@swiftbrowser/native 0.21.0 → 0.25.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swiftbrowser/native",
-  "version": "0.21.0",
+  "version": "0.25.0",
   "type": "module",
   "description": "Run a @swiftbrowser/react app natively: the runtime a JavaScriptCore-hosted app needs (timers, console, fetch and the other web globals over the SwiftBrowser Native bridge), the `run` entry that renders into the native SwiftUI renderer, and the bundler that builds app.js for the Xcode target.",
   "repository": {
@@ -63,8 +63,8 @@
   },
   "dependencies": {
     "@babel/core": "^7.29.7",
-    "@swiftbrowser/react": "0.21.0",
-    "@swiftbrowser/web": "0.21.0",
+    "@swiftbrowser/react": "0.25.0",
+    "@swiftbrowser/web": "0.25.0",
     "esbuild": "^0.28.2",
     "react-refresh": "^0.17.0"
   },

package/swift/Packages/SwiftBrowserDSP/Sources/SwiftBrowserDSP/ProgramNode.swift

@@ -99,6 +99,36 @@ final class ProgramNode: AudioEngineCustomNode {
             }
             return true
         }
+        if key.hasPrefix("table.") || key.hasPrefix("shape.") || key.hasPrefix("sample.") {
+            // Data replaced by name (DSPNode `setTable` …): made ready here, off the audio thread, then swapped in.
+            guard let json = value.string, let data = json.data(using: .utf8), let object = try? JSONSerialization.jsonObject(with: data) else {
+                throw ProgramNodeError("unsupported: \(key) crosses as JSON")
+            }
+            let name = String(key[key.index(after: key.firstIndex(of: ".")!)...])
+            func floats(_ value: Any?) -> [Float] { (value as? [NSNumber] ?? []).map(\.floatValue) }
+            if key.hasPrefix("table."), let index = program?.tables.firstIndex(where: { $0.name == name }) {
+                let table = object as? [String: Any] ?? [:]
+                let frames = (table["frames"] as? [Any] ?? []).map { floats($0) }
+                let cosines = (table["cosines"] as? [Any])?.map { floats($0) }
+                renderer.send(.table(Int32(index), DSPMachine.tableLevels(frames: frames, cosines: cosines), Int32(frames.count)))
+            } else if key.hasPrefix("shape."), let index = program?.shapes.firstIndex(where: { $0.name == name }) {
+                renderer.send(.shape(Int32(index), DSPBuffer(floats(object))))
+            } else if key.hasPrefix("sample."), let index = program?.samples.firstIndex(where: { $0.name == name }) {
+                let sample = object as? [String: Any] ?? [:]
+                let bytes = Data(base64Encoded: sample["data"] as? String ?? "") ?? Data()
+                var audio = [Float](repeating: 0, count: bytes.count / 4)
+                _ = audio.withUnsafeMutableBytes { bytes.copyBytes(to: $0) }
+                renderer.send(.sample(Int32(index), DSPBuffer(audio), (sample["rate"] as? NSNumber)?.doubleValue ?? 44100))
+            }
+            return true
+        }
+        if key.hasPrefix("routes.") {
+            // A route list replaced (DSPNode `setRoutes`): its registers, copied in by the machine.
+            guard let json = value.string, let data = json.data(using: .utf8), let list = (try? JSONSerialization.jsonObject(with: data)) as? [NSNumber],
+                  let index = Int32(key.dropFirst(7)) else { throw ProgramNodeError("unsupported: \(key) crosses as JSON") }
+            renderer.send(.routes(index, DSPBuffer(list.map(\.floatValue))))
+            return true
+        }
         if key.hasPrefix("param.") {
             guard let number = value.double else { throw ProgramNodeError("unsupported: \(key) takes a number") }
             let name = String(key.dropFirst(6))
@@ -145,6 +175,12 @@ enum ProgramEvent: Sendable {
     case controller(Int32, Int32, Double?)
     case pitchBend(Int32, Double?)
     case parameter(Int32, Float)
+    /// Data replaced (a table's samples and frames, a shape's points, a sample's audio and rate), made off the audio
+    /// thread; once swapped in, the buffer holds what the machine let go of, freed back off the audio thread.
+    case table(Int32, DSPBuffer, Int32)
+    case shape(Int32, DSPBuffer)
+    case sample(Int32, DSPBuffer, Double)
+    case routes(Int32, DSPBuffer)
     case tempo(Double)
     case seek(Double)
     case reset
@@ -161,6 +197,8 @@ final class Renderer: @unchecked Sendable {
         var events: [ProgramEvent] = []
         var machine: DSPMachine?
         var retired: DSPMachine?
+        /// Buffers the audio thread swapped out, for the main actor to free.
+        var spent: [DSPBuffer] = []
     }
 
     private let lock = OSAllocatedUnfairLock(initialState: Shared())
@@ -169,10 +207,16 @@ final class Renderer: @unchecked Sendable {
     // The audio thread's own.
     private var machine: DSPMachine?
     private var inbox: [ProgramEvent] = []
+    /// Buffers swapped out since the lock was last free, waiting to go to `Shared.spent`.
+    private var spent: [DSPBuffer] = []
 
     init() {
         inbox.reserveCapacity(256)
-        lock.withLockUnchecked { $0.events.reserveCapacity(256) }
+        spent.reserveCapacity(64)
+        lock.withLockUnchecked {
+            $0.events.reserveCapacity(256)
+            $0.spent.reserveCapacity(64)
+        }
     }
 
     func send(_ event: ProgramEvent) {
@@ -193,11 +237,14 @@ final class Renderer: @unchecked Sendable {
 
     /// Releases, on the caller's thread, a machine the audio thread let go of.
     func collect() {
-        let retired = lock.withLockUnchecked { shared -> DSPMachine? in
-            defer { shared.retired = nil }
-            return shared.retired
+        let (retired, spent) = lock.withLockUnchecked { shared -> (DSPMachine?, [DSPBuffer]) in
+            defer {
+                shared.retired = nil
+                shared.spent.removeAll(keepingCapacity: true)
+            }
+            return (shared.retired, shared.spent)
         }
-        _ = retired
+        _ = (retired, spent)
     }
 
     /// The audio thread: false when there is no program yet (silence). With `right`, the left side into `out`.
@@ -211,6 +258,8 @@ final class Renderer: @unchecked Sendable {
                 shared.machine = nil
             }
             swap(&shared.events, &inbox)
+            // What was swapped out, for the main actor to free (when it has taken the last).
+            if shared.spent.isEmpty && !spent.isEmpty { swap(&shared.spent, &spent) }
         }
         guard let machine else {
             inbox.removeAll(keepingCapacity: true)
@@ -223,6 +272,15 @@ final class Renderer: @unchecked Sendable {
             case let .controller(number, value, beat): machine.controller(number, value: value, atBeat: beat)
             case let .pitchBend(value, beat): machine.pitchBend(value, atBeat: beat)
             case let .parameter(index, value): machine.setParameter(at: Int(index), value)
+            case let .table(index, levels, frames):
+                if machine.replaceTable(Int(index), levels: levels, frames: Int(frames)) { spent.append(levels) }
+            case let .shape(index, points):
+                if machine.replaceShape(Int(index), points: points) { spent.append(points) }
+            case let .sample(index, audio, rate):
+                if machine.replaceSample(Int(index), audio: audio, rate: rate) { spent.append(audio) }
+            case let .routes(index, list):
+                _ = machine.replaceRoutes(Int(index), registers: list)
+                spent.append(list)
             case let .tempo(bpm): machine.setTempo(bpm)
             case let .seek(beat): machine.seek(toBeat: beat)
             case .reset: machine.reset()