@lumiastream/wakeword 1.1.4 → 1.1.5-alpha.2

package/lib/list-devices.js

@@ -5,10 +5,13 @@ import { existsSync } from "node:fs";
 
 const here = dirname(fileURLToPath(import.meta.url));
 
+const ASAR_TOKEN = "app.asar";
+const ASAR_UNPACKED_TOKEN = "app.asar.unpacked";
+
 function unpacked(p) {
-	return p.includes("app.asar")
-		? p.replace("app.asar", "app.asar.unpacked")
-		: p;
+	if (!p || !p.includes(ASAR_TOKEN)) return p;
+	if (p.includes(ASAR_UNPACKED_TOKEN)) return p;
+	return p.replace(ASAR_TOKEN, ASAR_UNPACKED_TOKEN);
 }
 
 const exeName = { win32: "sox.exe", darwin: "soxmac", linux: "soxlinux" }[

package/lib/voice.js

@@ -1,19 +1,50 @@
-import { Model, Recognizer, setLogLevel } from "vosk-koffi";
 import record from "./record.js";
-import { dirname, join } from "node:path";
+import koffi from "koffi";
+import { delimiter, dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { existsSync, chmodSync } from "node:fs";
 import readline from "node:readline";
 
+// Ensure native libs can load from app.asar.unpacked when packaged
+const maybeUnpackedPath = (libPath) => {
+	if (typeof libPath !== "string") return libPath;
+	if (!libPath.includes(ASAR_TOKEN)) return libPath;
+	if (libPath.includes(ASAR_UNPACKED_TOKEN)) return libPath;
+	const unpacked = libPath.replace(ASAR_TOKEN, ASAR_UNPACKED_TOKEN);
+	return existsSync(unpacked) ? unpacked : libPath;
+};
+const ensureWinBinOnPath = (libPath) => {
+	if (process.platform !== "win32") return;
+	const dir = dirname(libPath);
+	const current = process.env.Path || process.env.PATH || "";
+	const parts = current.split(delimiter).filter(Boolean);
+	if (!parts.includes(dir)) {
+		process.env.Path = [dir, ...parts].join(delimiter);
+	}
+};
+const originalKoffiLoad = koffi.load.bind(koffi);
+koffi.load = (libPath, ...rest) => {
+	const resolved = maybeUnpackedPath(libPath);
+	if (resolved !== libPath && typeof resolved === "string") {
+		ensureWinBinOnPath(resolved);
+	}
+	return originalKoffiLoad(resolved, ...rest);
+};
+
+const { Model, Recognizer, setLogLevel } = await import("vosk-koffi");
+
 /* ------------------------------------------------------------------ */
 /* 0. Helpers                                                         */
 /* ------------------------------------------------------------------ */
 const here = dirname(fileURLToPath(import.meta.url));
 
+const ASAR_TOKEN = "app.asar";
+const ASAR_UNPACKED_TOKEN = "app.asar.unpacked";
+
 function unpacked(p) {
-	return p.includes("app.asar")
-		? p.replace("app.asar", "app.asar.unpacked")
-		: p;
+	if (!p || !p.includes(ASAR_TOKEN)) return p;
+	if (p.includes(ASAR_UNPACKED_TOKEN)) return p;
+	return p.replace(ASAR_TOKEN, ASAR_UNPACKED_TOKEN);
 }
 
 const UNKNOWN_TOKEN = "[unk]";
@@ -29,12 +60,7 @@ const defaultExeName = {
 	darwin: "soxmac",
 	linux: "soxlinux",
 }[process.platform];
-const envExeOverride =
-	process.platform === "win32" && process.env.LUMIA_WIN_MIC_ALIAS_NAME
-		? process.env.LUMIA_WIN_MIC_ALIAS_NAME.trim()
-		: null;
-const exeName =
-	envExeOverride && envExeOverride.length ? envExeOverride : defaultExeName;
+const exeName = defaultExeName;
 const MATCH_SENTENCE = toBool(process.env.LUMIA_VOICE_MATCH_SENTENCE);
 
 /* Priority for sox path: argv[2] → fallback to sibling binaries/<exe> */
@@ -238,7 +264,7 @@ rl.on("line", (line) => {
 		.split(",")
 		.slice(1)
 		.map((s) => normalizePhrase(s))
-	.filter(Boolean);
+		.filter(Boolean);
 
 	if (!phrases.length) return;
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@lumiastream/wakeword",
-	"version": "1.1.4",
+	"version": "1.1.5-alpha.2",
 	"type": "module",
 	"main": "lib/index.js",
 	"files": [
@@ -15,6 +15,7 @@
 		"start": "node lib/voice.js"
 	},
 	"dependencies": {
+		"koffi": "^2.8.6",
 		"vosk-koffi": "^1.1.1"
 	}
 }