@jingyi0605/codingns 0.6.5 → 0.7.1
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/public/assets/AdaptiveButlerPage-Cd8nPdO0.js +3 -0
- package/dist/public/assets/{App-B9HcTkMT.js → App-CyxK-Nos.js} +6 -6
- package/dist/public/assets/{BootstrapPage-BgLdZEKQ.js → BootstrapPage-DEwPKWR8.js} +1 -1
- package/dist/public/assets/ConversationPage-CxWtRhfz.js +6 -0
- package/dist/public/assets/{DesktopDetachPreviewPage-YCBnyC58.js → DesktopDetachPreviewPage-DDOWolgB.js} +1 -1
- package/dist/public/assets/{DesktopWindowPage-CrvndE23.js → DesktopWindowPage-CtS9D8FD.js} +1 -1
- package/dist/public/assets/{FileContextPanel-CdC7GGw5.js → FileContextPanel-CNOjhsi5.js} +1 -1
- package/dist/public/assets/GitSidebar-DpC4UhFy.js +6 -0
- package/dist/public/assets/{MobileCreateSessionSheet-Cb2HM-y3.js → MobileCreateSessionSheet-DE4pTyXj.js} +1 -1
- package/dist/public/assets/{MobileTopHeaderFrame-etF2HKlm.js → MobileTopHeaderFrame-D_ZbS0qi.js} +1 -1
- package/dist/public/assets/{MobileWorkspaceSwitcherHeader-CuGJ31kb.js → MobileWorkspaceSwitcherHeader-Dc12IAXc.js} +1 -1
- package/dist/public/assets/{RelayConnectEntryPage-BB6DbGtP.js → RelayConnectEntryPage-D8kyZfdm.js} +1 -1
- package/dist/public/assets/{ServerSettingsModal-Bl1sacZg.js → ServerSettingsModal-8eRu6VXr.js} +1 -1
- package/dist/public/assets/SessionIndexPage-DIi0JWKP.js +1 -0
- package/dist/public/assets/SettingsPage-OQq3kp32.js +2 -0
- package/dist/public/assets/{TerminalManagerPanel-BOm8Hi_v.js → TerminalManagerPanel-BEMzisSy.js} +1 -1
- package/dist/public/assets/{TerminalPage-B5JNFU6w.js → TerminalPage-CXLQfwjU.js} +18 -18
- package/dist/public/assets/{TerminalRuntimeFallbackModal-CM3LRKOJ.js → TerminalRuntimeFallbackModal-BY_VUAbq.js} +1 -1
- package/dist/public/assets/ToolFilesPage-CYx3DgHg.js +1 -0
- package/dist/public/assets/ToolGitPage-fgQcvF6v.js +1 -0
- package/dist/public/assets/ToolProcessesPage-BL6yDDPV.js +1 -0
- package/dist/public/assets/{ToolsHomePage-DsJp0y8A.js → ToolsHomePage-B1n2OeVw.js} +1 -1
- package/dist/public/assets/{WorkbenchLandingPage-DyPei0e-.js → WorkbenchLandingPage-Cu9yAWYo.js} +1 -1
- package/dist/public/assets/WorkbenchLayout-D6hGXWGE.js +244 -0
- package/dist/public/assets/{WorkbenchModal-LNfB69qx.js → WorkbenchModal-Bpb_G1-U.js} +1 -1
- package/dist/public/assets/WorkbenchShellRoute-BCjcGWhl.js +1 -0
- package/dist/public/assets/{WorkspaceDebugDetailPage-CaXj5zVI.js → WorkspaceDebugDetailPage-CZwT99iQ.js} +1 -1
- package/dist/public/assets/{WorkspaceDetailPage-DOexuuaw.js → WorkspaceDetailPage-DCM-olfU.js} +1 -1
- package/dist/public/assets/{WorkspaceHomePage-DkCHNjKD.js → WorkspaceHomePage-CsIIqIma.js} +1 -1
- package/dist/public/assets/{client-runtime-manager-6OoYHXGd.js → client-runtime-manager-CMK7kLp8.js} +1 -1
- package/dist/public/assets/file-tree-icon-Bv-apgA1.js +3 -0
- package/dist/public/assets/index-CkkzIvxs.css +1 -0
- package/dist/public/assets/index-O3gOb1E0.js +42 -0
- package/dist/public/assets/{login-direct-candidate-resolver-CLlYtBRq.js → login-direct-candidate-resolver-Bn4I5JHh.js} +1 -1
- package/dist/public/assets/model-switch-api-ZGnyVir7.js +1 -0
- package/dist/public/assets/{preferences-service-BCcfYP_d.js → preferences-service-scuqVhuA.js} +1 -1
- package/dist/public/assets/realtime-client-TRootbbB.js +1 -0
- package/dist/public/assets/{relay-entry-BmLkMKuq.js → relay-entry-eyCjVFMA.js} +1 -1
- package/dist/public/assets/styles-DkbkRgWw.css +1 -0
- package/dist/public/assets/{terminal-runtime-meta-0h-75uRy.js → terminal-runtime-meta-BGcnzxqn.js} +1 -1
- package/dist/public/assets/{useRegisteredDebugTemplates-rBVmAqh3.js → useRegisteredDebugTemplates-BdgPIDVM.js} +1 -1
- package/dist/public/index.html +2 -2
- package/dist/server/config/env.js +21 -1
- package/dist/server/config/env.js.map +1 -1
- package/dist/server/config/opencode-base-url-resolver.d.ts +16 -0
- package/dist/server/config/opencode-base-url-resolver.js +154 -0
- package/dist/server/config/opencode-base-url-resolver.js.map +1 -1
- package/dist/server/helpers/wechat-claw-runtime/main.d.ts +1 -0
- package/dist/server/helpers/wechat-claw-runtime/main.js +38 -0
- package/dist/server/helpers/wechat-claw-runtime/main.js.map +1 -0
- package/dist/server/helpers/wechat-claw-runtime/modules/errors.d.ts +5 -0
- package/dist/server/helpers/wechat-claw-runtime/modules/errors.js +32 -0
- package/dist/server/helpers/wechat-claw-runtime/modules/errors.js.map +1 -0
- package/dist/server/helpers/wechat-claw-runtime/modules/login-service.d.ts +16 -0
- package/dist/server/helpers/wechat-claw-runtime/modules/login-service.js +209 -0
- package/dist/server/helpers/wechat-claw-runtime/modules/login-service.js.map +1 -0
- package/dist/server/helpers/wechat-claw-runtime/modules/poll-service.d.ts +18 -0
- package/dist/server/helpers/wechat-claw-runtime/modules/poll-service.js +135 -0
- package/dist/server/helpers/wechat-claw-runtime/modules/poll-service.js.map +1 -0
- package/dist/server/helpers/wechat-claw-runtime/modules/runtime-state-store.d.ts +34 -0
- package/dist/server/helpers/wechat-claw-runtime/modules/runtime-state-store.js +394 -0
- package/dist/server/helpers/wechat-claw-runtime/modules/runtime-state-store.js.map +1 -0
- package/dist/server/helpers/wechat-claw-runtime/modules/send-service.d.ts +9 -0
- package/dist/server/helpers/wechat-claw-runtime/modules/send-service.js +64 -0
- package/dist/server/helpers/wechat-claw-runtime/modules/send-service.js.map +1 -0
- package/dist/server/helpers/wechat-claw-runtime/modules/types.d.ts +167 -0
- package/dist/server/helpers/wechat-claw-runtime/modules/types.js +3 -0
- package/dist/server/helpers/wechat-claw-runtime/modules/types.js.map +1 -0
- package/dist/server/helpers/wechat-claw-runtime/modules/wechat-api-client.d.ts +34 -0
- package/dist/server/helpers/wechat-claw-runtime/modules/wechat-api-client.js +160 -0
- package/dist/server/helpers/wechat-claw-runtime/modules/wechat-api-client.js.map +1 -0
- package/dist/server/helpers/wechat-claw-runtime/routes/accounts.d.ts +9 -0
- package/dist/server/helpers/wechat-claw-runtime/routes/accounts.js +24 -0
- package/dist/server/helpers/wechat-claw-runtime/routes/accounts.js.map +1 -0
- package/dist/server/helpers/wechat-claw-runtime/server.d.ts +5 -0
- package/dist/server/helpers/wechat-claw-runtime/server.js +36 -0
- package/dist/server/helpers/wechat-claw-runtime/server.js.map +1 -0
- package/dist/server/middlewares/auth-guard.js +4 -1
- package/dist/server/middlewares/auth-guard.js.map +1 -1
- package/dist/server/modules/butler/butler-control-session-service.d.ts +16 -1
- package/dist/server/modules/butler/butler-control-session-service.js +106 -75
- package/dist/server/modules/butler/butler-control-session-service.js.map +1 -1
- package/dist/server/modules/butler/butler-session-service.js +44 -15
- package/dist/server/modules/butler/butler-session-service.js.map +1 -1
- package/dist/server/modules/channels/channel-bridge-service.d.ts +55 -0
- package/dist/server/modules/channels/channel-bridge-service.js +340 -0
- package/dist/server/modules/channels/channel-bridge-service.js.map +1 -0
- package/dist/server/modules/channels/channel-controller.d.ts +52 -0
- package/dist/server/modules/channels/channel-controller.js +54 -0
- package/dist/server/modules/channels/channel-controller.js.map +1 -0
- package/dist/server/modules/channels/channel-delivery-service.d.ts +63 -0
- package/dist/server/modules/channels/channel-delivery-service.js +429 -0
- package/dist/server/modules/channels/channel-delivery-service.js.map +1 -0
- package/dist/server/modules/channels/channel-gateway-controller.d.ts +15 -0
- package/dist/server/modules/channels/channel-gateway-controller.js +16 -0
- package/dist/server/modules/channels/channel-gateway-controller.js.map +1 -0
- package/dist/server/modules/channels/channel-gateway-service.d.ts +24 -0
- package/dist/server/modules/channels/channel-gateway-service.js +56 -0
- package/dist/server/modules/channels/channel-gateway-service.js.map +1 -0
- package/dist/server/modules/channels/channel-platform-adapters.d.ts +46 -0
- package/dist/server/modules/channels/channel-platform-adapters.js +315 -0
- package/dist/server/modules/channels/channel-platform-adapters.js.map +1 -0
- package/dist/server/modules/channels/channel-platform-catalog.d.ts +3 -0
- package/dist/server/modules/channels/channel-platform-catalog.js +42 -0
- package/dist/server/modules/channels/channel-platform-catalog.js.map +1 -0
- package/dist/server/modules/channels/channel-polling-scheduler.d.ts +31 -0
- package/dist/server/modules/channels/channel-polling-scheduler.js +93 -0
- package/dist/server/modules/channels/channel-polling-scheduler.js.map +1 -0
- package/dist/server/modules/channels/channel-polling-service.d.ts +46 -0
- package/dist/server/modules/channels/channel-polling-service.js +176 -0
- package/dist/server/modules/channels/channel-polling-service.js.map +1 -0
- package/dist/server/modules/channels/channel-service.d.ts +108 -0
- package/dist/server/modules/channels/channel-service.js +397 -0
- package/dist/server/modules/channels/channel-service.js.map +1 -0
- package/dist/server/modules/channels/wechat-claw-runtime-boundary.d.ts +4 -0
- package/dist/server/modules/channels/wechat-claw-runtime-boundary.js +13 -0
- package/dist/server/modules/channels/wechat-claw-runtime-boundary.js.map +1 -0
- package/dist/server/modules/channels/wechat-claw-runtime-client.d.ts +14 -0
- package/dist/server/modules/channels/wechat-claw-runtime-client.js +95 -0
- package/dist/server/modules/channels/wechat-claw-runtime-client.js.map +1 -0
- package/dist/server/modules/channels/wechat-claw-runtime-manager.d.ts +16 -0
- package/dist/server/modules/channels/wechat-claw-runtime-manager.js +133 -0
- package/dist/server/modules/channels/wechat-claw-runtime-manager.js.map +1 -0
- package/dist/server/modules/channels/wechat-claw-runtime-types.d.ts +1 -0
- package/dist/server/modules/channels/wechat-claw-runtime-types.js +2 -0
- package/dist/server/modules/channels/wechat-claw-runtime-types.js.map +1 -0
- package/dist/server/modules/git/git-controller.d.ts +3 -1
- package/dist/server/modules/git/git-controller.js +9 -2
- package/dist/server/modules/git/git-controller.js.map +1 -1
- package/dist/server/modules/git/git-read-service.js +2 -1
- package/dist/server/modules/git/git-read-service.js.map +1 -1
- package/dist/server/modules/git/git-remote-credential-service.d.ts +1 -0
- package/dist/server/modules/git/git-remote-credential-service.js +4 -0
- package/dist/server/modules/git/git-remote-credential-service.js.map +1 -1
- package/dist/server/modules/git/types.d.ts +1 -0
- package/dist/server/modules/opencli/opencli-bridge-skill-service.js +2 -1
- package/dist/server/modules/opencli/opencli-bridge-skill-service.js.map +1 -1
- package/dist/server/modules/provider/codex-model-options.js +14 -15
- package/dist/server/modules/provider/codex-model-options.js.map +1 -1
- package/dist/server/modules/provider/provider-catalog-service.d.ts +5 -6
- package/dist/server/modules/provider/provider-catalog-service.js +12 -57
- package/dist/server/modules/provider/provider-catalog-service.js.map +1 -1
- package/dist/server/modules/provider/provider-controller.d.ts +1 -0
- package/dist/server/modules/provider/provider-controller.js +5 -0
- package/dist/server/modules/provider/provider-controller.js.map +1 -1
- package/dist/server/modules/provider/provider-discovery-helper-process.js +2 -1
- package/dist/server/modules/provider/provider-discovery-helper-process.js.map +1 -1
- package/dist/server/modules/provider/provider-runtime-state-service.d.ts +24 -0
- package/dist/server/modules/provider/provider-runtime-state-service.js +141 -0
- package/dist/server/modules/provider/provider-runtime-state-service.js.map +1 -0
- package/dist/server/modules/sessions/session-history-service.d.ts +3 -3
- package/dist/server/modules/sessions/session-history-service.js +150 -47
- package/dist/server/modules/sessions/session-history-service.js.map +1 -1
- package/dist/server/modules/sessions/session-live-runtime-service.js +9 -11
- package/dist/server/modules/sessions/session-live-runtime-service.js.map +1 -1
- package/dist/server/modules/sessions/session-provider-config-service.d.ts +1 -0
- package/dist/server/modules/sessions/session-provider-config-service.js +28 -7
- package/dist/server/modules/sessions/session-provider-config-service.js.map +1 -1
- package/dist/server/modules/sessions/session-provider-error-mapper.js +7 -0
- package/dist/server/modules/sessions/session-provider-error-mapper.js.map +1 -1
- package/dist/server/modules/tasks/task-types.d.ts +2 -0
- package/dist/server/modules/tasks/task-types.js +2 -0
- package/dist/server/modules/tasks/task-types.js.map +1 -1
- package/dist/server/routes/channels.d.ts +3 -0
- package/dist/server/routes/channels.js +16 -0
- package/dist/server/routes/channels.js.map +1 -0
- package/dist/server/routes/providers.js +1 -0
- package/dist/server/routes/providers.js.map +1 -1
- package/dist/server/routes/public.d.ts +2 -1
- package/dist/server/routes/public.js +3 -1
- package/dist/server/routes/public.js.map +1 -1
- package/dist/server/server/create-server.d.ts +22 -0
- package/dist/server/server/create-server.js +63 -4
- package/dist/server/server/create-server.js.map +1 -1
- package/dist/server/shared/http/error-handler.js +59 -3
- package/dist/server/shared/http/error-handler.js.map +1 -1
- package/dist/server/storage/repositories/channel-account-repository.d.ts +12 -0
- package/dist/server/storage/repositories/channel-account-repository.js +153 -0
- package/dist/server/storage/repositories/channel-account-repository.js.map +1 -0
- package/dist/server/storage/repositories/channel-delivery-repository.d.ts +13 -0
- package/dist/server/storage/repositories/channel-delivery-repository.js +156 -0
- package/dist/server/storage/repositories/channel-delivery-repository.js.map +1 -0
- package/dist/server/storage/repositories/channel-inbound-event-repository.d.ts +12 -0
- package/dist/server/storage/repositories/channel-inbound-event-repository.js +144 -0
- package/dist/server/storage/repositories/channel-inbound-event-repository.js.map +1 -0
- package/dist/server/storage/repositories/channel-thread-repository.d.ts +12 -0
- package/dist/server/storage/repositories/channel-thread-repository.js +152 -0
- package/dist/server/storage/repositories/channel-thread-repository.js.map +1 -0
- package/dist/server/storage/repositories/provider-runtime-state-repository.d.ts +9 -0
- package/dist/server/storage/repositories/provider-runtime-state-repository.js +50 -0
- package/dist/server/storage/repositories/provider-runtime-state-repository.js.map +1 -0
- package/dist/server/storage/sqlite/schema.sql +114 -0
- package/dist/server/types/domain.d.ts +82 -0
- package/dist/server/ws/workbench-ws-hub.js +8 -2
- package/dist/server/ws/workbench-ws-hub.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/patch-builder.d.ts +6 -0
- package/node_modules/@codingns/session-sync-core/dist/patch-builder.js +398 -0
- package/node_modules/@codingns/session-sync-core/dist/patch-builder.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/providers/codex.js +75 -15
- package/node_modules/@codingns/session-sync-core/dist/providers/codex.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/providers/opencode.js +61 -8
- package/node_modules/@codingns/session-sync-core/dist/providers/opencode.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/runtime/codex-runtime.js +32 -4
- package/node_modules/@codingns/session-sync-core/dist/runtime/codex-runtime.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/runtime/opencode-runtime.d.ts +3 -0
- package/node_modules/@codingns/session-sync-core/dist/runtime/opencode-runtime.js +94 -21
- package/node_modules/@codingns/session-sync-core/dist/runtime/opencode-runtime.js.map +1 -1
- package/package.json +5 -1
- package/dist/public/assets/AdaptiveButlerPage-CfsUVZKl.js +0 -3
- package/dist/public/assets/ConversationPage-Cj8go7L0.js +0 -4
- package/dist/public/assets/GitSidebar-z2SBinQh.js +0 -6
- package/dist/public/assets/SessionIndexPage-NbF9gJnp.js +0 -1
- package/dist/public/assets/SettingsPage-DGsmQpLv.js +0 -1
- package/dist/public/assets/ToolFilesPage-GSqKQsj_.js +0 -1
- package/dist/public/assets/ToolGitPage-BVFWMMQp.js +0 -1
- package/dist/public/assets/ToolProcessesPage-DZ456fYz.js +0 -1
- package/dist/public/assets/WorkbenchLayout-DlbgBT3n.js +0 -4
- package/dist/public/assets/WorkbenchShellRoute-BsxumYx5.js +0 -1
- package/dist/public/assets/file-tree-icon-9pt1OStn.js +0 -31
- package/dist/public/assets/index-BwlbvwaA.css +0 -1
- package/dist/public/assets/index-DSw-TkQL.js +0 -42
- package/dist/public/assets/model-switch-api-C-l8-E1S.js +0 -1
- package/dist/public/assets/session-runtime-machine-DgtvREca.js +0 -21
- package/dist/public/assets/styles-CsEMfdaS.css +0 -1
- /package/dist/public/assets/{styles-DRVvx_kv.js → styles-JKFlsYFv.js} +0 -0
|
@@ -0,0 +1,209 @@
|
|
|
1
|
+
import { nowIso } from "../../../shared/utils/time.js";
|
|
2
|
+
import { DEFAULT_WECHAT_CLAW_BOT_TYPE, DEFAULT_WECHAT_CLAW_API_BASE_URL } from "./types.js";
|
|
3
|
+
import { invalidWechatClawInput, wechatClawUpstreamError } from "./errors.js";
|
|
4
|
+
export class WechatClawLoginService {
|
|
5
|
+
store;
|
|
6
|
+
apiClient;
|
|
7
|
+
constructor(store, apiClient) {
|
|
8
|
+
this.store = store;
|
|
9
|
+
this.apiClient = apiClient;
|
|
10
|
+
}
|
|
11
|
+
async startLogin(accountId, config) {
|
|
12
|
+
const normalizedAccountId = accountId.trim();
|
|
13
|
+
if (!normalizedAccountId) {
|
|
14
|
+
throw invalidWechatClawInput("accountId 不能为空", "accountId");
|
|
15
|
+
}
|
|
16
|
+
const current = this.store.getAccountSession(normalizedAccountId);
|
|
17
|
+
if (current
|
|
18
|
+
&& (current.status === "waiting_scan" || current.status === "scan_confirmed")
|
|
19
|
+
&& current.qrCodeUrl
|
|
20
|
+
&& isRenderableQrCodeDataUrl(current.qrCodeUrl)
|
|
21
|
+
&& !isExpired(current.expiresAt)) {
|
|
22
|
+
return {
|
|
23
|
+
accountId: normalizedAccountId,
|
|
24
|
+
actedAt: nowIso(),
|
|
25
|
+
detail: "二维码仍然有效,可以继续扫码。",
|
|
26
|
+
session: this.store.toSessionView(current)
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
const qr = await this.apiClient.getBotQrCode({
|
|
30
|
+
apiBaseUrl: config.loginBaseUrl ?? DEFAULT_WECHAT_CLAW_API_BASE_URL,
|
|
31
|
+
botType: normalizeBotType(config.botType),
|
|
32
|
+
routeTag: config.routeTag
|
|
33
|
+
});
|
|
34
|
+
if (!qr.qrcode || !qr.qrcode_img_content) {
|
|
35
|
+
throw wechatClawUpstreamError("微信登录二维码响应缺少 qrcode 或二维码地址");
|
|
36
|
+
}
|
|
37
|
+
const qrCodeImageDataUrl = await this.apiClient.renderQrCodeDataUrl({
|
|
38
|
+
text: qr.qrcode_img_content
|
|
39
|
+
});
|
|
40
|
+
const session = this.store.saveAccountSession(normalizedAccountId, {
|
|
41
|
+
status: "waiting_scan",
|
|
42
|
+
loginSessionKey: current?.loginSessionKey ?? `${normalizedAccountId}:${Date.now()}`,
|
|
43
|
+
loginQrcode: qr.qrcode,
|
|
44
|
+
qrCodeUrl: qrCodeImageDataUrl,
|
|
45
|
+
qrCodeSourceUrl: qr.qrcode_img_content,
|
|
46
|
+
apiBaseUrl: normalizeApiBaseUrl(config.apiBaseUrl),
|
|
47
|
+
token: null,
|
|
48
|
+
providerAccountId: null,
|
|
49
|
+
userId: null,
|
|
50
|
+
lastErrorCode: null,
|
|
51
|
+
lastErrorMessage: null,
|
|
52
|
+
loginStartedAt: nowIso(),
|
|
53
|
+
expiresAt: new Date(Date.now() + 5 * 60_000).toISOString()
|
|
54
|
+
});
|
|
55
|
+
return {
|
|
56
|
+
accountId: normalizedAccountId,
|
|
57
|
+
actedAt: nowIso(),
|
|
58
|
+
detail: "二维码已生成,请用微信扫码确认。",
|
|
59
|
+
session: this.store.toSessionView(session)
|
|
60
|
+
};
|
|
61
|
+
}
|
|
62
|
+
async refreshLoginStatus(accountId) {
|
|
63
|
+
const normalizedAccountId = accountId.trim();
|
|
64
|
+
const current = this.store.getAccountSession(normalizedAccountId);
|
|
65
|
+
if (!current) {
|
|
66
|
+
const session = this.store.saveAccountSession(normalizedAccountId, {
|
|
67
|
+
status: "not_logged_in",
|
|
68
|
+
lastErrorCode: null,
|
|
69
|
+
lastErrorMessage: null
|
|
70
|
+
});
|
|
71
|
+
return {
|
|
72
|
+
accountId: normalizedAccountId,
|
|
73
|
+
checkedAt: nowIso(),
|
|
74
|
+
detail: "当前还没有登录会话,请先生成二维码。",
|
|
75
|
+
session: this.store.toSessionView(session)
|
|
76
|
+
};
|
|
77
|
+
}
|
|
78
|
+
if (current.status === "active") {
|
|
79
|
+
const activeSession = current.qrCodeUrl || current.qrCodeSourceUrl || current.loginQrcode
|
|
80
|
+
? this.store.saveAccountSession(normalizedAccountId, {
|
|
81
|
+
status: "active",
|
|
82
|
+
loginQrcode: null,
|
|
83
|
+
qrCodeUrl: null,
|
|
84
|
+
qrCodeSourceUrl: null,
|
|
85
|
+
expiresAt: null,
|
|
86
|
+
lastErrorCode: null,
|
|
87
|
+
lastErrorMessage: null
|
|
88
|
+
})
|
|
89
|
+
: current;
|
|
90
|
+
return {
|
|
91
|
+
accountId: normalizedAccountId,
|
|
92
|
+
checkedAt: nowIso(),
|
|
93
|
+
detail: "微信账号已登录。",
|
|
94
|
+
session: this.store.toSessionView(activeSession)
|
|
95
|
+
};
|
|
96
|
+
}
|
|
97
|
+
if (!current.loginQrcode) {
|
|
98
|
+
const next = this.store.saveAccountSession(normalizedAccountId, {
|
|
99
|
+
status: "not_logged_in",
|
|
100
|
+
lastErrorCode: null,
|
|
101
|
+
lastErrorMessage: "当前没有可刷新的二维码,请重新开始登录。"
|
|
102
|
+
});
|
|
103
|
+
return {
|
|
104
|
+
accountId: normalizedAccountId,
|
|
105
|
+
checkedAt: nowIso(),
|
|
106
|
+
detail: "当前没有可刷新的二维码,请重新开始登录。",
|
|
107
|
+
session: this.store.toSessionView(next)
|
|
108
|
+
};
|
|
109
|
+
}
|
|
110
|
+
const status = await this.apiClient.getQrCodeStatus({
|
|
111
|
+
apiBaseUrl: current.apiBaseUrl ?? DEFAULT_WECHAT_CLAW_API_BASE_URL,
|
|
112
|
+
qrcode: current.loginQrcode
|
|
113
|
+
});
|
|
114
|
+
const checkedAt = nowIso();
|
|
115
|
+
const redirectBaseUrl = normalizeRedirectBaseUrl(status.redirect_host);
|
|
116
|
+
if (status.status === "confirmed" && status.bot_token) {
|
|
117
|
+
const next = this.store.saveAccountSession(normalizedAccountId, {
|
|
118
|
+
status: "active",
|
|
119
|
+
loginQrcode: null,
|
|
120
|
+
qrCodeUrl: null,
|
|
121
|
+
qrCodeSourceUrl: null,
|
|
122
|
+
providerAccountId: status.ilink_bot_id ?? current.providerAccountId,
|
|
123
|
+
apiBaseUrl: status.baseurl ?? redirectBaseUrl ?? current.apiBaseUrl,
|
|
124
|
+
token: status.bot_token,
|
|
125
|
+
userId: status.ilink_user_id ?? current.userId,
|
|
126
|
+
lastErrorCode: null,
|
|
127
|
+
lastErrorMessage: null,
|
|
128
|
+
expiresAt: null
|
|
129
|
+
});
|
|
130
|
+
return {
|
|
131
|
+
accountId: normalizedAccountId,
|
|
132
|
+
checkedAt,
|
|
133
|
+
detail: "扫码确认成功,微信账号已进入可用状态。",
|
|
134
|
+
session: this.store.toSessionView(next)
|
|
135
|
+
};
|
|
136
|
+
}
|
|
137
|
+
if (status.status === "expired") {
|
|
138
|
+
const next = this.store.saveAccountSession(normalizedAccountId, {
|
|
139
|
+
status: "expired",
|
|
140
|
+
token: null,
|
|
141
|
+
lastErrorCode: "QR_EXPIRED",
|
|
142
|
+
lastErrorMessage: "二维码已过期,请重新开始登录。"
|
|
143
|
+
});
|
|
144
|
+
return {
|
|
145
|
+
accountId: normalizedAccountId,
|
|
146
|
+
checkedAt,
|
|
147
|
+
detail: "二维码已过期,请重新生成。",
|
|
148
|
+
session: this.store.toSessionView(next)
|
|
149
|
+
};
|
|
150
|
+
}
|
|
151
|
+
const next = this.store.saveAccountSession(normalizedAccountId, {
|
|
152
|
+
status: status.status === "scaned" || status.status === "scaned_but_redirect"
|
|
153
|
+
? "scan_confirmed"
|
|
154
|
+
: "waiting_scan",
|
|
155
|
+
apiBaseUrl: status.baseurl ?? redirectBaseUrl ?? current.apiBaseUrl,
|
|
156
|
+
lastErrorCode: null,
|
|
157
|
+
lastErrorMessage: null
|
|
158
|
+
});
|
|
159
|
+
return {
|
|
160
|
+
accountId: normalizedAccountId,
|
|
161
|
+
checkedAt,
|
|
162
|
+
detail: next.status === "scan_confirmed" ? "已扫码,请在手机上继续确认。" : "等待扫码。",
|
|
163
|
+
session: this.store.toSessionView(next)
|
|
164
|
+
};
|
|
165
|
+
}
|
|
166
|
+
logout(accountId) {
|
|
167
|
+
this.store.clearAccountRuntimeState(accountId.trim());
|
|
168
|
+
return {
|
|
169
|
+
accountId: accountId.trim(),
|
|
170
|
+
actedAt: nowIso(),
|
|
171
|
+
detail: "微信 helper 私有运行态已清理。",
|
|
172
|
+
session: null
|
|
173
|
+
};
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
function normalizeBotType(value) {
|
|
177
|
+
const normalized = value?.trim();
|
|
178
|
+
return normalized && normalized.length > 0 ? normalized : DEFAULT_WECHAT_CLAW_BOT_TYPE;
|
|
179
|
+
}
|
|
180
|
+
function normalizeApiBaseUrl(value) {
|
|
181
|
+
const normalized = value?.trim();
|
|
182
|
+
return normalized && normalized.length > 0 ? normalized : DEFAULT_WECHAT_CLAW_API_BASE_URL;
|
|
183
|
+
}
|
|
184
|
+
function normalizeRedirectBaseUrl(host) {
|
|
185
|
+
const normalized = host?.trim();
|
|
186
|
+
return normalized ? `https://${normalized}` : null;
|
|
187
|
+
}
|
|
188
|
+
function isExpired(expiresAt) {
|
|
189
|
+
if (!expiresAt) {
|
|
190
|
+
return false;
|
|
191
|
+
}
|
|
192
|
+
const timestamp = Date.parse(expiresAt);
|
|
193
|
+
return Number.isFinite(timestamp) && timestamp <= Date.now();
|
|
194
|
+
}
|
|
195
|
+
function isRenderableQrCodeDataUrl(value) {
|
|
196
|
+
const normalized = value.trim();
|
|
197
|
+
const prefix = "data:image/svg+xml;base64,";
|
|
198
|
+
if (!normalized.startsWith(prefix)) {
|
|
199
|
+
return false;
|
|
200
|
+
}
|
|
201
|
+
try {
|
|
202
|
+
const decoded = Buffer.from(normalized.slice(prefix.length), "base64").toString("utf8");
|
|
203
|
+
return decoded.includes("<svg");
|
|
204
|
+
}
|
|
205
|
+
catch {
|
|
206
|
+
return false;
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
//# sourceMappingURL=login-service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"login-service.js","sourceRoot":"","sources":["../../../../../src/helpers/wechat-claw-runtime/modules/login-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import type { WechatClawRuntimeAccountConfig, WechatClawRuntimePollResult } from "./types.js";
|
|
2
|
+
import { WechatClawRuntimeStateStore } from "./runtime-state-store.js";
|
|
3
|
+
import { WechatClawApiClient } from "./wechat-api-client.js";
|
|
4
|
+
export declare class WechatClawPollService {
|
|
5
|
+
private readonly store;
|
|
6
|
+
private readonly apiClient;
|
|
7
|
+
constructor(store: WechatClawRuntimeStateStore, apiClient: WechatClawApiClient);
|
|
8
|
+
probe(accountId: string, config: WechatClawRuntimeAccountConfig): Promise<{
|
|
9
|
+
accountId: string;
|
|
10
|
+
checkedAt: string;
|
|
11
|
+
ok: boolean;
|
|
12
|
+
detail: string;
|
|
13
|
+
warnings: string[];
|
|
14
|
+
session: ReturnType<WechatClawRuntimeStateStore["toSessionView"]>;
|
|
15
|
+
}>;
|
|
16
|
+
poll(accountId: string, config: WechatClawRuntimeAccountConfig): Promise<WechatClawRuntimePollResult>;
|
|
17
|
+
private normalizeInboundMessage;
|
|
18
|
+
}
|
|
@@ -0,0 +1,135 @@
|
|
|
1
|
+
import { nowIso } from "../../../shared/utils/time.js";
|
|
2
|
+
import { wechatClawStateError, wechatClawUpstreamError } from "./errors.js";
|
|
3
|
+
export class WechatClawPollService {
|
|
4
|
+
store;
|
|
5
|
+
apiClient;
|
|
6
|
+
constructor(store, apiClient) {
|
|
7
|
+
this.store = store;
|
|
8
|
+
this.apiClient = apiClient;
|
|
9
|
+
}
|
|
10
|
+
async probe(accountId, config) {
|
|
11
|
+
const session = this.store.getAccountSession(accountId.trim());
|
|
12
|
+
const checkedAt = nowIso();
|
|
13
|
+
if (!session || session.status !== "active" || !session.token) {
|
|
14
|
+
return {
|
|
15
|
+
accountId: accountId.trim(),
|
|
16
|
+
checkedAt,
|
|
17
|
+
ok: false,
|
|
18
|
+
detail: "微信账号还没有完成扫码登录。",
|
|
19
|
+
warnings: [],
|
|
20
|
+
session: this.store.toSessionView(session)
|
|
21
|
+
};
|
|
22
|
+
}
|
|
23
|
+
if (!session.userId) {
|
|
24
|
+
return {
|
|
25
|
+
accountId: accountId.trim(),
|
|
26
|
+
checkedAt,
|
|
27
|
+
ok: true,
|
|
28
|
+
detail: "微信账号已登录,但当前还没有最近会话上下文。",
|
|
29
|
+
warnings: ["用户 ID 还没有回填,后续收到第一条微信消息后会自动补齐。"],
|
|
30
|
+
session: this.store.toSessionView(session)
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
const response = await this.apiClient.getConfig({
|
|
34
|
+
apiBaseUrl: session.apiBaseUrl ?? config.apiBaseUrl,
|
|
35
|
+
token: session.token,
|
|
36
|
+
userId: session.userId
|
|
37
|
+
});
|
|
38
|
+
if (response.ret && response.ret !== 0) {
|
|
39
|
+
throw wechatClawUpstreamError(`微信 getconfig 返回异常:ret=${response.ret} ${response.errmsg ?? ""}`.trim());
|
|
40
|
+
}
|
|
41
|
+
return {
|
|
42
|
+
accountId: accountId.trim(),
|
|
43
|
+
checkedAt,
|
|
44
|
+
ok: true,
|
|
45
|
+
detail: "微信 helper 已完成上游探活。",
|
|
46
|
+
warnings: response.typing_ticket ? [] : ["上游没有返回 typing_ticket,当前先只使用文本收发。"],
|
|
47
|
+
session: this.store.toSessionView(session)
|
|
48
|
+
};
|
|
49
|
+
}
|
|
50
|
+
async poll(accountId, config) {
|
|
51
|
+
const normalizedAccountId = accountId.trim();
|
|
52
|
+
const session = this.store.getAccountSession(normalizedAccountId);
|
|
53
|
+
if (!session || session.status !== "active" || !session.token) {
|
|
54
|
+
throw wechatClawStateError("微信账号还没有完成扫码登录,不能开始 poll。");
|
|
55
|
+
}
|
|
56
|
+
const checkpoint = this.store.getPollCheckpoint(normalizedAccountId);
|
|
57
|
+
const response = await this.apiClient.getUpdates({
|
|
58
|
+
apiBaseUrl: session.apiBaseUrl ?? config.apiBaseUrl,
|
|
59
|
+
token: session.token,
|
|
60
|
+
cursor: checkpoint?.cursor ?? null
|
|
61
|
+
});
|
|
62
|
+
if ((response.ret ?? 0) !== 0) {
|
|
63
|
+
if (response.errcode === -14) {
|
|
64
|
+
this.store.saveAccountSession(normalizedAccountId, {
|
|
65
|
+
status: "expired",
|
|
66
|
+
token: null,
|
|
67
|
+
lastErrorCode: String(response.errcode),
|
|
68
|
+
lastErrorMessage: response.errmsg ?? "微信登录态已失效,请重新扫码。"
|
|
69
|
+
});
|
|
70
|
+
}
|
|
71
|
+
throw wechatClawUpstreamError(`微信 getupdates 返回异常:ret=${response.ret ?? "unknown"} errcode=${response.errcode ?? "unknown"} ${response.errmsg ?? ""}`.trim());
|
|
72
|
+
}
|
|
73
|
+
const inboundMessages = (response.msgs ?? [])
|
|
74
|
+
.map((message) => this.normalizeInboundMessage(normalizedAccountId, message))
|
|
75
|
+
.filter((message) => Boolean(message));
|
|
76
|
+
const latestExternalEventId = inboundMessages.length > 0
|
|
77
|
+
? inboundMessages[inboundMessages.length - 1].externalEventId
|
|
78
|
+
: checkpoint?.latestExternalEventId ?? null;
|
|
79
|
+
this.store.setPollCheckpoint(normalizedAccountId, {
|
|
80
|
+
cursor: response.get_updates_buf ?? checkpoint?.cursor ?? null,
|
|
81
|
+
latestExternalEventId
|
|
82
|
+
});
|
|
83
|
+
return {
|
|
84
|
+
accountId: normalizedAccountId,
|
|
85
|
+
checkedAt: nowIso(),
|
|
86
|
+
detail: `本次轮询拿到 ${inboundMessages.length} 条文本消息。`,
|
|
87
|
+
inboundMessages
|
|
88
|
+
};
|
|
89
|
+
}
|
|
90
|
+
normalizeInboundMessage(accountId, message) {
|
|
91
|
+
if (message.message_type === 2) {
|
|
92
|
+
return null;
|
|
93
|
+
}
|
|
94
|
+
const text = (message.item_list ?? [])
|
|
95
|
+
.filter((item) => item.type === 1)
|
|
96
|
+
.map((item) => item.text_item?.text?.trim() ?? "")
|
|
97
|
+
.filter((item) => item.length > 0)
|
|
98
|
+
.join("\n");
|
|
99
|
+
if (!text) {
|
|
100
|
+
return null;
|
|
101
|
+
}
|
|
102
|
+
const externalUserId = message.from_user_id?.trim() ?? null;
|
|
103
|
+
const externalConversationKey = externalUserId
|
|
104
|
+
?? message.session_id?.trim()
|
|
105
|
+
?? message.to_user_id?.trim()
|
|
106
|
+
?? null;
|
|
107
|
+
if (!externalConversationKey) {
|
|
108
|
+
return null;
|
|
109
|
+
}
|
|
110
|
+
if (message.context_token && externalUserId) {
|
|
111
|
+
this.store.upsertContextToken(accountId, {
|
|
112
|
+
conversationKey: externalConversationKey,
|
|
113
|
+
externalUserId,
|
|
114
|
+
token: message.context_token,
|
|
115
|
+
status: "active"
|
|
116
|
+
});
|
|
117
|
+
}
|
|
118
|
+
return {
|
|
119
|
+
externalEventId: String(message.message_id ?? message.seq ?? `${externalConversationKey}:${message.create_time_ms ?? Date.now()}`),
|
|
120
|
+
externalConversationKey,
|
|
121
|
+
externalUserId,
|
|
122
|
+
externalThreadKey: null,
|
|
123
|
+
text,
|
|
124
|
+
senderDisplayName: externalUserId,
|
|
125
|
+
rawPayload: message,
|
|
126
|
+
transportContext: {
|
|
127
|
+
contextToken: message.context_token ?? null,
|
|
128
|
+
fromUserId: message.from_user_id ?? null,
|
|
129
|
+
toUserId: message.to_user_id ?? null,
|
|
130
|
+
sessionId: message.session_id ?? null
|
|
131
|
+
}
|
|
132
|
+
};
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
//# sourceMappingURL=poll-service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"poll-service.js","sourceRoot":"","sources":["../../../../../src/helpers/wechat-claw-runtime/modules/poll-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import type { WechatClawAccountSessionRecord, WechatClawContextTokenRecord, WechatClawDeliveryReceiptRecord, WechatClawPollCheckpointRecord, WechatClawRuntimeLoginStatus, WechatClawRuntimeSessionView } from "./types.js";
|
|
2
|
+
export declare class WechatClawRuntimeStateStore {
|
|
3
|
+
private readonly db;
|
|
4
|
+
constructor(runtimeRootDir: string);
|
|
5
|
+
dispose(): void;
|
|
6
|
+
getAccountSession(channelAccountId: string): WechatClawAccountSessionRecord | null;
|
|
7
|
+
saveAccountSession(channelAccountId: string, patch: Partial<WechatClawAccountSessionRecord> & {
|
|
8
|
+
status: WechatClawRuntimeLoginStatus;
|
|
9
|
+
}): WechatClawAccountSessionRecord;
|
|
10
|
+
clearAccountRuntimeState(channelAccountId: string): void;
|
|
11
|
+
getPollCheckpoint(channelAccountId: string): WechatClawPollCheckpointRecord | null;
|
|
12
|
+
setPollCheckpoint(channelAccountId: string, input: {
|
|
13
|
+
cursor: string | null;
|
|
14
|
+
latestExternalEventId: string | null;
|
|
15
|
+
}): WechatClawPollCheckpointRecord;
|
|
16
|
+
getContextToken(channelAccountId: string, conversationKey: string, externalUserId: string): WechatClawContextTokenRecord | null;
|
|
17
|
+
listContextTokensByUser(channelAccountId: string, externalUserId: string): WechatClawContextTokenRecord[];
|
|
18
|
+
upsertContextToken(channelAccountId: string, input: {
|
|
19
|
+
conversationKey: string;
|
|
20
|
+
externalUserId: string;
|
|
21
|
+
token: string;
|
|
22
|
+
status?: string;
|
|
23
|
+
expiresAt?: string | null;
|
|
24
|
+
}): WechatClawContextTokenRecord;
|
|
25
|
+
saveDeliveryReceipt(channelAccountId: string, input: {
|
|
26
|
+
providerMessageRef: string;
|
|
27
|
+
status: string;
|
|
28
|
+
errorCode?: string | null;
|
|
29
|
+
errorMessage?: string | null;
|
|
30
|
+
}): WechatClawDeliveryReceiptRecord;
|
|
31
|
+
toSessionView(session: WechatClawAccountSessionRecord | null): WechatClawRuntimeSessionView | null;
|
|
32
|
+
private initializeSchema;
|
|
33
|
+
private ensureColumn;
|
|
34
|
+
}
|