@xopcai/xopc 0.0.464 → 0.0.465
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/browser-ext/manifest.json +1 -1
- package/dist/extensions/feishu/src/adapters/cli-login.js +23 -49
- package/dist/extensions/feishu/src/adapters/gateway-setup.d.ts +3 -0
- package/dist/extensions/feishu/src/adapters/gateway-setup.js +180 -128
- package/dist/extensions/feishu/src/adapters/onboard-cli.d.ts +1 -1
- package/dist/extensions/feishu/src/adapters/onboard-cli.js +27 -15
- package/dist/extensions/feishu/src/auth/app-registration.d.ts +1 -0
- package/dist/extensions/feishu/src/auth/app-registration.js +12 -9
- package/dist/extensions/feishu/src/outbound/outbound-adapter.js +40 -16
- package/dist/extensions/feishu/src/plugin.d.ts +2 -0
- package/dist/extensions/feishu/src/plugin.js +37 -23
- package/dist/extensions/feishu/src/status/status-adapter.d.ts +1 -1
- package/dist/extensions/feishu/src/status/status-adapter.js +8 -5
- package/dist/extensions/feishu/src/streaming/streaming-adapter.js +97 -69
- package/dist/extensions/feishu/src/transport/client/bot-info.d.ts +10 -0
- package/dist/extensions/feishu/src/transport/client/bot-info.js +34 -0
- package/dist/extensions/feishu/src/transport/client/client.d.ts +7 -1
- package/dist/extensions/feishu/src/transport/client/client.js +6 -5
- package/dist/extensions/feishu/src/transport/client/install-sdk.d.ts +2 -0
- package/dist/extensions/feishu/src/transport/client/install-sdk.js +77 -0
- package/dist/extensions/feishu/src/transport/client/lark-sdk.d.ts +2 -0
- package/dist/extensions/feishu/src/transport/client/lark-sdk.js +27 -3
- package/dist/extensions/feishu/src/transport/client/sdk-catalog.d.ts +1 -0
- package/dist/extensions/feishu/src/transport/client/sdk-catalog.js +317 -0
- package/dist/extensions/feishu/src/transport/reliability/inbound-pipeline.d.ts +1 -1
- package/dist/extensions/feishu/src/transport/reliability/inbound-pipeline.js +13 -5
- package/dist/extensions/feishu/src/transport/reliability/message-ingress.d.ts +21 -0
- package/dist/extensions/feishu/src/transport/reliability/message-ingress.js +313 -0
- package/dist/extensions/feishu/src/transport/socket-mode/monitor.d.ts +1 -0
- package/dist/extensions/feishu/src/transport/socket-mode/monitor.js +56 -171
- package/dist/extensions/feishu/src/transport/webhook/monitor.d.ts +1 -0
- package/dist/extensions/feishu/src/transport/webhook/monitor.js +10 -102
- package/dist/extensions/telegram/src/account-manager.d.ts +1 -0
- package/dist/extensions/telegram/src/account-manager.js +3 -0
- package/dist/extensions/telegram/src/adapters/debounce-keys.js +7 -2
- package/dist/extensions/telegram/src/adapters/gateway-setup.js +113 -63
- package/dist/extensions/telegram/src/adapters/streaming-adapter.js +8 -4
- package/dist/extensions/telegram/src/doctor.js +1 -1
- package/dist/extensions/telegram/src/inbound-coalescer.d.ts +8 -6
- package/dist/extensions/telegram/src/inbound-coalescer.js +47 -88
- package/dist/extensions/telegram/src/inbound-processor.js +5 -1
- package/dist/extensions/telegram/src/outbound-sender.js +16 -23
- package/dist/extensions/telegram/src/plugin.js +80 -57
- package/dist/extensions/telegram/src/polling-session.d.ts +3 -6
- package/dist/extensions/telegram/src/polling-session.js +107 -94
- package/dist/extensions/telegram/src/rich-message.d.ts +4 -0
- package/dist/extensions/telegram/src/rich-message.js +23 -0
- package/dist/extensions/telegram/src/timeout-abort.d.ts +1 -1
- package/dist/extensions/telegram/src/timeout-abort.js +9 -3
- package/dist/extensions/telegram/src/update-offset-store.d.ts +1 -0
- package/dist/extensions/telegram/src/update-offset-store.js +6 -1
- package/dist/extensions/telegram/xopc.extension.json +1 -1
- package/dist/extensions/weixin/src/api/api.d.ts +1 -0
- package/dist/extensions/weixin/src/api/api.js +12 -6
- package/dist/extensions/weixin/src/api/types.d.ts +5 -2
- package/dist/extensions/weixin/src/auth/login-qr.d.ts +7 -1
- package/dist/extensions/weixin/src/auth/login-qr.js +48 -13
- package/dist/extensions/weixin/src/cdn/pic-decrypt.d.ts +2 -2
- package/dist/extensions/weixin/src/cdn/pic-decrypt.js +37 -25
- package/dist/extensions/weixin/src/cli/gateway-qr-login.d.ts +8 -0
- package/dist/extensions/weixin/src/cli/gateway-qr-login.js +45 -6
- package/dist/extensions/weixin/src/cli/qr-login.d.ts +1 -1
- package/dist/extensions/weixin/src/cli/qr-login.js +9 -3
- package/dist/extensions/weixin/src/media/media-download.d.ts +1 -0
- package/dist/extensions/weixin/src/media/media-download.js +4 -5
- package/dist/extensions/weixin/src/messaging/process-message.d.ts +2 -0
- package/dist/extensions/weixin/src/messaging/process-message.js +90 -65
- package/dist/extensions/weixin/src/messaging/quote-cache.d.ts +10 -0
- package/dist/extensions/weixin/src/messaging/quote-cache.js +46 -0
- package/dist/extensions/weixin/src/monitor/monitor.d.ts +3 -3
- package/dist/extensions/weixin/src/monitor/monitor.js +108 -104
- package/dist/extensions/weixin/src/plugin.d.ts +5 -1
- package/dist/extensions/weixin/src/plugin.js +138 -42
- package/dist/gateway/static/root/assets/{capabilities-page-rTjkjo71.js → capabilities-page-U_hQx5ou.js} +2 -2
- package/dist/gateway/static/root/assets/channels-BUzno8Pi.js +1 -0
- package/dist/gateway/static/root/assets/extension-settings-page-BvUtZGLT.js +1 -0
- package/dist/gateway/static/root/assets/index-Cdo4_zon.js +11 -0
- package/dist/gateway/static/root/assets/index-DYTktubl.css +1 -0
- package/dist/gateway/static/root/assets/{route-preload-5iwjWERk.js → route-preload-ClsAFFQc.js} +2 -2
- package/dist/gateway/static/root/assets/schema-form-BxBDgLrg.js +1 -0
- package/dist/gateway/static/root/assets/{settings-page-DNiRlM5x.js → settings-page-M6XwzIyu.js} +1 -1
- package/dist/gateway/static/root/assets/understanding-refresh-store-CM6bUcaJ.js +1 -0
- package/dist/gateway/static/root/assets/user-model-page-CBcGMhrR.js +2 -0
- package/dist/gateway/static/root/index.html +4 -4
- package/dist/package.js +1 -1
- package/dist/src/agent/inbound/inbound-loop.js +14 -0
- package/dist/src/agent/messaging/outbound-coordinator.js +1 -1
- package/dist/src/channels/connection-probe.d.ts +23 -0
- package/dist/src/channels/connection-probe.js +98 -0
- package/dist/src/channels/manager.d.ts +2 -0
- package/dist/src/channels/manager.js +5 -0
- package/dist/src/channels/message-journal.d.ts +25 -0
- package/dist/src/channels/message-journal.js +79 -0
- package/dist/src/channels/outbound-sender.d.ts +8 -0
- package/dist/src/channels/outbound-sender.js +60 -1
- package/dist/src/channels/plugins/types.adapters.d.ts +4 -0
- package/dist/src/channels/verified-inbound.js +20 -14
- package/dist/src/gateway/hono/routes/channels.js +23 -10
- package/dist/src/gateway/hono/routes/home.js +1 -1
- package/dist/src/gateway/hono/routes/user-model.js +48 -20
- package/dist/src/gateway/service.js +5 -5
- package/dist/src/home-intelligence/host.js +5 -5
- package/dist/src/infra/bus/index.d.ts +1 -1
- package/dist/src/infra/bus/queue.d.ts +16 -3
- package/dist/src/infra/bus/queue.js +74 -3
- package/dist/src/infra/debounce.d.ts +1 -0
- package/dist/src/infra/debounce.js +40 -35
- package/dist/src/knowledge-memory/index.js +2 -2
- package/dist/src/knowledge-memory/repository.d.ts +9 -0
- package/dist/src/knowledge-memory/repository.js +12 -2
- package/dist/src/runtime-tools/types.d.ts +1 -1
- package/package.json +5 -6
- package/dist/gateway/static/root/assets/channels-DvB2fwPI.js +0 -1
- package/dist/gateway/static/root/assets/extension-settings-page-DKAJE4h9.js +0 -1
- package/dist/gateway/static/root/assets/index-BGA-G-Bp.css +0 -1
- package/dist/gateway/static/root/assets/index-pmlYYCCU.js +0 -11
- package/dist/gateway/static/root/assets/schema-form-C9TYGa0_.js +0 -1
- package/dist/gateway/static/root/assets/understanding-refresh-store-Cf0DUO_C.js +0 -1
- package/dist/gateway/static/root/assets/user-model-page-CdB9qH57.js +0 -2
|
@@ -91,17 +91,18 @@ async function apiGetFetch(params) {
|
|
|
91
91
|
const timeoutMs = params.timeoutMs;
|
|
92
92
|
const controller = timeoutMs != null && timeoutMs > 0 ? new AbortController() : void 0;
|
|
93
93
|
const t = controller != null && timeoutMs != null ? setTimeout(() => controller.abort(), timeoutMs) : void 0;
|
|
94
|
+
const signal = controller && params.abortSignal ? AbortSignal.any([controller.signal, params.abortSignal]) : controller?.signal ?? params.abortSignal;
|
|
94
95
|
try {
|
|
95
96
|
const res = await fetch(url.toString(), {
|
|
96
97
|
method: "GET",
|
|
97
98
|
headers: hdrs,
|
|
98
|
-
|
|
99
|
+
signal,
|
|
99
100
|
keepalive: true
|
|
100
101
|
});
|
|
101
102
|
if (t !== void 0) clearTimeout(t);
|
|
102
103
|
const rawText = await res.text();
|
|
103
|
-
logger.debug(`${params.label} status=${res.status}
|
|
104
|
-
if (!res.ok) throw new Error(`${params.label} ${res.status}
|
|
104
|
+
logger.debug(`${params.label} status=${res.status}`);
|
|
105
|
+
if (!res.ok) throw new Error(`${params.label} ${res.status}`);
|
|
105
106
|
return rawText;
|
|
106
107
|
} catch (err) {
|
|
107
108
|
if (t !== void 0) clearTimeout(t);
|
|
@@ -175,7 +176,10 @@ async function getUpdates(params) {
|
|
|
175
176
|
keepalive: true,
|
|
176
177
|
abortSignal: params.abortSignal
|
|
177
178
|
});
|
|
178
|
-
return JSON.parse(rawText)
|
|
179
|
+
return JSON.parse(rawText, (key, value, context) => {
|
|
180
|
+
if ((key === "message_id" || key === "svr_id" || key === "seq") && typeof value === "number" && context?.source && /^-?\d+$/.test(context.source)) return context.source;
|
|
181
|
+
return value;
|
|
182
|
+
});
|
|
179
183
|
} catch (err) {
|
|
180
184
|
if (params.abortSignal?.aborted && err instanceof Error && err.name === "AbortError") throw err;
|
|
181
185
|
if (err instanceof Error && err.name === "AbortError") {
|
|
@@ -183,7 +187,8 @@ async function getUpdates(params) {
|
|
|
183
187
|
return {
|
|
184
188
|
ret: 0,
|
|
185
189
|
msgs: [],
|
|
186
|
-
get_updates_buf: params.get_updates_buf
|
|
190
|
+
get_updates_buf: params.get_updates_buf,
|
|
191
|
+
timedOut: true
|
|
187
192
|
};
|
|
188
193
|
}
|
|
189
194
|
if (isUndiciHeadersTimeout(err)) {
|
|
@@ -191,7 +196,8 @@ async function getUpdates(params) {
|
|
|
191
196
|
return {
|
|
192
197
|
ret: 0,
|
|
193
198
|
msgs: [],
|
|
194
|
-
get_updates_buf: params.get_updates_buf ?? ""
|
|
199
|
+
get_updates_buf: params.get_updates_buf ?? "",
|
|
200
|
+
timedOut: true
|
|
195
201
|
};
|
|
196
202
|
}
|
|
197
203
|
throw err;
|
|
@@ -118,6 +118,7 @@ export interface VideoItem {
|
|
|
118
118
|
thumb_width?: number;
|
|
119
119
|
}
|
|
120
120
|
export interface RefMessage {
|
|
121
|
+
svr_id?: string;
|
|
121
122
|
message_item?: MessageItem;
|
|
122
123
|
title?: string;
|
|
123
124
|
}
|
|
@@ -136,8 +137,8 @@ export interface MessageItem {
|
|
|
136
137
|
}
|
|
137
138
|
/** Unified message (proto: WeixinMessage). Replaces the old split Message + MessageContent + FullMessage. */
|
|
138
139
|
export interface WeixinMessage {
|
|
139
|
-
seq?: number;
|
|
140
|
-
message_id?: number;
|
|
140
|
+
seq?: number | string;
|
|
141
|
+
message_id?: number | string;
|
|
141
142
|
from_user_id?: string;
|
|
142
143
|
to_user_id?: string;
|
|
143
144
|
client_id?: string;
|
|
@@ -158,6 +159,8 @@ export interface GetUpdatesReq {
|
|
|
158
159
|
}
|
|
159
160
|
/** GetUpdates response: bytes fields are base64 strings in JSON. */
|
|
160
161
|
export interface GetUpdatesResp {
|
|
162
|
+
/** Client-side poll timeout, without an acknowledgement from the platform. */
|
|
163
|
+
timedOut?: boolean;
|
|
161
164
|
ret?: number;
|
|
162
165
|
/** Error code returned by the server (e.g. -14 = session timeout). Present when request fails. */
|
|
163
166
|
errcode?: number;
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
type QrStatus = "wait" | "scaned" | "confirmed" | "expired" | "scaned_but_redirect" | "need_verifycode" | "confirmed_but_need_verifycode";
|
|
1
2
|
type ActiveLogin = {
|
|
2
3
|
conversationId: string;
|
|
3
4
|
id: string;
|
|
@@ -5,13 +6,17 @@ type ActiveLogin = {
|
|
|
5
6
|
qrcodeUrl: string;
|
|
6
7
|
startedAt: number;
|
|
7
8
|
botToken?: string;
|
|
8
|
-
status?:
|
|
9
|
+
status?: QrStatus;
|
|
10
|
+
verifyCode?: string;
|
|
11
|
+
controller: AbortController;
|
|
9
12
|
error?: string;
|
|
10
13
|
/** The current effective polling base URL; may be updated on IDC redirect. */
|
|
11
14
|
currentApiBaseUrl?: string;
|
|
12
15
|
};
|
|
13
16
|
/** Default `bot_type` for ilink get_bot_qrcode / get_qrcode_status (this channel build). */
|
|
14
17
|
export declare const DEFAULT_ILINK_BOT_TYPE = "3";
|
|
18
|
+
export declare function cancelWeixinQrLogin(id: string): void;
|
|
19
|
+
export declare function submitWeixinQrVerificationCode(id: string, code: string): boolean;
|
|
15
20
|
export type WeixinQrStartResult = {
|
|
16
21
|
qrcodeUrl?: string;
|
|
17
22
|
message: string;
|
|
@@ -31,6 +36,7 @@ export declare function startWeixinLoginWithQr(opts: {
|
|
|
31
36
|
timeoutMs?: number;
|
|
32
37
|
force?: boolean;
|
|
33
38
|
accountId?: string;
|
|
39
|
+
freshSession?: boolean;
|
|
34
40
|
botType?: string;
|
|
35
41
|
routeTag?: string;
|
|
36
42
|
}): Promise<WeixinQrStartResult>;
|
|
@@ -2,6 +2,7 @@ import { logger } from "../util/logger.js";
|
|
|
2
2
|
import { redactToken } from "../util/redact.js";
|
|
3
3
|
import { apiGetFetch } from "../api/api.js";
|
|
4
4
|
import { randomUUID } from "node:crypto";
|
|
5
|
+
import { setTimeout as setTimeout$1 } from "node:timers/promises";
|
|
5
6
|
//#region extensions/weixin/src/auth/login-qr.ts
|
|
6
7
|
const ACTIVE_LOGIN_TTL_MS = 5 * 6e4;
|
|
7
8
|
/** Client-side timeout for the long-poll get_qrcode_status request. */
|
|
@@ -11,12 +12,22 @@ const DEFAULT_ILINK_BOT_TYPE = "3";
|
|
|
11
12
|
/** Fixed API base URL for all QR code requests. */
|
|
12
13
|
const FIXED_BASE_URL = "https://ilinkai.weixin.qq.com";
|
|
13
14
|
const activeLogins = /* @__PURE__ */ new Map();
|
|
15
|
+
function cancelWeixinQrLogin(id) {
|
|
16
|
+
activeLogins.get(id)?.controller.abort();
|
|
17
|
+
activeLogins.delete(id);
|
|
18
|
+
}
|
|
19
|
+
function submitWeixinQrVerificationCode(id, code) {
|
|
20
|
+
const login = activeLogins.get(id);
|
|
21
|
+
if (!login?.status?.includes("need_verifycode") || !/^\d{4,8}$/.test(code)) return false;
|
|
22
|
+
login.verifyCode = code;
|
|
23
|
+
return true;
|
|
24
|
+
}
|
|
14
25
|
function isLoginFresh(login) {
|
|
15
26
|
return Date.now() - login.startedAt < ACTIVE_LOGIN_TTL_MS;
|
|
16
27
|
}
|
|
17
28
|
/** Remove all expired entries from the activeLogins map to prevent memory leaks. */
|
|
18
29
|
function purgeExpiredLogins() {
|
|
19
|
-
for (const [id, login] of activeLogins) if (!isLoginFresh(login))
|
|
30
|
+
for (const [id, login] of activeLogins) if (!isLoginFresh(login)) cancelWeixinQrLogin(id);
|
|
20
31
|
}
|
|
21
32
|
async function fetchQRCode(botType, routeTag) {
|
|
22
33
|
logger.info(`Fetching QR code from: ${FIXED_BASE_URL} bot_type=${botType}`);
|
|
@@ -28,17 +39,17 @@ async function fetchQRCode(botType, routeTag) {
|
|
|
28
39
|
});
|
|
29
40
|
return JSON.parse(rawText);
|
|
30
41
|
}
|
|
31
|
-
async function pollQRStatus(apiBaseUrl, qrcode, routeTag) {
|
|
42
|
+
async function pollQRStatus(apiBaseUrl, qrcode, routeTag, signal, verifyCode) {
|
|
32
43
|
logger.debug(`Long-poll QR status from: ${apiBaseUrl} qrcode=***`);
|
|
33
44
|
try {
|
|
34
45
|
const rawText = await apiGetFetch({
|
|
35
46
|
baseUrl: apiBaseUrl,
|
|
36
|
-
endpoint: `ilink/bot/get_qrcode_status?qrcode=${encodeURIComponent(qrcode)}`,
|
|
47
|
+
endpoint: `ilink/bot/get_qrcode_status?qrcode=${encodeURIComponent(qrcode)}${verifyCode ? `&verify_code=${encodeURIComponent(verifyCode)}` : ""}`,
|
|
37
48
|
timeoutMs: QR_LONG_POLL_TIMEOUT_MS,
|
|
38
49
|
label: "pollQRStatus",
|
|
39
|
-
routeTag
|
|
50
|
+
routeTag,
|
|
51
|
+
abortSignal: signal
|
|
40
52
|
});
|
|
41
|
-
logger.debug(`pollQRStatus: body=${rawText.substring(0, 200)}`);
|
|
42
53
|
return JSON.parse(rawText);
|
|
43
54
|
} catch (err) {
|
|
44
55
|
if (err instanceof Error && err.name === "AbortError") {
|
|
@@ -50,7 +61,7 @@ async function pollQRStatus(apiBaseUrl, qrcode, routeTag) {
|
|
|
50
61
|
}
|
|
51
62
|
}
|
|
52
63
|
async function startWeixinLoginWithQr(opts) {
|
|
53
|
-
const conversationId = opts.accountId || randomUUID();
|
|
64
|
+
const conversationId = opts.freshSession ? randomUUID() : opts.accountId || randomUUID();
|
|
54
65
|
purgeExpiredLogins();
|
|
55
66
|
const existing = activeLogins.get(conversationId);
|
|
56
67
|
if (!opts.force && existing && isLoginFresh(existing) && existing.qrcodeUrl) return {
|
|
@@ -63,13 +74,13 @@ async function startWeixinLoginWithQr(opts) {
|
|
|
63
74
|
logger.info(`Starting Weixin login with bot_type=${botType}`);
|
|
64
75
|
const qrResponse = await fetchQRCode(botType, opts.routeTag);
|
|
65
76
|
logger.info(`QR code received, qrcode=${redactToken(qrResponse.qrcode)} imgContentLen=${qrResponse.qrcode_img_content?.length ?? 0}`);
|
|
66
|
-
logger.info(`二维码链接: ${qrResponse.qrcode_img_content}`);
|
|
67
77
|
const login = {
|
|
68
78
|
conversationId,
|
|
69
79
|
id: randomUUID(),
|
|
70
80
|
qrcode: qrResponse.qrcode,
|
|
71
81
|
qrcodeUrl: qrResponse.qrcode_img_content,
|
|
72
|
-
startedAt: Date.now()
|
|
82
|
+
startedAt: Date.now(),
|
|
83
|
+
controller: new AbortController()
|
|
73
84
|
};
|
|
74
85
|
activeLogins.set(conversationId, login);
|
|
75
86
|
return {
|
|
@@ -118,9 +129,30 @@ async function waitForWeixinLogin(opts) {
|
|
|
118
129
|
const silent = Boolean(opts.silent);
|
|
119
130
|
activeLogin.currentApiBaseUrl = FIXED_BASE_URL;
|
|
120
131
|
logger.info("Starting to poll QR code status...");
|
|
121
|
-
|
|
132
|
+
const signal = activeLogin.controller.signal;
|
|
133
|
+
while (Date.now() < deadline && !signal.aborted) {
|
|
122
134
|
try {
|
|
123
|
-
|
|
135
|
+
let verifyCode = activeLogin.verifyCode;
|
|
136
|
+
if (activeLogin.status?.includes("need_verifycode") && !verifyCode) {
|
|
137
|
+
if (silent) {
|
|
138
|
+
await setTimeout$1(400, void 0, { signal });
|
|
139
|
+
continue;
|
|
140
|
+
}
|
|
141
|
+
const { createInterface } = await import("node:readline/promises");
|
|
142
|
+
const reader = createInterface({
|
|
143
|
+
input: process.stdin,
|
|
144
|
+
output: process.stdout
|
|
145
|
+
});
|
|
146
|
+
try {
|
|
147
|
+
verifyCode = (await reader.question("请输入微信显示的验证码:", { signal })).trim();
|
|
148
|
+
} finally {
|
|
149
|
+
reader.close();
|
|
150
|
+
}
|
|
151
|
+
if (!/^\d{4,8}$/.test(verifyCode)) continue;
|
|
152
|
+
}
|
|
153
|
+
activeLogin.verifyCode = void 0;
|
|
154
|
+
const statusResponse = await pollQRStatus(activeLogin.currentApiBaseUrl ?? FIXED_BASE_URL, activeLogin.qrcode, opts.routeTag, signal, verifyCode);
|
|
155
|
+
if (signal.aborted) break;
|
|
124
156
|
logger.debug(`pollQRStatus: status=${statusResponse.status} hasBotToken=${Boolean(statusResponse.bot_token)} hasBotId=${Boolean(statusResponse.ilink_bot_id)}`);
|
|
125
157
|
activeLogin.status = statusResponse.status;
|
|
126
158
|
switch (statusResponse.status) {
|
|
@@ -183,6 +215,8 @@ async function waitForWeixinLogin(opts) {
|
|
|
183
215
|
} else logger.warn(`waitForWeixinLogin: received scaned_but_redirect but redirect_host is missing, continuing with current host`);
|
|
184
216
|
break;
|
|
185
217
|
}
|
|
218
|
+
case "need_verifycode":
|
|
219
|
+
case "confirmed_but_need_verifycode": break;
|
|
186
220
|
case "confirmed":
|
|
187
221
|
if (!statusResponse.ilink_bot_id) {
|
|
188
222
|
activeLogins.delete(opts.conversationId);
|
|
@@ -205,11 +239,12 @@ async function waitForWeixinLogin(opts) {
|
|
|
205
239
|
};
|
|
206
240
|
}
|
|
207
241
|
} catch (err) {
|
|
208
|
-
|
|
242
|
+
if (signal.aborted) break;
|
|
243
|
+
logger.error({ errorType: err instanceof Error ? err.name : typeof err }, "Weixin QR status request failed");
|
|
209
244
|
activeLogins.delete(opts.conversationId);
|
|
210
245
|
return {
|
|
211
246
|
connected: false,
|
|
212
|
-
message:
|
|
247
|
+
message: "Login failed. Please retry."
|
|
213
248
|
};
|
|
214
249
|
}
|
|
215
250
|
await new Promise((r) => setTimeout(r, 1e3));
|
|
@@ -222,4 +257,4 @@ async function waitForWeixinLogin(opts) {
|
|
|
222
257
|
};
|
|
223
258
|
}
|
|
224
259
|
//#endregion
|
|
225
|
-
export { DEFAULT_ILINK_BOT_TYPE, getWeixinActiveLoginSnapshot, startWeixinLoginWithQr, waitForWeixinLogin };
|
|
260
|
+
export { DEFAULT_ILINK_BOT_TYPE, cancelWeixinQrLogin, getWeixinActiveLoginSnapshot, startWeixinLoginWithQr, submitWeixinQrVerificationCode, waitForWeixinLogin };
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
* Download and AES-128-ECB decrypt a CDN media file. Returns plaintext Buffer.
|
|
3
3
|
* aesKeyBase64: CDNMedia.aes_key JSON field (see parseAesKey for supported formats).
|
|
4
4
|
*/
|
|
5
|
-
export declare function downloadAndDecryptBuffer(encryptedQueryParam: string, aesKeyBase64: string, cdnBaseUrl: string, label: string, fullUrl?: string): Promise<Buffer>;
|
|
5
|
+
export declare function downloadAndDecryptBuffer(encryptedQueryParam: string, aesKeyBase64: string, cdnBaseUrl: string, label: string, fullUrl?: string, signal?: AbortSignal): Promise<Buffer>;
|
|
6
6
|
/**
|
|
7
7
|
* Download plain (unencrypted) bytes from the CDN. Returns the raw Buffer.
|
|
8
8
|
*/
|
|
9
|
-
export declare function downloadPlainCdnBuffer(encryptedQueryParam: string, cdnBaseUrl: string, label: string, fullUrl?: string): Promise<Buffer>;
|
|
9
|
+
export declare function downloadPlainCdnBuffer(encryptedQueryParam: string, cdnBaseUrl: string, label: string, fullUrl?: string, signal?: AbortSignal): Promise<Buffer>;
|
|
@@ -2,26 +2,40 @@ import { logger } from "../util/logger.js";
|
|
|
2
2
|
import { decryptAesEcb } from "./aes-ecb.js";
|
|
3
3
|
import { buildCdnDownloadUrl } from "./cdn-url.js";
|
|
4
4
|
//#region extensions/weixin/src/cdn/pic-decrypt.ts
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
5
|
+
const IDLE_TIMEOUT_MS = 15e3;
|
|
6
|
+
const MAX_DOWNLOAD_BYTES = 5242896;
|
|
7
|
+
async function fetchCdnBytes(url, label, parent) {
|
|
8
|
+
const timeout = new AbortController();
|
|
9
|
+
const signal = parent ? AbortSignal.any([parent, timeout.signal]) : timeout.signal;
|
|
10
|
+
let timer;
|
|
11
|
+
const resetTimer = () => {
|
|
12
|
+
if (timer) clearTimeout(timer);
|
|
13
|
+
timer = setTimeout(() => timeout.abort(/* @__PURE__ */ new Error("Weixin media download stalled")), IDLE_TIMEOUT_MS);
|
|
14
|
+
};
|
|
15
|
+
resetTimer();
|
|
16
|
+
let reader;
|
|
10
17
|
try {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
18
|
+
const response = await fetch(url, { signal });
|
|
19
|
+
if (!response.ok || !response.body) throw new Error(`${label}: CDN download returned HTTP ${response.status}`);
|
|
20
|
+
if (Number(response.headers.get("content-length")) > MAX_DOWNLOAD_BYTES) throw new Error("Weixin media exceeds the attachment limit");
|
|
21
|
+
reader = response.body.getReader();
|
|
22
|
+
const parts = [];
|
|
23
|
+
let bytes = 0;
|
|
24
|
+
resetTimer();
|
|
25
|
+
while (true) {
|
|
26
|
+
const { done, value } = await reader.read();
|
|
27
|
+
if (done) return Buffer.concat(parts, bytes);
|
|
28
|
+
if (!value.length) continue;
|
|
29
|
+
bytes += value.length;
|
|
30
|
+
if (bytes > MAX_DOWNLOAD_BYTES) throw new Error("Weixin media exceeds the attachment limit");
|
|
31
|
+
parts.push(value);
|
|
32
|
+
resetTimer();
|
|
33
|
+
}
|
|
34
|
+
} finally {
|
|
35
|
+
if (timer) clearTimeout(timer);
|
|
36
|
+
timeout.abort();
|
|
37
|
+
if (reader) await reader.cancel().catch(() => {});
|
|
23
38
|
}
|
|
24
|
-
return Buffer.from(await res.arrayBuffer());
|
|
25
39
|
}
|
|
26
40
|
/**
|
|
27
41
|
* Parse CDNMedia.aes_key into a raw 16-byte AES key.
|
|
@@ -37,7 +51,7 @@ function parseAesKey(aesKeyBase64, label) {
|
|
|
37
51
|
const decoded = Buffer.from(aesKeyBase64, "base64");
|
|
38
52
|
if (decoded.length === 16) return decoded;
|
|
39
53
|
if (decoded.length === 32 && /^[0-9a-fA-F]{32}$/.test(decoded.toString("ascii"))) return Buffer.from(decoded.toString("ascii"), "hex");
|
|
40
|
-
const msg = `${label}: aes_key must decode to 16 raw bytes or 32-char hex string, got ${decoded.length} bytes
|
|
54
|
+
const msg = `${label}: aes_key must decode to 16 raw bytes or 32-char hex string, got ${decoded.length} bytes`;
|
|
41
55
|
logger.error(msg);
|
|
42
56
|
throw new Error(msg);
|
|
43
57
|
}
|
|
@@ -45,13 +59,12 @@ function parseAesKey(aesKeyBase64, label) {
|
|
|
45
59
|
* Download and AES-128-ECB decrypt a CDN media file. Returns plaintext Buffer.
|
|
46
60
|
* aesKeyBase64: CDNMedia.aes_key JSON field (see parseAesKey for supported formats).
|
|
47
61
|
*/
|
|
48
|
-
async function downloadAndDecryptBuffer(encryptedQueryParam, aesKeyBase64, cdnBaseUrl, label, fullUrl) {
|
|
62
|
+
async function downloadAndDecryptBuffer(encryptedQueryParam, aesKeyBase64, cdnBaseUrl, label, fullUrl, signal) {
|
|
49
63
|
const key = parseAesKey(aesKeyBase64, label);
|
|
50
64
|
let url;
|
|
51
65
|
if (fullUrl) url = fullUrl;
|
|
52
66
|
else url = buildCdnDownloadUrl(encryptedQueryParam, cdnBaseUrl);
|
|
53
|
-
|
|
54
|
-
const encrypted = await fetchCdnBytes(url, label);
|
|
67
|
+
const encrypted = await fetchCdnBytes(url, label, signal);
|
|
55
68
|
logger.debug(`${label}: downloaded ${encrypted.byteLength} bytes, decrypting`);
|
|
56
69
|
const decrypted = decryptAesEcb(encrypted, key);
|
|
57
70
|
logger.debug(`${label}: decrypted ${decrypted.length} bytes`);
|
|
@@ -60,12 +73,11 @@ async function downloadAndDecryptBuffer(encryptedQueryParam, aesKeyBase64, cdnBa
|
|
|
60
73
|
/**
|
|
61
74
|
* Download plain (unencrypted) bytes from the CDN. Returns the raw Buffer.
|
|
62
75
|
*/
|
|
63
|
-
async function downloadPlainCdnBuffer(encryptedQueryParam, cdnBaseUrl, label, fullUrl) {
|
|
76
|
+
async function downloadPlainCdnBuffer(encryptedQueryParam, cdnBaseUrl, label, fullUrl, signal) {
|
|
64
77
|
let url;
|
|
65
78
|
if (fullUrl) url = fullUrl;
|
|
66
79
|
else url = buildCdnDownloadUrl(encryptedQueryParam, cdnBaseUrl);
|
|
67
|
-
|
|
68
|
-
return fetchCdnBytes(url, label);
|
|
80
|
+
return fetchCdnBytes(url, label, signal);
|
|
69
81
|
}
|
|
70
82
|
//#endregion
|
|
71
83
|
export { downloadAndDecryptBuffer, downloadPlainCdnBuffer };
|
|
@@ -19,6 +19,13 @@ export type WeixinGatewayQrLoginStatus = {
|
|
|
19
19
|
phase: "unknown";
|
|
20
20
|
message: string;
|
|
21
21
|
};
|
|
22
|
+
export declare function getDeferredWeixinLogin(id: string): {
|
|
23
|
+
accountId: string;
|
|
24
|
+
ownerId?: string;
|
|
25
|
+
persist: () => void;
|
|
26
|
+
cleanup: () => void;
|
|
27
|
+
};
|
|
28
|
+
export declare function cancelWeixinGatewayQrLogin(id: string): void;
|
|
22
29
|
export declare function getWeixinGatewayQrLoginStatus(conversationId: string): WeixinGatewayQrLoginStatus;
|
|
23
30
|
export type WeixinGatewayQrLoginStartOptions = {
|
|
24
31
|
configPath?: string;
|
|
@@ -27,6 +34,7 @@ export type WeixinGatewayQrLoginStartOptions = {
|
|
|
27
34
|
verbose?: boolean;
|
|
28
35
|
/** Config snapshot from the already-running gateway; avoids loading the heavy config loader from Electron dynamic extension code. */
|
|
29
36
|
initialConfig?: Config;
|
|
37
|
+
deferPersistence?: boolean;
|
|
30
38
|
/** After credentials + config file are written (or login failed after wait). */
|
|
31
39
|
onPersisted?: (r: {
|
|
32
40
|
ok: boolean;
|
|
@@ -2,7 +2,7 @@ import { logger } from "../util/logger.js";
|
|
|
2
2
|
import { normalizeWeixinAccountId } from "../auth/weixin-account-id.js";
|
|
3
3
|
import { clearStaleAccountsForUserId, registerWeixinAccountId, saveWeixinAccount } from "../auth/accounts.js";
|
|
4
4
|
import { clearContextTokensForAccount } from "../messaging/inbound.js";
|
|
5
|
-
import { getWeixinActiveLoginSnapshot, startWeixinLoginWithQr, waitForWeixinLogin } from "../auth/login-qr.js";
|
|
5
|
+
import { cancelWeixinQrLogin, getWeixinActiveLoginSnapshot, startWeixinLoginWithQr, waitForWeixinLogin } from "../auth/login-qr.js";
|
|
6
6
|
import { getWeixinLoginApiContext, mergeWeixinConfigAfterLogin } from "./qr-login.js";
|
|
7
7
|
import { readFileSync, writeFileSync } from "node:fs";
|
|
8
8
|
//#region extensions/weixin/src/cli/gateway-qr-login.ts
|
|
@@ -10,6 +10,15 @@ import { readFileSync, writeFileSync } from "node:fs";
|
|
|
10
10
|
* Gateway / web UI: start Weixin QR login, poll status, persist credentials (same as CLI).
|
|
11
11
|
*/
|
|
12
12
|
const completedSessions = /* @__PURE__ */ new Map();
|
|
13
|
+
const deferredLogins = /* @__PURE__ */ new Map();
|
|
14
|
+
function getDeferredWeixinLogin(id) {
|
|
15
|
+
return deferredLogins.get(id);
|
|
16
|
+
}
|
|
17
|
+
function cancelWeixinGatewayQrLogin(id) {
|
|
18
|
+
cancelWeixinQrLogin(id);
|
|
19
|
+
deferredLogins.delete(id);
|
|
20
|
+
completedSessions.delete(id);
|
|
21
|
+
}
|
|
13
22
|
function loadConfigSnapshot(configPath, fallback) {
|
|
14
23
|
if (fallback) return fallback;
|
|
15
24
|
if (!configPath) return {};
|
|
@@ -25,7 +34,10 @@ function saveConfigSnapshot(configPath, config) {
|
|
|
25
34
|
}
|
|
26
35
|
function rememberCompleted(conversationId, state) {
|
|
27
36
|
completedSessions.set(conversationId, state);
|
|
28
|
-
setTimeout(() =>
|
|
37
|
+
setTimeout(() => {
|
|
38
|
+
completedSessions.delete(conversationId);
|
|
39
|
+
deferredLogins.delete(conversationId);
|
|
40
|
+
}, 5 * 6e4).unref();
|
|
29
41
|
}
|
|
30
42
|
function getWeixinGatewayQrLoginStatus(conversationId) {
|
|
31
43
|
const done = completedSessions.get(conversationId);
|
|
@@ -63,6 +75,7 @@ async function startWeixinGatewayQrLogin(opts) {
|
|
|
63
75
|
const verbose = Boolean(opts.verbose);
|
|
64
76
|
const startResult = await startWeixinLoginWithQr({
|
|
65
77
|
accountId: opts.account?.trim() || void 0,
|
|
78
|
+
freshSession: opts.deferPersistence,
|
|
66
79
|
botType: "3",
|
|
67
80
|
routeTag,
|
|
68
81
|
verbose
|
|
@@ -95,14 +108,33 @@ async function startWeixinGatewayQrLogin(opts) {
|
|
|
95
108
|
return;
|
|
96
109
|
}
|
|
97
110
|
const normalizedId = normalizeWeixinAccountId(waitResult.accountId);
|
|
98
|
-
|
|
111
|
+
const persist = () => {
|
|
99
112
|
saveWeixinAccount(normalizedId, {
|
|
100
113
|
token: waitResult.botToken,
|
|
101
114
|
baseUrl: waitResult.baseUrl?.trim() || baseUrl,
|
|
102
115
|
userId: waitResult.userId
|
|
103
116
|
});
|
|
104
117
|
registerWeixinAccountId(normalizedId);
|
|
118
|
+
};
|
|
119
|
+
const cleanup = () => {
|
|
105
120
|
if (waitResult.userId) clearStaleAccountsForUserId(normalizedId, waitResult.userId, clearContextTokensForAccount);
|
|
121
|
+
};
|
|
122
|
+
if (opts.deferPersistence) {
|
|
123
|
+
deferredLogins.set(conversationId, {
|
|
124
|
+
accountId: normalizedId,
|
|
125
|
+
ownerId: waitResult.userId,
|
|
126
|
+
persist,
|
|
127
|
+
cleanup
|
|
128
|
+
});
|
|
129
|
+
rememberCompleted(conversationId, {
|
|
130
|
+
phase: "done",
|
|
131
|
+
ok: true,
|
|
132
|
+
accountId: normalizedId
|
|
133
|
+
});
|
|
134
|
+
return;
|
|
135
|
+
}
|
|
136
|
+
try {
|
|
137
|
+
persist();
|
|
106
138
|
} catch (err) {
|
|
107
139
|
const message = `Saved login failed: ${String(err)}`;
|
|
108
140
|
logger.error(message);
|
|
@@ -118,8 +150,9 @@ async function startWeixinGatewayQrLogin(opts) {
|
|
|
118
150
|
return;
|
|
119
151
|
}
|
|
120
152
|
try {
|
|
121
|
-
const nextCfg = mergeWeixinConfigAfterLogin(cfg, normalizedId);
|
|
153
|
+
const nextCfg = mergeWeixinConfigAfterLogin(cfg, normalizedId, waitResult.userId);
|
|
122
154
|
saveConfigSnapshot(configPath, nextCfg);
|
|
155
|
+
cleanup();
|
|
123
156
|
await opts.onPersisted?.({
|
|
124
157
|
ok: true,
|
|
125
158
|
accountId: normalizedId,
|
|
@@ -146,7 +179,13 @@ async function startWeixinGatewayQrLogin(opts) {
|
|
|
146
179
|
ok: true,
|
|
147
180
|
accountId: normalizedId
|
|
148
181
|
});
|
|
149
|
-
})()
|
|
182
|
+
})().catch(() => {
|
|
183
|
+
rememberCompleted(conversationId, {
|
|
184
|
+
phase: "done",
|
|
185
|
+
ok: false,
|
|
186
|
+
message: "Weixin login failed."
|
|
187
|
+
});
|
|
188
|
+
});
|
|
150
189
|
return {
|
|
151
190
|
ok: true,
|
|
152
191
|
conversationId,
|
|
@@ -154,4 +193,4 @@ async function startWeixinGatewayQrLogin(opts) {
|
|
|
154
193
|
};
|
|
155
194
|
}
|
|
156
195
|
//#endregion
|
|
157
|
-
export { getWeixinGatewayQrLoginStatus, startWeixinGatewayQrLogin };
|
|
196
|
+
export { cancelWeixinGatewayQrLogin, getDeferredWeixinLogin, getWeixinGatewayQrLoginStatus, startWeixinGatewayQrLogin };
|
|
@@ -22,7 +22,7 @@ export declare function getWeixinLoginApiContext(cfg: Config, accountHint?: stri
|
|
|
22
22
|
baseUrl: string;
|
|
23
23
|
routeTag?: string;
|
|
24
24
|
};
|
|
25
|
-
export declare function mergeWeixinConfigAfterLogin(cfg: Config, normalizedAccountId: string): Config;
|
|
25
|
+
export declare function mergeWeixinConfigAfterLogin(cfg: Config, normalizedAccountId: string, ownerId?: string): Config;
|
|
26
26
|
/**
|
|
27
27
|
* Run interactive Weixin QR login (terminal QR + long-poll until confirmed or timeout).
|
|
28
28
|
*/
|
|
@@ -21,7 +21,7 @@ function getWeixinLoginApiContext(cfg, accountHint) {
|
|
|
21
21
|
routeTag: sectionRouteTag
|
|
22
22
|
};
|
|
23
23
|
}
|
|
24
|
-
function mergeWeixinConfigAfterLogin(cfg, normalizedAccountId) {
|
|
24
|
+
function mergeWeixinConfigAfterLogin(cfg, normalizedAccountId, ownerId) {
|
|
25
25
|
const prev = cfg.channels?.weixin;
|
|
26
26
|
const prevAccounts = prev?.accounts ?? {};
|
|
27
27
|
const merged = {
|
|
@@ -34,7 +34,13 @@ function mergeWeixinConfigAfterLogin(cfg, normalizedAccountId) {
|
|
|
34
34
|
accounts: {
|
|
35
35
|
...prevAccounts,
|
|
36
36
|
[normalizedAccountId]: {
|
|
37
|
-
...prevAccounts[normalizedAccountId] ?? {
|
|
37
|
+
...prevAccounts[normalizedAccountId] ?? (ownerId?.trim() ? {
|
|
38
|
+
dmPolicy: "allowlist",
|
|
39
|
+
allowFrom: [ownerId.trim()]
|
|
40
|
+
} : {
|
|
41
|
+
dmPolicy: "pairing",
|
|
42
|
+
allowFrom: []
|
|
43
|
+
}),
|
|
38
44
|
enabled: true
|
|
39
45
|
}
|
|
40
46
|
}
|
|
@@ -110,7 +116,7 @@ async function runWeixinQrLoginCli(opts) {
|
|
|
110
116
|
};
|
|
111
117
|
}
|
|
112
118
|
if (opts.writeConfig !== false) try {
|
|
113
|
-
const next = mergeWeixinConfigAfterLogin(cfg, normalizedId);
|
|
119
|
+
const next = mergeWeixinConfigAfterLogin(cfg, normalizedId, waitResult.userId);
|
|
114
120
|
const { saveConfig } = await import("../../../../src/config/loader.js");
|
|
115
121
|
await saveConfig(next, configPath);
|
|
116
122
|
} catch (err) {
|
|
@@ -16,9 +16,8 @@ async function downloadMediaFromItem(item, deps) {
|
|
|
16
16
|
const img = item.image_item;
|
|
17
17
|
if (!img?.media?.encrypt_query_param && !img?.media?.full_url) return result;
|
|
18
18
|
const aesKeyBase64 = img.aeskey ? Buffer.from(img.aeskey, "hex").toString("base64") : img.media.aes_key;
|
|
19
|
-
logger.debug(`${label} image: encrypt_query_param=${(img.media.encrypt_query_param ?? "").slice(0, 40)}... hasAesKey=${Boolean(aesKeyBase64)} aeskeySource=${img.aeskey ? "image_item.aeskey" : "media.aes_key"} full_url=${Boolean(img.media.full_url)}`);
|
|
20
19
|
try {
|
|
21
|
-
const saved = await saveMedia(aesKeyBase64 ? await downloadAndDecryptBuffer(img.media.encrypt_query_param ?? "", aesKeyBase64, cdnBaseUrl, `${label} image`, img.media.full_url) : await downloadPlainCdnBuffer(img.media.encrypt_query_param ?? "", cdnBaseUrl, `${label} image-plain`, img.media.full_url), void 0, "inbound", WEIXIN_MEDIA_MAX_BYTES);
|
|
20
|
+
const saved = await saveMedia(aesKeyBase64 ? await downloadAndDecryptBuffer(img.media.encrypt_query_param ?? "", aesKeyBase64, cdnBaseUrl, `${label} image`, img.media.full_url, deps.signal) : await downloadPlainCdnBuffer(img.media.encrypt_query_param ?? "", cdnBaseUrl, `${label} image-plain`, img.media.full_url, deps.signal), void 0, "inbound", WEIXIN_MEDIA_MAX_BYTES);
|
|
22
21
|
result.decryptedPicPath = saved.path;
|
|
23
22
|
logger.debug(`${label} image saved: ${saved.path}`);
|
|
24
23
|
} catch (err) {
|
|
@@ -29,7 +28,7 @@ async function downloadMediaFromItem(item, deps) {
|
|
|
29
28
|
const voice = item.voice_item;
|
|
30
29
|
if (!voice?.media?.encrypt_query_param && !voice?.media?.full_url || !voice.media.aes_key) return result;
|
|
31
30
|
try {
|
|
32
|
-
const silkBuf = await downloadAndDecryptBuffer(voice.media.encrypt_query_param ?? "", voice.media.aes_key, cdnBaseUrl, `${label} voice`, voice.media.full_url);
|
|
31
|
+
const silkBuf = await downloadAndDecryptBuffer(voice.media.encrypt_query_param ?? "", voice.media.aes_key, cdnBaseUrl, `${label} voice`, voice.media.full_url, deps.signal);
|
|
33
32
|
logger.debug(`${label} voice: decrypted ${silkBuf.length} bytes, attempting silk transcode`);
|
|
34
33
|
const wavBuf = await silkToWav(silkBuf);
|
|
35
34
|
if (wavBuf) {
|
|
@@ -51,7 +50,7 @@ async function downloadMediaFromItem(item, deps) {
|
|
|
51
50
|
const fileItem = item.file_item;
|
|
52
51
|
if (!fileItem?.media?.encrypt_query_param && !fileItem?.media?.full_url || !fileItem.media.aes_key) return result;
|
|
53
52
|
try {
|
|
54
|
-
const buf = await downloadAndDecryptBuffer(fileItem.media.encrypt_query_param ?? "", fileItem.media.aes_key, cdnBaseUrl, `${label} file`, fileItem.media.full_url);
|
|
53
|
+
const buf = await downloadAndDecryptBuffer(fileItem.media.encrypt_query_param ?? "", fileItem.media.aes_key, cdnBaseUrl, `${label} file`, fileItem.media.full_url, deps.signal);
|
|
55
54
|
const mime = getMimeFromFilename(fileItem.file_name ?? "file.bin");
|
|
56
55
|
const saved = await saveMedia(buf, mime, "inbound", WEIXIN_MEDIA_MAX_BYTES, fileItem.file_name ?? void 0);
|
|
57
56
|
result.decryptedFilePath = saved.path;
|
|
@@ -65,7 +64,7 @@ async function downloadMediaFromItem(item, deps) {
|
|
|
65
64
|
const videoItem = item.video_item;
|
|
66
65
|
if (!videoItem?.media?.encrypt_query_param && !videoItem?.media?.full_url || !videoItem.media.aes_key) return result;
|
|
67
66
|
try {
|
|
68
|
-
const saved = await saveMedia(await downloadAndDecryptBuffer(videoItem.media.encrypt_query_param ?? "", videoItem.media.aes_key, cdnBaseUrl, `${label} video`, videoItem.media.full_url), "video/mp4", "inbound", WEIXIN_MEDIA_MAX_BYTES);
|
|
67
|
+
const saved = await saveMedia(await downloadAndDecryptBuffer(videoItem.media.encrypt_query_param ?? "", videoItem.media.aes_key, cdnBaseUrl, `${label} video`, videoItem.media.full_url, deps.signal), "video/mp4", "inbound", WEIXIN_MEDIA_MAX_BYTES);
|
|
69
68
|
result.decryptedVideoPath = saved.path;
|
|
70
69
|
logger.debug(`${label} video: saved to ${saved.path}`);
|
|
71
70
|
} catch (err) {
|
|
@@ -11,5 +11,7 @@ export type ProcessWeixinMessageDeps = {
|
|
|
11
11
|
cdnBaseUrl: string;
|
|
12
12
|
token?: string;
|
|
13
13
|
routeTag?: string;
|
|
14
|
+
delivery?: Parameters<MessageBus['publishInbound']>[1];
|
|
15
|
+
abortSignal?: AbortSignal;
|
|
14
16
|
};
|
|
15
17
|
export declare function processWeixinInboundMessage(full: WeixinMessage, deps: ProcessWeixinMessageDeps): Promise<void>;
|