@goodandready/dsh-messenger-gateway 0.3.22 → 0.4.1

package/lib/http.js

@@ -1,3 +1,5 @@
+import { timingSafeEqual } from 'node:crypto'
+
 export async function readBody(req) {
   const chunks = []
   for await (const chunk of req) chunks.push(chunk)
@@ -15,4 +17,13 @@ export function isTrustedSettingsRequest(req) {
   const host = String(req.headers?.host || '')
   if (!origin || !host) return false
   try { return new URL(origin).host === host } catch { return false }
-}
+}
+
+export function timingSafeCompare(a, b) {
+  if (typeof a !== 'string' || typeof b !== 'string') return false
+  const bufA = Buffer.from(a, 'utf8')
+  const bufB = Buffer.from(b, 'utf8')
+  if (bufA.length !== bufB.length) return false
+  return timingSafeEqual(bufA, bufB)
+}
+

package/lib/index.js

@@ -3,7 +3,7 @@ import { join, dirname, resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { defineTool } from '@deepseek-ai/dsh-tools'
 import { Gateway } from './gateway.js'
-import { readBody, writeJson, isTrustedSettingsRequest } from './http.js'
+import { readBody, writeJson, isTrustedSettingsRequest, timingSafeCompare } from './http.js'
 import { registerPluginUpdater } from './updater.js'
 import {
   createMessengerService, dispatchMessenger, httpStatusForError,
@@ -12,7 +12,7 @@ import {
 import { listHomes } from './homes.js'
 import { Config } from './config.js'
 
-export const name = 'dsh-messenger-gateway'
+export const name = '@goodandready/dsh-messenger-gateway'
 export const inject = ['agentDefaultModel', 'agents', 'sessions', 'loader', 'settings', 'webServer', 'attachments', 'tools']
 
 export const SETTINGS_NAMESPACE = 'dsh-messenger-gateway'
@@ -327,6 +327,11 @@ export function apply(ctx, config) {
           startedAt: gw?.stats?.startedAt || 0,
           scheduledCount,
         },
+        apiHealth: {
+          degraded: (gw?.consecutiveApiFailures || 0) >= 3,
+          consecutiveFailures: gw?.consecutiveApiFailures || 0,
+          lastError: gw?.lastApiError || null,
+        },
         config: publicConfig(source()),
       })
     },
@@ -496,9 +501,12 @@ export function apply(ctx, config) {
       const cfg = source().telegram || {}
       if (cfg.transport !== 'webhook') return writeJson(res, 404, { ok: false, error: 'webhook transport disabled' })
       const secret = String(cfg.webhookSecret || '').trim()
-      if (secret) {
-        const hdr = String(req.headers['x-telegram-bot-api-secret-token'] || '')
-        if (hdr !== secret) return writeJson(res, 403, { ok: false, error: 'bad secret' })
+      if (!secret) {
+        return writeJson(res, 403, { ok: false, error: 'webhook secret not configured' })
+      }
+      const hdr = String(req.headers['x-telegram-bot-api-secret-token'] || '')
+      if (!timingSafeCompare(hdr, secret)) {
+        return writeJson(res, 403, { ok: false, error: 'bad secret' })
       }
       const gw = getGw()
       const adapter = gw?.getAdapter?.('telegram')

package/lib/integrations.js

@@ -37,4 +37,4 @@ export async function speakText(baseUrl, text, signal) {
     mime: data.mime || 'audio/mpeg',
     provider: data.provider,
   }
-}
+}

package/lib/media.js

@@ -40,14 +40,6 @@ export function classifyDocument(ext, mime) {
   return 'unsupported'
 }
 
-export function mediaKindOf(path) {
-  const ext = extname(path).toLowerCase()
-  if (IMAGE_EXT_TO_MIME[ext]) return 'photo'
-  if (['.ogg', '.opus', '.oga'].includes(ext)) return 'voice'
-  if (['.mp3', '.m4a', '.wav', '.flac'].includes(ext)) return 'audio'
-  return 'document'
-}
-
 export function safeName(name) {
   return String(name || 'file').replace(/[^\w.\- ]/g, '_').slice(0, 120) || 'file'
 }
@@ -65,4 +57,4 @@ export function cacheName(prefix, ext, name) {
   return display ? `${base}-${display}${ext || ''}` : `${base}${ext || ''}`
 }
 
