@lumiastream/wakeword 1.0.1-alpha.7 → 1.0.1-alpha.9

package/bin/wakeword

@@ -24,7 +24,7 @@ const child = spawn(
 			path.dirname(fileURLToPath(import.meta.url)),
 			"..",
 			"lib",
-			"voice.mjs"
+			"voice.js"
 		),
 		soxPath,
 		...process.argv.slice(2),

package/lib/record.js

@@ -1,9 +1,9 @@
 "use strict";
 
-const assert = require("assert");
-const debug = require("debug")("record");
-const { spawn } = require("child_process");
-const recorders = require("./recorders");
+import assert from "assert";
+import debug from "debug";
+import { spawn } from "child_process";
+import recorders from "./recorders/index.js";
 
 class Recording {
 	constructor(options = {}) {
@@ -114,6 +114,6 @@ Enable debugging with the environment variable DEBUG=record.`
 	}
 }
 
-module.exports = {
+export default {
 	record: (...args) => new Recording(...args),
 };

package/lib/recorders/arecord.js

@@ -1,5 +1,5 @@
 // On some systems (RasPi), arecord is the prefered recording binary
-module.exports = (options) => {
+export default (options) => {
 	let cmd = "arecord";
 
 	if (options.binPath) {

package/lib/recorders/index.js

@@ -1,18 +1,23 @@
-const path = require('path')
+// import { fileURLToPath } from "node:url";
+// import path from "node:path";
+// const __dirname = path.dirname(fileURLToPath(import.meta.url));
+import rec from "./sox.js";
 
-function load (recorderName) {
-  try {
-    const recoderPath = path.resolve(__dirname, recorderName)
-    return require(recoderPath)
-  } catch (err) {
-    if (err.code === 'MODULE_NOT_FOUND') {
-      throw new Error(`No such recorder found: ${recorderName}`)
-    }
+function load(recorderName) {
+	try {
+		// const recoderPath = path.resolve(__dirname, recorderName);
+		// const module = await import(recoderPath);
+		// return module.default;
+		return rec;
+	} catch (err) {
+		if (err.code === "MODULE_NOT_FOUND") {
+			throw new Error(`No such recorder found: ${recorderName}`);
+		}
 
-    throw err
-  }
+		throw err;
+	}
 }
 
-module.exports = {
-  load
-}
+export default {
+	load,
+};

package/lib/recorders/rec.js

@@ -1,4 +1,4 @@
-module.exports = (options) => {
+export default (options) => {
 	let cmd = "rec";
 
 	if (options.binPath) {

package/lib/recorders/sox.js

@@ -1,4 +1,4 @@
-module.exports = (options) => {
+export default (options) => {
 	let cmd = "sox";
 
 	if (options.binPath) {

package/lib/{voice.mjs → voice.js}

@@ -1,6 +1,10 @@
-import { Model, Recognizer, setLogLevel } from "vosk";
-import record from "./record";
-import { join } from "node:path";
+import { Model, Recognizer, setLogLevel } from "vosk-koffi";
+import record from "./record.js";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+import { existsSync } from "node:fs";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
 
 const binPath = join(
 	"binaries",
@@ -11,9 +15,8 @@ const binPath = join(
 		: "soxlinux"
 );
 
-console.log(binPath);
-
 let COMMANDS = [
+	"blue",
 	"[unk]", // always keep an [unk] fallback!
 ];
 
@@ -21,7 +24,18 @@ const SAMPLE_RATE = 16_000;
 setLogLevel(0);
 
 // 1. load model once
-const model = new Model("./models/vosk-model-small-en-us-0.15");
+let modelPath = join(__dirname, "..", "models", "vosk-model-small-en-us-0.15");
+
+/* If the file is running from inside  app.asar  we need the unpacked copy */
+if (modelPath.includes("app.asar")) {
+	modelPath = modelPath.replace("app.asar", "app.asar.unpacked");
+}
+
+if (!existsSync(modelPath)) {
+	throw new Error(`Vosk model not found at ${modelPath}`);
+}
+
+const model = new Model(modelPath);
 
 // 2. build a grammar recognizer
 let rec = new Recognizer({

package/package.json

@@ -1,8 +1,8 @@
 {
 	"name": "@lumiastream/wakeword",
-	"version": "1.0.1-alpha.7",
+	"version": "1.0.1-alpha.9",
 	"type": "module",
-	"main": "lib/voice.mjs",
+	"main": "lib/voice.js",
 	"bin": {
 		"wakeword": "bin/wakeword"
 	},
@@ -16,6 +16,6 @@
 		"postinstall": "chmod +x binaries/soxmac binaries/soxlinux binaries/sox.exe || true"
 	},
 	"dependencies": {
-		"vosk": "^0.3.39"
+		"vosk-koffi": "^1.1.1"
 	}
 }