react-native-wakeword 1.0.29 → 1.0.31

package/README.md

@@ -3,11 +3,7 @@ DaVoice.io Voice commands / Wake words / Voice to Intent / keyword detection npm
 
 Contact us at info@DaVoice.io
 
-## What's in this package
-
-### This package includes 
-1. "Wake Word" (also known as: "keyword detection" and "phrase spotting") api to enable ios and android applications.
-2. "Speech to Intent" (also known as: "voice commands" and "phrase spotting") very similar to "Wake Word" however mainly used to use speech command to control the application rather than waking up the application.
+# IOS and Android Package
 
 ## Installation
 npm install react-native-wakeword

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "react-native-wakeword",
-    "version": "1.0.29",
+    "version": "1.0.31",
     "description": "Voice/Wake-word detection library for React Native",
     "main": "wakewords/index.js",
     "types": "wakewords/index.d.ts",
@@ -31,8 +31,12 @@
         "react-native",
         "voice commands",
         "wake word",
+        "wakeword",
+        "wake words",
         "keyword detection",
         "keyword spotting",
+        "speech to intent",
+        "voice to intent",
         "phrase spotting"
     ],
     "author": "Davoice.io",

package/wakewords/KeyWordRNBridge.d.ts

@@ -4,13 +4,13 @@ export class KeyWordRNBridgeInstance {
     listeners: any[];
     isFirstInstance: boolean;
     isSticky: any;
-    createInstance(modelName: any, threshold: any, bufferCnt: any): any;
-    setKeywordDetectionLicense(license: any): any;
-    replaceKeywordDetectionModel(modelName: any, threshold: any, bufferCnt: any): any;
-    setKeywordLicense(license: any): any;
-    startKeywordDetection(threshold: any): any;
-    stopKeywordDetection(): any;
-    destroyInstance(): any;
+    createInstance(modelName: any, threshold: any, bufferCnt: any): Promise<any>;
+    setKeywordDetectionLicense(license: any): Promise<any>;
+    replaceKeywordDetectionModel(modelName: any, threshold: any, bufferCnt: any): Promise<any>;
+    setKeywordLicense(license: any): Promise<any>;
+    startKeywordDetection(threshold: any): Promise<any>;
+    stopKeywordDetection(): Promise<any>;
+    destroyInstance(): Promise<any>;
     onKeywordDetectionEvent(callback: any): void;
     removeListeners(): void;
 }

package/wakewords/KeyWordRNBridge.js

@@ -20,30 +20,25 @@ export class KeyWordRNBridgeInstance {
       this.isSticky = isSticky;
     }
   
