restructure, begin implementing libplt

2025-08-12 06:24:29 -05:00
parent ae166bc45c
commit ca586aaa36
23 changed files with 682 additions and 556 deletions
--- a/api/build.gradle.kts
+++ b/api/build.gradle.kts
@@ -1,32 +0,0 @@
-plugins {
-    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 {
-
-        }
-        jvmTest.dependencies {
-
-        }
-    }
-}
--- a/api/src/commonMain/kotlin/app/hakurei/planterette/api/HakureiConfig.kt
+++ b/api/src/commonMain/kotlin/app/hakurei/planterette/api/HakureiConfig.kt
@@ -1,126 +0,0 @@
-package app.hakurei.planterette.api
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class HakureiConfig(
-    val id: String,
-
-    val path: String? = null,
-    val args: List<String>,
-
-    val enablements: Byte,
-
-    @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: List<ExtraPermConfig>?,
-
-    val identity: Int,
-    val groups: List<String>,
-
-    val container: ContainerConfig
-) {
-    @Serializable
-    data class DbusConfig(
-        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,
-        val path: String,
-        @SerialName("r") val read: Boolean? = null,
-        @SerialName("w") val write: Boolean? = null,
-        @SerialName("x") val execute: Boolean? = null
-    )
-    @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,
-
-        val devel: Boolean? = null,
-        val userns: Boolean? = null,
-        val net: Boolean? = null,
-        val tty: Boolean? = null,
-        val multiarch: Boolean? = null,
-
-        val env: Map<String, String>,
-        @SerialName("map_real_uid") val mapRealUid: Boolean,
-
-        val device: Boolean? = null,
-        val filesystem: List<FilesystemConfig>,
-        @SerialName("symlink") val link: List<String>,
-
-        val etc: String? = null,
-        @SerialName("auto_etc") val autoEtc: Boolean,
-        val cover: List<String>
-    )
-
-    @Serializable
-    data class FilesystemConfig(
-        val dst: String? = null,
-        val src: String,
-        val write: 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);
-
-        companion object {
-            fun enablements(vararg enablements: Enablement): Byte {
-                return enablements.sumOf(Enablement::value).toByte()
-            }
-        }
-    }
-
-    @Serializable
-    enum class SeccompFilterPreset(val value: Int) {
-        Ext(1 shl 0),
-        DenyNS(1 shl 1),
-        DenyTTY(1 shl 2),
-        DenyDevel(1 shl 3),
-        Linux32(1 shl 4);
-
-        companion object {
-            fun filterPresets(vararg filterPresets: SeccompFilterPreset): Int {
-                return filterPresets.sumOf(SeccompFilterPreset::value)
-            }
-        }
-    }
-
-    @Serializable
-    enum class HakureiExportFlag(val value: Int) {
-        Multiarch(1 shl 0),
-        CAN(1 shl 1),
-        Bluetooth(1 shl 2);
-
-        companion object {
-            fun exportFlags(vararg exportFlags: HakureiExportFlag): Int {
-                return exportFlags.sumOf(HakureiExportFlag::value)
-            }
-        }
-    }
-}
--- a/api/src/commonMain/kotlin/app/hakurei/planterette/api/PackageManifest.kt
+++ b/api/src/commonMain/kotlin/app/hakurei/planterette/api/PackageManifest.kt
@@ -1,33 +0,0 @@
-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
@@ -1,16 +0,0 @@
-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
@@ -1,97 +0,0 @@
-package app.hakurei.planterette.api
-
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.serializer
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-class HakureiConfigTest {
-    @OptIn(ExperimentalSerializationApi::class)
-    val format = Json {
-        explicitNulls = false
-        prettyPrint = true
-    }
-
-    @Test
-    fun testHakureiConfigSerialization() {
-        val testConfig = HakureiConfig(
-            id = "org.chromium.Chromium",
-            path = "/run/current-system/sw/bin/chromium",
-            args = listOf(
-                "chromium",
-                "--ignore-gpu-blocklist",
-                "--disable-smooth-scrolling",
-                "--enable-features=UseOzonePlatform",
-                "--ozone-platform=wayland"
-                ),
-            enablements = HakureiConfig.Enablement.enablements(HakureiConfig.Enablement.Wayland, HakureiConfig.Enablement.DBus,
-                HakureiConfig.Enablement.Pulse),
-            sessionBus = HakureiConfig.DbusConfig(
-                see = null,
-                talk = listOf("org.freedesktop.Notifications", "org.freedesktop.FileManager1", "org.freedesktop.ScreenSaver",
-                    "org.freedesktop.secrets", "org.kde.kwalletd5", "org.kde.kwalletd6", "org.gnome.SessionManager"),
-                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/*"),
-                filter = true
-            ),
-            systemBus = HakureiConfig.DbusConfig(
-                talk = listOf("org.bluez", "org.freedesktop.Avahi", "org.freedesktop.UPower"),
-                filter = true
-            ),
-
-            username = "chronos",
-            shell = "/run/current-system/sw/bin/zsh",
-            data = "/var/lib/hakurei/u0/org.chromium.Chromium",
-            dir = "/data/data/org.chromium.Chromium",
-            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 = listOf("video", "dialout", "plugdev"),
-            container = HakureiConfig.ContainerConfig(
-                hostname = "localhost",
-                devel = true,
-                userns = true,
-                net = true,
-                device = true,
-                seccompFlags = HakureiConfig.HakureiExportFlag.Multiarch.value,
-                seccompPresets = HakureiConfig.SeccompFilterPreset.Ext.value,
-                tty = true,
-                multiarch = true,
-                mapRealUid = true,
-                env = mapOf(
-                    "GOOGLE_API_KEY" to "AIzaSyBHDrl33hwRp4rMQY0ziRbj8K9LPA6vUCY",
-                    "GOOGLE_DEFAULT_CLIENT_ID" to "77185425430.apps.googleusercontent.com",
-                    "GOOGLE_DEFAULT_CLIENT_SECRET" to "OTJgUOQcT7lO7GsGZq2G4IlT",
-                ),
-                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 = "/dev/dri", device = true)
-                ),
-                link = listOf("/run/user/65534", "/run/user/150"),
-                etc = "/etc",
-                autoEtc = true,
-                cover = listOf("/var/run/nscd"),
-                delay = -1,
-                seccompCompat = true
-            )
-        )
-        val json = format.encodeToString(serializer(), testConfig)
-        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
@@ -1,123 +0,0 @@
-{
-  "id": "org.chromium.Chromium",
-  "path": "/run/current-system/sw/bin/chromium",
-  "args": [
-    "chromium",
-    "--ignore-gpu-blocklist",
-    "--disable-smooth-scrolling",
-    "--enable-features=UseOzonePlatform",
-    "--ozone-platform=wayland"
-  ],
-  "enablements": 13,
-  "session_bus": {
-    "see": null,
-    "talk": [
-      "org.freedesktop.Notifications",
-      "org.freedesktop.FileManager1",
-      "org.freedesktop.ScreenSaver",
-      "org.freedesktop.secrets",
-      "org.kde.kwalletd5",
-      "org.kde.kwalletd6",
-      "org.gnome.SessionManager"
-    ],
-    "own": [
-      "org.chromium.Chromium.*",
-      "org.mpris.MediaPlayer2.org.chromium.Chromium.*",
-      "org.mpris.MediaPlayer2.chromium.*"
-    ],
-    "call": {
-      "org.freedesktop.portal.*": "*"
-    },
-    "broadcast": {
-      "org.freedesktop.portal.*": "@/org/freedesktop/portal/*"
-    },
-    "filter": true
-  },
-  "system_bus": {
-    "see": null,
-    "talk": [
-      "org.bluez",
-      "org.freedesktop.Avahi",
-      "org.freedesktop.UPower"
-    ],
-    "own": null,
-    "call": null,
-    "broadcast": null,
-    "filter": true
-  },
-  "username": "chronos",
-  "shell": "/run/current-system/sw/bin/zsh",
-  "data": "/var/lib/hakurei/u0/org.chromium.Chromium",
-  "dir": "/data/data/org.chromium.Chromium",
-  "extra_perms": [
-    {
-      "ensure": true,
-      "path": "/var/lib/hakurei/u0",
-      "x": true
-    },
-    {
-      "path": "/var/lib/hakurei/u0/org.chromium.Chromium",
-      "r": true,
-      "w": true,
-      "x": true
-    }
-  ],
-  "identity": 9,
-  "groups": [
-    "video",
-    "dialout",
-    "plugdev"
-  ],
-  "container": {
-    "hostname": "localhost",
-    "wait_delay": -1,
-    "seccomp_flags": 1,
-    "seccomp_presets": 1,
-    "seccomp_compat": true,
-    "devel": true,
-    "userns": true,
-    "net": true,
-    "tty": true,
-    "multiarch": true,
-    "env": {
-      "GOOGLE_API_KEY": "AIzaSyBHDrl33hwRp4rMQY0ziRbj8K9LPA6vUCY",
-      "GOOGLE_DEFAULT_CLIENT_ID": "77185425430.apps.googleusercontent.com",
-      "GOOGLE_DEFAULT_CLIENT_SECRET": "OTJgUOQcT7lO7GsGZq2G4IlT"
-    },
-    "map_real_uid": true,
-    "device": true,
-    "filesystem": [
-      {
-        "src": "/nix/store"
-      },
-      {
-        "src": "/run/current-system"
-      },
-      {
-        "src": "/run/opengl-driver"
-      },
-      {
-        "src": "/var/db/nix-channels"
-      },
-      {
-        "dst": "/data/data/org.chromium.Chromium",
-        "src": "/var/lib/hakurei/u0/org.chromium.Chromium",
-        "write": true,
-        "require": true
-      },
-      {
-        "src": "/dev/dri",
-        "dev": true
-      }
-    ],
-    "symlink": [
-      "/run/user/65534",
-      "/run/user/150"
-    ],
-    "etc": "/etc",
-    "auto_etc": true,
-    "cover": [
-      "/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
@@ -1,2 +0,0 @@
-package app.hakurei.planterette.api.dsl
-