Server entity database

.github/workflows/build.yml

@@ -13,21 +13,23 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: set up JDK 17
+      - name: set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           cache: gradle
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle
         run: ./gradlew buildDebug
-      - name: Run Kover
-        run: ./gradlew koverXmlReport
-      - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v4
+      #      - name: Run Kover
+      #        run: ./gradlew koverXmlReport
+      #      - name: Upload coverage reports to Codecov
+      #        uses: codecov/codecov-action@v4
+      - name: Run Server Migration Tests
+        run: ./gradlew :server:verifySqlDelightMigration
 #  ios:
 #    runs-on: macos-latest
 #    steps:
@@ -40,10 +42,10 @@ jobs:
 #      - name: Get swift version
 #        run: swift --version
 #
-#      - name: set up JDK 17
+#      - name: set up JDK 21
 #        uses: actions/setup-java@v4
 #        with:
-#          java-version: '17'
+#          java-version: '21'
 #          distribution: 'temurin'
 #          cache: gradle
 #

.github/workflows/publish.yml

@@ -14,10 +14,10 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: set up JDK 17
+      - name: set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           cache: gradle
 

.github/workflows/publishInternal.yml

@@ -14,10 +14,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: set up JDK 17
+      - name: set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           cache: gradle
 

.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
-          java-version: 17
+          java-version: 21
 
       - name: Gradle caching
         uses: actions/cache@v4
@@ -78,7 +78,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
-          java-version: 17
+          java-version: 21
 
       - name: Gradle caching
         uses: actions/cache@v4
@@ -131,7 +131,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
-          java-version: 17
+          java-version: 21
 
       - name: Gradle caching
         uses: actions/cache@v4
@@ -184,7 +184,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
-          java-version: 17
+          java-version: 21
 
       - name: Gradle caching
         uses: actions/cache@v4
@@ -239,7 +239,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
-          java-version: 17
+          java-version: 21
 
       - name: Gradle caching
         uses: actions/cache@v4

DEVELOPMENT.md

