react-native-wakeword-sid 1.1.205 → 1.1.207

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

@@ -1 +1 @@
-13fe069bbd5879f49a4ac72d819bb550  keyworddetection-1.0.0.aar
+f1b7db1a656e5f5e984a669235479be2  keyworddetection-1.0.0.aar

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

@@ -1 +1 @@
-84d3a2d0f926a3369afa202996e8e36747664f26  keyworddetection-1.0.0.aar
+f03917f37522ffd7dfab8dcba18e2b20584223a7  keyworddetection-1.0.0.aar

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

@@ -17,6 +17,10 @@ import androidx.annotation.Nullable;
 import android.util.Log;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicInteger;
+
 
 public class KeyWordRNBridge extends ReactContextBaseJavaModule {
 
@@ -38,6 +42,13 @@ public class KeyWordRNBridge extends ReactContextBaseJavaModule {
     private final Map<String, SVEngineHolder> svEngines = new HashMap<>();
 
     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<>();
+    // 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);
 
     // VAD API:
     private final Map<String, Float>  vadThresholdByInstance = new HashMap<>();
@@ -718,7 +729,19 @@ public class KeyWordRNBridge extends ReactContextBaseJavaModule {
     }
 
     private void sendEventUi(String eventName, WritableMap params) {
-        reactContext.runOnUiQueueThread(() -> sendEvent(eventName, params));
+        final ReactApplicationContext rc = reactContext;
+        if (rc == null) return;
+        if (!rc.hasActiveCatalystInstance()) return;
+        rc.runOnUiQueueThread(() -> {
+            try {
+                if (!rc.hasActiveCatalystInstance()) return;
+                rc.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+                  .emit(eventName, params);
+            } catch (Throwable t) {
+                // don't crash native if RN is tearing down
+                Log.w(SV_TAG, "sendEventUi failed event=" + eventName + " err=" + t);
+            }
+        });
     }
     @ReactMethod
     public void createSpeakerVerificationMicController(String controllerId,
@@ -794,6 +817,7 @@ public class KeyWordRNBridge extends ReactContextBaseJavaModule {
         out.putString("controllerId", controllerId);
         promise.resolve(out);
     }
+
     @ReactMethod
     public void svBeginOnboarding(String controllerId,
                                 String enrollmentId,
@@ -806,20 +830,21 @@ public class KeyWordRNBridge extends ReactContextBaseJavaModule {
             return;
         }
 
-        new Thread(() -> {
+        final int job = svJobN.incrementAndGet();
+        svExec.execute(() -> {
             try {
                 ctrl.beginOnboarding(enrollmentId, targetEmbeddingCount, reset);
-
                 WritableMap out = Arguments.createMap();
                 out.putBoolean("ok", true);
                 out.putString("controllerId", controllerId);
                 out.putString("enrollmentId", enrollmentId);
                 out.putInt("target", targetEmbeddingCount);
+                out.putInt("job", job);
                 promise.resolve(out);
             } catch (Throwable t) {
                 promise.reject("SVMicBeginError", String.valueOf(t.getMessage()), t);
             }
-        }).start();
+        });
     }
 
     @ReactMethod
@@ -830,17 +855,20 @@ public class KeyWordRNBridge extends ReactContextBaseJavaModule {
             return;
         }
 
-        new Thread(() -> {
+        final int job = svJobN.incrementAndGet();
+        svExec.execute(() -> {
             try {
                 ctrl.getNextEmbeddingFromMic();
                 WritableMap out = Arguments.createMap();
                 out.putBoolean("ok", true);
                 out.putString("controllerId", controllerId);
+                out.putInt("job", job);
                 promise.resolve(out);
             } catch (Throwable t) {
                 promise.reject("SVMicGetNextError", String.valueOf(t.getMessage()), t);
             }
-        }).start();
+        });
+
     }
 
     @ReactMethod
@@ -851,17 +879,19 @@ public class KeyWordRNBridge extends ReactContextBaseJavaModule {
             return;
         }
 
-        new Thread(() -> {
+        final int job = svJobN.incrementAndGet();
+        svExec.execute(() -> {
             try {
                 ctrl.finalizeOnboardingNow();
                 WritableMap out = Arguments.createMap();
                 out.putBoolean("ok", true);
                 out.putString("controllerId", controllerId);
+                out.putInt("job", job);
                 promise.resolve(out);
             } catch (Throwable t) {
                 promise.reject("SVMicFinalizeError", String.valueOf(t.getMessage()), t);
             }
-        }).start();
+        });
     }
 
     @ReactMethod
@@ -871,18 +901,20 @@ public class KeyWordRNBridge extends ReactContextBaseJavaModule {
             promise.reject("SVMicNotFound", "No speaker mic controller with ID: " + controllerId);
             return;
         }
-
-        new Thread(() -> {
+        final int job = svJobN.incrementAndGet();
+        svExec.execute(() -> {
             try {
                 ctrl.setEnrollmentJson(enrollmentJson);
                 WritableMap out = Arguments.createMap();
                 out.putBoolean("ok", true);
                 out.putString("controllerId", controllerId);
+                out.putInt("job", job);
                 promise.resolve(out);
             } catch (Throwable t) {
                 promise.reject("SVMicSetEnrollError", String.valueOf(t.getMessage()), t);
             }
-        }).start();
+        });
+
     }
 
     @ReactMethod
