@xmanrui/dsh-im 1.0.0 → 1.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmanrui/dsh-im",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "把九种 IM 机器人和公网 AI Office 接入本机 DeepSeek Harness。 Connect nine IM channels and a public AI Office to a local DeepSeek Harness.",
   "keywords": [
     "deepseek-harness",
@@ -99,6 +99,7 @@
     "@larksuiteoapi/node-sdk": "1.73.0",
     "@whiskeysockets/baileys": "7.0.0-rc14",
     "esbuild": "0.25.9",
+    "https-proxy-agent": "5.0.1",
     "react": "18.3.1",
     "react-dom": "18.3.1",
     "react-test-renderer": "18.3.1"

package/plugin-src/client/i18n.js

@@ -305,7 +305,14 @@ const EN = Object.freeze({
   '微信已授权，但登录凭据无法写入 DSH 凭据存储。请检查凭据存储是否可写。': 'WeChat was authorized, but the login credential could not be written to the DSH credential store. Check that the store is writable.',
   '微信已授权，但账号配置无法写入本机。请检查 DSH_HOME 目录权限。': 'WeChat was authorized, but the account configuration could not be saved locally. Check the DSH_HOME directory permissions.',
   '微信已授权，但无法初始化账号状态或工作区。请检查 DSH_HOME 和工作区目录。': 'WeChat was authorized, but the account state or workspace could not be initialized. Check DSH_HOME and the workspace directory.',
-  '微信已授权，但插件无法连接本机 Harness。请确认 dsh web 已正常启动。': 'WeChat was authorized, but the plugin could not reach the local Harness. Confirm that dsh web is running normally.',
+  '微信已授权，但插件无法连接本机 Harness。请检查 dsh web 地址和端口。': 'WeChat was authorized, but the plugin could not connect to the local Harness. Check the dsh web address and port.',
+  '微信已授权，但 Harness 健康检查超时。请确认 dsh web 未阻塞。': 'WeChat was authorized, but the Harness health check timed out. Confirm that dsh web is not blocked.',
+  '微信已授权，但 Harness 拒绝了本机健康检查。请检查 Host 信任配置。': 'WeChat was authorized, but Harness denied the local health check. Check the Host trust configuration.',
+  '微信已授权，但找不到 Harness 健康检查接口。请确认 Harness 与插件版本兼容。': 'WeChat was authorized, but the Harness health endpoint was not found. Confirm that Harness and the plugin are compatible.',
+  '微信已授权，但 Harness 健康检查返回服务错误。请查看 dsh web 日志。': 'WeChat was authorized, but the Harness health check returned a service error. Check the dsh web logs.',
+  '微信已授权，但 Harness 返回了无法识别的响应。请确认 Harness 与插件版本兼容。': 'WeChat was authorized, but Harness returned an unrecognized response. Confirm that Harness and the plugin are compatible.',
+  '微信已授权，但 Harness 拒绝了健康检查请求。请查看 dsh web 日志。': 'WeChat was authorized, but Harness rejected the health-check request. Check the dsh web logs.',
+  '微信已授权，但 Harness 健康检查发生未知错误。请查看 dsh web 日志。': 'WeChat was authorized, but the Harness health check failed unexpectedly. Check the dsh web logs.',
   '微信已授权，但消息连接初始化失败。请查看 dsh web 日志后重试。': 'WeChat was authorized, but the message connection could not be initialized. Check the dsh web logs and try again.',
   '微信已授权，但激活过程中发生未知错误。请查看 dsh web 日志。': 'WeChat was authorized, but an unknown error occurred during activation. Check the dsh web logs.',
   '微信已绑定，可以开始向已绑定的机器人发消息。': 'WeChat is connected and ready for messages.',

package/plugin-src/host/channels/feishu/production.mjs

@@ -2,6 +2,7 @@ import { homedir } from 'node:os';
 import { join, resolve } from 'node:path';
 import { unlink } from 'node:fs/promises';
 import * as Lark from '@larksuiteoapi/node-sdk';
+import HttpsProxyAgent from 'https-proxy-agent';
 import { createConnectionSupervisor } from './connection-supervisor.mjs';
 import { createHarnessCommandExecutor } from '../../harness-command-executor.mjs';
 import { createHarnessSessionExecutors } from '../../harness-session-coordinator.mjs';
@@ -22,6 +23,22 @@ import {
 } from '../../../../src/channels/shared/bot-workspace-store.mjs';
 import { listAgentPresetCatalog } from '../../../../src/channels/shared/agent-preset.mjs';
 
+function webSocketProxyUrl(env) {
+  for (const key of ['https_proxy', 'HTTPS_PROXY', 'http_proxy', 'HTTP_PROXY']) {
+    const value = env?.[key];
+    if (typeof value === 'string' && value.trim()) return value.trim();
+  }
+  return undefined;
+}
+
+export function createFeishuWebSocketAgent(
+  env,
+  createAgent = (url) => new HttpsProxyAgent(url),
+) {
+  const proxyUrl = webSocketProxyUrl(env);
+  return proxyUrl ? createAgent(proxyUrl) : undefined;
+}
+
 function harnessOrigin(webServer, configured) {
   if (configured !== undefined) return new URL(configured);
   const port = webServer?.port;
@@ -61,7 +78,11 @@ export async function createProductionController(ctx, config = {}, internals = {
   const SessionStateStore = internals.StateStore ?? StateStore;
   const Harness = internals.HarnessClient ?? HarnessClient;
   const Runtime = internals.FeishuRuntime ?? FeishuRuntime;
-  const verifyApp = internals.verifyFeishuApp ?? verifyFeishuApp;
+  const verify = internals.verifyFeishuApp ?? verifyFeishuApp;
+  const verifyApp = (options) => verify({
+    ...options,
+    httpInstance: lark.defaultHttpInstance,
+  });
   const createSupervisor = internals.createConnectionSupervisor ?? createConnectionSupervisor;
   const logger = typeof ctx.logger === 'function'
     ? ctx.logger('dsh-feishu')
@@ -127,6 +148,8 @@ export async function createProductionController(ctx, config = {}, internals = {
     ...(controlExecutor ? { controlExecutor } : {}),
     ...(sessionMaintenanceExecutor ? { sessionMaintenanceExecutor } : {}),
   });
+  const proxyEnv = internals.proxyEnv ?? process.env;
+  const wsAgent = createFeishuWebSocketAgent(proxyEnv, internals.createProxyAgent);
 
   const coreController = new Controller({
     registerApp: (options) => lark.registerApp(options),
@@ -153,6 +176,7 @@ export async function createProductionController(ctx, config = {}, internals = {
         harness: workspaceScope.harness,
         state: workspaceScope.state,
         replyTimeoutMs: config.replyTimeoutMs ?? 600_000,
+        ...(wsAgent ? { wsAgent } : {}),
         logger: {
           error: (...args) => logger.error?.(`[${botId ?? botConfig.id}]`, ...args),
           warn: (...args) => logger.warn?.(`[${botId ?? botConfig.id}]`, ...args),
@@ -190,6 +214,7 @@ export async function createProductionController(ctx, config = {}, internals = {
       await supervisor.close();
       await controller.close();
       harness.stopManagedProcess();
+      wsAgent?.destroy?.();
     },
   };
 }

package/scripts/verify-package.mjs

@@ -142,6 +142,7 @@ for (const [name, version] of Object.entries(directDependencies)) {
 const bundledBuildDependencies = {
   '@larksuiteoapi/node-sdk': '1.73.0',
   '@whiskeysockets/baileys': '7.0.0-rc14',
+  'https-proxy-agent': '5.0.1',
 };
 for (const [name, version] of Object.entries(bundledBuildDependencies)) {
   if (manifest.dependencies?.[name] !== undefined) {
@@ -157,8 +158,8 @@ if (lock.packages?.['node_modules/protobufjs']?.dev !== true) {
 if (manifest.bin?.['dsh-im'] !== 'bin/dsh-im.mjs') {
   throw new Error('package manifest must publish the dsh-im executable');
 }
-if (/(?:from\s*|import\s*\(|require\s*\()\s*["'](?:@larksuiteoapi\/node-sdk|@whiskeysockets\/baileys|protobufjs)(?:\/[^"']*)?["']/.test(host)) {
-  throw new Error('host bundle must not import a bundled SDK or protobufjs at runtime');
+if (/(?:from\s*|import\s*\(|require\s*\()\s*["'](?:@larksuiteoapi\/node-sdk|@whiskeysockets\/baileys|https-proxy-agent|protobufjs)(?:\/[^"']*)?["']/.test(host)) {
+  throw new Error('host bundle must not import a bundled SDK, proxy agent, or protobufjs at runtime');
 }
 if ((executable.mode & 0o111) === 0) throw new Error('dsh-im CLI is not executable');
 if (/private-bot-token|must-be-rolled-back|DEEPSEEK_API_KEY=/.test(client + host)) {

package/src/channels/discord/discord-api.mjs

@@ -108,7 +108,7 @@ export class DiscordApi {
         headers: {
           authorization: `Bot ${this.#token}`,
           'content-type': 'application/json',
-          'user-agent': 'DeepSeek-Harness-dsh-im (https://github.com/xmanrui/dsh-im, 1.0.0)',
+          'user-agent': 'DeepSeek-Harness-dsh-im (https://github.com/xmanrui/dsh-im, 1.0.2)',
         },
         ...(body === undefined ? {} : { body: JSON.stringify(body) }),
         signal: requestSignal(signal, timeoutMs),

package/src/channels/feishu/feishu-app.mjs

@@ -3,15 +3,12 @@ function endpointFor(domain, path) {
   return new URL(path, origin);
 }
 
-async function jsonResponse(response, operation) {
-  let body;
-  try {
-    body = await response.json();
-  } catch {
+function jsonResponse(body, operation) {
+  if (!body || typeof body !== 'object' || Array.isArray(body)) {
     throw new Error(`${operation} returned a non-JSON response`);
   }
-  if (!response.ok || body?.code !== 0) {
-    throw new Error(`${operation} failed: ${body?.msg || `HTTP ${response.status}`}`);
+  if (body.code !== 0) {
+    throw new Error(`${operation} failed: ${body.msg || `code ${body.code}`}`);
   }
   return body;
 }
@@ -21,26 +18,32 @@ export async function verifyFeishuApp({
   appId,
   appSecret,
   domain = 'feishu',
-  fetchImpl = fetch,
+  httpInstance,
   timeoutMs = 15000,
 }) {
   if (!appId || !appSecret) throw new Error('Feishu credentials are incomplete');
-  const tokenResponse = await fetchImpl(endpointFor(domain, '/open-apis/auth/v3/tenant_access_token/internal'), {
+  if (!httpInstance || typeof httpInstance.request !== 'function') {
+    throw new TypeError('Feishu verification requires an HTTP instance');
+  }
+  const tokenBody = jsonResponse(await httpInstance.request({
     method: 'POST',
+    url: endpointFor(domain, '/open-apis/auth/v3/tenant_access_token/internal').href,
     headers: { 'content-type': 'application/json; charset=utf-8' },
-    body: JSON.stringify({ app_id: appId, app_secret: appSecret }),
+    data: { app_id: appId, app_secret: appSecret },
     signal: AbortSignal.timeout(timeoutMs),
-  });
-  const tokenBody = await jsonResponse(tokenResponse, 'Feishu authentication');
+    timeout: timeoutMs,
+  }), 'Feishu authentication');
   if (!tokenBody.tenant_access_token) {
     throw new Error('Feishu authentication returned no tenant access token');
   }
 
-  const botResponse = await fetchImpl(endpointFor(domain, '/open-apis/bot/v3/info/'), {
+  const botBody = jsonResponse(await httpInstance.request({
+    method: 'GET',
+    url: endpointFor(domain, '/open-apis/bot/v3/info/').href,
     headers: { authorization: `Bearer ${tokenBody.tenant_access_token}` },
     signal: AbortSignal.timeout(timeoutMs),
-  });
-  const botBody = await jsonResponse(botResponse, 'Feishu bot verification');
+    timeout: timeoutMs,
+  }), 'Feishu bot verification');
   const bot = botBody.bot ?? {};
   return Object.freeze({
     appId,

package/src/channels/feishu/feishu-runtime.mjs

@@ -96,6 +96,7 @@ export class FeishuRuntime {
   #replyTimeoutMs;
   #connectTimeoutMs;
   #requestTimeoutMs;
+  #wsAgent;
   #logger;
   #repair;
   #client = null;
@@ -122,6 +123,7 @@ export class FeishuRuntime {
     replyTimeoutMs = 600000,
     connectTimeoutMs = 15000,
     requestTimeoutMs = DEFAULT_REQUEST_TIMEOUT_MS,
+    wsAgent,
     logger = console,
   }) {
     if (!lark) throw new Error('FeishuRuntime requires the Feishu SDK');
@@ -152,6 +154,7 @@ export class FeishuRuntime {
     this.#replyTimeoutMs = replyTimeoutMs;
     this.#connectTimeoutMs = connectTimeoutMs;
     this.#requestTimeoutMs = requestTimeoutMs;
+    this.#wsAgent = wsAgent;
     this.#logger = logger;
     this.#status = createBridgeStatus({ allowedSenderCount: normalizedOwners.length });
   }
@@ -266,6 +269,7 @@ export class FeishuRuntime {
 
       this.#wsClient = new this.#lark.WSClient({
         ...larkConfig,
+        ...(this.#wsAgent ? { agent: this.#wsAgent } : {}),
         loggerLevel: this.#lark.LoggerLevel.info,
         handshakeTimeoutMs: 15000,
         onReady: () => {

package/src/channels/shared/harness-client.mjs

@@ -364,6 +364,26 @@ export class HarnessRpcError extends Error {
   }
 }
 
+export class HarnessTransportError extends Error {
+  constructor(code, method, { cause, status } = {}) {
+    const statusDetail = Number.isInteger(status) ? `, HTTP ${status}` : '';
+    super(`Harness ${method} transport failed (${code}${statusDetail})`, { cause });
+    this.name = 'HarnessTransportError';
+    this.code = code;
+    this.method = method;
+    if (Number.isInteger(status)) this.status = status;
+  }
+}
+
+export class HarnessHealthError extends Error {
+  constructor(cause) {
+    super('Harness health RPC was rejected', { cause });
+    this.name = 'HarnessHealthError';
+    this.code = 'harness-rpc-rejected';
+    this.method = 'host.describe';
+  }
+}
+
 export class HarnessInteractionError extends Error {
   constructor(code, message) {
     super(message);
@@ -455,24 +475,60 @@ export class HarnessClient {
     const signal = options.signal
       ? AbortSignal.any([options.signal, timeoutSignal])
       : timeoutSignal;
-    const response = await this.#fetch(new URL(`/api/${method}`, this.#baseUrl), {
-      method: 'POST',
-      headers: { 'content-type': 'application/json' },
-      body: JSON.stringify({ type: 'client-request', rpcId, method, payload }),
-      signal,
-    });
-    if (!response.ok) throw new Error(`Harness transport ${method} failed: HTTP ${response.status}`);
-    const body = await response.json();
+    let response;
+    try {
+      response = await this.#fetch(new URL(`/api/${method}`, this.#baseUrl), {
+        method: 'POST',
+        headers: { 'content-type': 'application/json' },
+        body: JSON.stringify({ type: 'client-request', rpcId, method, payload }),
+        signal,
+      });
+    } catch (error) {
+      // Preserve an explicit caller cancellation; it is control flow, not a
+      // Harness availability diagnosis.
+      if (options.signal?.aborted) throw error;
+      throw new HarnessTransportError(
+        timeoutSignal.aborted ? 'harness-timeout' : 'harness-connect-failed',
+        method,
+        { cause: error },
+      );
+    }
+    if (!response.ok) {
+      const code = response.status === 401 || response.status === 403
+        ? 'harness-access-denied'
+        : response.status === 404
+          ? 'harness-api-not-found'
+          : 'harness-http-failed';
+      throw new HarnessTransportError(code, method, { status: response.status });
+    }
+    let body;
+    try {
+      body = await response.json();
+    } catch (error) {
+      throw new HarnessTransportError('harness-response-invalid', method, { cause: error });
+    }
     if (body?.type !== 'server-response' || body?.rpcId !== rpcId) {
-      throw new Error(`Harness returned an invalid response for ${method}`);
+      throw new HarnessTransportError('harness-response-invalid', method, {
+        cause: new Error(`Harness returned an invalid response for ${method}`),
+      });
+    }
+    if (!body.result || typeof body.result !== 'object' || typeof body.result.ok !== 'boolean') {
+      throw new HarnessTransportError('harness-response-invalid', method, {
+        cause: new Error(`Harness returned an invalid result for ${method}`),
+      });
     }
     if (!body.result?.ok) throw new HarnessRpcError(method, body.result?.error);
     return body.result.value;
   }
 
   async health(options = {}) {
-    await this.rpc('host.describe', {}, 5_000, options);
-    return true;
+    try {
+      await this.rpc('host.describe', {}, 5_000, options);
+      return true;
+    } catch (error) {
+      if (error instanceof HarnessRpcError) throw new HarnessHealthError(error);
+      throw error;
+    }
   }
 
   async ensureRunning(options = {}) {
@@ -506,7 +562,8 @@ export class HarnessClient {
         lastError = error;
       }
     }
-    throw new Error(`Harness did not become ready: ${lastError?.message ?? 'timeout'}`);
+    if (lastError) throw lastError;
+    throw new HarnessTransportError('harness-timeout', 'host.describe');
   }
 
   async listWorkspaces(options = {}) {

package/src/channels/weixin/weixin-api.mjs

@@ -184,7 +184,7 @@ function authenticatedHeaders(token) {
 function baseInfo() {
   return {
     channel_version: WEIXIN_PROTOCOL_VERSION,
-    bot_agent: 'DeepSeekHarness/1.0.0',
+    bot_agent: 'DeepSeekHarness/1.0.2',
   };
 }
 

package/src/channels/weixin/weixin-controller.mjs

@@ -25,7 +25,14 @@ const ACTIVATION_ERROR_MESSAGES = Object.freeze({
   'credential-save-failed': '微信已授权，但登录凭据无法写入 DSH 凭据存储。请检查凭据存储是否可写。',
   'account-config-save-failed': '微信已授权，但账号配置无法写入本机。请检查 DSH_HOME 目录权限。',
   'runtime-prepare-failed': '微信已授权，但无法初始化账号状态或工作区。请检查 DSH_HOME 和工作区目录。',
-  'harness-unreachable': '微信已授权，但插件无法连接本机 Harness。请确认 dsh web 已正常启动。',
+  'harness-connect-failed': '微信已授权，但插件无法连接本机 Harness。请检查 dsh web 地址和端口。',
+  'harness-timeout': '微信已授权，但 Harness 健康检查超时。请确认 dsh web 未阻塞。',
+  'harness-access-denied': '微信已授权，但 Harness 拒绝了本机健康检查。请检查 Host 信任配置。',
+  'harness-api-not-found': '微信已授权，但找不到 Harness 健康检查接口。请确认 Harness 与插件版本兼容。',
+  'harness-http-failed': '微信已授权，但 Harness 健康检查返回服务错误。请查看 dsh web 日志。',
+  'harness-response-invalid': '微信已授权，但 Harness 返回了无法识别的响应。请确认 Harness 与插件版本兼容。',
+  'harness-rpc-rejected': '微信已授权，但 Harness 拒绝了健康检查请求。请查看 dsh web 日志。',
+  'harness-check-unknown-failed': '微信已授权，但 Harness 健康检查发生未知错误。请查看 dsh web 日志。',
   'connection-start-failed': '微信已授权，但消息连接初始化失败。请查看 dsh web 日志后重试。',
 });
 

package/src/channels/weixin/weixin-runtime.mjs

@@ -6,6 +6,15 @@ import {
 } from '../shared/connection-test.mjs';
 
 const DEFAULT_START_RETRY_DELAYS_MS = Object.freeze([250, 1_000, 3_000]);
+const HARNESS_HEALTH_ERROR_CODES = new Set([
+  'harness-connect-failed',
+  'harness-timeout',
+  'harness-access-denied',
+  'harness-api-not-found',
+  'harness-http-failed',
+  'harness-response-invalid',
+  'harness-rpc-rejected',
+]);
 
 function startRetryDelays(value) {
   if (value === undefined) return [...DEFAULT_START_RETRY_DELAYS_MS];
@@ -32,6 +41,13 @@ function runtimeStartError(code, cause) {
   return error;
 }
 
+function harnessHealthError(cause) {
+  const code = HARNESS_HEALTH_ERROR_CODES.has(cause?.code)
+    ? cause.code
+    : 'harness-check-unknown-failed';
+  return runtimeStartError(code, cause);
+}
+
 function delay(ms, signal) {
   return new Promise((resolve, reject) => {
     if (signal?.aborted) {
@@ -127,7 +143,7 @@ export class WeixinRuntime {
       try {
         await this.#harness.ensureRunning();
       } catch (error) {
-        throw runtimeStartError('harness-unreachable', error);
+        throw harnessHealthError(error);
       }
       this.#status.harnessReachable = true;
       await this.#notifyStart();