klaudio 0.10.1 → 0.10.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "klaudio",
-  "version": "0.10.1",
+  "version": "0.10.3",
   "description": "Add sound effects to your coding sessions — play sounds when tasks complete, notifications arrive, and more",
   "type": "module",
   "bin": {
@@ -32,7 +32,6 @@
     "ink": "^6.8.0",
     "ink-select-input": "^6.2.0",
     "ink-spinner": "^5.0.0",
-    "kokoro-js": "^1.2.1",
     "react": "^19.2.4"
   },
   "engines": {

package/src/tts.js

@@ -40,17 +40,70 @@ const KOKORO_VOICES = [
 // Singleton: reuse the loaded model across calls
 let kokoroInstance = null;
 let kokoroLoadPromise = null;
+const KOKORO_DIR = join(homedir(), ".klaudio", "kokoro");
 
 /**
- * Load the Kokoro TTS model (singleton, downloads ~86MB on first use).
- * Uses CPU backend (DirectML has ConvTranspose compatibility issues).
+ * Ensure kokoro-js is installed in ~/.klaudio/kokoro.
+ * Installs on first use via npm.
+ */
+async function ensureKokoroInstalled() {
+  const kokoroMod = join(KOKORO_DIR, "node_modules", "kokoro-js");
+  try {
+    await stat(join(kokoroMod, "package.json"));
+    return; // already installed
+  } catch { /* needs install */ }
+
+  await mkdir(KOKORO_DIR, { recursive: true });
+  await fsWriteFile(join(KOKORO_DIR, "package.json"), '{"private":true}', "utf-8");
+
+  const npmCmd = platform() === "win32" ? "npm.cmd" : "npm";
+  await new Promise((resolve, reject) => {
+    execFile(npmCmd, ["install", "kokoro-js"], {
+      cwd: KOKORO_DIR,
+      windowsHide: true,
+      timeout: 180000,
+    }, (err) => err ? reject(err) : resolve());
+  });
+}
+
+/**
+ * Try to import kokoro-js from various locations.
+ */
+async function importKokoro() {
+  // 1. Try local ~/.klaudio/kokoro install
+  try {
+    const { createRequire } = await import("node:module");
+    const req = createRequire(join(KOKORO_DIR, "node_modules", "kokoro-js", "package.json"));
+    return req("kokoro-js");
+  } catch { /* not there */ }
+
+  // 2. Try global/project import (dev environment or globally installed)
+  try {
+    return await import("kokoro-js");
+  } catch { /* not available */ }
+
+  throw new Error("kokoro-js not available");
+}
+
+/**
+ * Load the Kokoro TTS model (singleton).
+ * Auto-installs kokoro-js on first use, then downloads ~25MB model on first generate.
  */
 async function getKokoro() {
   if (kokoroInstance) return kokoroInstance;
   if (kokoroLoadPromise) return kokoroLoadPromise;
 
   kokoroLoadPromise = (async () => {
-    const { KokoroTTS } = await import("kokoro-js");
+    // Try import first (already installed?), otherwise install then import
+    let mod;
+    try {
+      mod = await importKokoro();
+    } catch {
+      await ensureKokoroInstalled();
+      mod = await importKokoro();
+    }
+
+    const { KokoroTTS } = mod;
     kokoroInstance = await KokoroTTS.from_pretrained(
       "onnx-community/Kokoro-82M-v1.0-ONNX",
       { dtype: "q4", device: "cpu" },
@@ -260,9 +313,33 @@ function speakMacOS(text) {
 
 // ── Public API ──────────────────────────────────────────────────
 
+let speaking = false;
+const TTS_LOCK = join(tmpdir(), ".klaudio-tts-lock");
+
+/**
+ * Try to acquire a cross-process TTS lock.
+ * Returns true if acquired, false if another process is speaking.
+ * Stale locks (>30s) are automatically cleaned up.
+ */
+async function acquireTTSLock() {
+  try {
+    const lockStat = await stat(TTS_LOCK);
+    if (Date.now() - lockStat.mtimeMs < 30000) return false; // fresh lock, skip
+  } catch { /* no lock file, good */ }
+  try {
+    await fsWriteFile(TTS_LOCK, String(process.pid), "utf-8");
+    return true;
+  } catch { return false; }
+}
+
+async function releaseTTSLock() {
+  try { const { unlink } = await import("node:fs/promises"); await unlink(TTS_LOCK); } catch { /* ignore */ }
+}
+
 /**
  * Speak text using the best available TTS engine.
  * Priority: Kokoro (GPU/CPU) → Piper → macOS say
+ * Only one speak() call runs at a time — concurrent calls are skipped.
  *
  * @param {string} text - Text to speak
  * @param {object} [options]
@@ -271,26 +348,34 @@ function speakMacOS(text) {
  */
 export async function speak(text, options = {}) {
   if (!text) return;
+  if (speaking) return; // in-process mutex
+  if (!await acquireTTSLock()) return; // cross-process mutex
+  speaking = true;
 
-  const { voice, onProgress } = typeof options === "function"
-    ? { voice: null, onProgress: options }  // backwards compat: speak(text, onProgress)
-    : options;
-
-  // Try Kokoro first (works on all platforms, best quality)
   try {
-    await speakKokoro(text, voice);
-    return;
-  } catch {
-    // Kokoro unavailable — fall through
-  }
+    const { voice, onProgress } = typeof options === "function"
+      ? { voice: null, onProgress: options }  // backwards compat: speak(text, onProgress)
+      : options;
+
+    // Try Kokoro first (works on all platforms, best quality)
+    try {
+      await speakKokoro(text, voice);
+      return;
+    } catch {
+      // Kokoro unavailable — fall through
+    }
 
-  // macOS: use built-in `say`
-  if (platform() === "darwin") {
-    return speakMacOS(text);
-  }
+    // macOS: use built-in `say`
+    if (platform() === "darwin") {
+      return speakMacOS(text);
+    }
 
-  // Fallback: Piper
-  return speakPiper(text, onProgress);
+    // Fallback: Piper
+    return speakPiper(text, onProgress);
+  } finally {
+    speaking = false;
+    await releaseTTSLock();
+  }
 }
 
 export { KOKORO_PRESET_VOICES, KOKORO_VOICES, KOKORO_DEFAULT_VOICE };