react-native-wakeword 1.1.21 → 1.1.22

package/ios/KeyWordRNBridge/KeyWordDetection.xcframework/ios-arm64_x86_64-simulator/KeyWordDetection.framework/Modules/KeyWordDetection.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface

@@ -1,6 +1,6 @@
 // swift-interface-format-version: 1.0
 // swift-compiler-version: Apple Swift version 6.1.2 effective-5.10 (swiftlang-6.1.2.1.2 clang-1700.0.13.5)
-// swift-module-flags: -target x86_64-apple-ios13-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -enable-experimental-feature DebugDescriptionMacro -enable-bare-slash-regex -module-name KeyWordDetection
+// swift-module-flags: -target x86_64-apple-ios13.5-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -enable-experimental-feature DebugDescriptionMacro -enable-bare-slash-regex -module-name KeyWordDetection
 // swift-module-flags-ignorable: -no-verify-emitted-module-interface -interface-compiler-version 6.1.2
 import AVFAudio
 import AVFoundation
@@ -50,7 +50,7 @@ public class AVAudioWrapperFrameListener {
   public func removeFrameListener(_ listener: KeyWordDetection.AVAudioWrapperFrameListener)
   public func clearFrameListeners()
   public func setSessionOptions(sessionOptions: AVFAudio.AVAudioSession.CategoryOptions)
-  public func start(frameLength: Swift.UInt32, sampleRate: Swift.UInt32, setActive: Swift.Bool = true, duckOthers: Swift.Bool = false, mixWithOthers: Swift.Bool = true, defaultToSpeaker: Swift.Bool = true)
+  public func start(frameLength: Swift.UInt32, sampleRate: Swift.UInt32)
   public func stop() throws
   @objc deinit
 }
