@goodandready/dsh-messenger-gateway 0.4.4 → 0.4.6

package/lib/messenger-api.js

@@ -191,6 +191,7 @@ export function resolveAskTimeoutMs(timeoutMs) {
 }
 
 export function httpStatusForError(err) {
+  if (err?.statusCode) return err.statusCode
   if (err?.status) return err.status
   const msg = String(err?.message || '')
   if (msg.includes('timed out')) return 504

package/lib/models.js

@@ -1,13 +1,33 @@
 export const MODEL_PAGE_SIZE = 10
 
-export async function listModelCatalog(ctx, fallback = {}) {
+let catalogCache = new WeakMap()
+
+export function clearModelCatalogCache() {
+  catalogCache = new WeakMap()
+}
+
+export async function listModelCatalog(ctx, fallback = {}, options = {}) {
+  const llm = ctx?.get?.('llm') || ctx?.llm
+  const ttlMs = typeof options.ttlMs === 'number' ? options.ttlMs : 60_000
+  const bypass = Boolean(options.bypassCache)
+  const now = Date.now()
+
+  if (llm && typeof llm === 'object' && !bypass) {
+    const cached = catalogCache.get(llm)
+    if (cached && (now - cached.timestamp < ttlMs)) {
+      return {
+        providers: [...cached.providers],
+        modelsByProvider: new Map(cached.modelsByProvider),
+      }
+    }
+  }
+
   const result = {
     providers: [],
     modelsByProvider: new Map(),
   }
 
   // 1. Try ctx.llm if available
-  const llm = ctx?.get?.('llm') || ctx?.llm
   if (llm?.listProviders) {
     try {
       const providers = await llm.listProviders()
@@ -25,6 +45,13 @@ export async function listModelCatalog(ctx, fallback = {}) {
           result.modelsByProvider.set(pId, [])
         }
       }
+      if (llm && typeof llm === 'object' && result.providers.length > 0) {
+        catalogCache.set(llm, {
+          timestamp: now,
+          providers: result.providers,
+          modelsByProvider: new Map(result.modelsByProvider),
+        })
+      }
     } catch (err) {
       /* safe fallback when ctx.llm.listProviders is unavailable or throws */
     }

package/lib/scheduler.js

@@ -1,170 +1,170 @@
-import { readFile } from 'node:fs/promises'
-import { randomUUID } from 'node:crypto'
-import { writeJsonAtomic } from './storage-atomic.js'
-
-export function parseRelativeTime(input) {
-  if (!input) return null
-  const raw = String(input).trim().toLowerCase()
-  const match = /^(\d+)\s*(s|sec|m|min|h|hr|d|day|秒|分|小时|天)?$/i.exec(raw)
-  if (!match) return null
-
-  const val = parseInt(match[1], 10)
-  if (!Number.isFinite(val) || val <= 0) return null
-
-  const unit = (match[2] || 'm').toLowerCase()
-  if (['s', 'sec', '秒'].includes(unit)) return val * 1000
-  if (['m', 'min', '分'].includes(unit)) return val * 60 * 1000
-  if (['h', 'hr', '小时'].includes(unit)) return val * 3600 * 1000
-  if (['d', 'day', '天'].includes(unit)) return val * 86400 * 1000
-
-  return null
-}
-
-export function formatRemaining(ms, locale = 'en') {
-  const isZh = String(locale || '').toLowerCase().startsWith('zh')
-  if (ms <= 0) return isZh ? '刚刚' : 'now'
-  const sec = Math.ceil(ms / 1000)
-  if (sec < 60) return isZh ? `${sec}秒` : `${sec}s`
-  const min = Math.ceil(sec / 60)
-  if (min < 60) return isZh ? `${min}分` : `${min}m`
-  const hr = Math.floor(min / 60)
-  const remMin = min % 60
-  if (isZh) return remMin ? `${hr}小时 ${remMin}分` : `${hr}小时`
-  return remMin ? `${hr}h ${remMin}m` : `${hr}h`
-}
-
-export function createScheduler(filePath, onDue, options = {}) {
-  const logger = options?.logger || console
-  let tasks = []
-  let loaded = false
-  let timer = null
-
-  async function load() {
-    try {
-      const raw = await readFile(filePath, 'utf8')
-      tasks = JSON.parse(raw)
-    } catch (err) {
-      if (err?.code !== 'ENOENT') {
-        logger?.debug?.('[dsh-messenger-gateway] scheduler load error:', err?.message || err)
-      }
-      tasks = []
-    }
-    loaded = true
-  }
-
-  const RETENTION_MS = 7 * 86400 * 1000
-
-  async function save() {
-    if (!filePath) return
-    try {
-      const now = Date.now()
-      tasks = tasks.filter((t) => {
-        if (t.status === 'pending') return true
-        const finishTime = t.firedAt || t.createdAt || 0
-        return (now - finishTime) < RETENTION_MS
-      })
-      await writeJsonAtomic(filePath, tasks)
-    } catch (err) {
-      logger?.warn?.('[dsh-messenger-gateway] scheduler save failed:', err?.message || err)
-    }
-  }
-
-  async function checkDue() {
-    if (!loaded) await load()
-    const now = Date.now()
-    const due = tasks.filter((t) => t.status === 'pending' && t.dueAt <= now)
-
-    for (const task of due) {
-      if (task.recurring && Number(task.intervalMs) > 0) {
-        task.dueAt = now + Number(task.intervalMs)
-        task.lastFiredAt = now
-      } else {
-        task.status = 'fired'
-        task.firedAt = now
-      }
-      if (typeof onDue === 'function') {
-        try {
-          await onDue(task)
-        } catch (err) {
-          logger?.warn?.('[dsh-messenger-gateway] scheduler task execution failed:', err?.message || err)
-        }
-      }
-    }
-
-    if (due.length > 0) {
-      await save()
-    }
-  }
-
-  function start(intervalMs = 5000) {
-    if (timer) clearInterval(timer)
-    timer = setInterval(() => {
-      checkDue().catch(() => {})
-    }, intervalMs)
-    timer.unref?.()
-    checkDue().catch(() => {})
-  }
-
-  function stop() {
-    if (timer) {
-      clearInterval(timer)
-      timer = null
-    }
-  }
-
-  async function schedule(taskData) {
-    if (!loaded) await load()
-    const id = taskData.id || randomUUID().slice(0, 8)
-    const task = {
-      id,
-      platform: taskData.platform || 'telegram',
-      chatId: taskData.chatId,
-      threadId: taskData.threadId || 0,
-      userId: taskData.userId,
-      text: taskData.text,
-      prompt: taskData.prompt || taskData.text || '',
-      dueAt: taskData.dueAt,
-      createdAt: Date.now(),
-      status: 'pending',
-      recurring: Boolean(taskData.recurring),
-      intervalMs: taskData.intervalMs || 0,
-      cronExpr: taskData.cronExpr || '',
-    }
-    tasks.push(task)
-    await save()
-    return task
-  }
-
-  async function list(chatId) {
-    if (!loaded) await load()
-    const now = Date.now()
-    return tasks.filter((t) => (chatId ? t.chatId === chatId : true) && t.status === 'pending' && t.dueAt > now)
-  }
-
-  async function listRecurring(chatId) {
-    if (!loaded) await load()
-    return tasks.filter((t) => (chatId ? t.chatId === chatId : true) && t.status === 'pending' && t.recurring)
-  }
-
-  async function cancel(id, chatId) {
-    if (!loaded) await load()
-    const task = tasks.find((t) => t.id === id && (chatId ? t.chatId === chatId : true) && t.status === 'pending')
-    if (!task) return false
-    task.status = 'cancelled'
-    await save()
-    return true
-  }
-
-  return {
-    load,
-    save,
-    start,
-    stop,
-    schedule,
-    list,
-    listRecurring,
-    cancel,
-    checkDue,
-    getTasks: () => tasks,
-  }
+import { readFile } from 'node:fs/promises'
+import { randomUUID } from 'node:crypto'
+import { writeJsonAtomic } from './storage-atomic.js'
+
+export function parseRelativeTime(input) {
+  if (!input) return null
+  const raw = String(input).trim().toLowerCase()
+  const match = /^(\d+)\s*(s|sec|m|min|h|hr|d|day|秒|分|小时|天)?$/i.exec(raw)
+  if (!match) return null
+
+  const val = parseInt(match[1], 10)
+  if (!Number.isFinite(val) || val <= 0) return null
+
+  const unit = (match[2] || 'm').toLowerCase()
+  if (['s', 'sec', '秒'].includes(unit)) return val * 1000
+  if (['m', 'min', '分'].includes(unit)) return val * 60 * 1000
+  if (['h', 'hr', '小时'].includes(unit)) return val * 3600 * 1000
+  if (['d', 'day', '天'].includes(unit)) return val * 86400 * 1000
+
+  return null
+}
+
+export function formatRemaining(ms, locale = 'en') {
+  const isZh = String(locale || '').toLowerCase().startsWith('zh')
+  if (ms <= 0) return isZh ? '刚刚' : 'now'
+  const sec = Math.ceil(ms / 1000)
+  if (sec < 60) return isZh ? `${sec}秒` : `${sec}s`
+  const min = Math.ceil(sec / 60)
+  if (min < 60) return isZh ? `${min}分` : `${min}m`
+  const hr = Math.floor(min / 60)
+  const remMin = min % 60
+  if (isZh) return remMin ? `${hr}小时 ${remMin}分` : `${hr}小时`
+  return remMin ? `${hr}h ${remMin}m` : `${hr}h`
+}
+
+export function createScheduler(filePath, onDue, options = {}) {
+  const logger = options?.logger || console
+  let tasks = []
+  let loaded = false
+  let timer = null
+
+  async function load() {
+    try {
+      const raw = await readFile(filePath, 'utf8')
+      tasks = JSON.parse(raw)
+    } catch (err) {
+      if (err?.code !== 'ENOENT') {
+        logger?.debug?.('[dsh-messenger-gateway] scheduler load error:', err?.message || err)
+      }
+      tasks = []
+    }
+    loaded = true
+  }
+
+  const RETENTION_MS = 7 * 86400 * 1000
+
+  async function save() {
+    if (!filePath) return
+    try {
+      const now = Date.now()
+      tasks = tasks.filter((t) => {
+        if (t.status === 'pending') return true
+        const finishTime = t.firedAt || t.createdAt || 0
+        return (now - finishTime) < RETENTION_MS
+      })
+      await writeJsonAtomic(filePath, tasks)
+    } catch (err) {
+      logger?.warn?.('[dsh-messenger-gateway] scheduler save failed:', err?.message || err)
+    }
+  }
+
+  async function checkDue() {
+    if (!loaded) await load()
+    const now = Date.now()
+    const due = tasks.filter((t) => t.status === 'pending' && t.dueAt <= now)
+
+    for (const task of due) {
+      if (task.recurring && Number(task.intervalMs) > 0) {
+        task.dueAt = now + Number(task.intervalMs)
+        task.lastFiredAt = now
+      } else {
+        task.status = 'fired'
+        task.firedAt = now
+      }
+      if (typeof onDue === 'function') {
+        try {
+          await onDue(task)
+        } catch (err) {
+          logger?.warn?.('[dsh-messenger-gateway] scheduler task execution failed:', err?.message || err)
+        }
+      }
+    }
+
+    if (due.length > 0) {
+      await save()
+    }
+  }
+
+  function start(intervalMs = 5000) {
+    if (timer) clearInterval(timer)
+    timer = setInterval(() => {
+      checkDue().catch((err) => { logger?.debug?.('[dsh-messenger-gateway] scheduler checkDue error:', err?.message || err) })
+    }, intervalMs)
+    timer.unref?.()
+    checkDue().catch((err) => { logger?.debug?.('[dsh-messenger-gateway] scheduler checkDue error:', err?.message || err) })
+  }
+
+  function stop() {
+    if (timer) {
+      clearInterval(timer)
+      timer = null
+    }
+  }
+
+  async function schedule(taskData) {
+    if (!loaded) await load()
+    const id = taskData.id || randomUUID().slice(0, 8)
+    const task = {
+      id,
+      platform: taskData.platform || 'telegram',
+      chatId: taskData.chatId,
+      threadId: taskData.threadId || 0,
+      userId: taskData.userId,
+      text: taskData.text,
+      prompt: taskData.prompt || taskData.text || '',
+      dueAt: taskData.dueAt,
+      createdAt: Date.now(),
+      status: 'pending',
+      recurring: Boolean(taskData.recurring),
+      intervalMs: taskData.intervalMs || 0,
+      cronExpr: taskData.cronExpr || '',
+    }
+    tasks.push(task)
+    await save()
+    return task
+  }
+
+  async function list(chatId) {
+    if (!loaded) await load()
+    const now = Date.now()
+    return tasks.filter((t) => (chatId ? t.chatId === chatId : true) && t.status === 'pending' && t.dueAt > now)
+  }
+
+  async function listRecurring(chatId) {
+    if (!loaded) await load()
+    return tasks.filter((t) => (chatId ? t.chatId === chatId : true) && t.status === 'pending' && t.recurring)
+  }
+
+  async function cancel(id, chatId) {
+    if (!loaded) await load()
+    const task = tasks.find((t) => t.id === id && (chatId ? t.chatId === chatId : true) && t.status === 'pending')
+    if (!task) return false
+    task.status = 'cancelled'
+    await save()
+    return true
+  }
+
+  return {
+    load,
+    save,
+    start,
+    stop,
+    schedule,
+    list,
+    listRecurring,
+    cancel,
+    checkDue,
+    getTasks: () => tasks,
+  }
 }

package/lib/settings-bridge.js

@@ -0,0 +1,111 @@
+export function setupSettings(ctx, { namespace, Config, resolveConfig, baseConfig, sync, logger }) {
+  let settingsApi
+  let source = () => resolveConfig(baseConfig ?? {})
+
+  const mountSettings = (sctx) => {
+    const service = sctx?.settings || (typeof sctx?.get === 'function' ? sctx.get('settings') : null)
+    const effect = typeof sctx?.effect === 'function' ? sctx.effect.bind(sctx) : (typeof ctx.effect === 'function' ? ctx.effect.bind(ctx) : null)
+    if (!service) return
+
+    if (typeof service.register === 'function') {
+      settingsApi = service.register(namespace, Config, { base: baseConfig || {} })
+      source = () => resolveConfig(settingsApi.get() ?? baseConfig ?? {})
+      if (effect) effect(() => settingsApi.watch(sync), `${namespace}: settings`)
+      return
+    }
+
+    if (typeof service.configure === 'function') {
+      try {
+        const dispose = service.configure({ auto: false }, ctx.fiber)
+        if (effect && typeof dispose === 'function') effect(() => dispose, `${namespace}: configure`)
+      } catch (err) {
+        logger?.warn?.(`${namespace}: settings configure failed: ${err.message}`)
+      }
+    }
+
+    const getRevision = () => {
+      try {
+        return service.describe?.()?.find?.((row) => row.ns === namespace)?.revision
+      } catch {
+        return undefined
+      }
+    }
+
+    const readLiveSettings = () => {
+      try {
+        if (typeof service.describe === 'function') {
+          const desc = service.describe()?.find?.((row) => row.ns === namespace)
+          if (desc?.value && typeof desc.value === 'object') return desc.value
+        }
+        if (typeof service.get === 'function') {
+          const val = service.get(namespace)
+          if (val && typeof val === 'object') return val
+        }
+      } catch (err) {
+        logger?.warn?.(`${namespace}: readLiveSettings failed: ${err.message}`)
+      }
+      return null
+    }
+
+    const liveVal = readLiveSettings()
+    let currentConfig = resolveConfig(liveVal ?? baseConfig ?? {})
+    source = () => currentConfig
+
+    const persist = async (next) => {
+      const payload = Config(next)
+      if (typeof service.replace === 'function') {
+        await service.replace(namespace, payload, getRevision())
+      } else if (typeof service.update === 'function') {
+        await service.update(namespace, payload, getRevision())
+      } else if (typeof service.mutate === 'function') {
+        await service.mutate(namespace, [{ op: 'set', path: [], value: payload }])
+      } else {
+        throw new Error('settings service cannot persist configuration')
+      }
+      currentConfig = resolveConfig(payload)
+      sync()
+      return currentConfig
+    }
+
+    settingsApi = {
+      get: () => source(),
+      replace: async (next) => persist(next),
+      update: async (patch) => persist({ ...source(), ...patch }),
+      watch: (cb) => {
+        if (typeof service.watch === 'function') return service.watch(cb)
+        return () => {}
+      },
+    }
+
+    const onFn = typeof sctx?.on === 'function' ? sctx.on.bind(sctx) : (typeof ctx?.on === 'function' ? ctx.on.bind(ctx) : null)
+    const disposeDocUpdated = onFn
+      ? onFn('settings/document-updated', (updatedNs) => {
+          if (updatedNs === namespace) {
+            const nextVal = readLiveSettings()
+            if (nextVal) {
+              currentConfig = resolveConfig(nextVal)
+              sync()
+            }
+          }
+        })
+      : null
+
+    if (effect) {
+      effect(() => () => {
+        if (typeof disposeDocUpdated === 'function') disposeDocUpdated()
+        settingsApi = undefined
+      }, `${namespace}: settings`)
+    }
+  }
+
+  if (typeof ctx.inject === 'function') {
+    ctx.inject(['settings'], mountSettings)
+  } else {
+    mountSettings({ settings: ctx.get?.('settings') || ctx.settings, effect: ctx.effect })
+  }
+
+  return {
+    getSource: () => source(),
+    getSettingsApi: () => settingsApi,
+  }
+}

package/lib/stream.js

@@ -34,7 +34,7 @@ export function parseRetryAfter(err) {
   return 0
 }
 
-export function createEditScheduler(editFn, intervalMs = 1200, firstChunkDelayMs = 250) {
+export function createEditScheduler(editFn, intervalMs = 1200, firstChunkDelayMs = 250, logger = null) {
   let pending = null
   let timer = null
   let lastSent = ''
@@ -55,6 +55,7 @@ export function createEditScheduler(editFn, intervalMs = 1200, firstChunkDelayMs
         await editFn(text)
         lastSent = text
       } catch (err) {
+        logger?.debug?.('stream chunk edit failed:', err?.message || err)
         const retry = parseRetryAfter(err)
         if (retry > 0) {
           retryDelayMs = retry
@@ -91,20 +92,22 @@ export function createEditScheduler(editFn, intervalMs = 1200, firstChunkDelayMs
         try {
           await editFn(pending)
           lastSent = pending
-        } catch { /* safe best-effort final stream update delivery */ }
+        } catch (err) {
+          logger?.debug?.('stream final flush error:', err?.message || err)
+        }
       }
     },
   }
 }
 
-export function startTypingHeartbeat(typingFn, intervalMs = 4000) {
+export function startTypingHeartbeat(typingFn, intervalMs = 4000, logger = null) {
   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 */ }
+      typingFn()?.catch?.((err) => { logger?.debug?.('typing indicator error:', err?.message || err) })
+    } catch (err) { logger?.debug?.('typing indicator invoke error:', err?.message || err) }
   }
   safeInvoke()
   const timer = setInterval(safeInvoke, intervalMs)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-messenger-gateway",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "description": "Telegram messenger bridge for DeepSeek Harness: sessions, steer, homes, inline asks, notify bridge, and optional TTS voice notes.",
   "license": "MIT",
   "type": "module",
@@ -15,6 +15,8 @@
     "lib/",
     "cordis.patch.yml",
     "README.md",
+    "README.ru.md",
+    "README.zh.md",
     "LICENSE"
   ],
   "keywords": [