craft-native 0.0.340 → 0.0.341

package/dist/android/templates/CraftNativeCapabilities.kt.template

@@ -37,6 +37,7 @@ import java.net.URLConnection
 import java.util.UUID
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.Executors
+import java.util.concurrent.atomic.AtomicBoolean
 import kotlin.math.max
 import kotlin.math.roundToInt
 
@@ -86,6 +87,7 @@ internal class CraftNativeCapabilities(
     private val databaseExecutor = Executors.newSingleThreadExecutor()
     private val networkExecutor = Executors.newCachedThreadPool()
     private val cancelled = ConcurrentHashMap.newKeySet<String>()
+    private val closed = AtomicBoolean(false)
     private val fetchConnections = ConcurrentHashMap<String, HttpURLConnection>()
     private val fileRoot by lazy { File(context.cacheDir, "craft-files").apply { mkdirs() } }
     private var pendingFilePick: PendingFilePick? = null
@@ -135,6 +137,10 @@ internal class CraftNativeCapabilities(
         args: JSONArray,
         completion: (CraftNativeCapabilityResult) -> Unit,
     ) {
+        if (closed.get()) {
+            mainHandler.post { completion(failure("HOST_CLOSED", "The native capability host is closed")) }
+            return
+        }
         cancelled.remove(requestToken)
         if (version != CRAFT_NATIVE_CAPABILITY_PROTOCOL_VERSION) {
             complete(requestToken, failure("UNSUPPORTED_VERSION", "Unsupported native capability protocol version"), completion)
@@ -150,6 +156,7 @@ internal class CraftNativeCapabilities(
                 else bluetooth.perform(method, args) { complete(requestToken, it, completion) }
             }
             "Storage" -> mainHandler.post {
+                if (cancelled.remove(requestToken) || closed.get()) return@post
                 val answer = runCatching { storage(method, args) }
                     .getOrElse { failure("STORAGE_ERROR", it.message ?: "Storage operation failed") }
                 complete(requestToken, answer, completion)
@@ -199,6 +206,8 @@ internal class CraftNativeCapabilities(
     }
 
     fun close() {
+        if (!closed.compareAndSet(false, true)) return
+        cancelled.clear()
         if (config.optBoolean("enableBluetooth")) bluetooth.disconnect()
         databaseExecutor.shutdownNow()
         networkExecutor.shutdownNow()
@@ -653,9 +662,9 @@ internal class CraftNativeCapabilities(
         completion: (CraftNativeCapabilityResult) -> Unit,
     ) {
         if (android.os.Looper.myLooper() == android.os.Looper.getMainLooper()) {
-            if (!cancelled.remove(requestToken)) completion(result)
+            if (!cancelled.remove(requestToken) && !closed.get()) completion(result)
         } else mainHandler.post {
-            if (!cancelled.remove(requestToken)) completion(result)
+            if (!cancelled.remove(requestToken) && !closed.get()) completion(result)
         }
     }
 

package/dist/cli.js

@@ -3022,7 +3022,7 @@ function pinCraftNativeDependency(packagePath, craftVersion) {
 `);
 }
 // package.json
-var version = "0.0.340";
+var version = "0.0.341";
 
 // bin/cli.ts
 var spawnedFrom = process6.env[CRAFT_CLI_SPAWN_MARKER];

package/dist/index.cjs

@@ -375,7 +375,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.340";
+var version = "0.0.341";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

package/dist/index.js

@@ -117,7 +117,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.340";
+var version = "0.0.341";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

package/dist/ios/templates/CraftNativeActions.swift

@@ -203,7 +203,13 @@ enum CraftNativeActions {
         case ("Clipboard", "read"):
             sync = perform(action: "clipboardRead", body: [:], config: config)
         case ("Storage", _):
-            DispatchQueue.main.async { complete(requestToken, storage(method: method, args: args), completion) }
+            DispatchQueue.main.async {
+                cancellationLock.lock()
+                let cancelled = cancelledRequests.remove(requestToken) != nil
+                cancellationLock.unlock()
+                guard !cancelled else { return }
+                complete(requestToken, storage(method: method, args: args), completion)
+            }
             return
         case ("SecureStorage", _):
             guard config.enableSecureStorage else {

package/dist/ios/templates/CraftNativeScreen.swift

@@ -15,6 +15,45 @@ import UIKit
 
 private let craftNativeCapabilityTimeoutMilliseconds = 30_000
 
+/// A retained JavaScript context must lose synchronous storage access when
+/// its screen closes. Only the actual synchronous unmount callback may finish
+/// its cleanup; queued script work runs after that allowance ends.
+private final class CraftNativeStorageLifetime {
+    private let lock = NSLock()
+    private var closed = false
+    private var unmounting = false
+
+    func close() {
+        lock.lock()
+        closed = true
+        lock.unlock()
+    }
+
+    func unmount(_ work: () -> Void) {
+        lock.lock()
+        unmounting = true
+        lock.unlock()
+        defer {
+            lock.lock()
+            unmounting = false
+            lock.unlock()
+        }
+        work()
+    }
+
+    func access<T>(closedValue: T, _ work: () -> T) -> T {
+        lock.lock()
+        defer { lock.unlock() }
+        guard !closed || unmounting else {
+            if let context = JSContext.current() {
+                context.exception = JSValue(newErrorFromMessage: "SCREEN_CLOSED: The native screen is closed", in: context)
+            }
+            return closedValue
+        }
+        return work()
+    }
+}
+
 /// Foundation's `NSNumber(0/1) is Bool` is true even for JSON numbers.
 /// Check the Core Foundation identity so real booleans stay invalid numeric
 /// props while zero lengths, flex factors and opacity 1 remain numbers.
@@ -5751,6 +5790,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
     weak var hybridEvents: CraftHybridScreenEvents?
     private var hybridRendered = false
     private var runtimeDisposed = false
+    private let storageLifetime = CraftNativeStorageLifetime()
     /// The app script (`nativeApp`, CraftHybrid.swift): a bundle route with
     /// no screen, loaded once and never shown, that runs for the app's life.
     /// It hears every `APP_STATE` and the app's events (`CRAFT_EVENT`), no
@@ -5998,6 +6038,11 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
     private func disposeRuntime() {
         guard !runtimeDisposed else { return }
         runtimeDisposed = true
+        storageLifetime.close()
+        pendingCapabilityDeadlines.values.forEach { $0.cancel() }
+        pendingCapabilityDeadlines.removeAll()
+        pendingCapabilityRequests.forEach { CraftNativeActions.cancel(requestToken: $0) }
+        pendingCapabilityRequests.removeAll()
         if let owner = voiceRecordingOwner {
             voiceRecordingOwner = nil
             CraftVoiceRecording.shared.perform(method: "cancel", args: [owner]) { _ in }
@@ -6007,7 +6052,10 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         disposeRenderedTree()
         let context = jsContext
         let route = routeName ?? "screen"
-        CraftNativeScriptThread.run(label: "unmount \(route)") { context.objectForKeyedSubscript("__stxNativeUnmount")?.call(withArguments: []) }
+        let storageLifetime = self.storageLifetime
+        CraftNativeScriptThread.run(label: "unmount \(route)") {
+            storageLifetime.unmount { context.objectForKeyedSubscript("__stxNativeUnmount")?.call(withArguments: []) }
+        }
         audio.close()
         sounds.close()
         streams.close()
@@ -6469,17 +6517,22 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         let log: @convention(block) (String, String, String) -> Void = { level, category, message in
             CraftNativeConsole.write(level, category: category, message: message)
         }
+        let storageLifetime = self.storageLifetime
         let storageGet: @convention(block) (String) -> String? = { key in
-            do { return try CraftNativeActions.storageJSON(forKey: key) }
-            catch {
-                if let context = JSContext.current() {
-                    context.exception = JSValue(newErrorFromMessage: "STORAGE_ERROR: Unable to read stored value", in: context)
+            storageLifetime.access(closedValue: nil) {
+                do { return try CraftNativeActions.storageJSON(forKey: key) }
+                catch {
+                    if let context = JSContext.current() {
+                        context.exception = JSValue(newErrorFromMessage: "STORAGE_ERROR: Unable to read stored value", in: context)
+                    }
+                    return nil
                 }
-                return nil
             }
         }
         let storageSet: @convention(block) (String, JSValue) -> Bool = { key, value in
-            CraftNativeActions.setStorageJSON(value.isNull || value.isUndefined ? nil : value.toString(), forKey: key)
+            storageLifetime.access(closedValue: false) {
+                CraftNativeActions.setStorageJSON(value.isNull || value.isUndefined ? nil : value.toString(), forKey: key)
+            }
         }
         let snapshotGet: @convention(block) (String) -> String? = { name in
             CraftSnapshots.read(name)
@@ -7613,6 +7666,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
                 navigationController?.popToRootViewController(animated: true)
             }
         case "API_REQUEST":
+            guard !runtimeDisposed else { return }
             guard let id = message["id"] as? String else { return }
             let args = payload["args"] as? [Any] ?? []
             let requestToken = "\(capabilityScope)/\(id)"
@@ -7682,7 +7736,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         case "API_CANCEL":
             guard let id = payload["requestId"] as? String else { return }
             let requestToken = "\(capabilityScope)/\(id)"
-            pendingCapabilityRequests.remove(requestToken)
+            guard pendingCapabilityRequests.remove(requestToken) != nil else { return }
             pendingCapabilityDeadlines.removeValue(forKey: requestToken)?.cancel()
             screenRequestCancellers.removeValue(forKey: requestToken)?()
             CraftNativeActions.cancel(requestToken: requestToken)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "craft-native",
-  "version": "0.0.340",
+  "version": "0.0.341",
   "type": "module",
   "description": "Build desktop apps with web languages - TypeScript SDK for Craft",
   "author": "Chris Breuer <chris@stacksjs.org>",