@wenbin_wb/dsh-bridge 2.1.1 → 2.2.0

package/lib/index.js

@@ -545,6 +545,9 @@ function apply(ctx, config = {}) {
           accountId: cfg.accountId,
         });
         logger.info('dsh-bridge: loaded saved qq bot config, starting gateway');
+        await qq.start().catch((err) => {
+          logger.error('dsh-bridge: qq auto-start failed: %s', err?.message ?? err);
+        });
       }
     }
   }).catch(() => {});

package/lib/qq/gateway.js

@@ -5,7 +5,7 @@ import { Service } from '@deepseek-ai/cordis'
 import WebSocket from 'ws'
 
 const TOKEN_URL = 'https://bots.qq.com/app/getAppAccessToken'
-const API_BASE = 'https://api.sgroup.qq.com'
+const API_BASE = 'https://api.bot.qq.com'
 const DEFAULT_GATEWAY = 'wss://api.sgroup.qq.com/websocket/'
 const MAX_MESSAGE_CHARS = 2000
 const TOKEN_MARGIN_MS = 5 * 60_000
@@ -323,6 +323,7 @@ export class QqGateway extends Service {
       method: 'POST',
       body: {
         markdown: typeof markdown === 'string' ? { content: markdown } : markdown,
+        keyboard: opts.keyboard,
         msg_type: 2,
         msg_id: opts.msgId,
         event_id: opts.eventId,
@@ -331,12 +332,14 @@ export class QqGateway extends Service {
   }
 
   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: 2,
+        msg_type: 0,
         msg_id: opts.msgId,
         event_id: opts.eventId,
       },
@@ -355,14 +358,19 @@ export class QqGateway extends Service {
   }
 
   async sendStream(peerId, content, opts = {}) {
-    const endpoint = this.endpoint(peerId, opts.scope, 'stream-messages')
+    const endpoint = this.endpoint(peerId, opts.scope, 'stream_messages')
     return this.api(endpoint, {
       method: 'POST',
       body: {
-        content: stringValue(content).slice(0, MAX_MESSAGE_CHARS),
-        msg_type: 0,
+        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,
       },
     })
   }
@@ -374,7 +382,83 @@ export class QqGateway extends Service {
     })
   }
 
