react-native-wakeword-sid 1.1.209 → 1.1.211

package/android/libs/com/davoice/keyworddetection/1.0.0/keyworddetection-1.0.0.aar.md5

@@ -1 +1 @@
-22a7d3a03cf611623990763e52c2c9b1  keyworddetection-1.0.0.aar
+29f76a7f2526d57eaba9203dae00b06e  keyworddetection-1.0.0.aar

package/android/libs/com/davoice/keyworddetection/1.0.0/keyworddetection-1.0.0.aar.sha1

@@ -1 +1 @@
-c9ec5e1fd232f58f0db17b11731b66295321786f  keyworddetection-1.0.0.aar
+54adcc23c784604563a27e74a089780ac73781f1  keyworddetection-1.0.0.aar

package/android/src/main/java/com/davoice/keywordspotting/KeyWordRNBridge.java

@@ -19,6 +19,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
 
@@ -39,13 +40,13 @@ public class KeyWordRNBridge extends ReactContextBaseJavaModule {
         SpeakerVerification.SpeakerEnrollment enrollment;
     }
 
-    private final Map<String, SVEngineHolder> svEngines = new HashMap<>();
+    private final Map<String, SVEngineHolder> svEngines = new ConcurrentHashMap<>();
 
-    private final Map<String, SpeakerVerification.SpeakerVerificationMicController> svMicControllers = new HashMap<>();
-    private final Map<String, Boolean> svAutoOnboarding = new HashMap<>();
-    private final Map<String, Integer> svAutoTarget = new HashMap<>();
-    private final Map<String, Integer> svAutoCollected = new HashMap<>();
-    private final Map<String, String> svAutoEnrollmentId = new HashMap<>();
+    private final Map<String, SpeakerVerification.SpeakerVerificationMicController> svMicControllers = new ConcurrentHashMap<>();
+    private final Map<String, Boolean> svAutoOnboarding = new ConcurrentHashMap<>();
+    private final Map<String, Integer> svAutoTarget = new ConcurrentHashMap<>();
+    private final Map<String, Integer> svAutoCollected = new ConcurrentHashMap<>();
+    private final Map<String, String> svAutoEnrollmentId = new ConcurrentHashMap<>();
     // IMPORTANT: serialize ALL SV ops to avoid races with mic frames / onboarding state.
     private final ExecutorService svExec = Executors.newSingleThreadExecutor();
     private final AtomicInteger svJobN = new AtomicInteger(0);
@@ -804,18 +805,26 @@ public class KeyWordRNBridge extends ReactContextBaseJavaModule {
     }
     @ReactMethod
     public void destroySpeakerVerificationMicController(String controllerId, Promise promise) {
-        SpeakerVerification.SpeakerVerificationMicController ctrl = svMicControllers.remove(controllerId);
+        SpeakerVerification.SpeakerVerificationMicController ctrl = svMicControllers.get(controllerId);
         if (ctrl == null) {
             promise.reject("SVMicNotFound", "No speaker mic controller with ID: " + controllerId);
             return;
         }
 
-        try { ctrl.stop(); } catch (Throwable ignore) {}
-
-        WritableMap out = Arguments.createMap();
-        out.putBoolean("ok", true);
-        out.putString("controllerId", controllerId);
-        promise.resolve(out);
+        final int job = svJobN.incrementAndGet();
+        svExec.execute(() -> {
+            try {
+                try { ctrl.stop(); } catch (Throwable ignore) {}
+                svMicControllers.remove(controllerId); // remove only after stop
+                WritableMap out = Arguments.createMap();
+                out.putBoolean("ok", true);
+                out.putString("controllerId", controllerId);
+                out.putInt("job", job);
+                promise.resolve(out);
+            } catch (Throwable t) {
+                promise.reject("SVMicDestroyError", String.valueOf(t.getMessage()), t);
+            }
+        });
     }
 
     @ReactMethod
@@ -976,15 +985,20 @@ public class KeyWordRNBridge extends ReactContextBaseJavaModule {
             return;
         }
 
