expo-juce 0.2.22 → 0.2.23

package/ios/ExpoJuceBridge.h

@@ -8,6 +8,8 @@ typedef void(^ExpoJuceBeatBlock)(double beat, double bpm);
 
 + (void)setup;
 + (void)shutdown;
++ (void)startBeatTimer;
++ (void)stopBeatTimer;
 
 // ── Synth ─────────────────────────────────────────────────────────
 + (void)playToneWithFrequency:(double)frequency duration:(double)duration;

package/ios/ExpoJuceBridge.m

@@ -11,6 +11,14 @@
     [[JuceToneGenerator sharedInstance] shutdown];
 }
 
++ (void)startBeatTimer {
+    [[JuceToneGenerator sharedInstance] startBeatTimer];
+}
+
++ (void)stopBeatTimer {
+    [[JuceToneGenerator sharedInstance] stopBeatTimer];
+}
+
 // ── Synth ─────────────────────────────────────────────────────────
 
 + (void)playToneWithFrequency:(double)frequency duration:(double)duration {

package/ios/ExpoJuceModule.swift

@@ -1,6 +1,8 @@
 import ExpoModulesCore
 
 public class ExpoJuceModule: Module {
+  private var hasListeners = false
+
   public func definition() -> ModuleDefinition {
     Name("ExpoJuce")
 
@@ -8,6 +10,7 @@ public class ExpoJuceModule: Module {
     // Initializing AVAudioEngine in OnCreate can crash before JS is ready.
 
     OnDestroy {
+      ExpoJuceBridge.stopBeatTimer()
       ExpoJuceBridge.shutdown()
     }
 
@@ -17,15 +20,33 @@ public class ExpoJuceModule: Module {
 
     Events("onChange", "onBeat")
 
+    // Beat timer only runs while JS has active listeners.
+    // This prevents sendEvent from firing before listeners are attached (crash).
+    OnStartObserving {
+      self.hasListeners = true
+      ExpoJuceBridge.startBeatTimer()
+    }
+
+    OnStopObserving {
+      self.hasListeners = false
+      ExpoJuceBridge.stopBeatTimer()
+    }
+
     Function("hello") {
       return "Hello world!"
     }
 
     // ── Synth ───────────────────────────────────────────────────────
 
-    Function("setup") {
-      NSLog("[ExpoJuce] setup called from JS (NO-OP diagnostic)")
-      // DIAGNOSTIC: skip all native calls to isolate crash
+    Function("setup") { [weak self] in
+      ExpoJuceBridge.setup()
+      ExpoJuceBridge.setBeatCallback { [weak self] beat, bpm in
+        guard let self = self, self.hasListeners else { return }
+        self.sendEvent("onBeat", [
+          "beat": beat,
+          "bpm": bpm,
+        ])
+      }
     }
 
     Function("playTone") { (frequency: Double, duration: Double) -> String in

package/ios/JuceToneGenerator.h

@@ -7,6 +7,8 @@ typedef void(^BeatCallback)(double beat, double bpm);
 + (instancetype)sharedInstance;
 - (void)initialize;
 - (void)shutdown;
+- (void)startBeatTimer;
+- (void)stopBeatTimer;
 
 // ── Synth ─────────────────────────────────────────────────────────
 - (void)playToneWithFrequency:(double)frequency duration:(double)duration;

package/ios/JuceToneGenerator.mm

@@ -255,11 +255,18 @@ private:
 
 // ── Objective-C Wrapper ───────────────────────────────────────────
 
+struct BeatState {
+    std::atomic<bool> crossed{false};
+    std::atomic<double> beat{0.0};
+    std::atomic<double> bpm{120.0};
+};
+
 @interface JuceToneGenerator ()
 @property (nonatomic, strong) AVAudioEngine *audioEngine;
 @property (nonatomic, strong) AVAudioSourceNode *sourceNode;
 @property (nonatomic, assign) SynthEngine *engine;
 @property (nonatomic, assign) TransportEngine *transport;
+@property (nonatomic, assign) BeatState *beatState;
 @property (nonatomic, strong) dispatch_source_t beatTimer;
 @property (nonatomic, copy) BeatCallback beatCallback;
 @end
@@ -289,20 +296,115 @@ private:
     [self shutdown];
     if (_engine) { delete _engine; _engine = nullptr; }
     if (_transport) { delete _transport; _transport = nullptr; }
+    if (_beatState) { delete _beatState; _beatState = nullptr; }
 }
 
 - (void)initialize {
-    // DIAGNOSTIC: no-op to isolate crash source.
-    // If app still crashes on pad tap, the problem is in setFrequency/noteOn.
-    // If app stops crashing, the problem is in AVAudioEngine setup.
-    NSLog(@"[ExpoJuce] initialize called (NO-OP diagnostic mode)");
+    if (self.audioEngine) {
+        NSLog(@"[ExpoJuce] Audio engine already initialized, skipping");
+        return;
+    }
+
+    NSLog(@"[ExpoJuce] Initializing audio engine...");
+
+    @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);
+            error = nil;
+        }
+
+        [audioSession setActive:YES error:&error];
+        if (error) {
+            NSLog(@"[ExpoJuce] Error activating audio session: %@", error);
+            error = nil;
+        }
+
+        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);
+
+        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());
+                }
+
+                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);
+        } else {
+            NSLog(@"[ExpoJuce] Audio engine started successfully");
+        }
+
+    } @catch (NSException *exception) {
+        NSLog(@"[ExpoJuce] CRASH in audio init: %@ — %@", exception.name, exception.reason);
+    }
 }
 
