react-native-wakeword-sid 1.1.61 → 1.1.62

package/ios/KeyWordRNBridge/KeyWordRNBridge.m

@@ -215,12 +215,101 @@ static Class SVFacadeClass(void) {
     return NSClassFromString(@"SpeakerVerificationRNFacade");
 }
 
+// ============================================================
+// MARK: - Speaker Verification Mic Config JSON resolver (modelPath)
+// ============================================================
+
+// Resolve "modelPath" inside mic controller config JSON (bundle name -> absolute file path)
+// so Swift/ORT always receives a real filesystem path.
+static NSString * _Nullable SVResolveMicConfigJson(NSString *configJson, NSError **error) {
+    if (!configJson || configJson.length == 0) {
+        NSLog(@"[SV][ObjC] SVResolveMicConfigJson: empty configJson");
+        return configJson;
+    }
+
+    NSData *data = [configJson dataUsingEncoding:NSUTF8StringEncoding];
+    if (!data) {
+        NSLog(@"[SV][ObjC] SVResolveMicConfigJson: failed to make NSData from JSON string (passing through)");
+        return configJson;
+    }
+
+    NSError *jsonErr = nil;
+    id obj = [NSJSONSerialization JSONObjectWithData:data options:0 error:&jsonErr];
+    if (jsonErr || ![obj isKindOfClass:[NSDictionary class]]) {
+        NSLog(@"[SV][ObjC] SVResolveMicConfigJson: JSON parse failed (passing through). err=%@ json=%@", jsonErr, configJson);
+        return configJson;
+    }
+
+    NSMutableDictionary *cfg = [(NSDictionary *)obj mutableCopy];
+    id mp = cfg[@"modelPath"];
+    if (![mp isKindOfClass:[NSString class]] || ((NSString *)mp).length == 0) {
+        NSLog(@"[SV][ObjC] SVResolveMicConfigJson: missing/invalid modelPath (passing through). keys=%@", cfg.allKeys);
+        return configJson;
+    }
+
+    NSString *modelPathIn = (NSString *)mp;
+    NSLog(@"[SV][ObjC] SVResolveMicConfigJson: modelPath(in)='%@'", modelPathIn);
+
+    // If already absolute and exists: keep
+    if ([modelPathIn hasPrefix:@"/"] && [[NSFileManager defaultManager] fileExistsAtPath:modelPathIn]) {
+        NSLog(@"[SV][ObjC] SVResolveMicConfigJson: modelPath absolute & exists ✅");
+        return configJson;
+    }
+
+    // Resolve using the SAME logic as createSpeakerVerifier
+    NSString *resolved = SVResolveFilePath(modelPathIn);
+    if (!resolved) {
+        NSArray<NSString *> *onnx = [[NSBundle mainBundle] pathsForResourcesOfType:@"onnx" inDirectory:nil];
+        NSLog(@"[SV][ObjC] SVResolveMicConfigJson: ❌ cannot resolve modelPath='%@' in bundle. onnxCount=%lu sample=%@",
+              modelPathIn, (unsigned long)onnx.count, onnx.count ? onnx.firstObject : @"(none)");
+        if (error) {
+            *error = [NSError errorWithDomain:@"SV" code:420 userInfo:@{
+                NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Mic config model not found in app bundle: %@", modelPathIn]
+            }];
+        }
+        return nil;
+    }
+
+    NSString *stable = SVCopyToTempIfNeeded(resolved, [modelPathIn lastPathComponent]) ?: resolved;
+    cfg[@"modelPath"] = stable;
+
+    NSData *outData = [NSJSONSerialization dataWithJSONObject:cfg options:0 error:&jsonErr];
+    if (jsonErr || !outData) {
+        NSLog(@"[SV][ObjC] SVResolveMicConfigJson: re-encode failed (passing original). err=%@", jsonErr);
+        return configJson;
+    }
+
+    NSString *outJson = [[NSString alloc] initWithData:outData encoding:NSUTF8StringEncoding];
+    NSLog(@"[SV][ObjC] SVResolveMicConfigJson: modelPath(resolved)='%@'", stable);
+    NSLog(@"[SV][ObjC] SVResolveMicConfigJson: json(out)=%@", outJson);
+    return outJson;
+}
+
 
 // =========================
 // MARK: - Mic controller dynamic bridge
 // =========================
 
 static id _Nullable SVCreateMicController(NSString *configJson, NSError **error) {
+    NSLog(@"[SV][ObjC] SVCreateMicController: in.jsonLen=%lu json=%@",
+          (unsigned long)(configJson ? configJson.length : 0),
+          configJson ?: @"(null)");
+
+    // Resolve modelPath inside JSON BEFORE calling Swift
+    NSError *resolveErr = nil;
+    NSString *fixedJson = SVResolveMicConfigJson(configJson, &resolveErr);
+    if (resolveErr || !fixedJson) {
+        if (error) *error = resolveErr;
+        NSLog(@"[SV][ObjC] SVCreateMicController: ❌ SVResolveMicConfigJson failed: %@", resolveErr.localizedDescription);
+        return nil;
+    }
+    if (![fixedJson isEqualToString:configJson]) {
+        NSLog(@"[SV][ObjC] SVCreateMicController: using RESOLVED jsonLen=%lu", (unsigned long)fixedJson.length);
+    } else {
+        NSLog(@"[SV][ObjC] SVCreateMicController: json unchanged (no modelPath fix needed)");
+    }
+
+
     Class c = SVFacadeClass();
     if (!c) {
         if (error) *error = [NSError errorWithDomain:@"SV" code:10 userInfo:@{NSLocalizedDescriptionKey: @"Swift class SpeakerVerificationRNFacade not found"}];
@@ -232,7 +321,13 @@ static id _Nullable SVCreateMicController(NSString *configJson, NSError **error)
         return nil;
     }
     id (*msgSend)(id, SEL, NSString*, NSError**) = (void*)objc_msgSend;
-    return msgSend(c, sel, configJson, error);
+    id out = msgSend(c, sel, fixedJson, error);
+    if (*error) {
+        NSLog(@"[SV][ObjC] SVCreateMicController: ❌ Swift createMicController failed: %@", (*error).localizedDescription);
+    } else {
+        NSLog(@"[SV][ObjC] SVCreateMicController: ✅ created controller=%@", out);
+    }
+    return out;
 }
 
 static BOOL SVCallBool2(id obj, SEL sel, NSString *s1, NSInteger i1, BOOL b1, NSError **error) {
@@ -438,6 +533,11 @@ RCT_EXPORT_METHOD(createSpeakerVerificationMicController:(NSString *)controllerI
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
+    NSLog(@"[SV][ObjC] createSpeakerVerificationMicController: controllerId=%@ jsonLen=%lu json=%@",
+          controllerId,
+          (unsigned long)(configJson ? configJson.length : 0),
+          configJson ?: @"(null)");
+
     if (self.speakerMicControllers[controllerId]) {
         reject(@"SVMicExists", [NSString stringWithFormat:@"Speaker mic controller already exists with ID: %@", controllerId], nil);
         return;
@@ -448,11 +548,15 @@ RCT_EXPORT_METHOD(createSpeakerVerificationMicController:(NSString *)controllerI
             NSError *err = nil;
             id ctrl = SVCreateMicController(configJson, &err);
             if (err || !ctrl) {
+                NSLog(@"[SV][ObjC] createSpeakerVerificationMicController: ❌ FAILED err=%@", err.localizedDescription ?: @"(null)");
+
                 reject(@"SVMicCreateError",
                        [NSString stringWithFormat:@"Failed to create mic controller: %@", err.localizedDescription ?: @"unknown"],
                        err);
                 return;
             }
+            NSLog(@"[SV][ObjC] createSpeakerVerificationMicController: ✅ ctrl=%@", ctrl);
+
 
             // Create delegate proxy that will forward Swift callbacks -> RN events
             SVMicDelegateProxy *proxy = [SVMicDelegateProxy new];
@@ -461,12 +565,15 @@ RCT_EXPORT_METHOD(createSpeakerVerificationMicController:(NSString *)controllerI
 
             // Set delegate dynamically (no header needed)
             SVSetDelegate(ctrl, proxy);
+            NSLog(@"[SV][ObjC] createSpeakerVerificationMicController: delegate set proxy=%@", proxy);
 
             SVMicHolder *h = [SVMicHolder new];
             h.controllerId = controllerId;
             h.controller = ctrl;
             h.delegateProxy = proxy; // keep strong ref
             self.speakerMicControllers[controllerId] = h;
+            NSLog(@"[SV][ObjC] createSpeakerVerificationMicController: stored holder. count=%lu",
+                  (unsigned long)self.speakerMicControllers.count);
 
             resolve(@{ @"ok": @YES, @"controllerId": controllerId });
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "react-native-wakeword-sid",
-    "version": "1.1.61",
+    "version": "1.1.62",
     "description": "Voice/Wake-word detection library for React Native",
     "main": "wakewords/index.js",
     "types": "wakewords/index.d.ts",