-export { basename }
+export { basename }

package/lib/models.js

@@ -20,11 +20,14 @@ export async function listModelCatalog(ctx, fallback = {}) {
             pId,
             (models || []).map((m) => ({ id: m.id || m, name: m.name || m.id || m }))
           )
-        } catch {
+        } catch (err) {
+          /* safe fallback to empty list when provider cannot list models */
           result.modelsByProvider.set(pId, [])
         }
       }
-    } catch {}
+    } catch (err) {
+      /* safe fallback when ctx.llm.listProviders is unavailable or throws */
+    }
   }
 
   // 2. If no providers from ctx.llm, check settings / fallback
@@ -117,4 +120,4 @@ export function buildModelsKeyboard(providerId, models, currentModel, page = 0,
   rows.push([{ text: '🔙 Back to providers', callback_data: 'mdl:back' }])
 
   return { inline_keyboard: rows, page: curPage, totalPages }
-}
+}

package/lib/outbound.js

@@ -110,4 +110,4 @@ export async function buildOutboundFiles(ctx, baseUrl, collector, opts = {}) {
     }
   }
   return files
-}
+}

package/lib/pairing.js

@@ -19,25 +19,29 @@ function writeJsonAtomicSync(filePath, data) {
     writeFileSync(tmpPath, JSON.stringify(data, null, 2), 'utf8')
     renameSync(tmpPath, filePath)
   } catch (err) {
-    try { unlinkSync(tmpPath) } catch {}
+    try { unlinkSync(tmpPath) } catch { /* safe best-effort temp file cleanup */ }
     throw err
   }
 }
 
-export function createPairingStore(filePath) {
+export function createPairingStore(filePath, { logger } = {}) {
   const state = { pending: {}, /** @type {number[]} */ approved: [] }
   if (filePath && existsSync(filePath)) {
     try {
       const raw = JSON.parse(readFileSync(filePath, 'utf8'))
       if (Array.isArray(raw.approved)) state.approved = raw.approved.map(Number).filter(Number.isFinite)
       if (raw.pending && typeof raw.pending === 'object') state.pending = raw.pending
-    } catch {}
+    } catch (err) {
+      logger?.warn?.('[dsh-messenger-gateway] pairing store read error:', err?.message || err)
+    }
   }
   const persist = () => {
     if (!filePath) return
     try {
       writeJsonAtomicSync(filePath, { approved: state.approved, pending: state.pending })
-    } catch {}
+    } catch (err) {
+      logger?.warn?.('[dsh-messenger-gateway] pairing store persist error:', err?.message || err)
+    }
   }
   const prune = () => {
     const now = Date.now()

package/lib/personas.js

@@ -70,7 +70,7 @@ export function listPersonas() {
   return Object.values(BUILTIN_PERSONAS)
 }
 
-export function createPersonaStore(filePath) {
+export function createPersonaStore(filePath, { logger } = {}) {
   let cache = { personas: {}, presets: {} }
   try {
     const raw = JSON.parse(readFileSync(filePath, 'utf8'))
@@ -81,13 +81,17 @@ export function createPersonaStore(filePath) {
         cache = { personas: raw, presets: {} }
       }
     }
-  } catch {}
+  } catch (err) {
+    if (err?.code !== 'ENOENT') logger?.warn?.('[dsh-messenger-gateway] personas load error:', err?.message || err)
+  }
 
   function save() {
     try {
       mkdirSync(dirname(filePath), { recursive: true })
       writeFileSync(filePath, JSON.stringify(cache, null, 2), 'utf8')
-    } catch {}
+    } catch (err) {
+      logger?.warn?.('[dsh-messenger-gateway] personas save error:', err?.message || err)
+    }
   }
 
   function makeKey(chatId, threadId = 0) {
@@ -148,4 +152,4 @@ export function createPersonaStore(filePath) {
       return { ...cache }
     },
   }
-}
+}

package/lib/photos.js

@@ -28,4 +28,4 @@ export function photoOnlyHint(attachments, userText) {
   if (!photos.length) return ''
   if (photos.length === 1) return '[User attached a photo]'
   return `[User attached ${photos.length} photos]`
-}
+}

package/lib/scheduler.js

