@wenbin_wb/dsh-bridge 2.2.0 → 2.2.3

package/lib/qq/gateway.js

@@ -27,6 +27,8 @@ async function requestJson(url, { method = 'GET', token, body, timeoutMs = REQUE
   const controller = new AbortController()
   const timer = setTimeout(() => controller.abort(), timeoutMs)
   try {
+    // DEBUG: 记录请求详情
+    console.log('[QQ API DEBUG] Request:', { method, url, body })
     const response = await fetch(url, {
       method,
       headers: {
@@ -40,6 +42,8 @@ async function requestJson(url, { method = 'GET', token, body, timeoutMs = REQUE
     const raw = await response.text()
     let value = {}
     try { value = raw ? JSON.parse(raw) : {} } catch { value = { message: raw } }
+    // DEBUG: 记录响应详情
+    console.log('[QQ API DEBUG] Response:', { status: response.status, ok: response.ok, value })
     if (!response.ok) {
       const error = new Error(`QQ API ${response.status}: ${value?.message || value?.msg || value?.code || response.statusText}`)
       error.status = response.status
@@ -62,6 +66,7 @@ function normalizeEvent(payload) {
       text: stringValue(data.content).trim(),
       message: data,
       messageReference: data.message_reference,
+      msgSeq: data.msg_seq, // 用于避免去重
     }
   }
   if (event === 'GROUP_AT_MESSAGE_CREATE') {
@@ -74,6 +79,7 @@ function normalizeEvent(payload) {
       text: stringValue(data.content).trim(),
       message: data,
       messageReference: data.message_reference,
+      msgSeq: data.msg_seq, // 用于避免去重
     }
   }
   if (event === 'AT_MESSAGE_CREATE') {
@@ -307,43 +313,43 @@ export class QqGateway extends Service {
   }
 
   async sendText(peerId, content, opts = {}) {
-    return this.api(this.endpoint(peerId, opts.scope), {
-      method: 'POST',
-      body: {
-        content: stringValue(content).slice(0, MAX_MESSAGE_CHARS),
-        msg_type: 0,
-        msg_id: opts.msgId,
-        event_id: opts.eventId,
-      },
-    })
+    const body = {
+      content: stringValue(content).slice(0, MAX_MESSAGE_CHARS),
+      msg_type: 0,
+    }
+    // 只添加有值的可选字段
+    if (opts.msgId !== undefined) body.msg_id = opts.msgId
+    if (opts.eventId !== undefined) body.event_id = opts.eventId
+    if (opts.msgSeq !== undefined) body.msg_seq = opts.msgSeq
+    return this.api(this.endpoint(peerId, opts.scope), { method: 'POST', body })
   }
 
   async sendMarkdown(peerId, markdown, opts = {}) {
-    return this.api(this.endpoint(peerId, opts.scope), {
-      method: 'POST',
-      body: {
-        markdown: typeof markdown === 'string' ? { content: markdown } : markdown,
-        keyboard: opts.keyboard,
-        msg_type: 2,
-        msg_id: opts.msgId,
-        event_id: opts.eventId,
-      },
-    })
+    const body = {
+      markdown: typeof markdown === 'string' ? { content: markdown } : markdown,
+      keyboard: opts.keyboard,
+      msg_type: 2,
+    }
+    // 只添加有值的可选字段
+    if (opts.msgId !== undefined) body.msg_id = opts.msgId
+    if (opts.eventId !== undefined) body.event_id = opts.eventId
+    if (opts.msgSeq !== undefined) body.msg_seq = opts.msgSeq
+    return this.api(this.endpoint(peerId, opts.scope), { method: 'POST', body })
   }
 
   async sendKeyboard(peerId, content, keyboard, opts = {}) {
     // 官方文档：keyboard 为附加字段，配合 msg_type=0(content) 或 msg_type=2(markdown) 使用
     // 纯文本 + 键盘时使用 msg_type=0
-    return this.api(this.endpoint(peerId, opts.scope), {
-      method: 'POST',
-      body: {
-        content: stringValue(content),
-        keyboard,
-        msg_type: 0,
-        msg_id: opts.msgId,
-        event_id: opts.eventId,
-      },
-    })
+    const body = {
+      content: stringValue(content),
+      keyboard,
+      msg_type: 0,
+    }
+    // 只添加有值的可选字段
+    if (opts.msgId !== undefined) body.msg_id = opts.msgId
+    if (opts.eventId !== undefined) body.event_id = opts.eventId
+    if (opts.msgSeq !== undefined) body.msg_seq = opts.msgSeq
+    return this.api(this.endpoint(peerId, opts.scope), { method: 'POST', body })
   }
 
   async sendMedia(peerId, media, opts = {}) {
@@ -359,20 +365,19 @@ export class QqGateway extends Service {
 
   async sendStream(peerId, content, opts = {}) {
     const endpoint = this.endpoint(peerId, opts.scope, 'stream_messages')
-    return this.api(endpoint, {
-      method: 'POST',
-      body: {
-        content_type: opts.contentType || 'text',
-        content_raw: stringValue(content).slice(0, MAX_MESSAGE_CHARS),
-        input_mode: opts.inputMode || 'replace',
-        input_state: opts.inputState, // 1=生成中, 10=生成结束
-        index: opts.index, // 分片序号，从0递增
-        stream_msg_id: opts.streamMsgId, // 第一片由服务端返回，后续片需携带
-        msg_id: opts.msgId,
-        event_id: opts.eventId,
-        msg_seq: opts.msgSeq,
-      },
-    })
+    const body = {
+      content_type: opts.contentType || 'text',
+      content_raw: stringValue(content).slice(0, MAX_MESSAGE_CHARS),
+      input_mode: opts.inputMode || 'replace',
+      input_state: opts.inputState, // 1=生成中, 10=生成结束
+      index: opts.index, // 分片序号，从0递增
+    }
+    // 只添加有值的可选字段，避免 undefined 被序列化
+    if (opts.streamMsgId !== undefined) body.stream_msg_id = opts.streamMsgId
+    if (opts.msgId !== undefined) body.msg_id = opts.msgId
+    if (opts.eventId !== undefined) body.event_id = opts.eventId
+    if (opts.msgSeq !== undefined) body.msg_seq = opts.msgSeq
+    return this.api(endpoint, { method: 'POST', body })
   }
 
   async respondInteraction(interactionId, response) {
@@ -386,18 +391,18 @@ export class QqGateway extends Service {
     // QQ Bot API v2 使用 msg_type: 6 发送输入状态通知
     // 参考：https://bot.q.qq.com/wiki/develop/api-v2/autogen/api/v2_users_user_openid_messages.post.html
     const endpoint = this.endpoint(peerId, opts.scope)
-    return this.api(endpoint, {
-      method: 'POST',
-      body: {
-        msg_type: 6,
-        input_notify: {
-          input_type: 1,
-          input_second: Math.min(opts.durationSeconds || 5, 60), // 最长60秒
-        },
-        msg_id: opts.msgId,
-        event_id: opts.eventId,
+    const body = {
+      msg_type: 6,
+      input_notify: {
+        input_type: 1,
+        input_second: Math.min(opts.durationSeconds || 5, 60), // 最长60秒
       },
-    })
+    }
+    // 只添加有值的可选字段
+    if (opts.msgId !== undefined) body.msg_id = opts.msgId
+    if (opts.eventId !== undefined) body.event_id = opts.eventId
+    if (opts.msgSeq !== undefined) body.msg_seq = opts.msgSeq
+    return this.api(endpoint, { method: 'POST', body })
   }
 
   // ---- 自定义菜单（单聊底部菜单，全局生效）----

package/lib/qq/node.js

@@ -10,6 +10,73 @@ import { ConversationBridge, conversationBridgeHelpers } from '../platform/conve
 import { gatewayConstants } from './gateway.js'
 
 const MAX_MESSAGE_CHARS = gatewayConstants.MAX_MESSAGE_CHARS
+const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms))
+
+// QQ 流式消息：markdown 内容每片最大长度（append 模式下每片为追加片段）
+const STREAM_CHUNK_SIZE = 400
+
+/**
+ * 将文本转成 QQ 安全 Markdown：
+ *  - 表格（| a | b | / |---|）降级为纯文本（QQ Markdown 不支持表格，会截断/报错）
+ *  - markdown 图片语法 ![alt](url) 转为链接 [alt](url)（避免图片转存失败导致整条失败）
+ *  - 代码块内容原样保留
+ */
+function sanitizeQQMarkdown(text) {
+  if (!text) return ''
+  const lines = String(text).split('\n')
+  const out = []
+  let inFence = false
+  let inTable = false
+  const isSep = (l) => /^\s*\|?\s*:?-{2,}:?\s*(\|\s*:?-{2,}:?\s*)*\|?\s*$/.test(l) && l.includes('-')
+  const isTableRow = (l) => /^\s*\|.*\|\s*$/.test(l)
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i]
+    if (/^\s*```/.test(line)) {
+      inFence = !inFence
+      out.push(line)
+      continue
+    }
+    if (inFence) { out.push(line); continue }
+    const nextIsSep = i + 1 < lines.length && isSep(lines[i + 1])
+    if (isTableRow(line) && (inTable || nextIsSep)) {
+      inTable = true
+      if (!isSep(line)) {
+        // 去掉首尾 |，内部 | 转空格
+        out.push(line.replace(/^\s*\|\s*/, '').replace(/\s*\|\s*$/, '').replace(/\s*\|\s*/g, '  '))
+      }
+      continue
+    }
+    inTable = false
+    out.push(line.replace(/!\[([^\]]*)\]\(([^)]+)\)/g, '[$1]($2)'))
+  }
+  return out.join('\n')
+}
+
+/**
+ * 按段落边界切分内容（避免切断行内内容），单块时拆两片保证流式过渡
+ * @param {string} content - 要分片的内容
+ * @param {number} maxChunk - 单片最大字符数（用户配置的 maxMessageChars）
+ */
+function splitIntoChunks(content, maxChunk) {
+  const chunks = []
+  let start = 0
+  while (start < content.length) {
+    if (content.length - start <= maxChunk) { chunks.push(content.slice(start)); break }
+    const windowStart = start + Math.floor(maxChunk * 0.6)
+    const windowEnd = start + maxChunk
+    let cut = content.lastIndexOf('\n', windowEnd)
+    if (cut <= windowStart || cut === -1) cut = windowEnd
+    chunks.push(content.slice(start, cut))
+    start = cut
+  }
+  // 单块时拆两片，保证「生成中 → 生成结束」的流式过渡
+  if (chunks.length === 1 && content.length > 0) {
+    const half = Math.ceil(content.length / 2)
+    chunks.length = 0
+    chunks.push(content.slice(0, half), content.slice(half))
+  }
+  return chunks
+}
 
 // 把 QqGateway 适配为 ConversationBridge 需要的 Platform 消息接口
 function makePlatform(gateway) {
@@ -94,55 +161,75 @@ export class QqConversationNode extends ConversationBridge {
       return this.gateway.sendKeyboard(peerId, text, keyboard, { scope, msgId: replyMsgId })
     }
 
-    // 其他消息使用流式发送
+    // 其他回复统一走「流式 Markdown」：content_type=markdown 让手机端渲染，append 模式逐段追加
     const content = String(text || '').trim()
     if (content.length === 0) return { success: true }
 
-    const STREAM_CHUNK_SIZE = 500
-
-    // 如果消息较短，直接发送普通消息
-    if (content.length <= STREAM_CHUNK_SIZE) {
-      const result = await this.gateway.sendText(peerId, content, { scope, msgId: replyMsgId })
-      if (result?.id) this.lastMessageId = result.id
-      return result
-    }
-
-    // 流式发送：把内容切分成多段（append 模式，服务端拼接为同一条消息）
-    const chunks = []
-    for (let i = 0; i < content.length; i += STREAM_CHUNK_SIZE) {
-      chunks.push(content.slice(i, i + STREAM_CHUNK_SIZE))
-    }
-
-    let streamMsgId = null
-    for (let i = 0; i < chunks.length; i++) {
-      const chunk = chunks[i]
-      const isLast = i === chunks.length - 1
-      const result = await this.gateway.sendStream(peerId, chunk, {
-        scope,
-        msgId: i === 0 ? replyMsgId : undefined, // 首片带被动回复 msg_id
-        streamMsgId, // 后续片携带服务端返回的 stream_msg_id
-        index: i, // 分片序号从 0 递增
-        inputState: isLast ? 10 : 1, // 1=生成中, 10=生成结束
-        inputMode: 'append', // 追加模式：服务端拼接到同一条消息
-      })
-
-      // 首片返回 stream_msg_id，后续片需携带
-      if (i === 0 && result?.id) {
-        streamMsgId = result.id
-        this.lastMessageId = result.id // 保存消息 ID 用于消息引用
+    const md = sanitizeQQMarkdown(content)
+    // 使用用户配置的 maxMessageChars（默认 2000），而非硬编码 200
+    const maxChars = this.config.maxMessageChars || 2000
+    const chunks = splitIntoChunks(md, maxChars)
+
+    try {
+      let streamMsgId = null
+      for (let i = 0; i < chunks.length; i++) {
+        const isLast = i === chunks.length - 1
+        const result = await this.gateway.sendStream(peerId, chunks[i], {
+          scope,
+          contentType: 'markdown', // 流式 Markdown，手机端正常渲染
+          msgId: i === 0 ? replyMsgId : undefined, // 首片带被动回复 msg_id
+          streamMsgId, // 后续片携带服务端返回的 stream_msg_id
+          index: i, // 分片序号从 0 递增
+          inputState: isLast ? 10 : 1, // 1=生成中, 10=生成结束
+          inputMode: 'append', // 追加模式：服务端拼接到同一条消息
+        })
+
+        // 首片返回 stream_msg_id，后续片需携带
+        if (i === 0) {
+          // 尝试多个可能的字段名
+          streamMsgId = result?.id || result?.message_id || result?.stream_msg_id
+          if (streamMsgId) {
+            this.lastMessageId = streamMsgId
+            this.logger?.info?.('[dsh-bridge qq] stream started, stream_msg_id=%s, chunks=%d', streamMsgId, chunks.length)
+          } else {
+            this.logger?.warn?.('[dsh-bridge qq] stream first chunk returned no id: %o', result)
+          }
+        }
+
+        if (result?.code !== undefined && result.code !== 0) {
+          throw new Error(result.message || `QQ API error ${result.code}`)
+        }
+
+        // 使用用户配置的 sendChunkDelayMs（默认 1500ms），而非硬编码 120ms
+        if (!isLast) {
+          const delayMs = this.config.sendChunkDelayMs ?? 1500
+          if (delayMs > 0) await sleep(delayMs)
+        }
       }
-
-      if (result?.code !== undefined && result.code !== 0) {
-        return { success: false, error: result.message || `QQ API error ${result.code}` }
-      }
-
-      // 流式发送间隔稍短，避免刷屏
-      if (!isLast) {
-        await new Promise(resolve => setTimeout(resolve, 100))
+      return { success: true }
+    } catch (err) {
+      // 流式失败（如被动回复 msg_id 过期）→ 依次回退：带 msg_id 的 Markdown → 主动 Markdown
+      this.logger?.warn?.('[dsh-bridge qq] stream send failed, fallback to markdown: %s', err?.message ?? err)
+      try {
+        const result = await this.gateway.sendMarkdown(peerId, md, { 
+          scope, 
+          msgId: replyMsgId,
+          msgSeq: this._msgSeq !== undefined ? this._msgSeq + 1 : undefined, // 使用递增的 msg_seq 避免去重
+        })
+        if (result?.id) this.lastMessageId = result.id
+        return result
+      } catch (fallbackErr1) {
+        try {
+          // 主动消息兜底（digest 心跳等非回复场景，msg_id 已过期或无）
+          const result = await this.gateway.sendMarkdown(peerId, md, { scope })
+          if (result?.id) this.lastMessageId = result.id
+          return result
+        } catch (fallbackErr2) {
+          this.logger?.error?.('[dsh-bridge qq] markdown send failed: %s', fallbackErr2?.message ?? fallbackErr2)
+          return { success: false, error: fallbackErr2?.message ?? String(fallbackErr2) }
+        }
       }
     }
-
-    return { success: true }
   }
 
   /** 发送"正在输入"状态（QQ 通过 msg_type=6 + input_notify 显示 N 秒） */
@@ -179,11 +266,12 @@ export class QqConversationNode extends ConversationBridge {
     // 群聊：仅在群聊 @ 机器人事件中处理（GROUP_AT_MESSAGE_CREATE 已由网关归一化）
     const isGroup = event.scope === 'group' || event.scope === 'guild'
 
-    // 记录当前 peer 信息与被动回复消息 ID（事件 d.id），供出站使用
+    // 记录当前 peer 信息与被动回复消息 ID（事件 d.id）、msg_seq，供出站使用
     const peerId = isGroup ? event.groupId || event.peerId : event.peerId || event.senderId
     if (peerId) {
       this._lastPeer = { peerId: String(peerId), scope: isGroup ? 'group' : 'c2c' }
       if (event.id) this._replyMsgId = String(event.id)
+      if (event.msgSeq !== undefined) this._msgSeq = event.msgSeq
     }
 
     // 检测消息引用（文本交互）：如果用户回复了机器人的消息，且当前没有活动会话或消息以 /new 开头，
@@ -250,4 +338,7 @@ export const qqNodeHelpers = {
   textOfAssistantMessage: conversationBridgeHelpers.textOfAssistantMessage,
   listSessions: conversationBridgeHelpers.listSessions,
   sessionsInDisplayOrder: conversationBridgeHelpers.sessionsInDisplayOrder,
+  sanitizeQQMarkdown,
+  splitIntoChunks,
+  STREAM_CHUNK_SIZE,
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wenbin_wb/dsh-bridge",
-  "version": "2.2.0",
+  "version": "2.2.3",
   "description": "手机扫码即可在移动端/公网继续用 DeepSeek Harness，人不在电脑前也能接着干。一键局域网二维码、Cloudflare 公网隧道、自建隧道与微信 Bot（多工作区/会话持久化/媒体/审批），无需自己搭公网服务器。",
   "type": "module",
   "main": "lib/index.js",