react-native-wakeword 1.1.21 → 1.1.22

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

@@ -1 +1 @@
-f0c6b698ac8128dea7ed4b2e185803cf  keyworddetection-1.0.0.aar
+dc061ad4032e82074b661cfe3f21e3cc  keyworddetection-1.0.0.aar

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

@@ -1 +1 @@
-fbd4668154d96ea9b1a44aba0e13ee86fa22f011  keyworddetection-1.0.0.aar
+f4f50053ac6ebc02add55625d8858eac815433ef  keyworddetection-1.0.0.aar

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

@@ -42,6 +42,46 @@ public class KeyWordRNBridge extends ReactContextBaseJavaModule {
         promise.resolve(isLicesed);
     }
 
+    // Create a new instance efficiently
+    @ReactMethod
+    public void createInstanceMulti(String instanceId, ReadableArray modelPathsArray, ReadableArray thresholdsArray, ReadableArray bufferCntsArray, ReadableArray msBetweenCallbackArray, Promise promise) {
+        if (instances.containsKey(instanceId)) {
+            promise.reject("InstanceExists", "Instance already exists with ID: " + instanceId);
+            return;
+        }
+
+        try {
+            int size = modelPathsArray.size();
+            if (thresholdsArray.size() != size || bufferCntsArray.size() != size || msBetweenCallbackArray.size() != size) {
+                promise.reject("InvalidArguments", "All input arrays must be the same length.");
+                return;
+            }
+
+            // Convert ReadableArrays to Java arrays
+            String[] modelPaths = new String[size];
+            float[] thresholds = new float[size];
+            int[] bufferCnts = new int[size];
+            long[] msBetweenCallback = new long[size];
+
+            for (int i = 0; i < size; i++) {
+                modelPaths[i] = modelPathsArray.getString(i);
+                thresholds[i] = (float) thresholdsArray.getDouble(i);
+                bufferCnts[i] = bufferCntsArray.getInt(i);
+                msBetweenCallback[i] = (long) msBetweenCallbackArray.getDouble(i); // RN uses Double for all numbers
+            }
+
+            // Create instance
+            KeyWordsDetection keyWordsDetection = new KeyWordsDetection(reactContext, modelPaths, thresholds, bufferCnts, msBetweenCallback);
+            keyWordsDetection.initialize((detected, modelName) -> onKeywordDetected(instanceId, detected, modelName));
+
+            instances.put(instanceId, keyWordsDetection);
+            promise.resolve("Multi-model instance created with ID: " + instanceId);
+
+        } catch (Exception e) {
+            promise.reject("CreateError", "Failed to create multi-model instance: " + e.getMessage());
+        }
+    }
+
     // Create a new instance
     @ReactMethod
     public void createInstance(String instanceId, String modelName, float threshold, int bufferCnt, Promise promise) {
@@ -52,7 +92,8 @@ public class KeyWordRNBridge extends ReactContextBaseJavaModule {
 
         try {
             KeyWordsDetection keyWordsDetection = new KeyWordsDetection(reactContext, modelName, threshold, bufferCnt);
-            keyWordsDetection.initialize(detected -> onKeywordDetected(instanceId, detected));
+            keyWordsDetection.initialize((detected, ignored) -> onKeywordDetected(instanceId, detected, modelName));
+
             instances.put(instanceId, keyWordsDetection);
             promise.resolve("Instance created with ID: " + instanceId);
         } catch (Exception e) {
@@ -154,11 +195,12 @@ public class KeyWordRNBridge extends ReactContextBaseJavaModule {
     }
 
     // Handle keyword detection event
-    private void onKeywordDetected(String instanceId, Boolean detected) {
+    private void onKeywordDetected(String instanceId, boolean detected, String modelName) {
         if (detected) {
             WritableMap params = Arguments.createMap();
             params.putString("instanceId", instanceId);
-            params.putString("phrase", instanceId);
+            params.putString("phrase", modelName);
+            params.putString("modelName", modelName);
             sendEvent("onKeywordDetectionEvent", params);
         }
     }

package/ios/KeyWordRNBridge/KeyWordDetection.xcframework/Info.plist

@@ -8,32 +8,32 @@
 			<key>BinaryPath</key>
 			<string>KeyWordDetection.framework/KeyWordDetection</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>KeyWordDetection.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>KeyWordDetection.framework/KeyWordDetection</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>KeyWordDetection.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/ios/KeyWordRNBridge/KeyWordDetection.xcframework/ios-arm64/KeyWordDetection.framework/Headers/KeyWordDetection-Swift.h

@@ -349,12 +349,15 @@ SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly, strong) GlobalVariab
 @end
 
 @protocol KeywordDetectionRNDelegate;
+@class NSNumber;
 SWIFT_CLASS("_TtC16KeyWordDetection17KeyWordsDetection")
 @interface KeyWordsDetection : NSObject
 @property (nonatomic, weak) id <KeywordDetectionRNDelegate> _Nullable delegate;
 - (nullable instancetype)initWithModelPath:(NSString * _Nonnull)modelPath threshold:(float)threshold bufferCnt:(NSInteger)bufferCnt error:(NSError * _Nullable * _Nullable)error;
-- (nullable instancetype)initWithModelPath:(NSString * _Nonnull)modelPath threshold:(float)threshold bufferCnt:(NSInteger)bufferCnt cancelEcho:(BOOL)cancelEcho error:(NSError * _Nullable * _Nullable)error OBJC_DESIGNATED_INITIALIZER;
+- (nullable instancetype)initWithModelPaths:(NSArray<NSString *> * _Nonnull)modelPaths thresholds:(NSArray<NSNumber *> * _Nonnull)thresholds bufferCnts:(NSArray<NSNumber *> * _Nonnull)bufferCnts msBetweenCallback:(NSArray<NSNumber *> * _Nonnull)msBetweenCallback error:(NSError * _Nullable * _Nullable)error;
+- (nullable instancetype)initWithModelPaths:(NSArray<NSString *> * _Nonnull)modelPaths thresholds:(NSArray<NSNumber *> * _Nonnull)thresholds bufferCnts:(NSArray<NSNumber *> * _Nonnull)bufferCnts msBetweenCallback:(NSArray<NSNumber *> * _Nonnull)msBetweenCallback cancelEcho:(BOOL)cancelEcho error:(NSError * _Nullable * _Nullable)error OBJC_DESIGNATED_INITIALIZER;
 - (BOOL)replaceKeywordDetectionModelWithModelPath:(NSString * _Nonnull)modelPath threshold:(float)threshold bufferCnt:(NSInteger)bufferCnt error:(NSError * _Nullable * _Nullable)error;
+- (BOOL)replaceKeywordDetectionModelsWithModelPaths:(NSArray<NSString *> * _Nonnull)modelPaths thresholds:(NSArray<NSNumber *> * _Nonnull)thresholds bufferCnts:(NSArray<NSNumber *> * _Nonnull)bufferCnts msBetweenCallback:(NSArray<NSNumber *> * _Nonnull)msBetweenCallback error:(NSError * _Nullable * _Nullable)error;
 - (NSString * _Nonnull)getKeywordDetectionModel SWIFT_WARN_UNUSED_RESULT;
 - (NSString * _Nonnull)getRecordingWav SWIFT_WARN_UNUSED_RESULT;
 - (BOOL)setKeywordDetectionLicenseWithLicenseKey:(NSString * _Nonnull)licenseKey SWIFT_WARN_UNUSED_RESULT;