patrick/Vosklet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NEVER FORGET TO SPECIFY THE 3RD ARG WHEN USING O_CREAT. NEVER EVER AGAIN! (2 months wasted). Worked for mode 0

Browse Source
This commit is contained in:
msqr1
2024-03-06 23:04:28 -08:00
parent c650bf4b12
commit 05f14c3671
8 changed files with 10304 additions and 16874 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
devel/Vosklet.d.ts vendored
View File

@@ -7,13 +7,15 @@ interface WasmModule {
__emscripten_thread_init(_0: number, _1: number, _2: number, _3: number, _4: number, _5: number): void; __emscripten_thread_init(_0: number, _1: number, _2: number, _3: number, _4: number, _5: number): void;
__emscripten_thread_crashed(): void; __emscripten_thread_crashed(): void;
__emscripten_thread_exit(_0: number): void; __emscripten_thread_exit(_0: number): void;
__ZN6__asan9FakeStack17AddrIsInFakeStackEm(_0: number, _1: number): number;
__ZN6__asan9FakeStack8AllocateEmmm(_0: number, _1: number, _2: number, _3: number): number;
___set_stack_limits(_0: number, _1: number): void; ___set_stack_limits(_0: number, _1: number): void;
} }
export interface genericModel { export interface genericModel {
check(): void; check(): void;
afterFetch(): void; afterFetch(): void;
load(_0: boolean): void; load(): void;
delete(): void; delete(): void;
} }

7318
devel/Vosklet.js
View File

File diff suppressed because one or more lines are too long

19611
devel/Vosklet.js.symbols
View File

File diff suppressed because it is too large Load Diff

166
devel/Vosklet.worker.js
View File

