@goodandready/dsh-messenger-gateway 0.3.18 → 0.3.20

package/lib/stream.js

@@ -1,101 +1,114 @@
-/** 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) {
-  if (!toolName) return '⏳ Думаю…'
-  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) {
-  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
-      timer = setTimeout(flush, Math.max(200, intervalMs))
-      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 () => {}
-  typingFn().catch?.(() => {})
-  const timer = setInterval(() => { typingFn().catch?.(() => {}) }, intervalMs)
-  timer.unref?.()
-  return () => 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) {
+  if (!toolName) return '⏳ Думаю…'
+  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)
+  }
+}

package/lib/telegram-errors.js

@@ -1,51 +1,51 @@
-// Network error classification for Telegram sends (mirrors Hermes adapter policy).
-//
-// The key distinction: some network failures mean the request NEVER left the
-// process (connect/pool timeout, ECONNRESET before send) → resending is safe.
-// Others (a generic timeout after the request may have reached Telegram) could
-// duplicate a message if we resend → do NOT retry.
-
-function rootCause(err) {
-  let e = err
-  let depth = 0
-  while (e && e.cause && e.cause !== e && depth < 10) {
-    e = e.cause
-    depth++
-  }
-  return e || err
-}
-
-// True when a resend cannot duplicate a message: the request did not reach Telegram.
-export function isResendSafeNetworkError(err) {
-  const c = rootCause(err)
-  const msg = String(c?.message || err?.message || '').toLowerCase()
-  if (/not sent to telegram|connect timeout|und_err_connect|econnreset|enotfound|econnrefused|ECONNRESET|ENOTFOUND|ECONNREFUSED/i.test(msg)) {
-    return true
-  }
-  // undici PoolTimeout message: "Request was *not* sent to Telegram."
-  if (/pool timeout|request was \*?not\*? sent/i.test(msg)) return true
-  return false
-}
-
-// True for a 409 from getUpdates: a second bot instance polls the same token.
-export function isPollingConflict(err) {
-  const msg = String(err?.message || '').toLowerCase()
-  return /terminated by other getupdates request|another bot instance is running|getupdates.*conflict|conflict.*getupdates/i.test(msg)
-}
-
-// True when the target chat/topic no longer exists (deleted/closed/upgraded).
-// Such sends should not be retried and any pending ask binding must be pruned.
-export function isTopicGoneError(err) {
-  const msg = String(err?.message || '').toLowerCase()
-  return /thread not found|message thread not found|topic[_ ]?(not found|closed|deleted)|chat (not found|was (upgraded|deleted))|group chat was (upgraded|deleted)/i.test(msg)
-}
-
-/**
- * Calculates exponential backoff with max cap for polling retries.
- * errorCount is 1-indexed.
- */
-export function computePollBackoffMs(baseIntervalMs, errorCount, maxDelayMs = 30_000) {
-  const count = Math.max(1, Math.min(10, Number(errorCount) || 1))
-  const base = Math.max(100, Number(baseIntervalMs) || 500)
-  return Math.min(maxDelayMs, base * Math.pow(2, count - 1))
-}
+// Network error classification for Telegram sends (mirrors Hermes adapter policy).
+//
+// The key distinction: some network failures mean the request NEVER left the
+// process (connect/pool timeout, ECONNRESET before send) → resending is safe.
+// Others (a generic timeout after the request may have reached Telegram) could
+// duplicate a message if we resend → do NOT retry.
+
+function rootCause(err) {
+  let e = err
+  let depth = 0
+  while (e && e.cause && e.cause !== e && depth < 10) {
+    e = e.cause
+    depth++
+  }
+  return e || err
+}
+
+// True when a resend cannot duplicate a message: the request did not reach Telegram.
+export function isResendSafeNetworkError(err) {
+  const c = rootCause(err)
+  const msg = String(c?.message || err?.message || '').toLowerCase()
+  if (/not sent to telegram|connect timeout|und_err_connect|econnreset|enotfound|econnrefused|ECONNRESET|ENOTFOUND|ECONNREFUSED/i.test(msg)) {
+    return true
+  }
+  // undici PoolTimeout message: "Request was *not* sent to Telegram."
+  if (/pool timeout|request was \*?not\*? sent/i.test(msg)) return true
+  return false
+}
+
+// True for a 409 from getUpdates: a second bot instance polls the same token.
+export function isPollingConflict(err) {
+  const msg = String(err?.message || '').toLowerCase()
+  return /terminated by other getupdates request|another bot instance is running|getupdates.*conflict|conflict.*getupdates/i.test(msg)
+}
+
+// True when the target chat/topic no longer exists (deleted/closed/upgraded).
+// Such sends should not be retried and any pending ask binding must be pruned.
+export function isTopicGoneError(err) {
+  const msg = String(err?.message || '').toLowerCase()
+  return /thread not found|message thread not found|topic[_ ]?(not found|closed|deleted)|chat (not found|was (upgraded|deleted))|group chat was (upgraded|deleted)/i.test(msg)
+}
+
+/**
+ * Calculates exponential backoff with max cap for polling retries.
+ * errorCount is 1-indexed.
+ */
+export function computePollBackoffMs(baseIntervalMs, errorCount, maxDelayMs = 30_000) {
+  const count = Math.max(1, Math.min(10, Number(errorCount) || 1))
+  const base = Math.max(100, Number(baseIntervalMs) || 500)
+  return Math.min(maxDelayMs, base * Math.pow(2, count - 1))
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-messenger-gateway",
-  "version": "0.3.18",
+  "version": "0.3.20",
   "description": "Telegram messenger bridge for DeepSeek Harness: sessions, steer, homes, inline asks, notify bridge, and optional TTS voice notes.",
   "license": "MIT",
   "type": "module",