@goodandready/dsh-messenger-gateway 0.3.21 → 0.4.0

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

@@ -1,8 +1,10 @@
 import { homedir } from 'node:os'
-import { join } from 'node:path'
+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,
   messengerApiSchema, parseMessengerBody,
@@ -10,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'
@@ -63,7 +65,16 @@ function publicConfig(cfg) {
       forumMirrorEnabled: Boolean(cfg.telegram.forumMirrorEnabled),
       forumMirrorChatId: cfg.telegram.forumMirrorChatId || '',
     },
-    discord: { enabled: cfg.discord.enabled, botTokenConfigured: Boolean(String(cfg.discord.botToken || '').trim()) },
+    discord: {
+      enabled: Boolean(cfg.discord?.enabled),
+      botTokenConfigured: Boolean(String(cfg.discord?.botToken || '').trim()),
+      webhookConfigured: Boolean(String(cfg.discord?.webhookUrl || '').trim()),
+    },
+    slack: {
+      enabled: Boolean(cfg.slack?.enabled),
+      botTokenConfigured: Boolean(String(cfg.slack?.botToken || '').trim()),
+      webhookConfigured: Boolean(String(cfg.slack?.webhookUrl || '').trim()),
+    },
     media: { maxDocBytes: cfg.media.maxDocBytes, maxTextInjectBytes: cfg.media.maxTextInjectBytes, maxImageBytes: cfg.media.maxImageBytes },
     tts: cfg.tts,
     agent: {
@@ -251,7 +262,13 @@ export function apply(ctx, config) {
     const cfg = source().telegram?.notifyBridge
     if (!cfg?.enabled) return
     if (event.type === 'turn/start') {
-      turnStarts.set(String(session.id), Date.now())
+      const now = Date.now()
+      if (turnStarts.size > 50) {
+        for (const [sid, ts] of turnStarts.entries()) {
+          if (now - ts > 7_200_000) turnStarts.delete(sid)
+        }
+      }
+      turnStarts.set(String(session.id), now)
       return
     }
     if (event.type !== 'turn/end') return
@@ -289,6 +306,7 @@ export function apply(ctx, config) {
       const gw = getGw()
       const botInfo = gw?.getBotInfo?.() || {}
       const uptimeSec = gw?.stats?.startedAt ? Math.max(0, Math.round((Date.now() - gw.stats.startedAt) / 1000)) : 0
+      const scheduledCount = gw?.scheduler?.list ? (await gw.scheduler.list())?.length || 0 : 0
       writeJson(res, 200, {
         ok: true,
         running: Boolean(gw),
@@ -307,6 +325,12 @@ export function apply(ctx, config) {
           sent: gw?.stats?.sent || 0,
           errors: gw?.stats?.errors || 0,
           startedAt: gw?.stats?.startedAt || 0,
+          scheduledCount,
+        },
+        apiHealth: {
+          degraded: (gw?.consecutiveApiFailures || 0) >= 3,
+          consecutiveFailures: gw?.consecutiveApiFailures || 0,
+          lastError: gw?.lastApiError || null,
         },
         config: publicConfig(source()),
       })
@@ -400,10 +424,16 @@ export function apply(ctx, config) {
         if (payload.telegram?.notifyBridge) {
           nextTg.notifyBridge = { ...cur.telegram.notifyBridge, ...payload.telegram.notifyBridge }
         }
+        const nextDiscord = { ...(cur.discord || {}), ...(payload.discord || {}) }
+        if (payload.discord && !String(payload.discord.botToken || '').trim()) nextDiscord.botToken = cur.discord?.botToken
+        const nextSlack = { ...(cur.slack || {}), ...(payload.slack || {}) }
+        if (payload.slack && !String(payload.slack.botToken || '').trim()) nextSlack.botToken = cur.slack?.botToken
         await settingsApi.replace(Config({
           ...cur,
           ...payload,
           telegram: nextTg,
+          discord: nextDiscord,
+          slack: nextSlack,
           tts: { ...cur.tts, ...(payload.tts || {}) },
           agent: { ...cur.agent, ...(payload.agent || {}) },
           media: { ...cur.media, ...(payload.media || {}) },
@@ -471,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')
@@ -495,6 +528,13 @@ export function apply(ctx, config) {
   registerMessengerRoute(ctx, getGw, '/dsh-messenger-gateway/messenger/progress', 'progress')
   registerMessengerRoute(ctx, getGw, '/dsh-messenger-gateway/messenger/ask', 'ask')
 
+  const manifestPath = resolve(dirname(fileURLToPath(import.meta.url)), '../package.json')
+  ctx.effect(() => registerPluginUpdater(ctx, {
+    manifestPath,
+    packageName: '@goodandready/dsh-messenger-gateway',
+    endpoint: '/dsh-messenger-gateway/update',
+  }), 'dsh-messenger-gateway: plugin updater')
+
   ctx.on('dispose', () => { if (gateway) gateway.stop() })
   sync()
 }

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/locales/en.js

@@ -1,114 +1,123 @@
-// Canonical English locale dictionary
-export const en = {
-  // Command descriptions
-  'cmd.help': 'Show commands help',
-  'cmd.new': 'Start new session',
-  'cmd.stop': 'Interrupt current turn',
-  'cmd.model': 'Interactive model selector',
-  'cmd.role': 'Switch agent persona or role',
-  'cmd.rewind': 'Rewind last N turns',
-  'cmd.fork': 'Fork session into new branch',
-  'cmd.export': 'Export history to Markdown',
-  'cmd.skills': 'List active tools & skills',
-  'cmd.files': 'Workspace file explorer',
-  'cmd.get': 'Download file from workspace',
-  'cmd.remind': 'Set a timer or reminder',
-  'cmd.status': 'Gateway and model status',
-  'cmd.top': 'System resources (RAM, uptime)',
-  'cmd.keyboard': 'Toggle quick action buttons',
-  'cmd.voice': 'Voice reply mode',
-  'cmd.tts': 'Toggle speech in this chat',
-  'cmd.mute': 'Mute notifications in this chat',
-  'cmd.unmute': 'Unmute notifications in this chat',
-  'cmd.whoami': 'Show your messenger user ID',
-  'cmd.pair': 'Approve pairing code',
-  'cmd.sethome': 'Set primary notification home',
-  'cmd.setalert': 'Set alert notification target',
-  'cmd.bind': 'Bind preset or persona to forum topic',
-  'cmd.preset': 'Show or switch agent preset',
-  'cmd.cron': 'Schedule recurring autonomous report',
-
-  // Bot replies & statuses
-  'msg.start': 'Gateway connected. Send messages to the agent. /help for commands.',
-  'msg.steer_added': '↪️ Added to current turn',
-  'msg.turn_stopped': 'Turn interrupted.',
-  'msg.no_active_session': 'No active session found.',
-  'msg.unknown_command': 'Unknown command {cmd}. /help',
-  'msg.not_allowed': 'Access denied. Ask the owner to whitelist your ID.',
-  'msg.pairing_requested': 'Access required.\nYour ID: {userId}\nPairing code: {code}\n\nThe owner must send to bot:\n/pair {code}',
-  'msg.pairing_rate_limit': 'Pairing code already issued. Please wait or ask owner for /pair.',
-  'msg.pairing_approved': '✅ User {userId} successfully approved!',
-  'msg.pairing_invalid': 'Invalid or expired pairing code.',
-  'msg.muted_on': 'Notifications in this chat: muted (/unmute)',
-  'msg.muted_off': 'Notifications in this chat: enabled',
-  'msg.no_response': '(no response)',
-  'msg.agent_error': 'Agent error: {code}: {message}',
-  'msg.exception': 'Internal error: {message}',
-
-  // Photo & media
-  'photo.received_one': 'Photo received. Send a question — e.g. "what is in this photo?"',
-  'photo.received_many': 'Received {count} attachments. Send your question.',
-  'photo.hint_photo': '[Photo attached]',
-  'photo.hint_photos': '[{count} photos attached]',
-  'doc.hint': '[Document attached: {name}]',
-
-  // Interactive buttons & ask
-  'ask.confirm_title': '⚠️ Confirmation Required\nTool: <code>{tool}</code>{reason}',
-  'ask.allow_once': '✅ Allow Once',
-  'ask.allow_session': '🛡️ Allow for Session',
-  'ask.deny': '❌ Deny',
-  'ask.chose': 'Chose: {choice}',
-  'ask.done': 'Done',
-  'ask.cancel': 'Cancel',
-  'ask.canceled': 'Canceled',
-  'ask.expired': 'Interaction expired. Please try again.',
-  'ask.other_chat': 'Button belongs to another chat',
-
-  // Model selector
-  'model.title': '🤖 <b>Choose Provider:</b>',
-  'model.current': 'Current: <code>{current}</code>',
-  'model.provider_models': '🤖 <b>Provider:</b> <code>{provider}</code>\nSelect model (page {page}/{total}):',
-  'model.no_models': 'No models available for this provider',
-  'model.switched': '✅ Model successfully switched to: <b>{provider}/{model}</b>',
-
-  // Personas & Presets
-  'persona.title': '🎭 <b>Available Roles & Personas:</b>',
-  'persona.usage': 'Switch role: <code>/role coder</code> (or /role reset)',
-  'persona.reset': '🎭 Role reset to default (Default).',
-  'persona.switched': '🎭 Role changed to: {icon} <b>{name}</b>\n{description}',
-  'persona.unknown': 'Unknown role "{target}". List: /role list',
-  'persona.bound_topic': '📌 Topic bound to {kind}: <b>{name}</b>',
-
-  // Builtin persona descriptions
-  'persona.default.name': 'Default',
-  'persona.default.desc': 'General assistant, concise and balanced',
-  'persona.coder.name': 'Developer',
-  'persona.coder.desc': 'Senior developer, code focus without fluff',
-  'persona.writer.name': 'Editor',
-  'persona.writer.desc': 'Copywriter, clean text and clear tone',
-  'persona.analyst.name': 'Analyst',
-  'persona.analyst.desc': 'Structured decomposition and data analysis',
-  'persona.concise.name': 'Brief',
-  'persona.concise.desc': 'Ultra-short replies, 1-2 sentences',
-
-  // File explorer & export
-  'files.title': '📁 <b>Workspace:</b> <code>{path}</code>\nTotal files: {count}\n\n',
-  'files.empty': '📁 Directory is empty: <code>{path}</code>',
-  'files.download_hint': '\nDownload file: <code>/get &lt;path&gt;</code>',
-  'files.not_found': 'File not found: {path}',
-  'export.title': '📄 Dialog export ({count} messages):',
-  'export.empty': 'Session is empty, nothing to export.',
-
-  // Reminders & Cron
-  'remind.scheduled': '⏰ Reminder set for {time} (in {duration}):\n{text}',
-  'remind.invalid': 'Invalid time format. Example: /remind 10m check deploy',
-  'remind.prefix': '⏰ <b>[Reminder]</b>\n{text}',
-  'cron.scheduled': '⏱️ Autonomous cron task scheduled: <code>{id}</code>\nSchedule: <code>{schedule}</code>\nPrompt: {prompt}',
-  'cron.list_title': '⏱️ <b>Scheduled Cron Tasks:</b>\n',
-  'cron.none': 'No active cron tasks.',
-  'cron.cancelled': '✅ Cron task cancelled: <code>{id}</code>',
-  'cron.prefix': '⏱️ <b>[Scheduled Report: {id}]</b>\n',
-
-  // Mirror & Forum
-  'mirror.created': '🪞 <b>[DSH Session Mirror]</b>\nSession: <code>{sessionId}</code>\nTitle: <b>{title}</b>\nMessages in this topic are synchronized with DSH.',
-}
+// Canonical English locale dictionary
+export const en = {
+  // Command descriptions
+  'cmd.help': 'Show commands help',
+  'cmd.new': 'Start new session',
+  'cmd.stop': 'Interrupt current turn',
+  'cmd.model': 'Interactive model selector',
+  'cmd.role': 'Switch agent persona or role',
+  'cmd.rewind': 'Rewind last N turns',
+  'cmd.fork': 'Fork session into new branch',
+  'cmd.export': 'Export history to Markdown',
+  'cmd.skills': 'List active tools & skills',
+  'cmd.files': 'Workspace file explorer',
+  'cmd.get': 'Download file from workspace',
+  'cmd.remind': 'Set a timer or reminder',
+  'cmd.status': 'Gateway and model status',
+  'cmd.top': 'System resources (RAM, uptime)',
+  'cmd.keyboard': 'Toggle quick action buttons',
+  'cmd.voice': 'Voice reply mode',
+  'cmd.tts': 'Toggle speech in this chat',
+  'cmd.mute': 'Mute notifications in this chat',
+  'cmd.unmute': 'Unmute notifications in this chat',
+  'cmd.whoami': 'Show your messenger user ID',
+  'cmd.pair': 'Approve pairing code',
+  'cmd.sethome': 'Set primary notification home',
+  'cmd.setalert': 'Set alert notification target',
+  'cmd.bind': 'Bind preset or persona to forum topic',
+  'cmd.preset': 'Show or switch agent preset',
+  'cmd.cron': 'Schedule recurring autonomous report',
+
+  // Bot replies & statuses
+  'msg.start': 'Gateway connected. Send messages to the agent. /help for commands.',
+  'msg.steer_added': '↪️ Added to current turn',
+  'msg.turn_stopped': 'Turn interrupted.',
+  'msg.no_active_session': 'No active session found.',
+  'msg.unknown_command': 'Unknown command {cmd}. /help',
+  'msg.not_allowed': 'Access denied. Ask the owner to whitelist your ID.',
+  'msg.pairing_requested': 'Access required.\nYour ID: {userId}\nPairing code: {code}\n\nThe owner must send to bot:\n/pair {code}',
+  'msg.pairing_rate_limit': 'Pairing code already issued. Please wait or ask owner for /pair.',
+  'msg.pairing_approved': '✅ User {userId} successfully approved!',
+  'msg.pairing_invalid': 'Invalid or expired pairing code.',
+  'msg.muted_on': 'Notifications in this chat: muted (/unmute)',
+  'msg.muted_off': 'Notifications in this chat: enabled',
+  'msg.no_response': '(no response)',
+  'msg.agent_error': 'Agent error: {code}: {message}',
+  'msg.exception': 'Internal error: {message}',
+
+  // Photo & media
+  'photo.received_one': 'Photo received. Send a question — e.g. "what is in this photo?"',
+  'photo.received_many': 'Received {count} attachments. Send your question.',
+  'photo.hint_photo': '[Photo attached]',
+  'photo.hint_photos': '[{count} photos attached]',
+  'doc.hint': '[Document attached: {name}]',
+
+  // Interactive buttons & ask
+  'ask.confirm_title': '⚠️ Confirmation Required\nTool: <code>{tool}</code>{reason}',
+  'ask.allow_once': '✅ Allow Once',
+  'ask.allow_session': '🛡️ Allow for Session',
+  'ask.deny': '❌ Deny',
+  'ask.chose': 'Chose: {choice}',
+  'ask.done': 'Done',
+  'ask.cancel': 'Cancel',
+  'ask.canceled': 'Canceled',
+  'ask.expired': 'Interaction expired. Please try again.',
+  'ask.other_chat': 'Button belongs to another chat',
+
+  // Model selector
+  'model.title': '🤖 <b>Choose Provider:</b>',
+  'model.current': 'Current: <code>{current}</code>',
+  'model.provider_models': '🤖 <b>Provider:</b> <code>{provider}</code>\nSelect model (page {page}/{total}):',
+  'model.no_models': 'No models available for this provider',
+  'model.switched': '✅ Model successfully switched to: <b>{provider}/{model}</b>',
+
+  // Personas & Presets
+  'persona.title': '🎭 <b>Available Roles & Personas:</b>',
+  'persona.usage': 'Switch role: <code>/role coder</code> (or /role reset)',
+  'persona.reset': '🎭 Role reset to default (Default).',
+  'persona.switched': '🎭 Role changed to: {icon} <b>{name}</b>\n{description}',
+  'persona.unknown': 'Unknown role "{target}". List: /role list',
+  'persona.bound_topic': '📌 Topic bound to {kind}: <b>{name}</b>',
+
+  // Builtin persona descriptions
+  'persona.default.name': 'Default',
+  'persona.default.desc': 'General assistant, concise and balanced',
+  'persona.coder.name': 'Developer',
+  'persona.coder.desc': 'Senior developer, code focus without fluff',
+  'persona.writer.name': 'Editor',
+  'persona.writer.desc': 'Copywriter, clean text and clear tone',
+  'persona.analyst.name': 'Analyst',
+  'persona.analyst.desc': 'Structured decomposition and data analysis',
+  'persona.concise.name': 'Brief',
+  'persona.concise.desc': 'Ultra-short replies, 1-2 sentences',
+
+  // File explorer & export
+  'files.title': '📁 <b>Workspace:</b> <code>{path}</code>\nTotal files: {count}\n\n',
+  'files.empty': '📁 Directory is empty: <code>{path}</code>',
+  'files.download_hint': '\nDownload file: <code>/get &lt;path&gt;</code>',
+  'files.not_found': 'File not found: {path}',
+  'export.title': '📄 Dialog export ({count} messages):',
+  'export.empty': 'Session is empty, nothing to export.',
+
+  // Reminders & Cron
+  'remind.scheduled': '⏰ Reminder set for {time} (in {duration}):\n{text}',
+  'remind.invalid': 'Invalid time format. Example: /remind 10m check deploy',
+  'remind.prefix': '⏰ <b>[Reminder]</b>\n{text}',
+  'cron.scheduled': '⏱️ Autonomous cron task scheduled: <code>{id}</code>\nSchedule: <code>{schedule}</code>\nPrompt: {prompt}',
+  'cron.list_title': '⏱️ <b>Scheduled Cron Tasks:</b>\n',
+  'cron.none': 'No active cron tasks.',
+  'cron.cancelled': '✅ Cron task cancelled: <code>{id}</code>',
+  'cron.prefix': '⏱️ <b>[Scheduled Report: {id}]</b>\n',
+
+  // Mirror & Forum
+  'mirror.created': '🪞 <b>[DSH Session Mirror]</b>\nSession: <code>{sessionId}</code>\nTitle: <b>{title}</b>\nMessages in this topic are synchronized with DSH.',
+  // Updates & Maintenance
+  'cmd.update': 'Check or install plugin update',
+  'update.installing': '⏳ <b>Updating plugin…</b>\nRunning DSH package installation in background…',
+  'update.already_latest': '✅ Plugin is already up to date (<code>v{version}</code>).',
+  'update.success': '🎉 <b>Successfully updated to v{version}!</b>\nPlease restart the service to apply changes: <code>sudo systemctl restart dsh-web.service</code>',
+  'update.failed': '❌ <b>Update failed:</b> {error}',
+  'update.available': '📦 <b>Update Available!</b>\nCurrent version: <code>v{current}</code>\nLatest release: <code>v{latest}</code>\n\nRun <code>/update now</code> to install.',
+  'update.current': '✅ <b>Messenger Gateway is up to date.</b>\nCurrent version: <code>v{version}</code>.',
+  'update.check_failed': '⚠️ Failed to check for updates: {error}',
+}

package/lib/locales/index.js

@@ -1,21 +1,21 @@
-import { en } from './en.js'
-import { zh } from './zh.js'
-
-export const locales = { en, zh }
-
-export function getLocaleDictionary(locale = 'en') {
-  const norm = String(locale || '').toLowerCase()
-  if (norm.startsWith('zh')) return zh
-  return en
-}
-
-export function t(key, params = {}, locale = 'en') {
-  const dict = getLocaleDictionary(locale)
-  let template = dict[key] || en[key] || key
-  for (const [k, v] of Object.entries(params)) {
-    template = template.replaceAll(`{${k}}`, String(v))
-  }
-  return template
-}
-
-export { en, zh }
+import { en } from './en.js'
+import { zh } from './zh.js'
+
+export const locales = { en, zh }
+
+export function getLocaleDictionary(locale = 'en') {
+  const norm = String(locale || '').toLowerCase()
+  if (norm.startsWith('zh')) return zh
+  return en
+}
+
+export function t(key, params = {}, locale = 'en') {
+  const dict = getLocaleDictionary(locale)
+  let template = dict[key] || en[key] || key
+  for (const [k, v] of Object.entries(params)) {
+    template = template.replaceAll(`{${k}}`, String(v))
+  }
+  return template
+}
+
+export { en, zh }