-- (void)shutdown {
+- (void)stopBeatTimer {
     if (self.beatTimer) {
         dispatch_source_cancel(self.beatTimer);
         self.beatTimer = nil;
     }
+    self.beatCallback = nil;
+}
+
+- (void)startBeatTimer {
+    if (self.beatTimer) return;
+    if (!self.beatState) return;
+
+    BeatState *bs = self.beatState;
+    self.beatTimer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, dispatch_get_main_queue());
+    dispatch_source_set_timer(self.beatTimer, DISPATCH_TIME_NOW, 16 * NSEC_PER_MSEC, 1 * NSEC_PER_MSEC);
+    __weak JuceToneGenerator *weakSelf = self;
+    dispatch_source_set_event_handler(self.beatTimer, ^{
+        JuceToneGenerator *strongSelf = weakSelf;
+        if (!strongSelf) return;
+        BeatCallback cb = strongSelf.beatCallback;
+        if (bs->crossed.exchange(false) && cb) {
+            cb(bs->beat.load(), bs->bpm.load());
+        }
+    });
+    dispatch_resume(self.beatTimer);
+}
+
+- (void)shutdown {
+    [self stopBeatTimer];
     if (self.audioEngine) {
         [self.audioEngine stop];
         self.audioEngine = nil;
@@ -313,14 +415,20 @@ private:
 // ── Synth Methods ─────────────────────────────────────────────────
 
 - (void)playToneWithFrequency:(double)frequency duration:(double)duration {
-    NSLog(@"[ExpoJuce] playTone freq=%.1f dur=%.0f (NO-OP)", frequency, duration);
-    // DIAGNOSTIC: skip C++ call
+    NSLog(@"[ExpoJuce] playTone freq=%.1f dur=%.0f", frequency, duration);
+    if (!self.engine) return;
+
+    self.engine->setFrequency(frequency);
+    self.engine->noteOn();
+
+    __weak JuceToneGenerator *weakSelf = self;
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(duration / 1000.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        if (weakSelf.engine) weakSelf.engine->noteOff();
+    });
 }
 
 - (void)setFrequency:(double)frequency {
-    NSLog(@"[ExpoJuce] setFrequency: %.1f, engine=%p", frequency, self.engine);
     if (self.engine) self.engine->setFrequency(frequency);
-    NSLog(@"[ExpoJuce] setFrequency done");
 }
 
 - (void)setLevel:(double)level {
@@ -352,15 +460,11 @@ private:
 }
 
 - (void)noteOn {
-    NSLog(@"[ExpoJuce] noteOn, engine=%p", self.engine);
     if (self.engine) self.engine->noteOn();
-    NSLog(@"[ExpoJuce] noteOn done");
 }
 
 - (void)noteOff {
-    NSLog(@"[ExpoJuce] noteOff, engine=%p", self.engine);
     if (self.engine) self.engine->noteOff();
-    NSLog(@"[ExpoJuce] noteOff done");
 }
 
 // ── DSP Params ────────────────────────────────────────────────────

package/package.json

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