design change

src/bindings.cc

@@ -7,13 +7,15 @@ EMSCRIPTEN_BINDINGS() {
   function("setLogLevel", &vosk_set_log_level, allow_raw_pointers());
   class_<model>("model")
   .constructor<std::string, std::string, int>(allow_raw_pointers())
-  .function("checkModel", &spkModel::checkModel, allow_raw_pointers())
-  .function("afterFetch", &spkModel::afterFetch, allow_raw_pointers());
+  .function("checkModel", &model::checkModel, allow_raw_pointers())
+  .function("afterFetch", &model::afterFetch, allow_raw_pointers())
+  .function("load", &model::load, allow_raw_pointers());
 
   class_<spkModel>("spkModel")
   .constructor<std::string, std::string, int>(allow_raw_pointers())
   .function("checkModel", &spkModel::checkModel, allow_raw_pointers())
-  .function("afterFetch", &spkModel::afterFetch, allow_raw_pointers());
+  .function("afterFetch", &spkModel::afterFetch, allow_raw_pointers())
+  .function("load", &spkModel::load, allow_raw_pointers());
   
   class_<recognizer>("recognizer") 
   .constructor<model*, float, int>(allow_raw_pointers())

src/genericModel.cc

@@ -17,7 +17,7 @@ bool genericModel::checkModel() {
   return id.compare(oldid) == 0 ? true : false;
 }
 void genericModel::afterFetch(int memAddr, size_t size) {
-  // FIXME: Recognizer can reuse this thread to avoid respawning threads
+  // FIXME: Recognizer reuse this thread if possible
   std::thread t{[this, memAddr, size](){
     char* modelData = reinterpret_cast<char*>(memAddr);
     if(!extractModel(modelData, size)) {
@@ -34,8 +34,8 @@ void genericModel::afterFetch(int memAddr, size_t size) {
       return;
     }
     idFile << id;
-    if(!load())
-    fireEv("_continue", ".", index);
+    idFile.close();
+    load(false);
   }};
   t.detach();
 }

src/genericModel.h

@@ -17,7 +17,7 @@ struct genericModel {
   int index{};
   static bool extractModel(const char* fileBuf, size_t size);
   virtual bool checkModelFiles() = 0;
-  virtual bool load() = 0;
+  virtual void load(bool) = 0;
   bool checkModel();
   void afterFetch(int memAddr, size_t size);
   genericModel(const std::string &storepath, const std::string &id, int index);

src/global.cc

@@ -11,21 +11,27 @@ void throwJS(const char* msg, bool err) {
 }
 void fireEv(const char *type, const char *content, int index) {
   static ProxyingQueue pq{};
-  static pthread_t selfTID {pthread_self()};
-  pq.proxySync(selfTID, [&](){
+  static pthread_t selfTID{pthread_self()};
+  static auto proxy{[&](){
     EM_ASM({
-      let ev = new CustomEvent(UTF8ToString($1), {"details" : UTF8ToString($2)});
-      objs[$0].dispatchEvent(ev);
-      console.log(objs[$0], ev)
+      console.log(objs[$0]);
+      objs[$0].dispatchEvent(new CustomEvent(UTF8ToString($1), {"detail" : UTF8ToString($2)}))
     },index, type, content);
-  });
+  }};
+  if(selfTID == pthread_self()) {
+    proxy();
+    return;
+  }
+  pq.proxySync(selfTID, proxy);
 }
   
 int main() {
   //vosk_set_log_level(-1);
   std::thread t{[](){
     wasmfs_create_directory("/opfs",0777,wasmfs_create_opfs_backend());
+    fireEv("_ev", "test", 0);
   }};
   t.detach();
+  fireEv("_ev", "test event", 0);
   emscripten_exit_with_live_runtime();
 }

src/model.cc

@@ -7,13 +7,22 @@ model::~model() {
 void model::afterFetch(int addr, size_t size) {
   genericModel::afterFetch(addr,size);
 }
-void model::checkModel() {
-  genericModel::checkModel();
+bool model::checkModel() {
+  return genericModel::checkModel();
 }
-bool model::load() {
-  mdl = vosk_model_new(storepath.c_str());
-  if(mdl == nullptr) return false;
-  return true;
+void model::load(bool newThrd) {
+  static auto main{[this](){
+    mdl = vosk_model_new(".");
+    if(mdl == nullptr) fireEv("_continue", "Unable to load model for recognition", index);
+    fireEv("_continue", ".", index);
+  }};
+  if(!newThrd) {
+    main();
+    return;
+  }
+  // FIXME: Recognizer reuse this thread if possible
+  std::thread t{main};
+  t.detach();
 }
 bool model::checkModelFiles() { 
   static std::error_code c{};

src/model.h

@@ -5,9 +5,9 @@ struct model : genericModel {
   bool checkModelFiles();
   VoskModel* mdl{};
   model(const std::string& storepath, const std::string& id, int index);
-  void checkModel();
+  bool checkModel();
   void afterFetch(int addr, size_t size);
-  bool load();
+  void load(bool newThrd);
   ~model();
 };
 

src/pre.js

@@ -1,10 +1,10 @@
-let objs =  []
+let objs =  [new EventTarget()]
 class Recognizer extends EventTarget {
   constructor() {
     super()
   }
   _init(model, sampleRate) {
-    this.obj  = new Module.recognizer(model, sampleRate, objs.length)
+    this.obj = new Module.recognizer(model, sampleRate, objs.length)
     objs.push(this)
     this.ptr = Module._malloc(512)
   }
@@ -50,18 +50,20 @@ class Recognizer extends EventTarget {
   }
 }
 class Model extends EventTarget {
-  constructor(url, storepath) {
+  constructor(storepath, id) {
     super()
-    this.obj = new Module.model(url, storepath, objs.length)
+    this.obj = new Module.model(storepath, id, objs.length)
+    objs.push(this)
   }
   delete() {
     this.obj.delete()
   }
 }
 class SpkModel extends EventTarget {
-  constructor(url, storepath) {
+  constructor(storepath, id) {
     super()
-    this.obj = new Module.spkModel(url, storepath, objs.length)
+    this.obj = new Module.spkModel(storepath, id, objs.length)
+    objs.push(this)
   }
   delete() {
     this.obj.delete()
@@ -70,55 +72,55 @@ class SpkModel extends EventTarget {
 Module.deleteAll = () => {
   objs.forEach(obj => obj.delete())
 }
-Module.makeModel = async (url, storepath) => {
-  let mdl = new Model(url, storepath)
+Module.makeModel = async (url, storepath, id) => {
+  let mdl = new Model(storepath, id)
   return new Promise((resolve, reject) => {
-    if(mdl.checkModel()) {
-      objs.push(mdl)
-      resolve(mdl)
+    mdl.addEventListener("_continue", (ev) => {
+      if(ev.detail === ".") {
+        return resolve(mdl)
+      }
+      mdl.delete()
+      return reject(ev.detail)
+    }, {once : true})
+    if(mdl.obj.checkModel()) {
+      mdl.obj.load(true)
+      return resolve(mdl)
     }
     (async () => {
       let res = await fetch(url)
       if(!res.ok) {
-        reject("Unable to download model")
+        return reject("Unable to download model")
       }
       let arr = await res.arrayBuffer()
       let mdlMem = Module._malloc(arr.byteLength) // Will free in C++
       Module.HEAP8.set(new Int8Array(arr), mdlMem)
-      mdl.addEventListener("_continue", (ev) => {
-        if(ev.details === ".") {
-          objs.push(mdl)
-          resolve(mdl)
-        }
-        reject(ev.details)
-      }, {once : true})
-      mdl.afterFetch(mdlMem, arr.byteLength)
+      mdl.obj.afterFetch(mdlMem, arr.byteLength)
     })()
   })
 }
 Module.makeSpkModel = async (url, storepath, id) => {
-  let mdl = new Model(url, storepath)
+  let mdl = new SpkModel(storepath, id)
   return new Promise((resolve, reject) => {
-    if(mdl.checkModel()) {
-      objs.push(mdl)
-      resolve(mdl)
+    mdl.addEventListener("_continue", (ev) => {
+      if(ev.detail === ".") {
+        return resolve(mdl)
+      }
+      mdl.delete()
+      reject(ev.detail)
+    }, {once : true})
+    if(mdl.obj.checkModel()) {
+      mdl.obj.load(true)
+      return resolve(mdl)
     }
     (async () => {
       let res = await fetch(url)
       if(!res.ok) {
-        reject("Unable to download model")
+        return reject("Unable to download model")
       }
       let arr = await res.arrayBuffer()
       let mdlMem = Module._malloc(arr.byteLength) // Will free in C++
       Module.HEAP8.set(new Int8Array(arr), mdlMem)
-      mdl.addEventListener("_continue", (ev) => {
-        if(ev.details === ".") {
-          objs.push(mdl)
-          resolve(mdl)
-        }
-        reject(ev.details)
-      }, {once : true})
-      mdl.afterFetch(mdlMem, arr.byteLength)
+      mdl.obj.afterFetch(mdlMem, arr.byteLength)
     })()
   })
 }
@@ -126,10 +128,12 @@ Module.makeRecognizer = (model, sampleRate) => {
   let rec = new Recognizer()
   let retval = new Promise((resolve, reject) => {
     rec.addEventListener("_continue", (ev) => {
-      if(ev.details == ".") {
+      if(ev.detail == ".") {
+        objs.push(rec)
         resolve(rec)
       }
-      reject(ev.details)
+      rec.delete()
+      reject(ev.detail)
     }, {once : true})
   })
   rec._init(model.obj, sampleRate)

src/processor.js

@@ -13,14 +13,13 @@ if(typeof BRProcessor === "undefined") {
             break
           case "deinit":
             this.done = true
-            break
         }
       }
     }
     process(inputs, outputs, params) {
       if(this.done) return false;
       this.wasmMem.set(inputs[0].getChannelData(this.channel));
-      this.recognizerPort.postMessage(".") // Basically an empty message
+      this.recognizerPort.postMessage(".") 
       outputs = inputs
       return true
     }

src/spkModel.cc

@@ -8,16 +8,25 @@ spkModel::spkModel(const std::string& storepath, const std::string& id, int inde
 spkModel::~spkModel() {
   vosk_spk_model_free(mdl);
 }
-void spkModel::checkModel() {
-  genericModel::checkModel();
+bool spkModel::checkModel() {
+  return genericModel::checkModel();
 }
 void spkModel::afterFetch(int addr, size_t size) {
   genericModel::afterFetch(addr,size);
 }
-bool spkModel::load() {
-  mdl = vosk_spk_model_new(storepath.c_str());
-  if(mdl == nullptr) return false;
-  return true;
+void spkModel::load(bool newThrd) {
+  static auto main{[this](){
+    mdl = vosk_spk_model_new(".");
+    if(mdl == nullptr) fireEv("_continue", "Unable to load model for recognition", index);
+    fireEv("_continue", ".", index);
+  }};
+  if(!newThrd) {
+    main();
+    return;
+  }
+  // FIXME: Recognizer reuse this thread if possible
+  std::thread t{main};
+  t.detach();
 }
 bool spkModel::checkModelFiles() {
   return fs::exists("mfcc.conf") && 

src/spkModel.h

@@ -5,8 +5,8 @@ struct spkModel : genericModel {
   bool checkModelFiles();
   VoskSpkModel* mdl{};
   spkModel(const std::string& storepath, const std::string& id, int index);
-  void checkModel();
+  bool checkModel();
   void afterFetch(int addr, size_t size);
-  bool load();
+  void load(bool newThrd);
   ~spkModel();
 };

src/vosk.patch

@@ -1,3 +1,83 @@
+diff --git a/src/model.cc b/src/model.cc
+index 035ffee..9cb7e30 100644
+--- a/src/model.cc
++++ b/src/model.cc
+@@ -74,38 +74,48 @@ static void KaldiLogHandler(const LogMessageEnvelope &env, const char *message)
+ #else
+ static void KaldiLogHandler(const LogMessageEnvelope &env, const char *message)
+ {
+-  if (env.severity > GetVerboseLevel())
+-      return;
++    if (env.severity > GetVerboseLevel())
++        return;
+ 
+-  // Modified default Kaldi logging so we can disable LOG messages.
+-  std::stringstream full_message;
+-  if (env.severity > LogMessageEnvelope::kInfo) {
+-    full_message << "VLOG[" << env.severity << "] (";
+-  } else {
++    // Modified default Kaldi logging so we can disable LOG messages.
++    std::stringstream full_message;
++    if (env.severity > LogMessageEnvelope::kInfo) {
++        full_message << "VLOG[" << env.severity << "] (";
++    } else {
++        switch (env.severity) {
++        case LogMessageEnvelope::kInfo:
++        full_message << "LOG (";
++        break;
++        case LogMessageEnvelope::kWarning:
++        full_message << "WARNING (";
++        break;
++        case LogMessageEnvelope::kAssertFailed:
++        full_message << "ASSERTION_FAILED (";
++        break;
++        case LogMessageEnvelope::kError:
++        default: // If not the ERROR, it still an error!
++        full_message << "ERROR (";
++        break;
++        }
++    }
++    // Add other info from the envelope and the message text.
++    full_message << "VoskAPI" << ':'
++                << env.func << "():" << env.file << ':'
++                << env.line << ") " << message;
++    if(env.severity > LogMessageEnvelope::kInfo) {
++        emscripten_console_log(full_message.str().c_str());
++        return;
++    }
+     switch (env.severity) {
+     case LogMessageEnvelope::kInfo:
+-      full_message << "LOG (";
+-      break;
++        emscripten_console_log(full_message.str().c_str());
++        break;
+     case LogMessageEnvelope::kWarning:
+-      full_message << "WARNING (";
+-      break;
+-    case LogMessageEnvelope::kAssertFailed:
+-      full_message << "ASSERTION_FAILED (";
+-      break;
+-    case LogMessageEnvelope::kError:
+-    default: // If not the ERROR, it still an error!
+-      full_message << "ERROR (";
+-      break;
++        emscripten_console_warn(full_message.str().c_str());
++        break;
++    default:
++        emscripten_console_error(full_message.str().c_str());
+     }
+-  }
+-  // Add other info from the envelope and the message text.
+-  full_message << "VoskAPI" << ':'
+-               << env.func << "():" << env.file << ':'
+-               << env.line << ") " << message;
+-
+-  // Print the complete message to stderr.
+-  full_message << "\n";
+-  std::cerr << full_message.str();
+ }
+ #endif
+ 
 diff --git a/src/recognizer.cc b/src/recognizer.cc
 index 1da6e6b..5e0652a 100644
 --- a/src/recognizer.cc

test/index.html

@@ -30,4 +30,7 @@
       })()*/
     </script>
   </head>
+  <body>
+    <button>I am just another button lol</button>
+  </body>
 </html>

test/test.sh

@@ -35,4 +35,4 @@ fi
 export PATH=:$PATH:$EMSDK/upstream/bin &&
 
 cd $SRC &&
-em++ -O0 global.cc genericModel.cc model.cc spkModel.cc recognizer.cc bindings.cc -sWASMFS -sWASM_BIGINT -sSINGLE_FILE -sEMBIND_STD_STRING_IS_UTF8 -sASSERTIONS=2 -sEXPORTED_RUNTIME_METHODS=UTF8ToString,stringToUTF8OnStack -sEXPORTED_FUNCTIONS=_malloc,_free,_main -sSUPPORT_LONGJMP=0 -sMODULARIZE -sEXPORT_NAME=loadBR -sENVIRONMENT=web,worker -sINITIAL_MEMORY=$MAX_MEMORY -sPTHREAD_POOL_SIZE=$MAX_THREADS -sPTHREAD_POOL_SIZE_STRICT -sALLOW_BLOCKING_ON_MAIN_THREAD=1 -sPOLYFILL=0 --pre-js pre.js -I. -I$LIBARCHIVE/include -I$VOSK/src -L$LIBARCHIVE/lib -larchive -L$ZSTD/lib -lzstd -L$KALDI/src -l:online2/kaldi-online2.a -l:decoder/kaldi-decoder.a -l:ivector/kaldi-ivector.a -l:gmm/kaldi-gmm.a -l:tree/kaldi-tree.a -l:feat/kaldi-feat.a -l:cudamatrix/kaldi-cudamatrix.a -l:lat/kaldi-lat.a -l:lm/kaldi-lm.a -l:rnnlm/kaldi-rnnlm.a -l:hmm/kaldi-hmm.a -l:nnet3/kaldi-nnet3.a -l:transform/kaldi-transform.a -l:matrix/kaldi-matrix.a -l:fstext/kaldi-fstext.a -l:util/kaldi-util.a -l:base/kaldi-base.a -L$OPENFST/lib -l:libfst.a -l:libfstngram.a -L$CLAPACK_WASM -l:CBLAS/lib/cblas.a -l:CLAPACK-3.2.1/lapack.a -l:CLAPACK-3.2.1/libcblaswr.a -l:f2c_BLAS-3.8.0/blas.a -l:libf2c/libf2c.a -L$VOSK/src -l:vosk.a -lopfs.js -lembind -pthread -flto -o ../test/BrowserRecognizer.js
+em++ -O0 global.cc genericModel.cc model.cc spkModel.cc recognizer.cc bindings.cc -sWASMFS -sWASM_BIGINT -sSINGLE_FILE -sEMBIND_STD_STRING_IS_UTF8 -sEXPORTED_RUNTIME_METHODS=UTF8ToString,stringToUTF8OnStack -sMODULARIZE -sEXPORTED_FUNCTIONS=_malloc,_free,_main -sSUPPORT_LONGJMP=0 -sEXPORT_NAME=loadBR -sENVIRONMENT=web,worker -sINITIAL_MEMORY=$MAX_MEMORY -sPTHREAD_POOL_SIZE=$MAX_THREADS -sPTHREAD_POOL_SIZE_STRICT=2 -sALLOW_BLOCKING_ON_MAIN_THREAD=1 -sPOLYFILL=0 -sPTHREAD_POOL_DELAY_LOAD --pre-js pre.js -I. -I$LIBARCHIVE/include -I$VOSK/src -L$LIBARCHIVE/lib -larchive -L$ZSTD/lib -lzstd -L$KALDI/src -l:online2/kaldi-online2.a -l:decoder/kaldi-decoder.a -l:ivector/kaldi-ivector.a -l:gmm/kaldi-gmm.a -l:tree/kaldi-tree.a -l:feat/kaldi-feat.a -l:cudamatrix/kaldi-cudamatrix.a -l:lat/kaldi-lat.a -l:lm/kaldi-lm.a -l:rnnlm/kaldi-rnnlm.a -l:hmm/kaldi-hmm.a -l:nnet3/kaldi-nnet3.a -l:transform/kaldi-transform.a -l:matrix/kaldi-matrix.a -l:fstext/kaldi-fstext.a -l:util/kaldi-util.a -l:base/kaldi-base.a -L$OPENFST/lib -l:libfst.a -l:libfstngram.a -L$CLAPACK_WASM -l:CBLAS/lib/cblas.a -l:CLAPACK-3.2.1/lapack.a -l:CLAPACK-3.2.1/libcblaswr.a -l:f2c_BLAS-3.8.0/blas.a -l:libf2c/libf2c.a -L$VOSK/src -l:vosk.a -lopfs.js -lembind -pthread -flto -o ../test/BrowserRecognizer.js