@@ -33,7 +33,8 @@ export function formatRemaining(ms, locale = 'en') {
   return remMin ? `${hr}h ${remMin}m` : `${hr}h`
 }
 
-export function createScheduler(filePath, onDue) {
+export function createScheduler(filePath, onDue, options = {}) {
+  const logger = options?.logger || console
   let tasks = []
   let loaded = false
   let timer = null
@@ -42,7 +43,10 @@ export function createScheduler(filePath, onDue) {
     try {
       const raw = await readFile(filePath, 'utf8')
       tasks = JSON.parse(raw)
-    } catch {
+    } catch (err) {
+      if (err?.code !== 'ENOENT') {
+        logger?.debug?.('[dsh-messenger-gateway] scheduler load error:', err?.message || err)
+      }
       tasks = []
     }
     loaded = true
@@ -60,7 +64,9 @@ export function createScheduler(filePath, onDue) {
         return (now - finishTime) < RETENTION_MS
       })
       await writeJsonAtomic(filePath, tasks)
-    } catch {}
+    } catch (err) {
+      logger?.warn?.('[dsh-messenger-gateway] scheduler save failed:', err?.message || err)
+    }
   }
 
   async function checkDue() {
@@ -77,7 +83,11 @@ export function createScheduler(filePath, onDue) {
         task.firedAt = now
       }
       if (typeof onDue === 'function') {
-        try { await onDue(task) } catch {}
+        try {
+          await onDue(task)
+        } catch (err) {
+          logger?.warn?.('[dsh-messenger-gateway] scheduler task execution failed:', err?.message || err)
+        }
       }
     }
 

package/lib/stream.js

