@goodandready/dsh-voice 0.9.16 → 0.9.18

package/lib/local-daemon.js

@@ -0,0 +1,272 @@
+// lib/local-daemon.js — Local background process daemon management for whisper and sensevoice
+import { isAutoLang } from './provider-http.js'
+import { buildSensevoiceArgs } from './sensevoice-installer.js'
+
+export function createLocalDaemons({ live, ctx }) {
+  let child = null
+  let whisperError = null
+  let startingWhisper = false
+  let disposed = false
+
+  async function whisperAlive() {
+    const rawUrl = String(live().whisperUrl || '').trim()
+    const base = rawUrl.includes('/inference') ? rawUrl.split('/inference')[0] : rawUrl.replace(/\/+$/, '')
+    if (!base) return false
+    try {
+      const res = await fetch(base + '/', { signal: AbortSignal.timeout(2000) })
+      return res.ok
+    } catch {
+      return false
+    }
+  }
+
+  async function startWhisper() {
+    if (startingWhisper || disposed) return false
+    startingWhisper = true
+    try {
+      const cfg = live()
+      if (!cfg.autoStart) return false
+      if (!cfg.whisperModel) return false
+      if (await whisperAlive()) {
+        whisperError = null
+        return true
+      }
+      if (child && typeof child.kill === 'function') {
+        try { child.kill() } catch { /* ignore */ }
+        child = null
+      }
+      const command = `${JSON.stringify(cfg.whisperBin)} -m ${JSON.stringify(cfg.whisperModel)}`
+        + ` --host 127.0.0.1 --port 8001 -t 8 -p 1 -l ${isAutoLang(cfg.dictation.language) ? 'auto' : cfg.dictation.language}`
+      const specOpts = { command, onExpiry: 'none', timeoutMs: 0, stdoutMaxBytes: 4 * 1024 * 1024 }
+      const spec = typeof ctx.shell?.resolve === 'function' ? ctx.shell.resolve(specOpts) : specOpts
+
+      if (typeof ctx.shell?.execute === 'function') {
+        child = await ctx.shell.execute(spec)
+      } else if (typeof ctx.shell?.start === 'function') {
+        child = await ctx.shell.start(spec)
+      }
+
+      if (disposed) {
+        if (child && typeof child.kill === 'function') {
+          try { child.kill() } catch { /* ignore */ }
+          child = null
+        }
+        return false
+      }
+
+      if (child && typeof child.on === 'function') {
+        child.on('error', (err) => {
+          whisperError = err?.message || String(err)
+        })
+        child.on('exit', (code) => {
+          if (code !== 0 && code !== null) {
+            whisperError = `whisper server process exited with code ${code}`
+          }
+        })
+      }
+      if (child && child.done && typeof child.done.then === 'function') {
+        child.done.then((res) => {
+          if (child.status === 'killed') {
+            whisperError = 'whisper server process was killed'
+          } else if (child.status === 'completed') {
+            const code = child.result?.exitCode ?? (res && res.code)
+            if (code !== 0 && code !== null && code !== undefined) {
+              whisperError = `whisper server process exited with code ${code}`
+            }
+          } else if (res && res.code !== 0 && res.code !== null && res.code !== undefined) {
+            whisperError = `whisper server process exited with code ${res.code}`
+          }
+        }).catch((err) => {
+          whisperError = err?.message || String(err)
+        })
+      }
+
+      // Wait for it to become healthy (up to 30s for cold model loading on Metal/CPU).
+      for (let i = 0; i < 60; i++) {
+        if (disposed) return false
+        await new Promise((r) => setTimeout(r, 500))
+        if (disposed) return false
+        if (await whisperAlive()) {
+          whisperError = null
+          return true
+        }
+        if (child) {
+          if (child.status === 'killed') {
+            whisperError = 'whisper server process was killed'
+            return false
+          }
+          if (child.status === 'completed') {
+            const code = child.result?.exitCode ?? child.exitCode ?? 0
+            whisperError = `whisper server process exited prematurely with code ${code}`
+            return false
+          }
+          if (child.status === 'exited' || child.status === 'failed') {
+            whisperError = `whisper server process exited prematurely with status ${child.status}`
+            return false
+          }
+          if (child.exitCode !== null && child.exitCode !== undefined) {
+            whisperError = `whisper server process exited prematurely with code ${child.exitCode}`
+            return false
+          }
+        }
+      }
+      whisperError = 'whisper server process started but failed health check on port 8001'
+      return false
+    } catch (err) {
+      whisperError = String(err && err.message ? err.message : err)
+      return false
+    } finally {
+      startingWhisper = false
+    }
+  }
+
+  let sensevoiceChild = null
+  let sensevoiceError = null
+  let startingSensevoice = false
+
+  async function sensevoiceAlive() {
+    const cfg = live()
+    const base = String(cfg.sensevoiceUrl || '').replace(/\/api\/.*$/, '').replace(/\/v1\/.*$/, '').replace(/\/+$/, '')
+    if (!base) return false
+    try {
+      const res = await fetch(base + '/', { signal: AbortSignal.timeout(2000) })
+      return res.ok || res.status === 404
+    } catch {
+      return false
+    }
+  }
+
+  async function startSensevoice() {
+    if (startingSensevoice || disposed) return false
+    startingSensevoice = true
+    try {
+      const cfg = live()
+      if (!cfg.sensevoiceAutostart) return false
+      if (!cfg.sensevoiceModel) return false
+      if (await sensevoiceAlive()) {
+        sensevoiceError = null
+        return true
+      }
+      if (sensevoiceChild && typeof sensevoiceChild.kill === 'function') {
+        try { sensevoiceChild.kill() } catch { /* ignore */ }
+        sensevoiceChild = null
+      }
+      let port = '6006'
+      try { port = new URL(cfg.sensevoiceUrl).port || '6006' } catch { /* invalid URL */ }
+      const cmdArgs = buildSensevoiceArgs(cfg, port)
+      const commandStr = `${JSON.stringify(cfg.sensevoiceBin)}${cmdArgs}`
+      const specOpts = { command: commandStr, onExpiry: 'none', timeoutMs: 0, stdoutMaxBytes: 4 * 1024 * 1024 }
+      const spec = typeof ctx.shell?.resolve === 'function' ? ctx.shell.resolve(specOpts) : specOpts
+
+      if (typeof ctx.shell?.execute === 'function') {
+        sensevoiceChild = await ctx.shell.execute(spec)
+      } else if (typeof ctx.shell?.start === 'function') {
+        sensevoiceChild = await ctx.shell.start(spec)
+      }
+
+      if (disposed) {
+        if (sensevoiceChild && typeof sensevoiceChild.kill === 'function') {
+          try { sensevoiceChild.kill() } catch { /* ignore */ }
+          sensevoiceChild = null
+        }
+        return false
+      }
+
+      if (sensevoiceChild && typeof sensevoiceChild.on === 'function') {
+        sensevoiceChild.on('error', (err) => {
+          sensevoiceError = err?.message || String(err)
+        })
+        sensevoiceChild.on('exit', (code) => {
+          if (code !== 0 && code !== null) {
+            sensevoiceError = `sensevoice process exited with code ${code}`
+          }
+        })
+      }
+      if (sensevoiceChild && sensevoiceChild.done && typeof sensevoiceChild.done.then === 'function') {
+        sensevoiceChild.done.then((res) => {
+          if (sensevoiceChild.status === 'killed') {
+            sensevoiceError = 'sensevoice process was killed'
+          } else if (sensevoiceChild.status === 'completed') {
+            const code = sensevoiceChild.result?.exitCode ?? (res && res.code)
+            if (code !== 0 && code !== null && code !== undefined) {
+              sensevoiceError = `sensevoice process exited with code ${code}`
+            }
+          } else if (res && res.code !== 0 && res.code !== null && res.code !== undefined) {
+            sensevoiceError = `sensevoice process exited with code ${res.code}`
+          }
+        }).catch((err) => {
+          sensevoiceError = err?.message || String(err)
+        })
+      }
+
+      // Wait for it to become healthy (up to 30s).
+      for (let i = 0; i < 60; i++) {
+        if (disposed) return false
+        await new Promise((r) => setTimeout(r, 500))
+        if (disposed) return false
+        if (await sensevoiceAlive()) {
+          sensevoiceError = null
+          return true
+        }
+        if (sensevoiceChild) {
+          if (sensevoiceChild.status === 'killed') {
+            sensevoiceError = 'sensevoice process was killed'
+            return false
+          }
+          if (sensevoiceChild.status === 'completed') {
+            const code = sensevoiceChild.result?.exitCode ?? sensevoiceChild.exitCode ?? 0
+            sensevoiceError = `sensevoice process exited prematurely with code ${code}`
+            return false
+          }
+          if (sensevoiceChild.status === 'exited' || sensevoiceChild.status === 'failed') {
+            sensevoiceError = `sensevoice process exited prematurely with status ${sensevoiceChild.status}`
+            return false
+          }
+          if (sensevoiceChild.exitCode !== null && sensevoiceChild.exitCode !== undefined) {
+            sensevoiceError = `sensevoice process exited prematurely with code ${sensevoiceChild.exitCode}`
+            return false
+          }
+        }
+      }
+      sensevoiceError = 'sensevoice process started but failed health check'
+      return false
+    } catch (err) {
+      sensevoiceError = String(err && err.message ? err.message : err)
+      return false
+    } finally {
+      startingSensevoice = false
+    }
+  }
+
+  function triggerAutostart() {
+    startWhisper().catch((err) => {
+      ctx.logger?.debug?.('whisper autostart failed: %s', err?.message || err)
+    })
+    startSensevoice().catch((err) => {
+      ctx.logger?.debug?.('sensevoice autostart failed: %s', err?.message || err)
+    })
+  }
+
+  function dispose() {
+    disposed = true
+    if (child && typeof child.kill === 'function') {
+      try { child.kill() } catch { /* ignore */ }
+      child = null
+    }
+    if (sensevoiceChild && typeof sensevoiceChild.kill === 'function') {
+      try { sensevoiceChild.kill() } catch { /* ignore */ }
+      sensevoiceChild = null
+    }
+  }
+
+  return {
+    whisperAlive,
+    startWhisper,
+    getWhisperError: () => whisperError,
+    sensevoiceAlive,
+    startSensevoice,
+    getSensevoiceError: () => sensevoiceError,
+    triggerAutostart,
+    dispose,
+  }
+}