@@ -1,165 +1 @@
/** "use strict";var Module={};var initializedJS=false;function threadPrintErr(...args){var text=args.join(" ");console.error(text)}function threadAlert(...args){var text=args.join(" ");postMessage({cmd:"alert",text:text,threadId:Module["_pthread_self"]()})}var err=threadPrintErr;self.alert=threadAlert;Module["instantiateWasm"]=(info,receiveInstance)=>{var module=Module["wasmModule"];Module["wasmModule"]=null;var instance=new WebAssembly.Instance(module,info);return receiveInstance(instance)};self.onunhandledrejection=e=>{throw e.reason||e};function handleMessage(e){try{if(e.data.cmd==="load"){let messageQueue=[];self.onmessage=e=>messageQueue.push(e);self.startWorker=instance=>{Module=instance;postMessage({"cmd":"loaded"});for(let msg of messageQueue){handleMessage(msg)}self.onmessage=handleMessage};Module["wasmModule"]=e.data.wasmModule;for(const handler of e.data.handlers){Module[handler]=(...args)=>{postMessage({cmd:"callHandler",handler:handler,args:args})}}Module["wasmMemory"]=e.data.wasmMemory;Module["buffer"]=Module["wasmMemory"].buffer;Module["ENVIRONMENT_IS_PTHREAD"]=true;if(typeof e.data.urlOrBlob=="string"){importScripts(e.data.urlOrBlob)}else{var objectUrl=URL.createObjectURL(e.data.urlOrBlob);importScripts(objectUrl);URL.revokeObjectURL(objectUrl)}loadVosklet(Module)}else if(e.data.cmd==="run"){Module["__emscripten_thread_init"](e.data.pthread_ptr,0,0,1);Module["__emscripten_thread_mailbox_await"](e.data.pthread_ptr);Module["establishStackSpace"]();Module["PThread"].receiveObjectTransfer(e.data);Module["PThread"].threadInitTLS();if(!initializedJS){Module["__embind_initialize_bindings"]();initializedJS=true}try{Module["invokeEntryPoint"](e.data.start_routine,e.data.arg)}catch(ex){if(ex!="unwind"){throw ex}}}else if(e.data.cmd==="cancel"){if(Module["_pthread_self"]()){Module["__emscripten_thread_exit"](-1)}}else if(e.data.target==="setimmediate"){}else if(e.data.cmd==="checkMailbox"){if(initializedJS){Module["checkMailbox"]()}}else if(e.data.cmd){err(`worker.js received unknown command ${e.data.cmd}`);err(e.data)}}catch(ex){Module["__emscripten_thread_crashed"]?.();throw ex}}self.onmessage=handleMessage;
* @license
* Copyright 2015 The Emscripten Authors
* SPDX-License-Identifier: MIT
*/
// Pthread Web Worker startup routine:
// This is the entry point file that is loaded first by each Web Worker
// that executes pthreads on the Emscripten application.
'use strict';
var Module = {};
// Thread-local guard variable for one-time init of the JS state
var initializedJS = false;
function assert(condition, text) {
if (!condition) abort('Assertion failed: ' + text);
}
function threadPrintErr(...args) {
var text = args.join(' ');
console.error(text);
}
function threadAlert(...args) {
var text = args.join(' ');
postMessage({cmd: 'alert', text, threadId: Module['_pthread_self']()});
}
// We don't need out() for now, but may need to add it if we want to use it
// here. Or, if this code all moves into the main JS, that problem will go
// away. (For now, adding it here increases code size for no benefit.)
var out = () => { throw 'out() is not defined in worker.js.'; }
var err = threadPrintErr;
self.alert = threadAlert;
var dbg = threadPrintErr;
Module['instantiateWasm'] = (info, receiveInstance) => {
// Instantiate from the module posted from the main thread.
// We can just use sync instantiation in the worker.
var module = Module['wasmModule'];
// We don't need the module anymore; new threads will be spawned from the main thread.
Module['wasmModule'] = null;
var instance = new WebAssembly.Instance(module, info);
// TODO: Due to Closure regression https://github.com/google/closure-compiler/issues/3193,
// the above line no longer optimizes out down to the following line.
// When the regression is fixed, we can remove this if/else.
return receiveInstance(instance);
}
// Turn unhandled rejected promises into errors so that the main thread will be
// notified about them.
self.onunhandledrejection = (e) => {
throw e.reason || e;
};
function handleMessage(e) {
try {
if (e.data.cmd === 'load') { // Preload command that is called once per worker to parse and load the Emscripten code.
// Until we initialize the runtime, queue up any further incoming messages.
let messageQueue = [];
self.onmessage = (e) => messageQueue.push(e);
// And add a callback for when the runtime is initialized.
self.startWorker = (instance) => {
Module = instance;
// Notify the main thread that this thread has loaded.
postMessage({ 'cmd': 'loaded' });
// Process any messages that were queued before the thread was ready.
for (let msg of messageQueue) {
handleMessage(msg);
}
// Restore the real message handler.
self.onmessage = handleMessage;
};
// Module and memory were sent from main thread
Module['wasmModule'] = e.data.wasmModule;
// Use `const` here to ensure that the variable is scoped only to
// that iteration, allowing safe reference from a closure.
for (const handler of e.data.handlers) {
Module[handler] = (...args) => {
dbg(`calling handler on main thread: ${handler}`);
postMessage({ cmd: 'callHandler', handler, args: args });
}
}
Module['wasmMemory'] = e.data.wasmMemory;
Module['wasmOffsetData'] = e.data.wasmOffsetConverter;
Module['buffer'] = Module['wasmMemory'].buffer;
Module['workerID'] = e.data.workerID;
Module['ENVIRONMENT_IS_PTHREAD'] = true;
if (typeof e.data.urlOrBlob == 'string') {
importScripts(e.data.urlOrBlob);
} else {
var objectUrl = URL.createObjectURL(e.data.urlOrBlob);
importScripts(objectUrl);
URL.revokeObjectURL(objectUrl);
}
loadVosklet(Module);
} else if (e.data.cmd === 'run') {
// Pass the thread address to wasm to store it for fast access.
Module['__emscripten_thread_init'](e.data.pthread_ptr, /*is_main=*/0, /*is_runtime=*/0, /*can_block=*/1);
// Await mailbox notifications with `Atomics.waitAsync` so we can start
// using the fast `Atomics.notify` notification path.
Module['__emscripten_thread_mailbox_await'](e.data.pthread_ptr);
assert(e.data.pthread_ptr);
// Also call inside JS module to set up the stack frame for this pthread in JS module scope
Module['establishStackSpace']();
Module['PThread'].receiveObjectTransfer(e.data);
Module['PThread'].threadInitTLS();
if (!initializedJS) {
// Embind must initialize itself on all threads, as it generates support JS.
// We only do this once per worker since they get reused
Module['__embind_initialize_bindings']();
initializedJS = true;
}
try {
Module['invokeEntryPoint'](e.data.start_routine, e.data.arg);
} catch(ex) {
if (ex != 'unwind') {
// The pthread "crashed". Do not call `_emscripten_thread_exit` (which
// would make this thread joinable). Instead, re-throw the exception
// and let the top level handler propagate it back to the main thread.
throw ex;
}
dbg(`Pthread 0x${Module['_pthread_self']().toString(16)} completed its main entry point with an 'unwind', keeping the worker alive for asynchronous operation.`);
}
} else if (e.data.cmd === 'cancel') { // Main thread is asking for a pthread_cancel() on this thread.
if (Module['_pthread_self']()) {
Module['__emscripten_thread_exit'](-1);
}
} else if (e.data.target === 'setimmediate') {
// no-op
} else if (e.data.cmd === 'checkMailbox') {
if (initializedJS) {
Module['checkMailbox']();
}
} else if (e.data.cmd) {
// The received message looks like something that should be handled by this message
// handler, (since there is a e.data.cmd field present), but is not one of the
// recognized commands:
err(`worker.js received unknown command ${e.data.cmd}`);
err(e.data);
}
} catch(ex) {
err(`worker.js onmessage() captured an uncaught exception: ${ex}`);
if (ex?.stack) err(ex.stack);
Module['__emscripten_thread_crashed']?.();
throw ex;
}
};
self.onmessage = handleMessage;

