@aiti-ai/ext-shared 0.0.0-stage → 0.1.8
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/LICENSE +21 -0
- package/agent-accounts.test.mjs +227 -0
- package/agent-accounts.ts +324 -0
- package/agent-capability-contract.test.mjs +129 -0
- package/agent-interaction.test.mjs +194 -0
- package/agent-interaction.ts +340 -0
- package/agent-launch.test.mjs +262 -0
- package/agent-spawn-env.test.mjs +169 -0
- package/agent-spawn-env.ts +548 -0
- package/aiti-editor-inject.mjs +49 -0
- package/backend-queue.test.mjs +336 -0
- package/backend-queue.ts +469 -0
- package/blob-save-route.ts +128 -0
- package/cbc-model-catalog.ts +86 -0
- package/check-client.mjs +273 -0
- package/check-ext-globals.mjs +144 -0
- package/controlled-login-dialog.mjs +270 -0
- package/controlled-login.mjs +398 -0
- package/controlled-login.test.mjs +466 -0
- package/convert-saveas.test.mjs +39 -0
- package/convert-saveas.ts +170 -0
- package/copy-client-bundle.mjs +39 -0
- package/cursor-cli-store.ts +377 -0
- package/dedupe-fetch.test.mjs +71 -0
- package/dedupe-fetch.ts +58 -0
- package/deploy-commit.mjs +52 -0
- package/dev-pack.mjs +246 -0
- package/dock-icons.ts +127 -0
- package/esbuild-bin.test.mjs +53 -0
- package/esbuild-bin.ts +66 -0
- package/exec-async.test.mjs +86 -0
- package/exec-async.ts +179 -0
- package/ext-display-names.ts +91 -0
- package/ext-entry-contracts.test.mjs +131 -0
- package/ext-float-dock-core.test.mjs +348 -0
- package/ext-float-dock-core.ts +783 -0
- package/ext-float-dock-lite.ts +52 -0
- package/ext-float-dock.test.mjs +286 -0
- package/ext-float-dock.ts +740 -0
- package/ext-icons-deploy.mjs +24 -0
- package/ext-lazy.test.mjs +186 -0
- package/ext-lazy.tsx +183 -0
- package/ext-model-state.test.mjs +272 -0
- package/ext-model-state.ts +324 -0
- package/ext-protocol.mjs +113 -0
- package/ext-protocol.test.mjs +88 -0
- package/ext-session-usage.test.mjs +219 -0
- package/ext-session-usage.ts +507 -0
- package/external-cli-governance.ts +153 -0
- package/git-ops-client/api.mjs +56 -0
- package/git-ops-client/branch-panel.tsx +987 -0
- package/git-ops-client/i18n.mjs +328 -0
- package/host-tools-allow.test.mjs +46 -0
- package/host-tools-allow.ts +84 -0
- package/icons/alert.svg +1 -0
- package/icons/bookmark.svg +1 -0
- package/icons/bot.svg +1 -0
- package/icons/chart-column.svg +1 -0
- package/icons/check-circle.svg +1 -0
- package/icons/clipboard-list.svg +1 -0
- package/icons/clock.svg +1 -0
- package/icons/coffee.svg +1 -0
- package/icons/edit.svg +1 -0
- package/icons/eye.svg +1 -0
- package/icons/git-branch.svg +1 -0
- package/icons/git-commit-horizontal.svg +1 -0
- package/icons/globe.svg +1 -0
- package/icons/history.svg +1 -0
- package/icons/import.svg +1 -0
- package/icons/inbox.svg +1 -0
- package/icons/key-round.svg +1 -0
- package/icons/layout-grid.svg +1 -0
- package/icons/mail.svg +1 -0
- package/icons/message-circle.svg +1 -0
- package/icons/message-square.svg +1 -0
- package/icons/meter-vertical.svg +1 -0
- package/icons/mic.svg +1 -0
- package/icons/monitor.svg +1 -0
- package/icons/pen-line.svg +1 -0
- package/icons/plug.svg +1 -0
- package/icons/radio-dot.svg +1 -0
- package/icons/radio.svg +1 -0
- package/icons/refresh.svg +1 -0
- package/icons/rocket.svg +1 -0
- package/icons/search.svg +1 -0
- package/icons/shield.svg +1 -0
- package/icons/sparkles.svg +1 -0
- package/icons/square-kanban.svg +1 -0
- package/icons/terminal.svg +1 -0
- package/icons/users.svg +1 -0
- package/icons/volume-2.svg +1 -0
- package/icons/wand.svg +1 -0
- package/icons/wrench.svg +1 -0
- package/icons/x-circle.svg +1 -0
- package/icons/x.svg +1 -0
- package/ignore-semantics.ts +76 -0
- package/lazy-loading-metrics.mjs +61 -0
- package/new-session-cwd.test.mjs +389 -0
- package/new-session-cwd.ts +253 -0
- package/open-viewer-window.ts +65 -0
- package/overlay-back-client.test.mjs +123 -0
- package/overlay-back-client.ts +87 -0
- package/package.json +65 -4
- package/pi-fork-rpc/README.md +12 -0
- package/pi-fork-rpc/cli-resolve.test.mjs +42 -0
- package/pi-fork-rpc/cli-resolve.ts +79 -0
- package/pi-fork-rpc/remote-queue.test.mjs +100 -0
- package/pi-fork-rpc/remote-queue.ts +140 -0
- package/pi-fork-rpc/spec.ts +106 -0
- package/pi-fork-rpc/wire.test.mjs +260 -0
- package/pi-fork-rpc/wire.ts +367 -0
- package/popup-anchor.ts +45 -0
- package/provider-priority-contract.test.mjs +55 -0
- package/reconcile-deps.mjs +41 -0
- package/reload-instances.mjs +60 -0
- package/seed-tool.test.mjs +95 -0
- package/seed-tool.ts +88 -0
- package/session-recycle.ts +109 -0
- package/shared-copy-sync.test.mjs +115 -0
- package/soffice-locate.ts +171 -0
- package/soffice-panel.ts +239 -0
- package/sync-dir.mjs +91 -0
- package/sync-dir.test.mjs +101 -0
- package/sync-gate.test.mjs +93 -0
- package/sync-mirror.test.mjs +85 -0
- package/task-list.test.mjs +91 -0
- package/task-list.ts +118 -0
- package/test-rm-rf.mjs +33 -0
- package/ui-dialogs.test.mjs +198 -0
- package/ui-dialogs.ts +310 -0
- package/README.md +0 -3
|
@@ -0,0 +1,270 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* controlled-login — 外部 Agent 受控登录标准 · 前端统一弹窗(原生 h() 渲染,零构建步骤)。
|
|
3
|
+
*
|
|
4
|
+
* ⚠ 副本同步(字节级拷贝,改动须同步到全部副本;测试 `_shared/controlled-login.test.mjs` 钉住一致性)。
|
|
5
|
+
* 权威源:pi-web-ext/_shared/controlled-login-dialog.mjs
|
|
6
|
+
* 部署副本(client 侧走部署树内相对导入 —— 零构建 client 无法像 vite 客户端那样在构建期
|
|
7
|
+
* 内联 ../../_shared(资产路由拒绝越目录穿越),与 draft-keeper 的 ./core.mjs 同一惯例):
|
|
8
|
+
* pi-web-ext/aiti-{zcode,cursor,qoder,claude-code,codex}-agent/client/controlled-login-dialog.mjs
|
|
9
|
+
*
|
|
10
|
+
* 契约(docs/ext-controlled-login-standard.md §3.5):
|
|
11
|
+
* 🔗「打开授权页」按钮(target=_blank)+ URL 文本可复制 + 模式说明行
|
|
12
|
+
* + 状态区(waiting 转圈 / success ✅ 用户名 / failed / timeout / cancelled,均带重试)
|
|
13
|
+
* + B 模式(paste)专属 code 输入框+提交。
|
|
14
|
+
* 状态刷新:弹窗打开期间每 2s 轮询 GET /login/status,关闭即停
|
|
15
|
+
* (方案 §3.6 已论证并拍板的轮询例外:登录是分钟级一次性交互)。
|
|
16
|
+
*
|
|
17
|
+
* 浮动契约:面板根节点 data-ext-float="1" + data-ext-float-w/-h + data-ext-float-full="1"
|
|
18
|
+
* (aiti-float 接管拖拽/缩放/持久化/小屏全屏;未装时自身 style 居中兜底)。
|
|
19
|
+
*
|
|
20
|
+
* 接入(各扩展 client/controlled-login-client.mjs,两行):
|
|
21
|
+
* import { registerControlledLoginClient } from "./controlled-login-dialog.mjs";
|
|
22
|
+
* export default function register(ctx) { registerControlledLoginClient(ctx, { … }); }
|
|
23
|
+
*/
|
|
24
|
+
|
|
25
|
+
// ---------- 模块内 open 状态(toolbar 入口与 dialogs 条目同模块共享,不落 window 全局) ----------
|
|
26
|
+
let moduleSetOpen = null;
|
|
27
|
+
// 懒加载(clientImmediately:false)下 toolbar 静态条目点击时弹窗组件可能尚未挂载:
|
|
28
|
+
// 记 pending,挂载 effect 消费——避免首点失效。
|
|
29
|
+
let pendingOpen = false;
|
|
30
|
+
|
|
31
|
+
/** 打开本扩展的受控登录弹窗(toolbar 🔑 按钮 / 静态条目 meta.onClick 用)。 */
|
|
32
|
+
export function openControlledLogin() {
|
|
33
|
+
if (moduleSetOpen) moduleSetOpen(true);
|
|
34
|
+
else pendingOpen = true;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
// ---------- 自持样式层(幂等注入;clg- 前缀 + var(--x, 兜底),零宿主耦合) ----------
|
|
38
|
+
const STYLE_ID = "aiti-controlled-login-styles";
|
|
39
|
+
const STYLES = `
|
|
40
|
+
.clg-mask { position: fixed; inset: 0; z-index: 2147483000; background: rgba(0,0,0,.32); display: flex; align-items: center; justify-content: center; }
|
|
41
|
+
.clg-panel { width: 520px; max-width: calc(100vw - 16px); display: flex; flex-direction: column; overflow: hidden;
|
|
42
|
+
background: var(--bg,#fff); color: var(--text,#1a1a1a); border: 1px solid var(--border,#e0e0e0); border-radius: 12px;
|
|
43
|
+
box-shadow: 0 16px 64px rgba(0,0,0,.25); font-size: 13px; line-height: 1.55; }
|
|
44
|
+
.clg-head { display: flex; align-items: center; gap: 10px; padding: 11px 16px; border-bottom: 1px solid var(--border,#e0e0e0); flex-shrink: 0; background: var(--bg-subtle,#f7f7f7); }
|
|
45
|
+
.clg-title { font-size: 14px; font-weight: 700; display: flex; align-items: center; gap: 6px; }
|
|
46
|
+
.clg-x { margin-left: auto; border: none; background: none; cursor: pointer; color: var(--text-muted,#888); font-size: 16px; line-height: 1; padding: 4px 6px; border-radius: 6px; }
|
|
47
|
+
.clg-x:hover { background: var(--bg-hover,#eee); color: var(--text,#1a1a1a); }
|
|
48
|
+
.clg-body { padding: 14px 16px 16px; display: flex; flex-direction: column; gap: 10px; }
|
|
49
|
+
.clg-intro { color: var(--text-muted,#777); font-size: 12.5px; }
|
|
50
|
+
.clg-urlrow { display: flex; align-items: center; gap: 8px; flex-wrap: wrap; }
|
|
51
|
+
.clg-open { display: inline-flex; align-items: center; gap: 6px; padding: 7px 16px; border: 1px solid var(--accent,#2563eb); border-radius: 8px;
|
|
52
|
+
cursor: pointer; background: var(--accent,#2563eb); color: #fff; font-size: 13px; font-weight: 600; text-decoration: none; white-space: nowrap; }
|
|
53
|
+
.clg-open:hover { background: var(--accent-hover,#1d4ed8); }
|
|
54
|
+
.clg-url { flex: 1; min-width: 200px; font: 11.5px/1.5 ui-monospace, SFMono-Regular, Menlo, monospace; color: var(--text-muted,#777);
|
|
55
|
+
word-break: break-all; cursor: pointer; padding: 5px 8px; border: 1px dashed var(--border,#d8d8d8); border-radius: 6px; }
|
|
56
|
+
.clg-url:hover { border-color: var(--accent,#2563eb); color: var(--text,#1a1a1a); }
|
|
57
|
+
.clg-copied { color: #16a34a; font-size: 11.5px; }
|
|
58
|
+
.clg-status { display: flex; align-items: center; gap: 8px; padding: 9px 12px; border-radius: 8px; font-size: 12.5px; flex-wrap: wrap; }
|
|
59
|
+
.clg-status.waiting { background: rgba(37,99,235,.08); color: var(--accent,#2563eb); }
|
|
60
|
+
.clg-status.success { background: color-mix(in srgb, var(--ok, #22c55e) 12%, transparent); color: #16a34a; }
|
|
61
|
+
.clg-status.failed, .clg-status.timeout, .clg-status.cancelled { background: color-mix(in srgb, var(--danger, #ef4444) 8%, transparent); color: #dc2626; }
|
|
62
|
+
.clg-spin { width: 14px; height: 14px; flex-shrink: 0; border: 2px solid color-mix(in srgb, currentColor 25%, transparent); border-top-color: currentColor;
|
|
63
|
+
border-radius: 50%; animation: clg-rotate .9s linear infinite; }
|
|
64
|
+
@keyframes clg-rotate { to { transform: rotate(360deg); } }
|
|
65
|
+
.clg-errline { font-size: 12px; color: #dc2626; word-break: break-all; }
|
|
66
|
+
.clg-tail { font: 11px/1.5 ui-monospace, SFMono-Regular, Menlo, monospace; color: var(--text-muted,#888); background: var(--bg-subtle,#f5f5f5);
|
|
67
|
+
border: 1px solid var(--border,#e0e0e0); border-radius: 8px; padding: 8px 10px; max-height: 140px; overflow: auto; white-space: pre-wrap; word-break: break-all; }
|
|
68
|
+
.clg-coderow { display: flex; gap: 8px; align-items: center; flex-wrap: wrap; }
|
|
69
|
+
.clg-input { flex: 1; min-width: 180px; padding: 7px 10px; border: 1px solid var(--border,#d8d8d8); border-radius: 8px;
|
|
70
|
+
background: var(--bg,#fff); color: var(--text,#1a1a1a); font-size: 12.5px; outline: none; }
|
|
71
|
+
.clg-input:focus { border-color: var(--accent,#2563eb); box-shadow: 0 0 0 2px color-mix(in srgb, var(--accent,#2563eb) 18%, transparent); }
|
|
72
|
+
.clg-btn { display: inline-flex; align-items: center; gap: 5px; padding: 6px 14px; border: 1px solid var(--border,#d8d8d8); border-radius: 7px;
|
|
73
|
+
cursor: pointer; background: var(--bg,#fff); color: var(--text,#1a1a1a); font-size: 12.5px; font-weight: 500; white-space: nowrap; }
|
|
74
|
+
.clg-btn:hover { background: var(--bg-hover,#f0f0f0); }
|
|
75
|
+
.clg-btn:disabled { opacity: .5; cursor: not-allowed; }
|
|
76
|
+
.clg-btn.primary { background: var(--accent,#2563eb); border-color: var(--accent,#2563eb); color: #fff; }
|
|
77
|
+
.clg-btn.primary:hover { background: var(--accent-hover,#1d4ed8); }
|
|
78
|
+
.clg-foot { display: flex; align-items: center; gap: 8px; margin-top: 2px; }
|
|
79
|
+
.clg-hint { color: var(--text-dim,#999); font-size: 11.5px; }
|
|
80
|
+
`;
|
|
81
|
+
|
|
82
|
+
let stylesInjected = false;
|
|
83
|
+
function ensureStyles() {
|
|
84
|
+
if (stylesInjected) return;
|
|
85
|
+
if (typeof document === "undefined") return;
|
|
86
|
+
if (!document.getElementById(STYLE_ID)) {
|
|
87
|
+
const el = document.createElement("style");
|
|
88
|
+
el.id = STYLE_ID;
|
|
89
|
+
el.textContent = STYLES;
|
|
90
|
+
document.head.appendChild(el);
|
|
91
|
+
}
|
|
92
|
+
stylesInjected = true;
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
/**
|
|
96
|
+
* 统一弹窗注册(每扩展 client 的薄壳调用一次)。
|
|
97
|
+
*
|
|
98
|
+
* @param {*} ctx 宿主 client 上下文(h/useState/useEffect/apiUrl/registerItems)
|
|
99
|
+
* @param {object} config
|
|
100
|
+
* @param {string} config.extId 扩展 id(API 前缀 / toolbar item id 用)
|
|
101
|
+
* @param {string} config.toolbarLabel 工具条按钮 title/label(如 "登录 ZCode")
|
|
102
|
+
* @param {string} config.title 弹窗标题
|
|
103
|
+
* @param {string} [config.urlHint] A url-only 模式说明行
|
|
104
|
+
* @param {string} [config.pasteHint] B paste-relay 模式说明行
|
|
105
|
+
* @param {string} [config.successHint] 成功后的补充说明(如凭据换 key 提示)
|
|
106
|
+
*/
|
|
107
|
+
export function registerControlledLoginClient(ctx, config) {
|
|
108
|
+
ensureStyles();
|
|
109
|
+
const h = (...a) => ctx.h(...a);
|
|
110
|
+
const useState = (v) => ctx.useState(v);
|
|
111
|
+
const useEffect = (fn, deps) => ctx.useEffect(fn, deps);
|
|
112
|
+
const api = (p, init) => fetch(ctx.apiUrl("/api/extensions/" + config.extId + p), { cache: "no-store", ...init });
|
|
113
|
+
const jsonInit = (body) => ({ method: "POST", headers: { "content-type": "application/json" }, body: JSON.stringify(body) });
|
|
114
|
+
|
|
115
|
+
// ---- 工具条入口:声明式图标按钮(meta.icon + meta.onClick、无 render —— 宿主统一渲染 36×36 线图按钮,禁 emoji) ----
|
|
116
|
+
ctx.registerItems("toolbar", [{
|
|
117
|
+
id: `${config.extId}-controlled-login`,
|
|
118
|
+
meta: {
|
|
119
|
+
label: config.toolbarLabel,
|
|
120
|
+
title: config.toolbarLabel,
|
|
121
|
+
icon: "icons/key-round.svg",
|
|
122
|
+
onClick: () => openControlledLogin(),
|
|
123
|
+
},
|
|
124
|
+
}]);
|
|
125
|
+
// ---- 弹窗条目(dialogs slot;宿主包 display:contents 壳,float 持久化键认它) ----
|
|
126
|
+
ctx.registerItems("dialogs", [{
|
|
127
|
+
id: `${config.extId}-controlled-login-dialog`,
|
|
128
|
+
render: () => h(ControlledLoginDialog),
|
|
129
|
+
}]);
|
|
130
|
+
|
|
131
|
+
function ControlledLoginDialog() {
|
|
132
|
+
const [open, setOpen] = useState(false);
|
|
133
|
+
const [status, setStatus] = useState(null); // /login/status 响应({state,...})
|
|
134
|
+
const [busy, setBusy] = useState(false);
|
|
135
|
+
const [reqError, setReqError] = useState(null); // 请求层错误(网络/400)
|
|
136
|
+
const [code, setCode] = useState("");
|
|
137
|
+
const [copied, setCopied] = useState(false);
|
|
138
|
+
|
|
139
|
+
useEffect(() => {
|
|
140
|
+
moduleSetOpen = setOpen;
|
|
141
|
+
if (pendingOpen) { pendingOpen = false; setOpen(true); }
|
|
142
|
+
return () => { if (moduleSetOpen === setOpen) moduleSetOpen = null; };
|
|
143
|
+
}, []);
|
|
144
|
+
|
|
145
|
+
// 打开期间 2s 轮询 /login/status(§3.6 拍板例外);关闭即停
|
|
146
|
+
useEffect(() => {
|
|
147
|
+
if (!open) return;
|
|
148
|
+
let stopped = false;
|
|
149
|
+
let timer = null;
|
|
150
|
+
const tick = async () => {
|
|
151
|
+
try {
|
|
152
|
+
const r = await api("/login/status");
|
|
153
|
+
const d = await r.json();
|
|
154
|
+
if (!stopped) { setStatus(d); setReqError(null); }
|
|
155
|
+
} catch { /* 网络抖动忽略,下轮再试 */ }
|
|
156
|
+
if (!stopped) timer = setTimeout(tick, 2000);
|
|
157
|
+
};
|
|
158
|
+
tick();
|
|
159
|
+
return () => { stopped = true; if (timer) clearTimeout(timer); };
|
|
160
|
+
}, [open]);
|
|
161
|
+
|
|
162
|
+
if (!open) return null;
|
|
163
|
+
|
|
164
|
+
const st = status?.state ?? "idle";
|
|
165
|
+
const mode = status?.mode ?? "url";
|
|
166
|
+
const pasteMode = mode === "paste";
|
|
167
|
+
|
|
168
|
+
async function call(p, init) {
|
|
169
|
+
setBusy(true); setReqError(null);
|
|
170
|
+
try {
|
|
171
|
+
const r = await api(p, init);
|
|
172
|
+
const d = await r.json();
|
|
173
|
+
if (d && d.error) setReqError(d.error);
|
|
174
|
+
if (d) setStatus(d);
|
|
175
|
+
} catch (e) {
|
|
176
|
+
setReqError(e?.message || String(e));
|
|
177
|
+
}
|
|
178
|
+
setBusy(false);
|
|
179
|
+
}
|
|
180
|
+
const startLogin = () => call("/login/start", jsonInit({}));
|
|
181
|
+
const cancelLogin = () => call("/login/cancel", jsonInit({}));
|
|
182
|
+
const submitCode = () => { if (code.trim()) call("/login/submit", jsonInit({ code })); };
|
|
183
|
+
|
|
184
|
+
async function copyUrl() {
|
|
185
|
+
const url = status?.url || "";
|
|
186
|
+
if (!url) return;
|
|
187
|
+
try { await navigator.clipboard.writeText(url); setCopied(true); setTimeout(() => setCopied(false), 1500); } catch { /* 剪贴板不可用:URL 文本本身可选中复制 */ }
|
|
188
|
+
}
|
|
189
|
+
|
|
190
|
+
// ---- 状态区 ----
|
|
191
|
+
let statusLine = null;
|
|
192
|
+
if (st === "idle") {
|
|
193
|
+
statusLine = h("div", { className: "clg-status waiting" }, "尚未发起登录");
|
|
194
|
+
} else if (st === "waiting") {
|
|
195
|
+
statusLine = h("div", { className: "clg-status waiting" },
|
|
196
|
+
h("span", { className: "clg-spin" }),
|
|
197
|
+
status?.url ? "等待你在浏览器完成授权…(本页自动感知,约 2s 内)" : "正在启动官方登录进程,等待授权链接…",
|
|
198
|
+
h("button", { className: "clg-btn", disabled: busy, style: { marginLeft: "auto" }, onClick: cancelLogin }, "取消"),
|
|
199
|
+
);
|
|
200
|
+
} else if (st === "success") {
|
|
201
|
+
statusLine = h("div", { className: "clg-status success" },
|
|
202
|
+
"登录成功", status?.user ? h("span", { style: { fontWeight: 700 } }, status.user) : null,
|
|
203
|
+
config.successHint ? h("span", { className: "clg-hint", style: { color: "inherit" } }, config.successHint) : null,
|
|
204
|
+
);
|
|
205
|
+
} else if (st === "failed" || st === "timeout" || st === "cancelled") {
|
|
206
|
+
const label = st === "failed" ? "登录失败" : st === "timeout" ? "登录超时" : "已取消";
|
|
207
|
+
statusLine = h("div", { className: "clg-status " + st },
|
|
208
|
+
h("span", null, (st === "timeout" ? "⏱ " : st === "cancelled" ? "⚪ " : "❌ ") + label),
|
|
209
|
+
status?.error ? h("span", { className: "clg-errline" }, status.error) : null,
|
|
210
|
+
);
|
|
211
|
+
}
|
|
212
|
+
|
|
213
|
+
return h("div", { className: "clg-mask", onClick: () => setOpen(false) },
|
|
214
|
+
h("div", {
|
|
215
|
+
className: "clg-panel",
|
|
216
|
+
"data-ext-float": "1", "data-ext-float-w": 520, "data-ext-float-h": 380, "data-ext-float-full": "1",
|
|
217
|
+
onClick: (e) => e.stopPropagation(),
|
|
218
|
+
},
|
|
219
|
+
// ── 标题栏(首个子元素 = float 拖拽把手)──
|
|
220
|
+
h("div", { className: "clg-head" },
|
|
221
|
+
h("span", { className: "clg-title" }, "🔑 " + config.title),
|
|
222
|
+
h("button", { className: "clg-x", title: "关闭", onClick: () => setOpen(false) }, "✕"),
|
|
223
|
+
),
|
|
224
|
+
h("div", { className: "clg-body" },
|
|
225
|
+
config.urlHint && !pasteMode ? h("div", { className: "clg-intro" }, config.urlHint) : null,
|
|
226
|
+
pasteMode && config.pasteHint ? h("div", { className: "clg-intro" }, config.pasteHint) : null,
|
|
227
|
+
|
|
228
|
+
// ── URL 区(waiting 且已抓到链接)──
|
|
229
|
+
st === "waiting" && status?.url
|
|
230
|
+
? h("div", { className: "clg-urlrow" },
|
|
231
|
+
h("a", { className: "clg-open", href: status.url, target: "_blank", rel: "noopener noreferrer" }, "打开授权页"),
|
|
232
|
+
h("span", { className: "clg-url", title: "点击复制链接", onClick: copyUrl }, status.url),
|
|
233
|
+
copied ? h("span", { className: "clg-copied" }, "已复制") : null,
|
|
234
|
+
)
|
|
235
|
+
: null,
|
|
236
|
+
|
|
237
|
+
// ── B 模式 code 输入(paste 且 waiting)──
|
|
238
|
+
pasteMode && st === "waiting"
|
|
239
|
+
? h("div", { className: "clg-coderow" },
|
|
240
|
+
h("input", {
|
|
241
|
+
className: "clg-input",
|
|
242
|
+
placeholder: "粘贴授权完成页显示的 code(或完整回调链接)",
|
|
243
|
+
value: code,
|
|
244
|
+
onChange: (e) => setCode(e.target.value),
|
|
245
|
+
onKeyDown: (e) => { if (e.key === "Enter") submitCode(); },
|
|
246
|
+
}),
|
|
247
|
+
h("button", { className: "clg-btn primary", disabled: busy || !code.trim(), onClick: submitCode }, busy ? "…" : "提交 code"),
|
|
248
|
+
)
|
|
249
|
+
: null,
|
|
250
|
+
|
|
251
|
+
statusLine,
|
|
252
|
+
reqError ? h("div", { className: "clg-errline" }, reqError) : null,
|
|
253
|
+
|
|
254
|
+
// CLI 升级改输出格式导致 URL 抓取失败时:原文透出(人工可读可复制,方案 §7)
|
|
255
|
+
(st === "failed" || st === "timeout") && status?.outputTail
|
|
256
|
+
? h("div", { className: "clg-tail" }, status.outputTail)
|
|
257
|
+
: null,
|
|
258
|
+
|
|
259
|
+
// ── 底部动作:idle/终态带(重)试 ──
|
|
260
|
+
h("div", { className: "clg-foot" },
|
|
261
|
+
st === "idle" || st === "failed" || st === "timeout" || st === "cancelled" || st === "success"
|
|
262
|
+
? h("button", { className: "clg-btn primary", disabled: busy, onClick: startLogin }, busy ? "…" : st === "idle" ? "发起登录" : "重试")
|
|
263
|
+
: null,
|
|
264
|
+
h("span", { className: "clg-hint" }, "授权在浏览器完成,凭据由官方 CLI 落盘;本页关闭不影响进行中的登录。"),
|
|
265
|
+
),
|
|
266
|
+
),
|
|
267
|
+
),
|
|
268
|
+
);
|
|
269
|
+
}
|
|
270
|
+
}
|
|
@@ -0,0 +1,398 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* controlled-login — 外部 Agent 受控登录标准 · 服务端共享层(权威源,Node 零依赖)。
|
|
3
|
+
*
|
|
4
|
+
* ⚠ 副本同步(字节级拷贝,改动须同步到全部副本;测试 `_shared/controlled-login.test.mjs` 钉住一致性):
|
|
5
|
+
* pi-web-ext/aiti-zcode-agent/controlled-login.mjs
|
|
6
|
+
* pi-web-ext/aiti-cursor-agent/controlled-login.mjs
|
|
7
|
+
* pi-web-ext/aiti-qoder-agent/controlled-login.mjs
|
|
8
|
+
* pi-web-ext/aiti-claude-code-agent/controlled-login.mjs
|
|
9
|
+
* pi-web-ext/aiti-codex-agent/controlled-login.mjs
|
|
10
|
+
*
|
|
11
|
+
* 目标形态(docs/ext-controlled-login-standard.md):后端 spawn 官方 login 进程 → 抓出
|
|
12
|
+
* login URL 交给用户前端 → 用户在任意设备的浏览器完成授权 → CLI 自己轮询感知并落盘凭据
|
|
13
|
+
* → 后端全流程可查可取消。**不实现任何 OAuth 协议、不碰凭据内容**。
|
|
14
|
+
*
|
|
15
|
+
* 模式分类:
|
|
16
|
+
* - A url-only("url"):URL 交出去即完事,login 进程自己轮询并退出。zcode/cursor/qoder/codex。
|
|
17
|
+
* - B paste-relay("paste"):授权完成后服务端页面显示一次性 code,用户粘回前端,
|
|
18
|
+
* 后端写进 login 进程 stdin 才能完成。claude。
|
|
19
|
+
*
|
|
20
|
+
* 状态机(单槽,每扩展同时至多一个 login 进程):
|
|
21
|
+
* start → spawn(干净 env)→ 积累 stdout/stderr → extractUrl 命中置 waiting+url
|
|
22
|
+
* → [paste] submit(text) 写 stdin+"\r\n" → 进程退出走 interpret → 终态
|
|
23
|
+
* loginTimeoutMs 兜底 kill → timeout;cancel = kill → cancelled。
|
|
24
|
+
*
|
|
25
|
+
* 状态落 `<configDir>/controlled-login.json`(**不含 code/token**):
|
|
26
|
+
* { state: "waiting"|"success"|"failed"|"timeout"|"cancelled", url?, mode?,
|
|
27
|
+
* startedAt, pid?, user?, error?, outputTail?, finishedAt? }
|
|
28
|
+
* pid 仅供存活检查(服务重启后 waiting 态死 pid 在 status() 里 reconcile 成 failed);
|
|
29
|
+
* failed/timeout 态附 outputTail(≤1500 字符 stdout+stderr 尾巴)供弹窗透出原文——
|
|
30
|
+
* CLI 升级改输出格式导致 URL 抓取失败时人工可读可复制(方案 §7 风险对策)。
|
|
31
|
+
*
|
|
32
|
+
* ============================================================================
|
|
33
|
+
* Driver 契约(每家 ~20 行,由各扩展提供;成功后凭据链路全走各扩展现成逻辑)
|
|
34
|
+
* ============================================================================
|
|
35
|
+
* @typedef {Object} ControlledLoginDriver
|
|
36
|
+
* @property {string} agentId "zcode" | "cursor" | ...
|
|
37
|
+
* @property {"url"|"paste"} mode A url-only / B paste-relay
|
|
38
|
+
* @property {number} [loginTimeoutMs] 兜底 kill(默认 330_000;CLI 内部多为 300s)
|
|
39
|
+
* @property {(argv: { runtime: string; consoleMode?: boolean }) => {
|
|
40
|
+
* cmd: string; args: string[]; env: Record<string, string>;
|
|
41
|
+
* }} buildLogin 组装 spawn 三元组;env 用 cleanEnv() 起底(不注入模型 key)
|
|
42
|
+
* @property {(text: string) => string|null} extractUrl
|
|
43
|
+
* 从累计 stdout+stderr 抓 loginUrl(各家正则,命中即停)
|
|
44
|
+
* @property {(code: number|null, stdout: string, stderr: string) => {
|
|
45
|
+
* state: "success"|"failed"|"timeout"; user?: string; error?: string;
|
|
46
|
+
* }} interpret 进程退出判结果(zcode「timed out」→ timeout)
|
|
47
|
+
*
|
|
48
|
+
* 接入(扩展 index.ts,startup 里建一次、server.api 一行挂载):
|
|
49
|
+
* const login = createControlledLogin({ driver, configDir, resolveRuntime, onSuccess });
|
|
50
|
+
* loginApi = mountControlledLoginApi(login);
|
|
51
|
+
* … server: { startup(ctx) { … }, api(req, ctx) { return loginApi(req, ctx); } }
|
|
52
|
+
* 端点(POST body 均 JSON;错误 → {error} 400):
|
|
53
|
+
* POST /api/extensions/<ext>/login/start {consoleMode?, variant?…} → {state,url?,mode?}(幂等)
|
|
54
|
+
* GET /api/extensions/<ext>/login/status → {state,url?,mode?,user?,error?,startedAt,outputTail?}
|
|
55
|
+
* POST /api/extensions/<ext>/login/cancel → {state:"cancelled"}
|
|
56
|
+
* POST /api/extensions/<ext>/login/submit {code} → {state}(仅 paste 模式)
|
|
57
|
+
*/
|
|
58
|
+
|
|
59
|
+
import { spawn as nodeSpawn } from "node:child_process";
|
|
60
|
+
import { mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
|
|
61
|
+
import { join } from "node:path";
|
|
62
|
+
|
|
63
|
+
/** 兜底 kill 时长(默认 330s:CLI 内部多为 300s 硬超时,外层放宽一档再杀)。 */
|
|
64
|
+
export const DEFAULT_LOGIN_TIMEOUT_MS = 330_000;
|
|
65
|
+
|
|
66
|
+
/** 干净 env 起底:只透传系统定位/代理/TLS/Windows 系统键——**不透传任何模型 key/token**。 */
|
|
67
|
+
const ENV_ALLOW = [
|
|
68
|
+
"PATH", "HOME", "USERPROFILE", "USER", "LOGNAME", "SHELL",
|
|
69
|
+
"LANG", "LC_ALL", "TERM", "TZ", "TMPDIR", "TEMP", "TMP",
|
|
70
|
+
"XDG_CONFIG_HOME", "XDG_DATA_HOME", "XDG_CACHE_HOME", "XDG_RUNTIME_DIR",
|
|
71
|
+
"SSL_CERT_FILE", "SSL_CERT_DIR", "NODE_EXTRA_CA_CERTS",
|
|
72
|
+
"HTTP_PROXY", "HTTPS_PROXY", "NO_PROXY", "http_proxy", "https_proxy", "no_proxy",
|
|
73
|
+
// Windows
|
|
74
|
+
"SYSTEMROOT", "COMSPEC", "WINDIR", "PROGRAMFILES", "APPDATA", "LOCALAPPDATA",
|
|
75
|
+
];
|
|
76
|
+
|
|
77
|
+
export function cleanEnv(extra = {}) {
|
|
78
|
+
const env = {};
|
|
79
|
+
for (const k of ENV_ALLOW) {
|
|
80
|
+
const v = process.env[k];
|
|
81
|
+
if (typeof v === "string" && v) env[k] = v;
|
|
82
|
+
}
|
|
83
|
+
return { ...env, ...extra };
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
/** pid 存活检查(0 信号探测;EPERM = 存活但无权限,按活算)。 */
|
|
87
|
+
export function isPidAlive(pid) {
|
|
88
|
+
if (typeof pid !== "number" || !Number.isFinite(pid) || pid <= 0) return false;
|
|
89
|
+
try {
|
|
90
|
+
process.kill(pid, 0);
|
|
91
|
+
return true;
|
|
92
|
+
} catch (e) {
|
|
93
|
+
return e?.code === "EPERM";
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
/** 最后一条非空行(driver interpret 组人话 error 用)。 */
|
|
98
|
+
export function tailLine(text, max = 300) {
|
|
99
|
+
const lines = String(text ?? "").split("\n").map((s) => s.trim()).filter(Boolean);
|
|
100
|
+
return (lines[lines.length - 1] ?? "").slice(0, max);
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
|
|
104
|
+
|
|
105
|
+
/**
|
|
106
|
+
* 受控登录控制器(每扩展一个实例 = 单槽)。
|
|
107
|
+
*
|
|
108
|
+
* @param {object} opts
|
|
109
|
+
* @param {ControlledLoginDriver} opts.driver 家驱动
|
|
110
|
+
* @param {string} opts.configDir 扩展数据目录(状态文件落这里)
|
|
111
|
+
* @param {(argv: object) => Promise<string>} [opts.resolveRuntime]
|
|
112
|
+
* spawn 前解析 CLI/runtime(复用各扩展现有解析;
|
|
113
|
+
* 未装 throw 人话错误 → start 返回 failed 态)
|
|
114
|
+
* @param {(info: { user?: string; stdout: string; stderr: string }) => void} [opts.onSuccess]
|
|
115
|
+
* 成功钩子(如 zcode 预热 ensureCredential)
|
|
116
|
+
* @param {(cmd: string, args: string[], o: object) => ChildProcess} [opts.spawnImpl] 测试注入
|
|
117
|
+
* @param {number} [opts.urlWaitMs] start 返回前等 URL 的上限(默认 15s;超了也照常
|
|
118
|
+
* waiting,URL 由 status 轮询补见)
|
|
119
|
+
* @param {string} [opts.cwd] login 进程工作目录(默认 process.cwd())
|
|
120
|
+
* @param {(msg: string) => void} [opts.log]
|
|
121
|
+
*/
|
|
122
|
+
export function createControlledLogin(opts) {
|
|
123
|
+
const driver = opts.driver;
|
|
124
|
+
if (!driver || typeof driver.buildLogin !== "function" || typeof driver.extractUrl !== "function" || typeof driver.interpret !== "function") {
|
|
125
|
+
throw new Error("createControlledLogin: driver 契约不完整(需 agentId/mode/buildLogin/extractUrl/interpret)");
|
|
126
|
+
}
|
|
127
|
+
const configDir = opts.configDir;
|
|
128
|
+
if (!configDir) throw new Error("createControlledLogin: configDir 必填");
|
|
129
|
+
const spawnImpl = opts.spawnImpl ?? ((cmd, args, o) => nodeSpawn(cmd, args, o));
|
|
130
|
+
const resolveRuntime = opts.resolveRuntime ?? (async () => "");
|
|
131
|
+
const onSuccess = typeof opts.onSuccess === "function" ? opts.onSuccess : null;
|
|
132
|
+
const log = opts.log ?? (() => {});
|
|
133
|
+
const timeoutMs = Number(driver.loginTimeoutMs) > 0 ? Number(driver.loginTimeoutMs) : DEFAULT_LOGIN_TIMEOUT_MS;
|
|
134
|
+
const urlWaitMs = Number(opts.urlWaitMs) > 0 ? Number(opts.urlWaitMs) : 15_000;
|
|
135
|
+
const cwd = opts.cwd || process.cwd();
|
|
136
|
+
|
|
137
|
+
/** 活动流程(单槽):{ proc, cancelled, timedOut, timer, resolveUrl, resolveExit } */
|
|
138
|
+
let run = null;
|
|
139
|
+
|
|
140
|
+
const stateFile = () => join(configDir, "controlled-login.json");
|
|
141
|
+
const readState = () => {
|
|
142
|
+
try { return JSON.parse(readFileSync(stateFile(), "utf8")); } catch { return null; }
|
|
143
|
+
};
|
|
144
|
+
const writeState = (s) => {
|
|
145
|
+
try {
|
|
146
|
+
mkdirSync(configDir, { recursive: true });
|
|
147
|
+
writeFileSync(stateFile(), JSON.stringify(s, null, 2));
|
|
148
|
+
} catch (e) {
|
|
149
|
+
log(`[controlled-login] 状态文件写失败: ${e?.message || e}`);
|
|
150
|
+
}
|
|
151
|
+
};
|
|
152
|
+
const clearState = () => { try { rmSync(stateFile(), { force: true }); } catch { /* ignore */ } };
|
|
153
|
+
const mkState = (over) => ({ state: "waiting", url: null, mode: driver.mode, startedAt: Date.now(), pid: null, ...over });
|
|
154
|
+
|
|
155
|
+
function publicView(s) {
|
|
156
|
+
if (!s) return { state: "idle", mode: driver.mode };
|
|
157
|
+
const out = { state: s.state, mode: s.mode ?? driver.mode, startedAt: s.startedAt };
|
|
158
|
+
if (s.url) out.url = s.url;
|
|
159
|
+
if (s.user) out.user = s.user;
|
|
160
|
+
if (s.error) out.error = s.error;
|
|
161
|
+
if (s.outputTail) out.outputTail = s.outputTail;
|
|
162
|
+
return out;
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
function killProc(proc) {
|
|
166
|
+
try { proc.kill("SIGTERM"); } catch { /* already gone */ }
|
|
167
|
+
const t = setTimeout(() => {
|
|
168
|
+
try {
|
|
169
|
+
if (proc.exitCode === null && proc.signalCode === null) proc.kill("SIGKILL");
|
|
170
|
+
} catch { /* already gone */ }
|
|
171
|
+
}, 3_000);
|
|
172
|
+
if (typeof t.unref === "function") t.unref();
|
|
173
|
+
}
|
|
174
|
+
|
|
175
|
+
/** 状态查询;waiting 态且无活动进程时按 pid 做存活 reconcile(服务重启 → failed)。 */
|
|
176
|
+
function status() {
|
|
177
|
+
let s = readState();
|
|
178
|
+
if (!s) return { state: "idle", mode: driver.mode };
|
|
179
|
+
if (s.state === "waiting" && !run && !isPidAlive(s.pid)) {
|
|
180
|
+
s = {
|
|
181
|
+
...s,
|
|
182
|
+
state: "failed",
|
|
183
|
+
error: s.error ?? "登录进程已退出(服务重启或进程被终止),请重新发起",
|
|
184
|
+
finishedAt: Date.now(),
|
|
185
|
+
pid: null,
|
|
186
|
+
};
|
|
187
|
+
writeState(s);
|
|
188
|
+
}
|
|
189
|
+
return publicView(s);
|
|
190
|
+
}
|
|
191
|
+
|
|
192
|
+
/**
|
|
193
|
+
* 发起登录(幂等:waiting 且进程存活时原样返回既有状态,不重复 spawn)。
|
|
194
|
+
* argv 透传 resolveRuntime(variant 等家参数)+ buildLogin(consoleMode)。
|
|
195
|
+
*/
|
|
196
|
+
async function start(argv = {}) {
|
|
197
|
+
const existing = readState();
|
|
198
|
+
if (existing && existing.state === "waiting" && (run || isPidAlive(existing.pid))) {
|
|
199
|
+
return publicView(existing); // 幂等
|
|
200
|
+
}
|
|
201
|
+
if (run) { killProc(run.proc); clearTimeout(run.timer); run = null; } // 兜底清残活
|
|
202
|
+
clearState();
|
|
203
|
+
|
|
204
|
+
const failStart = (error) => {
|
|
205
|
+
const s = mkState({ state: "failed", error, finishedAt: Date.now() });
|
|
206
|
+
writeState(s);
|
|
207
|
+
return publicView(s);
|
|
208
|
+
};
|
|
209
|
+
|
|
210
|
+
let runtime = "";
|
|
211
|
+
try {
|
|
212
|
+
runtime = await resolveRuntime(argv ?? {});
|
|
213
|
+
} catch (e) {
|
|
214
|
+
return failStart(e?.message || String(e));
|
|
215
|
+
}
|
|
216
|
+
let built;
|
|
217
|
+
try {
|
|
218
|
+
built = driver.buildLogin({ runtime, ...(argv?.consoleMode ? { consoleMode: true } : {}) });
|
|
219
|
+
} catch (e) {
|
|
220
|
+
return failStart(e?.message || String(e));
|
|
221
|
+
}
|
|
222
|
+
|
|
223
|
+
let proc;
|
|
224
|
+
try {
|
|
225
|
+
proc = spawnImpl(built.cmd, built.args, { cwd, env: built.env, stdio: ["pipe", "pipe", "pipe"] });
|
|
226
|
+
} catch (e) {
|
|
227
|
+
return failStart(`无法启动登录进程 ${built.cmd}:${e?.message || e}`);
|
|
228
|
+
}
|
|
229
|
+
|
|
230
|
+
const ctx = { proc, cancelled: false, timedOut: false, timer: null };
|
|
231
|
+
run = ctx;
|
|
232
|
+
let resolveUrl = () => {};
|
|
233
|
+
let resolveExit = () => {};
|
|
234
|
+
const urlSeen = new Promise((r) => { resolveUrl = r; });
|
|
235
|
+
const exitSeen = new Promise((r) => { resolveExit = r; });
|
|
236
|
+
|
|
237
|
+
let stdoutBuf = "";
|
|
238
|
+
let stderrBuf = "";
|
|
239
|
+
let captured = false;
|
|
240
|
+
const tryCapture = () => {
|
|
241
|
+
if (captured) return;
|
|
242
|
+
const url = driver.extractUrl(stdoutBuf + "\n" + stderrBuf);
|
|
243
|
+
if (!url) return;
|
|
244
|
+
captured = true;
|
|
245
|
+
const s = readState();
|
|
246
|
+
if (s && s.state === "waiting" && !s.url) { s.url = url; writeState(s); }
|
|
247
|
+
resolveUrl(url);
|
|
248
|
+
};
|
|
249
|
+
proc.stdout?.on?.("data", (c) => { stdoutBuf += typeof c === "string" ? c : c.toString("utf8"); tryCapture(); });
|
|
250
|
+
proc.stderr?.on?.("data", (c) => { stderrBuf += typeof c === "string" ? c : c.toString("utf8"); tryCapture(); });
|
|
251
|
+
|
|
252
|
+
writeState(mkState({ pid: typeof proc.pid === "number" ? proc.pid : null }));
|
|
253
|
+
tryCapture(); // 竞态兜底(数据先于本行到达的极端情况)
|
|
254
|
+
|
|
255
|
+
const writeTerminal = (update, tailText) => {
|
|
256
|
+
const s = readState() ?? mkState({});
|
|
257
|
+
const next = {
|
|
258
|
+
...s,
|
|
259
|
+
state: update.state,
|
|
260
|
+
finishedAt: Date.now(),
|
|
261
|
+
...(update.user ? { user: update.user } : {}),
|
|
262
|
+
...(update.error ? { error: update.error } : {}),
|
|
263
|
+
};
|
|
264
|
+
if ((update.state === "failed" || update.state === "timeout") && tailText) {
|
|
265
|
+
next.outputTail = tailText.trim().slice(-1500);
|
|
266
|
+
}
|
|
267
|
+
writeState(next);
|
|
268
|
+
return next;
|
|
269
|
+
};
|
|
270
|
+
|
|
271
|
+
proc.on?.("error", (err) => {
|
|
272
|
+
if (run !== ctx || ctx.cancelled || ctx.timedOut) return;
|
|
273
|
+
run = null;
|
|
274
|
+
clearTimeout(ctx.timer);
|
|
275
|
+
writeTerminal({ state: "failed", error: `无法启动登录进程 ${built.cmd}:${err?.message || err}(请确认 CLI 已安装并在 PATH)` });
|
|
276
|
+
resolveExit();
|
|
277
|
+
});
|
|
278
|
+
|
|
279
|
+
proc.on?.("exit", (code) => {
|
|
280
|
+
if (run !== ctx) return; // 被 cancel/timeout/新一轮接管:终态已有人写
|
|
281
|
+
run = null;
|
|
282
|
+
clearTimeout(ctx.timer);
|
|
283
|
+
resolveExit();
|
|
284
|
+
if (ctx.cancelled || ctx.timedOut) return;
|
|
285
|
+
let r;
|
|
286
|
+
try {
|
|
287
|
+
r = driver.interpret(code, stdoutBuf, stderrBuf);
|
|
288
|
+
} catch (e) {
|
|
289
|
+
r = { state: "failed", error: `interpret 异常:${e?.message || e}` };
|
|
290
|
+
}
|
|
291
|
+
writeTerminal(r, stdoutBuf + "\n" + stderrBuf);
|
|
292
|
+
if (r.state === "success" && onSuccess) {
|
|
293
|
+
try { onSuccess({ user: r.user, stdout: stdoutBuf, stderr: stderrBuf }); } catch (e) {
|
|
294
|
+
log(`[controlled-login] onSuccess 失败(不影响登录结果): ${e?.message || e}`);
|
|
295
|
+
}
|
|
296
|
+
}
|
|
297
|
+
});
|
|
298
|
+
|
|
299
|
+
ctx.timer = setTimeout(() => {
|
|
300
|
+
if (run !== ctx) return;
|
|
301
|
+
ctx.timedOut = true;
|
|
302
|
+
run = null;
|
|
303
|
+
killProc(proc);
|
|
304
|
+
writeTerminal({ state: "timeout", error: `登录超时(${Math.round(timeoutMs / 1000)}s 未完成授权,进程已终止)` }, stdoutBuf + "\n" + stderrBuf);
|
|
305
|
+
resolveExit();
|
|
306
|
+
}, timeoutMs);
|
|
307
|
+
if (typeof ctx.timer.unref === "function") ctx.timer.unref();
|
|
308
|
+
|
|
309
|
+
// start 调用方:URL 命中 / 快速退出 / urlWaitMs,三者先到先回(未等到也照常 waiting,
|
|
310
|
+
// URL 由前端 status 轮询补见)
|
|
311
|
+
await Promise.race([urlSeen, exitSeen, sleep(urlWaitMs)]);
|
|
312
|
+
return status();
|
|
313
|
+
}
|
|
314
|
+
|
|
315
|
+
/** B 模式专属:把用户粘来的 code(或完整回调 URL)原样喂 login 进程 stdin。 */
|
|
316
|
+
async function submit(text) {
|
|
317
|
+
const s = readState();
|
|
318
|
+
if (!s || s.state !== "waiting") throw new Error("当前没有进行中的登录");
|
|
319
|
+
if (driver.mode !== "paste") throw new Error(`${driver.agentId} 登录为 url 模式(无需提交 code)`);
|
|
320
|
+
if (!run || !run.proc?.stdin?.writable) throw new Error("登录进程未在运行(可能已退出),请重新发起登录");
|
|
321
|
+
const line = String(text ?? "").trim().replace(/[\r\n]+$/, "");
|
|
322
|
+
if (!line) throw new Error("提交内容为空");
|
|
323
|
+
// 背压修正(同 A4):write() 返回 false 仅表示帧入缓冲,不是失败——真失败才 throw
|
|
324
|
+
try {
|
|
325
|
+
run.proc.stdin.write(line + "\r\n");
|
|
326
|
+
} catch (e) {
|
|
327
|
+
throw new Error(`登录进程 stdin 写失败: ${e?.message || e}`);
|
|
328
|
+
}
|
|
329
|
+
return status();
|
|
330
|
+
}
|
|
331
|
+
|
|
332
|
+
/** 取消:kill → cancelled(幂等:无进行中流程时原样返回当前状态)。 */
|
|
333
|
+
async function cancel() {
|
|
334
|
+
const s = readState();
|
|
335
|
+
if (!s || s.state !== "waiting") return status();
|
|
336
|
+
if (run) {
|
|
337
|
+
run.cancelled = true;
|
|
338
|
+
clearTimeout(run.timer);
|
|
339
|
+
killProc(run.proc);
|
|
340
|
+
run = null;
|
|
341
|
+
}
|
|
342
|
+
writeState({ ...s, state: "cancelled", finishedAt: Date.now() });
|
|
343
|
+
return publicView(readState());
|
|
344
|
+
}
|
|
345
|
+
|
|
346
|
+
/** 扩展停卸时清残留进程/定时器。 */
|
|
347
|
+
function dispose() {
|
|
348
|
+
if (run) {
|
|
349
|
+
clearTimeout(run.timer);
|
|
350
|
+
killProc(run.proc);
|
|
351
|
+
run = null;
|
|
352
|
+
}
|
|
353
|
+
}
|
|
354
|
+
|
|
355
|
+
return { start, status, cancel, submit, dispose };
|
|
356
|
+
}
|
|
357
|
+
|
|
358
|
+
/**
|
|
359
|
+
* API 挂载 helper:返回可直接用作扩展 `server.api` 的处理器(不匹配 /login/* 时返回 null 放行)。
|
|
360
|
+
* 用法:`api(req, ctx) { return loginApi(req, ctx); }`
|
|
361
|
+
*/
|
|
362
|
+
export function mountControlledLoginApi(controller) {
|
|
363
|
+
async function readJsonBody(req) {
|
|
364
|
+
try { return await req.json(); } catch { return {}; }
|
|
365
|
+
}
|
|
366
|
+
return async function controlledLoginApi(req, ctx) {
|
|
367
|
+
const segs = Array.isArray(ctx?.path) ? ctx.path : [];
|
|
368
|
+
if (segs[0] !== "login") return null;
|
|
369
|
+
const sub = segs[1] ?? "";
|
|
370
|
+
const method = String(ctx?.method ?? "GET").toUpperCase();
|
|
371
|
+
const allowed =
|
|
372
|
+
(sub === "start" && method === "POST") ||
|
|
373
|
+
(sub === "status" && method === "GET") ||
|
|
374
|
+
(sub === "cancel" && method === "POST") ||
|
|
375
|
+
(sub === "submit" && method === "POST");
|
|
376
|
+
if (!allowed) {
|
|
377
|
+
return Response.json({ error: `未知登录端点 /login/${sub}(${method})` }, { status: 404 });
|
|
378
|
+
}
|
|
379
|
+
try {
|
|
380
|
+
if (sub === "start") {
|
|
381
|
+
return Response.json(await controller.start(await readJsonBody(req)));
|
|
382
|
+
}
|
|
383
|
+
if (sub === "status") {
|
|
384
|
+
return Response.json(controller.status());
|
|
385
|
+
}
|
|
386
|
+
if (sub === "cancel") {
|
|
387
|
+
return Response.json(await controller.cancel());
|
|
388
|
+
}
|
|
389
|
+
// sub === "submit"
|
|
390
|
+
const body = await readJsonBody(req);
|
|
391
|
+
const code = typeof body?.code === "string" ? body.code : "";
|
|
392
|
+
if (!code.trim()) throw new Error("缺少 code(粘贴授权完成后页面显示的 code,或完整回调链接)");
|
|
393
|
+
return Response.json(await controller.submit(code));
|
|
394
|
+
} catch (e) {
|
|
395
|
+
return Response.json({ error: e?.message || String(e) }, { status: 400 });
|
|
396
|
+
}
|
|
397
|
+
};
|
|
398
|
+
}
|