@wenbin_wb/dsh-bridge 2.10.9 → 2.10.11

package/lib/restart-helper.mjs

@@ -0,0 +1,101 @@
+// 无托管器场景下的 DSH 重启助手（由 BridgeService.restartDsh 派生为独立进程）。
+//
+// 为什么需要它：旧进程调用 process.exit(0) 后，端口不会立刻释放；若新进程马上启动，
+// 很容易撞上 EADDRINUSE 然后无声退出（stdio 被 ignore 时连报错都看不到），
+// 结果就是"点了重启，dsh 再也没起来"。本助手按顺序做三件事并把过程写进日志：
+//   1. 等旧进程真正退出；
+//   2. 等端口释放（能连上说明还被占着）；
+//   3. 才派生新的 dsh，并在最长 120s 内确认端口可连接；失败则记日志并以非 0 退出。
+//
+// 用法（由 lib/index.js 组装 payload）：node restart-helper.mjs '<json>'
+import { spawn } from 'node:child_process';
+import { appendFileSync, openSync } from 'node:fs';
+import { connect } from 'node:net';
+
+const payload = JSON.parse(process.argv[2] ?? '{}');
+const {
+  pid, port, argv, cwd, execPath, logFile, childLog,
+  // 超时可注入（单测用），生产用默认值
+  waitTimeoutMs = 30_000,
+  readyTimeoutMs = 120_000,
+} = payload;
+const startedAt = Date.now();
+
+function log(message) {
+  try { appendFileSync(logFile, `[${new Date().toISOString()}] [helper] ${message}\n`); } catch { /* 日志不可写时忽略 */ }
+}
+
+const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+
+function processAlive(targetPid) {
+  try {
+    process.kill(targetPid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+/** 端口上是否有人在监听（能建立连接即视为被占用） */
+async function portAccepts(portNumber) {
+  return await new Promise((resolve) => {
+    let settled = false;
+    const done = (value) => { if (!settled) { settled = true; resolve(value); } };
+    let socket;
+    try {
+      socket = connect({ host: '127.0.0.1', port: portNumber });
+    } catch {
+      done(false);
+      return;
+    }
+    socket.setTimeout(1200);
+    socket.once('connect', () => { done(true); socket.destroy(); });
+    socket.once('timeout', () => { done(false); socket.destroy(); });
+    socket.once('error', () => { done(false); socket.destroy(); });
+  });
+}
+
+async function waitUntil(check, timeoutMs, label) {
+  const deadline = Date.now() + timeoutMs;
+  for (;;) {
+    if (await check()) return true;
+    if (Date.now() >= deadline) {
+      log(`等待超时：${label}（${timeoutMs}ms）`);
+      return false;
+    }
+    await sleep(400);
+  }
+}
+
+async function main() {
+  log(`启动：oldPid=${pid} port=${port} cwd=${cwd}`);
+
+  if (!(await waitUntil(() => !processAlive(pid), waitTimeoutMs, `旧进程 ${pid} 退出`))) {
+    log('旧进程仍在运行，放弃本次重启（不做任何破坏性动作）');
+    process.exit(2);
+  }
+  if (!(await waitUntil(async () => !(await portAccepts(port)), waitTimeoutMs, `端口 ${port} 释放`))) {
+    log(`端口 ${port} 仍被占用，放弃本次重启`);
+    process.exit(3);
+  }
+
+  let stdio = 'ignore';
+  try { stdio = openSync(childLog, 'a'); } catch { /* 打不开就用 ignore */ }
+  let child;
+  try {
+    child = spawn(execPath, argv, { cwd, env: process.env, detached: true, stdio: ['ignore', stdio, stdio] });
+  } catch (err) {
+    log(`派生新 dsh 失败：${err?.message ?? err}`);
+    process.exit(4);
+  }
+  log(`已派生新 dsh：pid=${child.pid ?? '(未知)'}（输出见 ${childLog}）`);
+  child.unref();
+
+  const up = await waitUntil(() => portAccepts(port), readyTimeoutMs, `新 dsh 监听 ${port}`);
+  log(up
+    ? `✅ 新 dsh 已就绪，耗时 ${Math.round((Date.now() - startedAt) / 1000)}s`
+    : `❌ 新 dsh 未能在 ${Math.round(readyTimeoutMs / 1000)}s 内就绪，请查看 ${childLog}`);
+  process.exit(up ? 0 : 1);
+}
+
+void main();

package/lib/telegram/index.js

@@ -1,216 +1,225 @@
-// dsh-bridge Telegram platform adapter
-// 编排 TelegramGateway（长轮询 + 代理支持）+ TelegramConversationNode（Telegram⇄DSH 会话桥）。
-// 作为 Platform 子类，注册进 PlatformManager 统一管理。
-
-import QRCode from 'qrcode'
-import { Platform } from '../platform/base.js'
-import { TelegramGateway } from './gateway.js'
-import { TelegramConversationNode } from './node.js'
-
-export class TelegramService extends Platform {
-  /**
-   * @param {object} opts
-   * @param {object} opts.ctx          Cordis 上下文
-   * @param {object} opts.logger       日志器
-   * @param {object} [opts.config]     已持久化的 telegram 配置（凭证 + allowFrom + 间隔）
-   * @param {(patch: object) => (void|Promise<void>)} opts.onPersist  主插件保存回调
-   */
-  constructor({ ctx, logger, config = {}, onPersist }) {
-    super({ ctx, logger, config, onPersist })
-    this.id = 'telegram'
-    this.name = 'Telegram'
-    this._botQrCache = { username: '', qr: '' }
-
-    this.gateway = new TelegramGateway(ctx, {
-      botToken: config.botToken ?? '',
-      proxy: config.proxy ?? '',
-    })
-
-    // 挂到 ctx 供会话节点读取
-    try { ctx.telegram = this.gateway } catch {}
-
-    this.node = new TelegramConversationNode(ctx, {
-      allowFrom: Array.isArray(config.allowFrom) ? config.allowFrom : [],
-      groupAutoApprove: config.groupAutoApprove,
-      digestIntervalSec: config.digestIntervalSec,
-      approvalTimeoutSec: config.approvalTimeoutSec,
-      maxMessageChars: config.maxMessageChars || 4096,
-      sendChunkDelayMs: config.sendChunkDelayMs,
-      activeSessionId: config.activeSessionId,
-    }, logger, {
-      onFirstSender: () => this.persist({ allowFrom: [...(this.node?.config?.allowFrom ?? [])] }),
-      onActiveSessionChange: (sessionId) => this.persist({ activeSessionId: sessionId }),
-    })
-    this.bridge = this.node
-
-    if (this.gateway.configured) {
-      void this.start().catch((err) => {
-        this.logger.error?.('[dsh-bridge telegram] start failed:', err?.message ?? err)
-      })
-    }
-  }
-
-  // ---- Platform 接口 ----
-
-  get configured() { return this.gateway.configured }
-  get accountId() { return this.gateway.accountId }
-
-  get capabilities() {
-    return {
-      group: true,
-      media: true,
-      approvals: true,
-      maxMessageChars: this.node.config.maxMessageChars || 4096,
-    }
-  }
-
-  async sendText(peerId, text, opts = {}) {
-    return this.gateway.sendText(peerId, text, opts)
-  }
-
-  async sendTyping(peerId, opts = {}) {
-    return this.gateway.sendTyping?.(peerId, opts)
-  }
-
-  // ---- 生命周期控制 ----
-
-  async start() {
-    if (!this.gateway.configured) {
-      this.setStatus('idle')
-      return { success: false, error: 'Telegram Bot Token 未配置' }
-    }
-    this.setStatus('starting')
-    const ok = await this.gateway.start()
-    if (ok) {
-      this.setStatus('connected')
-      return { success: true }
-    } else {
-      this.setStatus('error', '连接 Telegram API 失败，请检查 Bot Token 或网络代理')
-      return { success: false, error: '连接失败' }
-    }
-  }
-
-  async stop() {
-    await this.gateway.stop()
-    this.setStatus('offline')
-    return { success: true }
-  }
-
-  /**
-   * 配置或登录
-   * @param {object} creds - { botToken, proxy }
-   */
-  async login(creds = {}) {
-    const patch = {}
-    if (creds.botToken !== undefined) patch.botToken = String(creds.botToken).trim()
-    if (creds.proxy !== undefined) patch.proxy = String(creds.proxy).trim()
-
-    this.gateway.setCredentials(patch)
-    this.persist(patch)
-
-    if (!this.gateway.configured) {
-      await this.stop()
-      return { success: false, error: '请填写完整的 Telegram Bot Token' }
-    }
-
-    return this.start()
-  }
-
-  async unbind() {
-    await this.stop()
-    this.gateway.setCredentials({ botToken: '', proxy: '' })
-    this.persist({ botToken: '', proxy: '', allowFrom: [] })
-    if (this.node) this.node.config.allowFrom = []
-    return { success: true }
-  }
-
-  getStatus() {
-    const allowFrom = [...(this.node?.config?.allowFrom ?? [])]
-    const username = this.gateway.botInfo?.username || ''
-    const botLink = username ? `https://t.me/${encodeURIComponent(username)}` : null
-    if (botLink && this._botQrCache.username !== username) {
-      this._botQrCache.username = username
-      void QRCode.toDataURL(botLink, {
-        width: 260,
-        margin: 2,
-        color: { dark: '#1F2421', light: '#FFFFFF' },
-      }).then((qr) => {
-        this._botQrCache.qr = qr
-      }).catch(() => {})
-    }
-
-    return {
-      id: this.id,
-      name: this.name,
-      status: this.status === 'connected' ? 'connected' : this.gateway.status,
-      configured: this.gateway.configured,
-      accountId: this.gateway.accountId || (this.gateway.configured ? '已配置 Token' : ''),
-      allowFrom,
-      peerId: this.node?.peerId,
-      sessionId: this.node?.activeSessionId,
-      login: {
-        phase: this.status === 'connected' ? 'done' : this.status === 'error' ? 'error' : 'idle',
-      },
-      capabilities: { ...this.capabilities },
-      config: {
-        digestIntervalSec: this.node?.config?.digestIntervalSec,
-        approvalTimeoutSec: this.node?.config?.approvalTimeoutSec,
-        maxMessageChars: this.node?.config?.maxMessageChars,
-        sendChunkDelayMs: this.node?.config?.sendChunkDelayMs,
-        botToken: this.gateway.config.botToken ? '******' : '',
-        proxy: this.gateway.config.proxy || '',
-      },
-      botInfo: this.gateway.botInfo,
-      botLink,
-      botQr: this._botQrCache.qr,
-    }
-  }
-
-  setAllowFrom(allowFrom) {
-    const list = Array.isArray(allowFrom) ? allowFrom.map((s) => String(s).trim()).filter(Boolean) : []
-    if (this.node) this.node.config.allowFrom = list
-    this.persist({ allowFrom: list })
-    return { success: true, allowFrom: list }
-  }
-
-  async setConfig({ digestIntervalSec, approvalTimeoutSec, maxMessageChars, sendChunkDelayMs, groupAutoApprove, botToken, proxy } = {}) {
-    if (digestIntervalSec != null)   this.node.config.digestIntervalSec   = Number(digestIntervalSec)
-    if (approvalTimeoutSec != null)  this.node.config.approvalTimeoutSec  = Number(approvalTimeoutSec)
-    if (maxMessageChars != null) {
-      const val = Number(maxMessageChars)
-      this.node.config.maxMessageChars = (val >= 200) ? val : 4096
-    }
-    if (sendChunkDelayMs != null)    this.node.config.sendChunkDelayMs    = Number(sendChunkDelayMs)
-    if (groupAutoApprove != null)    this.node.config.groupAutoApprove    = groupAutoApprove === true
-
-    if (botToken !== undefined || proxy !== undefined) {
-      const patch = {}
-      if (botToken !== undefined) patch.botToken = botToken.trim()
-      if (proxy !== undefined) patch.proxy = proxy.trim()
-      this.gateway.setCredentials(patch)
-    }
-
-    const patch = {
-      digestIntervalSec:  this.node.config.digestIntervalSec,
-      approvalTimeoutSec: this.node.config.approvalTimeoutSec,
-      maxMessageChars:    this.node.config.maxMessageChars,
-      sendChunkDelayMs:   this.node.config.sendChunkDelayMs,
-      groupAutoApprove:   this.node.config.groupAutoApprove === true,
-    }
-    if (botToken !== undefined) patch.botToken = this.gateway.config.botToken
-    if (proxy !== undefined) patch.proxy = this.gateway.config.proxy
-    await this.persist(patch)
-
-    if (this.gateway.configured && (botToken !== undefined || proxy !== undefined)) {
-      await this.start().catch((err) => {
-        this.logger?.warn?.('[dsh-bridge telegram] auto-start failed: %s', err?.message ?? err)
-      })
-    }
-    return { success: true }
-  }
-
-  dispose() {
-    super.dispose()
-    this.gateway?.dispose?.()
-  }
-}
+// dsh-bridge Telegram platform adapter
+// 编排 TelegramGateway（长轮询 + 代理支持）+ TelegramConversationNode（Telegram⇄DSH 会话桥）。
+// 作为 Platform 子类，注册进 PlatformManager 统一管理。
+
+import QRCode from 'qrcode'
+import { Platform } from '../platform/base.js'
+import { applySessionConfig, readSessionConfig } from '../platform/session-config.js'
+import { TelegramGateway } from './gateway.js'
+import { TelegramConversationNode } from './node.js'
+
+export class TelegramService extends Platform {
+  /**
+   * @param {object} opts
+   * @param {object} opts.ctx          Cordis 上下文
+   * @param {object} opts.logger       日志器
+   * @param {object} [opts.config]     已持久化的 telegram 配置（凭证 + allowFrom + 间隔）
+   * @param {(patch: object) => (void|Promise<void>)} opts.onPersist  主插件保存回调
+   */
+  constructor({ ctx, logger, config = {}, onPersist }) {
+    super({ ctx, logger, config, onPersist })
+    this.id = 'telegram'
+    this.name = 'Telegram'
+    this._botQrCache = { username: '', qr: '' }
+
+    this.gateway = new TelegramGateway(ctx, {
+      botToken: config.botToken ?? '',
+      proxy: config.proxy ?? '',
+    })
+
+    // 挂到 ctx 供会话节点读取
+    try { ctx.telegram = this.gateway } catch {}
+
+    this.node = new TelegramConversationNode(ctx, {
+      allowFrom: Array.isArray(config.allowFrom) ? config.allowFrom : [],
+      groupAutoApprove: config.groupAutoApprove,
+      digestIntervalSec: config.digestIntervalSec,
+      approvalTimeoutSec: config.approvalTimeoutSec,
+      maxMessageChars: config.maxMessageChars || 4096,
+      sendChunkDelayMs: config.sendChunkDelayMs,
+      activeSessionId: config.activeSessionId,
+      // 会话级配置：工作区 / Agent 预设 / 模型路由（构造期来自 cordis 配置，运行期由设置页写入）
+      cwd: config.cwd,
+      agentPreset: config.agentPreset,
+      agentProvider: config.agentProvider,
+      agentModel: config.agentModel,
+    }, logger, {
+      onFirstSender: () => this.persist({ allowFrom: [...(this.node?.config?.allowFrom ?? [])] }),
+      onActiveSessionChange: (sessionId) => this.persist({ activeSessionId: sessionId }),
+    })
+    this.bridge = this.node
+
+    if (this.gateway.configured) {
+      void this.start().catch((err) => {
+        this.logger.error?.('[dsh-bridge telegram] start failed:', err?.message ?? err)
+      })
+    }
+  }
+
+  // ---- Platform 接口 ----
+
+  get configured() { return this.gateway.configured }
+  get accountId() { return this.gateway.accountId }
+
+  get capabilities() {
+    return {
+      group: true,
+      media: true,
+      approvals: true,
+      maxMessageChars: this.node.config.maxMessageChars || 4096,
+    }
+  }
+
+  async sendText(peerId, text, opts = {}) {
+    return this.gateway.sendText(peerId, text, opts)
+  }
+
+  async sendTyping(peerId, opts = {}) {
+    return this.gateway.sendTyping?.(peerId, opts)
+  }
+
+  // ---- 生命周期控制 ----
+
+  async start() {
+    if (!this.gateway.configured) {
+      this.setStatus('idle')
+      return { success: false, error: 'Telegram Bot Token 未配置' }
+    }
+    this.setStatus('starting')
+    const ok = await this.gateway.start()
+    if (ok) {
+      this.setStatus('connected')
+      return { success: true }
+    } else {
+      this.setStatus('error', '连接 Telegram API 失败，请检查 Bot Token 或网络代理')
+      return { success: false, error: '连接失败' }
+    }
+  }
+
+  async stop() {
+    await this.gateway.stop()
+    this.setStatus('offline')
+    return { success: true }
+  }
+
+  /**
+   * 配置或登录
+   * @param {object} creds - { botToken, proxy }
+   */
+  async login(creds = {}) {
+    const patch = {}
+    if (creds.botToken !== undefined) patch.botToken = String(creds.botToken).trim()
+    if (creds.proxy !== undefined) patch.proxy = String(creds.proxy).trim()
+
+    this.gateway.setCredentials(patch)
+    this.persist(patch)
+
+    if (!this.gateway.configured) {
+      await this.stop()
+      return { success: false, error: '请填写完整的 Telegram Bot Token' }
+    }
+
+    return this.start()
+  }
+
+  async unbind() {
+    await this.stop()
+    this.gateway.setCredentials({ botToken: '', proxy: '' })
+    this.persist({ botToken: '', proxy: '', allowFrom: [] })
+    if (this.node) this.node.config.allowFrom = []
+    return { success: true }
+  }
+
+  getStatus() {
+    const allowFrom = [...(this.node?.config?.allowFrom ?? [])]
+    const username = this.gateway.botInfo?.username || ''
+    const botLink = username ? `https://t.me/${encodeURIComponent(username)}` : null
+    if (botLink && this._botQrCache.username !== username) {
+      this._botQrCache.username = username
+      void QRCode.toDataURL(botLink, {
+        width: 260,
+        margin: 2,
+        color: { dark: '#1F2421', light: '#FFFFFF' },
+      }).then((qr) => {
+        this._botQrCache.qr = qr
+      }).catch(() => {})
+    }
+
+    return {
+      id: this.id,
+      name: this.name,
+      status: this.status === 'connected' ? 'connected' : this.gateway.status,
+      configured: this.gateway.configured,
+      accountId: this.gateway.accountId || (this.gateway.configured ? '已配置 Token' : ''),
+      allowFrom,
+      peerId: this.node?.peerId,
+      sessionId: this.node?.activeSessionId,
+      login: {
+        phase: this.status === 'connected' ? 'done' : this.status === 'error' ? 'error' : 'idle',
+      },
+      capabilities: { ...this.capabilities },
+      config: {
+        digestIntervalSec: this.node?.config?.digestIntervalSec,
+        approvalTimeoutSec: this.node?.config?.approvalTimeoutSec,
+        maxMessageChars: this.node?.config?.maxMessageChars,
+        sendChunkDelayMs: this.node?.config?.sendChunkDelayMs,
+        botToken: this.gateway.config.botToken ? '******' : '',
+        proxy: this.gateway.config.proxy || '',
+        ...readSessionConfig(this.node?.config),
+      },
+      botInfo: this.gateway.botInfo,
+      botLink,
+      botQr: this._botQrCache.qr,
+    }
+  }
+
+  setAllowFrom(allowFrom) {
+    const list = Array.isArray(allowFrom) ? allowFrom.map((s) => String(s).trim()).filter(Boolean) : []
+    if (this.node) this.node.config.allowFrom = list
+    this.persist({ allowFrom: list })
+    return { success: true, allowFrom: list }
+  }
+
+  async setConfig({ digestIntervalSec, approvalTimeoutSec, maxMessageChars, sendChunkDelayMs, groupAutoApprove, botToken, proxy, agentPreset, cwd, agentProvider, agentModel } = {}) {
+    if (digestIntervalSec != null)   this.node.config.digestIntervalSec   = Number(digestIntervalSec)
+    if (approvalTimeoutSec != null)  this.node.config.approvalTimeoutSec  = Number(approvalTimeoutSec)
+    if (maxMessageChars != null) {
+      const val = Number(maxMessageChars)
+      this.node.config.maxMessageChars = (val >= 200) ? val : 4096
+    }
+    if (sendChunkDelayMs != null)    this.node.config.sendChunkDelayMs    = Number(sendChunkDelayMs)
+    if (groupAutoApprove != null)    this.node.config.groupAutoApprove    = groupAutoApprove === true
+    applySessionConfig(this.node.config, { agentPreset, cwd, agentProvider, agentModel })
+
+    if (botToken !== undefined || proxy !== undefined) {
+      const patch = {}
+      if (botToken !== undefined) patch.botToken = botToken.trim()
+      if (proxy !== undefined) patch.proxy = proxy.trim()
+      this.gateway.setCredentials(patch)
+    }
+
+    const patch = {
+      digestIntervalSec:  this.node.config.digestIntervalSec,
+      approvalTimeoutSec: this.node.config.approvalTimeoutSec,
+      maxMessageChars:    this.node.config.maxMessageChars,
+      sendChunkDelayMs:   this.node.config.sendChunkDelayMs,
+      groupAutoApprove:   this.node.config.groupAutoApprove === true,
+      ...readSessionConfig(this.node.config),
+    }
+    if (botToken !== undefined) patch.botToken = this.gateway.config.botToken
+    if (proxy !== undefined) patch.proxy = this.gateway.config.proxy
+    await this.persist(patch)
+
+    if (this.gateway.configured && (botToken !== undefined || proxy !== undefined)) {
+      await this.start().catch((err) => {
+        this.logger?.warn?.('[dsh-bridge telegram] auto-start failed: %s', err?.message ?? err)
+      })
+    }
+    return { success: true }
+  }
+
+  dispose() {
+    super.dispose()
+    this.gateway?.dispose?.()
+  }
+}