8
devel/test.sh
View File

@@ -9,7 +9,7 @@ LIBARCHIVE=$(realpath libarchive) &&
CLAPACK_WASM=$(realpath clapack-wasm) && CLAPACK_WASM=$(realpath clapack-wasm) &&
MAX_MEMORY=${MAX_MEMORY:-300mb} && MAX_MEMORY=${MAX_MEMORY:-300mb} &&
MAX_THREADS=${MAX_THREADS:-2} && MAX_THREADS=${MAX_THREADS:-3} &&
EMSDK=${EMSDK:-$(realpath emsdk)} && EMSDK=${EMSDK:-$(realpath emsdk)} &&
if [ ! -d $EMSDK ]; then if [ ! -d $EMSDK ]; then
@@ -28,9 +28,9 @@ fi
. $EMSDK/emsdk_env.sh && . $EMSDK/emsdk_env.sh &&
cd $SRC && cd $SRC &&
MODE=0 && MODE=1 &&
if [ $MODE = 0 ]; then if [ $MODE = 0 ]; then
em++ -O0 global.cc genericModel.cc recognizer.cc bindings.cc -sWASMFS -sWASM_BIGINT -sSINGLE_FILE -sGZIP_EMBEDDINGS -sMODULARIZE -sEMBIND_STD_STRING_IS_UTF8 -sPTHREAD_POOL_DELAY_LOAD -sRUNTIME_DEBUG -sSTACK_OVERFLOW_CHECK=2 -sTEXTDECODER=2 -sPTHREAD_POOL_SIZE_STRICT=2 -sASSERTIONS=2 -sDISABLE_EXCEPTION_CATCHING=0 -sINITIAL_MEMORY=$MAX_MEMORY -sPTHREAD_POOL_SIZE=$MAX_THREADS -sPOLYFILL=0 -sSUPPORT_LONGJMP=0 -sEXPORTED_FUNCTIONS=_malloc -sEXPORT_NAME=loadVosklet -sMALLOC=emmalloc -sEXPORTED_RUNTIME_METHODS=UTF8ToString,stringToUTF8OnStack -sENVIRONMENT=web,worker -I. -I$LIBARCHIVE/include -I$VOSK/src -L$LIBARCHIVE/lib -larchive -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 -msimd128 --emit-symbol-map --embind-emit-tsd Vosklet.d.ts --pre-js pre.js -fsanitize=undefined -o ../devel/Vosklet.js em++ -O0 global.cc genericModel.cc recognizer.cc bindings.cc -sWASMFS -sWASM_BIGINT -sSINGLE_FILE -sGZIP_EMBEDDINGS -sMODULARIZE -sEMBIND_STD_STRING_IS_UTF8 -sPTHREAD_POOL_DELAY_LOAD -sRUNTIME_DEBUG -sSTACK_OVERFLOW_CHECK=2 -sTEXTDECODER=2 -sPTHREAD_POOL_SIZE_STRICT=2 -sASSERTIONS=2 -sINITIAL_MEMORY=$MAX_MEMORY -sPTHREAD_POOL_SIZE=$MAX_THREADS -sDISABLE_EXCEPTION_CATCHING=0 -sEXIT_RUNTIME=0 -sPOLYFILL=0 -sEXPORTED_FUNCTIONS=_malloc -sEXPORT_NAME=loadVosklet -sMALLOC=emmalloc -sEXPORTED_RUNTIME_METHODS=UTF8ToString,stringToUTF8OnStack -sENVIRONMENT=web,worker -I. -I$LIBARCHIVE/include -I$VOSK/src -L$LIBARCHIVE/lib -larchive -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 -msimd128 --emit-symbol-map --embind-emit-tsd Vosklet.d.ts --pre-js pre.js -fsanitize=undefined -fsanitize=address -o ../devel/Vosklet.js
else else
em++ -O3 global.cc genericModel.cc recognizer.cc bindings.cc -sWASMFS -sWASM_BIGINT -sSINGLE_FILE -sGZIP_EMBEDDINGS -sMODULARIZE -sEMBIND_STD_STRING_IS_UTF8 -sPTHREAD_POOL_DELAY_LOAD -sTEXTDECODER=2 -sPTHREAD_POOL_SIZE_STRICT=2 -sINITIAL_MEMORY=$MAX_MEMORY -sPTHREAD_POOL_SIZE=$MAX_THREADS -sPOLYFILL=0 -sSUPPORT_LONGJMP=0 -sEXPORTED_FUNCTIONS=_malloc -sEXPORT_NAME=Vosklet -sMALLOC=emmalloc -sEXPORTED_RUNTIME_METHODS=UTF8ToString,stringToUTF8OnStack -sENVIRONMENT=web,worker -I. -I$LIBARCHIVE/include -I$VOSK/src -L$LIBARCHIVE/lib -larchive -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 -msimd128 --pre-js pre.js -o ../devel/Vosklet.js em++ -O3 global.cc genericModel.cc recognizer.cc bindings.cc -sWASMFS -sWASM_BIGINT -sSINGLE_FILE -sGZIP_EMBEDDINGS -sMODULARIZE -sEMBIND_STD_STRING_IS_UTF8 -sPTHREAD_POOL_DELAY_LOAD -sTEXTDECODER=2 -sPTHREAD_POOL_SIZE_STRICT=2 -sINITIAL_MEMORY=$MAX_MEMORY -sPTHREAD_POOL_SIZE=$MAX_THREADS -sPOLYFILL=0 -sEXIT_RUNTIME=0 -sSUPPORT_LONGJMP=0 -sEXPORTED_FUNCTIONS=_malloc -sEXPORT_NAME=loadVosklet -sMALLOC=emmalloc -sEXPORTED_RUNTIME_METHODS=UTF8ToString,stringToUTF8OnStack -sENVIRONMENT=web,worker -I. -I$LIBARCHIVE/include -I$VOSK/src -L$LIBARCHIVE/lib -larchive -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 -msimd128 --pre-js pre.js -o ../devel/Vosklet.js
fi fi