@@ -120,6 +120,34 @@ scope.launch(defaultDispatcher) {
 }
 ```
 
+## Logging
+
+## Client
+
+On the client you can log using `Napier` it works on all supported platforms:
+
+```kotlin
+Napier.i("message")
+Napier.w("message")
+Napier.e("message")
+Napier.d("message")
+```
+
+## Server
+
+On server you can log anywhere you have access to the ktor `Application`
+
+```kotlin
+log.info("message")
+log.debug("message")
+```
+
+You can also access it from a ktor `Call` object:
+`call.application.environment.log.info("Hello from a Call!")`
+
+If you need logging below the HTTP layer 🤷 Pass the logger down? Idk we don't have a great solution
+for this yet.
+
 ## Synchronization
 
 The protocol for synchronizing data between client and server is outlined here:

base/build.gradle.kts

@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
 plugins {
 	alias(libs.plugins.kotlin.multiplatform)
 	alias(libs.plugins.kotlin.serialization)
@@ -17,15 +15,13 @@ repositories {
 
 kotlin {
     androidTarget()
-	jvm("desktop") {
-		compilerOptions {
-			jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvm.get()))
-		}
-	}
+	jvm("desktop")
 	iosX64()
 	iosArm64()
 	iosSimulatorArm64()
 
+	jvmToolchain(libs.versions.jvm.get().toInt())
+
 	applyDefaultHierarchyTemplate()
 
     sourceSets {

base/src/commonMain/kotlin/com/darkrockstudios/apps/hammer/base/ProjectId.kt

@@ -0,0 +1,14 @@
+package com.darkrockstudios.apps.hammer.base
+
+import korlibs.io.util.UUID
+import kotlinx.serialization.Serializable
+import kotlin.jvm.JvmInline
+
+@Serializable
+@JvmInline
+value class ProjectId(val id: String) {
+	companion object {
+		fun randomUUID() = ProjectId(UUID.randomUUID().toString())
+	}
+}
+

base/src/commonMain/kotlin/com/darkrockstudios/apps/hammer/base/http/ApiProjectEntity.kt

@@ -67,16 +67,24 @@ sealed interface ApiProjectEntity {
 		val content: String
 	) : ApiProjectEntity
 
-	enum class Type {
-		SCENE,
-		NOTE,
-		TIMELINE_EVENT,
-		ENCYCLOPEDIA_ENTRY,
-		SCENE_DRAFT;
+	enum class Type(val id: Int) {
+		SCENE(0),
+		NOTE(1),
+		TIMELINE_EVENT(2),
+		ENCYCLOPEDIA_ENTRY(3),
+		SCENE_DRAFT(4);
+
+		fun toStringId() = when (this) {
+			SCENE -> "scene"
+			NOTE -> "note"
+			TIMELINE_EVENT -> "timeline_event"
+			ENCYCLOPEDIA_ENTRY -> "encyclopedia_entry"
+			SCENE_DRAFT -> "scene_draft"
+		}
 
 		companion object {
-			fun fromString(string: String): Type? {
-				return when (string.trim().lowercase()) {
+			fun fromString(string: String?): Type? {
+				return when (string?.trim()?.lowercase()) {
 					"scene" -> SCENE
 					"note" -> NOTE
 					"timeline_event" -> TIMELINE_EVENT
@@ -85,6 +93,10 @@ sealed interface ApiProjectEntity {
 					else -> null
 				}
 			}
+
+			fun fromInt(id: Int?): Type? {
+				return entries.find { it.id == id }
+			}
 		}
 	}
 }

base/src/commonMain/kotlin/com/darkrockstudios/apps/hammer/base/http/Http.kt

@@ -1,10 +1,14 @@
 package com.darkrockstudios.apps.hammer.base.http
 
 const val AUTH_REALM = "User Resources"
+
 const val HAMMER_PROTOCOL_HEADER = "X-Hammer-Protocol-Version"
-const val HAMMER_PROTOCOL_VERSION = 0
+const val HAMMER_PROTOCOL_VERSION = 1
 const val HEADER_SERVER_VERSION = "X-Server-Version"
+const val HEADER_CLIENT_VERSION = "X-Client-Version"
 const val HEADER_SYNC_ID = "X-Sync-Id"
 const val HEADER_ENTITY_HASH = "X-Entity-Hash"
 const val HEADER_ORIGINAL_HASH = "X-Original-Hash"
-const val HEADER_ENTITY_TYPE = "X-Entity-Type"
+const val HEADER_ENTITY_TYPE = "X-Entity-Type"
+
+const val API_ROUTE_PREFIX = "api"

base/src/commonMain/kotlin/com/darkrockstudios/apps/hammer/base/http/ProjectsApi.kt

@@ -1,10 +1,23 @@
 package com.darkrockstudios.apps.hammer.base.http
 
+import com.darkrockstudios.apps.hammer.base.ProjectId
 import kotlinx.serialization.Serializable
 
+@Serializable
+data class ApiProjectDefinition(
+	val name: String,
+	val uuid: ProjectId,
+)
+
 @Serializable
 data class BeginProjectsSyncResponse(
 	val syncId: String,
-	val projects: Set<String>,
-	val deletedProjects: Set<String>,
-)
+	val projects: Set<ApiProjectDefinition>,
+	val deletedProjects: Set<ProjectId>,
+)
+
+@Serializable
+data class CreateProjectResponse(
+	val projectId: ProjectId,
+	val alreadyExisted: Boolean,
+)

common/src/commonMain/kotlin/com/darkrockstudios/apps/hammer/common/components/projectselection/accountsettings/AccountSettingsComponent.kt

@@ -147,6 +147,9 @@ class AccountSettingsComponent(
 
 	override fun removeServer() {
 		globalSettingsRepository.deleteServerSettings()
+		projectsRepository.getProjects().forEach { projectDef ->
+			projectsRepository.removeProjectId(projectDef = projectDef)
+		}
 	}
 
 	override suspend fun setAutomaticBackups(value: Boolean) {

common/src/commonMain/kotlin/com/darkrockstudios/apps/hammer/common/components/projectselection/projectslist/ProjectsListComponent.kt

@@ -11,6 +11,7 @@ import com.darkrockstudios.apps.hammer.common.components.projectselection.Projec
 import com.darkrockstudios.apps.hammer.common.components.savableState
 import com.darkrockstudios.apps.hammer.common.components.storyeditor.metadata.ProjectMetadata
 import com.darkrockstudios.apps.hammer.common.data.ProjectDef
+import com.darkrockstudios.apps.hammer.common.data.SyncedProjectDefinition
 import com.darkrockstudios.apps.hammer.common.data.globalsettings.GlobalSettingsRepository
 import com.darkrockstudios.apps.hammer.common.data.isSuccess
 import com.darkrockstudios.apps.hammer.common.data.projectmetadatarepository.ProjectMetadataDatasource
@@ -221,10 +222,17 @@ class ProjectsListComponent(
 	}
 
 	override fun deleteProject(projectDef: ProjectDef) {
+		val projectId = projectsRepository.getProjectId(projectDef)
+		val syncedProject = if (projectId != null) {
+			SyncedProjectDefinition(projectDef, projectId)
+		} else {
+			null
+		}
+
 		if (projectsRepository.deleteProject(projectDef)) {
 			Napier.i("Project deleted: ${projectDef.name}")
-			if (projectsSynchronizer.isServerSynchronized()) {
-				projectsSynchronizer.deleteProject(projectDef)
+			if (syncedProject != null) {
+				projectsSynchronizer.deleteProject(syncedProject)
 			}
 
 			loadProjectList()

common/src/commonMain/kotlin/com/darkrockstudios/apps/hammer/common/components/storyeditor/metadata/ProjectMetadata.kt

@@ -1,5 +1,6 @@
 package com.darkrockstudios.apps.hammer.common.components.storyeditor.metadata
 
+import com.darkrockstudios.apps.hammer.base.ProjectId
 import kotlinx.datetime.Instant
 import kotlinx.serialization.Serializable
 
@@ -16,5 +17,6 @@ data class ProjectMetadata(
 data class Info(
 	val created: Instant,
 	val lastAccessed: Instant? = null,
-	val dataVersion: Int = 0 // Default to 0, if we don't know the version, assume its the oldest
-)
+	val dataVersion: Int = 0, // Default to 0, if we don't know the version, assume its the oldest
+	val serverProjectId: ProjectId? = null,
+)

common/src/commonMain/kotlin/com/darkrockstudios/apps/hammer/common/data/ProjectDef.kt

@@ -1,9 +1,13 @@
 package com.darkrockstudios.apps.hammer.common.data
 
+import com.darkrockstudios.apps.hammer.base.ProjectId
 import com.darkrockstudios.apps.hammer.common.fileio.HPath
 import kotlinx.serialization.Serializable
 
 @Serializable
 data class ProjectDefinition(val name: String, val path: HPath)
 
-typealias ProjectDef = ProjectDefinition
+typealias ProjectDef = ProjectDefinition
+
+@Serializable
+data class SyncedProjectDefinition(val projectDef: ProjectDefinition, val projectId: ProjectId)

common/src/commonMain/kotlin/com/darkrockstudios/apps/hammer/common/data/id/IdRepository.kt

@@ -20,6 +20,7 @@ abstract class IdRepository(private val projectDef: ProjectDef) : ProjectScoped
 	private var nextId: Int = -1
 
 	fun peekNextId(): Int = nextId
+	fun peekLastId(): Int = nextId - 1
 
 	suspend fun findNextId() {
 		mutex.withLock {

common/src/commonMain/kotlin/com/darkrockstudios/apps/hammer/common/data/projectmetadatarepository/ProjectMetadata.kt

@@ -1,5 +1,6 @@
 package com.darkrockstudios.apps.hammer.common.data.projectmetadatarepository
 
+import com.darkrockstudios.apps.hammer.base.ProjectId
 import com.darkrockstudios.apps.hammer.common.components.storyeditor.metadata.ProjectMetadata
 import com.darkrockstudios.apps.hammer.common.data.ProjectDef
 import com.darkrockstudios.apps.hammer.common.fileio.HPath
@@ -14,4 +15,8 @@ abstract class ProjectMetadataDatasource(
 	abstract fun saveMetadata(metadata: ProjectMetadata, projectDef: ProjectDef)
 	abstract fun updateMetadata(projectDef: ProjectDef, block: (metadata: ProjectMetadata) -> ProjectMetadata)
 	abstract fun getMetadataPath(projectDef: ProjectDef): HPath
+}
+
+fun ProjectMetadataDatasource.loadProjectId(projectDef: ProjectDef): ProjectId {
+	return loadMetadata(projectDef).info.serverProjectId ?: error("Server project ID missing")
 }