@goodandready/dsh-messenger-gateway 0.3.21 → 0.4.0

package/lib/text.js

@@ -1,39 +1,39 @@
-export function splitText(text, maxLen) {
-  const raw = String(text ?? '')
-  if (raw.length <= maxLen) return [raw]
-  const chunks = []
-  let rest = raw
-  while (rest.length > maxLen) {
-    let cut = rest.lastIndexOf('\n', maxLen)
-    if (cut < maxLen / 2) cut = rest.lastIndexOf(' ', maxLen)
-    if (cut < maxLen / 2) cut = maxLen
-    chunks.push(rest.slice(0, cut).trim())
-    rest = rest.slice(cut).trimStart()
-  }
-  if (rest.length > 0) chunks.push(rest)
-  return chunks
-}
-
-export function assistantText(message) {
-  return (message?.content || [])
-    .filter((block) => block.type === 'text')
-    .map((block) => block.text)
-    .join('')
-}
-
-
-/** Drop English reasoning preamble before the user-facing reply (Telegram). */
-export function stripReasoningPreamble(text) {
-  const raw = String(text ?? '').trim()
-  if (!raw) return raw
-  const paragraphs = raw.split(/\n\n+/)
-  for (let i = 0; i < paragraphs.length; i++) {
-    const p = paragraphs[i]
-    const cyrillic = (p.match(/[\u0400-\u04FF]/g) || []).length
-    const latin = (p.match(/[A-Za-z]/g) || []).length
-    if (cyrillic >= 12 && cyrillic > latin) return paragraphs.slice(i).join('\n\n').trim()
-  }
-  return raw
-}
-
-export const MESSENGER_RELAY_INSTRUCTION = 'Channel: Messenger. Reply concisely and directly to the user. Do not leak internal reasoning or planning traces.'
+export function splitText(text, maxLen) {
+  const raw = String(text ?? '')
+  if (raw.length <= maxLen) return [raw]
+  const chunks = []
+  let rest = raw
+  while (rest.length > maxLen) {
+    let cut = rest.lastIndexOf('\n', maxLen)
+    if (cut < maxLen / 2) cut = rest.lastIndexOf(' ', maxLen)
+    if (cut < maxLen / 2) cut = maxLen
+    chunks.push(rest.slice(0, cut).trim())
+    rest = rest.slice(cut).trimStart()
+  }
+  if (rest.length > 0) chunks.push(rest)
+  return chunks
+}
+
+export function assistantText(message) {
+  return (message?.content || [])
+    .filter((block) => block.type === 'text')
+    .map((block) => block.text)
+    .join('')
+}
+
+
+/** Drop English reasoning preamble before the user-facing reply (Telegram). */
+export function stripReasoningPreamble(text) {
+  const raw = String(text ?? '').trim()
+  if (!raw) return raw
+  const paragraphs = raw.split(/\n\n+/)
+  for (let i = 0; i < paragraphs.length; i++) {
+    const p = paragraphs[i]
+    const cyrillic = (p.match(/[\u0400-\u04FF]/g) || []).length
+    const latin = (p.match(/[A-Za-z]/g) || []).length
+    if (cyrillic >= 12 && cyrillic > latin) return paragraphs.slice(i).join('\n\n').trim()
+  }
+  return raw
+}
+
+export const MESSENGER_RELAY_INSTRUCTION = 'Channel: Messenger. Reply concisely and directly to the user. Do not leak internal reasoning or planning traces.'

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/updater.js

