@wenbin_wb/dsh-bridge 2.3.3 → 2.5.0

package/lib/qq/node.js

@@ -6,6 +6,8 @@
 //   - 出站：sendText 走 gateway.sendText；长文本用 Markdown 分块
 //   - 群聊：@提及消息仅在命中机器人才处理（GROUP_AT_MESSAGE_CREATE 已保证）
 
+import fs from 'node:fs'
+import path from 'node:path'
 import { ConversationBridge, conversationBridgeHelpers } from '../platform/conversation-bridge.js'
 import { gatewayConstants } from './gateway.js'
 
@@ -114,6 +116,7 @@ function makePlatform(gateway) {
     get capabilities() { return gateway.capabilities },
     // sendText / sendTyping 由 QqConversationNode 覆盖，这里仅提供兜底
     sendText: (peer, text) => gateway.sendText(peer, text, {}),
+    sendMediaFile: (peer, filePath, opts = {}) => gateway.sendMediaFile(peer, filePath, opts),
     sendTyping: () => Promise.resolve({ ok: true }),
     sendKeyboard: (peer, content, keyboard) => gateway.sendKeyboard(peer, content, keyboard, {}),
   }
@@ -144,12 +147,8 @@ export class QqConversationNode extends ConversationBridge {
     this._replyMsgId = null // 被动回复用的用户消息 ID（事件 d.id）
 
     // 订阅网关入站事件
-    this.ctx.on('qq/message', (event) => {
-      void this._handleInbound(event)
-    })
-    this.ctx.on('qq/interaction', (event) => {
-      void this._handleInteraction(event)
-    })
+    this.ctx.on('qq/message', (event) => this._handleInbound(event))
+    this.ctx.on('qq/interaction', (event) => this._handleInteraction(event))
   }
 
   // ---- 出站：覆盖 sendText / sendTyping，正确处理 scope 与被动回复 ----
@@ -373,7 +372,16 @@ export class QqConversationNode extends ConversationBridge {
     }
 
     const text = String(event.text ?? '').trim()
-    if (!text) {
+    const attachments = event.attachments || []
+
+    let mediaFiles = []
+    if (attachments.length > 0) {
+      this.logger?.info?.(`[dsh-bridge qq] processing ${attachments.length} attachment(s) from ${sender}...`)
+      mediaFiles = await this._processAttachments(attachments, this.config.cwd)
+      this.logger?.info?.(`[dsh-bridge qq] downloaded ${mediaFiles.length} file(s)`)
+    }
+
+    if (!text && mediaFiles.length === 0) {
       this.logger?.info?.(`[dsh-bridge qq] ignore empty message from ${sender}`)
       return
     }
@@ -384,10 +392,16 @@ export class QqConversationNode extends ConversationBridge {
       if (event.msgSeq !== undefined) this._msgSeq = event.msgSeq
     }
 
+    let fullText = text
+    if (mediaFiles.length > 0) {
+      const mediaDesc = mediaFiles.map((f) => `[文件: ${f.path}]`).join('\n')
+      fullText = fullText ? `${text}\n\n${mediaDesc}` : mediaDesc
+    }
+
     // 检测消息引用（文本交互）：如果用户回复了机器人的消息，且当前没有活动会话或消息以 /new 开头，
     // 则自动创建新会话并发送消息
     const messageReference = event.messageReference
-    if (messageReference && !this.activeSessionId && !text.startsWith('/')) {
+    if (messageReference && !this.activeSessionId && !fullText.startsWith('/')) {
       this.logger?.info?.(`[dsh-bridge qq] detected message reference from ${sender}, auto-starting conversation`)
       // 先创建新会话，再处理消息
       await this.handleInbound({ senderId: authId, text: '/new', isGroup })
@@ -396,7 +410,33 @@ export class QqConversationNode extends ConversationBridge {
     }
 
     // 交给平台无关核心：白名单/群消息/命令路由/agent 分发
-    await this.handleInbound({ senderId: authId, text, isGroup })
+    await this.handleInbound({ senderId: authId, text: fullText, isGroup })
+  }
+
+  /** 下载附件（图片/文件）并保存到本地工作目录 */
+  async _processAttachments(attachments, sessionCwd) {
+    if (!Array.isArray(attachments) || attachments.length === 0) return []
+    const mediaDir = path.join(sessionCwd || this.config.cwd || process.cwd(), '.qq-media')
+    try { await fs.promises.mkdir(mediaDir, { recursive: true }) } catch {}
+
+    const downloaded = []
+    for (const att of attachments) {
+      if (!att?.url) continue
+      try {
+        const rawUrl = att.url.startsWith('http') ? att.url : `https://${att.url}`
+        const res = await fetch(rawUrl, { signal: AbortSignal.timeout(15000) })
+        if (!res.ok) continue
+        const buf = Buffer.from(await res.arrayBuffer())
+        const ext = att.filename ? path.extname(att.filename) : (att.content_type?.includes('image') ? '.png' : '.bin')
+        const safeName = att.filename ? path.basename(att.filename) : `qq_${Date.now()}_${Math.random().toString(36).slice(2, 8)}${ext}`
+        const filePath = path.join(mediaDir, safeName)
+        await fs.promises.writeFile(filePath, buf)
+        downloaded.push({ filename: safeName, path: filePath, size: buf.length })
+      } catch (err) {
+        this.logger?.warn?.('[dsh-bridge qq] download attachment error: %s', err?.message ?? err)
+      }
+    }
+    return downloaded
   }
 
   // ---- 互动事件 ----