@wenbin_wb/dsh-bridge 2.5.5 → 2.6.1

package/docs/feishu-usage.md

@@ -96,3 +96,19 @@
 
 ![飞书对话与卡片审批](screenshots/feishu-chat.jpg)
 
+---
+
+## ❓ 常见问题 (FAQ)
+
+### Q1: 点击卡片上的「批准」/「拒绝」按钮提示无权限或无反应？
+请依次核对以下三项飞书开放平台配置：
+1. **是否订阅了卡片交互事件**：在开放平台后台 **「事件与回调」➔「事件配置」** 中，必须添加 **`card.action.trigger`**（消息卡片回传交互）事件。若只添加了接收消息事件，卡片点击不会下发回调。
+2. **是否发布了新版本生效**：飞书平台的所有权限与事件变更，**必须在「版本管理与发布」中「创建版本」并申请发布通过后才会生效**。
+3. **应用可用范围**：在「版本管理与发布」中，确认应用可用范围包含了您当前的飞书账号（建议设为「所有员工」或将自己加入可用成员）。
+4. **快速应急处理**：如果卡片按钮暂时受网络或配置影响，可直接在聊天中回复文字 **`/yes`**（或 `1`）批准，回复 **`/no`**（或 `2`）拒绝。
+
+### Q2: 机器人无法在群聊中回复消息？
+1. 确保在「权限管理」中开通了 **`im:message.group_msg`**（获取群组中所有消息）权限；
+2. 确保在「版本管理与发布」中发布了包含该权限的新版本；
+3. 将机器人拉入群聊后，需要 **`@机器人`** 唤醒并发送指令。
+

package/lib/bridge-rpc-constants.js

