react-native-wakeword-sid 1.1.105 → 1.1.197

package/KeyWordRNBridge.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
 
 #    s.source_files = "ios/*.{h,m,mm,swift}"
     s.resources    = "ios/KeyWordRNBridge/models/*"
-    s.source_files = 'ios/KeyWordRNBridge/KeyWordRNBridge.h', 'ios/KeyWordRNBridge/KeyWordRNBridge.mm'
+    s.source_files = 'ios/KeyWordRNBridge/KeyWordRNBridge.h', 'ios/KeyWordRNBridge/KeyWordRNBridge.m'
 
     #s.static_framework = true
 

package/README.md

@@ -9,6 +9,8 @@ By [DaVoice.io](https://davoice.io)
 Welcome to **Davoice React-Native Wake Word / hotword / Keywords Detection** – Wake words and keyword detection solution designed by **DaVoice.io**.
 
 ## New:
+Android - 16KB alignment.
+
 Fix IOS crash when retaking microphone after a call.
 
 Fix IOS issue with static Podfile linkage.
@@ -44,9 +46,6 @@ Top Player     0.874812
 Third          0.626567
 ```
 
-Please check this link for an official benchmake by lookdeep.health:
-https://www.reddit.com/r/Python/comments/1ioo4yd/bulletproof_wakewordkeyword_spotting/
-
 - **Easy to deploy wake word with React Native:** Check out our example: "rn_example/DetectingKeyWords.js". With a few simple lines of code, you have your own keyword detecting enabled app.
 - **Cross-Platform Support:** Integrate Davoice KeywordsDetection into React-Native Framework. Both iOS and Android are supported.
 - **Low Latency:** Experience near-instantaneous keyword detection.

package/android/build.gradle

@@ -4,7 +4,7 @@ android {
     compileSdkVersion 33
 
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 23
         targetSdkVersion 33
         consumerProguardFiles 'consumer-rules.pro'
     }

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

@@ -1 +1 @@
-66b5a4f6201e3d7c7d71c3d9891bba82  keyworddetection-1.0.0.aar
+a1f8f0ccd4a36890e596d0b22f4ba7b7  keyworddetection-1.0.0.aar

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

@@ -1 +1 @@
-016cdcd6f0f4309c8d8ce5c694269a7d6cd00142  keyworddetection-1.0.0.aar
+ecce4612759e9765cb1eec2dcddf74d9a0a59869  keyworddetection-1.0.0.aar

package/android/src/main/AndroidManifest.xml

@@ -9,9 +9,5 @@
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
 
-    <!-- Required for microphone access in Android 14 -->
-    <uses-permission android:name="android.permission.CAPTURE_AUDIO_OUTPUT"/>
-    <uses-permission android:name="android.permission.CAPTURE_MEDIA_OUTPUT"/>
-
 </manifest>
 

package/android/src/main/java/com/davoice/DaVoiceUnifiedPackage.java

@@ -7,7 +7,7 @@ import com.facebook.react.uimanager.ViewManager;
 
 // Your two existing modules:
 import com.davoice.keywordspotting.KeyWordRNBridge;
-import com.davoice.speakeridrn.SpeakerIdRNBridge;
+//import com.davoice.speakeridrn.SpeakerIdRNBridge;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -17,8 +17,8 @@ public class DaVoiceUnifiedPackage implements ReactPackage {
   @Override
   public List<NativeModule> createNativeModules(ReactApplicationContext rc) {
     return Arrays.asList(
-      new KeyWordRNBridge(rc),
-      new SpeakerIdRNBridge(rc)
+      new KeyWordRNBridge(rc)
+//      new SpeakerIdRNBridge(rc)
     );
   }
 

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

@@ -4,7 +4,6 @@ import com.davoice.keywordsdetection.keywordslibrary.KeyWordsDetection;
 import com.facebook.react.bridge.*;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import androidx.annotation.Nullable;
-import ai.onnxruntime.*;
 import android.util.Log;
 import java.util.HashMap;
 import java.util.Map;
@@ -146,7 +145,7 @@ public class KeyWordRNBridge extends ReactContextBaseJavaModule {
 
     // Start detection for a specific instance
     @ReactMethod
-    public void startKeywordDetection(String instanceId, float threshold, Promise promise) throws OrtException {
+    public void startKeywordDetection(String instanceId, float threshold, Promise promise) {
         KeyWordsDetection instance = instances.get(instanceId);
         if (instance != null) {
             instance.startListening(threshold);
@@ -264,7 +263,8 @@ public void startVADDetection(String instanceId, Promise promise) {
         // after: API-21 safe
         Float _thr = vadThresholdByInstance.get(instanceId);
         float thr = (_thr != null) ? _thr : DEFAULT_VAD_THRESHOLD;
-        int   win = vadMsWindowByInstance.getOrDefault(instanceId, DEFAULT_VAD_MSWINDOW);
+        Integer   _win = vadMsWindowByInstance.get(instanceId);
+        int   win = (_win != null) ? _win : DEFAULT_VAD_MSWINDOW;
         instance.setVADParams(thr, win);
         boolean ok = instance.startVADListening();
         promise.resolve(ok);
@@ -313,8 +313,10 @@ public void getVADParams(String instanceId, Promise promise) {
         return;
     }
     WritableMap out = Arguments.createMap();
-    float thr = vadThresholdByInstance.getOrDefault(instanceId, DEFAULT_VAD_THRESHOLD);
-    int   win = vadMsWindowByInstance.getOrDefault(instanceId, DEFAULT_VAD_MSWINDOW);
+    Float _thr = vadThresholdByInstance.get(instanceId);
+    float thr = (_thr != null) ? _thr : DEFAULT_VAD_THRESHOLD;
+    Integer   _win = vadMsWindowByInstance.get(instanceId);
+    int   win = (_win != null) ? _win : DEFAULT_VAD_MSWINDOW;
     out.putDouble("threshold", (double) thr);
     out.putInt("msWindow", win);
     promise.resolve(out);

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

@@ -305,33 +305,20 @@ typedef unsigned int swift_uint4  __attribute__((__ext_vector_type__(4)));
 
 #if defined(__OBJC__)
 
-@class NSURL;
 @class NSString;
 SWIFT_CLASS("_TtC16KeyWordDetection29AudioSessionAndDuckingManager")
 @interface AudioSessionAndDuckingManager : NSObject
 SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly, strong) AudioSessionAndDuckingManager * _Nonnull shared;)
 + (AudioSessionAndDuckingManager * _Nonnull)shared SWIFT_WARN_UNUSED_RESULT;
+- (NSString * _Nullable)getWakewordAudioRoutingConfigJSONString SWIFT_WARN_UNUSED_RESULT;
+- (void)setWakewordAudioRoutingConfigFromJSONString:(NSString * _Nonnull)jsonConfig;
 - (void)initAudioSessAndDuckManage SWIFT_METHOD_FAMILY(none);
-- (void)disableDucking;
-/// Example function to end ducking. Deactivates session and stops engine.
-- (void)_disableDucking;
+- (void)enableRadioInCar;
 - (void)enableAggressiveDucking;
-- (void)_enableAggressiveDucking;
-- (void)enableAggressiveDuckingWorksMaxSilencing;
-- (void)enableAggressiveDuckingWorksOnSecondTime;
-/// Example function to end ducking. Deactivates session and stops engine.
-- (void)disableDuckingWorks;
-- (void)disableDuckingDidNotUnDuck;
-/// Example function to end ducking. Deactivates session and stops engine.
-- (void)disableDuckingOrg;
+- (void)disableDucking;
 - (void)restartListeningAfterDucking;
 /// Example function to end ducking. Deactivates session and stops engine.
 - (void)disableDuckingAndCleanup;
-/// BELOW IS FROM CHATGPT – XXX NOT TESTED AND PROBABLY BUGGY
-- (void)activateSessionForDucking;
-- (void)playInstructionSound:(NSURL * _Nonnull)soundURL;
-- (void)speakInstruction:(NSString * _Nonnull)text;
-- (void)deactivateSession;
 - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER;
 @end
 
@@ -363,7 +350,7 @@ SWIFT_CLASS("_TtC16KeyWordDetection17KeyWordsDetection")
 - (BOOL)setKeywordDetectionLicenseWithLicenseKey:(NSString * _Nonnull)licenseKey SWIFT_WARN_UNUSED_RESULT;
 - (BOOL)setLicenseWithLicenseKey:(NSString * _Nonnull)licenseKey SWIFT_WARN_UNUSED_RESULT;
 - (void)callBackWithFrame:(NSArray<NSNumber *> * _Nonnull)frame;
-- (BOOL)startListeningWithSetActive:(BOOL)setActive duckOthers:(BOOL)duckOthers mixWithOthers:(BOOL)mixWithOthers defaultToSpeaker:(BOOL)defaultToSpeaker SWIFT_WARN_UNUSED_RESULT;
+- (BOOL)startListeningWithNoExternalActivation:(BOOL)noExternalActivation duckOthers:(BOOL)duckOthers mixWithOthers:(BOOL)mixWithOthers defaultToSpeaker:(BOOL)defaultToSpeaker SWIFT_WARN_UNUSED_RESULT;
 - (void)stopListening;
 - (NSDictionary<NSString *, id> * _Nonnull)getVoiceProps SWIFT_WARN_UNUSED_RESULT;
 - (BOOL)startSilentListening SWIFT_WARN_UNUSED_RESULT;
@@ -385,6 +372,51 @@ SWIFT_CLASS("_TtC16KeyWordDetection14LicenseManager")
 - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER;
 @end
 
+SWIFT_CLASS("_TtC16KeyWordDetection25SpeakerVerificationEngine")
+@interface SpeakerVerificationEngine : NSObject
+- (void)resetStreamingState;
+- (nonnull instancetype)init SWIFT_UNAVAILABLE;
++ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");
+@end
+
+@protocol SpeakerVerificationNativeDelegate;
+SWIFT_CLASS("_TtC16KeyWordDetection32SpeakerVerificationMicController")
+@interface SpeakerVerificationMicController : NSObject
+@property (nonatomic, weak) id <SpeakerVerificationNativeDelegate> _Nullable delegate;
+- (BOOL)beginOnboardingWithEnrollmentId:(NSString * _Nonnull)enrollmentId targetEmbeddingCount:(NSInteger)targetEmbeddingCount reset:(BOOL)reset error:(NSError * _Nullable * _Nullable)error;
+/// App calls this each time it wants ONE embedding to be captured from mic.
+/// When collected, controller stops mic and notifies delegate.
+- (BOOL)getNextEmbeddingFromMicAndReturnError:(NSError * _Nullable * _Nullable)error;
+/// Optional explicit finalize (usually you rely on auto-finalize when target reached).
+- (BOOL)finalizeOnboardingNowAndReturnError:(NSError * _Nullable * _Nullable)error;
+- (BOOL)setEnrollmentJson:(NSString * _Nonnull)enrollmentJson error:(NSError * _Nullable * _Nullable)error;
+/// Starts mic and returns first verification result (then stops mic).
+- (BOOL)startVerifyFromMicWithResetState:(BOOL)resetState error:(NSError * _Nullable * _Nullable)error;
+- (void)stop;
+- (nonnull instancetype)init SWIFT_UNAVAILABLE;
++ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");
+@end
+
+SWIFT_PROTOCOL("_TtP16KeyWordDetection33SpeakerVerificationNativeDelegate_")
+@protocol SpeakerVerificationNativeDelegate
+- (void)svOnboardingProgress:(NSDictionary<NSString *, id> * _Nonnull)info;
+- (void)svOnboardingDone:(NSDictionary<NSString *, id> * _Nonnull)info;
+- (void)svVerifyResult:(NSDictionary<NSString *, id> * _Nonnull)info;
+- (void)svError:(NSDictionary<NSString *, id> * _Nonnull)info;
+@end
+
+@class NSError;
+SWIFT_CLASS_NAMED("SpeakerVerificationRNFacade")
+@interface SpeakerVerificationRNFacade : NSObject
++ (id _Nullable)createEngineWithModelPath:(NSString * _Nonnull)modelPath enrollmentJsonPath:(NSString * _Nonnull)enrollmentJsonPath options:(NSDictionary<NSString *, id> * _Nonnull)options error:(NSError * _Nullable * _Nullable)outError SWIFT_WARN_UNUSED_RESULT;
++ (NSDictionary<NSString *, id> * _Nullable)verifyWavWithEngine:(id _Nonnull)engine wavPath:(NSString * _Nonnull)wavPath reset:(BOOL)reset error:(NSError * _Nullable * _Nullable)outError SWIFT_WARN_UNUSED_RESULT;
+- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER;
+@end
+
+@interface SpeakerVerificationRNFacade (SWIFT_EXTENSION(KeyWordDetection))
++ (id _Nullable)createMicControllerWithConfigJson:(NSString * _Nonnull)configJson error:(NSError * _Nullable * _Nullable)outError SWIFT_WARN_UNUSED_RESULT;
+@end
+
 #endif
 #if __has_attribute(external_source_symbol)
 # pragma clang attribute pop