@dvai-bridge/capacitor-llama 4.0.0 → 4.0.2

package/android/src/main/java/co/deepvoiceai/bridge/llama/Plugin.kt

@@ -1,177 +1,177 @@
-package co.deepvoiceai.bridge.llama
-
-import com.getcapacitor.JSArray
-import com.getcapacitor.JSObject
-import com.getcapacitor.Plugin
-import com.getcapacitor.PluginCall
-import com.getcapacitor.PluginMethod
-import com.getcapacitor.annotation.CapacitorPlugin
-import co.deepvoiceai.bridge.llama.core.ModelDownloader
-import co.deepvoiceai.bridge.llama.core.PluginState
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.cancel
-import kotlinx.coroutines.launch
-
-// ---------------------------------------------------------------------------
-// JSObject ↔ Map translation helpers — needed because PluginState's API is
-// Capacitor-neutral (Map<String, Any?>) while the JS-bridge layer works with
-// Capacitor's JSObject (which extends JSONObject and has no .toMap()).
-// ---------------------------------------------------------------------------
-
-private fun JSObject.toAnyMap(): Map<String, Any?> {
-    val out = mutableMapOf<String, Any?>()
-    val it = keys()
-    while (it.hasNext()) {
-        val k = it.next()
-        out[k] = this.opt(k)  // returns Any (or JSONObject.NULL); fine for our usage
-    }
-    return out
-}
-
-private fun Map<String, Any?>.toJSObject(): JSObject {
-    val obj = JSObject()
-    for ((k, v) in this) {
-        if (v != null) obj.put(k, v)
-    }
-    return obj
-}
-
-@CapacitorPlugin(name = "DVAIBridgeLlama")
-class DVAIBridgeLlamaPlugin : Plugin() {
-    private val state = PluginState()
-    private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
-    private val downloader: ModelDownloader by lazy { ModelDownloader(context) }
-
-    override fun handleOnDestroy() {
-        super.handleOnDestroy()
-        scope.cancel()
-    }
-
-    @PluginMethod
-    fun start(call: PluginCall) {
-        scope.launch {
-            notifyListeners("progress", JSObject().apply { put("phase", "load") })
-            try {
-                val resultMap = state.start((call.data ?: JSObject()).toAnyMap())
-                notifyListeners("progress", JSObject().apply { put("phase", "ready") })
-                call.resolve(resultMap.toJSObject())
-            } catch (e: Exception) {
-                notifyListeners("progress", JSObject().apply {
-                    put("phase", "error")
-                    put("message", e.message ?: "Start failed")
-                })
-                call.reject(e.message ?: "Start failed", e)
-            }
-        }
-    }
-
-    @PluginMethod
-    fun stop(call: PluginCall) {
-        scope.launch {
-            try {
-                state.stop()
-                call.resolve()
-            } catch (e: Exception) {
-                call.reject(e.message ?: "Stop failed", e)
-            }
-        }
-    }
-
-    @PluginMethod
-    fun status(call: PluginCall) {
-        scope.launch {
-            call.resolve(state.statusInfo().toJSObject())
-        }
-    }
-
-    @PluginMethod
-    fun downloadModel(call: PluginCall) {
-        val url = call.getString("url") ?: return call.reject("url is required")
-        val sha = call.getString("sha256")?.takeIf { it.isNotEmpty() }?.lowercase()
-            ?: return call.reject("sha256 is required")
-        val destFilename = call.getString("destFilename") ?: url.substringAfterLast('/')
-        val headers: Map<String, String> = call.getObject("headers")?.let { obj ->
-            val map = mutableMapOf<String, String>()
-            obj.keys().forEachRemaining { k -> obj.getString(k)?.let { map[k] = it } }
-            map
-        } ?: emptyMap()
-
-        scope.launch {
-            try {
-                val (path, cached) = downloader.downloadModel(
-                    url = url,
-                    expectedSha256 = sha,
-                    destFilename = destFilename,
-                    headers = headers,
-                ) { bytesDone, bytesTotal ->
-                    val payload = JSObject().apply {
-                        put("phase", "download")
-                        put("bytesReceived", bytesDone)
-                        if (bytesTotal != null) {
-                            put("bytesTotal", bytesTotal)
-                            if (bytesTotal > 0) {
-                                put("percent", bytesDone.toDouble() / bytesTotal.toDouble() * 100.0)
-                            }
-                        }
-                    }
-                    notifyListeners("progress", payload)
-                }
-                call.resolve(JSObject().apply {
-                    put("path", path)
-                    put("cached", cached)
-                })
-            } catch (e: Exception) {
-                call.reject(e.message ?: "Download failed", e)
-            }
-        }
-    }
-
-    @PluginMethod
-    fun listCachedModels(call: PluginCall) {
-        scope.launch {
-            try {
-                val infos = downloader.listCached()
-                val arr = JSArray()
-                infos.forEach { info ->
-                    arr.put(JSObject().apply {
-                        put("filename", info.filename)
-                        put("path", info.path)
-                        put("bytes", info.bytes)
-                        put("sha256", info.sha256)
-                    })
-                }
-                call.resolve(JSObject().apply { put("models", arr) })
-            } catch (e: Exception) {
-                call.reject(e.message ?: "List failed", e)
-            }
-        }
-    }
-
-    @PluginMethod
-    fun deleteCachedModel(call: PluginCall) {
-        val filename = call.getString("filename")?.takeIf { it.isNotEmpty() }
-            ?: return call.reject("filename is required")
-        scope.launch {
-            try {
-                downloader.deleteCached(filename)
-                call.resolve()
-            } catch (e: Exception) {
-                call.reject(e.message ?: "Delete failed", e)
-            }
-        }
-    }
-
-    @PluginMethod
-    fun cacheDir(call: PluginCall) {
-        scope.launch {
-            try {
-                val path = downloader.cacheDir().absolutePath
-                call.resolve(JSObject().apply { put("path", path) })
-            } catch (e: Exception) {
-                call.reject(e.message ?: "cacheDir failed", e)
-            }
-        }
-    }
-}
+package co.deepvoiceai.bridge.llama
+
+import com.getcapacitor.JSArray
+import com.getcapacitor.JSObject
+import com.getcapacitor.Plugin
+import com.getcapacitor.PluginCall
+import com.getcapacitor.PluginMethod
+import com.getcapacitor.annotation.CapacitorPlugin
+import co.deepvoiceai.bridge.llama.core.ModelDownloader
+import co.deepvoiceai.bridge.llama.core.PluginState
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.launch
+
+// ---------------------------------------------------------------------------
+// JSObject ↔ Map translation helpers — needed because PluginState's API is
+// Capacitor-neutral (Map<String, Any?>) while the JS-bridge layer works with
+// Capacitor's JSObject (which extends JSONObject and has no .toMap()).
+// ---------------------------------------------------------------------------
+
+private fun JSObject.toAnyMap(): Map<String, Any?> {
+    val out = mutableMapOf<String, Any?>()
+    val it = keys()
+    while (it.hasNext()) {
+        val k = it.next()
+        out[k] = this.opt(k)  // returns Any (or JSONObject.NULL); fine for our usage
+    }
+    return out
+}
+
+private fun Map<String, Any?>.toJSObject(): JSObject {
+    val obj = JSObject()
+    for ((k, v) in this) {
+        if (v != null) obj.put(k, v)
+    }
+    return obj
+}
+
+@CapacitorPlugin(name = "DVAIBridgeLlama")
+class DVAIBridgeLlamaPlugin : Plugin() {
+    private val state = PluginState()
+    private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
+    private val downloader: ModelDownloader by lazy { ModelDownloader(context) }
+
+    override fun handleOnDestroy() {
+        super.handleOnDestroy()
+        scope.cancel()
+    }
+
+    @PluginMethod
+    fun start(call: PluginCall) {
+        scope.launch {
+            notifyListeners("progress", JSObject().apply { put("phase", "load") })
+            try {
+                val resultMap = state.start((call.data ?: JSObject()).toAnyMap())
+                notifyListeners("progress", JSObject().apply { put("phase", "ready") })
+                call.resolve(resultMap.toJSObject())
+            } catch (e: Exception) {
+                notifyListeners("progress", JSObject().apply {
+                    put("phase", "error")
+                    put("message", e.message ?: "Start failed")
+                })
+                call.reject(e.message ?: "Start failed", e)
+            }
+        }
+    }
+
+    @PluginMethod
+    fun stop(call: PluginCall) {
+        scope.launch {
+            try {
+                state.stop()
+                call.resolve()
+            } catch (e: Exception) {
+                call.reject(e.message ?: "Stop failed", e)
+            }
+        }
+    }
+
+    @PluginMethod
+    fun status(call: PluginCall) {
+        scope.launch {
+            call.resolve(state.statusInfo().toJSObject())
+        }
+    }
+
+    @PluginMethod
+    fun downloadModel(call: PluginCall) {
+        val url = call.getString("url") ?: return call.reject("url is required")
+        val sha = call.getString("sha256")?.takeIf { it.isNotEmpty() }?.lowercase()
+            ?: return call.reject("sha256 is required")
+        val destFilename = call.getString("destFilename") ?: url.substringAfterLast('/')
+        val headers: Map<String, String> = call.getObject("headers")?.let { obj ->
+            val map = mutableMapOf<String, String>()
+            obj.keys().forEachRemaining { k -> obj.getString(k)?.let { map[k] = it } }
+            map
+        } ?: emptyMap()
+
+        scope.launch {
+            try {
+                val (path, cached) = downloader.downloadModel(
+                    url = url,
+                    expectedSha256 = sha,
+                    destFilename = destFilename,
+                    headers = headers,
+                ) { bytesDone, bytesTotal ->
+                    val payload = JSObject().apply {
+                        put("phase", "download")
+                        put("bytesReceived", bytesDone)
+                        if (bytesTotal != null) {
+                            put("bytesTotal", bytesTotal)
+                            if (bytesTotal > 0) {
+                                put("percent", bytesDone.toDouble() / bytesTotal.toDouble() * 100.0)
+                            }
+                        }
+                    }
+                    notifyListeners("progress", payload)
+                }
+                call.resolve(JSObject().apply {
+                    put("path", path)
+                    put("cached", cached)
+                })
+            } catch (e: Exception) {
+                call.reject(e.message ?: "Download failed", e)
+            }
+        }
+    }
+
+    @PluginMethod
+    fun listCachedModels(call: PluginCall) {
+        scope.launch {
+            try {
+                val infos = downloader.listCached()
+                val arr = JSArray()
+                infos.forEach { info ->
+                    arr.put(JSObject().apply {
+                        put("filename", info.filename)
+                        put("path", info.path)
+                        put("bytes", info.bytes)
+                        put("sha256", info.sha256)
+                    })
+                }
+                call.resolve(JSObject().apply { put("models", arr) })
+            } catch (e: Exception) {
+                call.reject(e.message ?: "List failed", e)
+            }
+        }
+    }
+
+    @PluginMethod
+    fun deleteCachedModel(call: PluginCall) {
+        val filename = call.getString("filename")?.takeIf { it.isNotEmpty() }
+            ?: return call.reject("filename is required")
+        scope.launch {
+            try {
+                downloader.deleteCached(filename)
+                call.resolve()
+            } catch (e: Exception) {
+                call.reject(e.message ?: "Delete failed", e)
+            }
+        }
+    }
+
+    @PluginMethod
+    fun cacheDir(call: PluginCall) {
+        scope.launch {
+            try {
+                val path = downloader.cacheDir().absolutePath
+                call.resolve(JSObject().apply { put("path", path) })
+            } catch (e: Exception) {
+                call.reject(e.message ?: "cacheDir failed", e)
+            }
+        }
+    }
+}

