@wenbin_wb/dsh-bridge 2.2.9 → 2.3.0

package/lib/feishu/node.js

@@ -0,0 +1,351 @@
+// dsh-bridge Feishu / Lark conversation node
+// 把飞书 OpenAPI / WebSocket 长连接入站事件解析后交给平台无关的
+// ConversationBridge 处理，出站通过 FeishuGateway 发送文本 / 卡片。
+
+import { ConversationBridge, conversationBridgeHelpers } from '../platform/conversation-bridge.js'
+
+function makePlatform(gateway) {
+  return {
+    id: 'feishu',
+    name: 'Feishu / Lark',
+    capabilities: { supportsGroup: true, group: true, media: true, approvals: true },
+    async sendText(peerId, text, opts = {}) {
+      return gateway?.sendMarkdownCard(peerId, text, opts)
+    },
+    async sendTyping() {},
+    dispose() {},
+  }
+}
+
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms))
+}
+
+function splitIntoIncremental(content, maxChunk = 150) {
+  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 > 30) {
+    const step = Math.max(20, Math.floor(content.length / 4))
+    chunks.length = 0
+    for (let i = 0; i < content.length; i += step) {
+      chunks.push(content.slice(i, Math.min(i + step, content.length)))
+    }
+  }
+  const slices = []
+  let acc = ''
+  for (const s of chunks) {
+    acc += s
+    slices.push(acc)
+  }
+  return slices
+}
+
+export class FeishuConversationNode extends ConversationBridge {
+  constructor(ctx, config, logger, { onFirstSender, onActiveSessionChange } = {}) {
+    super({
+      ctx,
+      logger,
+      config,
+      platform: makePlatform(ctx.feishu),
+      onFirstSender,
+      onActiveSessionChange,
+    })
+    this.gateway = ctx.feishu
+    this._lastPeer = null // { peerId, senderId, isGroup }
+    this._streamCardId = null // 当前轮次的流式卡片 message_id
+    this._streamContent = ''  // 当前轮次流式卡片的内容
+    this._patchTimer = null   // 节流定时器
+    this._inTurn = false
+
+    // 订阅网关入站消息事件
+    this.ctx.on('feishu/message', (event) => {
+      void this._handleInbound(event)
+    })
+
+    // 订阅卡片交互事件（审批按钮点击）
+    this.ctx.on('feishu/action', (event) => {
+      void this._handleAction(event)
+    })
+
+    // 监听轮次事件：turn/start 开启流式会话，turn/end 最终刷新并重置
+    this.ctx.on('session/event', (session, event) => {
+      if (session.id !== this.activeSessionId) return
+      if (event.type === 'turn/start') {
+        this._inTurn = true
+        this._streamCardId = null
+        this._streamContent = ''
+        if (this._patchTimer) {
+          clearTimeout(this._patchTimer)
+          this._patchTimer = null
+        }
+      } else if (event.type === 'turn/end') {
+        this._inTurn = false
+        if (this._patchTimer) {
+          clearTimeout(this._patchTimer)
+          this._patchTimer = null
+        }
+        if (this._streamCardId && this._streamContent) {
+          void this.gateway.patchCard(this._streamCardId, this._streamContent).catch(() => {})
+        }
+        this._streamCardId = null
+        this._streamContent = ''
+      }
+    })
+  }
+
+  async _handleInbound(event) {
+    const { peerId, senderId, isGroup, text } = event
+    this._lastPeer = { peerId, senderId, isGroup }
+
+    this.logger.debug?.(`[dsh-bridge feishu] handling inbound message from ${peerId} (group=${isGroup}): ${text}`)
+
+    // 如果还没有活动会话，且是首条消息，自动尝试选择最新已有会话
+    if (!this.activeSessionId) {
+      await this._pickDefaultSession().catch(() => {})
+    }
+
+    // 转交通用 ConversationBridge 路由
+    return super.handleInbound({
+      senderId: isGroup ? peerId : senderId,
+      peerId,
+      isGroup,
+      text,
+    })
+  }
+
+  async _handleAction(event) {
+    const { operatorId, value } = event
+    const approvalId = Number(value.approvalId)
+    const action = value.action
+
+    if (approvalId && (action === 'approve' || action === 'reject')) {
+      const outcome = action === 'approve' ? 'allowed-once' : 'rejected'
+      const pending = this.pending.get(approvalId)
+      if (pending) {
+        this.clearApproval(approvalId)
+        pending.resolve(outcome)
+      }
+    }
+  }
+
+  async sendText(text) {
+    const peerId = this._lastPeer?.peerId || this.peerId
+    if (!peerId) return
+    const isGroup = this._lastPeer?.isGroup ?? (peerId.startsWith('oc_') || peerId.startsWith('chat_'))
+    const content = String(text || '').trim()
+    if (!content) return
+
+    // 如果处于 Agent 生成轮次中（turn 期间）：流式打字机逐段增量更新
+    if (this._inTurn) {
+      const maxChunk = 150
+      const slices = splitIntoIncremental(content, maxChunk)
+      const delayMs = Math.min(Math.max(this.config.sendChunkDelayMs ?? 200, 100), 1000)
+
+      if (!this._streamCardId) {
+        // 首片：创建卡片并记录 message_id
+        const firstSlice = slices[0] || content
+        try {
+          const res = await this.gateway.sendMarkdownCard(peerId, firstSlice, { isGroup })
+          this._streamCardId = res?.message_id || null
+          this._streamContent = firstSlice
+        } catch (err) {
+          this.logger.warn?.('[dsh-bridge feishu] sendMarkdownCard failed, fallback to sendText:', err?.message ?? err)
+          await this.gateway.sendText(peerId, content, { isGroup })
+          return
+        }
+
+        // 后续片依次 patchCard（间隔 delayMs，呈现真实打字机流式效果）
+        for (let i = 1; i < slices.length; i++) {
+          await sleep(delayMs)
+          this._streamContent = slices[i]
+          if (this._streamCardId) {
+            await this.gateway.patchCard(this._streamCardId, this._streamContent).catch(() => {})
+          }
+        }
+      } else {
+        // 如果卡片已存在（同轮次后续输出）：更新到最终内容
+        this._streamContent = content
+        await this.gateway.patchCard(this._streamCardId, this._streamContent).catch(() => {})
+      }
+      return
+    }
+
+    // 非 turn 期间（指令响应、系统提示、单条通知等）：以完整单张卡片直接发送，杜绝碎片拆分
+    try {
+      if (content.length <= 25000) {
+        await this.gateway.sendMarkdownCard(peerId, content, { isGroup })
+      } else {
+        const chunks = conversationBridgeHelpers.splitForIM(content, 20000)
+        for (const chunk of chunks) {
+          await this.gateway.sendMarkdownCard(peerId, chunk, { isGroup })
+        }
+      }
+    } catch (err) {
+      this.logger.warn?.('[dsh-bridge feishu] sendMarkdownCard failed, fallback to plain text:', err?.message ?? err)
+      await this.gateway.sendText(peerId, content, { isGroup })
+    }
+  }
+
+  // ---- 飞书专属卡片审批桥 ----
+
+  _attachApprovalBridge() {
+    const listener = async (req, next) => {
+      if (!this.ownsAgent(req.agent)) return next?.()
+      const peer = this._lastPeer
+      if (!peer?.peerId) return next?.()
+
+      const number = this.nextApprovalNumber()
+      const timeoutSec = this.config.approvalTimeoutSec || 600
+      const timeoutMin = Math.max(1, Math.round(timeoutSec / 60))
+
+      // 构建飞书原生交互卡片 (JSON 2.0)
+      const card = {
+        schema: '2.0',
+        header: {
+          title: {
+            tag: 'plain_text',
+            content: `⚠️ 操作权限确认 (#${number})`,
+          },
+          template: 'orange',
+        },
+        body: {
+          elements: [
+            {
+              tag: 'markdown',
+              content: [
+                `| 项目 | 详情 |`,
+                `| :--- | :--- |`,
+                `| **调用工具** | \`${req.toolName}\` |`,
+                ...(req.reason ? [`| **申请原因** | ${String(req.reason).replace(/\|/g, '｜')} |`] : []),
+                `| **等待超时** | ${timeoutMin} 分钟 (超时自动拒绝) |`,
+              ].join('\n'),
+            },
+            {
+              tag: 'column_set',
+              flex_mode: 'flow',
+              columns: [
+                {
+                  tag: 'column',
+                  width: 'auto',
+                  elements: [
+                    {
+                      tag: 'button',
+                      text: {
+                        tag: 'plain_text',
+                        content: '✓ 批准执行',
+                      },
+                      type: 'primary',
+                      value: {
+                        action: 'approve',
+                        approvalId: number,
+                      },
+                    },
+                  ],
+                },
+                {
+                  tag: 'column',
+                  width: 'auto',
+                  elements: [
+                    {
+                      tag: 'button',
+                      text: {
+                        tag: 'plain_text',
+                        content: '✕ 拒绝执行',
+                      },
+                      type: 'danger',
+                      value: {
+                        action: 'reject',
+                        approvalId: number,
+                      },
+                    },
+                  ],
+                },
+              ],
+            },
+          ],
+        },
+      }
+
+      // 发送飞书卡片
+      try {
+        await this.gateway.sendCard(peer.peerId, card, { isGroup: peer.isGroup })
+      } catch (err) {
+        // 卡片发送失败降级发送 Markdown
+        const textFallback = [
+          `## ⚠️ 操作权限确认 (#${number})`,
+          '',
+          `| 项目 | 详情 |`,
+          `| :--- | :--- |`,
+          `| **调用工具** | \`${req.toolName}\` |`,
+          ...(req.reason ? [`| **申请原因** | ${String(req.reason).replace(/\|/g, '｜')} |`] : []),
+          `| **等待超时** | ${timeoutMin} 分钟 (超时自动拒绝) |`,
+          '',
+          `> 回复 \`/yes\` (或 \`1\`) 批准执行`,
+          `> 回复 \`/no\` (或 \`2\`) 拒绝执行`,
+        ].join('\n')
+        void this.gateway.sendMarkdownCard(peer.peerId, textFallback, { isGroup: peer.isGroup })
+      }
+
+      // 同时调用 downstream next()，使 Web UI 原生弹窗也能同步显示并支持直接操作
+      let nextPromise = null
+      if (typeof next === 'function') {
+        try {
+          const res = next()
+          if (res && typeof res.then === 'function') {
+            nextPromise = res
+          }
+        } catch {}
+      }
+
+      let timeoutFired = false
+      let winner = 'feishu'
+      const feishuPromise = new Promise((resolve) => {
+        const timer = setTimeout(() => {
+          timeoutFired = true
+          this.clearApproval(number)
+          resolve('rejected')
+        }, timeoutSec * 1000)
+        if (typeof timer.unref === 'function') timer.unref()
+        this.registerApproval(number, { number, request: req, resolve, timer })
+      })
+
+      const outcome = await (nextPromise
+        ? Promise.race([
+            feishuPromise.then(res => { winner = 'feishu'; return res }),
+            nextPromise.then(res => { winner = 'web'; return res }),
+          ])
+        : feishuPromise)
+
+      // 如果 Web 端先决议，清除飞书端 pending 记录
+      if (winner === 'web') {
+        this.clearApproval(number)
+      }
+
+      if (!timeoutFired) {
+        const sourceHint = winner === 'web' ? '（Web 端操作）' : ''
+        const label = outcome === 'allowed-once' ? `✓ **已批准执行**${sourceHint}` : outcome === 'rejected' ? `❌ **已拒绝执行**${sourceHint}` : `**[${outcome}]**`
+        void this.gateway.sendMarkdownCard(peer.peerId, `${label}（#${number}）`, { isGroup: peer.isGroup })
+      }
+      return outcome
+    }
+
+    const disposer = this.ctx.on('approval/request', listener)
+    this.disposers.push(disposer)
+  }
+}
+
+export const feishuNodeHelpers = {
+  makePlatform,
+}

