craft-native 0.0.244 → 0.0.246

package/dist/ios/templates/CraftWebAudio.swift

@@ -1376,23 +1376,32 @@ final class CraftWebAudio {
     /// JavaScript, before its bundle runs.
     func install(in context: JSContext) {
         script = context
+        // The graph lives on the main thread. A script on its own thread
+        // (CraftNativeScriptThread) reaches it there, waiting for the answer
+        // its synchronous calls return; arguments are read off the JSValues
+        // where the script runs.
         let open: @convention(block) (Int, Double) -> NSDictionary? = { [weak self] id, rate in
-            self?.open(id, requestedRate: rate) as NSDictionary?
+            CraftNativeScriptThread.onMain { self?.open(id, requestedRate: rate) as NSDictionary? }
         }
         let send: @convention(block) (JSValue) -> Void = { [weak self] batch in
-            self?.receive(batch.toArray() ?? [])
+            let commands = batch.toArray() ?? []
+            CraftNativeScriptThread.onMain { self?.receive(commands) }
         }
         let time: @convention(block) (Int) -> Double = { [weak self] id in
-            self?.contexts[id]?.graph.currentTime ?? 0
+            CraftNativeScriptThread.onMain { self?.contexts[id]?.graph.currentTime ?? 0 }
         }
         let read: @convention(block) (Int, Int, String) -> Double = { [weak self] contextId, nodeId, key in
-            self?.read(contextId, nodeId, key) ?? .nan
+            CraftNativeScriptThread.onMain { self?.read(contextId, nodeId, key) ?? .nan }
         }
         let state: @convention(block) (Int, String) -> Bool = { [weak self] id, state in
-            self?.setState(id, state) ?? false
+            CraftNativeScriptThread.onMain { self?.setState(id, state) ?? false }
         }
         let buffer: @convention(block) (Int, Double, Int, JSValue) -> Bool = { [weak self] id, rate, length, channels in
-            self?.storeBuffer(id, rate, length, channels) ?? false
+            // The samples are copied out of the script's typed arrays where
+            // the script runs, then kept beside the graph.
+            guard let data = Self.copyBuffer(rate, length, channels) else { return false }
+            CraftNativeScriptThread.onMain { self?.buffers[id] = data }
+            return true
         }
         context.setObject(open, forKeyedSubscript: "craftNativeAudioOpen" as NSString)
         context.setObject(send, forKeyedSubscript: "craftNativeAudioSend" as NSString)
@@ -1637,10 +1646,10 @@ final class CraftWebAudio {
     }
 
     /// An AudioBuffer's channels, copied straight out of its Float32Arrays.
-    private func storeBuffer(_ id: Int, _ rate: Double, _ length: Int, _ channels: JSValue) -> Bool {
-        guard length > 0, rate > 0, let context = JSContext.current() else { return false }
+    private static func copyBuffer(_ rate: Double, _ length: Int, _ channels: JSValue) -> CraftAudioBufferData? {
+        guard length > 0, rate > 0, let context = JSContext.current() else { return nil }
         let count = Int(channels.objectForKeyedSubscript("length")?.toInt32() ?? 0)
-        guard count > 0 else { return false }
+        guard count > 0 else { return nil }
         let data = CraftAudioBufferData(sampleRate: rate, length: length, channelCount: count)
         let script = context.jsGlobalContextRef
         for index in 0..<count {
@@ -1651,8 +1660,7 @@ final class CraftWebAudio {
             let available = JSObjectGetTypedArrayLength(script, object, nil)
             data.channels[index].update(from: bytes.assumingMemoryBound(to: Float.self), count: min(length, available))
         }
-        buffers[id] = data
-        return true
+        return data
     }
 
     // MARK: Notices
@@ -1675,8 +1683,8 @@ final class CraftWebAudio {
                 }
             }
         }
-        guard !ended.isEmpty else { return }
-        script?.objectForKeyedSubscript("__craftNativeAudioEvents")?.call(withArguments: [ended])
+        guard !ended.isEmpty, let script else { return }
+        CraftNativeScriptThread.run { script.objectForKeyedSubscript("__craftNativeAudioEvents")?.call(withArguments: [ended]) }
     }
 
     // MARK: Tests

package/dist/mobile-testing.js

@@ -188,9 +188,12 @@ ${await Bun.file(join(fixtures, "media-cache.swift.fixture")).text()}`);
       if (!/^emulator-\d+$/.test(serial))
         throw new Error("Select a disposable Android emulator with ANDROID_SERIAL");
       const shell = await Bun.file(join(root, "android/templates/CraftNativeShell.kt.template")).text();
-      const media = shell.match(/internal object CraftNativeMedia \{[\s\S]*?\n\}/)?.[0];
-      if (!media)
+      const pieces = ["internal object CraftNativeMedia {", "internal class CraftResumableDownload(", "internal class CraftNativeMediaWorker("].map((start) => shell.match(new RegExp(`${start.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}[\\s\\S]*?\\n\\}`))?.[0]);
+      if (pieces.some((piece) => !piece))
         throw new Error("Android media implementation missing");
+      const media = pieces.join(`
+
+`);
       const android = join(scratch, "android");
       const app = join(android, "app");
       const sources = join(app, "src/main/java/dev/craft/mediaprobe");
@@ -214,15 +217,18 @@ android { namespace = "${packageName}";
   targetSdk = 35 };
   compileOptions { sourceCompatibility = JavaVersion.VERSION_17;
   targetCompatibility = JavaVersion.VERSION_17 };
-  kotlinOptions { jvmTarget = "17" } }`);
+  kotlinOptions { jvmTarget = "17" } }
+dependencies { implementation("androidx.work:work-runtime-ktx:2.9.1") }`);
       await Bun.write(join(app, "src/main/AndroidManifest.xml"), `<manifest xmlns:android="http://schemas.android.com/apk/res/android"><uses-permission android:name="android.permission.INTERNET"/><uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/><application android:usesCleartextTraffic="true" android:label="HQ Download Probe"/><instrumentation android:name=".DownloadProbe" android:targetPackage="${packageName}"/></manifest>`);
       await Bun.write(join(sources, "DownloadProbe.kt"), `package ${packageName}
 import android.content.Context
