@goodandready/dsh-tts 0.4.28 → 0.4.30

package/lib/index.js

@@ -163,9 +163,9 @@ export const Config = z.object({
     .description('Longer replies are truncated before synthesis.'),
   chain: z.array(ChainEntry).volatile()
     .default([
-      { provider: 'edge', model: '', voice: 'ru-RU-SvetlanaNeural' },
+      { provider: 'edge', model: '', voice: 'en-US-JennyNeural' },
       { provider: 'piper', model: '', voice: '' },
-      { provider: 'espeak', model: '', voice: 'ru' },
+      { provider: 'espeak', model: '', voice: 'en' },
     ])
     .description('Fallback chain. Order is the order of attempts. A provider without a key is skipped.'),
   openaiKeyEnv: z.string().volatile().default('OPENAI_API_KEY'),
@@ -198,23 +198,56 @@ export const Config = z.object({
   maxQueue: z.number().step(1).min(0).volatile().default(8),
 })
 
+export function extractRevision(desc, targetNs = NS) {
+  if (!desc) return undefined
+  if (typeof desc.revision === 'number' || typeof desc.revision === 'string') {
+    return desc.revision
+  }
+  let list = null
+  if (Array.isArray(desc)) {
+    list = desc
+  } else if (Array.isArray(desc.namespaces)) {
+    list = desc.namespaces
+  } else if (Array.isArray(desc.entries)) {
+    list = desc.entries
+  }
+  if (list) {
+    const match = list.find((item) => {
+      if (!item || typeof item !== 'object') return false
+      const name = item.name || item.id || item.ns || item.namespace || item.key
+      return name === targetNs || name === 'goodandready/dsh-tts' || name === 'dsh-tts' || name === '@goodandready/dsh-tts'
+    })
+    if (match && (typeof match.revision === 'number' || typeof match.revision === 'string')) {
+      return match.revision
+    }
+    if (list.length === 1 && (typeof list[0].revision === 'number' || typeof list[0].revision === 'string')) {
+      return list[0].revision
+    }
+  }
+  if (typeof desc === 'object') {
+    for (const k of [targetNs, 'goodandready/dsh-tts', 'dsh-tts', '@goodandready/dsh-tts']) {
+      if (desc[k] && (typeof desc[k].revision === 'number' || typeof desc[k].revision === 'string')) {
+        return desc[k].revision
+      }
+    }
+  }
+  return undefined
+}
+
 let utteranceSeq = 0
 
 export function apply(ctx, config) {
   const providerBreaker = createProviderBreaker()
 
-  let savedConfig = null
   const live = () => {
     const fromBoxes = plainConfig(config)
-    const merged = savedConfig ? { ...fromBoxes, ...savedConfig } : fromBoxes
-    return plainConfig(Config(merged))
+    return plainConfig(Config(fromBoxes))
   }
 
   const settingsApi = {
     get: () => live(),
     replace: async (next, expectedRevision) => {
       const plain = plainConfig(next)
-      const prevSaved = savedConfig
       const svc = ctx?.get?.('settings') ?? ctx?.settings ?? ctx?.get?.('settingsForms') ?? ctx?.settingsForms
       if (!svc) {
         throw new Error('Settings service is unavailable')
@@ -223,28 +256,33 @@ export function apply(ctx, config) {
       if (rev === undefined && typeof svc.describe === 'function') {
         try {
           const desc = await svc.describe(NS)
-          if (desc && typeof desc.revision === 'number') {
-            rev = desc.revision
-          } else if (desc && Array.isArray(desc.namespaces)) {
-            const entry = desc.namespaces.find((n) => n.ns === NS)
-            if (entry && typeof entry.revision === 'number') rev = entry.revision
-          }
-        } catch {
+          rev = extractRevision(desc, NS)
+        } catch (_err) {
           // ignore describe error
         }
       }
-      try {
-        if (typeof svc.replace === 'function') {
-          await svc.replace(NS, plain, rev)
-        } else if (typeof svc.update === 'function') {
-          await svc.update(NS, plain, rev)
-        } else {
-          throw new Error('Settings service does not support replace or update')
+      if (typeof svc.replace === 'function') {
+        await svc.replace(NS, plain, rev)
+      } else if (typeof svc.update === 'function') {
+        await svc.update(NS, plain, rev)
+      } else {
+        throw new Error('Settings service does not support replace or update')
+      }
+
+      // Mutate volatile boxes directly so runtime dynamically reflects new settings (#152)
+      if (config && typeof config === 'object') {
+        for (const [k, v] of Object.entries(plain)) {
+          if (config[k] && typeof config[k] === 'object') {
+            const sym = Object.getOwnPropertySymbols(config[k]).find((s) => String(s).includes('volatile.write'))
+            if (sym && typeof config[k][sym] === 'function') {
+              try { config[k][sym](v) } catch (_wErr) { /* best effort */ }
+            } else if ('value' in config[k]) {
+              config[k].value = v
+            }
+          } else if (config[k] !== undefined) {
+            config[k] = v
+          }
         }
-        savedConfig = plain
-      } catch (err) {
-        savedConfig = prevSaved
-        throw err
       }
       return plain
     },
@@ -265,7 +303,7 @@ export function apply(ctx, config) {
     try {
       const resolved = await ctx.credentials.resolve(credentialRef(ref))
       if (resolved && resolved.value) return resolved.value
-    } catch { /* fall through to env */ }
+    } catch (_err) { /* fall through to env */ }
     return process.env[ref] || ''
   }
 
@@ -285,7 +323,7 @@ export function apply(ctx, config) {
       }
       const resolved = await ctx.credentials.resolve(credentialRef(ref))
       return { provider, ref, configured: !!(resolved && resolved.value), writable: true }
-    } catch {
+    } catch (_err) {
       return base
     }
   }
@@ -327,10 +365,21 @@ export function apply(ctx, config) {
   }
 
   async function configResponse() {
+    let revision = null
+    const svc = ctx?.get?.('settings') ?? ctx?.settings ?? ctx?.get?.('settingsForms') ?? ctx?.settingsForms
+    if (svc && typeof svc.describe === 'function') {
+      try {
+        const desc = await svc.describe(NS)
+        revision = extractRevision(desc, NS) ?? null
+      } catch (_err) {
+        // best effort describe
+      }
+    }
     return {
       ok: true,
       config: publicConfig(live()),
       credentials: await credentialsView(),
+      revision,
     }
   }
 
@@ -381,7 +430,7 @@ export function apply(ctx, config) {
           if (retold) {
             return speechPhrases(cfg.language).summaryIntro + ' ' + retold
           }
-        } catch { /* quiet fallback to truncation */ }
+        } catch (_err) { /* quiet fallback to truncation */ }
       }
       return text.slice(0, maxChars)
     }
@@ -389,7 +438,8 @@ export function apply(ctx, config) {
   }
 
   function synthesisFingerprint(text, provider, model, voice, role, ssmlStyle, cfg, lang) {
-    const parts = [text, provider, model || '', voice || '', role || '', ssmlStyle || '', lang || '']
+    const credRef = needsApiKey(provider) ? (keyEnvName(cfg, provider) || '') : ''
+    const parts = [text, provider, model || '', voice || '', role || '', ssmlStyle || '', lang || '', credRef]
     if (provider === 'custom') parts.push(cfg.customBaseUrl || '')
     else if (provider === 'openai') parts.push(cfg.openaiBaseUrl || '')
     else if (provider === 'mimo') parts.push(cfg.mimoBaseUrl || '', cfg.mimoFormat || '')
@@ -402,12 +452,13 @@ export function apply(ctx, config) {
 
   function flightFingerprint(text, order, models, voices, role, ssmlStyle, cfg, lang) {
     const details = order.map((p) => {
+      const credRef = needsApiKey(p) ? (keyEnvName(cfg, p) || '') : ''
       const extra = p === 'custom' ? (cfg.customBaseUrl || '') :
                     p === 'openai' ? (cfg.openaiBaseUrl || '') :
                     p === 'mimo' ? `${cfg.mimoBaseUrl || ''}:${cfg.mimoFormat || ''}` :
                     p === 'azure' ? (cfg.azureRegion || '') :
                     p === 'piper' ? `${cfg.piperModel || ''}:${cfg.piperBin || ''}` : ''
-      return `${p}:${models[p] || ''}:${voices[p] || ''}:${extra}`
+      return `${p}:${models[p] || ''}:${voices[p] || ''}:${credRef}:${extra}`
     }).join(';')
     return cacheKey([text, details, role, ssmlStyle, lang])
   }
@@ -656,7 +707,7 @@ export function apply(ctx, config) {
         if (p && p.id && activeReservations.has(p.id)) {
           const resv = activeReservations.get(p.id)
           resv.dropped = true
-          try { resv.controller.abort() } catch {}
+          try { resv.controller.abort() } catch (_abortErr) { /* ignore aborted controller */ }
           clearTimeout(resv.timer)
           activeReservations.delete(p.id)
         }
@@ -671,7 +722,7 @@ export function apply(ctx, config) {
         const resv = activeReservations.get(dropped.id)
         if (resv) {
           resv.dropped = true
-          try { resv.controller.abort() } catch {}
+          try { resv.controller.abort() } catch (_abortErr) { /* ignore aborted controller */ }
           clearTimeout(resv.timer)
           activeReservations.delete(dropped.id)
         }
@@ -720,8 +771,10 @@ export function apply(ctx, config) {
     if (!cfg.speakReplies) return
     const sid = session && session.id
     if (!sid) return
-    const isMessenger = session && (session.kind === 'im' || session.kind === 'messenger' || session.channel === 'messenger' || session.type === 'im')
-    if (isMessenger && cfg.messengerTtsEnabled === false) return
+    const isMessenger = session && (session.kind === 'im' || session.kind === 'messenger' || session.channel === 'messenger' || session.type === 'im' || session.source === 'messenger')
+    if (isMessenger && !cfg.messengerTtsEnabled) return
+    const isVoice = session && (session.kind === 'voice' || session.channel === 'voice' || session.type === 'voice' || session.mode === 'voice')
+    if (isVoice && !cfg.voiceDuplexEnabled) return
     // The agent is waiting for human approval — worth speaking aloud
     // so the user notices without watching the screen.
     if (event.type === 'approval/asked') {
@@ -737,7 +790,7 @@ export function apply(ctx, config) {
     }
 
     if (event.type === 'assistant/message') {
-      const text = assistantText(event.data && event.data.message)
+      const text = assistantText(event.data && (event.data.message ?? event.data.text ?? event.data))
       const agentName = (event.data && (
         event.data.subagent ||
         event.data.agent ||
@@ -750,8 +803,12 @@ export function apply(ctx, config) {
       // in sentence pieces; waiting for turn end means silence while the agent works.
       
       if (cfg.speakAsItGoes) {
-        const ready = cleanText(text, cfg, 0)
-        for (const piece of splitSentences(ready, cfg.sentenceChars)) speakPiece(sid, piece, cfg, activeRole)
+        prepareSpeechText(text, cfg).then((ready) => {
+          if (!ready) return
+          for (const piece of splitSentences(ready, cfg.sentenceChars)) speakPiece(sid, piece, cfg, activeRole)
+        }).catch((_err) => {
+          // best-effort speech fallback
+        })
         return
       }
       const cur = collectors.get(sid) || { parts: [], role: activeRole }
@@ -816,6 +873,7 @@ export function apply(ctx, config) {
           additionalProperties: false,
           properties: {
             ok: { type: 'boolean' },
+            id: { type: 'string' },
             provider: { type: 'string' },
             mime: { type: 'string' },
             bytes: { type: 'number' },

package/lib/providers/cloud.js

@@ -192,7 +192,15 @@ export function makeCloudProviders(deps, req, withCloudTimeout) {
     const m = mimeType.match(/rate=(\d+)/i)
     if (m) sampleRate = parseInt(m[1], 10)
     const isWavAlready = raw.length >= 4 && raw.toString('ascii', 0, 4) === 'RIFF'
-    const audio = isWavAlready ? raw : pcmToWav(raw, sampleRate, 1)
+    let audio = null
+    const lowerMime = mimeType.toLowerCase()
+    if (isWavAlready || lowerMime.includes('wav')) {
+      audio = raw
+    } else if (!lowerMime || lowerMime.includes('pcm') || lowerMime.includes('raw') || lowerMime.includes('l16')) {
+      audio = pcmToWav(raw, sampleRate, 1)
+    } else {
+      return { ok: false, provider: 'google', reason: `unsupported Google TTS MIME: ${mimeType}` }
+    }
     return { ok: audio.length > 0, provider: 'google', audio, mime: 'audio/wav', reason: audio.length ? '' : 'empty audio' }
     } finally {
       cleanup()

package/lib/providers.js

@@ -29,7 +29,7 @@ export function makeProviders(deps, req) {
       cleanup: () => {
         clearTimeout(timer)
         if (parentSignal && onParentAbort) {
-          try { parentSignal.removeEventListener('abort', onParentAbort) } catch {}
+          try { parentSignal.removeEventListener('abort', onParentAbort) } catch (_err) { /* parent abort listener already removed */ }
         }
       },
     }

package/lib/routes.js

@@ -119,7 +119,7 @@ export function registerHttpRoutes(ctx, api) {
         writeJson(res, 400, { ok: false, error: { code: 'param', message: 'missing engine parameter' } })
         return
       }
-      if (!MODEL_SPECS[engine]) {
+      if (!Object.hasOwn(MODEL_SPECS, engine)) {
         writeJson(res, 400, { ok: false, error: { code: 'param', message: 'unknown engine: ' + engine } })
         return
       }
@@ -160,7 +160,7 @@ export function registerHttpRoutes(ctx, api) {
         writeJson(res, 400, { ok: false, error: { code: 'param', message: 'missing engine parameter' } })
         return
       }
-      if (!MODEL_SPECS[engine]) {
+      if (!Object.hasOwn(MODEL_SPECS, engine)) {
         writeJson(res, 400, { ok: false, error: { code: 'param', message: 'unknown engine: ' + engine } })
         return
       }
@@ -187,7 +187,7 @@ export function registerHttpRoutes(ctx, api) {
         try {
           if (typeof ctx.get === 'function' && ctx.get(id)) return true
           if (ctx[id]) return true
-        } catch {}
+        } catch (_err) { /* service check fallback */ }
         try {
           const reg = ctx.registry || ctx.root?.registry
           if (reg && typeof reg.entries === 'function') {
@@ -197,7 +197,7 @@ export function registerHttpRoutes(ctx, api) {
               if (id === 'messenger' && (name.includes('messenger') || name.includes('dsh-im'))) return true
             }
           }
-        } catch {}
+        } catch (_err) { /* registry check fallback */ }
         try {
           if (ctx.webServer) {
             if (typeof ctx.webServer.hasRoute === 'function') {
@@ -207,7 +207,7 @@ export function registerHttpRoutes(ctx, api) {
               if (ctx.webServer.routes.some((r) => r && r.path && r.path.includes(id))) return true
             }
           }
-        } catch {}
+        } catch (_err) { /* webServer route check fallback */ }
         return false
       }
 
@@ -467,6 +467,11 @@ export function registerHttpRoutes(ctx, api) {
       const rawText = String(payload.text || '')
       if (!rawText.trim()) { writeJson(res, 400, { ok: false, error: { code: 'no-text', message: 'no text' } }); return }
       const cfg = live()
+      const isMessenger = payload.channel === 'messenger' || payload.source === 'messenger' || req.headers['x-dsh-channel'] === 'messenger'
+      if (isMessenger && !cfg.messengerTtsEnabled) {
+        writeJson(res, 403, { ok: false, error: { code: 'disabled', message: 'messenger tts is disabled' } })
+        return
+      }
       const controller = new AbortController()
       const timer = setTimeout(() => controller.abort(), cfg.timeoutMs)
       try {
@@ -490,15 +495,11 @@ export function registerHttpRoutes(ctx, api) {
     },
   }), 'dsh-tts: /speak route')
 
-  ctx.effect(() => registerPluginUpdater(ctx, {
-    endpoint: '/dsh-tts/updater',
-    packageName: '@goodandready/dsh-tts',
-    manifestUrl: new URL('../package.json', import.meta.url),
-  }), 'dsh-tts: updater route /dsh-tts/updater')
-
+  const updaterMutex = { installing: false }
   ctx.effect(() => registerPluginUpdater(ctx, {
     endpoint: '/api/dsh-tts/update',
     packageName: '@goodandready/dsh-tts',
     manifestUrl: new URL('../package.json', import.meta.url),
+    mutex: updaterMutex,
   }), 'dsh-tts: updater route /api/dsh-tts/update')
 }

package/lib/stream-hub.js

@@ -20,25 +20,22 @@ function detach(res) {
 }
 
 function safeWrite(res, payload) {
-  // If subscriber is already backpressured, check buffered limit
-  if (res.__dtsBackpressured) {
-    const currentBuffered = typeof res.writableLength === 'number'
-      ? res.writableLength
-      : (res.__dtsBufferedBytes || 0)
-    const payloadBytes = Buffer.byteLength(payload)
-    if (currentBuffered + payloadBytes > MAX_SUBSCRIBER_BUFFER) {
-      // Disconnect slow subscriber exceeding memory buffer limit (#186)
-      subscribers.delete(res)
-      detach(res)
-      try { res.end() } catch {}
-      return false
-    }
+  const payloadBytes = Buffer.byteLength(payload)
+  const currentBuffered = typeof res.writableLength === 'number'
+    ? res.writableLength
+    : (res.__dtsBufferedBytes || 0)
+
+  if (res.__dtsBackpressured && currentBuffered + payloadBytes > MAX_SUBSCRIBER_BUFFER) {
+    subscribers.delete(res)
+    detach(res)
+    try { res.end() } catch (_err) { /* already ended */ }
+    return false
   }
 
   let writeOk = true
   try {
     writeOk = res.write(payload)
-  } catch {
+  } catch (_err) {
     subscribers.delete(res)
     detach(res)
     return false
@@ -46,7 +43,13 @@ function safeWrite(res, payload) {
 
   if (writeOk === false) {
     res.__dtsBackpressured = true
-    res.__dtsBufferedBytes = (res.__dtsBufferedBytes || 0) + Buffer.byteLength(payload)
+    res.__dtsBufferedBytes = (res.__dtsBufferedBytes || 0) + payloadBytes
+    if (res.__dtsBufferedBytes > MAX_SUBSCRIBER_BUFFER) {
+      subscribers.delete(res)
+      detach(res)
+      try { res.end() } catch (_err) { /* already ended */ }
+      return false
+    }
     if (!res.__dtsOnDrain) {
       const onDrain = () => {
         res.__dtsBackpressured = false
@@ -55,7 +58,7 @@ function safeWrite(res, payload) {
       res.__dtsOnDrain = onDrain
       try {
         if (typeof res.on === 'function') res.on('drain', onDrain)
-      } catch { /* non-eventemitter mock */ }
+      } catch (_err) { /* non-eventemitter mock */ }
     }
   } else if (res.__dtsBackpressured && (!res.writableLength || res.writableLength === 0)) {
     res.__dtsBackpressured = false

package/lib/text.js

@@ -138,7 +138,13 @@ export function stripForSpeech(raw, maxChars, opts) {
 
 export function assistantText(message) {
   if (!message) return ''
-  return blocksToText(message.content)
+  if (typeof message === 'string') return message
+  if (typeof message === 'object') {
+    if (message.content !== undefined) return blocksToText(message.content)
+    if (typeof message.text === 'string') return message.text
+    if (typeof message.message === 'string') return message.message
+  }
+  return ''
 }
 
 // Protect common English abbreviations from false sentence splits

package/lib/updater.js

@@ -225,7 +225,6 @@ async function installExact(target, packageSpec, options) {
         '--profile',
         target.profileName,
         'add',
-        '--config.minimumReleaseAge=0',
         packageSpec,
         `--registry=${options.registry ?? 'https://registry.npmjs.org/'}`,
       ],
@@ -268,7 +267,7 @@ function json(response, statusCode, value) {
 }
 
 export function registerPluginUpdater(ctx, options) {
-  let installing = false
+  const mutex = options?.mutex || { installing: false }
   if (typeof ctx?.webServer?.register !== 'function') {
     ctx?.logger?.warn?.('[dsh-tts] webServer service unavailable, updater skipped')
     return () => {}
@@ -298,11 +297,11 @@ export function registerPluginUpdater(ctx, options) {
           json(response, 403, { error: 'Rejected non-local or cross-origin update request.' })
           return
         }
-        if (installing) {
+        if (mutex.installing) {
           json(response, 409, { error: 'This plugin is already updating.' })
           return
         }
-        installing = true
+        mutex.installing = true
         try {
           const before = await status(options, target)
           if (before.latestVersion === undefined) {
@@ -322,7 +321,7 @@ export function registerPluginUpdater(ctx, options) {
         } catch (err) {
           json(response, 503, { error: `Plugin update failed: ${String(err?.message || err)}` })
         } finally {
-          installing = false
+          mutex.installing = false
         }
       } catch (error) {
         ctx?.logger?.warn?.(`[dsh-tts] plugin updater failed: ${String(error)}`)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-tts",
-  "version": "0.4.28",
+  "version": "0.4.30",
   "description": "Text-to-speech for DeepSeek Harness: speak agent replies in the Web UI with a provider fallback chain (OpenAI, ElevenLabs, Google, Azure, Groq, Deepgram, OpenRouter, Edge, Piper, eSpeak).",
   "license": "MIT",
   "type": "module",