@@ -106,8 +106,10 @@ public class AVAudioWrapper {
   @objc weak public var delegate: (any KeyWordDetection.KeywordDetectionRNDelegate)?
   public var eventSink: (([Swift.String : Any]) -> Swift.Void)?
   @objc convenience public init(modelPath: Swift.String, threshold: Swift.Float, bufferCnt: Swift.Int) throws
-  @objc public init(modelPath: Swift.String, threshold: Swift.Float, bufferCnt: Swift.Int, cancelEcho: Swift.Bool = false) throws
+  @objc convenience public init(modelPaths: [Swift.String], thresholds: [Foundation.NSNumber], bufferCnts: [Foundation.NSNumber], msBetweenCallback: [Foundation.NSNumber]) throws
+  @objc public init(modelPaths: [Swift.String], thresholds: [Swift.Float], bufferCnts: [Swift.Int], msBetweenCallback: [Swift.Int64], cancelEcho: Swift.Bool = false) throws
   @objc public func replaceKeywordDetectionModel(modelPath: Swift.String, threshold: Swift.Float, bufferCnt: Swift.Int) throws
+  @objc public func replaceKeywordDetectionModels(modelPaths: [Swift.String], thresholds: [Swift.Float], bufferCnts: [Swift.Int], msBetweenCallback: [Swift.Int64]) throws
   @objc public func getKeywordDetectionModel() -> Swift.String
   @objc public func getRecordingWav() -> Swift.String
   @objc public func setKeywordDetectionLicense(licenseKey: Swift.String) -> Swift.Bool

package/ios/KeyWordRNBridge/KeyWordDetection.xcframework/ios-arm64_x86_64-simulator/KeyWordDetection.framework/Modules/KeyWordDetection.swiftmodule/x86_64-apple-ios-simulator.swiftinterface

@@ -1,6 +1,6 @@
 // swift-interface-format-version: 1.0
 // swift-compiler-version: Apple Swift version 6.1.2 effective-5.10 (swiftlang-6.1.2.1.2 clang-1700.0.13.5)
-// swift-module-flags: -target x86_64-apple-ios13-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -enable-experimental-feature DebugDescriptionMacro -enable-bare-slash-regex -module-name KeyWordDetection
+// swift-module-flags: -target x86_64-apple-ios13.5-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -enable-experimental-feature DebugDescriptionMacro -enable-bare-slash-regex -module-name KeyWordDetection
 // swift-module-flags-ignorable: -no-verify-emitted-module-interface -interface-compiler-version 6.1.2
 import AVFAudio
 import AVFoundation
@@ -50,7 +50,7 @@ public class AVAudioWrapperFrameListener {
   public func removeFrameListener(_ listener: KeyWordDetection.AVAudioWrapperFrameListener)
   public func clearFrameListeners()
   public func setSessionOptions(sessionOptions: AVFAudio.AVAudioSession.CategoryOptions)
-  public func start(frameLength: Swift.UInt32, sampleRate: Swift.UInt32, setActive: Swift.Bool = true, duckOthers: Swift.Bool = false, mixWithOthers: Swift.Bool = true, defaultToSpeaker: Swift.Bool = true)
+  public func start(frameLength: Swift.UInt32, sampleRate: Swift.UInt32)
   public func stop() throws
   @objc deinit
 }
@@ -106,8 +106,10 @@ public class AVAudioWrapper {
   @objc weak public var delegate: (any KeyWordDetection.KeywordDetectionRNDelegate)?
   public var eventSink: (([Swift.String : Any]) -> Swift.Void)?
   @objc convenience public init(modelPath: Swift.String, threshold: Swift.Float, bufferCnt: Swift.Int) throws
-  @objc public init(modelPath: Swift.String, threshold: Swift.Float, bufferCnt: Swift.Int, cancelEcho: Swift.Bool = false) throws
+  @objc convenience public init(modelPaths: [Swift.String], thresholds: [Foundation.NSNumber], bufferCnts: [Foundation.NSNumber], msBetweenCallback: [Foundation.NSNumber]) throws
+  @objc public init(modelPaths: [Swift.String], thresholds: [Swift.Float], bufferCnts: [Swift.Int], msBetweenCallback: [Swift.Int64], cancelEcho: Swift.Bool = false) throws
   @objc public func replaceKeywordDetectionModel(modelPath: Swift.String, threshold: Swift.Float, bufferCnt: Swift.Int) throws
+  @objc public func replaceKeywordDetectionModels(modelPaths: [Swift.String], thresholds: [Swift.Float], bufferCnts: [Swift.Int], msBetweenCallback: [Swift.Int64]) throws
   @objc public func getKeywordDetectionModel() -> Swift.String
   @objc public func getRecordingWav() -> Swift.String
   @objc public func setKeywordDetectionLicense(licenseKey: Swift.String) -> Swift.Bool

package/ios/KeyWordRNBridge/KeyWordDetection.xcframework/ios-arm64_x86_64-simulator/KeyWordDetection.framework/_CodeSignature/CodeResources

@@ -6,7 +6,7 @@
 	<dict>
 		<key>Headers/KeyWordDetection-Swift.h</key>
 		<data>
-		dyetOGzCUSbh+NBwZekrAEh/M2I=
+		2LuxvPIzEv/mCjRCRJQR1iQMgJI=
 		</data>
 		<key>Headers/KeyWordDetection.h</key>
 		<data>
@@ -14,47 +14,47 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		L3dRigWzWuR7k+paH+0Og0o3MOs=
+		sSoVDG0TLK7+xwNThNe8Ny1Omu0=
 		</data>
 		<key>Modules/KeyWordDetection.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
 		<data>
-		EmQ2teQfgTapW0ygjSz5H19nzA4=
+		BLS7GdwnCockvW92Rfk1ffxnSdc=
 		</data>
 		<key>Modules/KeyWordDetection.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface</key>
 		<data>
-		PsxoWcpEnXEKezDqzkFUKRqWfdc=
+		Oin84KT6uz+Dz5zyaKdFqrTHEuY=
 		</data>
 		<key>Modules/KeyWordDetection.swiftmodule/arm64-apple-ios-simulator.swiftdoc</key>
 		<data>
-		KGK1XtiC7UVRxWPQ+2rX5PFCQF4=
+		pZsSKXuNOvF3YTKH6zkbn+hGvYg=
 		</data>
 		<key>Modules/KeyWordDetection.swiftmodule/arm64-apple-ios-simulator.swiftinterface</key>
 		<data>
-		PsxoWcpEnXEKezDqzkFUKRqWfdc=
+		Oin84KT6uz+Dz5zyaKdFqrTHEuY=
 		</data>
 		<key>Modules/KeyWordDetection.swiftmodule/arm64-apple-ios-simulator.swiftmodule</key>
 		<data>
-		2PfyfBtwCx2y/M0d3AdAb6Bajx8=
+		GPjpEF/igGhjAM0wpZyiMsndHys=
 		</data>
 		<key>Modules/KeyWordDetection.swiftmodule/x86_64-apple-ios-simulator.abi.json</key>
 		<data>
-		EmQ2teQfgTapW0ygjSz5H19nzA4=
+		BLS7GdwnCockvW92Rfk1ffxnSdc=
 		</data>
 		<key>Modules/KeyWordDetection.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface</key>
 		<data>
-		85dlU4jiFlZGxYHinqPNRbxi9y4=
+		thI3UPX8hf9jbWYqnJfUg5vy1p8=
 		</data>
 		<key>Modules/KeyWordDetection.swiftmodule/x86_64-apple-ios-simulator.swiftdoc</key>
 		<data>
-		WngUNmZdW9HV0L6r4qQDQQzsfjQ=
+		obKcLl48LCRITPrTt9lIXud6M8A=
 		</data>
 		<key>Modules/KeyWordDetection.swiftmodule/x86_64-apple-ios-simulator.swiftinterface</key>
 		<data>
-		85dlU4jiFlZGxYHinqPNRbxi9y4=
+		thI3UPX8hf9jbWYqnJfUg5vy1p8=
 		</data>
 		<key>Modules/KeyWordDetection.swiftmodule/x86_64-apple-ios-simulator.swiftmodule</key>
 		<data>
-		9iAcs52iycV3Wq6yDzA+lEAN8+w=
+		QYCh9Gleq504mkb3Q1TYFsdTQ/E=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -67,11 +67,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			dyetOGzCUSbh+NBwZekrAEh/M2I=
+			2LuxvPIzEv/mCjRCRJQR1iQMgJI=
 			</data>
 			<key>hash2</key>
 			<data>
-			+F1Hic5Pbd+gQo20D6o/zNzxjYHl/Imq91JAJVyPWOA=
+			PZysvYbQcZjqeW7WSVHAUa+KpiZFNPYwOWtz3z/WqLM=
 			</data>
 		</dict>
 		<key>Headers/KeyWordDetection.h</key>
@@ -89,110 +89,110 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			EmQ2teQfgTapW0ygjSz5H19nzA4=
+			BLS7GdwnCockvW92Rfk1ffxnSdc=
 			</data>
 			<key>hash2</key>
 			<data>
-			HzEZNf0/dMKsp+uNEzEMxlpOp/rqZ0ZZ3i5HNzBmRDc=
+			rxlcsSVQPKp4oOIUhXBI6qIi0L8k5o9a6YR/wLGJusQ=
 			</data>
 		</dict>
 		<key>Modules/KeyWordDetection.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			PsxoWcpEnXEKezDqzkFUKRqWfdc=
+			Oin84KT6uz+Dz5zyaKdFqrTHEuY=
 			</data>
 			<key>hash2</key>
 			<data>
-			xyK1ZhF6lr6CgOUc0ePOu9ZP6Gng0V9PbUeR97+wfYQ=
+			vI9ROONuqIho451juaviLqAEtfyvhX6To4DxdUhfN8g=
 			</data>
 		</dict>
 		<key>Modules/KeyWordDetection.swiftmodule/arm64-apple-ios-simulator.swiftdoc</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			KGK1XtiC7UVRxWPQ+2rX5PFCQF4=
+			pZsSKXuNOvF3YTKH6zkbn+hGvYg=
 			</data>
 			<key>hash2</key>
 			<data>
-			PLmoMUimTD/1NSL4/SCA3iok0JSOmDdH4QVhORvOskg=
+			i7XuxhozqyxYFrqDfphp4ea79bLoHwvKXvQEGxnZ5K0=
 			</data>
 		</dict>
 		<key>Modules/KeyWordDetection.swiftmodule/arm64-apple-ios-simulator.swiftinterface</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			PsxoWcpEnXEKezDqzkFUKRqWfdc=
+			Oin84KT6uz+Dz5zyaKdFqrTHEuY=
 			</data>
 			<key>hash2</key>
 			<data>
-			xyK1ZhF6lr6CgOUc0ePOu9ZP6Gng0V9PbUeR97+wfYQ=
+			vI9ROONuqIho451juaviLqAEtfyvhX6To4DxdUhfN8g=
 			</data>
 		</dict>
 		<key>Modules/KeyWordDetection.swiftmodule/arm64-apple-ios-simulator.swiftmodule</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			2PfyfBtwCx2y/M0d3AdAb6Bajx8=
+			GPjpEF/igGhjAM0wpZyiMsndHys=
 			</data>
 			<key>hash2</key>
 			<data>
-			c5ZB1moyUYX3/isjyrWpOhPp0S5wEJWosFDKA+//fsk=
+			PGimumdKzZCu1MKnTinL1AIl92xU0z0JwNiDs0oTjVk=
 			</data>
 		</dict>
 		<key>Modules/KeyWordDetection.swiftmodule/x86_64-apple-ios-simulator.abi.json</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			EmQ2teQfgTapW0ygjSz5H19nzA4=
+			BLS7GdwnCockvW92Rfk1ffxnSdc=
 			</data>
 			<key>hash2</key>
 			<data>
-			HzEZNf0/dMKsp+uNEzEMxlpOp/rqZ0ZZ3i5HNzBmRDc=
+			rxlcsSVQPKp4oOIUhXBI6qIi0L8k5o9a6YR/wLGJusQ=
 			</data>
 		</dict>
 		<key>Modules/KeyWordDetection.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			85dlU4jiFlZGxYHinqPNRbxi9y4=
+			thI3UPX8hf9jbWYqnJfUg5vy1p8=
 			</data>
 			<key>hash2</key>
 			<data>
-			PF1BM66gtI41d2cmefWYUC02lqixlffshm1a20r1JjA=
+			IWwaGRP2KyO5wCQ2MmsysDr6LR1qu255Oktn7QySVW4=
 			</data>
 		</dict>
 		<key>Modules/KeyWordDetection.swiftmodule/x86_64-apple-ios-simulator.swiftdoc</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			WngUNmZdW9HV0L6r4qQDQQzsfjQ=
+			obKcLl48LCRITPrTt9lIXud6M8A=
 			</data>
 			<key>hash2</key>
 			<data>
-			yRBEg5nBM7imjU9MJzbX9QyYxgrpIUKyaSgZmncDkWQ=
+			2N6P/hWCk5d8/u4tj1vNes79Dndx9XCG11jarZXMBvw=
 			</data>
 		</dict>
 		<key>Modules/KeyWordDetection.swiftmodule/x86_64-apple-ios-simulator.swiftinterface</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			85dlU4jiFlZGxYHinqPNRbxi9y4=
+			thI3UPX8hf9jbWYqnJfUg5vy1p8=
 			</data>
 			<key>hash2</key>
 			<data>
-			PF1BM66gtI41d2cmefWYUC02lqixlffshm1a20r1JjA=
+			IWwaGRP2KyO5wCQ2MmsysDr6LR1qu255Oktn7QySVW4=
 			</data>
 		</dict>
 		<key>Modules/KeyWordDetection.swiftmodule/x86_64-apple-ios-simulator.swiftmodule</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			9iAcs52iycV3Wq6yDzA+lEAN8+w=
+			QYCh9Gleq504mkb3Q1TYFsdTQ/E=
 			</data>
 			<key>hash2</key>
 			<data>
-			V81DQs9E6s1LrCOG8f1xWPmVFX3RL60w5wuu/NBxax0=
+			/at1gZWt2gLuRLlE0RPJa4MS0AqCzd2maWvJm9gx7Ww=
 			</data>
 		</dict>
 		<key>Modules/module.modulemap</key>

package/ios/KeyWordRNBridge/KeyWordRNBridge.mm

@@ -21,6 +21,14 @@
                             bridge:(KeyWordRNBridge *)bridge
                              error:(NSError **)error;
 
+- (instancetype)initWithInstanceId:(NSString *)instanceId
+                        modelNames:(NSArray<NSString *> *)modelNames
+                        thresholds:(NSArray<NSNumber *> *)thresholds
+                        bufferCnts:(NSArray<NSNumber *> *)bufferCnts
+                 msBetweenCallback:(NSArray<NSNumber *> *)msBetweenCallback
+                            bridge:(KeyWordRNBridge *)bridge
+                             error:(NSError **)error;
+
 @end
 
 @implementation KeyWordsDetectionWrapper
@@ -44,6 +52,33 @@
     return self;
 }
 
+- (instancetype)initWithInstanceId:(NSString *)instanceId
+                        modelNames:(NSArray<NSString *> *)modelNames
+                        thresholds:(NSArray<NSNumber *> *)thresholds
+                        bufferCnts:(NSArray<NSNumber *> *)bufferCnts
+                 msBetweenCallback:(NSArray<NSNumber *> *)msBetweenCallback
+                            bridge:(KeyWordRNBridge *)bridge
+                             error:(NSError **)error {
+    if (self = [super init]) {
+        _instanceId = instanceId;
+        _bridge = bridge;
+
+        NSMutableArray<NSNumber *> *floatThresholds = [NSMutableArray array];
+        for (NSNumber *num in thresholds) {
+            [floatThresholds addObject:@(num.floatValue)];
+        }
+
+        _keyWordsDetection = [[KeyWordsDetection alloc] initWithModelPaths:modelNames
+                                                                thresholds:floatThresholds
+                                                                bufferCnts:bufferCnts
+                                                         msBetweenCallback:msBetweenCallback
+                                                                      error:error];
+        if (*error) return nil;
+        _keyWordsDetection.delegate = self;
+    }
+    return self;
+}
+
 // Implement the delegate method
 - (void)KeywordDetectionDidDetectEvent:(NSDictionary *)eventInfo {
     NSMutableDictionary *mutableEventInfo = [eventInfo mutableCopy];
@@ -79,6 +114,35 @@ RCT_EXPORT_MODULE();
     return @[@"onKeywordDetectionEvent"];
 }
 
+RCT_EXPORT_METHOD(createInstanceMulti:(NSString *)instanceId
+                  modelPaths:(NSArray<NSString *> *)modelPaths
+                  thresholds:(NSArray<NSNumber *> *)thresholds
+                  bufferCnts:(NSArray<NSNumber *> *)bufferCnts
+                  msBetweenCallback:(NSArray<NSNumber *> *)msBetweenCallback
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject) {
+    if (self.instances[instanceId]) {
+        reject(@"InstanceExists", [NSString stringWithFormat:@"Instance already exists with ID: %@", instanceId], nil);
+        return;
+    }
+
+    NSError *error = nil;
+    KeyWordsDetectionWrapper *wrapper = [[KeyWordsDetectionWrapper alloc]
+        initWithInstanceId:instanceId
+               modelNames:modelPaths
+               thresholds:thresholds
+               bufferCnts:bufferCnts
+        msBetweenCallback:msBetweenCallback
+                   bridge:self
+                    error:&error];
+    if (error) {
+        reject(@"CreateError", [NSString stringWithFormat:@"Failed to create multi-model instance: %@", error.localizedDescription], nil);
+    } else {
+        self.instances[instanceId] = wrapper;
+        resolve([NSString stringWithFormat:@"Multi-model instance created with ID: %@", instanceId]);
+    }
+}
+
 RCT_EXPORT_METHOD(createInstance:(NSString *)instanceId modelName:(NSString *)modelName threshold:(float)threshold bufferCnt:(NSInteger)bufferCnt resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 {
     if (self.instances[instanceId]) {

package/package.json

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

package/wakewords/KeyWordRNBridge.d.ts

@@ -4,6 +4,7 @@ export class KeyWordRNBridgeInstance {
     listeners: any[];
     isFirstInstance: boolean;
     isSticky: any;
+    createInstanceMulti(modelNames: any, thresholds: any, bufferCnts: any, msBetweenCallbacks: any): Promise<any>;
     createInstance(modelName: any, threshold: any, bufferCnt: any): Promise<any>;
     setKeywordDetectionLicense(license: any): Promise<any>;
     replaceKeywordDetectionModel(modelName: any, threshold: any, bufferCnt: any): Promise<any>;

package/wakewords/KeyWordRNBridge.js

@@ -20,6 +20,23 @@ export class KeyWordRNBridgeInstance {
       this.isSticky = isSticky;
     }
   
+    async createInstanceMulti(modelNames, thresholds, bufferCnts, msBetweenCallbacks) {
+        const instance = await KeyWordRNBridge.createInstanceMulti(
+            this.instanceId,
+            modelNames,
+            thresholds,
+            bufferCnts,
+            msBetweenCallbacks
+        );
+
+        if (instance && this.isFirstInstance) {
+            this.isFirstInstance = false;
+            await KeyWordRNBridge.startForegroundService(this.instanceId);
+        }
+
+        return instance;
+    }
+
     async createInstance(modelName, threshold, bufferCnt) {
       instance = await KeyWordRNBridge.createInstance(
         this.instanceId,
@@ -83,7 +100,13 @@ export class KeyWordRNBridgeInstance {
     onKeywordDetectionEvent(callback) {
         const listener = keywordRNBridgeEmitter.addListener('onKeywordDetectionEvent', (event) => {
             if (event.instanceId === this.instanceId) {
-                callback(event.phrase);
+                console.log("event == .", event);
+                if (Platform.OS === 'ios') {
+                    console.log("event == .", event);
+                    callback(event.info);
+                } else {
+                    callback(event.phrase);
+                }
             }
         });
         this.listeners.push(listener);