Skip to content

Commit 78df059

Browse files
d4rkend4rken
committed
chore: rename package from kserver to server
1 parent b5495db commit 78df059

69 files changed

Lines changed: 252 additions & 259 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.claude/CLAUDE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
66

77
Sync server for the [Octi](https://github.com/d4rken-org/octi) Android app. Devices in the same account push/pull module data through this server, with real-time WebSocket notifications.
88

9-
- **Package**: `eu.darken.octi.kserver`
9+
- **Package**: `eu.darken.octi.server`
1010
- **Architecture**: Ktor 3 + Dagger 2 DI + file-based JSON persistence (no database)
1111
- **Key tech**: Kotlin coroutines, kotlinx-serialization, Netty, KSP
1212

‎.claude/rules/build-commands.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ Output: `./build/install/octi-server/`
2222
./gradlew check
2323

2424
# Run a single test class
25-
./gradlew test --tests "eu.darken.octi.kserver.module.ModuleFlowTest"
25+
./gradlew test --tests "eu.darken.octi.server.module.ModuleFlowTest"
2626

2727
# Run a single test method
28-
./gradlew test --tests "eu.darken.octi.kserver.module.ModuleFlowTest.writing a module"
28+
./gradlew test --tests "eu.darken.octi.server.module.ModuleFlowTest.writing a module"
2929
```
3030

3131
## Running Locally

‎.idea/runConfigurations/App___TestData___Debug.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ tasks.test {
4545
}
4646

4747
application {
48-
mainClass.set("eu.darken.octi.kserver.App")
48+
mainClass.set("eu.darken.octi.server.App")
4949
}
5050

5151
tasks.register("generateBuildInfo") {
@@ -73,7 +73,7 @@ tasks.register("generateBuildInfo") {
7373
File(outputDir, "BuildInfo.kt").apply {
7474
writeText(
7575
"""
76-
package eu.darken.octi.kserver
76+
package eu.darken.octi.server
7777
7878
object BuildInfo {
7979
const val GIT_SHA: String = "$gitSHA"

src/main/kotlin/eu/darken/octi/kserver/App.kt renamed to src/main/kotlin/eu/darken/octi/server/App.kt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package eu.darken.octi.kserver
2-
3-
import eu.darken.octi.kserver.common.AppScope
4-
import eu.darken.octi.kserver.common.RateLimitConfig
5-
import eu.darken.octi.kserver.common.debug.logging.ConsoleLogger
6-
import eu.darken.octi.kserver.common.debug.logging.Logging.Priority.*
7-
import eu.darken.octi.kserver.common.debug.logging.log
8-
import eu.darken.octi.kserver.common.debug.logging.logTag
9-
import eu.darken.octi.kserver.common.debug.DebugFlagMonitor
1+
package eu.darken.octi.server
2+
3+
import eu.darken.octi.server.common.AppScope
4+
import eu.darken.octi.server.common.RateLimitConfig
5+
import eu.darken.octi.server.common.debug.logging.ConsoleLogger
6+
import eu.darken.octi.server.common.debug.logging.Logging.Priority.*
7+
import eu.darken.octi.server.common.debug.logging.log
8+
import eu.darken.octi.server.common.debug.logging.logTag
9+
import eu.darken.octi.server.common.debug.DebugFlagMonitor
1010
import java.nio.file.Path
1111
import java.time.Duration
1212
import javax.inject.Inject

src/main/kotlin/eu/darken/octi/kserver/AppComponent.kt renamed to src/main/kotlin/eu/darken/octi/server/AppComponent.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package eu.darken.octi.kserver
1+
package eu.darken.octi.server
22

33
import dagger.BindsInstance
44
import dagger.Component
5-
import eu.darken.octi.kserver.common.serialization.SerializationModule
5+
import eu.darken.octi.server.common.serialization.SerializationModule
66
import javax.inject.Singleton
77

88
@Singleton

src/main/kotlin/eu/darken/octi/kserver/Server.kt renamed to src/main/kotlin/eu/darken/octi/server/Server.kt

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
package eu.darken.octi.kserver
1+
package eu.darken.octi.server
22

3-
import eu.darken.octi.kserver.account.AccountRoute
4-
import eu.darken.octi.kserver.account.share.ShareRoute
5-
import eu.darken.octi.kserver.common.debug.logging.Logging.Priority.ERROR
6-
import eu.darken.octi.kserver.common.debug.logging.Logging.Priority.INFO
7-
import eu.darken.octi.kserver.common.debug.logging.Logging.Priority.WARN
8-
import eu.darken.octi.kserver.common.debug.logging.asLog
9-
import eu.darken.octi.kserver.common.debug.logging.log
10-
import eu.darken.octi.kserver.common.debug.logging.logTag
11-
import eu.darken.octi.kserver.common.IpDeviceTracker
12-
import eu.darken.octi.kserver.common.IpDeviceTrackerKey
13-
import eu.darken.octi.kserver.common.installCallLogging
14-
import eu.darken.octi.kserver.common.installPayloadLimit
15-
import eu.darken.octi.kserver.common.installRateLimit
16-
import eu.darken.octi.kserver.device.DeviceRoute
17-
import eu.darken.octi.kserver.module.ModuleRoute
18-
import eu.darken.octi.kserver.myip.MyIpRoute
19-
import eu.darken.octi.kserver.status.StatusRoute
20-
import eu.darken.octi.kserver.ws.WsRoute
3+
import eu.darken.octi.server.account.AccountRoute
4+
import eu.darken.octi.server.account.share.ShareRoute
5+
import eu.darken.octi.server.common.debug.logging.Logging.Priority.ERROR
6+
import eu.darken.octi.server.common.debug.logging.Logging.Priority.INFO
7+
import eu.darken.octi.server.common.debug.logging.Logging.Priority.WARN
8+
import eu.darken.octi.server.common.debug.logging.asLog
9+
import eu.darken.octi.server.common.debug.logging.log
10+
import eu.darken.octi.server.common.debug.logging.logTag
11+
import eu.darken.octi.server.common.IpDeviceTracker
12+
import eu.darken.octi.server.common.IpDeviceTrackerKey
13+
import eu.darken.octi.server.common.installCallLogging
14+
import eu.darken.octi.server.common.installPayloadLimit
15+
import eu.darken.octi.server.common.installRateLimit
16+
import eu.darken.octi.server.device.DeviceRoute
17+
import eu.darken.octi.server.module.ModuleRoute
18+
import eu.darken.octi.server.myip.MyIpRoute
19+
import eu.darken.octi.server.status.StatusRoute
20+
import eu.darken.octi.server.ws.WsRoute
2121
import io.ktor.http.*
2222
import io.ktor.serialization.kotlinx.json.*
2323
import io.ktor.server.application.*

src/main/kotlin/eu/darken/octi/kserver/account/Account.kt renamed to src/main/kotlin/eu/darken/octi/server/account/Account.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package eu.darken.octi.kserver.account
1+
package eu.darken.octi.server.account
22

33
import kotlinx.serialization.Contextual
44
import kotlinx.serialization.Serializable

src/main/kotlin/eu/darken/octi/kserver/account/AccountRepo.kt renamed to src/main/kotlin/eu/darken/octi/server/account/AccountRepo.kt

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
@file:OptIn(ExperimentalPathApi::class)
22

3-
package eu.darken.octi.kserver.account
3+
package eu.darken.octi.server.account
44

5-
import eu.darken.octi.kserver.App
6-
import eu.darken.octi.kserver.common.AppScope
7-
import eu.darken.octi.kserver.common.debug.logging.Logging.Priority.*
8-
import eu.darken.octi.kserver.common.debug.logging.asLog
9-
import eu.darken.octi.kserver.common.debug.logging.log
10-
import eu.darken.octi.kserver.common.debug.logging.logTag
11-
import eu.darken.octi.kserver.device.DeviceRepo
5+
import eu.darken.octi.server.App
6+
import eu.darken.octi.server.common.AppScope
7+
import eu.darken.octi.server.common.debug.logging.Logging.Priority.*
8+
import eu.darken.octi.server.common.debug.logging.asLog
9+
import eu.darken.octi.server.common.debug.logging.log
10+
import eu.darken.octi.server.common.debug.logging.logTag
11+
import eu.darken.octi.server.device.DeviceRepo
1212
import kotlinx.coroutines.*
1313
import kotlinx.coroutines.sync.Mutex
1414
import kotlinx.coroutines.sync.withLock
15-
import kotlinx.serialization.encodeToString
1615
import kotlinx.serialization.json.Json
1716
import java.io.IOException
1817
import java.nio.file.Files

src/main/kotlin/eu/darken/octi/kserver/account/AccountRoute.kt renamed to src/main/kotlin/eu/darken/octi/server/account/AccountRoute.kt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
package eu.darken.octi.kserver.account
2-
3-
import eu.darken.octi.kserver.account.share.ShareRepo
4-
import eu.darken.octi.kserver.common.debug.logging.Logging.Priority.*
5-
import eu.darken.octi.kserver.common.debug.logging.asLog
6-
import eu.darken.octi.kserver.common.debug.logging.log
7-
import eu.darken.octi.kserver.common.debug.logging.logTag
8-
import eu.darken.octi.kserver.common.debug.logging.shortId
9-
import eu.darken.octi.kserver.common.headerDeviceId
10-
import eu.darken.octi.kserver.common.verifyCaller
11-
import eu.darken.octi.kserver.device.DeviceRepo
12-
import eu.darken.octi.kserver.device.deviceCredentials
1+
package eu.darken.octi.server.account
2+
3+
import eu.darken.octi.server.account.share.ShareRepo
4+
import eu.darken.octi.server.common.debug.logging.Logging.Priority.*
5+
import eu.darken.octi.server.common.debug.logging.asLog
6+
import eu.darken.octi.server.common.debug.logging.log
7+
import eu.darken.octi.server.common.debug.logging.logTag
8+
import eu.darken.octi.server.common.debug.logging.shortId
9+
import eu.darken.octi.server.common.headerDeviceId
10+
import eu.darken.octi.server.common.verifyCaller
11+
import eu.darken.octi.server.device.DeviceRepo
12+
import eu.darken.octi.server.device.deviceCredentials
1313
import io.ktor.http.*
1414
import io.ktor.server.response.*
1515
import io.ktor.server.routing.*

0 commit comments

Comments
 (0)