@@ -9,6 +9,8 @@ export const BRIDGE_ENDPOINTS = {
   startCloudflared: 'startCloudflared',
   stopCloudflared: 'stopCloudflared',
   resetCloudflared: 'resetCloudflared',
+  saveCloudflaredConfig: 'saveCloudflaredConfig',
+  setTunnelAutoStart: 'setTunnelAutoStart',
   saveCustomTunnelConfig: 'saveCustomTunnelConfig',
   checkVersion: 'checkVersion',
   upgradePlugin: 'upgradePlugin',

package/lib/bridge-rpc.js

@@ -144,6 +144,26 @@ export function installBridgeRpc(ctx, { service, authManager, wechat, platformMa
           return ok(status);
         }
 
+        if (endpoint === BRIDGE_ENDPOINTS.saveCloudflaredConfig) {
+          const adminErr = checkAdminAuth(authManager, payload);
+          if (adminErr) return adminErr;
+
+          const { token = '', hostname = '' } = payload;
+          await service.saveCloudflaredConfig({ token, hostname });
+          const status = await service.getStatus();
+          return ok(status);
+        }
+
+        if (endpoint === BRIDGE_ENDPOINTS.setTunnelAutoStart) {
+          const adminErr = checkAdminAuth(authManager, payload);
+          if (adminErr) return adminErr;
+
+          const { tunnel, autoStart } = payload;
+          await service.setTunnelAutoStart({ tunnel, autoStart });
+          const status = await service.getStatus();
+          return ok(status);
+        }
+
         if (endpoint === BRIDGE_ENDPOINTS.startCustomTunnel) {
           const adminErr = checkAdminAuth(authManager, payload);
           if (adminErr) return adminErr;

package/lib/cloudflared-manager.mjs

@@ -74,9 +74,11 @@ async function downloadFile(url, dest, onProgress) {
 }
 
 export class CloudflaredManager {
-  constructor({ port, home, onStateChange, logger }) {
+  constructor({ port, home, token, hostname, onStateChange, logger }) {
     this.port = port;
     this.home = home || join(homedir(), '.dsh-bridge');
+    this.token = token ? String(token).trim() : null;
+    this.hostname = hostname ? String(hostname).trim() : null;
     this.onStateChange = onStateChange;
     this.logger = logger;
 
@@ -152,8 +154,13 @@ export class CloudflaredManager {
 
       this._setState('connecting', '正在连接 Cloudflare...');
 
-      const args = ['tunnel', '--url', `http://127.0.0.1:${this.port}`];
-      this.logger?.info('启动 cloudflared: %s %s', this.binaryPath, args.join(' '));
+      const args = this.token
+        ? ['tunnel', 'run', '--token', this.token]
+        : ['tunnel', '--url', `http://127.0.0.1:${this.port}`];
+
+      // 隐藏日志中的 token 敏感字段
+      const safeArgs = this.token ? ['tunnel', 'run', '--token', '***'] : args;
+      this.logger?.info('启动 cloudflared: %s %s', this.binaryPath, safeArgs.join(' '));
 
       this.process = spawn(this.binaryPath, args, {
         stdio: ['ignore', 'pipe', 'pipe'],
@@ -168,13 +175,38 @@ export class CloudflaredManager {
         }
       };
 
-      // URL 同时在 stdout 和 stderr 里找（不同版本行为不同）
+      // 1. 命名/Token 隧道：通过握手日志判定就绪，使用预设固定域名
+      const parseNamedTunnel = (text) => {
+        if (!this.token) return;
+        if (
+          (text.includes('Registered tunnel') ||
+           text.includes('registered connIndex') ||
+           text.includes('Connection') && text.includes('registered') ||
+           text.includes('Updated to new configuration') ||
+           text.includes('Route propagated')) &&
+          !resolved
+        ) {
+          let fixedUrl = this.hostname
+            ? (this.hostname.startsWith('http') ? this.hostname : `https://${this.hostname}`)
+            : null;
+          this.url = fixedUrl;
+          this._setState('ready', fixedUrl ? `固定隧道已建立 (${fixedUrl})` : '固定隧道已建立');
+          this.logger?.info('cloudflared 固定隧道就绪: %s', this.url || 'Token 模式');
+          tryResolve();
+        }
+      };
+
+      // 2. 免费临时隧道：从 stdout/stderr 解析随机分配的 trycloudflare.com 域名
       const parseUrl = (text) => {
+        if (this.token) {
+          parseNamedTunnel(text);
+          return;
+        }
         const match = text.match(/https:\/\/[a-z0-9-]+\.trycloudflare\.com/);
         if (match && !resolved) {
           this.url = match[0];
-          this._setState('ready', '隧道已建立');
-          this.logger?.info('cloudflared 隧道就绪: %s', this.url);
+          this._setState('ready', '临时隧道已建立');
+          this.logger?.info('cloudflared 临时隧道就绪: %s', this.url);
           tryResolve();
         }
       };
@@ -185,7 +217,7 @@ export class CloudflaredManager {
         this.logger?.debug('cloudflared: %s', text.trim());
         parseUrl(text);
         if (text.includes('Registered tunnel') && !resolved) {
-          this._setState('connecting', '隧道已注册，等待 URL...');
+          this._setState('connecting', '隧道已注册，等待就绪...');
         }
       });
 

package/lib/index.js

@@ -108,10 +108,52 @@ class QrCache {
 }
 
 /**
- * 非安全上下文（http://LAN-IP:端口）里浏览器没有 crypto.randomUUID，
- * DSH 连接层 mint RPC id 时会抛错，注入 polyfill 修复。
+ * PWA Web App Manifest 与 App 启动图标
  */
-const RANDOM_UUID_POLYFILL = `<script data-dsh-bridge-polyfill="1">!function(){try{if(self.crypto&&!self.crypto.randomUUID){self.crypto.randomUUID=function(){var b=new Uint8Array(16);self.crypto.getRandomValues(b);b[6]=b[6]&15|64;b[8]=b[8]&63|128;var h="";for(var i=0;i<16;i++){var x=b[i].toString(16);h+=(x.length<2?"0":"")+x;if(i===3||i===5||i===7||i===9)h+="-";}return h;}}}catch(e){}}();</script>`;
+const PWA_MANIFEST = JSON.stringify({
+  name: 'DeepSeek Harness',
+  short_name: 'DSH',
+  description: 'DeepSeek Harness Remote & Mobile Workspace',
+  start_url: '/',
+  display: 'standalone',
+  background_color: '#181825',
+  theme_color: '#1e1e2e',
+  orientation: 'any',
+  icons: [
+    {
+      src: '/__dsh_bridge__/pwa-icon.svg',
+      sizes: 'any',
+      type: 'image/svg+xml',
+      purpose: 'any maskable'
+    }
+  ]
+}, null, 2);
+
+const PWA_ICON_SVG = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
+  <defs>
+    <linearGradient id="g" x1="0%" y1="0%" x2="100%" y2="100%">
+      <stop offset="0%" stop-color="#4f6ef7"/>
+      <stop offset="100%" stop-color="#24388a"/>
+    </linearGradient>
+  </defs>
+  <rect width="512" height="512" rx="128" fill="url(#g)"/>
+  <path d="M150 170 C150 140, 362 140, 362 170 L362 330 C362 360, 150 360, 150 330 Z" fill="#ffffff" fill-opacity="0.12"/>
+  <circle cx="206" cy="220" r="28" fill="#ffffff"/>
+  <circle cx="306" cy="220" r="28" fill="#ffffff"/>
+  <path d="M200 290 Q256 340 312 290" stroke="#ffffff" stroke-width="24" stroke-linecap="round" fill="none"/>
+  <rect x="236" y="90" width="40" height="60" rx="10" fill="#ffffff"/>
+  <circle cx="256" cy="80" r="16" fill="#4f6ef7"/>
+</svg>`;
+
+const HTML_HEAD_INJECTIONS = `<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
+<meta name="apple-mobile-web-app-title" content="DSH">
+<meta name="theme-color" content="#1e1e2e">
+<link rel="manifest" href="/manifest.webmanifest">
+<link rel="icon" type="image/svg+xml" href="/__dsh_bridge__/pwa-icon.svg">
+<link rel="apple-touch-icon" href="/__dsh_bridge__/pwa-icon.svg">
+<script data-dsh-bridge-polyfill="1">!function(){try{if(self.crypto&&!self.crypto.randomUUID){self.crypto.randomUUID=function(){var b=new Uint8Array(16);self.crypto.getRandomValues(b);b[6]=b[6]&15|64;b[8]=b[8]&63|128;var h="";for(var i=0;i<16;i++){var x=b[i].toString(16);h+=(x.length<2?"0":"")+x;if(i===3||i===5||i===7||i===9)h+="-";}return h;}}}catch(e){}}();</script>`;
 const INJECT_MARK = 'data-dsh-bridge-polyfill="1"';
 
 function isCompressed(headers) {
@@ -150,6 +192,18 @@ class ProxyServer {
     this.server = createServer((req, res) => {
       const pathname = (req.url || '/').split('?')[0].replace(/\/+$/, '') || '/';
 
+      // 0. PWA Web App Manifest 与 App 图标支持
+      if (pathname === '/manifest.webmanifest' || pathname === '/manifest.json') {
+        res.writeHead(200, { 'Content-Type': 'application/manifest+json; charset=utf-8', 'Access-Control-Allow-Origin': '*' });
+        res.end(PWA_MANIFEST);
+        return;
+      }
+      if (pathname === '/__dsh_bridge__/pwa-icon.svg' || pathname === '/apple-touch-icon.png') {
+        res.writeHead(200, { 'Content-Type': 'image/svg+xml; charset=utf-8', 'Access-Control-Allow-Origin': '*' });
+        res.end(PWA_ICON_SVG);
+        return;
+      }
+
       // 1. 处理登录 API: POST /__dsh_bridge__/login
       if (pathname === '/__dsh_bridge__/login' && req.method === 'POST') {
         const chunks = [];
@@ -289,7 +343,7 @@ class ProxyServer {
             proxyRes.on('end', () => {
               let html = Buffer.concat(chunks).toString('utf8');
               if (!html.includes(INJECT_MARK)) {
-                html = html.replace(/<head[^>]*>/i, (m) => `${m}${RANDOM_UUID_POLYFILL}`);
+                html = html.replace(/<head[^>]*>/i, (m) => `${m}${HTML_HEAD_INJECTIONS}`);
               }
               const out = Buffer.from(html, 'utf8');
               const outHeaders = { ...proxyRes.headers };
@@ -398,12 +452,14 @@ class ProxyServer {
  * Bridge Service
  */
 class BridgeService {
-  constructor({ dshPort, proxyPort, home, customTunnelConfig, authManager, logger }) {
+  constructor({ dshPort, proxyPort, home, cloudflaredConfig, customTunnelConfig, authManager, onPersist, logger }) {
     this.dshPort = dshPort;
     this.proxyPort = proxyPort;
     this.home = home;
+    this.cloudflaredConfig = cloudflaredConfig ?? { token: '', hostname: '', autoStart: false };
     this.customTunnelConfig = customTunnelConfig ?? null;
     this.authManager = authManager ?? null;
+    this.onPersist = onPersist ?? null;
     this.logger = logger;
 
     this.qrCache = new QrCache();
@@ -485,6 +541,10 @@ class BridgeService {
           ? await this.qrCache.get(cloudflaredUrl)
           : null,
         state: this.cloudflaredState,
+        tokenConfigured: !!this.cloudflaredConfig?.token,
+        token: adminAuthValid ? (this.cloudflaredConfig?.token || '') : (this.cloudflaredConfig?.token ? '******' : ''),
+        hostname: this.cloudflaredConfig?.hostname || '',
+        autoStart: Boolean(this.cloudflaredConfig?.autoStart),
       },
 
       customTunnel: {
@@ -497,6 +557,7 @@ class BridgeService {
           ? await this.qrCache.get(customUrl)
           : null,
         state: this.customTunnelState,
+        autoStart: Boolean(this.customTunnelConfig?.autoStart),
       },
 
       // 轻量摘要，供 UI Tab 状态点使用（完整状态由 wechatGetStatus 提供）
@@ -504,7 +565,33 @@ class BridgeService {
     };
   }
 
-  async startCustomTunnel() {
+  async saveCloudflaredConfig({ token, hostname }) {
+    this.cloudflaredConfig = {
+      ...(this.cloudflaredConfig ?? {}),
+      token: token ? String(token).trim() : '',
+      hostname: hostname ? String(hostname).trim() : '',
+    };
+    await this.onPersist?.({ cloudflared: this.cloudflaredConfig });
+  }
+
+  async setTunnelAutoStart({ tunnel, autoStart }) {
+    const isAuto = Boolean(autoStart);
+    if (tunnel === 'cloudflared') {
+      this.cloudflaredConfig = {
+        ...(this.cloudflaredConfig ?? {}),
+        autoStart: isAuto,
+      };
+      await this.onPersist?.({ cloudflared: this.cloudflaredConfig });
+    } else if (tunnel === 'customTunnel' || tunnel === 'custom') {
+      this.customTunnelConfig = {
+        ...(this.customTunnelConfig ?? {}),
+        autoStart: isAuto,
+      };
+      await this.onPersist?.({ customTunnel: this.customTunnelConfig });
+    }
+  }
+
+  async startCustomTunnel({ autoStart = true } = {}) {
     if (this.customTunnel) {
       throw new Error('自建隧道已在运行');
     }
@@ -513,9 +600,15 @@ class BridgeService {
     const accessToken = this.customTunnelConfig?.accessToken;
 
     if (!serverUrl || !accessToken) {
-      throw new Error('缺少配置：请在 cordis.yml 中配置 customTunnel.serverUrl 和 customTunnel.accessToken');
+      throw new Error('缺少配置：请在控制台配置 customTunnel.serverUrl 和 customTunnel.accessToken');
     }
 
+    this.customTunnelConfig = {
+      ...(this.customTunnelConfig ?? {}),
+      autoStart: Boolean(autoStart),
+    };
+    await this.onPersist?.({ customTunnel: this.customTunnelConfig });
+
     this.customTunnel = new CustomTunnelClient({
       serverUrl,
       accessToken,
@@ -530,23 +623,36 @@ class BridgeService {
     await this.customTunnel.connect();
   }
 
-  stopCustomTunnel() {
+  async stopCustomTunnel() {
     if (this.customTunnel) {
       this.customTunnel.disconnect();
       this.customTunnel = null;
       this.customTunnelState = { phase: 'idle', detail: '' };
     }
+    this.customTunnelConfig = {
+      ...(this.customTunnelConfig ?? {}),
+      autoStart: false,
+    };
+    await this.onPersist?.({ customTunnel: this.customTunnelConfig });
   }
 
-  async startCloudflared() {
+  async startCloudflared({ autoStart = true } = {}) {
     if (this.cloudflared) {
       throw new Error('Cloudflare 隧道已在运行');
     }
 
+    this.cloudflaredConfig = {
+      ...(this.cloudflaredConfig ?? {}),
+      autoStart: Boolean(autoStart),
+    };
+    await this.onPersist?.({ cloudflared: this.cloudflaredConfig });
+
     this.cloudflaredState = { phase: 'connecting', detail: '正在初始化...' };
     this.cloudflared = new CloudflaredManager({
       port: this.proxyPort,
       home: this.home,
+      token: this.cloudflaredConfig?.token,
+      hostname: this.cloudflaredConfig?.hostname,
       onStateChange: (state) => {
         this.cloudflaredState = state;
         // 出错时自动清理，让用户可以重新开启
@@ -561,17 +667,22 @@ class BridgeService {
     this.cloudflared.start();
   }
 
-  stopCloudflared() {
+  async stopCloudflared() {
     if (this.cloudflared) {
       this.cloudflared.stop();
       this.cloudflared = null;
       this.cloudflaredState = { phase: 'idle', detail: '' };
     }
+    this.cloudflaredConfig = {
+      ...(this.cloudflaredConfig ?? {}),
+      autoStart: false,
+    };
+    await this.onPersist?.({ cloudflared: this.cloudflaredConfig });
   }
 
   // 重置 Cloudflare 隧道：关闭隧道 + 删除已下载的 cloudflared 二进制
   async resetCloudflared() {
-    this.stopCloudflared();
+    await this.stopCloudflared();
     const binDir = join(this.home ?? join(homedir(), '.dsh-bridge'), 'bin');
     const candidates = ['cloudflared.exe', 'cloudflared'];
     for (const name of candidates) {
@@ -584,14 +695,17 @@ class BridgeService {
   // 检查 npm 上是否有新版本（优先国内高速镜像 npmmirror，降级 npmjs 官方源）
   async checkVersion() {
     const fetchRegistry = (url, timeoutMs = 4000) => new Promise((resolve, reject) => {
-      const req = httpsGet(url, { timeout: timeoutMs }, (res) => {
+      const req = httpsGet(url, { timeout: timeoutMs, headers: { 'User-Agent': 'dsh-bridge' } }, (res) => {
         if (res.statusCode !== 200) return reject(new Error(`HTTP ${res.statusCode}`));
         const chunks = [];
         res.on('data', (c) => chunks.push(c));
         res.on('end', () => {
           try {
             const data = JSON.parse(Buffer.concat(chunks).toString());
-            resolve(data.version ?? null);
+            resolve({
+              version: data.version ?? null,
+              releaseNotes: data.releaseNotes ?? data.description ?? null,
+            });
           } catch (e) {
             reject(e);
           }
@@ -602,9 +716,13 @@ class BridgeService {
     });
 
     try {
-      const latest = await fetchRegistry('https://registry.npmmirror.com/@wenbin_wb/dsh-bridge/latest', 3500)
+      const latestData = await fetchRegistry('https://registry.npmmirror.com/@wenbin_wb/dsh-bridge/latest', 3500)
         .catch(() => fetchRegistry('https://registry.npmjs.org/@wenbin_wb/dsh-bridge/latest', 5000));
-      return { current: VERSION, latest: latest ?? null };
+      return {
+        current: VERSION,
+        latest: latestData?.version ?? null,
+        releaseNotes: latestData?.releaseNotes ?? null,
+      };
     } catch (e) {
       return { current: VERSION, latest: null, error: e.message ?? '检查失败' };
     }
@@ -774,15 +892,38 @@ function apply(ctx, config = {}) {
     proxyPort,
     home: config.home,
     customTunnelConfig: config.customTunnel ?? null,
+    cloudflaredConfig: config.cloudflared ?? null,
     authManager,
+    onPersist: async (patch) => {
+      const stored = await loadConfig();
+      Object.assign(stored, patch);
+      await saveConfig(stored);
+    },
     logger,
   });
 
-  // 启动时读取已保存的自建隧道配置
-  loadConfig().then((stored) => {
-    if (stored?.customTunnel?.serverUrl) {
+  // 启动时读取已保存的公网隧道配置并按需自动拉起
+  loadConfig().then(async (stored) => {
+    if (stored?.cloudflared) {
+      service.cloudflaredConfig = stored.cloudflared;
+      logger.info('dsh-bridge: loaded saved cloudflared config (autoStart=%s, tokenConfigured=%s)', Boolean(service.cloudflaredConfig.autoStart), Boolean(service.cloudflaredConfig.token));
+      if (service.cloudflaredConfig.autoStart) {
+        logger.info('dsh-bridge: auto-starting cloudflared tunnel...');
+        service.startCloudflared({ autoStart: true }).catch((err) => {
+          logger.error('dsh-bridge: cloudflared auto-start failed: %s', err?.message ?? err);
+        });
+      }
+    }
+
+    if (stored?.customTunnel) {
       service.customTunnelConfig = stored.customTunnel;
-      logger.info('dsh-bridge: loaded saved custom tunnel config');
+      logger.info('dsh-bridge: loaded saved custom tunnel config (autoStart=%s)', Boolean(service.customTunnelConfig.autoStart));
+      if (service.customTunnelConfig.autoStart && service.customTunnelConfig.serverUrl) {
+        logger.info('dsh-bridge: auto-starting custom tunnel...');
+        service.startCustomTunnel({ autoStart: true }).catch((err) => {
+          logger.error('dsh-bridge: custom tunnel auto-start failed: %s', err?.message ?? err);
+        });
+      }
     }
   }).catch(() => {});
 

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@wenbin_wb/dsh-bridge",
-  "version": "2.5.5",
+  "version": "2.6.1",
   "description": "手机扫码即可在移动端/公网继续用 DeepSeek Harness，人不在电脑前也能接着干。一键局域网二维码、Cloudflare 公网隧道、自建隧道与微信 / QQ / 飞书 / Telegram Bot（多工作区/会话持久化/媒体/卡片审批/流式输出），无需自己搭公网服务器。",
+  "releaseNotes": "【v2.6.1 公网隧道自启与固定域名】\n• 🔄 支持公网隧道（Cloudflare/自建）开机自启与重启状态记忆\n• 🌐 支持 Cloudflare 命名隧道（Token 模式），永久固定专属域名永不变更\n• ⚙️ 控制台新增「随 DSH 启动自动开启」开关与高级 Token 配置",
   "type": "module",
   "main": "lib/index.js",
   "exports": {