-  async sendTyping() { return { ok: false, unsupported: true } }
+  async sendTyping(peerId, opts = {}) {
+    // 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,
+      },
+    })
+  }
+
+  // ---- 自定义菜单（单聊底部菜单，全局生效）----
+  // 参考：https://bot.q.qq.com/wiki/develop/api-v2/autogen/api/v2_menu.get.html
+  //       https://bot.q.qq.com/wiki/develop/api-v2/autogen/api/v2_menu.put.html
+
+  /** 查询全局自定义菜单 */
+  async getMenu() {
+    return this.api('/v2/menu', { method: 'GET' })
+  }
+
+  /**
+   * 修改全局自定义菜单（覆盖式）
+   * @param {Array} items 菜单项，最多 10 个
+   *   { name, type: 'switch'|'send_message'|'link'|'menu', sub_menu_items?, send_message?, link?, switch? }
+   */
+  async setMenu(items) {
+    return this.api('/v2/menu', {
+      method: 'PUT',
+      body: { menu: { items } },
+    })
+  }
+
+  // ---- 指令面板（c2c/group/channel/dm 场景）----
+  // 参考：https://bot.q.qq.com/wiki/develop/api-v2/server-inter/menu-panel/
+  //       https://bot.q.qq.com/wiki/develop/api-v2/autogen/api/v2_panels.post.html
+
+  /** 查询指令面板列表（按场景筛选） */
+  async listPanels(scope) {
+    const query = scope ? `?scope=${encodeURIComponent(scope)}` : ''
+    return this.api(`/v2/panels${query}`, { method: 'GET' })
+  }
+
+  /**
+   * 创建指令面板
+   * @param {object} body { scope, target_type?, user_openids?, group_openids?, panel: { items, remark?, version? } }
+   * @returns {Promise<{panel_id: string}>}
+   */
+  async createPanel(body) {
+    return this.api('/v2/panels', { method: 'POST', body })
+  }
+
+  /** 查询指令面板详情 */
+  async getPanel(panelId) {
+    return this.api(`/v2/panels/${encodeURIComponent(panelId)}`, { method: 'GET' })
+  }
+
+  /** 修改指令面板 */
+  async updatePanel(panelId, body) {
+    return this.api(`/v2/panels/${encodeURIComponent(panelId)}`, { method: 'PUT', body })
+  }
+
+  /** 删除指令面板 */
+  async deletePanel(panelId) {
+    return this.api(`/v2/panels/${encodeURIComponent(panelId)}`, { method: 'DELETE' })
+  }
+
+  /** 修改指令面板关联对象（增删指定用户/群） */
+  async updatePanelTarget(panelId, body) {
+    return this.api(`/v2/panels/${encodeURIComponent(panelId)}/target`, { method: 'PUT', body })
+  }
 
   setCredentials(values = {}) {
     for (const key of ['appId', 'clientSecret', 'accessToken', 'accessTokenExpiresAt', 'gatewayUrl', 'intents']) {

package/lib/qq/index.js

@@ -42,6 +42,16 @@ export class QqService extends Platform {
     // 挂到 ctx 供会话节点读取
     try { ctx.qq = this.gateway } catch { /* 挂载失败不致命 */ }
 
+    // 网关连接成功后自动配置指令面板与自定义菜单（一次性）
+    this._panelSetupDone = false
+    try {
+      ctx.on?.('qq/status', (status) => {
+        if (status === 'connected') {
+          void this._ensurePanelSetup().catch(() => {})
+        }
+      })
+    } catch { /* 忽略事件订阅失败 */ }
+
     this.node = new QqConversationNode(ctx, {
       allowFrom: Array.isArray(config.allowFrom) ? config.allowFrom : [],
       digestIntervalSec: config.digestIntervalSec,
@@ -79,8 +89,10 @@ export class QqService extends Platform {
     return this.gateway.sendText(peerId, text, opts)
   }
 
-  async sendTyping(peerId, state) {
-    return this.gateway.sendTyping(peerId, state)
+  async sendTyping(peerId, opts = {}) {
+    // 兼容旧调用：sendTyping(peerId, durationSeconds)
+    const normalized = typeof opts === 'number' ? { durationSeconds: opts } : opts
+    return this.gateway.sendTyping(peerId, normalized)
   }
 
   async sendMedia(peerId, media, opts = {}) {
@@ -91,8 +103,8 @@ export class QqService extends Platform {
     return this.gateway.sendMarkdown(peerId, markdown, opts)
   }
 
-  async sendKeyboard(peerId, keyboard, opts = {}) {
-    return this.gateway.sendKeyboard(peerId, keyboard, opts)
+  async sendKeyboard(peerId, content, keyboard, opts = {}) {
+    return this.gateway.sendKeyboard(peerId, content, keyboard, opts)
   }
 
   /** 合并展示状态给浏览器 UI。 */
@@ -189,6 +201,58 @@ export class QqService extends Platform {
     await this.persist({ allowFrom: clean })
   }
 
+  // ---- 指令面板 / 自定义菜单（一次性自动配置）----
+
+  /**
+   * 连接成功后自动创建 c2c + group 指令面板，并配置单聊自定义菜单。
+   * 幂等：已存在 remark 匹配的面板时跳过创建；失败仅记日志，不影响连接。
+   */
+  async _ensurePanelSetup() {
+    if (this._panelSetupDone) return
+    this._panelSetupDone = true // 防并发重复执行
+
+    const gate = this.gateway
+    const remark = PANEL_REMARK
+    const items = [
+      { name: '/new', desc: '新建对话', type: 'command' },
+      { name: '/list', desc: '查看会话列表', type: 'command' },
+      { name: '/resume', desc: '恢复会话', type: 'command' },
+      { name: '/sessions', desc: '切换会话', type: 'command' },
+      { name: '/help', desc: '命令帮助', type: 'command' },
+    ]
+
+    // 指令面板：c2c（单聊）与 group（群聊）各建一个全局面板
+    for (const scope of ['c2c', 'group']) {
+      try {
+        const list = await gate.listPanels(scope)
+        const exists = (list?.records || []).some((r) => r?.panel?.remark === remark)
+        if (!exists) {
+          const res = await gate.createPanel({
+            scope,
+            target_type: 'all',
+            panel: { items, remark, version: 1 },
+          })
+          this.logger.info('[dsh-bridge qq] created %s command panel: %s', scope, res?.panel_id ?? '(no id)')
+        }
+      } catch (err) {
+        this.logger.warn('[dsh-bridge qq] command panel setup for %s skipped: %s', scope, err?.message ?? err)
+      }
+    }
+
+    // 自定义菜单：单聊底部菜单（send_message 类型，点击自动填入命令）
+    try {
+      const menuItems = [
+        { name: '新建', type: 'send_message', send_message: '/new' },
+        { name: '列表', type: 'send_message', send_message: '/list' },
+        { name: '帮助', type: 'send_message', send_message: '/help' },
+      ]
+      await gate.setMenu(menuItems)
+      this.logger.info('[dsh-bridge qq] custom menu configured')
+    } catch (err) {
+      this.logger.warn('[dsh-bridge qq] custom menu setup skipped: %s', err?.message ?? err)
+    }
+  }
+
   /** 更新运行时配置并持久化。 */
   async setConfig({ digestIntervalSec, approvalTimeoutSec, maxMessageChars, sendChunkDelayMs, appId, clientSecret } = {}) {
     if (digestIntervalSec != null)   this.node.config.digestIntervalSec   = Number(digestIntervalSec)
@@ -226,3 +290,6 @@ export class QqService extends Platform {
 function gatewayMaxChars() {
   return 2000
 }
+
+// 指令面板 remark 标识，用于幂等判断（区分本插件创建的面板）
+const PANEL_REMARK = 'dsh-bridge 常用命令'

package/lib/qq/node.js

@@ -18,8 +18,9 @@ function makePlatform(gateway) {
     name: 'QQ',
     get accountId() { return gateway.accountId ?? '' },
     get capabilities() { return gateway.capabilities },
+    // sendText / sendTyping 由 QqConversationNode 覆盖，这里仅提供兜底
     sendText: (peer, text) => gateway.sendText(peer, text, {}),
-    sendTyping: (peer, state) => gateway.sendTyping(peer, state),
+    sendTyping: () => Promise.resolve({ ok: true }),
     sendKeyboard: (peer, content, keyboard) => gateway.sendKeyboard(peer, content, keyboard, {}),
   }
 }
@@ -44,6 +45,9 @@ export class QqConversationNode extends ConversationBridge {
     })
     this.gateway = ctx.qq
     this.lastMessageId = null // 存储最后发送的消息 ID，用于消息引用
+    // 当前对话 peer 信息（由 _handleInbound 在每次收到消息时刷新）
+    this._lastPeer = null // { peerId, scope: 'c2c'|'group' }
+    this._replyMsgId = null // 被动回复用的用户消息 ID（事件 d.id）
 
     // 订阅网关入站事件
     this.ctx.on('qq/message', (event) => {
@@ -54,15 +58,22 @@ export class QqConversationNode extends ConversationBridge {
     })
   }
 
-  // ---- 出站：覆盖 sendText，在提示消息中添加按钮 ----
+  // ---- 出站：覆盖 sendText / sendTyping，正确处理 scope 与被动回复 ----
+
+  /** 解析当前对话 peer 信息；无活动 peer 时返回 null */
+  _currentPeer() {
+    return this._lastPeer
+  }
 
   async sendText(text) {
-    const peer = this.peerId
-    if (!peer) return
-    
+    const peerInfo = this._currentPeer()
+    if (!peerInfo) return
+    const { peerId, scope } = peerInfo
+    const replyMsgId = this._replyMsgId || undefined
+
     // 检测是否是提示用户开始新会话的消息
     const isPromptMessage = text.includes('没有活动会话') || text.includes('恢复会话失败')
-    
+
     if (isPromptMessage) {
       // 发送带按钮的消息，方便用户快速操作
       const keyboard = {
@@ -80,56 +91,73 @@ export class QqConversationNode extends ConversationBridge {
           },
         ],
       }
-      const result = await this.platform.sendKeyboard(peer, text, keyboard)
-      // 保存消息 ID
-      if (result?.data?.message_id) {
-        this.lastMessageId = result.data.message_id
-      }
-      return result
+      return this.gateway.sendKeyboard(peerId, text, keyboard, { scope, msgId: replyMsgId })
     }
-    
+
     // 其他消息使用流式发送
     const content = String(text || '').trim()
     if (content.length === 0) return { success: true }
-    
-    const STREAM_CHUNK_SIZE = 200
-    
+
+    const STREAM_CHUNK_SIZE = 500
+
     // 如果消息较短，直接发送普通消息
     if (content.length <= STREAM_CHUNK_SIZE) {
-      const result = await this.gateway.sendText(peer, content, {})
-      // 保存消息 ID
-      if (result?.data?.message_id) {
-        this.lastMessageId = result.data.message_id
-      }
+      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 firstMsgId = null
-    for (const chunk of chunks) {
-      const result = await this.gateway.sendStream(peer, chunk, {
-        msgId: firstMsgId, // 后续段关联到第一段
+
+    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', // 追加模式：服务端拼接到同一条消息
       })
-      if (!firstMsgId && result?.data?.message_id) {
-        firstMsgId = result.data.message_id
-        this.lastMessageId = firstMsgId // 保存第一段消息 ID
+
+      // 首片返回 stream_msg_id，后续片需携带
+      if (i === 0 && result?.id) {
+        streamMsgId = result.id
+        this.lastMessageId = result.id // 保存消息 ID 用于消息引用
       }
-      if (result?.error) {
-        return { success: false, error: result.error }
+
+      if (result?.code !== undefined && result.code !== 0) {
+        return { success: false, error: result.message || `QQ API error ${result.code}` }
       }
+
       // 流式发送间隔稍短，避免刷屏
-      await new Promise(resolve => setTimeout(resolve, 100))
+      if (!isLast) {
+        await new Promise(resolve => setTimeout(resolve, 100))
+      }
     }
-    
+
     return { success: true }
   }
 
+  /** 发送"正在输入"状态（QQ 通过 msg_type=6 + input_notify 显示 N 秒） */
+  async sendTyping(state) {
+    const peerInfo = this._currentPeer()
+    if (!peerInfo) return
+    // state=2（停止）时无需显式结束——input_second 到期自动消失
+    if (Number(state) === 2) return { ok: true }
+    return this.gateway.sendTyping(peerInfo.peerId, {
+      scope: peerInfo.scope,
+      durationSeconds: 8,
+      msgId: this._replyMsgId || undefined,
+    })
+  }
+
   // ---- 入站 ----
 
   async _handleInbound(event) {
@@ -151,6 +179,13 @@ export class QqConversationNode extends ConversationBridge {
     // 群聊：仅在群聊 @ 机器人事件中处理（GROUP_AT_MESSAGE_CREATE 已由网关归一化）
     const isGroup = event.scope === 'group' || event.scope === 'guild'
 
+    // 记录当前 peer 信息与被动回复消息 ID（事件 d.id），供出站使用
+    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)
+    }
+
     // 检测消息引用（文本交互）：如果用户回复了机器人的消息，且当前没有活动会话或消息以 /new 开头，
     // 则自动创建新会话并发送消息
     const messageReference = event.messageReference
@@ -178,6 +213,14 @@ export class QqConversationNode extends ConversationBridge {
       return
     }
 
+    // 记录 peer 信息，供命令回复使用
+    const isGroup = event.scope === 'group'
+    const peerId = isGroup ? event.groupId || event.peerId : event.peerId || sender
+    if (peerId) {
+      this._lastPeer = { peerId: String(peerId), scope: isGroup ? 'group' : 'c2c' }
+      this._replyMsgId = null
+    }
+
     const data = event.data || {}
     const resolved = data.resolved || {}
     const buttonId = resolved.button_id || ''

package/package.json

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