pi-voicekit 0.1.2 → 0.1.3

package/extensions/voice/audio-tool.ts

@@ -0,0 +1,16 @@
+/**
+ * Capture-tool preference.
+ *
+ * SoX' `rec` is the best default for local capture, but it is known to stall on
+ * network PulseAudio servers: over an SSH audio tunnel (`PULSE_SERVER` pointing at
+ * a forwarded TCP port, e.g. `tcp:127.0.0.1:4713`) the same `rec` invocation
+ * returned zero bytes in 40% of runs on this stack, while ffmpeg was reliable in
+ * every run. So when a remote Pulse server is configured, probe ffmpeg first and
+ * keep SoX as the fallback; local capture keeps SoX first.
+ */
+
+export type AudioToolName = "ffmpeg" | "sox" | "arecord";
+
+export function audioToolOrder(env: { PULSE_SERVER?: string | undefined } = process.env): AudioToolName[] {
+	return env.PULSE_SERVER ? ["ffmpeg", "sox", "arecord"] : ["sox", "ffmpeg", "arecord"];
+}

package/extensions/voice.ts

@@ -100,6 +100,7 @@ import {
 } from "./voice/local";
 import { shouldArmReleaseDetectOnRepeat, decideRecordingStartTimer } from "./voice/hold-to-talk";
 import { GapTimer, type TimerPort } from "./voice/release-controller";
+import { audioToolOrder, type AudioToolName } from "./voice/audio-tool";
 
 /** Adapter for the real event loop — lets GapTimer run under the real setTimeout. */
 const realTimerPort: TimerPort = {
@@ -245,87 +246,95 @@ interface AudioCaptureTool {
 	args: string[];
 }
 
-// Try available audio capture tools in order of preference
+// Try available audio capture tools in the order given by audioToolOrder()
 let _cachedAudioTool: AudioCaptureTool | null | undefined;
-function detectAudioCaptureTool(): AudioCaptureTool | null {
-	if (_cachedAudioTool !== undefined) return _cachedAudioTool;
 
-	// 1. SoX rec — purpose-built for recording, best quality
-	if (commandExists("rec")) {
-		_cachedAudioTool = {
-			name: "sox",
-			cmd: "rec",
-			args: [
-				"-q",
-				"--buffer",
-				"4096",
-				"-c",
-				String(CHANNELS),
-				"-b",
-				"16",
-				"-e",
-				"signed-integer",
-				"-t",
-				"raw",
-				"-",
-				"rate",
-				String(SAMPLE_RATE),
-			],
-		};
-		return _cachedAudioTool;
-	}
+function probeSox(): AudioCaptureTool | null {
+	if (!commandExists("rec")) return null;
+	return {
+		name: "sox",
+		cmd: "rec",
+		args: [
+			"-q",
+			"--buffer",
+			"4096",
+			"-c",
+			String(CHANNELS),
+			"-b",
+			"16",
+			"-e",
+			"signed-integer",
+			"-t",
+			"raw",
+			"-",
+			"rate",
+			String(SAMPLE_RATE),
+		],
+	};
+}
 
-	// 2. ffmpeg — widely installed, captures from default mic
-	if (commandExists("ffmpeg")) {
-		const isLinux = process.platform === "linux";
-		const isMac = process.platform === "darwin";
-		const isWin = process.platform === "win32";
-		// Input device varies by platform
-		let inputArgs: string[];
-		if (isMac) {
-			inputArgs = ["-f", "avfoundation", "-i", ":default"];
-		} else if (isLinux) {
-			inputArgs = ["-f", "pulse", "-i", "default"];
-		} else if (isWin) {
-			// DirectShow has no "default" alias — enumerate devices and pick the first audio device
-			const dshowDevice = detectWindowsAudioDevice();
-			inputArgs = dshowDevice
-				? ["-f", "dshow", "-i", `audio=${dshowDevice}`]
-				: ["-f", "dshow", "-i", "audio=Microphone"]; // last-resort guess
-		} else {
-			inputArgs = ["-f", "pulse", "-i", "default"]; // fallback for other platforms
-		}
-		_cachedAudioTool = {
-			name: "ffmpeg",
-			cmd: "ffmpeg",
-			args: [
-				...inputArgs,
-				"-ac",
-				String(CHANNELS),
-				"-ar",
-				String(SAMPLE_RATE),
-				"-sample_fmt",
-				"s16",
-				"-f",
-				"s16le",
-				"-loglevel",
-				"error",
-				"pipe:1",
-			],
-		};
-		return _cachedAudioTool;
+function probeFfmpeg(): AudioCaptureTool | null {
+	if (!commandExists("ffmpeg")) return null;
+	const isLinux = process.platform === "linux";
+	const isMac = process.platform === "darwin";
+	const isWin = process.platform === "win32";
+	// Input device varies by platform
+	let inputArgs: string[];
+	if (isMac) {
+		inputArgs = ["-f", "avfoundation", "-i", ":default"];
+	} else if (isLinux) {
+		inputArgs = ["-f", "pulse", "-i", "default"];
+	} else if (isWin) {
+		// DirectShow has no "default" alias — enumerate devices and pick the first audio device
+		const dshowDevice = detectWindowsAudioDevice();
+		inputArgs = dshowDevice ? ["-f", "dshow", "-i", `audio=${dshowDevice}`] : ["-f", "dshow", "-i", "audio=Microphone"]; // last-resort guess
+	} else {
+		inputArgs = ["-f", "pulse", "-i", "default"]; // fallback for other platforms
 	}
+	return {
+		name: "ffmpeg",
+		cmd: "ffmpeg",
+		args: [
+			...inputArgs,
+			"-ac",
+			String(CHANNELS),
+			"-ar",
+			String(SAMPLE_RATE),
+			"-sample_fmt",
+			"s16",
+			"-f",
+			"s16le",
+			"-loglevel",
+			"error",
+			"pipe:1",
+		],
+	};
+}
 
-	// 3. arecord — built into Linux ALSA, zero install
-	if (process.platform === "linux" && commandExists("arecord")) {
-		_cachedAudioTool = {
-			name: "arecord",
-			cmd: "arecord",
-			args: ["-q", "-f", "S16_LE", "-r", String(SAMPLE_RATE), "-c", String(CHANNELS), "-t", "raw"],
-		};
-		return _cachedAudioTool;
-	}
+function probeArecord(): AudioCaptureTool | null {
+	if (process.platform !== "linux" || !commandExists("arecord")) return null;
+	return {
+		name: "arecord",
+		cmd: "arecord",
+		args: ["-q", "-f", "S16_LE", "-r", String(SAMPLE_RATE), "-c", String(CHANNELS), "-t", "raw"],
+	};
+}
 
+const audioProbes: Record<AudioToolName, () => AudioCaptureTool | null> = {
+	sox: probeSox,
+	ffmpeg: probeFfmpeg,
+	arecord: probeArecord,
+};
+
+function detectAudioCaptureTool(): AudioCaptureTool | null {
+	if (_cachedAudioTool !== undefined) return _cachedAudioTool;
+	for (const name of audioToolOrder()) {
+		const tool = audioProbes[name]();
+		if (tool) {
+			_cachedAudioTool = tool;
+			return tool;
+		}
+	}
 	_cachedAudioTool = null;
 	return null;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-voicekit",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Voice in + voice out for Pi CLI — hold-to-talk STT (Deepgram streaming or 21 offline models) plus TTS (Kitten Nano, Piper, Kokoro, or Deepgram Aura)",
   "type": "module",
   "keywords": [