craft-native 0.0.118 → 0.0.120

package/dist/ios/templates/CraftNativeScreen.swift

@@ -3,6 +3,8 @@ import JavaScriptCore
 import SwiftUI
 import UIKit
 
+private let craftNativeCapabilityTimeoutMilliseconds = 30_000
+
 /// A WebView-free host for the first stx-native vertical slice. The bundled
 /// JavaScript sends whole, compiled view trees to UIKit and receives control
 /// events and Craft API replies through JavaScriptCore.
@@ -83,6 +85,11 @@ final class CraftNativeScreenController: UIViewController {
     private var flatListRows: [ObjectIdentifier: [String: RenderedNode]] = [:]
     private var flatListOwners: [String: String] = [:]
     private let mutationDocument = CraftNativeMutationDocument()
+    private let capabilityScope = UUID().uuidString
+    private var pendingCapabilityRequests = Set<String>()
+    private var pendingCapabilityDeadlines: [String: DispatchWorkItem] = [:]
+    private var lifecycleObservers: [NSObjectProtocol] = []
+    private var deepLinkListener: UUID?
 
     init(config: CraftConfig, routeName: String? = nil, routeParams: [String: Any] = [:]) {
         self.config = config
@@ -97,6 +104,10 @@ final class CraftNativeScreenController: UIViewController {
 
     deinit {
         imageTasks.values.forEach { $0.cancel() }
+        pendingCapabilityDeadlines.values.forEach { $0.cancel() }
+        pendingCapabilityRequests.forEach { CraftNativeActions.cancel(requestToken: $0) }
+        lifecycleObservers.forEach(NotificationCenter.default.removeObserver)
+        if let deepLinkListener = deepLinkListener { DeepLinkManager.shared.removeNativeListener(deepLinkListener) }
     }
 
     override func viewDidLoad() {
@@ -116,6 +127,7 @@ final class CraftNativeScreenController: UIViewController {
         ])
         setupJavaScript()
         loadBundle()
+        observeNativeEvents()
     }
 
     private func setupJavaScript() {
@@ -130,10 +142,18 @@ final class CraftNativeScreenController: UIViewController {
             self?.receive(json)
         }
         jsContext.setObject(postMessage, forKeyedSubscript: "craftNativePostMessage" as NSString)
+        let capabilities = CraftNativeActions.capabilities(config: config)
+        let capabilityData = try? JSONSerialization.data(withJSONObject: capabilities)
+        let capabilityJSON = capabilityData.flatMap { String(data: $0, encoding: .utf8) } ?? "[]"
         jsContext.evaluateScript("""
             globalThis.__stxNativeCallback = null;
             globalThis.__stxNativeBridge = {
+                platform: "ios",
                 mutationProtocolVersion: 1,
+                capabilityProtocolVersion: \(craftNativeCapabilityProtocolVersion),
+                capabilityTimeoutMs: \(craftNativeCapabilityTimeoutMilliseconds),
+                capabilities: \(capabilityJSON),
+                initialAppState: "\(CraftNativeActions.currentAppState())",
                 postMessage: function(message) { craftNativePostMessage(message); },
                 onMessage: function(callback) { globalThis.__stxNativeCallback = callback; }
             };
@@ -156,6 +176,31 @@ final class CraftNativeScreenController: UIViewController {
         }
     }
 
+    private func observeNativeEvents() {
+        func observe(_ name: Notification.Name, state: String) {
+            lifecycleObservers.append(NotificationCenter.default.addObserver(
+                forName: name,
+                object: nil,
+                queue: .main
+            ) { [weak self] _ in self?.sendAppState(state) })
+        }
+        observe(UIApplication.didBecomeActiveNotification, state: "active")
+        observe(UIApplication.willResignActiveNotification, state: "inactive")
+        observe(UIApplication.didEnterBackgroundNotification, state: "background")
+        sendAppState(CraftNativeActions.currentAppState())
+        deepLinkListener = DeepLinkManager.shared.addNativeListener { [weak self] url, initial in
+            guard let self = self, self.navigationController?.topViewController === self else { return }
+            var payload = CraftNativeActions.deepLinkData(url)
+            payload["initial"] = initial
+            self.send(type: "DEEP_LINK", payload: payload)
+        }
+    }
+
+    private func sendAppState(_ state: String) {
+        guard navigationController?.topViewController === self else { return }
+        send(type: "APP_STATE", payload: ["state": state])
+    }
+
     private func showError(_ message: String) {
         let label = UILabel()
         label.numberOfLines = 0
@@ -219,30 +264,56 @@ final class CraftNativeScreenController: UIViewController {
         case "API_REQUEST":
             guard let id = message["id"] as? String else { return }
             let args = payload["args"] as? [Any] ?? []
-            let route: (action: String, body: [String: Any])?
-            switch (payload["module"] as? String, payload["method"] as? String) {
-            case ("Device", "getInfo"):
-                route = ("getDeviceInfo", [:])
-            case ("Haptics", "impact"):
-                route = ("haptic", ["style": args.first ?? NSNull()])
-            case ("Clipboard", "write"):
-                route = ("clipboardWrite", ["text": args.first ?? NSNull()])
-            case ("Clipboard", "read"):
-                route = ("clipboardRead", [:])
-            default:
-                route = nil
-            }
-            guard let route = route,
-                  let answer = CraftNativeActions.perform(action: route.action, body: route.body, config: config) else {
-                send(type: "API_ERROR", payload: ["requestId": id, "code": "UNKNOWN_ACTION", "message": "Unsupported native API"], correlationId: id)
-                return
+            let requestToken = "\(capabilityScope)/\(id)"
+            pendingCapabilityRequests.insert(requestToken)
+            let deadline = DispatchWorkItem { [weak self] in
+                guard let self = self, self.pendingCapabilityRequests.remove(requestToken) != nil else { return }
+                self.pendingCapabilityDeadlines.removeValue(forKey: requestToken)
+                CraftNativeActions.cancel(requestToken: requestToken)
+                self.send(type: "API_ERROR", payload: [
+                    "version": craftNativeCapabilityProtocolVersion,
+                    "requestId": id,
+                    "code": "TIMEOUT",
+                    "message": "Native API request timed out",
+                ], correlationId: id)
             }
-            switch answer {
-            case .success(let data):
-                send(type: "API_RESPONSE", payload: ["requestId": id, "data": data], correlationId: id)
-            case .failure(let error):
-                send(type: "API_ERROR", payload: ["requestId": id, "code": error.code, "message": error.message], correlationId: id)
+            pendingCapabilityDeadlines[requestToken] = deadline
+            DispatchQueue.main.asyncAfter(
+                deadline: .now() + .milliseconds(craftNativeCapabilityTimeoutMilliseconds),
+                execute: deadline
+            )
+            CraftNativeActions.perform(
+                requestToken: requestToken,
+                version: payload["version"] as? Int ?? craftNativeCapabilityProtocolVersion,
+                module: payload["module"] as? String ?? "",
+                method: payload["method"] as? String ?? "",
+                args: args,
+                config: config
+            ) { [weak self] answer in
+                guard let self = self, self.pendingCapabilityRequests.remove(requestToken) != nil else { return }
+                self.pendingCapabilityDeadlines.removeValue(forKey: requestToken)?.cancel()
+                switch answer {
+                case .success(let data):
+                    self.send(type: "API_RESPONSE", payload: [
+                        "version": craftNativeCapabilityProtocolVersion,
+                        "requestId": id,
+                        "data": data,
+                    ], correlationId: id)
+                case .failure(let error):
+                    self.send(type: "API_ERROR", payload: [
+                        "version": craftNativeCapabilityProtocolVersion,
+                        "requestId": id,
+                        "code": error.code,
+                        "message": error.message,
+                    ], correlationId: id)
+                }
             }
+        case "API_CANCEL":
+            guard let id = payload["requestId"] as? String else { return }
+            let requestToken = "\(capabilityScope)/\(id)"
+            pendingCapabilityRequests.remove(requestToken)
+            pendingCapabilityDeadlines.removeValue(forKey: requestToken)?.cancel()
+            CraftNativeActions.cancel(requestToken: requestToken)
         default:
             break
         }

package/dist/ios/templates/Info.plist.template

@@ -43,6 +43,7 @@
     <false/>
 {{USAGE_DESCRIPTIONS}}
 {{URL_TYPES}}
+{{APP_BOUND_DOMAINS}}
 {{BACKGROUND_MODES}}
 {{LIVE_ACTIVITY_SUPPORT}}
     <key>NSAppTransportSecurity</key>

package/dist/mobile.js

@@ -326,6 +326,17 @@ var secureStorage = {
       throw new Error("Craft secure storage bridge is unavailable");
     localStorage.removeItem(`secure_${key}`);
   },
+  async remove(key) {
+    const craft = getCraftMobile();
+    if (typeof window !== "undefined" && craft?.secureStorage) {
+      if (typeof craft.secureStorage.remove === "function")
+        return craft.secureStorage.remove(key);
+      return craft.secureStorage.delete(key);
+    }
+    if (typeof window !== "undefined" && window.craft)
+      throw new Error("Craft secure storage bridge is unavailable");
+    localStorage.removeItem(`secure_${key}`);
+  },
   async clear() {
     const craft = getCraftMobile();
     if (typeof window !== "undefined" && craft?.secureStorage) {
@@ -525,6 +536,20 @@ var notifications = {
     }
     throw new Error("Scheduled notifications not available in web");
   },
+  async cancel(id) {
+    const craft = getCraftMobile();
+    if (typeof window !== "undefined" && craft?.notifications) {
+      return craft.notifications.cancel(id);
+    }
+    throw new Error("Scheduled notifications not available in web");
+  },
+  async pending() {
+    const craft = getCraftMobile();
+    if (typeof window !== "undefined" && craft?.notifications) {
+      return craft.notifications.pending();
+    }
+    return [];
+  },
   async cancelAll() {
     const craft = getCraftMobile();
     if (typeof window !== "undefined" && craft?.notifications) {

package/package.json

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