expo-juce 0.2.23 → 0.2.25

package/ios/JuceToneGenerator.mm

@@ -12,12 +12,17 @@ static const int MAX_HARMONICS = 8;
 // ── Simple one-pole low-pass filter ───────────────────────────────
 class OnePoleLPF {
 public:
-    OnePoleLPF() : y1(0.0), cutoff(20000.0), resonance(0.0) {}
+    OnePoleLPF() : y1(0.0), cutoff(20000.0), resonance(0.0), pendingReset(false) {}
 
     void setCutoff(double hz) { cutoff.store(hz); }
     void setResonance(double q) { resonance.store(q); }
 
     float process(float input, double sampleRate) {
+        // Handle reset on audio thread to avoid data race
+        if (pendingReset.exchange(false)) {
+            y1 = 0.0;
+        }
+
         double fc = cutoff.load();
 
         // Clamp cutoff to Nyquist
@@ -34,12 +39,14 @@ public:
         return (float)y1;
     }
 
-    void reset() { y1 = 0.0; }
+    // Signal reset from main thread — applied on next audio render
+    void reset() { pendingReset.store(true); }
 
 private:
-    double y1;
+    double y1;  // Only touched by audio thread
     std::atomic<double> cutoff;
     std::atomic<double> resonance;
+    std::atomic<bool> pendingReset;
 };
 
 // ── ADSR Envelope ─────────────────────────────────────────────────
@@ -130,7 +137,7 @@ public:
     }
 
     void noteOn() {
-        phase = 0.0;
+        pendingNoteOn.store(true);
         filter.reset();
         envelope.noteOn();
     }
