@wenbin_wb/dsh-bridge 2.2.2 → 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

@@ -185,9 +185,15 @@ export class QqConversationNode extends ConversationBridge {
         })
 
         // 首片返回 stream_msg_id，后续片需携带
-        if (i === 0 && result?.id) {
-          streamMsgId = result.id
-          this.lastMessageId = result.id // 保存消息 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) {
@@ -205,7 +211,11 @@ export class QqConversationNode extends ConversationBridge {
       // 流式失败（如被动回复 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 })
+        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) {
@@ -256,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 开头，

package/package.json

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