@michengai/dsh-im-connect 1.0.11 → 1.0.12
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/CHANGELOG.md +7 -0
- package/CHANGELOG.zh-CN.md +7 -0
- package/client.js +60 -6
- package/lib/channels/channel-image-download.d.ts +8 -5
- package/lib/channels/channel-image-download.d.ts.map +1 -1
- package/lib/channels/channel-image-download.js +70 -2
- package/lib/channels/channel-image-download.js.map +1 -1
- package/lib/channels/diagnostics.d.ts +1 -1
- package/lib/channels/diagnostics.d.ts.map +1 -1
- package/lib/channels/diagnostics.js +2 -2
- package/lib/channels/diagnostics.js.map +1 -1
- package/lib/channels/discord.d.ts +3 -0
- package/lib/channels/discord.d.ts.map +1 -1
- package/lib/channels/discord.js +56 -7
- package/lib/channels/discord.js.map +1 -1
- package/lib/channels/factory.d.ts.map +1 -1
- package/lib/channels/factory.js +8 -2
- package/lib/channels/factory.js.map +1 -1
- package/lib/channels/file-send.d.ts +1 -1
- package/lib/channels/file-send.d.ts.map +1 -1
- package/lib/channels/file-send.js +2 -2
- package/lib/channels/file-send.js.map +1 -1
- package/lib/channels/meta.d.ts +2 -0
- package/lib/channels/meta.d.ts.map +1 -1
- package/lib/channels/meta.js +2 -0
- package/lib/channels/meta.js.map +1 -1
- package/lib/channels/telegram.d.ts +2 -0
- package/lib/channels/telegram.d.ts.map +1 -1
- package/lib/channels/telegram.js +29 -6
- package/lib/channels/telegram.js.map +1 -1
- package/lib/client.js +60 -6
- package/lib/manager.d.ts +8 -0
- package/lib/manager.d.ts.map +1 -1
- package/lib/manager.js +146 -32
- package/lib/manager.js.map +1 -1
- package/package.json +5 -4
- package/src/channels/channel-image-download.ts +83 -5
- package/src/channels/diagnostics.ts +2 -2
- package/src/channels/discord.ts +49 -7
- package/src/channels/factory.ts +8 -2
- package/src/channels/file-send.ts +2 -2
- package/src/channels/meta.ts +4 -0
- package/src/channels/telegram.ts +22 -6
- package/src/manager.ts +136 -30
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 1.0.12 - 2026-10-21
|
|
4
|
+
|
|
5
|
+
- Support per-account outbound proxy configuration for Telegram and Discord: choose between following host proxy (default), connecting directly, or configuring custom HTTP/HTTPS proxies.
|
|
6
|
+
- Route all Telegram and Discord outbound traffic through the configured proxy, including REST APIs, Telegram long polling, Discord Gateway WebSocket connections, file transfers, connection diagnostics, and inbound media/attachment downloads.
|
|
7
|
+
- Display proxy addresses as standard text fields with reflection and draft retention while keeping credentials securely stored in the local vault, and avoid unnecessary channel restarts when editing unrelated account settings.
|
|
8
|
+
- Improve Discord Gateway reconnection resilience: dynamically recreate closed dispatchers on reconnect, and automatically clear expired session cursors to fall back to a fresh Identify immediately when receiving Opcode 9 (`Invalid Session`).
|
|
9
|
+
|
|
3
10
|
## 1.0.11 - 2026-10-21
|
|
4
11
|
|
|
5
12
|
- Fix Feishu and Lark replies failing to fall back to plain text when a card is rejected with HTTP 400, such as a reply containing a local inline image. The fallback preserves the full text, image description, and path; it does not upload or render the local image.
|
package/CHANGELOG.zh-CN.md
CHANGED
|
@@ -4,6 +4,13 @@
|
|
|
4
4
|
|
|
5
5
|
以下记录近期发布的版本。Git 标签与 GitHub Release 现已和这些条目同步;历史条目继续保留原始发布提交链接。
|
|
6
6
|
|
|
7
|
+
## 1.0.12 - 2026-10-21
|
|
8
|
+
|
|
9
|
+
- 支持 Telegram 与 Discord 按账号独立配置出站代理:可在账号设置中选择跟随宿主(默认)、直连或手动配置 HTTP/HTTPS 代理。
|
|
10
|
+
- 覆盖全链路出站代理分流:包含 REST Web API、Telegram 长轮询、Discord Gateway WebSocket 连接与重连、文件发送、连接诊断以及入站图片和附件下载。
|
|
11
|
+
- 代理输入框使用标准文本框并支持地址反显与草稿保留,底层统一安全存储于本地凭据库;修改无关设置时避免触发通道不必要的重启。
|
|
12
|
+
- 优化 Discord Gateway 重连韧性:在重连时动态恢复存活的 Dispatcher 连接池;当服务端旧会话游标失效(收到 Opcode 9)时自动清空游标并立即回退到全新 Identify 握手,消除通道卡在重连中的问题。
|
|
13
|
+
|
|
7
14
|
## 1.0.11 - 2026-10-21
|
|
8
15
|
|
|
9
16
|
- 修复飞书和 Lark 回复卡片因本地内联图片等内容被平台以 HTTP 400 拒绝时,未尝试纯文本回退的问题。回退保留完整正文、图片说明和路径,不会自动上传或渲染本地图片。
|
package/client.js
CHANGED
|
@@ -611,7 +611,7 @@ window.__ModuleLoader__.load({
|
|
|
611
611
|
"settings.label": "IM助理", "settings.title": "IM助理", "settings.description": "管理各渠道账号。每个账号独立选择工作区、模型和权限,配置仅保存在本机。", "settings.viewProject": "GitHub", "settings.feedback": "问题反馈",
|
|
612
612
|
"settings.aria": "IM助理", "settings.publicChatNotice": "未批准用户可以发起聊天,但不能批准工具调用。", "pending.notice": "有访问请求。批准后该用户才能驱动本机助手。", "action.approve": "批准", "action.deny": "拒绝", "loading": "加载中…",
|
|
613
613
|
"account.presetUnavailable": "预设不可用", "account.presetNote": "更改后使用新会话,旧会话保留。", "action.settings": "设置", "command.dm": "私聊命令", "command.group": "群聊命令", "command.enabled": "可以执行命令", "command.disabled": "仅正常对话",
|
|
614
|
-
"account.workspace": "工作区", "account.currentWorkspace": "当前工作区", "account.selectWorkspace": "请选择工作区", "account.selectModel": "请选择模型", "account.selectPermission": "请选择权限", "account.privateAccess": "私聊准入", "account.privateApproved": "仅已批准用户", "account.privateAll": "允许所有私聊用户", "account.sendMode": "发送方式", "account.sendQueue": "排队发送", "account.sendSteer": "插话发送", "account.sendSteerNote": "插话发送会把消息作为补充指令立即交给运行中的任务;任务空闲时与排队发送相同。", "account.autoNameNote": "绑定成功后会自动生成账号名,无需手动填写。需要区分使用者时,可在账号行填写备注。", "account.defaultName": "{channel}账号 {count}",
|
|
614
|
+
"account.workspace": "工作区", "account.currentWorkspace": "当前工作区", "account.selectWorkspace": "请选择工作区", "account.selectModel": "请选择模型", "account.selectPermission": "请选择权限", "account.privateAccess": "私聊准入", "account.privateApproved": "仅已批准用户", "account.privateAll": "允许所有私聊用户", "account.sendMode": "发送方式", "account.sendQueue": "排队发送", "account.sendSteer": "插话发送", "account.sendSteerNote": "插话发送会把消息作为补充指令立即交给运行中的任务;任务空闲时与排队发送相同。", "account.autoNameNote": "绑定成功后会自动生成账号名,无需手动填写。需要区分使用者时,可在账号行填写备注。", "account.proxyMode": "网络代理", "account.proxyInherit": "跟随宿主", "account.proxyDirect": "直接连接", "account.proxyCustom": "手动配置", "account.proxyUrl": "代理地址", "account.proxyNote": "仅影响当前账号;保存后自动重连生效。", "account.proxySaved": "代理地址已保存;留空保存可保留当前地址。", "account.defaultName": "{channel}账号 {count}",
|
|
615
615
|
"account.remark": "名称备注", "account.remarkNote": "只在本机设置页区分账号,留空恢复自动名称。", "account.rename": "修改名称备注",
|
|
616
616
|
"account.count": "{count} 个账号", "account.statusProcessing": "处理中…", "account.statusNotConnected": "未连接", "account.receive": "接收消息", "account.receiveDescription": "关闭后保留账号配置,但不接收新消息", "account.removeConfirm": "确定移除这个账号?本机保存的配置和凭据将一并删除。",
|
|
617
617
|
"action.addAccount": "添加账号", "action.generateQr": "生成二维码", "action.checkConnection": "诊断连接", "action.reconnectAccount": "重新连接", "action.removeAccount": "移除接入", "status.saving": "保存中…", "status.saved": "已保存",
|
|
@@ -640,7 +640,7 @@ window.__ModuleLoader__.load({
|
|
|
640
640
|
"settings.label": "IM Assistant", "settings.title": "IM Assistant", "settings.description": "Manage accounts across channels. Each account has its own workspace, model, and permission settings, stored only on this machine.", "settings.viewProject": "GitHub", "settings.feedback": "Issues",
|
|
641
641
|
"settings.aria": "IM Assistant", "settings.publicChatNotice": "Unapproved users can start chats, but they cannot approve tool calls.", "pending.notice": "There are access requests. Approve a user before they can control the local assistant.", "action.approve": "Approve", "action.deny": "Deny", "loading": "Loading…",
|
|
642
642
|
"account.presetUnavailable": "Preset unavailable", "account.presetNote": "Changes start a new session; previous sessions are kept.", "action.settings": "Settings", "command.dm": "DM commands", "command.group": "Group commands", "command.enabled": "Commands enabled", "command.disabled": "Conversation only",
|
|
643
|
-
"account.workspace": "Workspace", "account.currentWorkspace": "Current workspace", "account.selectWorkspace": "Select a workspace", "account.selectModel": "Select a model", "account.selectPermission": "Select a permission", "account.privateAccess": "Private chat access", "account.privateApproved": "Approved users only", "account.privateAll": "Allow all DM users", "account.sendMode": "Send mode", "account.sendQueue": "Queue", "account.sendSteer": "Steer", "account.sendSteerNote": "Steer hands the message to the running task as additional instructions at its next step; when the task is idle it behaves like Queue.", "account.autoNameNote": "The account name is generated automatically after setup. Add a remark on the account row if you need to tell users apart.", "account.defaultName": "{channel} account {count}",
|
|
643
|
+
"account.workspace": "Workspace", "account.currentWorkspace": "Current workspace", "account.selectWorkspace": "Select a workspace", "account.selectModel": "Select a model", "account.selectPermission": "Select a permission", "account.privateAccess": "Private chat access", "account.privateApproved": "Approved users only", "account.privateAll": "Allow all DM users", "account.sendMode": "Send mode", "account.sendQueue": "Queue", "account.sendSteer": "Steer", "account.sendSteerNote": "Steer hands the message to the running task as additional instructions at its next step; when the task is idle it behaves like Queue.", "account.autoNameNote": "The account name is generated automatically after setup. Add a remark on the account row if you need to tell users apart.", "account.proxyMode": "Network proxy", "account.proxyInherit": "Follow Host", "account.proxyDirect": "Connect directly", "account.proxyCustom": "Configure manually", "account.proxyUrl": "Proxy address", "account.proxyNote": "Affects only this account. The channel reconnects automatically after saving.", "account.proxySaved": "A proxy address is saved. Leave the field blank to keep it.", "account.defaultName": "{channel} account {count}",
|
|
644
644
|
"account.remark": "Name remark", "account.remarkNote": "Shown only in settings to tell accounts apart. Leave blank to restore the automatic name.", "account.rename": "Edit name remark",
|
|
645
645
|
"account.count": "{count} accounts", "account.statusProcessing": "Processing…", "account.statusNotConnected": "Not connected", "account.receive": "Receive messages", "account.receiveDescription": "Turn this off to keep the account settings without receiving new messages", "account.removeConfirm": "Remove this account? Its saved settings and credentials will also be deleted.",
|
|
646
646
|
"action.addAccount": "Add account", "action.generateQr": "Generate QR code", "action.checkConnection": "Diagnose connection", "action.reconnectAccount": "Reconnect", "action.removeAccount": "Remove", "status.saving": "Saving…", "status.saved": "Saved",
|
|
@@ -810,6 +810,8 @@ window.__ModuleLoader__.load({
|
|
|
810
810
|
.ima-bind-modal>.ima-modal-content,.ima-account-modal>.ima-modal-content{flex:1 1 auto;min-height:0;overflow-y:auto;overscroll-behavior:contain;scrollbar-gutter:stable}
|
|
811
811
|
.ima-account-settings{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:14px 16px;width:100%;box-sizing:border-box}
|
|
812
812
|
.ima-account-settings.compact{grid-template-columns:1fr}
|
|
813
|
+
.ima-proxy-settings{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:14px 16px;width:100%;box-sizing:border-box}
|
|
814
|
+
.ima-proxy-settings>.ima-picker-note{grid-column:1/-1}
|
|
813
815
|
.ima-picker-field{display:flex;min-width:0;width:100%;flex-direction:column;gap:6px;box-sizing:border-box}
|
|
814
816
|
.ima-picker-field.wide,.ima-picker-note,.ima-model-effort{grid-column:1/-1}
|
|
815
817
|
.ima-model-effort{display:grid;grid-template-columns:1fr 1fr;gap:14px 16px;min-width:0;width:100%;box-sizing:border-box}
|
|
@@ -1605,7 +1607,7 @@ window.__ModuleLoader__.load({
|
|
|
1605
1607
|
)
|
|
1606
1608
|
),
|
|
1607
1609
|
hasManual && h("div", showTabs ? { className: "ima-bind-panel", id: "ima-bind-panel-manual", role: "tabpanel", "aria-labelledby": "ima-bind-tab-manual", hidden: tab !== "manual" } : null,
|
|
1608
|
-
...ch.fields.map((f) => h("label", { key: f.key, className: "ima-field" },
|
|
1610
|
+
...ch.fields.filter((f) => !f.settingsOnly).map((f) => h("label", { key: f.key, className: "ima-field" },
|
|
1609
1611
|
fieldLabel(ch, f, t),
|
|
1610
1612
|
h(Input, {
|
|
1611
1613
|
type: f.secret ? "password" : "text",
|
|
@@ -1931,6 +1933,8 @@ window.__ModuleLoader__.load({
|
|
|
1931
1933
|
function AccountInspector({ account, catalog, permissions, agentPresets, workspaces, createWorkspace, pickDirectory, modelT, permissionT, presetT, t, onAction, onSave, busy }) {
|
|
1932
1934
|
const [modal, modalHolder] = Modal.useModal();
|
|
1933
1935
|
const [draft, setDraft] = useState(account);
|
|
1936
|
+
const [proxyModeDraft, setProxyModeDraft] = useState(account.proxyMode || "inherit");
|
|
1937
|
+
const [proxyUrlDraft, setProxyUrlDraft] = useState(account.proxyUrl || "");
|
|
1934
1938
|
const [note, setNote] = useState("");
|
|
1935
1939
|
const [checkResult, setCheckResult] = useState(null);
|
|
1936
1940
|
const [checkFailed, setCheckFailed] = useState(false);
|
|
@@ -1969,14 +1973,19 @@ window.__ModuleLoader__.load({
|
|
|
1969
1973
|
useEffect(() => {
|
|
1970
1974
|
saveSeq.current += 1;
|
|
1971
1975
|
setDraft(account);
|
|
1976
|
+
setProxyModeDraft(account.proxyMode || "inherit");
|
|
1972
1977
|
setNote("");
|
|
1973
|
-
}, [account.id, account.cwd, account.permission, account.agentPreset, account.privateAccess, account.sendMode, JSON.stringify(account.commandPermissions), account.receiveEnabled, account.assistant && account.assistant.provider, account.assistant && account.assistant.model, account.assistant && account.assistant.reasoningEffort]);
|
|
1978
|
+
}, [account.id, account.cwd, account.permission, account.agentPreset, account.privateAccess, account.sendMode, account.proxyMode, account.proxyConfigured, JSON.stringify(account.commandPermissions), account.receiveEnabled, account.assistant && account.assistant.provider, account.assistant && account.assistant.model, account.assistant && account.assistant.reasoningEffort]);
|
|
1979
|
+
useEffect(() => {
|
|
1980
|
+
setProxyUrlDraft(account.proxyUrl || "");
|
|
1981
|
+
}, [account.id, account.proxyUrl]);
|
|
1974
1982
|
const save = (patch) => {
|
|
1975
1983
|
const seq = ++saveSeq.current;
|
|
1976
1984
|
const next = { ...draft, ...patch };
|
|
1977
1985
|
setDraft(next);
|
|
1986
|
+
if (next.proxyMode) setProxyModeDraft(next.proxyMode);
|
|
1978
1987
|
setNote("status.saving");
|
|
1979
|
-
|
|
1988
|
+
const payload = {
|
|
1980
1989
|
name: next.name,
|
|
1981
1990
|
cwd: next.cwd,
|
|
1982
1991
|
provider: next.assistant.provider,
|
|
@@ -1987,7 +1996,15 @@ window.__ModuleLoader__.load({
|
|
|
1987
1996
|
sendMode: next.sendMode,
|
|
1988
1997
|
agentPreset: next.agentPreset,
|
|
1989
1998
|
commandPermissions: next.commandPermissions,
|
|
1990
|
-
}
|
|
1999
|
+
};
|
|
2000
|
+
if (account.platform === "telegram" || account.platform === "discord") {
|
|
2001
|
+
const hasProxyPatch = Object.prototype.hasOwnProperty.call(patch, "proxyMode") || Object.prototype.hasOwnProperty.call(patch, "proxyUrl");
|
|
2002
|
+
if (hasProxyPatch) {
|
|
2003
|
+
payload.proxyMode = next.proxyMode || proxyModeDraft;
|
|
2004
|
+
payload.proxyUrl = Object.prototype.hasOwnProperty.call(patch, "proxyUrl") ? patch.proxyUrl : proxyUrlDraft;
|
|
2005
|
+
}
|
|
2006
|
+
}
|
|
2007
|
+
return onSave(account.id, payload).then((ok) => {
|
|
1991
2008
|
if (seq === saveSeq.current) setNote(ok ? "status.saved" : "error.save");
|
|
1992
2009
|
return ok;
|
|
1993
2010
|
});
|
|
@@ -2039,6 +2056,43 @@ window.__ModuleLoader__.load({
|
|
|
2039
2056
|
workspaceLabel: t("account.currentWorkspace"),
|
|
2040
2057
|
t,
|
|
2041
2058
|
}),
|
|
2059
|
+
(account.platform === "telegram" || account.platform === "discord") && h("div", { className: "ima-proxy-settings" },
|
|
2060
|
+
h("label", { className: "ima-picker-field" },
|
|
2061
|
+
h("span", { className: "ima-picker-label" }, t("account.proxyMode")),
|
|
2062
|
+
h(Select, {
|
|
2063
|
+
className: "ima-account-picker",
|
|
2064
|
+
value: proxyModeDraft,
|
|
2065
|
+
"aria-label": t("account.proxyMode"),
|
|
2066
|
+
options: [
|
|
2067
|
+
{ value: "inherit", label: t("account.proxyInherit") },
|
|
2068
|
+
{ value: "direct", label: t("account.proxyDirect") },
|
|
2069
|
+
{ value: "custom", label: t("account.proxyCustom") },
|
|
2070
|
+
],
|
|
2071
|
+
onChange: (next) => {
|
|
2072
|
+
setProxyModeDraft(next);
|
|
2073
|
+
if (next === "custom" && !account.proxyConfigured) setDraft({ ...draft, proxyMode: next });
|
|
2074
|
+
else save({ proxyMode: next, proxyUrl: "" });
|
|
2075
|
+
},
|
|
2076
|
+
})),
|
|
2077
|
+
proxyModeDraft === "custom" && h("label", { className: "ima-picker-field" },
|
|
2078
|
+
h("span", { className: "ima-picker-label" }, t("account.proxyUrl")),
|
|
2079
|
+
h(Input, {
|
|
2080
|
+
type: "text",
|
|
2081
|
+
autoComplete: "url",
|
|
2082
|
+
value: proxyUrlDraft,
|
|
2083
|
+
placeholder: t(account.proxyConfigured ? "account.proxySaved" : "http://127.0.0.1:7897"),
|
|
2084
|
+
"aria-label": t("account.proxyUrl"),
|
|
2085
|
+
onChange: (event) => { setProxyUrlDraft(event.target.value); setDraft({ ...draft, proxyMode: "custom" }); },
|
|
2086
|
+
onBlur: (event) => {
|
|
2087
|
+
const value = event.target.value.trim();
|
|
2088
|
+
save({ proxyMode: "custom", proxyUrl: value }).then((ok) => {
|
|
2089
|
+
if (ok && !value) setProxyUrlDraft(account.proxyUrl || "");
|
|
2090
|
+
});
|
|
2091
|
+
},
|
|
2092
|
+
}),
|
|
2093
|
+
),
|
|
2094
|
+
h("div", { className: "ima-picker-note" }, t("account.proxyNote")),
|
|
2095
|
+
),
|
|
2042
2096
|
h(CommandPermissionSettings, { value: draft.commandPermissions, onSave: commandPermissions => save({ commandPermissions }), t }),
|
|
2043
2097
|
note && h("div", { className: note === "status.saved" ? "ima-save-note ok" : "ima-save-note" }, t(note)),
|
|
2044
2098
|
h("div", { className: "ima-inspector-actions" },
|
|
@@ -7,10 +7,7 @@ export declare function channelImageFailureReason(error: unknown): string;
|
|
|
7
7
|
export declare function channelImageDownloadHost(raw?: string): string;
|
|
8
8
|
/** Infer MIME from bytes, not an attacker-controlled filename or Content-Type. */
|
|
9
9
|
export declare function imageMedia(data: Buffer, maxBytes?: number): ImMedia;
|
|
10
|
-
|
|
11
|
-
* No ambient proxy/credentials. Same-host redirects are opt-in. IPv4-only intentionally fails closed on IPv6-only hosts.
|
|
12
|
-
*/
|
|
13
|
-
export declare function requestChannelBytes(rawUrl: string, options?: {
|
|
10
|
+
export interface ChannelByteRequestOptions {
|
|
14
11
|
method?: 'GET' | 'POST';
|
|
15
12
|
headers?: Record<string, string>;
|
|
16
13
|
body?: string;
|
|
@@ -20,7 +17,13 @@ export declare function requestChannelBytes(rawUrl: string, options?: {
|
|
|
20
17
|
additionalTrustedHosts?: readonly string[];
|
|
21
18
|
/** 只跟随同一主机的 HTTPS 跳转,令牌不会被带到别的域名。默认不跟随。 */
|
|
22
19
|
sameHostRedirects?: number;
|
|
23
|
-
|
|
20
|
+
/** 自定义 fetcher(用于账号级代理分流,挂载 ProxyAgent) */
|
|
21
|
+
fetcher?: typeof fetch;
|
|
22
|
+
}
|
|
23
|
+
/** HTTPS only; 未注入 fetcher 时走本地原生连接查找与 DNS rebinding 防护(直连无环境代理);
|
|
24
|
+
* 传入 fetcher 时通过账号级代理分流。仅限同主机重定向。IPv4-only 模式在纯 IPv6 主机上明确快速失败。
|
|
25
|
+
*/
|
|
26
|
+
export declare function requestChannelBytes(rawUrl: string, options?: ChannelByteRequestOptions): Promise<Buffer>;
|
|
24
27
|
/** 通用文件不套用图片魔数验证,文件类型和格式由 Chat 接收策略判断。 */
|
|
25
28
|
export declare function fileMedia(data: Buffer, name?: string, maxBytes?: number): ImMedia;
|
|
26
29
|
//# sourceMappingURL=channel-image-download.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"channel-image-download.d.ts","sourceRoot":"","sources":["../../src/channels/channel-image-download.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAMjD,eAAO,MAAM,uBAAuB,QAAmB,CAAA;AACvD,eAAO,MAAM,kBAAkB,IAAI,CAAA;AAEnC,2FAA2F;AAC3F,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAiBhE;AAED,kFAAkF;AAClF,wBAAgB,wBAAwB,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAM7D;AAED,kFAAkF;AAClF,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,SAA0B,GAAG,OAAO,CASpF;AAwCD
|
|
1
|
+
{"version":3,"file":"channel-image-download.d.ts","sourceRoot":"","sources":["../../src/channels/channel-image-download.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAMjD,eAAO,MAAM,uBAAuB,QAAmB,CAAA;AACvD,eAAO,MAAM,kBAAkB,IAAI,CAAA;AAEnC,2FAA2F;AAC3F,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAiBhE;AAED,kFAAkF;AAClF,wBAAgB,wBAAwB,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAM7D;AAED,kFAAkF;AAClF,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,SAA0B,GAAG,OAAO,CASpF;AAwCD,MAAM,WAAW,yBAAyB;IACxC,MAAM,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;IACxE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,WAAW,CAAA;IAC3D,sBAAsB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IAC1C,2CAA2C;IAC3C,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,2CAA2C;IAC3C,OAAO,CAAC,EAAE,OAAO,KAAK,CAAA;CACvB;AAyED;;GAEG;AACH,wBAAsB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,yBAA8B,GAAG,OAAO,CAAC,MAAM,CAAC,CAuFlH;AAED,0CAA0C;AAC1C,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,SAAa,EAAE,QAAQ,SAAmB,GAAG,OAAO,CAI/F"}
|
|
@@ -104,8 +104,73 @@ function sameHostRedirect(current, location) {
|
|
|
104
104
|
return undefined;
|
|
105
105
|
return next.href;
|
|
106
106
|
}
|
|
107
|
-
/**
|
|
108
|
-
*
|
|
107
|
+
/**
|
|
108
|
+
* 代理模式下的下载实现:
|
|
109
|
+
* 在 custom/direct 代理分流下由外部注入带 Dispatcher 的 fetcher 执行请求。
|
|
110
|
+
* 此时目标域名的 DNS 解析由代理服务器完成,本地 DNS rebinding 校验不适用;
|
|
111
|
+
* 但仍严格保留并执行:强制 HTTPS、默认 443 端口、禁止裸 IP、禁止凭据、仅限同主机重定向、拦截 text/html 以及流式字节上限防护。
|
|
112
|
+
*/
|
|
113
|
+
async function requestChannelBytesViaFetcher(url, options, fetcher) {
|
|
114
|
+
const signal = options.timeoutMs
|
|
115
|
+
? AbortSignal.any([AbortSignal.timeout(options.timeoutMs), ...(options.signal ? [options.signal] : [])])
|
|
116
|
+
: options.signal ?? AbortSignal.timeout(30_000);
|
|
117
|
+
signal.throwIfAborted();
|
|
118
|
+
const response = await fetcher(url.href, {
|
|
119
|
+
method: options.method ?? 'GET',
|
|
120
|
+
headers: options.headers,
|
|
121
|
+
body: options.body,
|
|
122
|
+
signal,
|
|
123
|
+
redirect: 'manual',
|
|
124
|
+
});
|
|
125
|
+
const status = response.status;
|
|
126
|
+
const redirects = options.sameHostRedirects ?? 0;
|
|
127
|
+
if (redirects > 0 && [301, 302, 307, 308].includes(status)) {
|
|
128
|
+
const location = response.headers.get('location');
|
|
129
|
+
await response.body?.cancel().catch(() => undefined);
|
|
130
|
+
const next = sameHostRedirect(url, location ?? undefined);
|
|
131
|
+
if (!next)
|
|
132
|
+
throw new Error('图片地址不符合安全要求');
|
|
133
|
+
return requestChannelBytes(next, { ...options, sameHostRedirects: redirects - 1, fetcher });
|
|
134
|
+
}
|
|
135
|
+
if (status !== 200) {
|
|
136
|
+
await response.body?.cancel().catch(() => undefined);
|
|
137
|
+
throw new Error(`图片下载 HTTP ${status}`);
|
|
138
|
+
}
|
|
139
|
+
const contentType = String(response.headers.get('content-type') ?? '');
|
|
140
|
+
if (/text\/html/i.test(contentType)) {
|
|
141
|
+
await response.body?.cancel().catch(() => undefined);
|
|
142
|
+
throw new Error('图片地址不符合安全要求');
|
|
143
|
+
}
|
|
144
|
+
const maxBytes = options.maxBytes ?? MAX_CHANNEL_IMAGE_BYTES + 32;
|
|
145
|
+
const contentLength = Number(response.headers.get('content-length'));
|
|
146
|
+
if (contentLength > maxBytes) {
|
|
147
|
+
await response.body?.cancel().catch(() => undefined);
|
|
148
|
+
throw new Error('图片超过大小限制');
|
|
149
|
+
}
|
|
150
|
+
if (!response.body)
|
|
151
|
+
return Buffer.alloc(0);
|
|
152
|
+
const reader = response.body.getReader();
|
|
153
|
+
const chunks = [];
|
|
154
|
+
let size = 0;
|
|
155
|
+
try {
|
|
156
|
+
while (true) {
|
|
157
|
+
const { done, value } = await reader.read();
|
|
158
|
+
if (done)
|
|
159
|
+
break;
|
|
160
|
+
size += value.length;
|
|
161
|
+
if (size > maxBytes)
|
|
162
|
+
throw new Error('图片超过大小限制');
|
|
163
|
+
chunks.push(Buffer.from(value));
|
|
164
|
+
}
|
|
165
|
+
return Buffer.concat(chunks);
|
|
166
|
+
}
|
|
167
|
+
finally {
|
|
168
|
+
await reader.cancel().catch(() => undefined);
|
|
169
|
+
reader.releaseLock();
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
/** HTTPS only; 未注入 fetcher 时走本地原生连接查找与 DNS rebinding 防护(直连无环境代理);
|
|
173
|
+
* 传入 fetcher 时通过账号级代理分流。仅限同主机重定向。IPv4-only 模式在纯 IPv6 主机上明确快速失败。
|
|
109
174
|
*/
|
|
110
175
|
export async function requestChannelBytes(rawUrl, options = {}) {
|
|
111
176
|
const additionalHosts = new Set(validateAdditionalImageHosts(options.additionalTrustedHosts));
|
|
@@ -115,6 +180,9 @@ export async function requestChannelBytes(rawUrl, options = {}) {
|
|
|
115
180
|
|| isIP(url.hostname) || url.hostname.includes(':') || url.hostname.endsWith('.')) {
|
|
116
181
|
throw new Error('图片地址不符合安全要求');
|
|
117
182
|
}
|
|
183
|
+
if (options.fetcher) {
|
|
184
|
+
return requestChannelBytesViaFetcher(url, options, options.fetcher);
|
|
185
|
+
}
|
|
118
186
|
return new Promise((resolve, reject) => {
|
|
119
187
|
let settled = false;
|
|
120
188
|
let timer;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"channel-image-download.js","sourceRoot":"","sources":["../../src/channels/channel-image-download.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"channel-image-download.js","sourceRoot":"","sources":["../../src/channels/channel-image-download.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ export declare class DiagnosticError extends Error {
|
|
|
16
16
|
}
|
|
17
17
|
export declare function probe(id: DiagnosticCheck['id'], signal: AbortSignal, run: () => Promise<void>): Promise<DiagnosticCheck>;
|
|
18
18
|
/** 新请求、不跟随重定向、限制回包大小;调用方负责平台业务码与必要字段校验。 */
|
|
19
|
-
export declare function diagnosticJson(url: string, signal: AbortSignal, body?: unknown, headers?: Record<string, string
|
|
19
|
+
export declare function diagnosticJson(url: string, signal: AbortSignal, body?: unknown, headers?: Record<string, string>, fetcher?: typeof fetch): Promise<Record<string, unknown>>;
|
|
20
20
|
export declare function requireDiagnostic(value: unknown): asserts value;
|
|
21
21
|
export declare function platformResult(code: unknown, authCodes?: number[]): void;
|
|
22
22
|
//# sourceMappingURL=diagnostics.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diagnostics.d.ts","sourceRoot":"","sources":["../../src/channels/diagnostics.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,MAAM,MAAM,gBAAgB,GAAG,IAAI,GAAG,aAAa,GAAG,WAAW,GAAG,MAAM,GAAG,YAAY,GAAG,YAAY,GAAG,QAAQ,GAAG,SAAS,GAAG,SAAS,GAAG,kBAAkB,GAAG,UAAU,GAAG,kBAAkB,GAAG,iBAAiB,GAAG,eAAe,GAAG,aAAa,GAAG,SAAS,CAAA;AACpQ,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,aAAa,GAAG,KAAK,GAAG,SAAS,GAAG,SAAS,GAAG,QAAQ,GAAG,WAAW,CAAA;IAC1E,MAAM,EAAE,QAAQ,GAAG,QAAQ,GAAG,YAAY,CAAA;IAC1C,MAAM,EAAE,gBAAgB,CAAA;IACxB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,qBAAa,eAAgB,SAAQ,KAAK;IAC5B,QAAQ,CAAC,MAAM,EAAE,gBAAgB;IAAE,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM;IAAE,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM;gBAAtF,MAAM,EAAE,gBAAgB,EAAW,UAAU,CAAC,EAAE,MAAM,YAAA,EAAW,YAAY,CAAC,EAAE,MAAM,YAAA;CAC5G;AAED,wBAAsB,KAAK,CAAC,EAAE,EAAE,eAAe,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC,CAY9H;AAED,2CAA2C;AAC3C,wBAAsB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"diagnostics.d.ts","sourceRoot":"","sources":["../../src/channels/diagnostics.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,MAAM,MAAM,gBAAgB,GAAG,IAAI,GAAG,aAAa,GAAG,WAAW,GAAG,MAAM,GAAG,YAAY,GAAG,YAAY,GAAG,QAAQ,GAAG,SAAS,GAAG,SAAS,GAAG,kBAAkB,GAAG,UAAU,GAAG,kBAAkB,GAAG,iBAAiB,GAAG,eAAe,GAAG,aAAa,GAAG,SAAS,CAAA;AACpQ,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,aAAa,GAAG,KAAK,GAAG,SAAS,GAAG,SAAS,GAAG,QAAQ,GAAG,WAAW,CAAA;IAC1E,MAAM,EAAE,QAAQ,GAAG,QAAQ,GAAG,YAAY,CAAA;IAC1C,MAAM,EAAE,gBAAgB,CAAA;IACxB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,qBAAa,eAAgB,SAAQ,KAAK;IAC5B,QAAQ,CAAC,MAAM,EAAE,gBAAgB;IAAE,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM;IAAE,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM;gBAAtF,MAAM,EAAE,gBAAgB,EAAW,UAAU,CAAC,EAAE,MAAM,YAAA,EAAW,YAAY,CAAC,EAAE,MAAM,YAAA;CAC5G;AAED,wBAAsB,KAAK,CAAC,EAAE,EAAE,eAAe,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC,CAY9H;AAED,2CAA2C;AAC3C,wBAAsB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,GAAE,OAAO,KAAa,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAwBxL;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,KAAK,CAE/D;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,GAAE,MAAM,EAAO,GAAG,IAAI,CAK5E"}
|
|
@@ -24,8 +24,8 @@ export async function probe(id, signal, run) {
|
|
|
24
24
|
}
|
|
25
25
|
}
|
|
26
26
|
/** 新请求、不跟随重定向、限制回包大小;调用方负责平台业务码与必要字段校验。 */
|
|
27
|
-
export async function diagnosticJson(url, signal, body, headers) {
|
|
28
|
-
const response = await
|
|
27
|
+
export async function diagnosticJson(url, signal, body, headers, fetcher = fetch) {
|
|
28
|
+
const response = await fetcher(url, { method: body === undefined ? 'GET' : 'POST', headers: { 'content-type': 'application/json', ...headers }, body: body === undefined ? undefined : JSON.stringify(body), signal, redirect: 'error' });
|
|
29
29
|
if (!response.ok) {
|
|
30
30
|
await response.body?.cancel();
|
|
31
31
|
const status = response.status;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diagnostics.js","sourceRoot":"","sources":["../../src/channels/diagnostics.ts"],"names":[],"mappings":"AAWA,MAAM,OAAO,eAAgB,SAAQ,KAAK;IACnB;IAAmC;IAA8B;IAAtF,YAAqB,MAAwB,EAAW,UAAmB,EAAW,YAAqB;QAAI,KAAK,CAAC,MAAM,CAAC,CAAA;QAAvG,WAAM,GAAN,MAAM,CAAkB;QAAW,eAAU,GAAV,UAAU,CAAS;QAAW,iBAAY,GAAZ,YAAY,CAAS;IAAkB,CAAC;CAC/H;AAED,MAAM,CAAC,KAAK,UAAU,KAAK,CAAC,EAAyB,EAAE,MAAmB,EAAE,GAAwB;IAClG,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;IAC1B,IAAI,CAAC;QACH,MAAM,CAAC,cAAc,EAAE,CAAA;QACvB,MAAM,GAAG,EAAE,CAAA;QACX,MAAM,CAAC,cAAc,EAAE,CAAA;QACvB,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,EAAE,CAAA;IACjF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,KAAK,YAAY,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,KAAK,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;QAC7K,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,WAAW,EAAE,iBAAiB,EAAE,eAAe,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO;YAC3M,GAAG,CAAC,OAAO,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,EAAE,CAAA;IAC5K,CAAC;AACH,CAAC;AAED,2CAA2C;AAC3C,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,GAAW,EAAE,MAAmB,EAAE,IAAc,EAAE,OAAgC;
|
|
1
|
+
{"version":3,"file":"diagnostics.js","sourceRoot":"","sources":["../../src/channels/diagnostics.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,8 +6,11 @@ export interface DiscordConfig {
|
|
|
6
6
|
get(name: string): unknown;
|
|
7
7
|
};
|
|
8
8
|
fetchImpl?: typeof fetch;
|
|
9
|
+
/** 自定义 WebSocket 工厂;若指定此项,代理分流由外部工厂负责处理。 */
|
|
9
10
|
createWebSocket?: (url: string) => GatewaySocket;
|
|
10
11
|
connectTimeoutMs?: number;
|
|
12
|
+
proxyMode?: 'inherit' | 'direct' | 'custom';
|
|
13
|
+
proxyUrl?: string;
|
|
11
14
|
}
|
|
12
15
|
export interface GatewaySocketEvent {
|
|
13
16
|
data?: unknown;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"discord.d.ts","sourceRoot":"","sources":["../../src/channels/discord.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAmC,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"discord.d.ts","sourceRoot":"","sources":["../../src/channels/discord.ts"],"names":[],"mappings":"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"}
|
package/lib/channels/discord.js
CHANGED
|
@@ -6,6 +6,7 @@ import { sleepWithSignal, timeoutSignal } from '../engine/abort.js';
|
|
|
6
6
|
import { splitText } from '../engine/split.js';
|
|
7
7
|
import { diagnosticJson, probe, requireDiagnostic } from './diagnostics.js';
|
|
8
8
|
import { fileMedia, imageMedia, requestChannelBytes } from './channel-image-download.js';
|
|
9
|
+
import { Agent, ProxyAgent } from 'undici';
|
|
9
10
|
const API = 'https://discord.com/api/v10/';
|
|
10
11
|
const USER_AGENT = 'DiscordBot (https://github.com/MichengAI/dsh-im-connect, 0.1.59)';
|
|
11
12
|
const INTENTS = (1 << 0) | (1 << 9) | (1 << 12) | (1 << 15);
|
|
@@ -279,8 +280,44 @@ export function createDiscordChannel(config, log) {
|
|
|
279
280
|
const token = config.token?.trim();
|
|
280
281
|
if (!token)
|
|
281
282
|
return undefined;
|
|
282
|
-
const
|
|
283
|
-
|
|
283
|
+
const proxyMode = config.proxyMode ?? 'inherit';
|
|
284
|
+
let parsedProxyUrl;
|
|
285
|
+
if (proxyMode === 'custom') {
|
|
286
|
+
let proxyUrl;
|
|
287
|
+
try {
|
|
288
|
+
proxyUrl = new URL(config.proxyUrl ?? '');
|
|
289
|
+
}
|
|
290
|
+
catch {
|
|
291
|
+
throw new Error('Discord 代理地址无效');
|
|
292
|
+
}
|
|
293
|
+
if (!['http:', 'https:'].includes(proxyUrl.protocol) || !proxyUrl.hostname || proxyUrl.pathname !== '/' || proxyUrl.search || proxyUrl.hash) {
|
|
294
|
+
throw new Error('Discord 代理地址无效');
|
|
295
|
+
}
|
|
296
|
+
parsedProxyUrl = proxyUrl.toString();
|
|
297
|
+
}
|
|
298
|
+
else if (proxyMode !== 'inherit' && proxyMode !== 'direct')
|
|
299
|
+
throw new Error('Discord 代理模式无效');
|
|
300
|
+
let dispatcher;
|
|
301
|
+
function getDispatcher() {
|
|
302
|
+
if (proxyMode === 'inherit')
|
|
303
|
+
return undefined;
|
|
304
|
+
const isAlive = (d) => Boolean(d && !d.closed && !d.destroyed);
|
|
305
|
+
if (dispatcher && isAlive(dispatcher))
|
|
306
|
+
return dispatcher;
|
|
307
|
+
if (proxyMode === 'direct')
|
|
308
|
+
dispatcher = new Agent();
|
|
309
|
+
else if (proxyMode === 'custom' && parsedProxyUrl)
|
|
310
|
+
dispatcher = new ProxyAgent(parsedProxyUrl);
|
|
311
|
+
return dispatcher;
|
|
312
|
+
}
|
|
313
|
+
const fetchImpl = config.fetchImpl ?? ((input, init) => {
|
|
314
|
+
const disp = getDispatcher();
|
|
315
|
+
return fetch(input, disp ? { ...init, dispatcher: disp } : init);
|
|
316
|
+
});
|
|
317
|
+
const createSocket = config.createWebSocket ?? ((url) => {
|
|
318
|
+
const disp = getDispatcher();
|
|
319
|
+
return new WebSocket(url, disp ? { dispatcher: disp } : undefined);
|
|
320
|
+
});
|
|
284
321
|
const cursorFile = new JsonStateFile(config.stateDir ? `${config.stateDir.replace(/[\\/]$/, '')}/discord-gateway.json` : '', EMPTY_CURSOR);
|
|
285
322
|
const persist = Boolean(config.stateDir);
|
|
286
323
|
let handler;
|
|
@@ -411,6 +448,7 @@ export function createDiscordChannel(config, log) {
|
|
|
411
448
|
signal,
|
|
412
449
|
maxBytes: kind === 'image' ? 10 * 1024 * 1024 : 20 * 1024 * 1024,
|
|
413
450
|
additionalTrustedHosts: [new URL(url).hostname],
|
|
451
|
+
fetcher: dispatcher ? fetchImpl : undefined,
|
|
414
452
|
});
|
|
415
453
|
const name = attachment.filename?.replace(/\\/g, '/').split('/').pop();
|
|
416
454
|
media.push(kind === 'image' ? { ...imageMedia(bytes), ...(name ? { name } : {}) } : fileMedia(bytes, name));
|
|
@@ -710,12 +748,17 @@ export function createDiscordChannel(config, log) {
|
|
|
710
748
|
choiceLimits: { maxButtons: 25, maxTextLength: 1800 },
|
|
711
749
|
typingIntervalMs: 8_000,
|
|
712
750
|
async start() {
|
|
713
|
-
await this.stop();
|
|
714
751
|
stopped = false;
|
|
715
752
|
starting = true;
|
|
716
753
|
readyOnce = false;
|
|
717
754
|
statusText = '连接中';
|
|
755
|
+
clearTimeout(reconnectTimer);
|
|
756
|
+
clearHeartbeat();
|
|
757
|
+
generation += 1;
|
|
758
|
+
lifecycle.abort();
|
|
718
759
|
lifecycle = new AbortController();
|
|
760
|
+
socket?.close(1000, 'restarting');
|
|
761
|
+
socket = undefined;
|
|
719
762
|
const saved = persist ? cursorFile.read() : EMPTY_CURSOR;
|
|
720
763
|
sessionId = saved.sessionId || '';
|
|
721
764
|
resumeUrl = saved.resumeUrl || '';
|
|
@@ -729,11 +772,12 @@ export function createDiscordChannel(config, log) {
|
|
|
729
772
|
throw new Error('Discord token does not belong to a bot');
|
|
730
773
|
runtimeBotId = String(bot.id);
|
|
731
774
|
gatewayBase = String(gateway?.url ?? '');
|
|
775
|
+
const hadCursor = Boolean(sessionId && resumeUrl);
|
|
732
776
|
try {
|
|
733
|
-
await connectOnce(
|
|
777
|
+
await connectOnce(hadCursor);
|
|
734
778
|
}
|
|
735
779
|
catch (error) {
|
|
736
|
-
if (fatalGateway(error) || !
|
|
780
|
+
if (fatalGateway(error) || !hadCursor)
|
|
737
781
|
throw error;
|
|
738
782
|
clearCursor();
|
|
739
783
|
await connectOnce(false);
|
|
@@ -742,6 +786,7 @@ export function createDiscordChannel(config, log) {
|
|
|
742
786
|
log('[discord] Gateway 已连接');
|
|
743
787
|
}
|
|
744
788
|
catch (error) {
|
|
789
|
+
log(`[discord] 启动失败: ${error instanceof Error ? error.message : String(error)}`);
|
|
745
790
|
// 4000/1006 只是这次握手失败。停掉适配器后管理器不会再拉起,重启就会一直停在连接异常。
|
|
746
791
|
if (!recoverableGateway(error)) {
|
|
747
792
|
statusText = '连接失败,请查看本机日志';
|
|
@@ -768,6 +813,10 @@ export function createDiscordChannel(config, log) {
|
|
|
768
813
|
socket?.close(1000, 'stopped');
|
|
769
814
|
socket = undefined;
|
|
770
815
|
saveCursor();
|
|
816
|
+
const currentDispatcher = dispatcher;
|
|
817
|
+
dispatcher = undefined;
|
|
818
|
+
if (currentDispatcher)
|
|
819
|
+
await Promise.resolve(currentDispatcher.close()).catch(() => currentDispatcher?.destroy?.());
|
|
771
820
|
},
|
|
772
821
|
canDeliverDeferred() { return !stopped && statusText === '长连接已建立'; },
|
|
773
822
|
async send(chatId, text) {
|
|
@@ -897,13 +946,13 @@ export function createDiscordChannel(config, log) {
|
|
|
897
946
|
setMessageHandler(next) { handler = next; },
|
|
898
947
|
async diagnose(signal) {
|
|
899
948
|
const identity = await probe('bot', signal, async () => {
|
|
900
|
-
const bot = await diagnosticJson(new URL('users/@me', API).href, signal, undefined, headers);
|
|
949
|
+
const bot = await diagnosticJson(new URL('users/@me', API).href, signal, undefined, headers, fetchImpl);
|
|
901
950
|
requireDiagnostic(bot.id && bot.bot === true);
|
|
902
951
|
});
|
|
903
952
|
if (identity.status !== 'passed')
|
|
904
953
|
return [identity];
|
|
905
954
|
return [identity, await probe('gateway', signal, async () => {
|
|
906
|
-
const gateway = await diagnosticJson(new URL('gateway/bot', API).href, signal, undefined, headers);
|
|
955
|
+
const gateway = await diagnosticJson(new URL('gateway/bot', API).href, signal, undefined, headers, fetchImpl);
|
|
907
956
|
requireDiagnostic(typeof gateway.url === 'string');
|
|
908
957
|
gatewayUrl(gateway.url);
|
|
909
958
|
})];
|