@@ -893,18 +925,21 @@ public class KeyWordRNBridge extends ReactContextBaseJavaModule {
             return;
         }
 
-        new Thread(() -> {
+        final int job = svJobN.incrementAndGet();
+        svExec.execute(() -> {
             try {
                 ctrl.startVerifyFromMic(resetState);
                 WritableMap out = Arguments.createMap();
                 out.putBoolean("ok", true);
                 out.putString("controllerId", controllerId);
                 out.putBoolean("resetState", resetState);
+                out.putInt("job", job);
                 promise.resolve(out);
             } catch (Throwable t) {
                 promise.reject("SVMicStartVerifyError", String.valueOf(t.getMessage()), t);
             }
-        }).start();
+        });
+
     }
 
     @ReactMethod
@@ -915,7 +950,8 @@ public class KeyWordRNBridge extends ReactContextBaseJavaModule {
             return;
         }
 
-        new Thread(() -> {
+        final int job = svJobN.incrementAndGet();
+        svExec.execute(() -> {
             try {
                 ctrl.startEndlessVerifyFromMic((float) hopSeconds, stopOnMatch, resetState);
                 WritableMap out = Arguments.createMap();
@@ -924,11 +960,12 @@ public class KeyWordRNBridge extends ReactContextBaseJavaModule {
                 out.putDouble("hopSeconds", hopSeconds);
                 out.putBoolean("stopOnMatch", stopOnMatch);
                 out.putBoolean("resetState", resetState);
+                out.putInt("job", job);
                 promise.resolve(out);
             } catch (Throwable t) {
                 promise.reject("SVMicStartEndlessVerifyError", String.valueOf(t.getMessage()), t);
             }
-        }).start();
+        });
     }
 
     @ReactMethod
@@ -949,5 +986,15 @@ public class KeyWordRNBridge extends ReactContextBaseJavaModule {
             promise.reject("SVMicStopError", String.valueOf(t.getMessage()), t);
         }
     }
+    @ReactMethod
+    public void startVerifyContinuousFromMic(String controllerId, boolean resetState, double hopSeconds, Promise promise) {
+        // parity: continuous verify == endless verify
+        // choose stopOnMatch=false by default (continuous)
+        svStartEndlessVerifyFromMic(controllerId, hopSeconds, false, resetState, promise);
+    }
 
+    @ReactMethod
+    public void stopVerifyContinuousFromMic(String controllerId, Promise promise) {
+        svStopMic(controllerId, promise);
+    }
 }

package/package.json

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