package/lib/index.js

@@ -20,6 +20,7 @@ import { CloudflaredManager } from './cloudflared-manager.mjs';
 import { PlatformManager } from './platform/manager.js';
 import { WechatService } from './wechat/index.js';
 import { QqService } from './qq/index.js';
+import { FeishuService } from './feishu/index.js';
 
 const name = 'dsh-bridge';
 // 微信 Bot 会话桥依赖 DSH 提供的会话/agent/审批/工作区/持久化服务，需显式 inject
@@ -555,6 +556,19 @@ function apply(ctx, config = {}) {
   });
   platformManager.register(qq);
 
+  // 飞书 Bot（官方 OpenAPI / WebSocket 长连接）—— 作为 Platform 子类注册进平台管理器
+  const feishu = new FeishuService({
+    ctx,
+    logger,
+    config: config.feishu ?? {},
+    onPersist: async (patch) => {
+      const stored = await loadConfig();
+      stored.feishu = { ...(stored.feishu ?? {}), ...patch };
+      await saveConfig(stored);
+    },
+  });
+  platformManager.register(feishu);
+
   // 启动时读取已保存的微信 Bot 配置（凭证 + 白名单 + 活动会话）
   loadConfig().then(async (stored) => {
     if (stored?.wechat) {
@@ -632,10 +646,46 @@ function apply(ctx, config = {}) {
     }
   }).catch(() => {});
 
+  // 启动时读取已保存的飞书 Bot 配置（凭证 + 白名单 + 活动会话）
+  loadConfig().then(async (stored) => {
+    if (stored?.feishu) {
+      const cfg = stored.feishu;
+      feishu.node.config.allowFrom = Array.isArray(cfg.allowFrom) ? cfg.allowFrom : [];
+
+      feishu.node._restoringConfig = (async () => {
+        try {
+          if (cfg.activeSessionId) {
+            feishu.node.activeSessionId = cfg.activeSessionId;
+            logger.info('dsh-bridge: restored feishu active session: %s', cfg.activeSessionId);
+          } else {
+            await feishu.node._pickDefaultSession().catch(() => {});
+          }
+        } finally {
+          feishu.node._configRestored = true;
+        }
+      })();
+
+      await feishu.node._restoringConfig;
+
+      if (cfg.appId && cfg.appSecret) {
+        feishu.gateway.updateConfig({
+          appId: cfg.appId,
+          appSecret: cfg.appSecret,
+          domain: cfg.domain || 'feishu',
+        });
+        logger.info('dsh-bridge: loaded saved feishu bot config, starting gateway');
+        await feishu.start().catch((err) => {
+          logger.error('dsh-bridge: feishu auto-start failed: %s', err?.message ?? err);
+        });
+      }
+    }
+  }).catch(() => {});
+
   const disposeRpc = installBridgeRpc(ctx, {
     service,
     wechat,
     qq,
+    feishu,
     platformManager,
     logger,
     saveCustomTunnelConfig: async (serverUrl, accessToken) => {

package/lib/platform/conversation-bridge.js

@@ -626,9 +626,9 @@ export class ConversationBridge {
 
   _attachApprovalBridge() {
     const listener = async (req, next) => {
-      if (!this.ownsAgent(req.agent)) return next()
+      if (!this.ownsAgent(req.agent)) return next?.()
       const peer = this.peerId
-      if (!peer) return next()
+      if (!peer) return next?.()
 
       const number = this.nextApprovalNumber()
       const timeoutSec = this.config.approvalTimeoutSec
@@ -648,8 +648,20 @@ export class ConversationBridge {
 
       void this.sendText(prompt)
 
+      // 同时调用 downstream next()，使 Web UI 原生弹窗也能同步显示并支持直接操作
+      let nextPromise = null
+      if (typeof next === 'function') {
+        try {
+          const res = next()
+          if (res && typeof res.then === 'function') {
+            nextPromise = res
+          }
+        } catch {}
+      }
+
       let timeoutFired = false
-      const outcome = await new Promise((resolve) => {
+      let winner = 'im'
+      const imPromise = new Promise((resolve) => {
         const timer = setTimeout(() => {
           timeoutFired = true
           this.clearApproval(number)
@@ -659,9 +671,22 @@ export class ConversationBridge {
         this.registerApproval(number, { number, request: req, resolve, timer })
       })
 
+      const outcome = await (nextPromise
+        ? Promise.race([
+            imPromise.then(res => { winner = 'im'; return res }),
+            nextPromise.then(res => { winner = 'web'; return res }),
+          ])
+        : imPromise)
+
+      // 如果 Web 端先决议，清除 IM 端 pending 记录
+      if (winner === 'web') {
+        this.clearApproval(number)
+      }
+
       // 仅在非超时路径发送确认消息（超时时 resolve 已经发生在 timer 回调）
       if (!timeoutFired) {
-        const label = outcome === 'allowed-once' ? '✓ **已批准执行**' : outcome === 'rejected' ? '❌ **已拒绝执行**' : `**[${outcome}]**`
+        const sourceHint = winner === 'web' ? '（Web 端操作）' : ''
+        const label = outcome === 'allowed-once' ? `✓ **已批准执行**${sourceHint}` : outcome === 'rejected' ? `❌ **已拒绝执行**${sourceHint}` : `**[${outcome}]**`
         void this.sendText(`${label}（#${number}）`)
       }
       return outcome

package/lib/qq/gateway.js

@@ -245,7 +245,7 @@ export class QqGateway extends Service {
         if (this.ws === ws) this.ws = null
         error ? reject(error) : resolve()
       }
-      ws.on('open', () => this.logger?.info?.('[dsh-bridge qq] gateway connected'))
+      ws.on('open', () => this.logger?.info?.('[dsh-bridge qq] WebSocket connected to QQ Open Platform'))
       ws.on('message', (raw) => {
         let payload
         try { payload = JSON.parse(String(raw)) } catch { return }

package/lib/wechat/gateway.js

@@ -736,6 +736,9 @@ export class WechatGateway extends Service {
 
         consecutiveFailures = 0
         if (batch.syncBuf) this.syncBuf = batch.syncBuf
+        if (this.statusValue !== 'connected') {
+          this.logger?.info?.('[dsh-bridge wechat] connected to iLink platform')
+        }
         this.setStatus('connected')
         for (const message of batch.messages) {
           this.dispatchInbound(message)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wenbin_wb/dsh-bridge",
-  "version": "2.2.9",
-  "description": "手机扫码即可在移动端/公网继续用 DeepSeek Harness，人不在电脑前也能接着干。一键局域网二维码、Cloudflare 公网隧道、自建隧道与微信 Bot（多工作区/会话持久化/媒体/审批），无需自己搭公网服务器。",
+  "version": "2.3.0",
+  "description": "手机扫码即可在移动端/公网继续用 DeepSeek Harness，人不在电脑前也能接着干。一键局域网二维码、Cloudflare 公网隧道、自建隧道与微信 / QQ / 飞书 Bot（多工作区/会话持久化/媒体/卡片审批/流式输出），无需自己搭公网服务器。",
   "type": "module",
   "main": "lib/index.js",
   "exports": {
@@ -21,13 +21,15 @@
     "docs/banner.jpg",
     "docs/custom-tunnel.md",
     "docs/wechat-usage.md",
-    "docs/qq-usage.md"
+    "docs/qq-usage.md",
+    "docs/feishu-usage.md"
   ],
   "scripts": {
     "build:client": "node client/build.mjs",
     "test": "node --test test/*.test.mjs"
   },
   "dependencies": {
+    "@larksuiteoapi/node-sdk": "^1.73.0",
     "qrcode": "^1.5.3",
     "ws": "^8.18.0",
     "@deepseek-ai/dsh-llm": "0.1.0-rc.6"