package/android/src/main/res/xml/dvai_network_security_config.xml

@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
-    <domain-config cleartextTrafficPermitted="true">
-        <domain includeSubdomains="false">localhost</domain>
-        <domain includeSubdomains="false">127.0.0.1</domain>
-    </domain-config>
-</network-security-config>
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="false">localhost</domain>
+        <domain includeSubdomains="false">127.0.0.1</domain>
+    </domain-config>
+</network-security-config>

package/android/src/test/java/co/deepvoiceai/bridge/llama/SmokeTest.kt

@@ -1,11 +1,11 @@
-package co.deepvoiceai.bridge.llama
-
-import org.junit.Assert.assertNotNull
-import org.junit.Test
-
-class SmokeTest {
-    @Test
-    fun pluginClassExists() {
-        assertNotNull(DVAIBridgeLlamaPlugin::class.java)
-    }
-}
+package co.deepvoiceai.bridge.llama
+
+import org.junit.Assert.assertNotNull
+import org.junit.Test
+
+class SmokeTest {
+    @Test
+    fun pluginClassExists() {
+        assertNotNull(DVAIBridgeLlamaPlugin::class.java)
+    }
+}

package/dist/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import { registerPlugin } from \"@capacitor/core\";\r\nimport type { NativePluginInterface } from \"@dvai-bridge/capacitor\";\r\n\r\nconst DVAIBridgeLlama = registerPlugin<NativePluginInterface>(\"DVAIBridgeLlama\");\r\n\r\nexport default DVAIBridgeLlama;\r\nexport { DVAIBridgeLlama };\r\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAA+B;AAG/B,IAAM,sBAAkB,4BAAsC,iBAAiB;AAE/E,IAAO,gBAAQ;","names":[]}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import { registerPlugin } from \"@capacitor/core\";\nimport type { NativePluginInterface } from \"@dvai-bridge/capacitor\";\n\nconst DVAIBridgeLlama = registerPlugin<NativePluginInterface>(\"DVAIBridgeLlama\");\n\nexport default DVAIBridgeLlama;\nexport { DVAIBridgeLlama };\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAA+B;AAG/B,IAAM,sBAAkB,4BAAsC,iBAAiB;AAE/E,IAAO,gBAAQ;","names":[]}

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import { registerPlugin } from \"@capacitor/core\";\r\nimport type { NativePluginInterface } from \"@dvai-bridge/capacitor\";\r\n\r\nconst DVAIBridgeLlama = registerPlugin<NativePluginInterface>(\"DVAIBridgeLlama\");\r\n\r\nexport default DVAIBridgeLlama;\r\nexport { DVAIBridgeLlama };\r\n"],"mappings":";AAAA,SAAS,sBAAsB;AAG/B,IAAM,kBAAkB,eAAsC,iBAAiB;AAE/E,IAAO,gBAAQ;","names":[]}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import { registerPlugin } from \"@capacitor/core\";\nimport type { NativePluginInterface } from \"@dvai-bridge/capacitor\";\n\nconst DVAIBridgeLlama = registerPlugin<NativePluginInterface>(\"DVAIBridgeLlama\");\n\nexport default DVAIBridgeLlama;\nexport { DVAIBridgeLlama };\n"],"mappings":";AAAA,SAAS,sBAAsB;AAG/B,IAAM,kBAAkB,eAAsC,iBAAiB;AAE/E,IAAO,gBAAQ;","names":[]}