@@ -0,0 +1,304 @@
+import { existsSync, readFileSync } from 'node:fs'
+import { readFile } from 'node:fs/promises'
+import { spawn } from 'node:child_process'
+import { homedir } from 'node:os'
+import { basename, dirname, isAbsolute, resolve } from 'node:path'
+import { fileURLToPath } from 'node:url'
+import { isTrustedSettingsRequest } from './http.js'
+
+const UPDATE_HEADER = 'x-dsh-plugin-update'
+const UPDATE_TIMEOUT_MS = 180_000
+const VERSION_CACHE_MS = 300_000
+
+let latestCache = null
+
+function header(request, name) {
+  const value = request?.headers?.[name.toLowerCase()]
+  if (Array.isArray(value)) return value[0]
+  return typeof value === 'string' ? value : undefined
+}
+
+function isLoopback(value) {
+  const address = value?.toLowerCase().replace(/^\[|\]$/g, '')
+  return address === 'localhost' || address === 'localhost.' || address === '::1'
+    || address?.startsWith('127.') === true
+    || address?.startsWith('::ffff:127.') === true
+}
+
+export function isTrustedUpdateRequest(request) {
+  if (header(request, UPDATE_HEADER) !== '1') return false
+  if (!isLoopback(request?.socket?.remoteAddress)) return false
+  const site = header(request, 'sec-fetch-site')
+  if (site !== undefined && site !== 'same-origin') return false
+  const origin = header(request, 'origin')
+  const host = header(request, 'host')
+  if (origin === undefined || host === undefined) return false
+  try {
+    const url = new URL(origin)
+    return (url.protocol === 'http:' || url.protocol === 'https:')
+      && isLoopback(url.hostname) && url.host === host
+  } catch {
+    return false
+  }
+}
+
+function validProfileName(value) {
+  return typeof value === 'string' && value !== '' && value !== '.' && value !== '..'
+    && !value.includes('/') && !value.includes('\\') && !/[\0-\x1f\x7f]/.test(value)
+}
+
+function profileNameFromArgv(argv) {
+  for (let i = 0; i < argv.length; i++) {
+    const item = argv[i]
+    if (item === '--profile' || item === '-p') {
+      const next = argv[i + 1]
+      return validProfileName(next) ? next : undefined
+    }
+    if (typeof item === 'string' && item.startsWith('--profile=')) {
+      const value = item.slice('--profile='.length)
+      return validProfileName(value) ? value : undefined
+    }
+  }
+  return undefined
+}
+
+export function findDshCliEntry() {
+  const value = process.argv[1]
+  if (value === undefined || value === '') return undefined
+  const entry = value.startsWith('file:') ? fileURLToPath(value) : resolve(process.cwd(), value)
+  if (!existsSync(entry)) return undefined
+  for (let directory = dirname(entry); ; directory = dirname(directory)) {
+    const manifestPath = resolve(directory, 'package.json')
+    if (existsSync(manifestPath)) {
+      try {
+        const manifest = JSON.parse(readFileSync(manifestPath, 'utf8'))
+        const bin = typeof manifest.bin === 'string'
+          ? manifest.bin
+          : typeof manifest.bin === 'object' && manifest.bin !== null
+            ? manifest.bin.dsh
+            : undefined
+        if (manifest.name === '@deepseek-ai/dsh' && typeof bin === 'string'
+          && !isAbsolute(bin) && resolve(directory, bin) === resolve(entry)) return entry
+      } catch {
+        // Continue searching parent directories
+      }
+    }
+    const parent = dirname(directory)
+    if (parent === directory) return undefined
+  }
+}
+
+export function runtime() {
+  const profileDir = resolve(process.env.DSH_PROFILE_DIR
+    ?? resolve(homedir(), '.dsh', 'profiles', 'web'))
+  const selected = profileNameFromArgv(process.argv)
+  const profileName = validProfileName(selected)
+    ? selected
+    : validProfileName(basename(profileDir)) ? basename(profileDir) : 'web'
+  const cliEntry = findDshCliEntry()
+  return cliEntry === undefined ? { profileName, profileDir } : { profileName, profileDir, cliEntry }
+}
+
+export function parseSemver(value) {
+  const match = /^v?(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?(?:\+[0-9A-Za-z.-]+)?$/.exec(String(value || '').trim())
+  if (match === null) return undefined
+  return {
+    core: [Number(match[1]), Number(match[2]), Number(match[3])],
+    prerelease: match[4]?.split('.') ?? [],
+  }
+}
+
+function comparePrerelease(left, right) {
+  if (left.length === 0 || right.length === 0) return left.length === right.length ? 0 : left.length === 0 ? 1 : -1
+  const length = Math.max(left.length, right.length)
+  for (let index = 0; index < length; index += 1) {
+    const a = left[index]
+    const b = right[index]
+    if (a === undefined || b === undefined) return a === b ? 0 : a === undefined ? -1 : 1
+    if (a === b) continue
+    const aNumeric = /^\d+$/.test(a)
+    const bNumeric = /^\d+$/.test(b)
+    if (aNumeric && bNumeric) {
+      const aNumber = BigInt(a)
+      const bNumber = BigInt(b)
+      if (aNumber !== bNumber) return aNumber > bNumber ? 1 : -1
+      continue
+    }
+    if (aNumeric !== bNumeric) return aNumeric ? -1 : 1
+    return a > b ? 1 : -1
+  }
+  return 0
+}
+
+export function isNewerVersion(currentValue, candidateValue) {
+  const current = parseSemver(currentValue)
+  const candidate = parseSemver(candidateValue)
+  if (current === undefined || candidate === undefined) return false
+  for (let index = 0; index < 3; index += 1) {
+    if (candidate.core[index] !== current.core[index]) return candidate.core[index] > current.core[index]
+  }
+  return comparePrerelease(candidate.prerelease, current.prerelease) > 0
+}
+
+export async function fetchLatestVersion(packageName, registry = 'https://registry.npmjs.org') {
+  if (latestCache?.packageName === packageName && latestCache.registry === registry && Date.now() < latestCache.expiresAt) {
+    return latestCache.version
+  }
+  try {
+    const cleanReg = registry.replace(/\/$/, '')
+    const response = await fetch(`${cleanReg}/${encodeURIComponent(packageName)}/latest`, {
+      headers: { accept: 'application/json' },
+      signal: AbortSignal.timeout(8000),
+    })
+    if (!response.ok) return undefined
+    const value = await response.json()
+    if (typeof value.version !== 'string' || value.version === '') return undefined
+    latestCache = { packageName, registry, version: value.version, expiresAt: Date.now() + VERSION_CACHE_MS }
+    return value.version
+  } catch {
+    return undefined
+  }
+}
+
+export async function currentVersion(manifestPath) {
+  const raw = await readFile(manifestPath, 'utf8')
+  const value = JSON.parse(raw)
+  if (typeof value.version !== 'string' || value.version === '') throw new Error('Cannot read current plugin version.')
+  return value.version
+}
+
+export async function getUpdateStatus(options, target = runtime()) {
+  const current = await currentVersion(options.manifestPath)
+  const latest = await fetchLatestVersion(options.packageName, options.registry ?? 'https://registry.npmjs.org')
+  return {
+    packageName: options.packageName,
+    currentVersion: current,
+    ...(latest === undefined ? {} : { latestVersion: latest }),
+    latestCheckFailed: latest === undefined,
+    updateAvailable: latest !== undefined && isNewerVersion(current, latest),
+    profileName: target.profileName,
+    canAutoUpdate: target.cliEntry !== undefined,
+  }
+}
+
+export async function installExact(target, packageSpec, options = {}) {
+  if (target.cliEntry === undefined) throw new Error('Automatic update CLI entry is unavailable in this runtime.')
+  return new Promise((resolvePromise, reject) => {
+    const args = [
+      target.cliEntry, 'plugin', '--profile', target.profileName, 'add',
+      '--config.minimumReleaseAge=0', packageSpec,
+      `--registry=${options.registry ?? 'https://registry.npmjs.org/'}`,
+    ]
+    const child = spawn(process.execPath, args, {
+      cwd: target.profileDir,
+      windowsHide: true,
+      stdio: ['ignore', 'pipe', 'pipe'],
+      env: { ...process.env, NO_COLOR: '1' },
+    })
+    let detail = ''
+    child.stdout?.on('data', (chunk) => { detail = (detail + String(chunk)).slice(-4000) })
+    child.stderr?.on('data', (chunk) => { detail = (detail + String(chunk)).slice(-4000) })
+    const timer = setTimeout(() => {
+      child.kill()
+      reject(new Error('Update timed out; use the standard DSH update flow.'))
+    }, UPDATE_TIMEOUT_MS)
+    child.once('error', (error) => { clearTimeout(timer); reject(error) })
+    child.once('exit', (code) => {
+      clearTimeout(timer)
+      if (code === 0) resolvePromise({ ok: true })
+      else reject(new Error(detail.trim() || `Update exited with code ${String(code)}.`))
+    })
+  })
+}
+
+let isGlobalUpdating = false
+
+export async function runDirectUpdate(options, target = runtime()) {
+  if (isGlobalUpdating) {
+    throw new Error('Update is already in progress.')
+  }
+  isGlobalUpdating = true
+  try {
+    const status = await getUpdateStatus(options, target)
+    if (status.latestVersion === undefined) {
+      throw new Error('Latest version information is temporarily unavailable.')
+    }
+    if (!status.updateAvailable) {
+      return { ...status, updated: false, message: 'Already up to date.' }
+    }
+    await installExact(target, `${options.packageName}@${status.latestVersion}`, options)
+    return {
+      ...status,
+      updated: true,
+      updatedVersion: status.latestVersion,
+      restartRequired: true,
+    }
+  } finally {
+    isGlobalUpdating = false
+  }
+}
+
+export function registerPluginUpdater(ctx, options) {
+  const getWebServer = () => ctx.get?.('webServer') || ctx.webServer
+  return getWebServer().register({
+    kind: 'exact',
+    path: options.endpoint || '/dsh-messenger-gateway/update',
+    handler: async (request, response) => {
+      try {
+        const target = runtime()
+        if (request.method === 'GET' || request.method === 'HEAD') {
+          const payload = await getUpdateStatus(options, target)
+          response.writeHead(200, {
+            'content-type': 'application/json; charset=utf-8',
+            'cache-control': 'no-store',
+          })
+          response.end(request.method === 'HEAD' ? undefined : JSON.stringify(payload))
+          return
+        }
+        if (request.method !== 'POST') {
+          response.writeHead(405, { allow: 'GET, HEAD, POST' })
+          response.end()
+          return
+        }
+        if (!isTrustedUpdateRequest(request)) {
+          response.writeHead(403, { 'content-type': 'application/json; charset=utf-8' })
+          response.end(JSON.stringify({ ok: false, error: 'Rejected untrusted or cross-origin update request.' }))
+          return
+        }
+        if (isGlobalUpdating) {
+          response.writeHead(409, { 'content-type': 'application/json; charset=utf-8' })
+          response.end(JSON.stringify({ ok: false, error: 'This plugin is already updating.' }))
+          return
+        }
+        isGlobalUpdating = true
+        try {
+          const before = await getUpdateStatus(options, target)
+          if (before.latestVersion === undefined) {
+            response.writeHead(503, { 'content-type': 'application/json; charset=utf-8' })
+            response.end(JSON.stringify({ ok: false, error: 'The latest version is temporarily unavailable.' }))
+            return
+          }
+          if (!before.updateAvailable) {
+            response.writeHead(200, { 'content-type': 'application/json; charset=utf-8' })
+            response.end(JSON.stringify({ ...before, updated: false }))
+            return
+          }
+          await installExact(target, `${options.packageName}@${before.latestVersion}`, options)
+          response.writeHead(200, { 'content-type': 'application/json; charset=utf-8' })
+          response.end(JSON.stringify({
+            ...before,
+            updated: true,
+            updatedVersion: before.latestVersion,
+            restartRequired: true,
+          }))
+        } finally {
+          isGlobalUpdating = false
+        }
+      } catch (error) {
+        ctx.logger?.warn?.(`plugin updater error: ${error?.message || String(error)}`)
+        response.writeHead(500, { 'content-type': 'application/json; charset=utf-8' })
+        response.end(JSON.stringify({ ok: false, error: error?.message || 'Plugin update failed.' }))
+      }
+    },
+  })
+}

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,65 +1,69 @@
-{
-  "name": "@goodandready/dsh-messenger-gateway",
-  "version": "0.3.21",
-  "description": "Telegram messenger bridge for DeepSeek Harness: sessions, steer, homes, inline asks, notify bridge, and optional TTS voice notes.",
-  "license": "MIT",
-  "type": "module",
-  "main": "./lib/index.js",
-  "exports": {
-    ".": "./lib/index.js",
-    "./client": "./lib/client.js",
-    "./package.json": "./package.json",
-    "./cordis.patch.yml": "./cordis.patch.yml"
-  },
-  "files": [
-    "lib/",
-    "cordis.patch.yml",
-    "README.md",
-    "LICENSE"
-  ],
-  "keywords": [
-    "dsh",
-    "dsh-plugin",
-    "telegram",
-    "messenger",
-    "deepseek-harness",
-    "bot"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/GooDAnDReaDY/dsh-messenger-gateway.git"
-  },
-  "homepage": "https://github.com/GooDAnDReaDY/dsh-messenger-gateway#readme",
-  "scripts": {
-    "test": "node --test test/*.test.mjs",
-    "test:load": "node scripts/verify-dsh-load.mjs",
-    "test:all": "npm test && npm run test:load",
-    "smoke:http": "node scripts/smoke-http.mjs"
-  },
-  "dsh": {
-    "bundle": {
-      "patch": "./cordis.patch.yml"
-    },
-    "client": {
-      "platform": "web",
-      "inject": []
-    }
-  },
-  "peerDependencies": {
-    "@deepseek-ai/cordis": "^4.0.2",
-    "@deepseek-ai/dsh-agent": "^0.1.2-alpha.2",
-    "@deepseek-ai/dsh-agent-loop": "^0.1.2-alpha.2",
-    "@deepseek-ai/dsh-host-webserver": "^0.1.2-alpha.2",
-    "@deepseek-ai/dsh-llm": "^0.1.2-alpha.2",
-    "@deepseek-ai/dsh-session": "^0.1.2-alpha.2",
-    "@deepseek-ai/dsh-settings": "^0.1.2-alpha.2",
-    "@deepseek-ai/schemastery": "^3.18.2",
-    "@deepseek-ai/dsh-tools": "^0.1.2-alpha.2"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "bugs": {
-    "url": "https://github.com/GooDAnDReaDY/dsh-messenger-gateway/issues"
-  }
-}
+{
+  "name": "@goodandready/dsh-messenger-gateway",
+  "version": "0.4.0",
+  "description": "Telegram messenger bridge for DeepSeek Harness: sessions, steer, homes, inline asks, notify bridge, and optional TTS voice notes.",
+  "license": "MIT",
+  "type": "module",
+  "main": "./lib/index.js",
+  "exports": {
+    ".": "./lib/index.js",
+    "./client": "./lib/client.js",
+    "./package.json": "./package.json",
+    "./cordis.patch.yml": "./cordis.patch.yml"
+  },
+  "files": [
+    "lib/",
+    "cordis.patch.yml",
+    "README.md",
+    "LICENSE"
+  ],
+  "keywords": [
+    "dsh",
+    "dsh-plugin",
+    "telegram",
+    "messenger",
+    "deepseek-harness",
+    "bot"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/GooDAnDReaDY/dsh-messenger-gateway.git"
+  },
+  "homepage": "https://github.com/GooDAnDReaDY/dsh-messenger-gateway#readme",
+  "scripts": {
+    "test": "node --test test/*.test.mjs",
+    "test:load": "node scripts/verify-dsh-load.mjs",
+    "test:all": "npm test && npm run test:load",
+    "smoke:http": "node scripts/smoke-http.mjs"
+  },
+  "dsh": {
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    },
+    "client": {
+      "platform": "web",
+      "inject": [
+        "@deepseek-ai/dsh-client-locale",
+        "@deepseek-ai/dsh-client-ui-slots",
+        "@deepseek-ai/dsh-client-ui-settings"
+      ]
+    }
+  },
+  "peerDependencies": {
+    "@deepseek-ai/cordis": "^4.0.2",
+    "@deepseek-ai/dsh-agent": "^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-agent-loop": "^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-host-webserver": "^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-llm": "^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-session": "^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-settings": "^0.1.2-alpha.2",
+    "@deepseek-ai/schemastery": "^3.18.2",
+    "@deepseek-ai/dsh-tools": "^0.1.2-alpha.2"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "bugs": {
+    "url": "https://github.com/GooDAnDReaDY/dsh-messenger-gateway/issues"
+  }
+}