58
src/genericModel.cc
View File

@@ -1,12 +1,7 @@
#include "genericModel.h" #include "genericModel.h"
genericModel::genericModel(std::string storepath, std::string id, int index, bool normalMdl) : index(index), normalMdl(normalMdl) { genericModel::genericModel(std::string storepath, std::string id, int index, bool normalMdl) : index(index), normalMdl(normalMdl), storepath(std::move(storepath)), id(std::move(id)) {}
this->storepath = new char[storepath.size()]; void genericModel::load() {
this->id = new char[id.size()];
strcpy(this->storepath, storepath.c_str());
strcpy(this->id, id.c_str());
}
void genericModel::load(bool newTask) {
auto main{[this](){ auto main{[this](){
if(normalMdl) { if(normalMdl) {
VoskModel* temp {vosk_model_new(".")}; VoskModel* temp {vosk_model_new(".")};
@@ -26,14 +21,10 @@ void genericModel::load(bool newTask) {
} }
fireEv("_continue", nullptr, index); fireEv("_continue", nullptr, index);
}}; }};
if(!newTask) {
main();
return;
}
thrd.addTask(main); thrd.addTask(main);
} }
bool genericModel::checkFiles() { bool genericModel::checkFiles() {
if(std::holds_alternative<VoskModel*>(mdl)) { if(normalMdl) {
return fs::exists("am/final.mdl", tank) && return fs::exists("am/final.mdl", tank) &&
fs::exists("conf/mfcc.conf", tank) && fs::exists("conf/mfcc.conf", tank) &&
fs::exists("conf/model.conf", tank) && fs::exists("conf/model.conf", tank) &&
@@ -54,13 +45,11 @@ bool genericModel::checkFiles() {
fs::exists("transform.mat", tank); fs::exists("transform.mat", tank);
} }
genericModel::~genericModel() { genericModel::~genericModel() {
if(std::holds_alternative<VoskModel*>(mdl)) { if(normalMdl) {
vosk_model_free(std::get<0>(mdl)); vosk_model_free(std::get<0>(mdl));
return; return;
} }
vosk_spk_model_free(std::get<1>(mdl)); vosk_spk_model_free(std::get<1>(mdl));
delete[] storepath;
delete[] id;
} }
void genericModel::check() { void genericModel::check() {
thrd.addTask([this](){ thrd.addTask([this](){
@@ -68,10 +57,10 @@ void genericModel::check() {
fireEv("_checkMdl", "OPFS isn't available", index); fireEv("_checkMdl", "OPFS isn't available", index);
return; return;
} }
if(!OPFSTried){ if(!OPFSTried){
OPFSTried = true; OPFSTried = true;
OPFSOk = wasmfs_create_directory("/opfs", 0777, wasmfs_create_opfs_backend()) == 0; OPFSOk = wasmfs_create_directory("/opfs", 0777, wasmfs_create_opfs_backend()) == 0;
} };
if(!OPFSOk) { if(!OPFSOk) {
fireEv("_checkMdl", "OPFS initialization failed", index); fireEv("_checkMdl", "OPFS initialization failed", index);
return; return;
@@ -98,11 +87,13 @@ void genericModel::check() {
fireEv("_checkMdl", "Couldn't open id file", index); fireEv("_checkMdl", "Couldn't open id file", index);
return; return;
} }
emscripten_console_log("1");
if(fseek(idFile, 0, SEEK_END) != 0) { if(fseek(idFile, 0, SEEK_END) != 0) {
fireEv("_checkMdl", "Id file end seeking fail", index); fireEv("_checkMdl", "Id file end seeking fail", index);
fclose(idFile); fclose(idFile);
return; return;
}; };
emscripten_console_log("1");
long long oldsize{ftell(idFile)}; long long oldsize{ftell(idFile)};
char* oldid {new char[oldsize]}; char* oldid {new char[oldsize]};
if(fseek(idFile, 0L, SEEK_SET) != 0) { if(fseek(idFile, 0L, SEEK_SET) != 0) {
@@ -110,11 +101,13 @@ void genericModel::check() {
fclose(idFile); fclose(idFile);
return; return;
}; };
emscripten_console_log("1");
fread(oldid, 1, oldsize, idFile); fread(oldid, 1, oldsize, idFile);
fclose(idFile); fclose(idFile);
if(strcmp(oldid, id) != 0) fireEv("_checkMdl", "fetch", index); if(strcmp(oldid, id.c_str()) != 0) fireEv("_checkMdl", "fetch", index);
else fireEv("_checkMdl", nullptr, index); else fireEv("_checkMdl", nullptr, index);
delete[] oldid; delete[] oldid;
emscripten_console_log("1");
}); });
} }
void genericModel::afterFetch() { void genericModel::afterFetch() {
@@ -126,13 +119,11 @@ void genericModel::afterFetch() {
fireEv("_continue", "Unable to extract model", index); fireEv("_continue", "Unable to extract model", index);
return; return;
} }
fs::remove("/opfs/m0dEl.tar",tank);
fs::remove("README",tank);
if(!checkFiles()) { if(!checkFiles()) {
fireEv("_continue", "URL points to invalid model files", index); fireEv("_continue", "URL points to invalid model files", index);
return; return;
} }
int idFd {open("id", O_WRONLY | O_TRUNC | O_CREAT)}; int idFd {creat("id",0777)};
if(idFd == -1) { if(idFd == -1) {
fireEv("_continue", "Unable create ID file", index); fireEv("_continue", "Unable create ID file", index);
fs::remove("/opfs/m0dEl.tar",tank); fs::remove("/opfs/m0dEl.tar",tank);
@@ -140,7 +131,7 @@ void genericModel::afterFetch() {
fs::remove_all(storepath, tank); fs::remove_all(storepath, tank);
return; return;
} }
if(write(idFd, id, strlen(id)) == -1) { if(write(idFd, id.c_str(), id.size()) == -1) {
fireEv("_continue", "Unable to write new ID", index); fireEv("_continue", "Unable to write new ID", index);
fs::remove("/opfs/m0dEl.tar",tank); fs::remove("/opfs/m0dEl.tar",tank);
fs::current_path("/opfs", tank); fs::current_path("/opfs", tank);
@@ -149,30 +140,35 @@ void genericModel::afterFetch() {
return; return;
}; };
close(idFd); close(idFd);
load(false);
}); });
load();
} }
bool genericModel::extract() { bool genericModel::extract() {
std::string path{}; static fs::path path{};
archive* src {archive_read_new()}; static int fd{};
archive_entry* entry{}; static archive* src {archive_read_new()};
int fd{}; archive_entry* entry{archive_entry_new()};
archive_read_support_format_tar(src); archive_read_support_format_tar(src);
archive_read_open_filename(src, "/opfs/m0dEl.tar", 10240); archive_read_open_filename(src, "/opfs/m0dEl.tar", 10240);
if(archive_errno(src) != 0) return false; if(archive_errno(src) != 0) return false;
while(archive_read_next_header2(src, entry) == ARCHIVE_OK) { while(archive_read_next_header2(src, entry) == ARCHIVE_OK) {
if(archive_errno(src) != 0) return false;
path = archive_entry_pathname(entry); path = archive_entry_pathname(entry);
// Strip 1st component, keep relative path // Strip 1st component, keep relative path
path = "." + path.substr(path.find("/")); path = "." + path.generic_string().substr(path.generic_string().find("/"));
if(!fs::path(path).has_extension()) { emscripten_console_log(path.c_str());
if(!path.has_extension()) {
fs::create_directory(path); fs::create_directory(path);
continue; continue;
} }
fd = open(path.c_str(), O_CREAT | O_WRONLY | O_TRUNC); fd = creat(path.c_str(),0777);
if(fd == -1) return false;
archive_read_data_into_fd(src, fd); archive_read_data_into_fd(src, fd);
close(fd);
if(archive_errno(src) != 0) return false; if(archive_errno(src) != 0) return false;
close(fd);
} }
fs::remove("README",tank);
fs::remove("/opfs/m0dEl.tar",tank);
archive_read_free(src); archive_read_free(src);
return true; return true;
} }

6
src/genericModel.h
View File

@@ -16,12 +16,12 @@ struct genericModel {
bool normalMdl{}; bool normalMdl{};
bool recognizerUsedThrd{}; bool recognizerUsedThrd{};
int index{}; int index{};
char* storepath{}; std::string storepath;
char* id{}; std::string id;
std::variant<VoskModel*, VoskSpkModel*> mdl{}; std::variant<VoskModel*, VoskSpkModel*> mdl{};
reusableThrd thrd{}; reusableThrd thrd{};
static bool extract(); static bool extract();
void load(bool newTask); void load();
void check(); void check();
bool checkFiles(); bool checkFiles();
void afterFetch(); void afterFetch();

7
src/global.cc
View File

@@ -11,11 +11,8 @@ void fireEv(const char *type, const char *content, int index) {
objs[$0].dispatchEvent(new CustomEvent(UTF8ToString($1), {"detail" : UTF8ToString($2)})); objs[$0].dispatchEvent(new CustomEvent(UTF8ToString($1), {"detail" : UTF8ToString($2)}));
},index, type, content); },index, type, content);
}}; }};
if(dstThrd == pthread_self()) { if(dstThrd == pthread_self()) proxy();
proxy(); else glbQ.proxySync(dstThrd, proxy);
return;
}
glbQ.proxySync(dstThrd, proxy);
} }
void reusableThrd::addTask(std::function<void()>&& task) { void reusableThrd::addTask(std::function<void()>&& task) {
static std::thread thrd{[this](){ static std::thread thrd{[this](){