+import android.content.SharedPreferences
 import android.net.Uri
 import android.os.Handler
 import android.os.Looper
 import org.json.JSONObject
 import java.io.File
+import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.Executors
 internal data class CraftNativeCapabilityResult(val data: Any? = null, val code: String? = null, val message: String? = null)
 ${media}

package/dist/mobile.js

@@ -355,6 +355,32 @@ var secureStorage = {
     Object.keys(localStorage).filter((k) => k.startsWith("secure_")).forEach((k) => localStorage.removeItem(k));
   }
 };
+var SESSION_EVENT = "craftsession";
+var SESSION_MESSAGE = "SESSION_CHANGED";
+var DEFAULT_SESSION_TOKEN_KEY = "auth.token";
+var sessionToken = (value) => typeof value === "string" && value !== "" ? value : null;
+var session = {
+  token() {
+    const host = getCraftRoot()?.session;
+    if (typeof host?.token !== "function")
+      return null;
+    try {
+      return sessionToken(host.token());
+    } catch {
+      return null;
+    }
+  },
+  onChange(callback) {
+    if (typeof callback !== "function")
+      throw new TypeError("session.onChange needs a function");
+    const host = getCraftRoot()?.session;
+    if (typeof host?.onChange === "function") {
+      const stop = host.onChange((token, previous) => callback(sessionToken(token), sessionToken(previous)));
+      return typeof stop === "function" ? stop : () => {};
+    }
+    return onCraftEvent(SESSION_EVENT, (detail) => callback(sessionToken(detail.token), sessionToken(detail.previous)));
+  }
+};
 function storageHost(method) {
   const host = getCraftRoot()?.storage;
   if (typeof host?.[method] !== "function")
@@ -1643,11 +1669,11 @@ var health = {
       throw new Error("Reading sleep intervals is unavailable");
     return craft.health.getSleepIntervals(options);
   },
-  async saveMindfulSession(session) {
+  async saveMindfulSession(session2) {
     const craft = getCraftRoot();
     if (!craft?.health?.saveMindfulSession)
       throw new Error("Saving mindful sessions is unavailable");
-    return craft.health.saveMindfulSession(session);
+    return craft.health.saveMindfulSession(session2);
   },
   async getMindfulSessions(options = {}) {
     const craft = getCraftRoot();
@@ -1802,6 +1828,7 @@ export {
   speech,
   snapshots,
   share,
+  session,
   secureStorage,
   scheduledWorkoutsUnsupported,
   scheduledWorkouts,
@@ -1843,5 +1870,8 @@ export {
   appearance,
   appReview,
   _webFallbackDeviceId,
-  _resetWebFallbackDeviceIdForTests
+  _resetWebFallbackDeviceIdForTests,
+  SESSION_MESSAGE,
+  SESSION_EVENT,
+  DEFAULT_SESSION_TOKEN_KEY
 };

package/package.json

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