-    createInstance(
-      modelName,
-      threshold,
-      bufferCnt) 
-      {
-      instance = KeyWordRNBridge.createInstance(
+    async createInstance(modelName, threshold, bufferCnt) {
+      instance = await KeyWordRNBridge.createInstance(
         this.instanceId,
         modelName,
         threshold,
-        bufferCnt
-      );
+        bufferCnt);
       if (instance && this.isFirstInstance)
       {
         this.isFirstInstance = false;
-        KeyWordRNBridge.startForegroundService(this.instanceId); 
+        await KeyWordRNBridge.startForegroundService(this.instanceId); 
       }
       return instance;
     }
 
-    setKeywordDetectionLicense(license) {
+    async setKeywordDetectionLicense(license) {
         return KeyWordRNBridge.setKeywordDetectionLicense(this.instanceId, license);
     }
 
-    replaceKeywordDetectionModel(modelName, threshold, bufferCnt) {
+    async replaceKeywordDetectionModel(modelName, threshold, bufferCnt) {
         return KeyWordRNBridge.replaceKeywordDetectionModel(this.instanceId, modelName, threshold, bufferCnt);
     }
     /*startForegroundService() {
@@ -53,19 +48,19 @@ export class KeyWordRNBridgeInstance {
     stopForegroundService() {
         return KeyWordRNBridge.stopForegroundService(this.instanceId);
     }*/
-    setKeywordLicense(license) {
+    async setKeywordLicense(license) {
         return KeyWordRNBridge.setKeywordLicense(this.instanceId, license);
     }
 
-    startKeywordDetection(threshold) {
+    async startKeywordDetection(threshold) {
         return KeyWordRNBridge.startKeywordDetection(this.instanceId, threshold);
     }
 
-    stopKeywordDetection() {
+    async stopKeywordDetection() {
         return KeyWordRNBridge.stopKeywordDetection(this.instanceId);
     }
 
-    destroyInstance() {
+    async destroyInstance() {
         return KeyWordRNBridge.destroyInstance(this.instanceId);
     }
 

package/wakewords/useModel.d.ts

@@ -1,3 +1,10 @@
+interface instanceConfig {
+    id: string;
+    modelName: string;
+    threshold: number;
+    bufferCnt: number;
+    sticky: boolean;
+}
 /**
  * Custom hook for handling keyword detection using KeyWordRNBridge
  * @returns An object with functions and state for keyword detection
@@ -5,7 +12,7 @@
 export declare const useModel: () => {
     isListening: boolean;
     startListening: () => Promise<void>;
-    loadModel: (models: [string], callback: (phrase: string) => void) => Promise<void>;
+    loadModel: (useConfigs: instanceConfig[], callback: (phrase: string) => void) => Promise<void>;
     setKeywordDetectionLicense: (licenseKey: string) => Promise<void>;
     stopListening: () => Promise<void>;
 };

package/wakewords/useModel.tsx

@@ -27,9 +27,8 @@ function findInstanceById(id: string): keyWordRNBridgeInstanceConfig | undefined
 }
 
 // Create an array of instance configurations
-const instanceConfigs:instanceConfig[] = [
+var instanceConfigs:instanceConfig[] = [
     { id: 'need_help_now', modelName: 'need_help_now.onnx', threshold: 0.9999, bufferCnt: 3 , sticky: false },
-    { id: 'default', modelName: "", threshold: 0.9999, bufferCnt: 2 , sticky: false }
 ];
 
 // Function to add a new instance dynamically
@@ -44,7 +43,7 @@ async function addInstance(
     if (instanceConf != null) {
         console.log("Found Instance: ", id, "starting to listen");
         const instance = instanceConf.instance;
-        instance.startKeywordDetection(conf.threshold);
+        await instance.startKeywordDetection(conf.threshold);
         return instance;
     }
     const instance = await createKeyWordRNBridgeInstance(id, conf.sticky);
@@ -69,7 +68,7 @@ async function addInstance(
       callback(id);
     });
     console.log(`Instance ${id} calling startKeywordDetection()`);
-    instance.startKeywordDetection(conf.threshold);
+    await instance.startKeywordDetection(conf.threshold);
     console.log(`Instance ${id} started Keyword Detection`);
     return instance;
   }
@@ -134,27 +133,16 @@ export const useModel = () => {
      * @param bufferCount - The number of audio buffers
      */
     const loadModel = useCallback(
-        async (models: [string], callback: (phrase: string) => void): Promise<void> => {
+        async (useConfigs: instanceConfig[], callback: (phrase: string) => void): Promise<void> => {
 
         console.log("loadModel()");
-        let searchIds = models;
+        instanceConfigs = useConfigs;
         let element:any = null;
-        console.log("loadModel() - models == ", models)
+        console.log("loadModel() - instanceConfigs == ", instanceConfigs)
         try {
-            stopListening();
-            searchIds.forEach(sId => {
-                element = instanceConfigs.find(element => element.id === sId.split(".")[0]);
-                if (element == null || element == undefined) {
-                    //console.error('element id' + sId + " not found in instanceConfigs");
-                    //return;
-                }
-                else {
-                    element = Object.assign({}, instanceConfigs.find(element => element.id === 'default'));
-                    element.modelName = sId;
-                    element.id = sId.split(".")[0];
-                }
-                console.log('element:', element);
-                const id = addInstance(element, callback);
+            instanceConfigs.forEach(async element => {
+                console.log('Adding element:', element);
+                const id = await addInstance(element, callback);
             });
         } catch (error) {
             console.error("[useModel] Error loading model:", error);
@@ -166,9 +154,14 @@ export const useModel = () => {
      */
     const startListening = useCallback(async () => {
         try {
-            keyWordRNBridgeInstances.forEach(element => {
+            keyWordRNBridgeInstances.forEach(async element => {
                 const instance = element.instance;
-                instance.startKeywordDetection();
+                const conf = instanceConfigs.find(element => element.id === instance.instanceId);
+                if (conf) {
+                    await instance.startKeywordDetection(conf.threshold);
+                } else {
+                    console.error(`No configuration found for instance ID: ${instance.instanceId}`);
+                }
                 /*if (instance.isSticky == false) {
                     instance.stopKeywordDetection();
                 } else if (Platform.OS != 'ios') {
@@ -186,9 +179,9 @@ export const useModel = () => {
      */
     const stopListening = useCallback(async () => {
         try {
-            keyWordRNBridgeInstances.forEach(element => {
+            keyWordRNBridgeInstances.forEach(async element => {
                 const instance = element.instance;
-                instance.stopKeywordDetection();
+                await instance.stopKeywordDetection();
                 /*if (instance.isSticky == false) {
                     instance.stopKeywordDetection();
                 } else if (Platform.OS != 'ios') {