From 042deefa08e8f37b5df8cb652f1fbdccbed9cdef Mon Sep 17 00:00:00 2001
From: David Huggins-Daines <dhdaines@gmail.com>
Date: Thu, 1 Dec 2022 08:34:38 -0500
Subject: [PATCH 1/2] refactor: use "soundswallower" as module name

---
 js/soundswallower.spec.js | 42 ++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/js/soundswallower.spec.js b/js/soundswallower.spec.js
index 72b841c..0ea0d2c 100644
--- a/js/soundswallower.spec.js
+++ b/js/soundswallower.spec.js
@@ -1,3 +1,4 @@
+/* A bunch of junk to make this work in Node and Web */
 const ENVIRONMENT_IS_WEB = typeof(window) !== "undefined";
 let assert, load_binary_file;
 if (ENVIRONMENT_IS_WEB) {
@@ -20,36 +21,37 @@ else {
     }
     assert = require('assert');
 }
-const ssjs = {};
+
+const soundswallower = {};
 before(async () => {
     if (ENVIRONMENT_IS_WEB) {
-        await createModule(ssjs);
+        await createModule(soundswallower);
     }
     else {
-        await require("./soundswallower.js")(ssjs);
+        await require("./soundswallower.js")(soundswallower);
     }
         
 });
 describe("Test initialization", () => {
     it("Should load the WASM module", () => {
-	assert.ok(ssjs);
+	assert.ok(soundswallower);
     });
 });
 describe("Test decoder initialization", () => {
     it("Should initialize the decoder", async () => {
-	let decoder = new ssjs.Decoder({
+	let decoder = new soundswallower.Decoder({
 	    fsg: "testdata/goforward.fsg",
 	    samprate: 16000,
 	});
         assert.ok(decoder);
         assert.equal(decoder.get_config("hmm"),
-                     ssjs.get_model_path(ssjs.defaultModel));
+                     soundswallower.get_model_path(soundswallower.defaultModel));
         decoder.delete();
     });
 });
 describe("Test configuration as JSON", () => {
     it("Should contain default configuration", () => {
-	let decoder = new ssjs.Decoder({
+	let decoder = new soundswallower.Decoder({
 	    fsg: "testdata/goforward.fsg",
 	    samprate: 16000,
 	});
@@ -58,14 +60,14 @@ describe("Test configuration as JSON", () => {
         let config = JSON.parse(json);
         assert.ok(config);
         assert.equal(config.hmm,
-                     ssjs.get_model_path(ssjs.defaultModel));
+                     soundswallower.get_model_path(soundswallower.defaultModel));
         assert.equal(config.loglevel, "WARN");
         assert.equal(config.fsg, "testdata/goforward.fsg");
     });
 });
 describe("Test acoustic model loading", () => {
     it('Should load acoustic model', async () => {
-	let decoder = new ssjs.Decoder();
+	let decoder = new soundswallower.Decoder();
 	await decoder.init_featparams();
 	await decoder.init_fe();
 	await decoder.init_feat();
@@ -77,7 +79,7 @@ describe("Test acoustic model loading", () => {
 });
 describe("Test decoding", () => {
     it('Should recognize "go forward ten meters"', async () => {
-        let decoder = new ssjs.Decoder({
+        let decoder = new soundswallower.Decoder({
             fsg: "testdata/goforward.fsg",
             samprate: 16000,
         });
@@ -99,7 +101,7 @@ describe("Test decoding", () => {
         decoder.delete();
     });
     it('Should accept Float32Array as well as UInt8Array', async () => {
-        let decoder = new ssjs.Decoder({
+        let decoder = new soundswallower.Decoder({
             fsg: "testdata/goforward.fsg",
             samprate: 16000
         });
@@ -113,7 +115,7 @@ describe("Test decoding", () => {
         decoder.delete();
     });
     it('Should align "go forward ten meters"', async () => {
-        let decoder = new ssjs.Decoder({
+        let decoder = new soundswallower.Decoder({
             samprate: 16000,
         });
         await decoder.initialize();
@@ -154,7 +156,7 @@ describe("Test decoding", () => {
 });
 describe("Test dictionary and FSG", () => {
     it('Should recognize "_go _forward _ten _meters"', async () => {
-        let decoder = new ssjs.Decoder({samprate: 16000});
+        let decoder = new soundswallower.Decoder({samprate: 16000});
         decoder.unset_config("dict");
         await decoder.initialize();
         await decoder.add_word("_go", "G OW", false);
@@ -177,7 +179,7 @@ describe("Test dictionary and FSG", () => {
 });
 describe("Test reinitialization", () => {
     it('Should recognize "go forward ten meters"', async () => {
-        let decoder = new ssjs.Decoder({samprate: 16000});
+        let decoder = new soundswallower.Decoder({samprate: 16000});
         await decoder.initialize();
         await decoder.add_word("_go", "G OW", false);
         await decoder.add_word("_forward", "F AO R W ER D", false);
@@ -190,7 +192,7 @@ describe("Test reinitialization", () => {
             {from: 3, to: 4, prob: 1.0, word: "_meters"}
         ]);
         decoder.set_config("dict",
-                           ssjs.get_model_path(ssjs.defaultModel) + "/dict.txt");
+                           soundswallower.get_model_path(soundswallower.defaultModel) + "/dict.txt");
         decoder.set_config("fsg", "testdata/goforward.fsg");
         await decoder.initialize();
         let pcm = await load_binary_file("testdata/goforward-float32.raw");
@@ -203,7 +205,7 @@ describe("Test reinitialization", () => {
 });
 describe("Test loading model for other language", () => {
     it('Should recognize "avance de dix mètres"', async () => {
-        let decoder = new ssjs.Decoder({hmm: ssjs.get_model_path("fr-fr"),
+        let decoder = new soundswallower.Decoder({hmm: soundswallower.get_model_path("fr-fr"),
                                         samprate: 16000});
         await decoder.initialize();
         await decoder.set_fsg("goforward", 0, 4, [
@@ -234,7 +236,7 @@ describe("Test loading model for other language", () => {
 });
 describe("Test JSGF", () => {
     it('Should recognize "yo gimme four large all dressed pizzas"', async () => {
-        let decoder = new ssjs.Decoder({
+        let decoder = new soundswallower.Decoder({
             jsgf: "testdata/pizza.gram",
             samprate: 16000
         });
@@ -249,7 +251,7 @@ describe("Test JSGF", () => {
 });
 describe("Test JSGF string", () => {
     it('Should recognize "yo gimme four large all dressed pizzas"', async () => {
-	let decoder = new ssjs.Decoder({samprate: 16000});
+	let decoder = new soundswallower.Decoder({samprate: 16000});
 	await decoder.initialize();
 	await decoder.set_jsgf(`#JSGF V1.0;
 grammar pizza;
@@ -273,7 +275,7 @@ public <order> = [<greeting>] [<want>] [<quantity>] [<size>] [<style>]
 });
 describe("Test reinitialize_audio", () => {
     it('Should recognize "go forward ten meters"', async () => {
-        let decoder = new ssjs.Decoder({
+        let decoder = new soundswallower.Decoder({
             fsg: "testdata/goforward.fsg",
             samprate: 11025,
             loglevel: "INFO"
@@ -300,7 +302,7 @@ describe("Test reinitialize_audio", () => {
 });
 describe("Test dictionary lookup", () => {
     it('Should return "W AH N"', async () => {
-	let decoder = new ssjs.Decoder();
+	let decoder = new soundswallower.Decoder();
 	await decoder.initialize();
 	const phones = decoder.lookup_word("one");
 	assert.equal("W AH N", phones);

From 1accd676412581d3cd992e41c572c327ef13f068 Mon Sep 17 00:00:00 2001
From: David Huggins-Daines <dhdaines@gmail.com>
Date: Wed, 7 Dec 2022 21:35:03 -0500
Subject: [PATCH 2/2] fix: memory error in process() due to bad js api

it is not immediately obvious that you must always, always use the
three-argument constructor when creating a typed array from another
ones buffer in case it happens to be a subarray.

this was causing massive heap overruns for maybe obvious reasons
---
 js/api.js                 |  7 ++++---
 js/package.json           |  2 +-
 js/soundswallower.spec.js | 15 ++++++++++-----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/js/api.js b/js/api.js
index 8a93477..715f9b5 100644
--- a/js/api.js
+++ b/js/api.js
@@ -383,9 +383,10 @@ class Decoder {
 	this.assert_initialized();
 	const pcm_bytes = pcm.length * pcm.BYTES_PER_ELEMENT;
 	const pcm_addr = Module._malloc(pcm_bytes);
-	const pcm_u8 = new Uint8Array(pcm.buffer);
-	// Emscripten documentation fails to mention that this
-	// function specifically takes a Uint8Array
+        // This Javascript API is rather stupid.  DO NOT forget byteOffset and length.
+	const pcm_u8 = new Uint8Array(pcm.buffer, pcm.byteOffset, pcm_bytes);
+	// Emscripten documentation (what documentation) fails to
+        // mention that this function specifically takes a Uint8Array
 	writeArrayToMemory(pcm_u8, pcm_addr);
 	const rv = Module._decoder_process_float32(this.cdecoder, pcm_addr, pcm_bytes / 4,
 					           no_search, full_utt);
diff --git a/js/package.json b/js/package.json
index dc66855..966e353 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
    "name": "soundswallower",
-   "version": "0.4.1",
+   "version": "0.4.2",
    "description": "An even smaller speech recognizer",
    "main": "soundswallower.js",
    "scripts": {
diff --git a/js/soundswallower.spec.js b/js/soundswallower.spec.js
index 0ea0d2c..32dc034 100644
--- a/js/soundswallower.spec.js
+++ b/js/soundswallower.spec.js
@@ -86,18 +86,23 @@ describe("Test decoding", () => {
         await decoder.initialize();
         let pcm = await load_binary_file("testdata/goforward-float32.raw");
         await decoder.start();
-        await decoder.process(pcm, false, true);
+        // 128-sample buffers, because fuck you, that's why
+        for (let pos = 0; pos < pcm.length; pos += 128) {
+            let len = pcm.length - pos;
+            if (len > 128)
+                len = 128;
+            await decoder.process(pcm.subarray(pos, pos + len), false, false);
+        }
         await decoder.stop();
         assert.equal("go forward ten meters", decoder.get_hyp());
         let hypseg = decoder.get_hypseg();
         let hypseg_words = []
         for (const seg of hypseg) {
             assert.ok(seg.end >= seg.start);
-            hypseg_words.push(seg.word);
+            if (seg.word != "<sil>" && seg.word != "(NULL)")
+                hypseg_words.push(seg.word);
         }
-        assert.deepStrictEqual(hypseg_words,
-                               ["<sil>", "go", "forward",
-                                "(NULL)", "ten", "meters"]);
+        assert.equal(hypseg_words.join(" "), "go forward ten meters");
         decoder.delete();
     });
     it('Should accept Float32Array as well as UInt8Array', async () => {