react-native-wakeword-sid 1.1.100 → 1.1.102

package/android/src/main/java/com/davoice/speakeridrn/SpeakerIdRNBridge.java

@@ -18,6 +18,13 @@ import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.*;
+import android.content.res.AssetManager;
+import java.io.InputStream;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Locale;
+import java.util.Log;
 
 /**
  * React Native bridge for the speaker-id Android library.
@@ -105,7 +112,9 @@ public class SpeakerIdRNBridge extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void initVerificationUsingCurrentConfig(Promise promise) {
+    public void initVerificationUsingCurrentConfig(String instanceId, Promise promise) {
+        SpeakerIdApi api = instances.get(instanceId);
+        if (api == null) { promise.reject("InstanceNotFound", instanceId); return; }
         try {
             boolean ok = api.initVerificationUsingCurrentConfig();
             promise.resolve(ok);
@@ -114,6 +123,59 @@ public class SpeakerIdRNBridge extends ReactContextBaseJavaModule {
         }
     }
 
+    // ======= External-audio cluster API (RN) =======
+
+    @ReactMethod
+    public void initCluster(String instanceId, int numOfEmb, Promise promise) {
+        SpeakerIdApi api = instances.get(instanceId);
+        if (api == null) { promise.reject("InstanceNotFound", instanceId); return; }
+        exec.submit(() -> {
+            try {
+                int cid = api.initCluster(numOfEmb);
+                main.post(() -> promise.resolve(cid));
+            } catch (Throwable t) {
+                main.post(() -> promise.reject("InitClusterError", t.getMessage(), t));
+            }
+        });
+    }
+
+    @ReactMethod
+    public void createAndPushEmbeddingsToCluster(String instanceId, int clusterId, ReadableArray pcmI16, int length, Promise promise) {
+        SpeakerIdApi api = instances.get(instanceId);
+        if (api == null) { promise.reject("InstanceNotFound", instanceId); return; }
+        // Convert RN int[] -> short[]
+        int n = Math.min(length, pcmI16.size());
+        final short[] block = new short[n];
+        for (int i = 0; i < n; i++) block[i] = (short) pcmI16.getInt(i);
+
+        exec.submit(() -> {
+            try {
+                api.createAndPushEmbeddingsToCluster(clusterId, block, n);
+                main.post(() -> promise.resolve(null));
+            } catch (Throwable t) {
+                main.post(() -> promise.reject("PushClusterError", t.getMessage(), t));
+            }
+        });
+    }
+
+    @ReactMethod
+    public void createAndVerifyEmbeddingsFromCluster(String instanceId, int clusterId, ReadableArray pcmI16, int length, Promise promise) {
+        SpeakerIdApi api = instances.get(instanceId);
+        if (api == null) { promise.reject("InstanceNotFound", instanceId); return; }
+        int n = Math.min(length, pcmI16.size());
+        final short[] block = new short[n];
+        for (int i = 0; i < n; i++) block[i] = (short) pcmI16.getInt(i);
+
+        exec.submit(() -> {
+            try {
+                float score = api.createAndVerifyEmbeddingsFromCluster(clusterId, block, n);
+                main.post(() -> promise.resolve(score));
+            } catch (Throwable t) {
+                main.post(() -> promise.reject("VerifyClusterError", t.getMessage(), t));
+            }
+        });
+    }
+
     @ReactMethod
     public void destroyInstance(String instanceId, Promise promise) {
         SpeakerIdApi api;
@@ -319,17 +381,31 @@ public class SpeakerIdRNBridge extends ReactContextBaseJavaModule {
     }
 
     // ======= WWD: create instance tuned for wake-word =======
+
+    private static final boolean DEBUG_SID_ASSETS = true; // set false for production
+
     @ReactMethod
     public void createInstanceWWD(String instanceId, Promise promise) {
         if (instances.containsKey(instanceId)) {
             promise.reject("InstanceExists", "Instance already exists: " + instanceId);
             return;
         }
+        Log.d("WWD DEBUG", "createInstanceWWD")
+
         exec.submit(() -> {
             try {
+        Log.d("WWD DEBUG", "createInstanceWWD2")
                 SpeakerIdApi api = SpeakerIdApi.createWWD(reactContext);
+        Log.d("WWD DEBUG", "createInstanceWWD3")
                 synchronized (instances) { instances.put(instanceId, api); }
+        Log.d("WWD DEBUG", "createInstanceWWD4")
                 main.post(() -> promise.resolve(true));
+                // Then run debug async if enabled
+                if (DEBUG_SID_ASSETS) {
+                    Log.d("WWD DEBUG", "Calling debugOnAssetsWWD")
+                    exec.submit(() -> debugOnAssetsWWD(instanceId));
+                }
+
             } catch (Exception e) {
                 main.post(() -> promise.reject("CreateWWDError", e.getMessage(), e));
             }
@@ -434,4 +510,79 @@ public class SpeakerIdRNBridge extends ReactContextBaseJavaModule {
         exec.shutdownNow();
         super.onCatalystInstanceDestroy();
     }
+
+    // ======= DEBUG harness (assets) =======
+
+    private void emitDebug(String msg) {
+        Log.d("WWD DEBUG", msg)
+        WritableMap m = Arguments.createMap();
+        m.putString("line", msg);
+        sendEvent("SpeakerIdDebug", m);
+    }
+
+    private void debugOnAssetsWWD(String instanceId) {
+        try {
+            SpeakerIdApi api = instances.get(instanceId);
+            if (api == null) { emitDebug("debugOnAssetsWWD: instance gone: " + instanceId); return; }
+
+            // 1) Init a small FIFO cluster (K=3)
+            final int K = 3;
+            int clusterId = api.initCluster(K);
+            emitDebug("WWD DEBUG: initCluster -> " + clusterId + " (K=" + K + ")");
+
+            // 2) Onboarding from assets
+            String[] onboard = new String[] {
+                    "onboard1.raw","onboard2.raw","onboard3.raw","onboard4.raw"
+            };
+            for (int i = 0; i < onboard.length; i++) {
+                short[] pcm = readPcm16LeRawAsset(onboard[i]);
+                api.createAndPushEmbeddingsToCluster(clusterId, pcm, pcm.length);
+                String line = String.format(Locale.US, "WWD DEBUG: push #%d '%s' samples=%d", i+1, onboard[i], pcm.length);
+                emitDebug(line);
+            }
+            emitDebug("WWD DEBUG: onboarding done; cluster+mean saved.");
+
+            // 3) Verification from assets
+            String[] tests = new String[] {
+                    "test1.raw","test2.raw","test3.raw","test4.raw","test5.raw","test6.raw","test7.raw"
+            };
+            for (String tf : tests) {
+                short[] pcm = readPcm16LeRawAsset(tf);
+                float score = api.createAndVerifyEmbeddingsFromCluster(clusterId, pcm, pcm.length);
+                String line = String.format(Locale.US, "WWD DEBUG: verify '%s' samples=%d -> score=%.4f",
+                        tf, pcm.length, score);
+                emitDebug(line);
+            }
+            emitDebug("WWD DEBUG: verification pass completed.");
+        } catch (Throwable t) {
+            emitDebug("WWD DEBUG ERROR: " + t.getMessage());
+        }
+    }
+
+    /** Read RAW little-endian PCM16 asset → short[] (exactly your requested method) */
+    private short[] readPcm16LeRawAsset(String assetName) throws IOException {
+        AssetManager am = reactContext.getAssets();
+        try (InputStream in = am.open(assetName);
+            BufferedInputStream bis = new BufferedInputStream(in);
+            ByteArrayOutputStream baos = new ByteArrayOutputStream(32 * 1024)) {
+
+            byte[] buf = new byte[8192];
+            int n;
+            while ((n = bis.read(buf)) != -1) {
+                baos.write(buf, 0, n);
+            }
+            byte[] all = baos.toByteArray();
+            if ((all.length & 1) != 0) {
+                throw new IOException("Asset RAW has odd byte length: " + assetName + " (" + all.length + " bytes)");
+            }
+            int samples = all.length / 2;
+            short[] pcm = new short[samples];
+            for (int i = 0, s = 0; i < all.length; i += 2, s++) {
+                int lo = (all[i] & 0xFF);
+                int hi = (all[i + 1] << 8);
+                pcm[s] = (short) (hi | lo);
+            }
+            return pcm;
+        }
+    }
 }

package/package.json

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