some tweaks and fixes

Author: fquirin

src/modules/porcupine-wake-word-worker.js

@@ -127,12 +127,14 @@ function constructWorker(options) {
 	processBufferSize = options.setup.bufferSize || inputSampleSize;
 
 	porcupineVersion = options.setup.version || options.setup.porcupineVersion || 19;
+	porcupineVersion = porcupineVersion.replace(".", "").trim();	//remove dot
 	importScripts('./picovoice/porcupine-wasm-module-' + porcupineVersion + '.js');
 
 	keywords = options.setup.keywords || ["Computer"];
 	keywords.forEach(function(kw){
 		importScripts('./picovoice/porcupine-keywords/' + kw.replace(/\s+/, "_").toLowerCase() + "_wasm_" + porcupineVersion + '.js');
 	});
+	//TODO: use 'options.setup.keywordsData'
 	sensitivities = options.setup.sensitivities || [0.5];
 
 	var wasmFileArrayBuffer = options.preLoadResults.wasmFile;

src/modules/speex-resample-switch.js

@@ -113,7 +113,7 @@ function constructWorker(options) {
 	channelCount = 1;	//options.setup.channelCount || 1;		//TODO: only MONO atm
 
 	calculateRmsVolume = (options.setup.calculateRmsVolume != undefined)? options.setup.calculateRmsVolume : true;
-	gain = options.setup.gain || 1.0;		//TODO: keep?
+	gain = options.setup.gain || 1.0;
 
 	resamplingMode = (targetSampleRate < sourceSamplerate? -1 : (targetSampleRate > sourceSamplerate? 1 : 0));
 	resampleRatio = targetSampleRate/sourceSamplerate;

src/modules/speex-resample-worker.js

@@ -276,7 +276,7 @@ if (!(typeof SepiaFW == "object")){
 					var moduleName = info.moduleName;
 					var moduleSetup = info.moduleSetup;
 
-					//pre-loads - NOTE: there might be room for optimizations here ...
+					//pre-loads - NOTE: there might be room for optimizations here ... - TODO: can/should we cache preloads globally?
 					var preLoads = {};
 					var preLoadKeys = Object.keys(info.modulePreLoads);
 					await Promise.all(preLoadKeys.map(async function(plKey, j){
@@ -349,6 +349,7 @@ if (!(typeof SepiaFW == "object")){
 						if (err.message && err.message.indexOf("Uncaught {") == 0){
 							err.preventDefault();
 							errorMessage = JSON.parse(err.message.replace(/^Uncaught /, ""));
+							err.message = errorMessage;
 						}
 						onProcessorError({
 							name: "AudioModuleProcessorException",
@@ -359,6 +360,9 @@ if (!(typeof SepiaFW == "object")){
 							completeInitCondition("module-" + i);
 							initializerError({message: "Error during setup of module: " + thisProcessNode.moduleName, name: "ProcessorInitError", info: errorMessage});
 						}
+						if (moduleSetup.onerror){
+							moduleSetup.onerror(err);	//... in case the user requires per-module error messages
+						}
 					}
 
 					//AudioWorkletProcessor

src/processor.js

@@ -362,7 +362,7 @@ <h1>SEPIA Web Audio Processor</h1>
 			name: 'porcupine-wake-word-worker',
 			type: 'worker',
 			preLoad: {
-				wasmFile: (porcupineVersion == 14? 'src/modules/picovoice/porcupine-14.wasm' : 'src/modules/picovoice/porcupine-19.wasm')
+				wasmFile: ('src/modules/picovoice/porcupine-' + porcupineVersion + '.wasm')
 			},
 			settings: {
 				onmessage: onWakeWordMessage,