package/ios/Package.swift

@@ -1,57 +1,62 @@
-// swift-tools-version: 5.9
-import PackageDescription
-
-let package = Package(
-    name: "DVAICapacitorLlama",
-    platforms: [.iOS(.v14), .macOS(.v12)],
-    products: [
-        .library(name: "DVAICapacitorLlama", targets: ["DVAICapacitorLlama"]),
-    ],
-    dependencies: [
-        // Capacitor SPM artifact (existing)
-        .package(url: "https://github.com/ionic-team/capacitor-swift-pm", branch: "main"),
-        // Core package — relative path during dev, replaced with version-pin
-        // or git URL at publish time. The path is relative to *this* Package.swift's
-        // location (`packages/dvai-bridge-capacitor-llama/ios/`), so two `..` get
-        // us to the `packages/` parent and `dvai-bridge-ios-llama-core/ios` is the
-        // sibling package's SPM root.
-        //
-        // The core's Package.swift lives at the PACKAGE ROOT (not under `ios/`)
-        // so that SPM derives identity "dvai-bridge-ios-llama-core" rather than
-        // "ios" for this dependency. With both Package.swifts at `ios/`, SPM's
-        // path-dep identity-from-last-dir-name rule aliased them and triggered
-        // a false `cyclic dependency between packages DVAICapacitorLlama ->
-        // DVAICapacitorLlama` resolution error. The bare product reference
-        // ("DVAILlamaCore") in the target dependency list below works because
-        // SPM auto-resolves unambiguous product names across the dep graph.
-        .package(path: "../../dvai-bridge-ios-llama-core"),
-    ],
-    targets: [
-        .target(
-            name: "DVAICapacitorLlama",
-            dependencies: [
-                .product(name: "Capacitor", package: "capacitor-swift-pm"),
-                .product(name: "Cordova", package: "capacitor-swift-pm"),
-                // The package's identity is derived from the last dir of the
-                // path dep (`dvai-bridge-ios-llama-core`), not from the
-                // manifest's `name:` field. Bare-name product references don't
-                // cross package boundaries reliably; explicit form is required.
-                .product(name: "DVAILlamaCore", package: "dvai-bridge-ios-llama-core"),
-            ],
-            path: "Sources/DVAICapacitorLlama",
-            exclude: ["PluginProxy.m"]
-        ),
-        .testTarget(
-            name: "DVAICapacitorLlamaTests",
-            dependencies: [
-                "DVAICapacitorLlama",
-                // RealModelSmokeTest reaches the core directly (LlamaCppBridge,
-                // ModelDownloader, MTMD_MEDIA_MARKER) — declare both core products
-                // explicitly so Xcode resolves them at link time.
-                .product(name: "DVAILlamaCore", package: "dvai-bridge-ios-llama-core"),
-                .product(name: "DVAILlamaCoreObjC", package: "dvai-bridge-ios-llama-core"),
-            ],
-            path: "Tests/DVAICapacitorLlamaTests"
-        ),
-    ]
-)
+// swift-tools-version: 5.9
+import PackageDescription
+
+let package = Package(
+    name: "DVAICapacitorLlama",
+    // iOS 17 / macOS 14 — must match dvai-bridge-ios-llama-core
+    // (`platforms: [.iOS(.v17), .macOS(.v14)]`), which we depend on
+    // transitively via `DVAILlamaCore`/`DVAILlamaCoreObjC` below.
+    // Earlier .v14 / .v12 declaration was a vestige from before the
+    // Hummingbird migration (v3.2.0) bumped the shared-core floor.
+    platforms: [.iOS(.v17), .macOS(.v14)],
+    products: [
+        .library(name: "DVAICapacitorLlama", targets: ["DVAICapacitorLlama"]),
+    ],
+    dependencies: [
+        // Capacitor SPM artifact (existing)
+        .package(url: "https://github.com/ionic-team/capacitor-swift-pm", branch: "main"),
+        // Core package — relative path during dev, replaced with version-pin
+        // or git URL at publish time. The path is relative to *this* Package.swift's
+        // location (`packages/dvai-bridge-capacitor-llama/ios/`), so two `..` get
+        // us to the `packages/` parent and `dvai-bridge-ios-llama-core/ios` is the
+        // sibling package's SPM root.
+        //
+        // The core's Package.swift lives at the PACKAGE ROOT (not under `ios/`)
+        // so that SPM derives identity "dvai-bridge-ios-llama-core" rather than
+        // "ios" for this dependency. With both Package.swifts at `ios/`, SPM's
+        // path-dep identity-from-last-dir-name rule aliased them and triggered
+        // a false `cyclic dependency between packages DVAICapacitorLlama ->
+        // DVAICapacitorLlama` resolution error. The bare product reference
+        // ("DVAILlamaCore") in the target dependency list below works because
+        // SPM auto-resolves unambiguous product names across the dep graph.
+        .package(path: "../../dvai-bridge-ios-llama-core"),
+    ],
+    targets: [
+        .target(
+            name: "DVAICapacitorLlama",
+            dependencies: [
+                .product(name: "Capacitor", package: "capacitor-swift-pm"),
+                .product(name: "Cordova", package: "capacitor-swift-pm"),
+                // The package's identity is derived from the last dir of the
+                // path dep (`dvai-bridge-ios-llama-core`), not from the
+                // manifest's `name:` field. Bare-name product references don't
+                // cross package boundaries reliably; explicit form is required.
+                .product(name: "DVAILlamaCore", package: "dvai-bridge-ios-llama-core"),
+            ],
+            path: "Sources/DVAICapacitorLlama",
+            exclude: ["PluginProxy.m"]
+        ),
+        .testTarget(
+            name: "DVAICapacitorLlamaTests",
+            dependencies: [
+                "DVAICapacitorLlama",
+                // RealModelSmokeTest reaches the core directly (LlamaCppBridge,
+                // ModelDownloader, MTMD_MEDIA_MARKER) — declare both core products
+                // explicitly so Xcode resolves them at link time.
+                .product(name: "DVAILlamaCore", package: "dvai-bridge-ios-llama-core"),
+                .product(name: "DVAILlamaCoreObjC", package: "dvai-bridge-ios-llama-core"),
+            ],
+            path: "Tests/DVAICapacitorLlamaTests"
+        ),
+    ]
+)