-        try {
-            ctrl.stop();
-            WritableMap out = Arguments.createMap();
-            out.putBoolean("ok", true);
-            out.putString("controllerId", controllerId);
-            promise.resolve(out);
-        } catch (Throwable t) {
-            promise.reject("SVMicStopError", String.valueOf(t.getMessage()), t);
-        }
+        final int job = svJobN.incrementAndGet();
+        svExec.execute(() -> {
+            try {
+                ctrl.stop();
+                WritableMap out = Arguments.createMap();
+                out.putBoolean("ok", true);
+                out.putString("controllerId", controllerId);
+                out.putInt("job", job);
+                promise.resolve(out);
+            } catch (Throwable t) {
+                promise.reject("SVMicStopError", String.valueOf(t.getMessage()), t);
+            }
+        });
+
     }
     @ReactMethod
     public void startVerifyContinuousFromMic(String controllerId, boolean resetState, double hopSeconds, Promise promise) {

package/package.json

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

package/wakewords/SpeakerVerificationRNBridge.js

@@ -132,12 +132,7 @@ export class SpeakerVerificationMicController {
   }
 
   async create(configJson) {
-
     assertMethod('createSpeakerVerificationMicController');
-    const cfg =
-      typeof configJson === 'string'
-        ? configJson
-        : JSON.stringify(configJson ?? {});
     // IMPORTANT: must pass a REAL JSON string, not "[object Object]"
     const jsonStr = (typeof configJson === 'string')
       ? configJson
@@ -235,42 +230,43 @@ async function verifyFromMicWithEnrollment(enrollmentJson, setUiMessage) {
 
   const ctrl = await createSpeakerVerificationMicController('svMicVerify1');
   await ctrl.create(JSON.stringify(micConfig));
-
-  // IMPORTANT: set enrollment BEFORE starting verify
-  await ctrl.setEnrollmentJson(enrollmentJson);
-
-  const waitVerify = (timeoutMs = 60_000) =>
-    new Promise<any>((resolve, reject) => {
-      const offR = onSpeakerVerificationVerifyResult((e) => {
-        if (e?.controllerId !== 'svMicVerify1') return;
-        offR?.();
-        offE?.();
-        resolve(e);
+  try {
+    // IMPORTANT: set enrollment BEFORE starting verify
+    await ctrl.setEnrollmentJson(enrollmentJson);
+
+    const waitVerify = (timeoutMs = 60_000) =>
+      new Promise<any>((resolve, reject) => {
+        const offR = onSpeakerVerificationVerifyResult((e) => {
+          if (e?.controllerId !== 'svMicVerify1') return;
+          offR?.();
+          offE?.();
+          resolve(e);
+        });
+        const offE = onSpeakerVerificationError((e) => {
+          if (e?.controllerId !== 'svMicVerify1') return;
+          offR?.();
+          offE?.();
+          reject(new Error(`[SVJS] verify error: ${JSON.stringify(e)}`));
+        });
+        setTimeout(() => {
+          offR?.();
+          offE?.();
+          reject(new Error('NO_SPEECH_TIMEOUT'));
+        }, timeoutMs);
       });
-      const offE = onSpeakerVerificationError((e) => {
-        if (e?.controllerId !== 'svMicVerify1') return;
-        offR?.();
-        offE?.();
-        reject(new Error(`[SVJS] verify error: ${JSON.stringify(e)}`));
-      });
-      setTimeout(() => {
-        offR?.();
-        offE?.();
-        reject(new Error('NO_SPEECH_TIMEOUT'));
-      }, timeoutMs);
-    });
-
-  // start one verify pass (native should emit onSpeakerVerificationVerifyResult)
-  setUiMessage?.('🎙️ Mic verify: please speak (up to 60s)...');
-  await ctrl.startVerifyFromMic(true);
-
-  const res = await waitVerify(60_000);
-  console.log('[SVJS] mic verify result event:', res);
-  setUiMessage?.(`✅ Mic verify done → score=${res?.bestScore ?? res?.score ?? 'n/a'}`);
-
-  await ctrl.stop().catch(() => {});
-  await ctrl.destroy().catch(() => {});
-  return res;
+
+    // start one verify pass (native should emit onSpeakerVerificationVerifyResult)
+    setUiMessage?.('🎙️ Mic verify: please speak (up to 60s)...');
+    await ctrl.startVerifyFromMic(true);
+
+    const res = await waitVerify(60_000);
+    console.log('[SVJS] mic verify result event:', res);
+    setUiMessage?.(`✅ Mic verify done → score=${res?.bestScore ?? res?.score ?? 'n/a'}`);
+    return res;
+  } finally {
+    await ctrl.stop().catch(() => {});
+    await ctrl.destroy().catch(() => {});
+  }
 }
 
 // ============================================================