hansjone/dsh-im-ops
1
0
Fork 0
mirror of https://github.com/hansjone/dsh-im-ops.git synced 2026-10-09 01:53:21 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(feishu): honor proxy settings for REST and WebSocket

Browse source
This commit is contained in:
xmanrui 2026-08-22 14:45:25 +08:00
parent b9ceac0779
commit f7d2fe7047
14 changed files with 467 additions and 188 deletions
Download patch file Download diff file Expand all files Collapse all files

27
plugin-src/host/channels/feishu/production.mjs
View file

@ -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?.();
},
};
}