capacitor-mobilecron 0.2.23 → 0.2.24

package/CapacitorMobilecron.podspec

@@ -15,5 +15,6 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '14.0'
 
   s.dependency 'Capacitor'
+  s.dependency 'CapacitorNativeAgent'
   s.swift_version = '5.9'
 end

package/Package.swift

@@ -11,14 +11,16 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "8.0.0")
+        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "8.0.0"),
+        .package(path: "../capacitor-native-agent")
     ],
     targets: [
         .target(
             name: "MobileCronPlugin",
             dependencies: [
                 .product(name: "Capacitor", package: "capacitor-swift-pm"),
-                .product(name: "Cordova", package: "capacitor-swift-pm")
+                .product(name: "Cordova", package: "capacitor-swift-pm"),
+                .product(name: "CapacitorNativeAgent", package: "capacitor-native-agent")
             ],
             path: "ios/Plugin",
             exclude: ["MobileCronPlugin.m"]

package/android/build.gradle

@@ -37,6 +37,7 @@ repositories {
 
 dependencies {
     implementation project(':capacitor-android')
+    compileOnly project(':capacitor-native-agent')
     implementation "org.jetbrains.kotlin:kotlin-stdlib"
     implementation "androidx.work:work-runtime-ktx:2.9.0"
     testImplementation "junit:junit:$junitVersion"

package/android/src/main/java/io/mobilecron/CronWorker.kt

@@ -10,7 +10,10 @@ class CronWorker(
 ) : CoroutineWorker(appContext, params) {
     override suspend fun doWork(): Result {
         NativeJobEvaluator.evaluate(applicationContext, "workmanager")
-        CronBridge.wake("workmanager")
+        val handledNatively = NativeAgentBridge.handleWake(applicationContext, "workmanager")
+        if (!handledNatively) {
+            CronBridge.wake("workmanager")
+        }
         return Result.success()
     }
 }

package/android/src/main/java/io/mobilecron/NativeAgentBridge.kt

@@ -0,0 +1,67 @@
+package io.mobilecron
+
+import android.content.Context
+import com.t6x.plugins.nativeagent.MemoryProviderImpl
+import com.t6x.plugins.nativeagent.NativeNotifierImpl
+import java.util.concurrent.atomic.AtomicBoolean
+import uniffi.native_agent_ffi.NativeAgentHandle
+import uniffi.native_agent_ffi.createHandleFromPersistedConfig
+
+object NativeAgentBridge {
+    private const val STORAGE_FILE = "CapacitorStorage"
+    private const val CONFIG_PATH_KEY = "mobilecron:native-agent-config-path"
+
+    @Volatile
+    private var handle: NativeAgentHandle? = null
+    private val libraryLoaded = AtomicBoolean(false)
+
+    fun handleWake(context: Context, source: String): Boolean {
+        return runCatching {
+            val agentHandle = getOrCreateHandle(context) ?: return false
+            agentHandle.handleWake(source)
+            true
+        }.getOrDefault(false)
+    }
+
+    private fun getOrCreateHandle(context: Context): NativeAgentHandle? {
+        handle?.let { return it }
+        synchronized(this) {
+            handle?.let { return it }
+            ensureLibraryLoaded()
+            val configPath = context
+                .getSharedPreferences(STORAGE_FILE, Context.MODE_PRIVATE)
+                .getString(CONFIG_PATH_KEY, null)
+                ?: return null
+
+            val agentHandle = runCatching {
+                createHandleFromPersistedConfig(configPath)
+            }.getOrNull() ?: return null
+
+            runCatching {
+                agentHandle.setNotifier(NativeNotifierImpl(context.applicationContext))
+            }
+            runCatching {
+                val memoryProvider = MemoryProviderImpl(context.applicationContext)
+                if (memoryProvider.isAvailable()) {
+                    agentHandle.setMemoryProvider(memoryProvider)
+                }
+            }
+
+            handle = agentHandle
+            return agentHandle
+        }
+    }
+
+    private fun ensureLibraryLoaded() {
+        if (libraryLoaded.get()) {
+            return
+        }
+        synchronized(libraryLoaded) {
+            if (libraryLoaded.get()) {
+                return
+            }
+            System.loadLibrary("native_agent_ffi")
+            libraryLoaded.set(true)
+        }
+    }
+}

package/ios/Plugin/BGTaskManager.swift

@@ -63,7 +63,9 @@ final class BGTaskManager {
             task.setTaskCompleted(success: false)
         }
         _ = NativeJobEvaluator.evaluate(source: "bgtask_refresh")
-        plugin?.handleBackgroundWake(source: "bgtask_refresh")
+        if !NativeAgentBridge.shared.handleWake("bgtask_refresh") {
+            plugin?.handleBackgroundWake(source: "bgtask_refresh")
+        }
         task.setTaskCompleted(success: true)
     }
 
@@ -74,7 +76,9 @@ final class BGTaskManager {
             task.setTaskCompleted(success: false)
         }
         _ = NativeJobEvaluator.evaluate(source: "bgtask_processing")
-        plugin?.handleBackgroundWake(source: "bgtask_processing")
+        if !NativeAgentBridge.shared.handleWake("bgtask_processing") {
+            plugin?.handleBackgroundWake(source: "bgtask_processing")
+        }
         task.setTaskCompleted(success: true)
     }
 }

package/ios/Plugin/NativeAgentBridge.swift

@@ -0,0 +1,62 @@
+import Foundation
+
+#if canImport(CapacitorNativeAgent)
+import CapacitorNativeAgent
+#elseif canImport(NativeAgentPlugin)
+import NativeAgentPlugin
+#endif
+
+#if canImport(CapacitorNativeAgent) || canImport(NativeAgentPlugin)
+final class NativeAgentBridge {
+    static let shared = NativeAgentBridge()
+
+    private let configPathKey = "mobilecron:native-agent-config-path"
+    private let lock = NSLock()
+    private var handle: NativeAgentHandle?
+
+    func handleWake(_ source: String) -> Bool {
+        guard let handle = getOrCreateHandle() else {
+            return false
+        }
+        do {
+            try handle.handleWake(source: source)
+            return true
+        } catch {
+            return false
+        }
+    }
+
+    private func getOrCreateHandle() -> NativeAgentHandle? {
+        lock.lock()
+        defer { lock.unlock() }
+
+        if let handle {
+            return handle
+        }
+
+        guard let configPath = UserDefaults.standard.string(forKey: configPathKey) else {
+            return nil
+        }
+
+        do {
+            let handle = try createHandleFromPersistedConfig(configPath: configPath)
+            try handle.setNotifier(notifier: NativeNotifierImpl())
+            if let memoryProvider = MemoryProviderImpl.makeIfAvailable() {
+                try handle.setMemoryProvider(provider: memoryProvider)
+            }
+            self.handle = handle
+            return handle
+        } catch {
+            return nil
+        }
+    }
+}
+#else
+final class NativeAgentBridge {
+    static let shared = NativeAgentBridge()
+
+    func handleWake(_ source: String) -> Bool {
+        false
+    }
+}
+#endif

package/ios/Plugin/NativeJobEvaluator.swift

@@ -142,7 +142,7 @@ final class NativeJobEvaluator {
         return firedEvents
     }
 
-    private static func computeNextDueAt(schedule: [String: Any]?, nowMs: Int64) -> Int64? {
+    static func computeNextDueAt(schedule: [String: Any]?, nowMs: Int64) -> Int64? {
         guard let schedule else { return nil }
         switch scheduleKind(schedule) {
         case "at":
@@ -171,7 +171,7 @@ final class NativeJobEvaluator {
         return nil
     }
 
-    private static func isWithinActiveHours(activeHours: [String: Any], nowMs: Int64) -> Bool {
+    static func isWithinActiveHours(activeHours: [String: Any], nowMs: Int64) -> Bool {
         guard let startValue = activeHours["start"] as? String,
               let endValue = activeHours["end"] as? String,
               let start = parseClock(startValue),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-mobilecron",
-  "version": "0.2.23",
+  "version": "0.2.24",
   "description": "Capacitor scheduling primitive that emits job due events across web, Android, and iOS",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",