hansjone/dsh-im-ops
1
0
Fork 0
mirror of https://github.com/hansjone/dsh-im-ops.git synced 2026-10-09 20:13: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

33
src/channels/feishu/feishu-app.mjs
View file

@ -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,

4
src/channels/feishu/feishu-runtime.mjs
View file

@ -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: () => {