create PackageManifest.kt and get test working

2025-07-30 03:15:37 -05:00
parent 0baf6b876b
commit c14a7be42a
21 changed files with 361 additions and 70 deletions
--- a/api/build.gradle.kts
+++ b/api/build.gradle.kts
@@ -1,9 +1,32 @@
 plugins {
-    id("buildsrc.convention.kotlin-jvm")
+    kotlin("multiplatform")
    alias(libs.plugins.kotlinPluginSerialization)
 }
+kotlin {
+    jvm()
+    val nativeTarget = if(System.getProperty("os.arch") == "aarch64") {
+        linuxArm64("native")
+    } else {
+        linuxX64("native")
+    }
+    nativeTarget.binaries {
+        sharedLib {
+            baseName = "planterette"
+        }
+    }
+    sourceSets {
+        commonMain.dependencies {
+            implementation(libs.bundles.kotlinxEcosystem)
+        }
+        commonTest.dependencies {
+            implementation(libs.bundles.kotlinxEcosystem)
+            implementation(kotlin("test"))
+        }
+        jvmMain.dependencies {

-dependencies {
-    implementation(libs.bundles.kotlinxEcosystem)
-    testImplementation(kotlin("test"))
-}
+        }
+        jvmTest.dependencies {
+
+        }
+    }
+}
--- a/api/src/commonMain/kotlin/app/hakurei/planterette/api/HakureiConfig.kt
+++ b/api/src/commonMain/kotlin/app/hakurei/planterette/api/HakureiConfig.kt
@@ -8,35 +8,37 @@ data class HakureiConfig(
    val id: String,

    val path: String? = null,
-    val args: Array<String>,
+    val args: List<String>,

    val enablements: Byte,

-    @SerialName("session_bus") val sessionBus: DbusConfig?,
-    @SerialName("system_bus") val systemBus: DbusConfig?,
-    @SerialName("direct_wayland") val directWayland: Boolean?,
+    @SerialName("session_bus") val sessionBus: DbusConfig? = null,
+    @SerialName("system_bus") val systemBus: DbusConfig? = null,
+    @SerialName("direct_wayland") val directWayland: Boolean? = null,

    val username: String? = null,
    val shell: String? = null,
    val data: String,
    val dir: String,
-    @SerialName("extra_perms") val extraPerms: Array<ExtraPermConfig>?,
+    @SerialName("extra_perms") val extraPerms: List<ExtraPermConfig>?,

    val identity: Int,
-    val groups: Array<String>,
+    val groups: List<String>,

    val container: ContainerConfig
 ) {
    @Serializable
    data class DbusConfig(
-        val see: Array<String>? = null,
-        val talk: Array<String>,
-        val own: Array<String>?,
-        val call: Map<String, String>?,
-        val broadcast: Map<String, String>?,
-        val log: Boolean,
-        val filter: Boolean
-    )
+        val see: List<String>? = null,
+        val talk: List<String>? = null,
+        val own: List<String>? = null,
+        val call: Map<String, String>? = null,
+        val broadcast: Map<String, String>? = null,
+        val log: Boolean? = null,
+        val filter: Boolean? = null
+    ) {
+    }
+
    @Serializable
    data class ExtraPermConfig(
        val ensure: Boolean? = null,
@@ -48,7 +50,7 @@ data class HakureiConfig(
    @Serializable
    data class ContainerConfig(
        val hostname: String? = null,
-
+        @SerialName("wait_delay") val delay: Int = -1,
        @SerialName("seccomp_flags") val seccompFlags: Int,
        @SerialName("seccomp_presets") val seccompPresets: Int,
        @SerialName("seccomp_compat") val seccompCompat: Boolean? = null,
@@ -63,29 +65,29 @@ data class HakureiConfig(
        @SerialName("map_real_uid") val mapRealUid: Boolean,

        val device: Boolean? = null,
-        val filesystem: Array<FilesystemConfig>,
-        @SerialName("symlink") val link: Array<String>,
+        val filesystem: List<FilesystemConfig>,
+        @SerialName("symlink") val link: List<String>,

        val etc: String? = null,
        @SerialName("auto_etc") val autoEtc: Boolean,
-        val cover: Array<String>
+        val cover: List<String>
    )
+
    @Serializable
    data class FilesystemConfig(
        val dst: String? = null,
        val src: String,
        val write: Boolean? = null,
-        val device: Boolean? = null,
+        @SerialName("dev") val device: Boolean? = null,
        @SerialName("require") val must: Boolean? = null
    )
+
    @Serializable
    enum class Enablement(val value: Int) {
        Wayland(1 shl 0),
        X11(1 shl 1),
        DBus(1 shl 2),
-        Pulse(1 shl 3),
-
-        EM(0b10000);
+        Pulse(1 shl 3);

        companion object {
            fun enablements(vararg enablements: Enablement): Byte {
@@ -93,6 +95,7 @@ data class HakureiConfig(
            }
        }
    }
+
    @Serializable
    enum class SeccompFilterPreset(val value: Int) {
        Ext(1 shl 0),
@@ -107,6 +110,7 @@ data class HakureiConfig(
            }
        }
    }
+
    @Serializable
    enum class HakureiExportFlag(val value: Int) {
        Multiarch(1 shl 0),
--- a/api/src/commonMain/kotlin/app/hakurei/planterette/api/PackageManifest.kt
+++ b/api/src/commonMain/kotlin/app/hakurei/planterette/api/PackageManifest.kt
@@ -0,0 +1,33 @@
+package app.hakurei.planterette.api
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class PackageManifest(
+    val hakureiConfig: HakureiConfig,
+    val id: String,
+    val version: Version,
+    val name: String,
+    val description: String,
+    val architecture: List<Architecture>,
+    val baseImage: BaseImage
+) {
+    @Serializable
+    data class Version(val version: String, val canonicalVersion: UInt)
+
+    @Serializable
+    enum class Architecture {
+        X86_64,
+        ARM64,
+    }
+    @Serializable
+    enum class BaseImage {
+        DEBIAN,
+        CHIMERA,
+
+    }
+    companion object {
+        val fileList = listOf("planterette.json", "icon.png", "image.tar")
+        val signatureFile = "package.sig"
+    }
+}
--- a/api/src/commonMain/kotlin/app/hakurei/planterette/api/Util.kt
+++ b/api/src/commonMain/kotlin/app/hakurei/planterette/api/Util.kt
@@ -0,0 +1,16 @@
+package app.hakurei.planterette.api
+
+import kotlinx.io.Buffer
+import kotlinx.io.buffered
+import kotlinx.io.files.Path
+import kotlinx.io.files.SystemFileSystem
+import kotlinx.io.readString
+
+object Util {
+    fun readFileToString(path: String): String {
+        val buffer = Buffer()
+        val source = SystemFileSystem.source(Path(path))
+        source.buffered().transferTo(buffer)
+        return buffer.readString()
+    }
+}
--- a/api/src/commonTest/kotlin/app/hakurei/planterette/api/HakureiConfigTest.kt
+++ b/api/src/commonTest/kotlin/app/hakurei/planterette/api/HakureiConfigTest.kt
@@ -3,23 +3,22 @@ package app.hakurei.planterette.api
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.serializer
-import org.junit.jupiter.api.Test
-import java.io.FileInputStream
-import kotlin.test.asserter
+import kotlin.test.Test
+import kotlin.test.assertEquals

 class HakureiConfigTest {
    @OptIn(ExperimentalSerializationApi::class)
    val format = Json {
        explicitNulls = false
+        prettyPrint = true
    }
-    val templateFile: String = javaClass.classLoader.getResource("template.json")!!.readText()

    @Test
    fun testHakureiConfigSerialization() {
-        val testConfig: HakureiConfig = HakureiConfig(
+        val testConfig = HakureiConfig(
            id = "org.chromium.Chromium",
            path = "/run/current-system/sw/bin/chromium",
-            args = arrayOf(
+            args = listOf(
                "chromium",
                "--ignore-gpu-blocklist",
                "--disable-smooth-scrolling",
@@ -30,36 +29,29 @@ class HakureiConfigTest {
                HakureiConfig.Enablement.Pulse),
            sessionBus = HakureiConfig.DbusConfig(
                see = null,
-                talk = arrayOf("org.freedesktop.Notifications", "org.freedesktop.FileManager1", "org.freedesktop.ScreenSaver",
+                talk = listOf("org.freedesktop.Notifications", "org.freedesktop.FileManager1", "org.freedesktop.ScreenSaver",
                    "org.freedesktop.secrets", "org.kde.kwalletd5", "org.kde.kwalletd6", "org.gnome.SessionManager"),
-                own = arrayOf("org.chromium.Chromium.*", "org.mpris.MediaPlayer2.org.chromium.Chromium.*",
+                own = listOf("org.chromium.Chromium.*", "org.mpris.MediaPlayer2.org.chromium.Chromium.*",
                    "org.mpris.MediaPlayer2.chromium.*"),
                call = mapOf("org.freedesktop.portal.*" to "*"),
                broadcast = mapOf("org.freedesktop.portal.*" to "@/org/freedesktop/portal/*"),
-                log = false,
                filter = true
            ),
            systemBus = HakureiConfig.DbusConfig(
-                see = null,
-                talk = arrayOf("org.bluez", "org.freedesktop.Avahi", "org.freedesktop.UPower"),
-                own = null,
-                call = null,
-                broadcast = null,
-                log = false,
+                talk = listOf("org.bluez", "org.freedesktop.Avahi", "org.freedesktop.UPower"),
                filter = true
            ),
-            directWayland = false,

            username = "chronos",
            shell = "/run/current-system/sw/bin/zsh",
            data = "/var/lib/hakurei/u0/org.chromium.Chromium",
            dir = "/data/data/org.chromium.Chromium",
-            extraPerms = arrayOf(
+            extraPerms = listOf(
                HakureiConfig.ExtraPermConfig(path = "/var/lib/hakurei/u0", ensure = true, execute = true),
                HakureiConfig.ExtraPermConfig(path = "/var/lib/hakurei/u0/org.chromium.Chromium", read = true, write = true, execute = true)
            ),
            identity = 9,
-            groups = arrayOf("video", "dialout", "plugdev"),
+            groups = listOf("video", "dialout", "plugdev"),
            container = HakureiConfig.ContainerConfig(
                hostname = "localhost",
                devel = true,
@@ -76,22 +68,30 @@ class HakureiConfigTest {
                    "GOOGLE_DEFAULT_CLIENT_ID" to "77185425430.apps.googleusercontent.com",
                    "GOOGLE_DEFAULT_CLIENT_SECRET" to "OTJgUOQcT7lO7GsGZq2G4IlT",
                ),
-                filesystem = arrayOf(
+                filesystem = listOf(
                    HakureiConfig.FilesystemConfig(src = "/nix/store"),
                    HakureiConfig.FilesystemConfig(src = "/run/current-system"),
                    HakureiConfig.FilesystemConfig(src = "/run/opengl-driver"),
                    HakureiConfig.FilesystemConfig(src = "/var/db/nix-channels"),
-                    HakureiConfig.FilesystemConfig(src = "/var/lib/hakurei/u0/org.chromium.Chromium", dst = "/data/data/org.chromium.Chromium", write = true, must = true),
+                    HakureiConfig.FilesystemConfig(
+                        src = "/var/lib/hakurei/u0/org.chromium.Chromium",
+                        dst = "/data/data/org.chromium.Chromium",
+                        write = true,
+                        must = true
+                    ),
                    HakureiConfig.FilesystemConfig(src = "/dev/dri", device = true)
                ),
-                link = arrayOf("/run/user/65534", "/run/user/150"),
+                link = listOf("/run/user/65534", "/run/user/150"),
                etc = "/etc",
                autoEtc = true,
-                cover = arrayOf("/var/run/nscd")
+                cover = listOf("/var/run/nscd"),
+                delay = -1,
+                seccompCompat = true
            )
        )
        val json = format.encodeToString(serializer(), testConfig)
-        println("can't compare to template generated by go right now, so printing here. add \"prettyPrint = true\" to format to add whitespace")
-        println(json)
+        val deserializeJson: HakureiConfig = format.decodeFromString(json)
+        val templateJson: HakureiConfig = format.decodeFromString(Util.readFileToString("/home/lilly/Documents/Projects/Rosa/planterette/api/src/commonTest/resources/template.json"))
+        assertEquals(templateJson, deserializeJson, "")
    }
 }
--- a/api/src/commonTest/resources/template.json
+++ b/api/src/commonTest/resources/template.json
@@ -70,8 +70,10 @@
  ],
  "container": {
    "hostname": "localhost",
+    "wait_delay": -1,
    "seccomp_flags": 1,
    "seccomp_presets": 1,
+    "seccomp_compat": true,
    "devel": true,
    "userns": true,
    "net": true,
@@ -109,10 +111,8 @@
      }
    ],
    "symlink": [
-      [
-        "/run/user/65534",
-        "/run/user/150"
-      ]
+      "/run/user/65534",
+      "/run/user/150"
    ],
    "etc": "/etc",
    "auto_etc": true,
@@ -120,4 +120,4 @@
      "/var/run/nscd"
    ]
  }
-}
+}
--- a/api/src/jvmMain/kotlin/app/hakurei/planterette/api/dsl/HakureiDSL.kt
+++ b/api/src/jvmMain/kotlin/app/hakurei/planterette/api/dsl/HakureiDSL.kt
@@ -0,0 +1,2 @@
+package app.hakurei.planterette.api.dsl
+