@craft-native/ios 0.0.99 → 0.0.101

package/dist/cli.js

@@ -390,12 +390,13 @@ async function init(options) {
   }
   const finalBundleId = bundleId || `com.craft.${name.toLowerCase()}`;
   const bundleIdPrefix = finalBundleId.split(".").slice(0, -1).join(".");
+  const given = Object.fromEntries(Object.entries(options.config ?? {}).filter(([, value]) => value !== undefined));
   const config = {
     ...DEFAULT_CONFIG,
     appName: displayName,
     bundleId: finalBundleId,
     teamId: teamId || "",
-    ...options.config
+    ...given
   };
   if (config.enableBackgroundLocation)
     config.enableGeolocation = true;

package/dist/index.d.ts

@@ -19,6 +19,8 @@ export interface CraftConfig {
     backgroundColor?: string;
     /** The launch and webview background while the phone is in Dark Mode. */
     backgroundColorDark?: string;
+    /** Edge-swipe back and forward through the page's history, pushState entries included. */
+    swipeNavigation?: boolean;
     enableSpeechRecognition?: boolean;
     enableHaptics?: boolean;
     enableShare?: boolean;

package/dist/index.js

@@ -385,12 +385,13 @@ async function init(options) {
   }
   const finalBundleId = bundleId || `com.craft.${name.toLowerCase()}`;
   const bundleIdPrefix = finalBundleId.split(".").slice(0, -1).join(".");
+  const given = Object.fromEntries(Object.entries(options.config ?? {}).filter(([, value]) => value !== undefined));
   const config = {
     ...DEFAULT_CONFIG,
     appName: displayName,
     bundleId: finalBundleId,
     teamId: teamId || "",
-    ...options.config
+    ...given
   };
   if (config.enableBackgroundLocation)
     config.enableGeolocation = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@craft-native/ios",
-  "version": "0.0.99",
+  "version": "0.0.101",
   "homepage": "https://github.com/craft-native/craft/tree/main/packages/ios#readme",
   "repository": {
     "type": "git",

package/templates/CraftApp.swift

@@ -337,17 +337,40 @@ class AppState: ObservableObject {
     @Published var config: CraftConfig
 
     init() {
-        // Load config from craft.config.json if available
         if let configURL = Bundle.main.url(forResource: "craft.config", withExtension: "json"),
-           let data = try? Data(contentsOf: configURL),
-           let config = try? JSONDecoder().decode(CraftConfig.self, from: data) {
-            self.config = config
+           let data = try? Data(contentsOf: configURL) {
+            self.config = CraftConfig.load(from: data)
         } else {
             self.config = CraftConfig()
         }
     }
 }
 
+extension CraftConfig {
+    /// The bundled config laid over the defaults, key by key.
+    ///
+    /// Decoded whole, one missing or mistyped key failed the entire file and
+    /// the app ran on `CraftConfig()` — every capability off, silently: the
+    /// network bridge refused, the page read that as offline, and nothing said
+    /// why. A key the file leaves out now keeps its default, and a file that
+    /// still cannot be read says so in the log.
+    static func load(from data: Data) -> CraftConfig {
+        let defaults = (try? JSONEncoder().encode(CraftConfig()))
+            .flatMap { try? JSONSerialization.jsonObject(with: $0) as? [String: Any] } ?? [:]
+        guard let given = (try? JSONSerialization.jsonObject(with: data)) as? [String: Any] else {
+            NSLog("[craft] craft.config.json is not a JSON object; running on defaults")
+            return CraftConfig()
+        }
+        let merged = defaults.merging(given.filter { !($0.value is NSNull) }) { _, bundled in bundled }
+        do {
+            return try JSONDecoder().decode(CraftConfig.self, from: JSONSerialization.data(withJSONObject: merged))
+        } catch {
+            NSLog("[craft] craft.config.json could not be read, running on defaults: %@", String(describing: error))
+            return CraftConfig()
+        }
+    }
+}
+
 // MARK: - Configuration
 struct CraftConfig: Codable {
     var appName: String = "Craft App"
@@ -359,6 +382,8 @@ struct CraftConfig: Codable {
     var backgroundColor: String = "#1a1a2e"
     /// The background while the phone is in Dark Mode; the light one if unset.
     var backgroundColorDark: String? = nil
+    /// Edge-swipe back and forward through the page's history.
+    var swipeNavigation: Bool? = nil
     var enableSpeechRecognition: Bool = false
     var enableHaptics: Bool = false
     var enableShare: Bool = false
@@ -512,6 +537,48 @@ final class BundledAssetSchemeHandler: NSObject, WKURLSchemeHandler {
     }
 }
 
+#if DEBUG
+/// Relays the page's console and uncaught errors to NSLog in debug builds.
+final class PageConsoleRelay: NSObject, WKScriptMessageHandler {
+    static let script = """
+    (function() {
+        var handler = window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.craftLog;
+        if (!handler) return;
+        function text(value) {
+            try { return typeof value === 'string' ? value : (value && value.stack) || JSON.stringify(value); }
+            catch (e) { return String(value); }
+        }
+        function send(level, message) { try { handler.postMessage({ level: level, message: String(message).slice(0, 4000) }); } catch (e) {} }
+        ['error', 'warn', 'log', 'info'].forEach(function(level) {
+            var original = console[level];
+            console[level] = function() {
+                send(level, Array.prototype.map.call(arguments, text).join(' '));
+                return original.apply(console, arguments);
+            };
+        });
+        // Capture phase: a script or stylesheet that fails to load fires its
+        // error on the element, which never bubbles to window.
+        window.addEventListener('error', function(event) {
+            var target = event.target;
+            if (target && target !== window && (target.src || target.href)) {
+                send('error', 'failed to load ' + (target.src || target.href));
+                return;
+            }
+            send('error', 'uncaught ' + event.message + ' at ' + event.filename + ':' + event.lineno + ':' + event.colno);
+        }, true);
+        window.addEventListener('unhandledrejection', function(event) {
+            send('error', 'unhandled rejection ' + text(event.reason));
+        });
+    })();
+    """
+
+    func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) {
+        guard let body = message.body as? [String: Any] else { return }
+        NSLog("[craft page] %@: %@", body["level"] as? String ?? "log", body["message"] as? String ?? "")
+    }
+}
+#endif
+
 struct CraftWebView: UIViewRepresentable {
     let config: CraftConfig
 
@@ -526,10 +593,25 @@ struct CraftWebView: UIViewRepresentable {
         let contentController = WKUserContentController()
         contentController.add(context.coordinator, name: "craft")
         webConfig.userContentController = contentController
+        #if DEBUG
+        // The page's errors and console, in the device log, so a debug build
+        // can be diagnosed from `log stream` or `simctl spawn … log show`
+        // without attaching Safari. A separate handler, outside the bridge's
+        // action dispatch. Never in a release build.
+        contentController.add(PageConsoleRelay(), name: "craftLog")
+        contentController.addUserScript(WKUserScript(source: PageConsoleRelay.script, injectionTime: .atDocumentStart, forMainFrameOnly: true))
+        #endif
 
         let webView = WKWebView(frame: .zero, configuration: webConfig)
         webView.navigationDelegate = context.coordinator
         webView.isOpaque = false
+        // An edge swipe goes back (and forward) through the page's history,
+        // pushState entries included, the way every iOS app's stack does.
+        webView.allowsBackForwardNavigationGestures = config.swipeNavigation ?? false
+        #if DEBUG
+        // Safari's Develop menu can attach to a debug build; never a release.
+        if #available(iOS 16.4, *) { webView.isInspectable = true }
+        #endif
 
         // Before any message can be offered. Zig evaluates every reply against
         // this webview, and without it an action would run, succeed, and reach
@@ -1301,7 +1383,7 @@ struct CraftWebView: UIViewRepresentable {
             case "requestHealthAuthorization":
                 if config.enableHealthKit {
                     let types = body["types"] as? [String] ?? []
-                    requestHealthAuthorization(types: types, callbackId: callbackId)
+                    requestHealthAuthorization(types: types, readOnly: body["readOnly"] as? Bool ?? false, callbackId: callbackId)
                 } else {
                     rejectCallback(callbackId, error: "HealthKit is disabled", code: "CAPABILITY_DISABLED")
                 }
@@ -3239,19 +3321,28 @@ struct CraftWebView: UIViewRepresentable {
                 var legacyNotifications = craft.notifications;
 
                 craft.contractVersion = '1.0.0';
+                // Actions answered by a person, through a system sheet they
+                // may take a minute to read. Thirty seconds of reading the
+                // HealthKit sheet used to fail the call while the sheet was
+                // still open; these wait for the answer instead.
+                var personFacing = {
+                    requestHealthAuthorization: true,
+                    requestPermission: true,
+                    signInWithApple: true
+                };
                 craft._invoke = function(action, payload) {
                     var self = craft;
                     var id = 'cb_' + (++self._callbackId);
                     var message = Object.assign({}, payload || {}, {action: action, callbackId: id});
                     window.webkit.messageHandlers.craft.postMessage(message);
                     return new Promise(function(resolve, reject) {
-                        var timeout = setTimeout(function() {
+                        var timeout = personFacing[action] ? null : setTimeout(function() {
                             delete self._callbacks[id];
                             reject(new Error('Craft bridge timed out: ' + action));
                         }, 30000);
                         self._callbacks[id] = {
-                            resolve: function(value) { clearTimeout(timeout); resolve(value); },
-                            reject: function(error) { clearTimeout(timeout); reject(error); }
+                            resolve: function(value) { if (timeout) clearTimeout(timeout); resolve(value); },
+                            reject: function(error) { if (timeout) clearTimeout(timeout); reject(error); }
                         };
                     });
                 };
@@ -3387,7 +3478,9 @@ struct CraftWebView: UIViewRepresentable {
                     readRecording: function() { return craft._invoke('readLocationRecording'); }
                 };
                 craft.health = {
-                    requestAuthorization: function(types) { return craft._invoke('requestHealthAuthorization', {types: types || []}); },
+                    requestAuthorization: function(types, options) {
+                        return craft._invoke('requestHealthAuthorization', {types: types || [], readOnly: Boolean(options && options.write === false)});
+                    },
                     getData: function(type, options) {
                         options = options || {};
                         return craft._invoke('getHealthData', {type: type, startDate: options.startDate, endDate: options.endDate});
@@ -5125,7 +5218,7 @@ struct CraftWebView: UIViewRepresentable {
         }
 
         // MARK: - Health
-        private func requestHealthAuthorization(types: [String], callbackId: String?) {
+        private func requestHealthAuthorization(types: [String], readOnly: Bool = false, callbackId: String?) {
             guard let healthStore = healthStore else {
                 rejectCallback(callbackId, error: "HealthKit not available")
                 return
@@ -5188,6 +5281,9 @@ struct CraftWebView: UIViewRepresentable {
                 }
             }
 
+            // A page that only reads asks only to read: the sheet then says
+            // "access", not "access and update".
+            if readOnly { shareTypes.removeAll() }
             healthStore.requestAuthorization(toShare: shareTypes, read: readTypes) { [weak self] success, error in
                 if success {
                     self?.resolveCallback(callbackId, result: true)