@wenbin_wb/dsh-bridge 2.3.3 → 2.5.0

package/lib/feishu/gateway.js

@@ -2,6 +2,8 @@
 // Official SDK: @larksuiteoapi/node-sdk
 // Reference: https://open.feishu.cn/document/home/event-subscription-via-websocket/overview
 
+import fs from 'node:fs'
+import path from 'node:path'
 import { Service } from '@deepseek-ai/cordis'
 import * as Lark from '@larksuiteoapi/node-sdk'
 
@@ -144,6 +146,7 @@ export class FeishuGateway extends Service {
         // 5. 启动 WebSocket 长连接
         await this.wsClient.start({ eventDispatcher: this.eventDispatcher })
         this.setStatus('online')
+        this._startWatchdog()
         this.logger.info?.('[dsh-bridge feishu] WebSocket connected to Feishu Open Platform')
         return true
       } catch (err) {
@@ -158,8 +161,28 @@ export class FeishuGateway extends Service {
     return this._startingPromise
   }
 
+  _startWatchdog() {
+    this._stopWatchdog()
+    this._watchdogTimer = setInterval(async () => {
+      if (this.status === 'online' && !this._closing && this.configured && this.client) {
+        try {
+          await this.client.bot.v3.bot.get({}).catch(() => null)
+        } catch (err) {
+          this.logger?.warn?.('[dsh-bridge feishu] liveness probe warning: %s', err?.message ?? err)
+        }
+      }
+    }, 60_000)
+    if (typeof this._watchdogTimer?.unref === 'function') this._watchdogTimer.unref()
+  }
+
+  _stopWatchdog() {
+    if (this._watchdogTimer) clearInterval(this._watchdogTimer)
+    this._watchdogTimer = null
+  }
+
   async stop() {
     this._closing = true
+    this._stopWatchdog()
     try {
       if (this.wsClient) {
         const wsInstance = this.wsClient.wsConfig?.getWSInstance?.()
@@ -199,15 +222,16 @@ export class FeishuGateway extends Service {
     const chatType = message.chat_type || 'p2p' // 'p2p' or 'group'
     const isGroup = chatType === 'group'
 
-    // 提取文本内容
+    // 解析消息体（文本 / 图片 / 文件 / 音频 / 视频）
     let text = ''
-    if (message.message_type === 'text') {
-      try {
-        const parsed = JSON.parse(message.content || '{}')
-        text = parsed.text || ''
-      } catch {
-        text = message.content || ''
+    let contentObj = {}
+    try {
+      contentObj = JSON.parse(message.content || '{}')
+      if (message.message_type === 'text') {
+        text = contentObj.text || ''
       }
+    } catch {
+      text = message.content || ''
     }
 
     // 群聊中剥离机器人 @ 占位符（例如 @_user_1 等）
@@ -226,12 +250,54 @@ export class FeishuGateway extends Service {
       isGroup,
       messageId,
       text,
+      contentObj,
       messageType: message.message_type,
       raw: data,
       createTime: Number(message.create_time || Date.now()),
     })
   }
 
+  /**
+   * 下载消息中的资源文件（图片/文件/音频/媒体）
+   * @param {object} opts
+   * @param {string} opts.messageId 消息 ID
+   * @param {string} opts.fileKey 资源 Key
+   * @param {string} [opts.type] 'file' | 'image'
+   * @returns {Promise<Buffer|null>}
+   */
+  async downloadMessageResource({ messageId, fileKey, type = 'file' }) {
+    if (!this.client) throw new Error('Feishu client not initialized')
+    try {
+      const resp = await this.client.im.messageResource.get({
+        path: {
+          message_id: messageId,
+          file_key: fileKey,
+        },
+        params: {
+          type: type === 'image' ? 'image' : 'file',
+        },
+      })
+      if (Buffer.isBuffer(resp)) return resp
+      if (resp && typeof resp.pipe === 'function') {
+        const chunks = []
+        for await (const chunk of resp) chunks.push(Buffer.from(chunk))
+        return Buffer.concat(chunks)
+      }
+      if (resp?.data) {
+        if (Buffer.isBuffer(resp.data)) return resp.data
+        if (resp.data.pipe) {
+          const chunks = []
+          for await (const chunk of resp.data) chunks.push(Buffer.from(chunk))
+          return Buffer.concat(chunks)
+        }
+      }
+      return null
+    } catch (err) {
+      this.logger?.warn?.('[dsh-bridge feishu] downloadMessageResource error: %s', err?.message ?? err)
+      return null
+    }
+  }
+
   async _handleCardActionTrigger(data) {
     const action = data?.action || {}
     const operator = data?.operator || {}
@@ -382,6 +448,99 @@ export class FeishuGateway extends Service {
     }
   }
 
+  /**
+   * 上传并发送本地图片
+   */
+  async sendLocalImage(receiveId, filePath, opts = {}) {
+    if (!this.client || !receiveId || !filePath) return null
+    let receiveIdType = opts.receiveIdType
+    if (!receiveIdType) {
+      if (receiveId.startsWith('ou_')) receiveIdType = 'open_id'
+      else if (receiveId.startsWith('oc_')) receiveIdType = 'chat_id'
+      else if (opts.isGroup) receiveIdType = 'chat_id'
+      else receiveIdType = 'open_id'
+    }
+
+    try {
+      const imageStream = fs.createReadStream(filePath)
+      const uploadRes = await this.client.im.v1.image.create({
+        data: {
+          image_type: 'message',
+          image: imageStream,
+        },
+      })
+      const imageKey = uploadRes?.image_key
+      if (!imageKey) throw new Error('Feishu image upload returned no image_key')
+
+      const res = await this.client.im.v1.message.create({
+        params: { receive_id_type: receiveIdType },
+        data: {
+          receive_id: receiveId,
+          msg_type: 'image',
+          content: JSON.stringify({ image_key: imageKey }),
+        },
+      })
+      return res?.data
+    } catch (err) {
+      this.logger.warn?.(`[dsh-bridge feishu] sendLocalImage error (${receiveId}, ${filePath}):`, err?.message ?? err)
+      return null
+    }
+  }
+
+  /**
+   * 上传并发送本地文件
+   */
+  async sendLocalFile(receiveId, filePath, opts = {}) {
+    if (!this.client || !receiveId || !filePath) return null
+    let receiveIdType = opts.receiveIdType
+    if (!receiveIdType) {
+      if (receiveId.startsWith('ou_')) receiveIdType = 'open_id'
+      else if (receiveId.startsWith('oc_')) receiveIdType = 'chat_id'
+      else if (opts.isGroup) receiveIdType = 'chat_id'
+      else receiveIdType = 'open_id'
+    }
+
+    try {
+      const fileName = path.basename(filePath)
+      const fileStream = fs.createReadStream(filePath)
+      const uploadRes = await this.client.im.v1.file.create({
+        data: {
+          file_type: 'stream',
+          file_name: fileName,
+          file: fileStream,
+        },
+      })
+      const fileKey = uploadRes?.file_key
+      if (!fileKey) throw new Error('Feishu file upload returned no file_key')
+
+      const res = await this.client.im.v1.message.create({
+        params: { receive_id_type: receiveIdType },
+        data: {
+          receive_id: receiveId,
+          msg_type: 'file',
+          content: JSON.stringify({ file_key: fileKey }),
+        },
+      })
+      return res?.data
+    } catch (err) {
+      this.logger.warn?.(`[dsh-bridge feishu] sendLocalFile error (${receiveId}, ${filePath}):`, err?.message ?? err)
+      return null
+    }
+  }
+
+  /**
+   * 发送本地媒体文件（自动识别图片/文档）
+   */
+  async sendMediaFile(receiveId, filePath, opts = {}) {
+    if (!fs.existsSync(filePath)) return null
+    const ext = path.extname(filePath).toLowerCase()
+    const isImage = ['.png', '.jpg', '.jpeg', '.gif', '.webp', '.bmp'].includes(ext)
+    if (isImage) {
+      return this.sendLocalImage(receiveId, filePath, opts)
+    }
+    return this.sendLocalFile(receiveId, filePath, opts)
+  }
+
   // 释放资源
   dispose() {
     void this.stop()

package/lib/feishu/node.js

@@ -2,6 +2,8 @@
 // 把飞书 OpenAPI / WebSocket 长连接入站事件解析后交给平台无关的
 // ConversationBridge 处理，出站通过 FeishuGateway 发送文本 / 卡片。
 
+import fs from 'node:fs'
+import path from 'node:path'
 import { ConversationBridge, conversationBridgeHelpers } from '../platform/conversation-bridge.js'
 
 function makePlatform(gateway) {
@@ -12,6 +14,9 @@ function makePlatform(gateway) {
     async sendText(peerId, text, opts = {}) {
       return gateway?.sendMarkdownCard(peerId, text, opts)
     },
+    async sendMediaFile(peerId, filePath, opts = {}) {
+      return gateway?.sendMediaFile(peerId, filePath, opts)
+    },
     async sendTyping() {},
     dispose() {},
   }
@@ -70,14 +75,10 @@ export class FeishuConversationNode extends ConversationBridge {
     this._inTurn = false
 
     // 订阅网关入站消息事件
-    this.ctx.on('feishu/message', (event) => {
-      void this._handleInbound(event)
-    })
+    this.ctx.on('feishu/message', (event) => this._handleInbound(event))
 
     // 订阅卡片交互事件（审批按钮点击）
-    this.ctx.on('feishu/action', (event) => {
-      void this._handleAction(event)
-    })
+    this.ctx.on('feishu/action', (event) => this._handleAction(event))
 
     // 监听轮次事件：turn/start 开启流式会话，turn/end 最终刷新并重置
     this.ctx.on('session/event', (session, event) => {
@@ -106,10 +107,26 @@ export class FeishuConversationNode extends ConversationBridge {
   }
 
   async _handleInbound(event) {
-    const { peerId, senderId, isGroup, text } = event
+    const { peerId, senderId, isGroup, text, messageId, messageType, contentObj } = event
     this._lastPeer = { peerId, senderId, isGroup }
 
-    this.logger.debug?.(`[dsh-bridge feishu] handling inbound message from ${peerId} (group=${isGroup}): ${text}`)
+    let mediaFiles = []
+    if (messageType && messageType !== 'text') {
+      mediaFiles = await this._processMedia(messageId, messageType, contentObj, this.config.cwd)
+    }
+
+    if (!text && mediaFiles.length === 0) {
+      this.logger.debug?.(`[dsh-bridge feishu] ignore empty message from ${peerId}`)
+      return
+    }
+
+    let fullText = text || ''
+    if (mediaFiles.length > 0) {
+      const mediaDesc = mediaFiles.map((f) => `[文件: ${f.path}]`).join('\n')
+      fullText = fullText ? `${fullText}\n\n${mediaDesc}` : mediaDesc
+    }
+
+    this.logger.debug?.(`[dsh-bridge feishu] handling inbound message from ${peerId} (group=${isGroup}): ${fullText}`)
 
     // 如果还没有活动会话，且是首条消息，自动尝试选择最新已有会话
     if (!this.activeSessionId) {
@@ -117,14 +134,42 @@ export class FeishuConversationNode extends ConversationBridge {
     }
 
     // 转交通用 ConversationBridge 路由
-    return super.handleInbound({
+    return this.handleInbound({
       senderId: isGroup ? peerId : senderId,
       peerId,
       isGroup,
-      text,
+      text: fullText,
     })
   }
 
+  async _processMedia(messageId, messageType, contentObj = {}, sessionCwd) {
+    if (!messageId || !messageType) return []
+    const mediaDir = path.join(sessionCwd || this.config.cwd || process.cwd(), '.feishu-media')
+    try { await fs.promises.mkdir(mediaDir, { recursive: true }) } catch {}
+
+    const downloaded = []
+    const fileKey = contentObj.image_key || contentObj.file_key
+    const fileName = contentObj.file_name
+
+    if (fileKey) {
+      try {
+        const type = messageType === 'image' ? 'image' : 'file'
+        const buf = await this.gateway.downloadMessageResource({ messageId, fileKey, type })
+        if (buf && buf.length > 0) {
+          const ext = fileName ? path.extname(fileName) : (type === 'image' ? '.png' : '.bin')
+          const safeName = fileName ? path.basename(fileName) : `feishu_${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 })
+          this.logger.info?.(`[dsh-bridge feishu] downloaded media ${safeName} (${buf.length} bytes)`)
+        }
+      } catch (err) {
+        this.logger.warn?.(`[dsh-bridge feishu] download media failed: ${err.message}`)
+      }
+    }
+    return downloaded
+  }
+
   async _handleAction(event) {
     const { operatorId, value } = event
     const approvalId = Number(value.approvalId)