supersonic-scsynth 0.1.9 → 0.2.1

package/dist/workers/scsynth_audio_worklet.js

@@ -33,6 +33,7 @@ class ScsynthProcessor extends AudioWorkletProcessor {
         this.atomicView = null;
         this.uint8View = null;
         this.dataView = null;
+        this.localClockOffsetView = null;  // Float64Array for reading local clock offset
 
         // Buffer constants (loaded from WASM at initialization)
         this.bufferConstants = null;
@@ -72,9 +73,9 @@ class ScsynthProcessor extends AudioWorkletProcessor {
             throw new Error('WASM memory not available');
         }
 
-        // Read the struct (14 uint32_t fields + 1 uint8_t + 3 padding bytes)
-        const uint32View = new Uint32Array(memory.buffer, layoutPtr, 15);
-        const uint8View = new Uint8Array(memory.buffer, layoutPtr, 60);
+        // Read the struct (20 uint32_t fields + 1 uint8_t + 3 padding bytes)
+        const uint32View = new Uint32Array(memory.buffer, layoutPtr, 21);
+        const uint8View = new Uint8Array(memory.buffer, layoutPtr, 84);
 
         // Extract constants (order matches BufferLayout struct in shared_memory.h)
         this.bufferConstants = {
@@ -88,11 +89,17 @@ class ScsynthProcessor extends AudioWorkletProcessor {
             CONTROL_SIZE: uint32View[7],
             METRICS_START: uint32View[8],
             METRICS_SIZE: uint32View[9],
-            TOTAL_BUFFER_SIZE: uint32View[10],
-            MAX_MESSAGE_SIZE: uint32View[11],
-            MESSAGE_MAGIC: uint32View[12],
-            PADDING_MAGIC: uint32View[13],
-            DEBUG_PADDING_MARKER: uint8View[56],
+            NTP_START_TIME_START: uint32View[10],
+            NTP_START_TIME_SIZE: uint32View[11],
+            DRIFT_OFFSET_START: uint32View[12],
+            DRIFT_OFFSET_SIZE: uint32View[13],
+            GLOBAL_OFFSET_START: uint32View[14],
+            GLOBAL_OFFSET_SIZE: uint32View[15],
+            TOTAL_BUFFER_SIZE: uint32View[16],
+            MAX_MESSAGE_SIZE: uint32View[17],
+            MESSAGE_MAGIC: uint32View[18],
+            PADDING_MAGIC: uint32View[19],
+            DEBUG_PADDING_MARKER: uint8View[80],
             MESSAGE_HEADER_SIZE: 16  // sizeof(Message) - 4 x uint32_t (magic, length, sequence, padding)
         };
 
@@ -128,8 +135,12 @@ class ScsynthProcessor extends AudioWorkletProcessor {
             PROCESS_COUNT: (ringBufferBase + METRICS_START + 0) / 4,
             BUFFER_OVERRUNS: (ringBufferBase + METRICS_START + 4) / 4,
             MESSAGES_PROCESSED: (ringBufferBase + METRICS_START + 8) / 4,
-            MESSAGES_DROPPED: (ringBufferBase + METRICS_START + 12) / 4
+            MESSAGES_DROPPED: (ringBufferBase + METRICS_START + 12) / 4,
+            SCHEDULER_QUEUE_DEPTH: (ringBufferBase + METRICS_START + 16) / 4,
+            SCHEDULER_QUEUE_MAX: (ringBufferBase + METRICS_START + 20) / 4,
+            SCHEDULER_QUEUE_DROPPED: (ringBufferBase + METRICS_START + 24) / 4
         };
+
     }
 
     // Write debug message to SharedArrayBuffer DEBUG ring buffer
@@ -264,11 +275,6 @@ class ScsynthProcessor extends AudioWorkletProcessor {
                         if (this.wasmInstance.exports.init_memory) {
                             this.wasmInstance.exports.init_memory(48000.0);
 
-                            // Set time offset from JavaScript
-                            if (this.wasmInstance.exports.set_time_offset && data.timeOffset) {
-                                this.wasmInstance.exports.set_time_offset(data.timeOffset);
-                            }
-
                             this.isInitialized = true;
 
                             this.port.postMessage({
@@ -297,11 +303,6 @@ class ScsynthProcessor extends AudioWorkletProcessor {
                         if (this.wasmInstance.exports.init_memory) {
                             this.wasmInstance.exports.init_memory(48000.0);
 
-                            // Set time offset from JavaScript
-                            if (this.wasmInstance.exports.set_time_offset && data.timeOffset) {
-                                this.wasmInstance.exports.set_time_offset(data.timeOffset);
-                            }
-
                             this.isInitialized = true;
 
                             this.port.postMessage({
@@ -344,6 +345,9 @@ class ScsynthProcessor extends AudioWorkletProcessor {
                         bufferOverruns: Atomics.load(this.atomicView, this.METRICS_INDICES.BUFFER_OVERRUNS),
                         messagesProcessed: Atomics.load(this.atomicView, this.METRICS_INDICES.MESSAGES_PROCESSED),
                         messagesDropped: Atomics.load(this.atomicView, this.METRICS_INDICES.MESSAGES_DROPPED),
+                        schedulerQueueDepth: Atomics.load(this.atomicView, this.METRICS_INDICES.SCHEDULER_QUEUE_DEPTH),
+                        schedulerQueueMax: Atomics.load(this.atomicView, this.METRICS_INDICES.SCHEDULER_QUEUE_MAX),
+                        schedulerQueueDropped: Atomics.load(this.atomicView, this.METRICS_INDICES.SCHEDULER_QUEUE_DROPPED),
                         statusFlags: Atomics.load(this.atomicView, this.CONTROL_INDICES.STATUS_FLAGS),
                         inBufferUsed: {
                             bytes: inUsed,
@@ -416,6 +420,12 @@ class ScsynthProcessor extends AudioWorkletProcessor {
     }
 
     process(inputs, outputs, parameters) {
+        // DEBUG: Log first call
+        if (!this._everCalled) {
+            this._everCalled = true;
+            console.log('[AudioWorklet] process() called for first time');
+        }
+
         if (!this.isInitialized) {
             return true;
         }
@@ -426,8 +436,14 @@ class ScsynthProcessor extends AudioWorkletProcessor {
                 // In AudioWorkletGlobalScope, currentTime is a bare global variable (not on globalThis)
                 // We use a different variable name to avoid shadowing
                 const audioContextTime = currentTime;  // Access the global currentTime directly
-                const unixSeconds = Date.now() / 1000;  // Current Unix time in seconds
-                const keepAlive = this.wasmInstance.exports.process_audio(audioContextTime, unixSeconds);
+
+                // C++ process_audio() now calculates NTP time internally from:
+                // - NTP_START_TIME (write-once, set during initialization)
+                // - DRIFT_OFFSET (updated every 15s by main thread)
+                // - GLOBAL_OFFSET (for future multi-system sync)
+                // DEPRECATED: Legacy timing offset views kept in memory for compatibility but unused
+
+                const keepAlive = this.wasmInstance.exports.process_audio(audioContextTime);
 
                 // Copy scsynth audio output to AudioWorklet outputs
                 if (this.wasmInstance.exports.get_audio_output_bus && outputs[0] && outputs[0].length >= 2) {
@@ -484,6 +500,8 @@ class ScsynthProcessor extends AudioWorkletProcessor {
                 return keepAlive !== 0;
             }
         } catch (error) {
+            console.error('[AudioWorklet] process() error:', error);
+            console.error('[AudioWorklet] Stack:', error.stack);
             if (this.atomicView) {
                 Atomics.or(this.atomicView, this.CONTROL_INDICES.STATUS_FLAGS, this.STATUS_FLAGS.WASM_ERROR);
             }
@@ -510,7 +528,10 @@ class ScsynthProcessor extends AudioWorkletProcessor {
                 processCount: Atomics.load(this.atomicView, this.METRICS_INDICES.PROCESS_COUNT),
                 messagesProcessed: Atomics.load(this.atomicView, this.METRICS_INDICES.MESSAGES_PROCESSED),
                 messagesDropped: Atomics.load(this.atomicView, this.METRICS_INDICES.MESSAGES_DROPPED),
-                bufferOverruns: Atomics.load(this.atomicView, this.METRICS_INDICES.BUFFER_OVERRUNS)
+                bufferOverruns: Atomics.load(this.atomicView, this.METRICS_INDICES.BUFFER_OVERRUNS),
+                schedulerQueueDepth: Atomics.load(this.atomicView, this.METRICS_INDICES.SCHEDULER_QUEUE_DEPTH),
+                schedulerQueueMax: Atomics.load(this.atomicView, this.METRICS_INDICES.SCHEDULER_QUEUE_MAX),
+                schedulerQueueDropped: Atomics.load(this.atomicView, this.METRICS_INDICES.SCHEDULER_QUEUE_DROPPED)
             };
 
             this.port.postMessage({
@@ -528,4 +549,4 @@ class ScsynthProcessor extends AudioWorkletProcessor {
 }
 
 // Register the processor
-registerProcessor('scsynth-processor', ScsynthProcessor);
+registerProcessor('scsynth-processor', ScsynthProcessor);

package/dist/workers/system_worker.js

@@ -0,0 +1,64 @@
+/*
+    SuperSonic - SuperCollider AudioWorklet WebAssembly port
+    Copyright (c) 2025 Sam Aaron
+
+    Based on SuperCollider by James McCartney and community
+    GPL v3 or later
+*/
+
+/**
+ * System Message Worker - Handles internal SuperSonic messages
+ * Uses the shared ring buffer base class
+ * ES5-compatible for Qt WebEngine
+ */
+
+// Import the base class
+importScripts('ring_buffer_worker_base.js');
+
+// Create worker instance for SYSTEM buffer
+var worker = new RingBufferWorkerBase('SYSTEM');
+
+// Override postMessage to maintain compatibility
+worker.postMessage = self.postMessage.bind(self);
+
+/**
+ * Handle messages from main thread
+ */
+self.onmessage = function(event) {
+    var data = event.data;
+
+    try {
+        switch (data.type) {
+            case 'init':
+                worker.initRingBuffer(data.sharedBuffer, data.ringBufferBase, data.bufferConstants);
+                self.postMessage({ type: 'initialized' });
+                break;
+
+            case 'start':
+                worker.start();
+                break;
+
+            case 'stop':
+                worker.stop();
+                break;
+
+            case 'getStats':
+                self.postMessage({
+                    type: 'stats',
+                    stats: worker.stats
+                });
+                break;
+
+            default:
+                console.warn('[SystemWorker] Unknown message type:', data.type);
+        }
+    } catch (error) {
+        console.error('[SystemWorker] Error:', error);
+        self.postMessage({
+            type: 'error',
+            error: error.message
+        });
+    }
+};
+
+console.log('[SystemWorker] Script loaded');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "supersonic-scsynth",
-  "version": "0.1.9",
+  "version": "0.2.1",
   "description": "SuperCollider scsynth WebAssembly port for AudioWorklet - Run SuperCollider synthesis in the browser",
   "main": "dist/supersonic.js",
   "unpkg": "dist/supersonic.js",