package/lib/schema.js

@@ -134,7 +134,7 @@ export const BaseConfig = z.object({
   sensevoiceAutostart: z.boolean().default(false)
     .description('Start the local SenseVoice / sherpa-onnx server process automatically on startup.'),
   sensevoiceProvider: z.string().default('cpu')
-    .description('Execution provider for sherpa-onnx: "cpu", "rknpu" (Rockchip RK3588/RK3568 NPU on ARM SBC), "openvino", "cuda".'),
+    .description('Execution provider for sherpa-onnx: "cpu", "rknn" (Rockchip RK3588/RK3568 NPU on ARM SBC with RKNN models), "openvino", "cuda".'),
   sensevoiceThreads: z.number().default(4)
     .description('Execution thread count for local SenseVoice / sherpa-onnx on CPU/SBC.'),
   webgpuModel: z.string().default('onnx-community/whisper-tiny')

package/lib/sensevoice-installer.js

@@ -235,8 +235,10 @@ export function buildSensevoiceArgs(cfg, port) {
   const modelDir = cfg?.sensevoiceModel ? path.dirname(cfg.sensevoiceModel) : getDefaultModelDir()
   const tokensPath = findTokensFile(modelDir)
   const tokensArg = tokensPath ? ` --tokens=${JSON.stringify(tokensPath)}` : ''
-  const provider = (cfg?.sensevoiceProvider && cfg.sensevoiceProvider !== 'cpu')
-    ? ` --provider=${cfg.sensevoiceProvider}`
+  const rawProv = String(cfg?.sensevoiceProvider || '').trim().toLowerCase()
+  const normProv = rawProv === 'rknpu' ? 'rknn' : rawProv
+  const provider = (normProv && normProv !== 'cpu')
+    ? ` --provider=${normProv}`
     : ''
   const threads = Number(cfg?.sensevoiceThreads) || 4
   return ` --sense-voice-model=${JSON.stringify(cfg?.sensevoiceModel || '')}`

package/lib/updater.js

@@ -2,7 +2,7 @@
 // Implements canonical DSH plugin-updater specification.
 
 import { spawn } from 'node:child_process';
-import { existsSync, readFileSync, unlinkSync } from 'node:fs';
+import { existsSync, readFileSync, unlinkSync, renameSync } from 'node:fs';
 import { readFile } from 'node:fs/promises';
 import { homedir } from 'node:os';
 import { basename, dirname, isAbsolute, resolve } from 'node:path';
@@ -202,10 +202,24 @@ export function checkProfileLock(profileDir) {
     if (isProcessAlive(pid)) {
       return { locked: true, pid };
     }
+    // Verify before unlinking: ensure the file content still holds the dead pid we read,
+    // using atomic rename coordinator so a successor's live lock is never deleted (#205).
     try {
-      unlinkSync(lockPath);
-      return { locked: false, cleanedStale: true };
+      const staleName = `${lockPath}.stale.${Date.now()}.${Math.random().toString(36).slice(2)}`;
+      renameSync(lockPath, staleName);
+      const renamedPid = readLockPid(staleName);
+      if (renamedPid === pid) {
+        try { unlinkSync(staleName); } catch {}
+        return { locked: false, cleanedStale: true };
+      }
+      try { renameSync(staleName, lockPath); } catch {}
+      return { locked: true, pid: renamedPid };
     } catch {
+      if (!existsSync(lockPath)) return { locked: false };
+      const currentPid = readLockPid(lockPath);
+      if (currentPid !== null && isProcessAlive(currentPid)) {
+        return { locked: true, pid: currentPid };
+      }
       return { locked: false };
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-voice",
-  "version": "0.9.16",
+  "version": "0.9.18",
   "description": "Voice input for DeepSeek Harness: dictation chunked by pauses and voice messages, each with its own provider fallback chain (Deepgram, Groq, HuggingFace, local whisper.cpp, plus any OpenAI-compatible API of your own).",
   "license": "MIT",
   "type": "module",