@michengai/dsh-im-connect 0.1.17 → 0.1.19
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/README.en.md +3 -3
- package/README.md +3 -3
- package/SECURITY.md +9 -2
- package/client.js +86 -34
- package/lib/channels/dingtalk.d.ts.map +1 -1
- package/lib/channels/dingtalk.js +13 -2
- package/lib/channels/dingtalk.js.map +1 -1
- package/lib/channels/factory.d.ts +3 -1
- package/lib/channels/factory.d.ts.map +1 -1
- package/lib/channels/factory.js +2 -2
- package/lib/channels/factory.js.map +1 -1
- package/lib/channels/qr/hub.d.ts.map +1 -1
- package/lib/channels/qr/hub.js +14 -5
- package/lib/channels/qr/hub.js.map +1 -1
- package/lib/channels/telegram.d.ts.map +1 -1
- package/lib/channels/telegram.js +2 -1
- package/lib/channels/telegram.js.map +1 -1
- package/lib/channels/weixin.d.ts +9 -1
- package/lib/channels/weixin.d.ts.map +1 -1
- package/lib/channels/weixin.js +47 -14
- package/lib/channels/weixin.js.map +1 -1
- package/lib/client.js +86 -34
- package/lib/engine/credentials.d.ts.map +1 -1
- package/lib/engine/credentials.js +8 -4
- package/lib/engine/credentials.js.map +1 -1
- package/lib/engine/file-log.d.ts +7 -0
- package/lib/engine/file-log.d.ts.map +1 -0
- package/lib/engine/file-log.js +26 -0
- package/lib/engine/file-log.js.map +1 -0
- package/lib/engine/gateway.js +3 -3
- package/lib/engine/gateway.js.map +1 -1
- package/lib/engine/keyed-queue.d.ts +7 -0
- package/lib/engine/keyed-queue.d.ts.map +1 -0
- package/lib/engine/keyed-queue.js +21 -0
- package/lib/engine/keyed-queue.js.map +1 -0
- package/lib/engine/secure-file.d.ts +6 -0
- package/lib/engine/secure-file.d.ts.map +1 -0
- package/lib/engine/secure-file.js +19 -0
- package/lib/engine/secure-file.js.map +1 -0
- package/lib/engine/seen-store.d.ts +1 -0
- package/lib/engine/seen-store.d.ts.map +1 -1
- package/lib/engine/seen-store.js +8 -2
- package/lib/engine/seen-store.js.map +1 -1
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +5 -6
- package/lib/index.js.map +1 -1
- package/lib/manager.d.ts +19 -0
- package/lib/manager.d.ts.map +1 -1
- package/lib/manager.js +179 -43
- package/lib/manager.js.map +1 -1
- package/package.json +1 -1
- package/src/channels/dingtalk.ts +12 -3
- package/src/channels/factory.ts +2 -3
- package/src/channels/qr/hub.ts +12 -7
- package/src/channels/telegram.ts +2 -2
- package/src/channels/weixin.ts +89 -56
- package/src/engine/credentials.ts +7 -4
- package/src/engine/file-log.ts +32 -0
- package/src/engine/gateway.ts +8 -8
- package/src/engine/keyed-queue.ts +20 -0
- package/src/engine/secure-file.ts +15 -0
- package/src/engine/seen-store.ts +9 -2
- package/src/index.ts +5 -4
- package/src/manager.ts +272 -110
package/README.en.md
CHANGED
|
@@ -207,10 +207,10 @@ DingTalk replies prefer official AI Card streaming and fall back to plain text.
|
|
|
207
207
|
| Item | Current behavior |
|
|
208
208
|
| --- | --- |
|
|
209
209
|
| Access | Groups need no binding, only a mention. DMs fail closed: the QR scanner is allowlisted automatically; other DM users must be approved on the settings page |
|
|
210
|
-
| Management API |
|
|
211
|
-
| Secrets |
|
|
210
|
+
| Management API | Enforces both a loopback peer and loopback host (`localhost`, `127.0.0.1`, `[::1]`); mutations require JSON and the plugin client header |
|
|
211
|
+
| Secrets | WeChat tokens and other secrets prefer DSH `ctx.credentials`; otherwise they use plaintext `%DSH_HOME%\dsh-im-connect\secrets.json`, restricted to the current user and never safe to sync or share |
|
|
212
212
|
| Channel state | `channels.json` stores enablement and credential refs, not raw secrets |
|
|
213
|
-
| Browser payloads | Never include tokens, secrets, App Secrets, or
|
|
213
|
+
| Browser payloads | Never include tokens, secrets, App Secrets, or internal error details |
|
|
214
214
|
| WeChat protocol | Official iLink only; no reverse-engineered personal WeChat protocol |
|
|
215
215
|
| Tool approval | Only an allowlisted user in a DM can grant or deny; group chats cannot approve |
|
|
216
216
|
|
package/README.md
CHANGED
|
@@ -207,10 +207,10 @@ dsh --profile web --dump-config
|
|
|
207
207
|
| 项 | 当前行为 |
|
|
208
208
|
| --- | --- |
|
|
209
209
|
| 用户准入 | 群聊不用绑定,只需 @。私聊默认拒绝:扫码用户自动放行,其他私聊用户需在设置页批准 |
|
|
210
|
-
| 管理接口 |
|
|
211
|
-
| 敏感字段 |
|
|
210
|
+
| 管理接口 | 强制校验本机回环来源及 Host(`localhost` / `127.0.0.1` / `[::1]`);写接口要求 JSON 和插件客户端请求头 |
|
|
211
|
+
| 敏感字段 | 包括微信 token 在内均优先写入 DSH `ctx.credentials`;没有该服务时落到 `%DSH_HOME%\dsh-im-connect\secrets.json`(明文,仅限当前用户,禁止同步或分享) |
|
|
212
212
|
| 渠道状态 | `channels.json` 只保存启用状态和凭据引用,不保存明文 Secret |
|
|
213
|
-
| 浏览器回包 | 不返回 token、secret、App Secret
|
|
213
|
+
| 浏览器回包 | 不返回 token、secret、App Secret 或内部异常详情 |
|
|
214
214
|
| 微信协议 | 只走腾讯官方 iLink,不使用逆向个人微信协议 |
|
|
215
215
|
| 工具批准 | 仅私聊且发送者已在白名单时生效,不能跨会话、也不能在群里批准 |
|
|
216
216
|
|
package/SECURITY.md
CHANGED
|
@@ -20,9 +20,16 @@
|
|
|
20
20
|
|
|
21
21
|
## 管理面
|
|
22
22
|
|
|
23
|
-
- 设置页与 `/dsh-im-connect/api`
|
|
23
|
+
- 设置页与 `/dsh-im-connect/api` 同时校验回环来源地址与回环 Host;即使 Host webServer 误绑到局域网地址,远程请求也会被拒绝。
|
|
24
|
+
- 所有写接口必须使用 `application/json`,并携带插件客户端专用请求头;普通跨站表单不能触发连接、批准、删除或权限修改。
|
|
24
25
|
- 待批准列表保存在 `channels.json` 的 `pending`,白名单保存在 `allowlist`。
|
|
25
|
-
- 浏览器回包不返回 token、secret
|
|
26
|
+
- 浏览器回包不返回 token、secret、原始凭据或内部异常详情。
|
|
27
|
+
|
|
28
|
+
## 本地凭据
|
|
29
|
+
|
|
30
|
+
- 微信 `botToken` 与其他渠道 Secret 一样优先写入 Host `ctx.credentials`,不会继续写入 `wechat-state.json`;旧版本明文 token 会在首次启动时迁移。
|
|
31
|
+
- Host 没有 credentials 服务时会回退到 `secrets.json`。POSIX 文件权限强制为 `0600`;Windows 继承当前用户目录 ACL。该文件仍含明文凭据,不应同步、共享或提交到版本库。
|
|
32
|
+
- `gateway.log` 只保留当前文件和一个轮转归档;对外聊天只显示通用错误,详细异常仅写本机日志。
|
|
26
33
|
|
|
27
34
|
## 报告
|
|
28
35
|
|
package/client.js
CHANGED
|
@@ -87,6 +87,15 @@ window.__ModuleLoader__.load({
|
|
|
87
87
|
.ima-chip-next{width:7px;height:7px;border-right:1.6px solid currentColor;border-bottom:1.6px solid currentColor;transform:rotate(-45deg);opacity:.55;flex:none}
|
|
88
88
|
.ima-chip-split{height:1px;margin:6px 8px;background:var(--ima-line)}
|
|
89
89
|
.ima-chip-effort{color:var(--ima-muted);font-weight:500}
|
|
90
|
+
.ima-model-select .ima-chip-btn{border-radius:24px;gap:4px}
|
|
91
|
+
.ima-model-select .ima-chip-menu{width:min(240px,calc(100vw - 32px));min-width:240px;max-height:min(360px,calc(100vh - 96px));padding:4px;border-radius:12px;background:var(--dsw-specific-menu,var(--dsw-alias-bg-base,#fff))}
|
|
92
|
+
.ima-model-select .ima-chip-row{min-height:40px;padding:0 10px;font-size:14px}
|
|
93
|
+
.ima-model-select .ima-chip-row-side{font-size:13px;color:var(--dsw-alias-label-tertiary,var(--ima-muted))}
|
|
94
|
+
.ima-model-group+.ima-model-group{margin-top:4px}
|
|
95
|
+
.ima-model-group-title{position:sticky;top:0;z-index:1;padding:5px 8px 3px;background:var(--dsw-specific-menu,var(--dsw-alias-bg-base,#fff));color:var(--dsw-alias-label-tertiary,var(--ima-muted));font-size:12px;font-weight:500;line-height:18px}
|
|
96
|
+
.ima-model-option{display:flex;width:100%;min-height:38px;align-items:center;gap:8px;padding:6px 8px;border:0;border-radius:10px;background:transparent;color:var(--dsw-alias-label-primary,var(--ima-text));text-align:left;cursor:pointer}
|
|
97
|
+
.ima-model-option:hover,.ima-model-option:focus-visible{background:var(--dsw-alias-interactive-bg-hover,rgba(127,127,127,.08));outline:none}
|
|
98
|
+
.ima-model-option-copy{display:flex;min-width:0;flex:1;flex-direction:column}.ima-model-name{overflow:hidden;font-size:14px;font-weight:500;line-height:20px;text-overflow:ellipsis;white-space:nowrap}.ima-model-description{overflow:hidden;color:var(--dsw-alias-label-tertiary,var(--ima-muted));font-size:12px;line-height:18px;text-overflow:ellipsis;white-space:nowrap}.ima-model-check{display:grid;flex:0 0 18px;place-items:center;color:var(--dsw-alias-label-primary,var(--ima-text))}
|
|
90
99
|
.ima-chip-dialog{margin-top:10px;padding:12px;border:1px solid var(--ima-line);border-radius:12px;background:var(--dsw-alias-bg-layer-3,transparent)}
|
|
91
100
|
.ima-chip-dialog strong{display:block;margin:0 0 8px;font-size:13px}
|
|
92
101
|
.ima-chip-dialog input{width:100%;min-height:36px;padding:8px 10px;border-radius:8px;border:1px solid var(--ima-line);background:var(--dsw-alias-bg-layer-3,var(--dsw-alias-button-elevated-fill,transparent));color:var(--ima-text);box-sizing:border-box}
|
|
@@ -175,7 +184,14 @@ window.__ModuleLoader__.load({
|
|
|
175
184
|
document.head.appendChild(styleEl);
|
|
176
185
|
};
|
|
177
186
|
|
|
178
|
-
const api = (path, opts) =>
|
|
187
|
+
const api = (path, opts) => {
|
|
188
|
+
const request = Object.assign({}, opts || {});
|
|
189
|
+
const method = String(request.method || "GET").toUpperCase();
|
|
190
|
+
if (method !== "GET" && method !== "HEAD") {
|
|
191
|
+
request.headers = Object.assign({}, request.headers || {}, { "x-dsh-im-connect-client": "1" });
|
|
192
|
+
}
|
|
193
|
+
return fetch(API_BASE + path, request).then((r) => r.json());
|
|
194
|
+
};
|
|
179
195
|
|
|
180
196
|
function BrandMark({ id }) {
|
|
181
197
|
const svg = (viewBox, children) => h("svg", {
|
|
@@ -525,12 +541,6 @@ window.__ModuleLoader__.load({
|
|
|
525
541
|
if (builtIn && (option.name === option.value || option.name === builtIn[1])) return t(builtIn[0]);
|
|
526
542
|
return option.name || option.value;
|
|
527
543
|
}
|
|
528
|
-
const DEFAULT_EFFORTS = [
|
|
529
|
-
{ id: "low", name: "Low" },
|
|
530
|
-
{ id: "medium", name: "Medium" },
|
|
531
|
-
{ id: "high", name: "High" },
|
|
532
|
-
];
|
|
533
|
-
|
|
534
544
|
function FolderIcon() {
|
|
535
545
|
return h("svg", { viewBox: "0 0 16 16", width: 14, height: 14, fill: "none", "aria-hidden": "true" },
|
|
536
546
|
h("path", { d: "M5.196 1.571c.615 0 1.19.308 1.532.819l.471.708c.086.128.23.205.383.205h4.588A2.666 2.666 0 0 1 14.586 5.72v.907c.683.4 1.074 1.223.852 2.06l-1.053 3.971A2.666 2.666 0 0 1 12.05 14.453H2.917A2.416 2.416 0 0 1 .502 11.952V3.987A2.416 2.416 0 0 1 2.918 1.571h2.278Z", fill: "currentColor" }),
|
|
@@ -561,7 +571,7 @@ window.__ModuleLoader__.load({
|
|
|
561
571
|
document.addEventListener("mousedown", close);
|
|
562
572
|
return () => document.removeEventListener("mousedown", close);
|
|
563
573
|
}, [props.open]);
|
|
564
|
-
return h("div", { className: "ima-chip" + (props.open ? " is-open" : ""), ref: root },
|
|
574
|
+
return h("div", { className: "ima-chip" + (props.className ? " " + props.className : "") + (props.open ? " is-open" : ""), ref: root },
|
|
565
575
|
h("button", {
|
|
566
576
|
type: "button",
|
|
567
577
|
className: "ima-chip-btn",
|
|
@@ -575,7 +585,23 @@ window.__ModuleLoader__.load({
|
|
|
575
585
|
props.suffix && h("span", { className: "ima-chip-effort" }, props.suffix),
|
|
576
586
|
h("em"),
|
|
577
587
|
),
|
|
578
|
-
props.open && h("div", { className: "ima-chip-menu" + (props.align === "end" ? " is-end" : ""), role: "menu" }, props.children),
|
|
588
|
+
props.open && h("div", { className: "ima-chip-menu" + (props.menuClassName ? " " + props.menuClassName : "") + (props.align === "end" ? " is-end" : ""), role: "menu", "aria-label": props.menuAria }, props.children),
|
|
589
|
+
);
|
|
590
|
+
}
|
|
591
|
+
|
|
592
|
+
function ModelChoiceRow(props) {
|
|
593
|
+
return h("button", {
|
|
594
|
+
type: "button",
|
|
595
|
+
className: "ima-model-option",
|
|
596
|
+
role: "menuitemradio",
|
|
597
|
+
"aria-checked": props.active,
|
|
598
|
+
onClick: props.onClick,
|
|
599
|
+
},
|
|
600
|
+
h("span", { className: "ima-model-option-copy" },
|
|
601
|
+
h("span", { className: "ima-model-name" }, props.label),
|
|
602
|
+
props.description && h("span", { className: "ima-model-description" }, props.description),
|
|
603
|
+
),
|
|
604
|
+
h("span", { className: "ima-model-check" }, props.active && h("i", { className: "ima-chip-tick" })),
|
|
579
605
|
);
|
|
580
606
|
}
|
|
581
607
|
|
|
@@ -651,18 +677,32 @@ window.__ModuleLoader__.load({
|
|
|
651
677
|
};
|
|
652
678
|
|
|
653
679
|
const workspace = items.find((item) => item.path === cwd);
|
|
654
|
-
const
|
|
680
|
+
const modelGroups = providers.map((item) => ({
|
|
681
|
+
id: item.id,
|
|
682
|
+
name: item.name || item.id,
|
|
683
|
+
models: (item.models || []).map((entry) => ({
|
|
655
684
|
value: item.id + "::" + entry.id,
|
|
656
685
|
provider: item.id,
|
|
686
|
+
providerName: item.name || item.id,
|
|
657
687
|
model: entry.id,
|
|
658
688
|
label: entry.name || entry.id,
|
|
689
|
+
description: entry.description,
|
|
659
690
|
reasoning: entry.reasoning,
|
|
660
|
-
|
|
691
|
+
})),
|
|
692
|
+
})).filter((item) => item.models.length > 0);
|
|
693
|
+
const models = modelGroups.flatMap((item) => item.models);
|
|
661
694
|
const currentModel = models.find((item) => item.provider === provider && item.model === model);
|
|
662
|
-
const
|
|
663
|
-
|
|
664
|
-
|
|
665
|
-
|
|
695
|
+
const reasoning = currentModel && currentModel.reasoning;
|
|
696
|
+
const effectiveEffort = effort || (reasoning && reasoning.defaultEffort) || "";
|
|
697
|
+
const efforts = reasoning
|
|
698
|
+
? [
|
|
699
|
+
...(reasoning.defaultEffort ? [] : [{ id: "", name: props.modelT("effort.providerDefault") }]),
|
|
700
|
+
...((reasoning.efforts || []).map((item) => ({ id: item.id, name: item.name || item.id, description: item.description }))),
|
|
701
|
+
]
|
|
702
|
+
: [];
|
|
703
|
+
const effortLabel = reasoning
|
|
704
|
+
? ((efforts.find((item) => item.id === effectiveEffort) || {}).name || effectiveEffort || props.modelT("effort.providerDefault"))
|
|
705
|
+
: "";
|
|
666
706
|
const permissionOptions = permissions.map((item) => ({
|
|
667
707
|
...item,
|
|
668
708
|
label: permissionLabel(item, props.permissionT),
|
|
@@ -764,6 +804,9 @@ window.__ModuleLoader__.load({
|
|
|
764
804
|
if (next) setModelPane("root");
|
|
765
805
|
},
|
|
766
806
|
align: "end",
|
|
807
|
+
className: "ima-model-select",
|
|
808
|
+
menuClassName: "ima-model-menu",
|
|
809
|
+
menuAria: props.modelT("menu.aria"),
|
|
767
810
|
label: (currentModel && currentModel.label) || modelFallback,
|
|
768
811
|
suffix: effortLabel,
|
|
769
812
|
ariaLabel: props.modelT("trigger.selectAria"),
|
|
@@ -777,7 +820,7 @@ window.__ModuleLoader__.load({
|
|
|
777
820
|
chevron: true,
|
|
778
821
|
onClick: () => setModelPane("model"),
|
|
779
822
|
}),
|
|
780
|
-
h(ChipRow, {
|
|
823
|
+
reasoning && h(ChipRow, {
|
|
781
824
|
key: "effort",
|
|
782
825
|
kv: true,
|
|
783
826
|
label: props.modelT("menu.effort"),
|
|
@@ -788,28 +831,33 @@ window.__ModuleLoader__.load({
|
|
|
788
831
|
],
|
|
789
832
|
modelPane === "model" && (
|
|
790
833
|
models.length === 0
|
|
791
|
-
? h("div", { className: "ima-chip-empty" },
|
|
792
|
-
:
|
|
793
|
-
|
|
794
|
-
|
|
795
|
-
|
|
796
|
-
|
|
797
|
-
|
|
798
|
-
|
|
799
|
-
|
|
800
|
-
|
|
801
|
-
|
|
802
|
-
|
|
803
|
-
|
|
804
|
-
|
|
834
|
+
? h("div", { className: "ima-chip-empty" }, props.modelT("empty.models"))
|
|
835
|
+
: modelGroups.map((group) => h("section", { key: group.id, className: "ima-model-group", role: "group", "aria-label": group.name },
|
|
836
|
+
h("div", { className: "ima-model-group-title" }, group.name),
|
|
837
|
+
...group.models.map((item) => h(ModelChoiceRow, {
|
|
838
|
+
key: item.value,
|
|
839
|
+
label: item.label,
|
|
840
|
+
description: item.description,
|
|
841
|
+
active: item.provider === provider && item.model === model,
|
|
842
|
+
onClick: () => {
|
|
843
|
+
const nextEffort = (item.reasoning && item.reasoning.defaultEffort) || "";
|
|
844
|
+
setProvider(item.provider);
|
|
845
|
+
setModel(item.model);
|
|
846
|
+
setEffort(nextEffort);
|
|
847
|
+
save({ provider: item.provider, model: item.model, reasoningEffort: nextEffort || null });
|
|
848
|
+
setOpen("");
|
|
849
|
+
},
|
|
850
|
+
})),
|
|
851
|
+
))
|
|
805
852
|
),
|
|
806
|
-
modelPane === "effort" && efforts.map((item) => h(
|
|
853
|
+
modelPane === "effort" && efforts.map((item) => h(ModelChoiceRow, {
|
|
807
854
|
key: item.id,
|
|
808
855
|
label: item.name,
|
|
809
|
-
|
|
856
|
+
description: item.description,
|
|
857
|
+
active: item.id === effectiveEffort,
|
|
810
858
|
onClick: () => {
|
|
811
859
|
setEffort(item.id);
|
|
812
|
-
if (provider && model) save({ provider, model, reasoningEffort: item.id });
|
|
860
|
+
if (provider && model) save({ provider, model, reasoningEffort: item.id || null });
|
|
813
861
|
setOpen("");
|
|
814
862
|
},
|
|
815
863
|
})),
|
|
@@ -1730,6 +1778,10 @@ window.__ModuleLoader__.load({
|
|
|
1730
1778
|
useSyncExternalStore(subscribeLocale, localeSnapshot, localeSnapshot);
|
|
1731
1779
|
return h(SessionSwitcher, Object.assign({}, props, { t }));
|
|
1732
1780
|
}
|
|
1781
|
+
function LocalizedSettingsPage(props) {
|
|
1782
|
+
useSyncExternalStore(subscribeLocale, localeSnapshot, localeSnapshot);
|
|
1783
|
+
return h(SettingsPage, Object.assign({}, props, { t, permissionT, modelT }));
|
|
1784
|
+
}
|
|
1733
1785
|
openImSession = (id) => {
|
|
1734
1786
|
try { ctx.sessions.open(id); return true; }
|
|
1735
1787
|
catch (error) { console.warn("[dsh-im-connect] 无法打开会话", id, error); return false; }
|
|
@@ -1747,7 +1799,7 @@ window.__ModuleLoader__.load({
|
|
|
1747
1799
|
permissionT,
|
|
1748
1800
|
modelT,
|
|
1749
1801
|
}),
|
|
1750
|
-
},
|
|
1802
|
+
}, LocalizedSettingsPage));
|
|
1751
1803
|
|
|
1752
1804
|
ctx.slots.inject("sidebar.channels", () => ctx.slots.register({
|
|
1753
1805
|
name: "sidebar.channels",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dingtalk.d.ts","sourceRoot":"","sources":["../../src/channels/dingtalk.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAA0B,MAAM,oBAAoB,CAAA;AAGhF,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE;IAC/C,IAAI,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAczG;AACD,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,cAAc,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,cAAc,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"dingtalk.d.ts","sourceRoot":"","sources":["../../src/channels/dingtalk.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAA0B,MAAM,oBAAoB,CAAA;AAGhF,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE;IAC/C,IAAI,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAczG;AACD,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,cAAc,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,cAAc,GAAG,SAAS,CA8GrH"}
|
package/lib/channels/dingtalk.js
CHANGED
|
@@ -26,6 +26,15 @@ export function createDingtalkChannel(config, log) {
|
|
|
26
26
|
const webhooks = new Map();
|
|
27
27
|
const targets = new Map();
|
|
28
28
|
const cards = new DingtalkCardClient(clientId, clientSecret, log);
|
|
29
|
+
const remember = (map, key, value) => {
|
|
30
|
+
map.delete(key);
|
|
31
|
+
map.set(key, value);
|
|
32
|
+
if (map.size > 1000) {
|
|
33
|
+
const oldest = map.keys().next().value;
|
|
34
|
+
if (oldest !== undefined)
|
|
35
|
+
map.delete(oldest);
|
|
36
|
+
}
|
|
37
|
+
};
|
|
29
38
|
return {
|
|
30
39
|
id: 'dingtalk',
|
|
31
40
|
label: '钉钉',
|
|
@@ -44,9 +53,9 @@ export function createDingtalkChannel(config, log) {
|
|
|
44
53
|
}
|
|
45
54
|
const parsed = parseDingtalkRobotEvent(payload);
|
|
46
55
|
if (payload.sessionWebhook && parsed?.chatId)
|
|
47
|
-
webhooks
|
|
56
|
+
remember(webhooks, parsed.chatId, payload.sessionWebhook);
|
|
48
57
|
if (parsed?.chatId) {
|
|
49
|
-
targets
|
|
58
|
+
remember(targets, parsed.chatId, parsed.kind === 'group'
|
|
50
59
|
? { type: 'group', openConversationId: payload.conversationId ?? parsed.chatId }
|
|
51
60
|
: { type: 'user', userId: parsed.userId });
|
|
52
61
|
}
|
|
@@ -75,6 +84,8 @@ export function createDingtalkChannel(config, log) {
|
|
|
75
84
|
async stop() {
|
|
76
85
|
client?.disconnect();
|
|
77
86
|
client = undefined;
|
|
87
|
+
webhooks.clear();
|
|
88
|
+
targets.clear();
|
|
78
89
|
statusText = '已停止';
|
|
79
90
|
},
|
|
80
91
|
async send(chatId, text) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dingtalk.js","sourceRoot":"","sources":["../../src/channels/dingtalk.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,sBAAsB,EAAmB,MAAM,oBAAoB,CAAA;AAOhG,MAAM,UAAU,uBAAuB,CAAC,OAUvC;IACC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAA;IAChD,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAA;IAC9D,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,KAAK,GAAG,CAAA;IACtD,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAA;IAC9D,IAAI,CAAC,MAAM;QAAE,OAAO,SAAS,CAAA;IAC7B,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,QAAQ,CAAA;IACpE,OAAO;QACL,MAAM;QACN,MAAM,EAAE,MAAM;QACd,IAAI;QACJ,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI;QAC5B,SAAS;KACV,CAAA;AACH,CAAC;AACD,MAAM,UAAU,qBAAqB,CAAC,MAAsB,EAAE,GAA2B;IACvF,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAA;IACxC,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,EAAE,IAAI,EAAE,CAAA;IAChD,IAAI,CAAC,QAAQ,IAAI,CAAC,YAAY;QAAE,OAAO,SAAS,CAAA;IAEhD,IAAI,OAA+D,CAAA;IACnE,IAAI,MAA2J,CAAA;IAC/J,IAAI,UAAU,GAAG,KAAK,CAAA;IACtB,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAkB,CAAA;IAC1C,MAAM,OAAO,GAAG,IAAI,GAAG,EAAsB,CAAA;IAC7C,MAAM,KAAK,GAAG,IAAI,kBAAkB,CAAC,QAAQ,EAAE,YAAY,EAAE,GAAG,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"dingtalk.js","sourceRoot":"","sources":["../../src/channels/dingtalk.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import type { ChannelAdapter } from '../engine/types.js';
|
|
2
2
|
import type { ChannelId } from '../engine/session-id.js';
|
|
3
|
-
export declare function createChannelAdapter(id: ChannelId, config: Record<string, string>, log: (line: string) => void, stateDir: string
|
|
3
|
+
export declare function createChannelAdapter(id: ChannelId, config: Record<string, string>, log: (line: string) => void, stateDir: string, options?: {
|
|
4
|
+
onWeixinBotToken?: (token: string | undefined) => void | Promise<void>;
|
|
5
|
+
}): ChannelAdapter | undefined;
|
|
4
6
|
//# sourceMappingURL=factory.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/channels/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAQxD,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,SAAS,EACb,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9B,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,EAC3B,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/channels/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAQxD,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,SAAS,EACb,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9B,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,EAC3B,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE;IAAE,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,GACnF,cAAc,GAAG,SAAS,CAmB5B"}
|
package/lib/channels/factory.js
CHANGED
|
@@ -4,7 +4,7 @@ import { createTelegramChannel } from './telegram.js';
|
|
|
4
4
|
import { createWecomChannel } from './wecom.js';
|
|
5
5
|
import { createWeixinChannel } from './weixin.js';
|
|
6
6
|
import { createQqChannel } from './qq.js';
|
|
7
|
-
export function createChannelAdapter(id, config, log, stateDir) {
|
|
7
|
+
export function createChannelAdapter(id, config, log, stateDir, options) {
|
|
8
8
|
switch (id) {
|
|
9
9
|
case 'telegram':
|
|
10
10
|
return createTelegramChannel({ token: config.token, stateDir }, log);
|
|
@@ -13,7 +13,7 @@ export function createChannelAdapter(id, config, log, stateDir) {
|
|
|
13
13
|
case 'lark':
|
|
14
14
|
return createFeishuChannel('lark', { appId: config.appId, appSecret: config.appSecret, domain: 'lark' }, log);
|
|
15
15
|
case 'weixin':
|
|
16
|
-
return createWeixinChannel({ enabled: true, stateDir }, log, stateDir);
|
|
16
|
+
return createWeixinChannel({ enabled: true, stateDir, botToken: config.botToken, onBotToken: options?.onWeixinBotToken }, log, stateDir);
|
|
17
17
|
case 'wecom':
|
|
18
18
|
return createWecomChannel({ botId: config.botId, secret: config.secret }, log);
|
|
19
19
|
case 'dingtalk':
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../src/channels/factory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAA;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAA;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAC/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAEzC,MAAM,UAAU,oBAAoB,CAClC,EAAa,EACb,MAA8B,EAC9B,GAA2B,EAC3B,QAAgB;
|
|
1
|
+
{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../src/channels/factory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAA;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAA;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAC/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAEzC,MAAM,UAAU,oBAAoB,CAClC,EAAa,EACb,MAA8B,EAC9B,GAA2B,EAC3B,QAAgB,EAChB,OAAoF;IAEpF,QAAQ,EAAE,EAAE,CAAC;QACX,KAAK,UAAU;YACb,OAAO,qBAAqB,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,GAAG,CAAC,CAAA;QACtE,KAAK,QAAQ;YACX,OAAO,mBAAmB,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,EAAE,GAAG,CAAC,CAAA;QACjG,KAAK,MAAM;YACT,OAAO,mBAAmB,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,CAAA;QAC/G,KAAK,QAAQ;YACX,OAAO,mBAAmB,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,gBAAgB,EAAE,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAA;QAC1I,KAAK,OAAO;YACV,OAAO,kBAAkB,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,EAAE,GAAG,CAAC,CAAA;QAChF,KAAK,UAAU;YACb,OAAO,qBAAqB,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,CAAC,YAAY,EAAE,EAAE,GAAG,CAAC,CAAA;QACrG,KAAK,IAAI;YACP,OAAO,eAAe,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,EAAE,GAAG,CAAC,CAAA;QACnF;YACE,OAAO,SAAS,CAAA;IACpB,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hub.d.ts","sourceRoot":"","sources":["../../../src/channels/qr/hub.ts"],"names":[],"mappings":"AAAA,4BAA4B;AAC5B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAA;AAE3D,OAAO,EAAwC,KAAK,YAAY,EAAqB,KAAK,WAAW,EAAE,MAAM,aAAa,CAAA;AAQ1H,MAAM,WAAW,iBAAiB;IAChC,SAAS,CAAC,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACxF,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;IAC5B,2BAA2B;IAC3B,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,YAAY,CAAC,CAAA;CAC/E;AAiBD,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA6B;IACtD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAgC;IAC3D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAA8B;IACvD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAwB;gBAEhC,OAAO,GAAE,iBAAsB;IAM3C,QAAQ,CAAC,EAAE,EAAE,SAAS,GAAG,OAAO;IAKhC,IAAI,CAAC,EAAE,EAAE,SAAS,GAAG,WAAW;IAe1B,KAAK,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,GAAG,OAAO,CAAC,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"hub.d.ts","sourceRoot":"","sources":["../../../src/channels/qr/hub.ts"],"names":[],"mappings":"AAAA,4BAA4B;AAC5B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAA;AAE3D,OAAO,EAAwC,KAAK,YAAY,EAAqB,KAAK,WAAW,EAAE,MAAM,aAAa,CAAA;AAQ1H,MAAM,WAAW,iBAAiB;IAChC,SAAS,CAAC,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACxF,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;IAC5B,2BAA2B;IAC3B,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,YAAY,CAAC,CAAA;CAC/E;AAiBD,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA6B;IACtD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAgC;IAC3D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAA8B;IACvD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAwB;gBAEhC,OAAO,GAAE,iBAAsB;IAM3C,QAAQ,CAAC,EAAE,EAAE,SAAS,GAAG,OAAO;IAKhC,IAAI,CAAC,EAAE,EAAE,SAAS,GAAG,WAAW;IAe1B,KAAK,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAwC9E,OAAO,CAAC,EAAE,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;IAKlD,MAAM,CAAC,EAAE,EAAE,SAAS,GAAG,WAAW;IAalC,OAAO,IAAI,IAAI;YAKD,KAAK;YAoBL,IAAI;CAkEnB"}
|
package/lib/channels/qr/hub.js
CHANGED
|
@@ -76,8 +76,9 @@ export class PairingHub {
|
|
|
76
76
|
if (this.sessions.get(id) !== session)
|
|
77
77
|
return this.view(id);
|
|
78
78
|
session.status = 'failed';
|
|
79
|
-
|
|
80
|
-
|
|
79
|
+
const detail = error instanceof Error ? error.message : String(error);
|
|
80
|
+
session.error = '二维码生成失败,请查看本机日志';
|
|
81
|
+
this.log(`[pairing] ${id} 生成二维码失败:${detail}`);
|
|
81
82
|
return this.view(id);
|
|
82
83
|
}
|
|
83
84
|
}
|
|
@@ -164,8 +165,9 @@ export class PairingHub {
|
|
|
164
165
|
}
|
|
165
166
|
catch (error) {
|
|
166
167
|
session.status = 'failed';
|
|
167
|
-
|
|
168
|
-
|
|
168
|
+
const detail = error instanceof Error ? error.message : String(error);
|
|
169
|
+
session.error = '保存凭据失败,请查看本机日志';
|
|
170
|
+
this.log(`[pairing] ${session.channelId} 保存凭据失败:${detail}`);
|
|
169
171
|
}
|
|
170
172
|
return;
|
|
171
173
|
}
|
|
@@ -175,7 +177,14 @@ export class PairingHub {
|
|
|
175
177
|
}
|
|
176
178
|
else if (polled.status === 'expired' || polled.status === 'failed') {
|
|
177
179
|
session.status = polled.status;
|
|
178
|
-
|
|
180
|
+
if (polled.status === 'failed') {
|
|
181
|
+
if (polled.error)
|
|
182
|
+
this.log(`[pairing] ${session.channelId} 绑定失败:${polled.error}`);
|
|
183
|
+
session.error = '绑定失败,请查看本机日志';
|
|
184
|
+
}
|
|
185
|
+
else {
|
|
186
|
+
session.error = polled.error;
|
|
187
|
+
}
|
|
179
188
|
session.qrUrl = undefined;
|
|
180
189
|
session.qrImage = undefined;
|
|
181
190
|
session.begin?.dispose?.();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hub.js","sourceRoot":"","sources":["../../../src/channels/qr/hub.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"hub.js","sourceRoot":"","sources":["../../../src/channels/qr/hub.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telegram.d.ts","sourceRoot":"","sources":["../../src/channels/telegram.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAA0B,MAAM,oBAAoB,CAAA;AAGhF,MAAM,WAAW,cAAc;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAiBD,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,cAAc,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,cAAc,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"telegram.d.ts","sourceRoot":"","sources":["../../src/channels/telegram.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAA0B,MAAM,oBAAoB,CAAA;AAGhF,MAAM,WAAW,cAAc;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAiBD,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,cAAc,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,cAAc,GAAG,SAAS,CAuJrH"}
|
package/lib/channels/telegram.js
CHANGED
|
@@ -46,6 +46,7 @@ export function createTelegramChannel(config, log) {
|
|
|
46
46
|
});
|
|
47
47
|
lastError = '';
|
|
48
48
|
for (const update of updates) {
|
|
49
|
+
// Telegram offset 是 at-most-once 取舍:先确认游标可避免崩溃重启后重复驱动 agent,代价是极端情况下丢一条未完成消息。
|
|
49
50
|
offset = update.update_id + 1;
|
|
50
51
|
if (persist)
|
|
51
52
|
cursorFile.write({ offset });
|
|
@@ -158,7 +159,7 @@ export function createTelegramChannel(config, log) {
|
|
|
158
159
|
};
|
|
159
160
|
},
|
|
160
161
|
setMessageHandler(h) { handler = h; },
|
|
161
|
-
status() { return stopped ? '已停止' : lastError ?
|
|
162
|
+
status() { return stopped ? '已停止' : lastError ? '轮询异常(详情见本机日志)' : '轮询中'; },
|
|
162
163
|
};
|
|
163
164
|
}
|
|
164
165
|
//# sourceMappingURL=telegram.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telegram.js","sourceRoot":"","sources":["../../src/channels/telegram.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"telegram.js","sourceRoot":"","sources":["../../src/channels/telegram.ts"],"names":[],"mappings":"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"}
|
package/lib/channels/weixin.d.ts
CHANGED
|
@@ -15,6 +15,10 @@ export interface WeixinChannelConfig {
|
|
|
15
15
|
/** 登录/上下文/媒体落盘目录。 */
|
|
16
16
|
stateDir?: string;
|
|
17
17
|
pollTimeoutSecs?: number;
|
|
18
|
+
/** 由 Host credentials vault 注入,不写入微信状态文件。 */
|
|
19
|
+
botToken?: string;
|
|
20
|
+
/** 登录态刷新或失效时同步回 Host credentials vault。 */
|
|
21
|
+
onBotToken?: (token: string | undefined) => void | Promise<void>;
|
|
18
22
|
}
|
|
19
23
|
/** CDN 基址(官方插件同款)。 */
|
|
20
24
|
export declare const CDN_BASE_URL = "https://novac2c.cdn.weixin.qq.com/c2c";
|
|
@@ -30,11 +34,15 @@ export declare function parseAesKey(aesKeyBase64: string, label?: string): Buffe
|
|
|
30
34
|
/** 构建 CDN 下载 URL。 */
|
|
31
35
|
export declare function buildCdnDownloadUrl(encryptedQueryParam: string, cdnBaseUrl?: string): string;
|
|
32
36
|
export declare function mimeFromExt(ext: string): string;
|
|
37
|
+
/** 为每个入站媒体生成不可复用的安全文件名,避免同名附件互相覆盖。 */
|
|
38
|
+
export declare function uniqueMediaFileName(prefix: string, ext: string, name?: string): string;
|
|
39
|
+
export declare function isStaleWeixinTokenError(error: unknown): boolean;
|
|
33
40
|
export declare function createWeixinChannel(config: WeixinChannelConfig, log: (line: string) => void, stateDir: string): ChannelAdapter | undefined;
|
|
34
41
|
export declare function weixinStatePath(stateDir: string): string;
|
|
35
42
|
export declare function readWeixinAllowedUserId(stateDir: string): string | undefined;
|
|
43
|
+
/** 读取旧版本明文登录 token,仅供 manager 一次性迁移到 credentials vault。 */
|
|
44
|
+
export declare function readLegacyWeixinBotToken(stateDir: string): string | undefined;
|
|
36
45
|
export declare function persistWeixinLogin(stateDir: string, data: {
|
|
37
|
-
botToken: string;
|
|
38
46
|
allowedUserId?: string;
|
|
39
47
|
baseUrl?: string;
|
|
40
48
|
}): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"weixin.d.ts","sourceRoot":"","sources":["../../src/channels/weixin.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAsB,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"weixin.d.ts","sourceRoot":"","sources":["../../src/channels/weixin.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAsB,MAAM,oBAAoB,CAAA;AAO5E,MAAM,WAAW,mBAAmB;IAClC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,qBAAqB;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,6CAA6C;IAC7C,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,2CAA2C;IAC3C,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CACjE;AAGD,sBAAsB;AACtB,eAAO,MAAM,YAAY,0CAA0C,CAAA;AA6BnE,sBAAsB;AACtB,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAE9D;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAGpE;AAED,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAGrE;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,SAAQ,GAAG,MAAM,CAOvE;AAED,qBAAqB;AACrB,wBAAgB,mBAAmB,CAAC,mBAAmB,EAAE,MAAM,EAAE,UAAU,SAAe,GAAG,MAAM,CAElG;AA2BD,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAU/C;AAED,sCAAsC;AACtC,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAMtF;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAG/D;AAYD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,mBAAmB,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,EAAE,QAAQ,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,CA8hB1I;AAOD,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAExD;AAED,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAQ5E;AAED,2DAA2D;AAC3D,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAO7E;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE;IAAE,aAAa,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAmB7G;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CASvD"}
|