@@ -1,116 +1,116 @@
-/** Helpers for Telegram streaming edits + progress. */
-
-export function extractTextDelta(chunk) {
-  if (!chunk || typeof chunk !== 'object') return ''
-  if (chunk.type === 'text-delta' && typeof chunk.text === 'string') return chunk.text
-  return ''
-}
-
-export function extractToolName(eventData) {
-  const name = eventData?.tool?.name || eventData?.toolName || eventData?.name
-  return name ? String(name) : ''
-}
-
-export function formatProgressLine(toolName, locale = 'en') {
-  if (!toolName) {
-    return String(locale || '').toLowerCase().startsWith('zh') ? '⏳ 思考中…' : '⏳ Thinking…'
-  }
-  return `🔧 ${toolName}…`
-}
-
-export function buildStreamPreview(streamText, toolName, maxLen = 3500) {
-  const body = String(streamText || '').trimEnd()
-  const head = toolName ? `${formatProgressLine(toolName)}\n\n` : ''
-  const combined = head + (body || '…')
-  if (combined.length <= maxLen) return combined
-  return combined.slice(0, maxLen - 1) + '…'
-}
-
-export function parseRetryAfter(err) {
-  if (!err) return 0
-  const msg = err.message || String(err)
-  const match = /retry after (\d+)/i.exec(msg)
-  if (match) return parseInt(match[1], 10) * 1000
-  return 0
-}
-
-export function createEditScheduler(editFn, intervalMs = 1200, firstChunkDelayMs = 250) {
-  let pending = null
-  let timer = null
-  let lastSent = ''
-  let inFlight = Promise.resolve()
-  let retryDelayMs = 0
-
-  const flush = () => {
-    timer = null
-    if (pending === null || pending === lastSent) return
-    const text = pending
-    inFlight = inFlight.then(async () => {
-      try {
-        if (retryDelayMs > 0) {
-          const delay = retryDelayMs
-          retryDelayMs = 0
-          await new Promise((r) => setTimeout(r, delay))
-        }
-        await editFn(text)
-        lastSent = text
-      } catch (err) {
-        const retry = parseRetryAfter(err)
-        if (retry > 0) {
-          retryDelayMs = retry
-          // Re-schedule flush with retry delay
-          if (!timer) {
-            timer = setTimeout(flush, retry + 100)
-            timer.unref?.()
-          }
-        }
-      }
-    })
-  }
-
-  return {
-    push(text) {
-      pending = text
-      if (timer) return
-      // Fast first chunk: when lastSent is empty, dispatch quickly so user sees immediate response.
-      // Subsequent edits throttle to intervalMs to respect Telegram rate limits.
-      const delay = !lastSent ? Math.min(firstChunkDelayMs, intervalMs) : Math.max(200, intervalMs)
-      timer = setTimeout(flush, delay)
-      timer.unref?.()
-    },
-    async flush() {
-      if (timer) { clearTimeout(timer); timer = null }
-      flush()
-      await inFlight
-      // If there's still a pending difference (e.g. rate limit delay happened), wait and retry
-      if (pending !== null && pending !== lastSent) {
-        if (retryDelayMs > 0) {
-          await new Promise((r) => setTimeout(r, retryDelayMs + 50))
-          retryDelayMs = 0
-        }
-        try {
-          await editFn(pending)
-          lastSent = pending
-        } catch {}
-      }
-    },
-  }
-}
-
-export function startTypingHeartbeat(typingFn, intervalMs = 4000) {
-  if (typeof typingFn !== 'function') return () => {}
-  let active = true
-  const safeInvoke = () => {
-    if (!active) return
-    try {
-      typingFn()?.catch?.(() => {})
-    } catch {}
-  }
-  safeInvoke()
-  const timer = setInterval(safeInvoke, intervalMs)
-  timer.unref?.()
-  return () => {
-    active = false
-    clearInterval(timer)
-  }
+/** Helpers for Telegram streaming edits + progress. */
+
+export function extractTextDelta(chunk) {
+  if (!chunk || typeof chunk !== 'object') return ''
+  if (chunk.type === 'text-delta' && typeof chunk.text === 'string') return chunk.text
+  return ''
+}
+
+export function extractToolName(eventData) {
+  const name = eventData?.tool?.name || eventData?.toolName || eventData?.name
+  return name ? String(name) : ''
+}
+
+export function formatProgressLine(toolName, locale = 'en') {
+  if (!toolName) {
+    return String(locale || '').toLowerCase().startsWith('zh') ? '⏳ 思考中…' : '⏳ Thinking…'
+  }
+  return `🔧 ${toolName}…`
+}
+
+export function buildStreamPreview(streamText, toolName, maxLen = 3500) {
+  const body = String(streamText || '').trimEnd()
+  const head = toolName ? `${formatProgressLine(toolName)}\n\n` : ''
+  const combined = head + (body || '…')
+  if (combined.length <= maxLen) return combined
+  return combined.slice(0, maxLen - 1) + '…'
+}
+
+export function parseRetryAfter(err) {
+  if (!err) return 0
+  const msg = err.message || String(err)
+  const match = /retry after (\d+)/i.exec(msg)
+  if (match) return parseInt(match[1], 10) * 1000
+  return 0
+}
+
+export function createEditScheduler(editFn, intervalMs = 1200, firstChunkDelayMs = 250) {
+  let pending = null
+  let timer = null
+  let lastSent = ''
+  let inFlight = Promise.resolve()
+  let retryDelayMs = 0
+
+  const flush = () => {
+    timer = null
+    if (pending === null || pending === lastSent) return
+    const text = pending
+    inFlight = inFlight.then(async () => {
+      try {
+        if (retryDelayMs > 0) {
+          const delay = retryDelayMs
+          retryDelayMs = 0
+          await new Promise((r) => setTimeout(r, delay))
+        }
+        await editFn(text)
+        lastSent = text
+      } catch (err) {
+        const retry = parseRetryAfter(err)
+        if (retry > 0) {
+          retryDelayMs = retry
+          // Re-schedule flush with retry delay
+          if (!timer) {
+            timer = setTimeout(flush, retry + 100)
+            timer.unref?.()
+          }
+        }
+      }
+    })
+  }
+
+  return {
+    push(text) {
+      pending = text
+      if (timer) return
+      // Fast first chunk: when lastSent is empty, dispatch quickly so user sees immediate response.
+      // Subsequent edits throttle to intervalMs to respect Telegram rate limits.
+      const delay = !lastSent ? Math.min(firstChunkDelayMs, intervalMs) : Math.max(200, intervalMs)
+      timer = setTimeout(flush, delay)
+      timer.unref?.()
+    },
+    async flush() {
+      if (timer) { clearTimeout(timer); timer = null }
+      flush()
+      await inFlight
+      // If there's still a pending difference (e.g. rate limit delay happened), wait and retry
+      if (pending !== null && pending !== lastSent) {
+        if (retryDelayMs > 0) {
+          await new Promise((r) => setTimeout(r, retryDelayMs + 50))
+          retryDelayMs = 0
+        }
+        try {
+          await editFn(pending)
+          lastSent = pending
+        } catch { /* safe best-effort final stream update delivery */ }
+      }
+    },
+  }
+}
+
+export function startTypingHeartbeat(typingFn, intervalMs = 4000) {
+  if (typeof typingFn !== 'function') return () => {}
+  let active = true
+  const safeInvoke = () => {
+    if (!active) return
+    try {
+      typingFn()?.catch?.(() => { /* safe best-effort typing indicator */ })
+    } catch { /* safe best-effort typing indicator */ }
+  }
+  safeInvoke()
+  const timer = setInterval(safeInvoke, intervalMs)
+  timer.unref?.()
+  return () => {
+    active = false
+    clearInterval(timer)
+  }
 }

package/lib/topics.js

@@ -25,20 +25,6 @@ export function sessionKey({ platform, chatId, threadId = 0, userId, chatType, s
   return base
 }
 
-export function parseChatKey(key) {
-  const parts = String(key || "").split(":")
-  if (parts.length < 2) return null
-  const platform = parts[0]
-  const chatId = parts[1]
-  const threadId = parts.length >= 3 ? normalizeThreadId(parts[2]) : 0
-  const out = { platform, chatId, threadId }
-  if (parts.length >= 5 && parts[3] === "u") {
-    const userId = Number(parts[4])
-    if (Number.isFinite(userId)) out.userId = userId
-  }
-  return out
-}
-
 /** Extra Telegram API fields for forum topic replies. */
 export function telegramThreadParams(threadId) {
   const tid = normalizeThreadId(threadId)

package/lib/tts.js

@@ -57,16 +57,6 @@ export function isOggOpusMime(mime) {
   return m.includes('ogg') || m.includes('opus')
 }
 
-export function voiceReplyFile(spoken) {
-  const mime = spoken?.mime || 'audio/mpeg'
-  return {
-    bytes: spoken.audio,
-    mime,
-    kind: 'voice',
-    name: voiceFileNameForMime(mime),
-  }
-}
-
 function runFfmpeg(args) {
   return new Promise((resolve, reject) => {
     const child = spawn('ffmpeg', args, { stdio: ['ignore', 'ignore', 'pipe'] })

package/lib/voice-prefs.js

@@ -10,25 +10,29 @@ function writeJsonAtomicSync(filePath, data) {
     writeFileSync(tmpPath, JSON.stringify(data, null, 2), "utf8")
     renameSync(tmpPath, filePath)
   } catch (err) {
-    try { unlinkSync(tmpPath) } catch {}
+    try { unlinkSync(tmpPath) } catch { /* safe best-effort temp file cleanup */ }
     throw err
   }
 }
 
-export function createVoicePrefs(filePath) {
+export function createVoicePrefs(filePath, { logger } = {}) {
   /** @type {Record<string, boolean>} */
   let state = {}
   if (filePath && existsSync(filePath)) {
     try {
       const raw = JSON.parse(readFileSync(filePath, "utf8"))
       if (raw && typeof raw === "object") state = raw
-    } catch {}
+    } catch (err) {
+      logger?.warn?.('[dsh-messenger-gateway] voice prefs read error:', err?.message || err)
+    }
   }
   const persist = () => {
     if (!filePath) return
     try {
       writeJsonAtomicSync(filePath, state)
-    } catch {}
+    } catch (err) {
+      logger?.warn?.('[dsh-messenger-gateway] voice prefs persist error:', err?.message || err)
+    }
   }
   const key = (userId) => String(Number(userId) || userId || "")
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-messenger-gateway",
-  "version": "0.3.22",
+  "version": "0.4.1",
   "description": "Telegram messenger bridge for DeepSeek Harness: sessions, steer, homes, inline asks, notify bridge, and optional TTS voice notes.",
   "license": "MIT",
   "type": "module",
@@ -42,7 +42,11 @@
     },
     "client": {
       "platform": "web",
-      "inject": []
+      "inject": [
+        "@deepseek-ai/dsh-client-locale",
+        "@deepseek-ai/dsh-client-ui-slots",
+        "@deepseek-ai/dsh-client-ui-settings"
+      ]
     }
   },
   "peerDependencies": {