capacitor-native-agent 0.9.3 → 0.9.4

package/android/src/main/java/com/t6x/plugins/nativeagent/NativeAgentBridge.kt

@@ -0,0 +1,70 @@
+package com.t6x.plugins.nativeagent
+
+import java.util.concurrent.CopyOnWriteArrayList
+import uniffi.native_agent_ffi.NativeAgentHandle
+
+/**
+ * Listener interface for in-process Kotlin code that wants to observe
+ * raw FFI events alongside the WebView listener. Mirrors the shape of
+ * uniffi.native_agent_ffi.NativeEventCallback but is registered through
+ * NativeAgentBridge instead of the FFI itself, so multiple consumers
+ * can subscribe at once.
+ */
+interface NativeEventListener {
+    fun onEvent(eventType: String, payloadJson: String)
+}
+
+/**
+ * Process-wide accessor that exposes the live NativeAgentHandle and a
+ * multi-listener event fan-out to other modules in the same Android
+ * process — most notably the STOMP transport service in theshell.
+ *
+ * The single FFI-side NativeEventCallback registered by NativeAgentPlugin
+ * forwards every event into [dispatch] in addition to its existing
+ * notifyListeners("nativeAgentEvent", ...) call, so the WebView pipeline
+ * is byte-equivalent to before this bridge existed.
+ *
+ * Listeners are strong-referenced; callers MUST call
+ * [removeNativeEventListener] when their lifecycle ends.
+ */
+object NativeAgentBridge {
+
+    @Volatile
+    private var handleRef: NativeAgentHandle? = null
+
+    private val listeners = CopyOnWriteArrayList<NativeEventListener>()
+
+    /**
+     * The live FFI handle, or null if NativeAgent has not been
+     * initialized yet (or has been destroyed).
+     */
+    @JvmStatic
+    fun handle(): NativeAgentHandle? = handleRef
+
+    @JvmStatic
+    fun addNativeEventListener(listener: NativeEventListener) {
+        listeners.addIfAbsent(listener)
+    }
+
+    @JvmStatic
+    fun removeNativeEventListener(listener: NativeEventListener) {
+        listeners.remove(listener)
+    }
+
+    internal fun setHandle(h: NativeAgentHandle?) {
+        handleRef = h
+    }
+
+    internal fun dispatch(eventType: String, payloadJson: String) {
+        for (l in listeners) {
+            try {
+                l.onEvent(eventType, payloadJson)
+            } catch (t: Throwable) {
+                android.util.Log.w(
+                    "NativeAgentBridge",
+                    "listener threw on $eventType: ${t.message}",
+                )
+            }
+        }
+    }
+}

package/android/src/main/java/com/t6x/plugins/nativeagent/NativeAgentPlugin.kt

@@ -98,6 +98,7 @@ class NativeAgentPlugin : Plugin() {
                         data.put("eventType", eventType)
                         data.put("payloadJson", payloadJson)
                         notifyListeners("nativeAgentEvent", data)
+                        NativeAgentBridge.dispatch(eventType, payloadJson)
                     }
                 })
                 h.setNotifier(NativeNotifierImpl(context.applicationContext))
@@ -109,6 +110,7 @@ class NativeAgentPlugin : Plugin() {
                 }
                 h.persistConfig()
                 handle = h
+                NativeAgentBridge.setHandle(h)
                 context
                     .getSharedPreferences(STORAGE_FILE, android.content.Context.MODE_PRIVATE)
                     .edit()
@@ -530,6 +532,7 @@ class NativeAgentPlugin : Plugin() {
 
     override fun handleOnDestroy() {
         scope.cancel()
+        NativeAgentBridge.setHandle(null)
         handle = null
     }
 

package/ios/Sources/NativeAgentPlugin/NativeAgentBridge.swift

@@ -0,0 +1,64 @@
+import Foundation
+
+/// Listener protocol for in-process Swift code that wants to observe
+/// raw FFI events alongside the WebView listener. Mirrors the shape of
+/// the UniFFI-generated NativeEventCallback protocol but is registered
+/// through NativeAgentBridge instead of the FFI itself, so multiple
+/// consumers can subscribe at once.
+public protocol NativeEventListener: AnyObject {
+    func onEvent(eventType: String, payloadJson: String)
+}
+
+/// Process-wide accessor that exposes the live NativeAgentHandle and a
+/// multi-listener event fan-out to other modules in the same iOS
+/// process — most notably the STOMP transport in theshell.
+///
+/// The single FFI-side NativeEventCallback registered by NativeAgentPlugin
+/// (NativeAgentEventBridge in NativeAgentPlugin.swift) forwards every
+/// event into `dispatch` in addition to its existing notifyListeners
+/// call, so the WebView pipeline is byte-equivalent to before this
+/// bridge existed.
+///
+/// Listeners are strong-referenced by ObjectIdentifier; callers MUST
+/// call `removeNativeEventListener` when their lifecycle ends.
+public enum NativeAgentBridge {
+
+    private static let lock = NSLock()
+    private static var handleRef: NativeAgentHandle?
+    private static var listeners: [ObjectIdentifier: NativeEventListener] = [:]
+
+    /// The live FFI handle, or nil if NativeAgent has not been
+    /// initialized yet (or has been destroyed).
+    public static func handle() -> NativeAgentHandle? {
+        lock.lock()
+        defer { lock.unlock() }
+        return handleRef
+    }
+
+    public static func addNativeEventListener(_ listener: NativeEventListener) {
+        lock.lock()
+        defer { lock.unlock() }
+        listeners[ObjectIdentifier(listener)] = listener
+    }
+
+    public static func removeNativeEventListener(_ listener: NativeEventListener) {
+        lock.lock()
+        defer { lock.unlock() }
+        listeners.removeValue(forKey: ObjectIdentifier(listener))
+    }
+
+    internal static func setHandle(_ h: NativeAgentHandle?) {
+        lock.lock()
+        defer { lock.unlock() }
+        handleRef = h
+    }
+
+    internal static func dispatch(eventType: String, payloadJson: String) {
+        lock.lock()
+        let snapshot = Array(listeners.values)
+        lock.unlock()
+        for l in snapshot {
+            l.onEvent(eventType: eventType, payloadJson: payloadJson)
+        }
+    }
+}

package/ios/Sources/NativeAgentPlugin/NativeAgentPlugin.swift

@@ -66,6 +66,10 @@ public class NativeAgentPlugin: CAPPlugin, CAPBridgedPlugin {
 
     private var handle: NativeAgentHandle?
 
+    deinit {
+        NativeAgentBridge.setHandle(nil)
+    }
+
     // ── Helper ──────────────────────────────────────────────────────────────
 
     /// Resolves a `files://` prefixed path to an absolute iOS path
@@ -173,6 +177,7 @@ public class NativeAgentPlugin: CAPPlugin, CAPBridgedPlugin {
                 }
                 try h.persistConfig()
                 self.handle = h
+                NativeAgentBridge.setHandle(h)
                 UserDefaults.standard.set(
                     self.resolveConfigPath(workspacePath: resolvedWorkspacePath),
                     forKey: Self.configPathKey
@@ -837,5 +842,6 @@ class NativeAgentEventBridge: NativeEventCallback {
             "eventType": eventType,
             "payloadJson": payloadJson,
         ])
+        NativeAgentBridge.dispatch(eventType: eventType, payloadJson: payloadJson)
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-native-agent",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "description": "Native AI agent loop for Capacitor — runs LLM completions, tool execution, and cron jobs in native Rust, enabling background execution.",
   "main": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",