@jingyi0605/codingns 0.4.0 → 0.5.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/bin/codingns.mjs +425 -1
- package/dist/public/assets/AdaptiveButlerPage-B153lk5H.css +1 -0
- package/dist/public/assets/AdaptiveButlerPage-SffCV4Vb.js +3 -0
- package/dist/public/assets/App-DUAg5urj.css +1 -0
- package/dist/public/assets/App-WOLwMld_.js +30 -0
- package/dist/public/assets/BootstrapPage--zExdgfM.js +1 -0
- package/dist/public/assets/ConversationPage-D9pzRmOg.js +2 -0
- package/dist/public/assets/DesktopDetachPreviewPage-DvI9CIKi.js +1 -0
- package/dist/public/assets/DesktopWindowPage-D8FpOSLE.js +2 -0
- package/dist/public/assets/FileContextPanel-C8T7oqRN.js +1 -0
- package/dist/public/assets/GitSidebar-Bze7DNnc.js +6 -0
- package/dist/public/assets/MobileCreateSessionSheet-CXSKMnYn.js +1 -0
- package/dist/public/assets/MobileSheet-Gzc14EpR.js +1 -0
- package/dist/public/assets/MobileTopHeaderFrame-BWorAJ1C.js +1 -0
- package/dist/public/assets/MobileWorkspaceSwitcherHeader-DOr4pTUq.js +1 -0
- package/dist/public/assets/ServerSettingsModal-BYB0GvTl.js +1 -0
- package/dist/public/assets/SessionIndexPage-CR3IARXX.js +1 -0
- package/dist/public/assets/SettingsPage-B_BQtnwE.js +1 -0
- package/dist/public/assets/TerminalManagerPanel-PQ-EM64j.js +1 -0
- package/dist/public/assets/{TerminalPage-6jHZV9Mh.js → TerminalPage-CvnHXBhw.js} +19 -19
- package/dist/public/assets/TerminalRuntimeFallbackModal-D7Aq186N.js +1 -0
- package/dist/public/assets/ToolFilesPage-Qzkc6K2I.js +1 -0
- package/dist/public/assets/ToolGitPage-BdNDN-cV.js +1 -0
- package/dist/public/assets/ToolProcessesPage-EXJ9DHWI.js +1 -0
- package/dist/public/assets/ToolsHomePage-CjF3CWzR.js +1 -0
- package/dist/public/assets/WorkbenchLandingPage-DZPk4SmX.js +1 -0
- package/dist/public/assets/WorkbenchLayout-rwQib5In.js +3 -0
- package/dist/public/assets/WorkbenchModal-B09hC9b5.js +1 -0
- package/dist/public/assets/WorkbenchShellRoute-Cerk5uK7.js +1 -0
- package/dist/public/assets/WorkbenchShellRoute-DsW4mBTX.css +1 -0
- package/dist/public/assets/WorkspaceDebugDetailPage-Bcq8s-Ma.js +1 -0
- package/dist/public/assets/WorkspaceDetailPage-DNAa8pKr.js +1 -0
- package/dist/public/assets/WorkspaceHomePage-BoiLuACV.js +1 -0
- package/dist/public/assets/butler-records-events-DgWCG364.js +1 -0
- package/dist/public/assets/client-runtime-manager-CRQ-F5d2.js +1 -0
- package/dist/public/assets/default-session-permission-mode-D0wZ9Jek.js +1 -0
- package/dist/public/assets/event-DvH9tcej.js +1 -0
- package/dist/public/assets/file-tree-icon-Dp_xhVfD.js +31 -0
- package/dist/public/assets/index-C2G8Gmf1.js +42 -0
- package/dist/public/assets/index-CpPTUeA3.css +1 -0
- package/dist/public/assets/preferences-service-gOt2ZjKZ.js +1 -0
- package/dist/public/assets/session-runtime-machine-Dq3pW-UF.js +17 -0
- package/dist/public/assets/styles-BWPBZvze.css +1 -0
- package/dist/public/assets/styles-CSUx5LGe.js +1 -0
- package/dist/public/assets/terminal-runtime-meta-BMT-rSEe.js +1 -0
- package/dist/public/assets/useRegisteredDebugTemplates-zMcEOGca.js +1 -0
- package/dist/public/assets/window-BWqRixxq.js +1 -0
- package/dist/public/index.html +2 -2
- package/dist/server/middlewares/auth-guard.d.ts +4 -0
- package/dist/server/middlewares/auth-guard.js +42 -4
- package/dist/server/middlewares/auth-guard.js.map +1 -1
- package/dist/server/modules/assistant-capability/assistant-capability-controller.d.ts +62 -1
- package/dist/server/modules/assistant-capability/assistant-capability-controller.js +58 -0
- package/dist/server/modules/assistant-capability/assistant-capability-controller.js.map +1 -1
- package/dist/server/modules/assistant-capability/assistant-capability-service.d.ts +66 -3
- package/dist/server/modules/assistant-capability/assistant-capability-service.js +173 -1
- package/dist/server/modules/assistant-capability/assistant-capability-service.js.map +1 -1
- package/dist/server/modules/auth/auth-controller.d.ts +11 -1
- package/dist/server/modules/auth/auth-controller.js +61 -2
- package/dist/server/modules/auth/auth-controller.js.map +1 -1
- package/dist/server/modules/auth/auth-device-display-name.d.ts +10 -0
- package/dist/server/modules/auth/auth-device-display-name.js +190 -0
- package/dist/server/modules/auth/auth-device-display-name.js.map +1 -0
- package/dist/server/modules/auth/auth-service.d.ts +80 -5
- package/dist/server/modules/auth/auth-service.js +333 -23
- package/dist/server/modules/auth/auth-service.js.map +1 -1
- package/dist/server/modules/butler/assistant-automation-service.d.ts +2 -0
- package/dist/server/modules/butler/assistant-automation-service.js +46 -0
- package/dist/server/modules/butler/assistant-automation-service.js.map +1 -1
- package/dist/server/modules/butler/assistant-sandbox-cleanup-scheduler.d.ts +32 -0
- package/dist/server/modules/butler/assistant-sandbox-cleanup-scheduler.js +93 -0
- package/dist/server/modules/butler/assistant-sandbox-cleanup-scheduler.js.map +1 -0
- package/dist/server/modules/butler/assistant-sandbox-service.d.ts +16 -2
- package/dist/server/modules/butler/assistant-sandbox-service.js +137 -4
- package/dist/server/modules/butler/assistant-sandbox-service.js.map +1 -1
- package/dist/server/modules/butler/butler-auth-service.js +7 -2
- package/dist/server/modules/butler/butler-auth-service.js.map +1 -1
- package/dist/server/modules/butler/butler-control-session-service.d.ts +4 -1
- package/dist/server/modules/butler/butler-control-session-service.js +20 -1
- package/dist/server/modules/butler/butler-control-session-service.js.map +1 -1
- package/dist/server/modules/butler/butler-follow-up-evaluation-instruction-adapter.d.ts +2 -1
- package/dist/server/modules/butler/butler-follow-up-evaluation-instruction-adapter.js +27 -25
- package/dist/server/modules/butler/butler-follow-up-evaluation-instruction-adapter.js.map +1 -1
- package/dist/server/modules/butler/butler-follow-up-service.d.ts +32 -4
- package/dist/server/modules/butler/butler-follow-up-service.js +436 -331
- package/dist/server/modules/butler/butler-follow-up-service.js.map +1 -1
- package/dist/server/modules/butler/butler-inbox-analysis-service.d.ts +1 -1
- package/dist/server/modules/butler/butler-inbox-analysis-service.js.map +1 -1
- package/dist/server/modules/butler/butler-inbox-service.js +1 -0
- package/dist/server/modules/butler/butler-inbox-service.js.map +1 -1
- package/dist/server/modules/butler/butler-session-service.d.ts +3 -1
- package/dist/server/modules/butler/butler-session-service.js +15 -1
- package/dist/server/modules/butler/butler-session-service.js.map +1 -1
- package/dist/server/modules/butler/butler-workspace-context.d.ts +1 -1
- package/dist/server/modules/butler/butler-workspace-context.js +54 -28
- package/dist/server/modules/butler/butler-workspace-context.js.map +1 -1
- package/dist/server/modules/client/client-controller.js +1 -1
- package/dist/server/modules/client/client-controller.js.map +1 -1
- package/dist/server/modules/client/client-service.d.ts +16 -2
- package/dist/server/modules/client/client-service.js +21 -3
- package/dist/server/modules/client/client-service.js.map +1 -1
- package/dist/server/modules/provider/provider-controller.d.ts +1 -1
- package/dist/server/modules/provider/provider-controller.js.map +1 -1
- package/dist/server/modules/relay-tunnel/crypto/relay-tunnel-identity-service.d.ts +10 -0
- package/dist/server/modules/relay-tunnel/crypto/relay-tunnel-identity-service.js +48 -0
- package/dist/server/modules/relay-tunnel/crypto/relay-tunnel-identity-service.js.map +1 -0
- package/dist/server/modules/relay-tunnel/crypto/relay-tunnel-packets.d.ts +48 -0
- package/dist/server/modules/relay-tunnel/crypto/relay-tunnel-packets.js +11 -0
- package/dist/server/modules/relay-tunnel/crypto/relay-tunnel-packets.js.map +1 -0
- package/dist/server/modules/relay-tunnel/crypto/relay-tunnel-protocol.d.ts +74 -0
- package/dist/server/modules/relay-tunnel/crypto/relay-tunnel-protocol.js +302 -0
- package/dist/server/modules/relay-tunnel/crypto/relay-tunnel-protocol.js.map +1 -0
- package/dist/server/modules/relay-tunnel/relay-tunnel-controller.d.ts +33 -0
- package/dist/server/modules/relay-tunnel/relay-tunnel-controller.js +57 -0
- package/dist/server/modules/relay-tunnel/relay-tunnel-controller.js.map +1 -0
- package/dist/server/modules/relay-tunnel/relay-tunnel-edge-proof.d.ts +9 -0
- package/dist/server/modules/relay-tunnel/relay-tunnel-edge-proof.js +25 -0
- package/dist/server/modules/relay-tunnel/relay-tunnel-edge-proof.js.map +1 -0
- package/dist/server/modules/relay-tunnel/relay-tunnel-gateway-service.d.ts +18 -0
- package/dist/server/modules/relay-tunnel/relay-tunnel-gateway-service.js +230 -0
- package/dist/server/modules/relay-tunnel/relay-tunnel-gateway-service.js.map +1 -0
- package/dist/server/modules/relay-tunnel/relay-tunnel-runtime-adapter.d.ts +41 -0
- package/dist/server/modules/relay-tunnel/relay-tunnel-runtime-adapter.js +443 -0
- package/dist/server/modules/relay-tunnel/relay-tunnel-runtime-adapter.js.map +1 -0
- package/dist/server/modules/relay-tunnel/relay-tunnel-service.d.ts +112 -0
- package/dist/server/modules/relay-tunnel/relay-tunnel-service.js +966 -0
- package/dist/server/modules/relay-tunnel/relay-tunnel-service.js.map +1 -0
- package/dist/server/modules/sessions/codex-app-server-helper-client.d.ts +2 -1
- package/dist/server/modules/sessions/codex-app-server-helper-client.js +78 -0
- package/dist/server/modules/sessions/codex-app-server-helper-client.js.map +1 -1
- package/dist/server/modules/sessions/codex-app-server-helper-process.js +84 -2
- package/dist/server/modules/sessions/codex-app-server-helper-process.js.map +1 -1
- package/dist/server/modules/sessions/provider-session-delete-cli.d.ts +15 -0
- package/dist/server/modules/sessions/provider-session-delete-cli.js +148 -0
- package/dist/server/modules/sessions/provider-session-delete-cli.js.map +1 -0
- package/dist/server/modules/sessions/session-controller.d.ts +4 -1
- package/dist/server/modules/sessions/session-controller.js +4 -0
- package/dist/server/modules/sessions/session-controller.js.map +1 -1
- package/dist/server/modules/sessions/session-history-service.d.ts +17 -0
- package/dist/server/modules/sessions/session-history-service.js +150 -1
- package/dist/server/modules/sessions/session-history-service.js.map +1 -1
- package/dist/server/modules/sessions/session-live-runtime-router-service.d.ts +25 -0
- package/dist/server/modules/sessions/session-live-runtime-router-service.js +42 -0
- package/dist/server/modules/sessions/session-live-runtime-router-service.js.map +1 -0
- package/dist/server/modules/sessions/session-live-runtime-service.js +34 -18
- package/dist/server/modules/sessions/session-live-runtime-service.js.map +1 -1
- package/dist/server/modules/sessions/session-message-attachment-service.d.ts +1 -0
- package/dist/server/modules/sessions/session-message-attachment-service.js +22 -0
- package/dist/server/modules/sessions/session-message-attachment-service.js.map +1 -1
- package/dist/server/modules/sessions/session-permission-request-service.d.ts +1 -0
- package/dist/server/modules/sessions/session-permission-request-service.js +200 -5
- package/dist/server/modules/sessions/session-permission-request-service.js.map +1 -1
- package/dist/server/modules/sessions/session-provider-error-mapper.js +32 -0
- package/dist/server/modules/sessions/session-provider-error-mapper.js.map +1 -1
- package/dist/server/modules/sessions/session-provider-usage-guard-service.d.ts +37 -0
- package/dist/server/modules/sessions/session-provider-usage-guard-service.js +179 -0
- package/dist/server/modules/sessions/session-provider-usage-guard-service.js.map +1 -0
- package/dist/server/modules/sessions/session-provider-usage-limit.d.ts +17 -0
- package/dist/server/modules/sessions/session-provider-usage-limit.js +465 -0
- package/dist/server/modules/sessions/session-provider-usage-limit.js.map +1 -0
- package/dist/server/modules/skills/assistant-runtime-skill-catalog.d.ts +8 -0
- package/dist/server/modules/skills/assistant-runtime-skill-catalog.js +26 -0
- package/dist/server/modules/skills/assistant-runtime-skill-catalog.js.map +1 -0
- package/dist/server/modules/skills/assistant-runtime-skill-cleanup.d.ts +9 -0
- package/dist/server/modules/skills/assistant-runtime-skill-cleanup.js +55 -0
- package/dist/server/modules/skills/assistant-runtime-skill-cleanup.js.map +1 -0
- package/dist/server/modules/skills/builtin-skill-service.js +1 -6
- package/dist/server/modules/skills/builtin-skill-service.js.map +1 -1
- package/dist/server/modules/skills/skill-controller.d.ts +2 -2
- package/dist/server/modules/skills/skill-controller.js +9 -1
- package/dist/server/modules/skills/skill-controller.js.map +1 -1
- package/dist/server/modules/skills/skill-manager-service.d.ts +26 -1
- package/dist/server/modules/skills/skill-manager-service.js +346 -90
- package/dist/server/modules/skills/skill-manager-service.js.map +1 -1
- package/dist/server/modules/skills/skill-name-policy.d.ts +2 -0
- package/dist/server/modules/skills/skill-name-policy.js +10 -0
- package/dist/server/modules/skills/skill-name-policy.js.map +1 -0
- package/dist/server/modules/tailscale/tailscale-service.d.ts +2 -0
- package/dist/server/modules/tailscale/tailscale-service.js +21 -8
- package/dist/server/modules/tailscale/tailscale-service.js.map +1 -1
- package/dist/server/modules/tasks/task-types.d.ts +3 -0
- package/dist/server/modules/tasks/task-types.js +3 -0
- package/dist/server/modules/tasks/task-types.js.map +1 -1
- package/dist/server/modules/terminal/template-reverse-proxy-service.js +71 -3
- package/dist/server/modules/terminal/template-reverse-proxy-service.js.map +1 -1
- package/dist/server/modules/workbench/snapshot-revision.d.ts +4 -0
- package/dist/server/modules/workbench/snapshot-revision.js +13 -0
- package/dist/server/modules/workbench/snapshot-revision.js.map +1 -0
- package/dist/server/modules/workbench/workbench-service.d.ts +1 -0
- package/dist/server/modules/workbench/workbench-service.js +3 -2
- package/dist/server/modules/workbench/workbench-service.js.map +1 -1
- package/dist/server/modules/workbench/workspace-panel-snapshot-service.d.ts +6 -1
- package/dist/server/modules/workbench/workspace-panel-snapshot-service.js +10 -8
- package/dist/server/modules/workbench/workspace-panel-snapshot-service.js.map +1 -1
- package/dist/server/routes/assistant.js +30 -0
- package/dist/server/routes/assistant.js.map +1 -1
- package/dist/server/routes/auth.js +4 -0
- package/dist/server/routes/auth.js.map +1 -1
- package/dist/server/routes/sessions.js +1 -0
- package/dist/server/routes/sessions.js.map +1 -1
- package/dist/server/routes/system.d.ts +2 -1
- package/dist/server/routes/system.js +13 -1
- package/dist/server/routes/system.js.map +1 -1
- package/dist/server/server/create-server.d.ts +10 -0
- package/dist/server/server/create-server.js +83 -13
- package/dist/server/server/create-server.js.map +1 -1
- package/dist/server/shared/utils/tokens.d.ts +3 -1
- package/dist/server/shared/utils/tokens.js +9 -2
- package/dist/server/shared/utils/tokens.js.map +1 -1
- package/dist/server/storage/repositories/assistant-automation-task-repository.d.ts +2 -0
- package/dist/server/storage/repositories/assistant-automation-task-repository.js +8 -2
- package/dist/server/storage/repositories/assistant-automation-task-repository.js.map +1 -1
- package/dist/server/storage/repositories/assistant-sandbox-workspace-repository.d.ts +1 -0
- package/dist/server/storage/repositories/assistant-sandbox-workspace-repository.js +27 -0
- package/dist/server/storage/repositories/assistant-sandbox-workspace-repository.js.map +1 -1
- package/dist/server/storage/repositories/auth-device-repository.d.ts +22 -0
- package/dist/server/storage/repositories/auth-device-repository.js +97 -0
- package/dist/server/storage/repositories/auth-device-repository.js.map +1 -0
- package/dist/server/storage/repositories/auth-device-session-repository.d.ts +17 -0
- package/dist/server/storage/repositories/auth-device-session-repository.js +82 -0
- package/dist/server/storage/repositories/auth-device-session-repository.js.map +1 -0
- package/dist/server/storage/repositories/auth-login-event-repository.d.ts +9 -0
- package/dist/server/storage/repositories/auth-login-event-repository.js +53 -0
- package/dist/server/storage/repositories/auth-login-event-repository.js.map +1 -0
- package/dist/server/storage/repositories/auth-token-repository.d.ts +4 -0
- package/dist/server/storage/repositories/auth-token-repository.js +58 -5
- package/dist/server/storage/repositories/auth-token-repository.js.map +1 -1
- package/dist/server/storage/repositories/butler-follow-up-task-repository.js +21 -3
- package/dist/server/storage/repositories/butler-follow-up-task-repository.js.map +1 -1
- package/dist/server/storage/repositories/instance-relay-tunnel-identity-repository.d.ts +8 -0
- package/dist/server/storage/repositories/instance-relay-tunnel-identity-repository.js +52 -0
- package/dist/server/storage/repositories/instance-relay-tunnel-identity-repository.js.map +1 -0
- package/dist/server/storage/repositories/instance-relay-tunnel-repository.d.ts +10 -0
- package/dist/server/storage/repositories/instance-relay-tunnel-repository.js +153 -0
- package/dist/server/storage/repositories/instance-relay-tunnel-repository.js.map +1 -0
- package/dist/server/storage/repositories/instance-tailscale-repository.js +6 -3
- package/dist/server/storage/repositories/instance-tailscale-repository.js.map +1 -1
- package/dist/server/storage/repositories/managed-skill-repository.d.ts +2 -1
- package/dist/server/storage/repositories/managed-skill-repository.js +14 -4
- package/dist/server/storage/repositories/managed-skill-repository.js.map +1 -1
- package/dist/server/storage/repositories/session-message-attachment-repository.d.ts +2 -0
- package/dist/server/storage/repositories/session-message-attachment-repository.js +24 -0
- package/dist/server/storage/repositories/session-message-attachment-repository.js.map +1 -1
- package/dist/server/storage/sqlite/client.js +297 -2
- package/dist/server/storage/sqlite/client.js.map +1 -1
- package/dist/server/storage/sqlite/schema.sql +122 -4
- package/dist/server/types/domain.d.ts +91 -1
- package/dist/server/ws/workbench-ws-hub.js +225 -99
- package/dist/server/ws/workbench-ws-hub.js.map +1 -1
- package/dist/server/ws/ws-auth-guard.js +1 -4
- package/dist/server/ws/ws-auth-guard.js.map +1 -1
- package/dist/server/ws/ws-server.d.ts +1 -1
- package/dist/server/ws/ws-server.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/codex-resume-history.d.ts +1 -0
- package/node_modules/@codingns/session-sync-core/dist/codex-resume-history.js +80 -0
- package/node_modules/@codingns/session-sync-core/dist/codex-resume-history.js.map +1 -0
- package/node_modules/@codingns/session-sync-core/dist/providers/claude-code.d.ts +1 -0
- package/node_modules/@codingns/session-sync-core/dist/providers/claude-code.js +11 -1
- package/node_modules/@codingns/session-sync-core/dist/providers/claude-code.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/providers/codex.d.ts +11 -0
- package/node_modules/@codingns/session-sync-core/dist/providers/codex.js +132 -21
- package/node_modules/@codingns/session-sync-core/dist/providers/codex.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/providers/gemini.d.ts +2 -0
- package/node_modules/@codingns/session-sync-core/dist/providers/gemini.js +53 -1
- package/node_modules/@codingns/session-sync-core/dist/providers/gemini.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/providers/kimi.d.ts +1 -0
- package/node_modules/@codingns/session-sync-core/dist/providers/kimi.js +10 -1
- package/node_modules/@codingns/session-sync-core/dist/providers/kimi.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/providers/opencode.d.ts +1 -0
- package/node_modules/@codingns/session-sync-core/dist/providers/opencode.js +30 -0
- 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.d.ts +5 -1
- package/node_modules/@codingns/session-sync-core/dist/runtime/codex-runtime.js +145 -58
- package/node_modules/@codingns/session-sync-core/dist/runtime/codex-runtime.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/services.d.ts +1 -0
- package/node_modules/@codingns/session-sync-core/dist/services.js +7 -0
- package/node_modules/@codingns/session-sync-core/dist/services.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/types.d.ts +2 -0
- package/package.json +1 -1
- package/scripts/postinstall.mjs +0 -33
- package/dist/public/assets/index-CSVhg7I8.js +0 -123
- package/dist/public/assets/index-Ce1VX19m.css +0 -1
|
@@ -3,7 +3,16 @@ import { AppError } from "../../shared/errors/app-error.js";
|
|
|
3
3
|
import { hashToken, verifyPassword } from "../../shared/utils/hash.js";
|
|
4
4
|
import { createId } from "../../shared/utils/id.js";
|
|
5
5
|
import { addSeconds, nowIso } from "../../shared/utils/time.js";
|
|
6
|
-
import { createOpaqueToken } from "../../shared/utils/tokens.js";
|
|
6
|
+
import { createOpaqueToken, isButlerRuntimeAccessToken } from "../../shared/utils/tokens.js";
|
|
7
|
+
import { resolveAuthDeviceInfo } from "./auth-device-display-name.js";
|
|
8
|
+
const DEFAULT_AUTH_REQUEST_METADATA = {
|
|
9
|
+
clientType: "unknown",
|
|
10
|
+
clientInstanceId: null,
|
|
11
|
+
displayName: null,
|
|
12
|
+
sourceAddress: null,
|
|
13
|
+
userAgent: null
|
|
14
|
+
};
|
|
15
|
+
const MAX_RECENT_LOGIN_EVENTS = 10;
|
|
7
16
|
const LOGIN_CAPTCHA_THRESHOLD = 3;
|
|
8
17
|
const LOGIN_CAPTCHA_LENGTH = 4;
|
|
9
18
|
const LOGIN_CAPTCHA_TTL_SECONDS = 5 * 60;
|
|
@@ -14,20 +23,26 @@ export class AuthService {
|
|
|
14
23
|
bootstrapStateRepository;
|
|
15
24
|
authUserRepository;
|
|
16
25
|
authTokenRepository;
|
|
26
|
+
authDeviceRepository;
|
|
27
|
+
authDeviceSessionRepository;
|
|
28
|
+
authLoginEventRepository;
|
|
17
29
|
authLoginAttemptRepository;
|
|
18
30
|
config;
|
|
19
31
|
demoCleanupService;
|
|
20
32
|
demoOnlineTracker;
|
|
21
|
-
constructor(bootstrapStateRepository, authUserRepository, authTokenRepository, authLoginAttemptRepository, config, demoServices) {
|
|
33
|
+
constructor(bootstrapStateRepository, authUserRepository, authTokenRepository, authDeviceRepository, authDeviceSessionRepository, authLoginEventRepository, authLoginAttemptRepository, config, demoServices) {
|
|
22
34
|
this.bootstrapStateRepository = bootstrapStateRepository;
|
|
23
35
|
this.authUserRepository = authUserRepository;
|
|
24
36
|
this.authTokenRepository = authTokenRepository;
|
|
37
|
+
this.authDeviceRepository = authDeviceRepository;
|
|
38
|
+
this.authDeviceSessionRepository = authDeviceSessionRepository;
|
|
39
|
+
this.authLoginEventRepository = authLoginEventRepository;
|
|
25
40
|
this.authLoginAttemptRepository = authLoginAttemptRepository;
|
|
26
41
|
this.config = config;
|
|
27
42
|
this.demoCleanupService = demoServices?.cleanupService;
|
|
28
43
|
this.demoOnlineTracker = demoServices?.onlineTracker;
|
|
29
44
|
}
|
|
30
|
-
login(input) {
|
|
45
|
+
login(input, metadata = DEFAULT_AUTH_REQUEST_METADATA) {
|
|
31
46
|
this.ensureInitialized();
|
|
32
47
|
const now = new Date();
|
|
33
48
|
const username = this.normalizeUsername(input.username);
|
|
@@ -42,21 +57,33 @@ export class AuthService {
|
|
|
42
57
|
throw this.createInvalidCredentialsError();
|
|
43
58
|
}
|
|
44
59
|
this.authLoginAttemptRepository.deleteByUsername(username);
|
|
45
|
-
const
|
|
46
|
-
|
|
60
|
+
const issuedAt = nowIso(now);
|
|
61
|
+
const device = this.resolveOrCreateDevice(user.id, metadata, issuedAt);
|
|
62
|
+
const deviceSession = this.createDeviceSession(user.id, device?.id ?? null, issuedAt);
|
|
63
|
+
const result = this.issueTokenPair(user.id, "interactive_user", deviceSession.id, now);
|
|
64
|
+
this.authDeviceSessionRepository.updateBinding(deviceSession.id, {
|
|
65
|
+
deviceId: device?.id ?? null,
|
|
66
|
+
accessTokenId: result.accessTokenId,
|
|
67
|
+
refreshTokenId: result.refreshTokenId,
|
|
68
|
+
updatedAt: issuedAt
|
|
69
|
+
});
|
|
70
|
+
this.recordLoginEvent(user.id, device?.id ?? null, metadata.clientType, metadata.sourceAddress, issuedAt);
|
|
71
|
+
const response = {
|
|
72
|
+
accessToken: result.accessToken,
|
|
73
|
+
refreshToken: result.refreshToken,
|
|
74
|
+
expiresIn: result.expiresIn,
|
|
47
75
|
user: {
|
|
48
76
|
userId: user.id,
|
|
49
77
|
username: user.username,
|
|
50
78
|
role: user.role
|
|
51
79
|
}
|
|
52
80
|
};
|
|
53
|
-
// Demo 模式:追踪在线会话
|
|
54
81
|
if (this.demoOnlineTracker) {
|
|
55
|
-
this.demoOnlineTracker.trackLogin(user.id, hashToken(
|
|
82
|
+
this.demoOnlineTracker.trackLogin(user.id, hashToken(response.accessToken));
|
|
56
83
|
}
|
|
57
|
-
return
|
|
84
|
+
return response;
|
|
58
85
|
}
|
|
59
|
-
refresh(input) {
|
|
86
|
+
refresh(input, metadata = DEFAULT_AUTH_REQUEST_METADATA) {
|
|
60
87
|
this.ensureInitialized();
|
|
61
88
|
const refreshTokenHash = hashToken(input.refreshToken);
|
|
62
89
|
const refreshRecord = this.authTokenRepository.findByHash(refreshTokenHash, "refresh");
|
|
@@ -82,11 +109,25 @@ export class AuthService {
|
|
|
82
109
|
detail: "当前用户不存在"
|
|
83
110
|
});
|
|
84
111
|
}
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
112
|
+
const now = new Date();
|
|
113
|
+
const issuedAt = nowIso(now);
|
|
114
|
+
const existingDeviceSession = refreshRecord.deviceSessionId
|
|
115
|
+
? this.authDeviceSessionRepository.findById(refreshRecord.deviceSessionId)
|
|
116
|
+
: null;
|
|
117
|
+
const device = this.resolveDeviceForRefresh(user.id, metadata, existingDeviceSession?.deviceId ?? null, issuedAt);
|
|
118
|
+
const deviceSession = existingDeviceSession
|
|
119
|
+
?? this.createDeviceSession(user.id, device?.id ?? null, issuedAt);
|
|
120
|
+
const result = this.issueTokenPair(user.id, refreshRecord.callerKind ?? "interactive_user", deviceSession.id, now);
|
|
121
|
+
this.authDeviceSessionRepository.updateBinding(deviceSession.id, {
|
|
122
|
+
deviceId: device?.id ?? existingDeviceSession?.deviceId ?? null,
|
|
123
|
+
accessTokenId: result.accessTokenId,
|
|
124
|
+
refreshTokenId: result.refreshTokenId,
|
|
125
|
+
updatedAt: issuedAt
|
|
126
|
+
});
|
|
88
127
|
return {
|
|
89
|
-
|
|
128
|
+
accessToken: result.accessToken,
|
|
129
|
+
refreshToken: result.refreshToken,
|
|
130
|
+
expiresIn: result.expiresIn,
|
|
90
131
|
user: {
|
|
91
132
|
userId: user.id,
|
|
92
133
|
username: user.username,
|
|
@@ -97,14 +138,16 @@ export class AuthService {
|
|
|
97
138
|
logout(accessToken, input) {
|
|
98
139
|
const revokedAt = nowIso();
|
|
99
140
|
const accessHash = hashToken(accessToken);
|
|
100
|
-
// 先查出用户 ID(用于 demo 在线追踪)
|
|
101
141
|
const accessRecord = this.authTokenRepository.findByHash(accessHash, "access");
|
|
102
142
|
const userId = accessRecord?.userId;
|
|
103
143
|
this.authTokenRepository.revokeByHash(accessHash, revokedAt);
|
|
104
144
|
if (input?.refreshToken) {
|
|
105
145
|
this.authTokenRepository.revokeByHash(hashToken(input.refreshToken), revokedAt);
|
|
106
146
|
}
|
|
107
|
-
|
|
147
|
+
if (accessRecord?.deviceSessionId) {
|
|
148
|
+
this.authTokenRepository.revokeByDeviceSessionIds([accessRecord.deviceSessionId], revokedAt);
|
|
149
|
+
this.authDeviceSessionRepository.revokeById(accessRecord.deviceSessionId, revokedAt);
|
|
150
|
+
}
|
|
108
151
|
if (userId && this.demoOnlineTracker && this.demoCleanupService) {
|
|
109
152
|
const isLastSession = this.demoOnlineTracker.trackLogout(userId, accessHash);
|
|
110
153
|
if (isLastSession) {
|
|
@@ -113,6 +156,109 @@ export class AuthService {
|
|
|
113
156
|
}
|
|
114
157
|
return { success: true };
|
|
115
158
|
}
|
|
159
|
+
listDeviceManagement(auth) {
|
|
160
|
+
const currentDevice = auth.deviceId ? this.authDeviceRepository.findById(auth.deviceId) : null;
|
|
161
|
+
const activeDeviceSessions = this.authDeviceSessionRepository.listActiveByUser(auth.user.userId);
|
|
162
|
+
const otherDeviceIds = Array.from(new Set(activeDeviceSessions
|
|
163
|
+
.filter((session) => session.deviceId && session.deviceId !== auth.deviceId)
|
|
164
|
+
.map((session) => session.deviceId)));
|
|
165
|
+
const otherDevices = this.authDeviceRepository.listByIds(otherDeviceIds).map((device) => toAuthDeviceView(device, false));
|
|
166
|
+
const legacySessions = activeDeviceSessions
|
|
167
|
+
.filter((session) => !session.deviceId && session.id !== auth.deviceSessionId)
|
|
168
|
+
.map((session) => toLegacyDeviceView(session.updatedAt));
|
|
169
|
+
const legacyRefreshTokens = this.authTokenRepository
|
|
170
|
+
.listActiveLegacyRefreshTokensByUser(auth.user.userId, nowIso())
|
|
171
|
+
.map((record) => toLegacyDeviceView(record.createdAt));
|
|
172
|
+
const recentLoginRecords = this.authLoginEventRepository.listRecentByUser(auth.user.userId, MAX_RECENT_LOGIN_EVENTS);
|
|
173
|
+
const recentDeviceIds = Array.from(new Set(recentLoginRecords.flatMap((event) => (event.deviceId ? [event.deviceId] : []))));
|
|
174
|
+
const recentDevices = this.authDeviceRepository.listByIds(recentDeviceIds);
|
|
175
|
+
const recentDeviceMap = new Map(recentDevices.map((device) => [device.id, device]));
|
|
176
|
+
return {
|
|
177
|
+
currentDevice: currentDevice ? toAuthDeviceView(currentDevice, true) : null,
|
|
178
|
+
otherActiveDevices: [...otherDevices, ...legacySessions, ...legacyRefreshTokens],
|
|
179
|
+
recentLoginRecords: recentLoginRecords.map((event) => toRecentLoginRecordView(event, event.deviceId ? (recentDeviceMap.get(event.deviceId) ?? null) : null, auth.deviceId))
|
|
180
|
+
};
|
|
181
|
+
}
|
|
182
|
+
updateCurrentDevicePrimary(auth, input) {
|
|
183
|
+
if (!auth.deviceId) {
|
|
184
|
+
throw new AppError({
|
|
185
|
+
statusCode: 400,
|
|
186
|
+
errorCode: "DEVICE_CONTEXT_REQUIRED",
|
|
187
|
+
detail: "当前登录态缺少设备上下文,请重新登录后重试"
|
|
188
|
+
});
|
|
189
|
+
}
|
|
190
|
+
const user = this.authUserRepository.findById(auth.user.userId);
|
|
191
|
+
if (!user || !verifyPassword(input.password, user.passwordHash)) {
|
|
192
|
+
throw new AppError({
|
|
193
|
+
statusCode: 401,
|
|
194
|
+
errorCode: "INVALID_CREDENTIALS",
|
|
195
|
+
detail: "管理员密码错误"
|
|
196
|
+
});
|
|
197
|
+
}
|
|
198
|
+
const updatedAt = nowIso();
|
|
199
|
+
this.authDeviceRepository.updatePrimary(auth.deviceId, {
|
|
200
|
+
isPrimary: input.primary,
|
|
201
|
+
primarySetAt: input.primary ? updatedAt : null,
|
|
202
|
+
updatedAt
|
|
203
|
+
});
|
|
204
|
+
const nextDevice = this.authDeviceRepository.findById(auth.deviceId);
|
|
205
|
+
if (!nextDevice) {
|
|
206
|
+
throw new AppError({
|
|
207
|
+
statusCode: 404,
|
|
208
|
+
errorCode: "DEVICE_NOT_FOUND",
|
|
209
|
+
detail: "当前设备不存在"
|
|
210
|
+
});
|
|
211
|
+
}
|
|
212
|
+
return toAuthDeviceView(nextDevice, true);
|
|
213
|
+
}
|
|
214
|
+
logoutOtherDevices(auth) {
|
|
215
|
+
this.ensurePrimaryDeviceAccess(auth);
|
|
216
|
+
const revokedAt = nowIso();
|
|
217
|
+
const activeSessions = this.authDeviceSessionRepository.listActiveByUser(auth.user.userId);
|
|
218
|
+
const targetSessions = activeSessions.filter((session) => session.deviceId !== auth.deviceId && session.id !== auth.deviceSessionId);
|
|
219
|
+
const targetSessionIds = targetSessions.map((session) => session.id);
|
|
220
|
+
const legacyRefreshTokens = this.authTokenRepository.listActiveLegacyRefreshTokensByUser(auth.user.userId, revokedAt);
|
|
221
|
+
const revokedDeviceCount = new Set(targetSessions.map((session) => session.deviceId ?? `legacy-session:${session.id}`)).size
|
|
222
|
+
+ legacyRefreshTokens.length;
|
|
223
|
+
this.authTokenRepository.revokeByDeviceSessionIds(targetSessionIds, revokedAt);
|
|
224
|
+
this.authDeviceSessionRepository.revokeByIds(targetSessionIds, revokedAt);
|
|
225
|
+
if (legacyRefreshTokens.length > 0) {
|
|
226
|
+
this.authTokenRepository.revokeLegacyTokensByUser(auth.user.userId, revokedAt);
|
|
227
|
+
}
|
|
228
|
+
return {
|
|
229
|
+
success: true,
|
|
230
|
+
revokedDeviceCount
|
|
231
|
+
};
|
|
232
|
+
}
|
|
233
|
+
logoutDevice(auth, deviceId) {
|
|
234
|
+
this.ensurePrimaryDeviceAccess(auth);
|
|
235
|
+
if (deviceId === auth.deviceId) {
|
|
236
|
+
throw new AppError({
|
|
237
|
+
statusCode: 400,
|
|
238
|
+
errorCode: "CURRENT_DEVICE_NOT_ALLOWED",
|
|
239
|
+
detail: "不能直接退出当前设备,请使用退出登录"
|
|
240
|
+
});
|
|
241
|
+
}
|
|
242
|
+
const targetDevice = this.authDeviceRepository.findById(deviceId);
|
|
243
|
+
if (!targetDevice || targetDevice.userId !== auth.user.userId) {
|
|
244
|
+
throw new AppError({
|
|
245
|
+
statusCode: 404,
|
|
246
|
+
errorCode: "DEVICE_NOT_FOUND",
|
|
247
|
+
detail: "目标设备不存在"
|
|
248
|
+
});
|
|
249
|
+
}
|
|
250
|
+
const revokedAt = nowIso();
|
|
251
|
+
const activeSessions = this.authDeviceSessionRepository.listActiveByUser(auth.user.userId);
|
|
252
|
+
const targetSessionIds = activeSessions
|
|
253
|
+
.filter((session) => session.deviceId === deviceId)
|
|
254
|
+
.map((session) => session.id);
|
|
255
|
+
this.authTokenRepository.revokeByDeviceSessionIds(targetSessionIds, revokedAt);
|
|
256
|
+
this.authDeviceSessionRepository.revokeByIds(targetSessionIds, revokedAt);
|
|
257
|
+
return {
|
|
258
|
+
success: true,
|
|
259
|
+
revokedSessionCount: targetSessionIds.length
|
|
260
|
+
};
|
|
261
|
+
}
|
|
116
262
|
authenticateAccessToken(accessToken) {
|
|
117
263
|
const accessRecord = this.authTokenRepository.findByHash(hashToken(accessToken), "access");
|
|
118
264
|
if (!accessRecord || accessRecord.revokedAt) {
|
|
@@ -137,12 +283,40 @@ export class AuthService {
|
|
|
137
283
|
detail: "当前用户不存在"
|
|
138
284
|
});
|
|
139
285
|
}
|
|
286
|
+
const deviceSession = accessRecord.deviceSessionId
|
|
287
|
+
? this.authDeviceSessionRepository.findById(accessRecord.deviceSessionId)
|
|
288
|
+
: null;
|
|
140
289
|
return {
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
290
|
+
accessToken,
|
|
291
|
+
accessTokenId: accessRecord.id,
|
|
292
|
+
deviceSessionId: accessRecord.deviceSessionId,
|
|
293
|
+
deviceId: deviceSession?.deviceId ?? null,
|
|
294
|
+
callerKind: accessRecord.callerKind ?? resolveAuthCallerKind(accessToken),
|
|
295
|
+
user: {
|
|
296
|
+
userId: user.id,
|
|
297
|
+
username: user.username,
|
|
298
|
+
role: user.role
|
|
299
|
+
}
|
|
144
300
|
};
|
|
145
301
|
}
|
|
302
|
+
ensurePrimaryDeviceAccess(auth) {
|
|
303
|
+
if (!auth.deviceId) {
|
|
304
|
+
throw new AppError({
|
|
305
|
+
statusCode: 400,
|
|
306
|
+
errorCode: "DEVICE_CONTEXT_REQUIRED",
|
|
307
|
+
detail: "当前登录态缺少设备上下文,请重新登录后重试"
|
|
308
|
+
});
|
|
309
|
+
}
|
|
310
|
+
const currentDevice = this.authDeviceRepository.findById(auth.deviceId);
|
|
311
|
+
if (!currentDevice?.isPrimary) {
|
|
312
|
+
throw new AppError({
|
|
313
|
+
statusCode: 403,
|
|
314
|
+
errorCode: "PRIMARY_DEVICE_REQUIRED",
|
|
315
|
+
detail: "只有主设备才能退出其他设备"
|
|
316
|
+
});
|
|
317
|
+
}
|
|
318
|
+
return currentDevice;
|
|
319
|
+
}
|
|
146
320
|
ensureInitialized() {
|
|
147
321
|
if (!this.bootstrapStateRepository.getState().initialized) {
|
|
148
322
|
throw new AppError({
|
|
@@ -152,25 +326,104 @@ export class AuthService {
|
|
|
152
326
|
});
|
|
153
327
|
}
|
|
154
328
|
}
|
|
155
|
-
|
|
156
|
-
const
|
|
329
|
+
createDeviceSession(userId, deviceId, timestamp) {
|
|
330
|
+
const record = {
|
|
331
|
+
id: createId(),
|
|
332
|
+
userId,
|
|
333
|
+
deviceId,
|
|
334
|
+
accessTokenId: null,
|
|
335
|
+
refreshTokenId: null,
|
|
336
|
+
revokedAt: null,
|
|
337
|
+
createdAt: timestamp,
|
|
338
|
+
updatedAt: timestamp
|
|
339
|
+
};
|
|
340
|
+
this.authDeviceSessionRepository.create(record);
|
|
341
|
+
return record;
|
|
342
|
+
}
|
|
343
|
+
resolveDeviceForRefresh(userId, metadata, currentDeviceId, timestamp) {
|
|
344
|
+
if (currentDeviceId) {
|
|
345
|
+
const currentDevice = this.authDeviceRepository.findById(currentDeviceId);
|
|
346
|
+
if (currentDevice) {
|
|
347
|
+
this.authDeviceRepository.updateActivity(currentDevice.id, {
|
|
348
|
+
displayName: metadata.displayName ?? currentDevice.displayName,
|
|
349
|
+
userAgent: metadata.userAgent ?? currentDevice.userAgent,
|
|
350
|
+
lastSourceAddress: metadata.sourceAddress ?? currentDevice.lastSourceAddress,
|
|
351
|
+
lastSeenAt: timestamp,
|
|
352
|
+
updatedAt: timestamp
|
|
353
|
+
});
|
|
354
|
+
return this.authDeviceRepository.findById(currentDevice.id);
|
|
355
|
+
}
|
|
356
|
+
}
|
|
357
|
+
return this.resolveOrCreateDevice(userId, metadata, timestamp);
|
|
358
|
+
}
|
|
359
|
+
resolveOrCreateDevice(userId, metadata, timestamp) {
|
|
360
|
+
if (!metadata.clientInstanceId) {
|
|
361
|
+
return null;
|
|
362
|
+
}
|
|
363
|
+
const existing = this.authDeviceRepository.findByClientIdentity(userId, metadata.clientType, metadata.clientInstanceId);
|
|
364
|
+
if (existing) {
|
|
365
|
+
this.authDeviceRepository.updateActivity(existing.id, {
|
|
366
|
+
displayName: metadata.displayName ?? existing.displayName,
|
|
367
|
+
userAgent: metadata.userAgent ?? existing.userAgent,
|
|
368
|
+
lastSourceAddress: metadata.sourceAddress ?? existing.lastSourceAddress,
|
|
369
|
+
lastSeenAt: timestamp,
|
|
370
|
+
updatedAt: timestamp
|
|
371
|
+
});
|
|
372
|
+
return this.authDeviceRepository.findById(existing.id);
|
|
373
|
+
}
|
|
374
|
+
const record = {
|
|
375
|
+
id: createId(),
|
|
376
|
+
userId,
|
|
377
|
+
clientType: metadata.clientType,
|
|
378
|
+
clientInstanceId: metadata.clientInstanceId,
|
|
379
|
+
displayName: metadata.displayName,
|
|
380
|
+
userAgent: metadata.userAgent,
|
|
381
|
+
isPrimary: false,
|
|
382
|
+
lastSourceAddress: metadata.sourceAddress,
|
|
383
|
+
lastSeenAt: timestamp,
|
|
384
|
+
primarySetAt: null,
|
|
385
|
+
createdAt: timestamp,
|
|
386
|
+
updatedAt: timestamp
|
|
387
|
+
};
|
|
388
|
+
this.authDeviceRepository.create(record);
|
|
389
|
+
return record;
|
|
390
|
+
}
|
|
391
|
+
recordLoginEvent(userId, deviceId, clientType, sourceAddress, occurredAt) {
|
|
392
|
+
const record = {
|
|
393
|
+
id: createId(),
|
|
394
|
+
userId,
|
|
395
|
+
deviceId,
|
|
396
|
+
clientType,
|
|
397
|
+
sourceAddress,
|
|
398
|
+
occurredAt
|
|
399
|
+
};
|
|
400
|
+
this.authLoginEventRepository.create(record);
|
|
401
|
+
this.authLoginEventRepository.trimToLatest(userId, MAX_RECENT_LOGIN_EVENTS);
|
|
402
|
+
}
|
|
403
|
+
issueTokenPair(userId, callerKind, deviceSessionId, now) {
|
|
157
404
|
const createdAt = nowIso(now);
|
|
158
|
-
const accessToken = createOpaqueToken();
|
|
405
|
+
const accessToken = createOpaqueToken(callerKind === "assistant_runtime" ? "butler_" : "");
|
|
159
406
|
const refreshToken = createOpaqueToken();
|
|
407
|
+
const accessTokenId = createId();
|
|
408
|
+
const refreshTokenId = createId();
|
|
160
409
|
this.authTokenRepository.create({
|
|
161
|
-
id:
|
|
410
|
+
id: accessTokenId,
|
|
162
411
|
userId,
|
|
163
412
|
tokenType: "access",
|
|
164
413
|
tokenHash: hashToken(accessToken),
|
|
414
|
+
deviceSessionId,
|
|
415
|
+
callerKind,
|
|
165
416
|
expiresAt: addSeconds(now, this.config.accessTokenTtlSeconds),
|
|
166
417
|
revokedAt: null,
|
|
167
418
|
createdAt
|
|
168
419
|
});
|
|
169
420
|
this.authTokenRepository.create({
|
|
170
|
-
id:
|
|
421
|
+
id: refreshTokenId,
|
|
171
422
|
userId,
|
|
172
423
|
tokenType: "refresh",
|
|
173
424
|
tokenHash: hashToken(refreshToken),
|
|
425
|
+
deviceSessionId,
|
|
426
|
+
callerKind,
|
|
174
427
|
expiresAt: addSeconds(now, this.config.refreshTokenTtlSeconds),
|
|
175
428
|
revokedAt: null,
|
|
176
429
|
createdAt
|
|
@@ -178,6 +431,8 @@ export class AuthService {
|
|
|
178
431
|
return {
|
|
179
432
|
accessToken,
|
|
180
433
|
refreshToken,
|
|
434
|
+
accessTokenId,
|
|
435
|
+
refreshTokenId,
|
|
181
436
|
expiresIn: this.config.accessTokenTtlSeconds
|
|
182
437
|
};
|
|
183
438
|
}
|
|
@@ -329,4 +584,59 @@ export class AuthService {
|
|
|
329
584
|
`.trim();
|
|
330
585
|
}
|
|
331
586
|
}
|
|
587
|
+
export function resolveAuthCallerKind(accessToken) {
|
|
588
|
+
return isButlerRuntimeAccessToken(accessToken) ? "assistant_runtime" : "interactive_user";
|
|
589
|
+
}
|
|
590
|
+
function toAuthDeviceView(device, isCurrent) {
|
|
591
|
+
const deviceInfo = resolveAuthDeviceInfo(device.clientType, device.userAgent);
|
|
592
|
+
return {
|
|
593
|
+
deviceId: device.id,
|
|
594
|
+
clientType: device.clientType,
|
|
595
|
+
clientInstanceId: device.clientInstanceId,
|
|
596
|
+
displayName: deviceInfo.displayName ?? device.displayName,
|
|
597
|
+
browserName: deviceInfo.browserName,
|
|
598
|
+
browserVersion: deviceInfo.browserVersion,
|
|
599
|
+
osName: deviceInfo.osName,
|
|
600
|
+
osVersion: deviceInfo.osVersion,
|
|
601
|
+
lastSourceAddress: device.lastSourceAddress,
|
|
602
|
+
lastSeenAt: device.lastSeenAt,
|
|
603
|
+
isPrimary: device.isPrimary,
|
|
604
|
+
isCurrent,
|
|
605
|
+
isLegacy: false
|
|
606
|
+
};
|
|
607
|
+
}
|
|
608
|
+
function toLegacyDeviceView(timestamp) {
|
|
609
|
+
return {
|
|
610
|
+
deviceId: null,
|
|
611
|
+
clientType: "unknown",
|
|
612
|
+
clientInstanceId: null,
|
|
613
|
+
displayName: null,
|
|
614
|
+
browserName: null,
|
|
615
|
+
browserVersion: null,
|
|
616
|
+
osName: null,
|
|
617
|
+
osVersion: null,
|
|
618
|
+
lastSourceAddress: null,
|
|
619
|
+
lastSeenAt: timestamp,
|
|
620
|
+
isPrimary: false,
|
|
621
|
+
isCurrent: false,
|
|
622
|
+
isLegacy: true
|
|
623
|
+
};
|
|
624
|
+
}
|
|
625
|
+
function toRecentLoginRecordView(event, device, currentDeviceId) {
|
|
626
|
+
const deviceInfo = device ? resolveAuthDeviceInfo(device.clientType, device.userAgent) : null;
|
|
627
|
+
return {
|
|
628
|
+
id: event.id,
|
|
629
|
+
deviceId: event.deviceId,
|
|
630
|
+
clientType: event.clientType,
|
|
631
|
+
displayName: deviceInfo?.displayName ?? device?.displayName ?? null,
|
|
632
|
+
browserName: deviceInfo?.browserName ?? null,
|
|
633
|
+
browserVersion: deviceInfo?.browserVersion ?? null,
|
|
634
|
+
osName: deviceInfo?.osName ?? null,
|
|
635
|
+
osVersion: deviceInfo?.osVersion ?? null,
|
|
636
|
+
sourceAddress: event.sourceAddress,
|
|
637
|
+
occurredAt: event.occurredAt,
|
|
638
|
+
isCurrentDevice: event.deviceId !== null && event.deviceId === currentDeviceId,
|
|
639
|
+
isLegacy: event.deviceId === null
|
|
640
|
+
};
|
|
641
|
+
}
|
|
332
642
|
//# sourceMappingURL=auth-service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-service.js","sourceRoot":"","sources":["../../../../src/modules/auth/auth-service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"auth-service.js","sourceRoot":"","sources":["../../../../src/modules/auth/auth-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -92,6 +92,7 @@ export declare class AssistantAutomationService {
|
|
|
92
92
|
runDueTasks(referenceAt: string): Promise<AssistantAutomationRunDueTasksResult>;
|
|
93
93
|
private registerBackgroundTasks;
|
|
94
94
|
private runDueTasksDirect;
|
|
95
|
+
private reactivatePausedTasks;
|
|
95
96
|
private evaluateTask;
|
|
96
97
|
private processDueTask;
|
|
97
98
|
private prepareDueTask;
|
|
@@ -100,6 +101,7 @@ export declare class AssistantAutomationService {
|
|
|
100
101
|
private prepareSessionRuntimeIdleTask;
|
|
101
102
|
private buildConditionSkippedTask;
|
|
102
103
|
private finalizeSuccessfulTask;
|
|
104
|
+
private buildUsageLimitDeferredTask;
|
|
103
105
|
private requireTask;
|
|
104
106
|
private buildUpdatedTrigger;
|
|
105
107
|
private reconcileTaskWithLatestRun;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { AppError } from "../../shared/errors/app-error.js";
|
|
2
2
|
import { createId } from "../../shared/utils/id.js";
|
|
3
3
|
import { nowIso } from "../../shared/utils/time.js";
|
|
4
|
+
import { readProviderUsageLimitErrorData } from "../sessions/session-provider-usage-guard-service.js";
|
|
4
5
|
import { createTaskManager } from "../tasks/task-manager.js";
|
|
5
6
|
import { HOST_TASK_TYPES } from "../tasks/task-types.js";
|
|
6
7
|
import { buildConditionTriggerConfig, computeNextRunAt, createTriggerConfig, parseActionConfig, parseConditionState, parseTriggerConfig } from "./assistant-automation-trigger.js";
|
|
@@ -234,6 +235,7 @@ export class AssistantAutomationService {
|
|
|
234
235
|
}
|
|
235
236
|
}
|
|
236
237
|
async runDueTasksDirect(referenceAt) {
|
|
238
|
+
this.reactivatePausedTasks(referenceAt);
|
|
237
239
|
const activeTaskCount = this.taskRepository.list({
|
|
238
240
|
statuses: ["active"]
|
|
239
241
|
}).length;
|
|
@@ -254,6 +256,20 @@ export class AssistantAutomationService {
|
|
|
254
256
|
idle: dueTasks.length === 0
|
|
255
257
|
};
|
|
256
258
|
}
|
|
259
|
+
reactivatePausedTasks(referenceAt) {
|
|
260
|
+
const pausedTasks = this.taskRepository.listDuePaused(referenceAt, DEFAULT_DUE_TASK_LIMIT);
|
|
261
|
+
for (const task of pausedTasks) {
|
|
262
|
+
const triggerConfig = parseTriggerConfig(task.triggerType, task.triggerConfigJson);
|
|
263
|
+
const nextRunAt = computeNextRunAt(triggerConfig, referenceAt);
|
|
264
|
+
this.taskRepository.update({
|
|
265
|
+
...task,
|
|
266
|
+
status: nextRunAt ? "active" : "completed",
|
|
267
|
+
nextRunAt,
|
|
268
|
+
lastError: null,
|
|
269
|
+
updatedAt: referenceAt
|
|
270
|
+
});
|
|
271
|
+
}
|
|
272
|
+
}
|
|
257
273
|
async evaluateTask(automationId, referenceAt) {
|
|
258
274
|
const task = this.reconcileTaskWithLatestRun(this.requireTask(automationId), referenceAt);
|
|
259
275
|
if (!task || task.status !== "active" || !task.nextRunAt || task.nextRunAt > referenceAt) {
|
|
@@ -300,6 +316,19 @@ export class AssistantAutomationService {
|
|
|
300
316
|
this.taskRepository.update(prepared.finalizeSuccess(result.acceptedAt, finishedRun.summary ?? summary));
|
|
301
317
|
}
|
|
302
318
|
catch (error) {
|
|
319
|
+
const usageLimitBlocked = readProviderUsageLimitErrorData(error instanceof AppError ? error.data : undefined);
|
|
320
|
+
if (usageLimitBlocked?.blockedUntil) {
|
|
321
|
+
const summary = `${usageLimitBlocked.sourceLabel?.trim() || "当前控制会话"}检测到 provider 套餐限额,已顺延到 ${usageLimitBlocked.blockedUntil} 后再继续。`;
|
|
322
|
+
this.runRepository.update({
|
|
323
|
+
...run,
|
|
324
|
+
status: "skipped",
|
|
325
|
+
summary,
|
|
326
|
+
error: null,
|
|
327
|
+
finishedAt: referenceAt
|
|
328
|
+
});
|
|
329
|
+
this.taskRepository.update(this.buildUsageLimitDeferredTask(task, prepared, referenceAt, usageLimitBlocked.blockedUntil, usageLimitBlocked.sourceLabel));
|
|
330
|
+
return;
|
|
331
|
+
}
|
|
303
332
|
const finishedAt = nowIso();
|
|
304
333
|
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
305
334
|
this.runRepository.update({
|
|
@@ -524,6 +553,23 @@ export class AssistantAutomationService {
|
|
|
524
553
|
updatedAt: finishedAt
|
|
525
554
|
};
|
|
526
555
|
}
|
|
556
|
+
buildUsageLimitDeferredTask(task, prepared, referenceAt, blockedUntil, sourceLabel) {
|
|
557
|
+
const effectiveLabel = sourceLabel?.trim()
|
|
558
|
+
|| (prepared.actionConfig.targetSessionId?.trim()
|
|
559
|
+
? `目标会话 ${prepared.actionConfig.targetSessionId.trim()}`
|
|
560
|
+
: "当前控制会话");
|
|
561
|
+
const summary = `${effectiveLabel}检测到 provider 套餐限额,系统会在 ${blockedUntil} 后自动继续。`;
|
|
562
|
+
const nextStatus = task.triggerType === "once" ? "active" : "paused";
|
|
563
|
+
return {
|
|
564
|
+
...task,
|
|
565
|
+
status: nextStatus,
|
|
566
|
+
nextRunAt: blockedUntil,
|
|
567
|
+
lastRunAt: referenceAt,
|
|
568
|
+
lastRunSummary: summary,
|
|
569
|
+
lastError: null,
|
|
570
|
+
updatedAt: referenceAt
|
|
571
|
+
};
|
|
572
|
+
}
|
|
527
573
|
requireTask(taskId) {
|
|
528
574
|
const task = this.taskRepository.findById(taskId.trim());
|
|
529
575
|
if (!task) {
|