@@ -145,6 +152,11 @@ public:
     void setFilterResonance(double q) { filter.setResonance(q); }
 
     float getNextSample(double sampleRate) {
+        // Handle phase reset on audio thread to avoid data race
+        if (pendingNoteOn.exchange(false)) {
+            phase = 0.0;
+        }
+
         float envGain = envelope.process(sampleRate);
         if (envGain < 0.00001f && !envelope.isActive()) {
             return 0.0f;
@@ -203,7 +215,8 @@ public:
 private:
     std::atomic<double> frequency;
     std::atomic<double> level;
-    double phase;
+    double phase;  // Only touched by audio thread
+    std::atomic<bool> pendingNoteOn{false};
     std::atomic<Waveform> waveform;
     std::atomic<double> detuneCents;
     std::atomic<double> harmonics[MAX_HARMONICS];
@@ -300,79 +313,126 @@ struct BeatState {
 }
 
 - (void)initialize {
+    [self initializeWithRetries:3];
+}
+
+- (void)initializeWithRetries:(int)maxRetries {
     if (self.audioEngine) {
         NSLog(@"[ExpoJuce] Audio engine already initialized, skipping");
         return;
     }
 
-    NSLog(@"[ExpoJuce] Initializing audio engine...");
-
-    @try {
-        NSError *error = nil;
+    // Listen for audio interruptions (phone calls, Siri, etc.)
+    [[NSNotificationCenter defaultCenter] removeObserver:self
+                                                    name:AVAudioSessionInterruptionNotification
+                                                  object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(handleAudioInterruption:)
+                                                 name:AVAudioSessionInterruptionNotification
+                                               object:[AVAudioSession sharedInstance]];
+
+    for (int attempt = 1; attempt <= maxRetries; attempt++) {
+        NSLog(@"[ExpoJuce] Initializing audio engine (attempt %d/%d)...", attempt, maxRetries);
+
+        @try {
+            NSError *error = nil;
+
+            AVAudioSession *audioSession = [AVAudioSession sharedInstance];
+            [audioSession setCategory:AVAudioSessionCategoryPlayback
+                          withOptions:AVAudioSessionCategoryOptionMixWithOthers
+                                error:&error];
+            if (error) {
+                NSLog(@"[ExpoJuce] Error setting audio session category: %@", error);
+                continue;
+            }
 
-        AVAudioSession *audioSession = [AVAudioSession sharedInstance];
-        [audioSession setCategory:AVAudioSessionCategoryPlayback
-                      withOptions:AVAudioSessionCategoryOptionMixWithOthers
-                            error:&error];
-        if (error) {
-            NSLog(@"[ExpoJuce] Error setting audio session category: %@", error);
-            error = nil;
-        }
+            [audioSession setActive:YES error:&error];
+            if (error) {
+                NSLog(@"[ExpoJuce] Error activating audio session: %@", error);
+                continue;
+            }
 
-        [audioSession setActive:YES error:&error];
-        if (error) {
-            NSLog(@"[ExpoJuce] Error activating audio session: %@", error);
-            error = nil;
-        }
+            self.audioEngine = [[AVAudioEngine alloc] init];
 
-        self.audioEngine = [[AVAudioEngine alloc] init];
+            double sampleRate = audioSession.sampleRate > 0 ? audioSession.sampleRate : 44100.0;
+            AVAudioFormat *format = [[AVAudioFormat alloc] initStandardFormatWithSampleRate:sampleRate channels:2];
+            NSLog(@"[ExpoJuce] Using sample rate: %.0f", sampleRate);
 
-        double sampleRate = audioSession.sampleRate > 0 ? audioSession.sampleRate : 44100.0;
-        AVAudioFormat *format = [[AVAudioFormat alloc] initStandardFormatWithSampleRate:sampleRate channels:2];
-        NSLog(@"[ExpoJuce] Using sample rate: %.0f", sampleRate);
+            SynthEngine *eng = self.engine;
+            TransportEngine *trans = self.transport;
 
-        SynthEngine *eng = self.engine;
-        TransportEngine *trans = self.transport;
+            if (!self.beatState) {
+                self.beatState = new BeatState();
+            }
+            BeatState *bs = self.beatState;
+
+            self.sourceNode = [[AVAudioSourceNode alloc] initWithRenderBlock:^OSStatus(BOOL *isSilence, const AudioTimeStamp *timestamp, AVAudioFrameCount frameCount, AudioBufferList *outputData) {
+                double sr = sampleRate;
+                float *leftChannel = (float *)outputData->mBuffers[0].mData;
+                float *rightChannel = (outputData->mNumberBuffers > 1) ? (float *)outputData->mBuffers[1].mData : leftChannel;
+
+                for (AVAudioFrameCount i = 0; i < frameCount; i++) {
+                    if (trans->advance(sr)) {
+                        bs->crossed.store(true);
+                        bs->beat.store(trans->getPosition());
+                        bs->bpm.store(trans->getTempo());
+                    }
 
-        if (!self.beatState) {
-            self.beatState = new BeatState();
-        }
-        BeatState *bs = self.beatState;
-
-        self.sourceNode = [[AVAudioSourceNode alloc] initWithRenderBlock:^OSStatus(BOOL *isSilence, const AudioTimeStamp *timestamp, AVAudioFrameCount frameCount, AudioBufferList *outputData) {
-            double sr = sampleRate;
-            float *leftChannel = (float *)outputData->mBuffers[0].mData;
-            float *rightChannel = (outputData->mNumberBuffers > 1) ? (float *)outputData->mBuffers[1].mData : leftChannel;
-
-            for (AVAudioFrameCount i = 0; i < frameCount; i++) {
-                if (trans->advance(sr)) {
-                    bs->crossed.store(true);
-                    bs->beat.store(trans->getPosition());
-                    bs->bpm.store(trans->getTempo());
+                    float sample = eng->getNextSample(sr);
+                    leftChannel[i] = sample;
+                    rightChannel[i] = sample;
                 }
 
-                float sample = eng->getNextSample(sr);
-                leftChannel[i] = sample;
-                rightChannel[i] = sample;
+                return noErr;
+            }];
+
+            [self.audioEngine attachNode:self.sourceNode];
+            [self.audioEngine connect:self.sourceNode to:self.audioEngine.mainMixerNode format:format];
+            [self.audioEngine connect:self.audioEngine.mainMixerNode to:self.audioEngine.outputNode format:nil];
+
+            [self.audioEngine prepare];
+            [self.audioEngine startAndReturnError:&error];
+            if (error) {
+                NSLog(@"[ExpoJuce] Error starting audio engine: %@", error);
+                [self tearDownAudioEngine];
+                continue;
             }
 
-            return noErr;
-        }];
+            NSLog(@"[ExpoJuce] Audio engine started successfully");
+            return;
 
-        [self.audioEngine attachNode:self.sourceNode];
-        [self.audioEngine connect:self.sourceNode to:self.audioEngine.mainMixerNode format:format];
-        [self.audioEngine connect:self.audioEngine.mainMixerNode to:self.audioEngine.outputNode format:nil];
+        } @catch (NSException *exception) {
+            NSLog(@"[ExpoJuce] CRASH in audio init (attempt %d): %@ — %@", attempt, exception.name, exception.reason);
+            [self tearDownAudioEngine];
+        }
+    }
 
-        [self.audioEngine prepare];
+    NSLog(@"[ExpoJuce] Audio engine failed to initialize after %d attempts", maxRetries);
+}
+
+- (void)tearDownAudioEngine {
+    if (self.audioEngine) {
+        [self.audioEngine stop];
+        self.audioEngine = nil;
+    }
+    self.sourceNode = nil;
+}
+
+- (void)handleAudioInterruption:(NSNotification *)notification {
+    NSDictionary *info = notification.userInfo;
+    AVAudioSessionInterruptionType type = (AVAudioSessionInterruptionType)[info[AVAudioSessionInterruptionTypeKey] unsignedIntegerValue];
+
+    if (type == AVAudioSessionInterruptionTypeBegan) {
+        NSLog(@"[ExpoJuce] Audio interrupted (phone call, Siri, etc.)");
+    } else if (type == AVAudioSessionInterruptionTypeEnded) {
+        NSLog(@"[ExpoJuce] Audio interruption ended, restarting engine...");
+        NSError *error = nil;
         [self.audioEngine startAndReturnError:&error];
         if (error) {
-            NSLog(@"[ExpoJuce] Error starting audio engine: %@", error);
-        } else {
-            NSLog(@"[ExpoJuce] Audio engine started successfully");
+            NSLog(@"[ExpoJuce] Failed to restart after interruption: %@, reinitializing...", error);
+            [self tearDownAudioEngine];
+            [self initializeWithRetries:2];
         }
-
-    } @catch (NSException *exception) {
-        NSLog(@"[ExpoJuce] CRASH in audio init: %@ — %@", exception.name, exception.reason);
     }
 }
 
@@ -404,6 +464,7 @@ struct BeatState {
 }
 
 - (void)shutdown {
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
     [self stopBeatTimer];
     if (self.audioEngine) {
         [self.audioEngine stop];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-juce",
-  "version": "0.2.23",
+  "version": "0.2.25",
   "description": "Realtime DSP w/C++ & JUCE",
   "type": "module",
   "main": "build/index.js",