openxiangda-devkit-core 2.0.0-alpha.12 → 2.0.0-alpha.13

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/session.js CHANGED
@@ -1,48 +1,351 @@
1
- import { chmod, mkdir, readFile, rm, writeFile } from 'node:fs/promises';
2
- import { homedir } from 'node:os';
3
- import { dirname, join } from 'node:path';
1
+ import { chmod, mkdir, readFile, rename, rm, writeFile, } from "node:fs/promises";
2
+ import { homedir } from "node:os";
3
+ import { dirname, join } from "node:path";
4
+ import { randomUUID } from "node:crypto";
5
+ export class DeveloperSessionError extends Error {
6
+ code;
7
+ status;
8
+ data;
9
+ constructor(code, message, status, data) {
10
+ super(message);
11
+ this.code = code;
12
+ this.status = status;
13
+ this.data = data;
14
+ this.name = "DeveloperSessionError";
15
+ }
16
+ }
4
17
  export function defaultSessionPath() {
5
- return join(homedir(), '.config', 'openxiangda-v2', 'session.json');
18
+ return join(homedir(), ".config", "openxiangda-v2", "session.json");
19
+ }
20
+ export function normalizePlatformBaseUrl(value) {
21
+ const text = String(value || "").trim();
22
+ let url;
23
+ try {
24
+ url = new URL(text);
25
+ }
26
+ catch {
27
+ throw new DeveloperSessionError("OPENXIANGDA_PLATFORM_URL_INVALID", "平台地址不是有效 URL");
28
+ }
29
+ if (!/^https?:$/.test(url.protocol) || url.username || url.password) {
30
+ throw new DeveloperSessionError("OPENXIANGDA_PLATFORM_URL_INVALID", "平台地址只允许不含用户凭据的 HTTP(S) URL");
31
+ }
32
+ const path = url.pathname.replace(/\/+$/, "");
33
+ if (!path ||
34
+ path === "/platform" ||
35
+ path.startsWith("/platform/") ||
36
+ path === "/view" ||
37
+ path.startsWith("/view/")) {
38
+ return `${url.origin}/service`;
39
+ }
40
+ return `${url.origin}${path}`;
6
41
  }
7
42
  export async function loadSession(path = defaultSessionPath()) {
8
- const baseUrl = String(process.env.OPENXIANGDA_BASE_URL || '').trim();
9
- const token = String(process.env.OPENXIANGDA_TOKEN || '').trim();
10
- if (baseUrl && token) {
11
- return { schemaVersion: 2, baseUrl, token, savedAt: 'environment' };
43
+ const baseUrl = String(process.env.OPENXIANGDA_BASE_URL || "").trim();
44
+ const token = String(process.env.OPENXIANGDA_TOKEN || "").trim();
45
+ if (baseUrl || token) {
46
+ if (!baseUrl || !token) {
47
+ throw new DeveloperSessionError("OPENXIANGDA_ENV_AUTH_INCOMPLETE", "CI 身份必须同时提供 OPENXIANGDA_BASE_URL 和 OPENXIANGDA_TOKEN");
48
+ }
49
+ return {
50
+ schemaVersion: 2,
51
+ baseUrl: normalizePlatformBaseUrl(baseUrl),
52
+ accessToken: token,
53
+ savedAt: "environment",
54
+ source: "environment",
55
+ };
12
56
  }
13
57
  try {
14
- const value = JSON.parse(await readFile(path, 'utf8'));
15
- if (value.schemaVersion !== 2 || !value.baseUrl || !value.token)
58
+ const raw = JSON.parse(await readFile(path, "utf8"));
59
+ const accessToken = String(raw.accessToken || raw.token || "").trim();
60
+ if (raw.schemaVersion !== 2 || !raw.baseUrl || !accessToken)
16
61
  return null;
17
- return value;
62
+ return {
63
+ schemaVersion: 2,
64
+ baseUrl: normalizePlatformBaseUrl(raw.baseUrl),
65
+ accessToken,
66
+ ...(raw.refreshToken ? { refreshToken: raw.refreshToken } : {}),
67
+ ...(raw.accessTokenExpiresAt
68
+ ? { accessTokenExpiresAt: raw.accessTokenExpiresAt }
69
+ : {}),
70
+ ...(raw.refreshTokenExpiresAt
71
+ ? { refreshTokenExpiresAt: raw.refreshTokenExpiresAt }
72
+ : {}),
73
+ savedAt: raw.savedAt || "unknown",
74
+ source: "file",
75
+ };
18
76
  }
19
77
  catch (error) {
20
- if (error.code === 'ENOENT')
78
+ if (error.code === "ENOENT")
21
79
  return null;
22
80
  throw error;
23
81
  }
24
82
  }
25
83
  export async function saveSession(input, path = defaultSessionPath()) {
26
- const session = {
84
+ const accessToken = String(input.accessToken || input.token || "").trim();
85
+ if (!accessToken) {
86
+ throw new DeveloperSessionError("OPENXIANGDA_ACCESS_TOKEN_REQUIRED", "缺少 OpenXiangda access token");
87
+ }
88
+ const persisted = {
27
89
  schemaVersion: 2,
28
- baseUrl: input.baseUrl.replace(/\/+$/, ''),
29
- token: input.token,
90
+ baseUrl: normalizePlatformBaseUrl(input.baseUrl),
91
+ accessToken,
92
+ ...(input.refreshToken ? { refreshToken: input.refreshToken } : {}),
93
+ ...(input.accessTokenExpiresAt
94
+ ? { accessTokenExpiresAt: input.accessTokenExpiresAt }
95
+ : {}),
96
+ ...(input.refreshTokenExpiresAt
97
+ ? { refreshTokenExpiresAt: input.refreshTokenExpiresAt }
98
+ : {}),
30
99
  savedAt: new Date().toISOString(),
31
100
  };
32
- await mkdir(dirname(path), { recursive: true, mode: 0o700 });
33
- await writeFile(path, `${JSON.stringify(session, null, 2)}\n`, {
34
- encoding: 'utf8',
35
- mode: 0o600,
36
- });
37
- await chmod(path, 0o600);
38
- return { ...session, token: redactToken(session.token) };
101
+ const directory = dirname(path);
102
+ const temporaryPath = join(directory, `.session-${randomUUID()}.tmp`);
103
+ await mkdir(directory, { recursive: true, mode: 0o700 });
104
+ await chmod(directory, 0o700);
105
+ try {
106
+ await writeFile(temporaryPath, `${JSON.stringify(persisted, null, 2)}\n`, {
107
+ encoding: "utf8",
108
+ mode: 0o600,
109
+ });
110
+ await rename(temporaryPath, path);
111
+ await chmod(path, 0o600);
112
+ }
113
+ finally {
114
+ await rm(temporaryPath, { force: true });
115
+ }
116
+ return sessionSummary({ ...persisted, source: "file" });
39
117
  }
40
118
  export async function clearSession(path = defaultSessionPath()) {
41
119
  await rm(path, { force: true });
42
120
  }
43
121
  export function redactToken(token) {
44
122
  if (token.length <= 8)
45
- return '********';
123
+ return "********";
46
124
  return `${token.slice(0, 4)}…${token.slice(-4)}`;
47
125
  }
126
+ export function sessionSummary(session) {
127
+ return {
128
+ schemaVersion: session.schemaVersion,
129
+ baseUrl: session.baseUrl,
130
+ accessToken: redactToken(session.accessToken),
131
+ refreshTokenConfigured: Boolean(session.refreshToken),
132
+ accessTokenExpiresAt: session.accessTokenExpiresAt,
133
+ refreshTokenExpiresAt: session.refreshTokenExpiresAt,
134
+ savedAt: session.savedAt,
135
+ source: session.source,
136
+ };
137
+ }
138
+ export class OpenXiangdaDeveloperSession {
139
+ session;
140
+ options;
141
+ refreshInFlight;
142
+ validated = false;
143
+ constructor(session, options = {}) {
144
+ this.session = session;
145
+ this.options = options;
146
+ }
147
+ static async load(options = {}) {
148
+ const session = await loadSession(options.sessionPath);
149
+ return session ? new OpenXiangdaDeveloperSession(session, options) : null;
150
+ }
151
+ get baseUrl() {
152
+ return this.session.baseUrl;
153
+ }
154
+ summary() {
155
+ return sessionSummary(this.session);
156
+ }
157
+ assertPlatform(linkedBaseUrl) {
158
+ const linked = normalizePlatformBaseUrl(linkedBaseUrl);
159
+ if (linked !== this.session.baseUrl) {
160
+ throw new DeveloperSessionError("OPENXIANGDA_PLATFORM_SESSION_MISMATCH", `工作区绑定平台 ${linked} 与当前登录平台 ${this.session.baseUrl} 不一致;为防止凭据跨平台发送,请切换登录会话或重新绑定工作区`);
161
+ }
162
+ }
163
+ async getAccessToken(input = {}) {
164
+ if (input.forceRefresh || this.shouldRefresh()) {
165
+ await this.refresh();
166
+ }
167
+ if (!this.validated) {
168
+ try {
169
+ await this.requestWhoami(this.session.accessToken);
170
+ }
171
+ catch (error) {
172
+ if (!this.isUnauthorized(error) || !this.session.refreshToken)
173
+ throw error;
174
+ await this.refresh();
175
+ await this.requestWhoami(this.session.accessToken);
176
+ }
177
+ this.validated = true;
178
+ }
179
+ return this.session.accessToken;
180
+ }
181
+ async whoami() {
182
+ if (this.shouldRefresh())
183
+ await this.refresh();
184
+ try {
185
+ const identity = await this.requestWhoami(this.session.accessToken);
186
+ this.validated = true;
187
+ return identity;
188
+ }
189
+ catch (error) {
190
+ if (!this.isUnauthorized(error) || !this.session.refreshToken)
191
+ throw error;
192
+ await this.refresh();
193
+ const identity = await this.requestWhoami(this.session.accessToken);
194
+ this.validated = true;
195
+ return identity;
196
+ }
197
+ }
198
+ async logout() {
199
+ let serverRevoked = false;
200
+ let serverError;
201
+ try {
202
+ const token = await this.getAccessToken();
203
+ await this.request("/openxiangda-api/v2/auth/logout", {
204
+ method: "POST",
205
+ token,
206
+ body: "{}",
207
+ });
208
+ serverRevoked = true;
209
+ }
210
+ catch (error) {
211
+ serverError = error instanceof Error ? error.message : String(error);
212
+ }
213
+ finally {
214
+ if (this.session.source === "file") {
215
+ await clearSession(this.options.sessionPath);
216
+ }
217
+ }
218
+ return { loggedOut: true, serverRevoked, ...(serverError ? { serverError } : {}) };
219
+ }
220
+ shouldRefresh() {
221
+ return Boolean(this.session.refreshToken &&
222
+ this.session.accessTokenExpiresAt &&
223
+ this.session.accessTokenExpiresAt <= this.now() + 30_000);
224
+ }
225
+ async refresh() {
226
+ if (this.refreshInFlight)
227
+ return await this.refreshInFlight;
228
+ if (!this.session.refreshToken || this.session.source === "environment") {
229
+ throw new DeveloperSessionError("OPENXIANGDA_AUTH_REFRESH_UNAVAILABLE", "当前身份不能自动刷新,请重新登录或更新 CI token");
230
+ }
231
+ const pending = this.performRefresh();
232
+ this.refreshInFlight = pending;
233
+ try {
234
+ return await pending;
235
+ }
236
+ finally {
237
+ if (this.refreshInFlight === pending)
238
+ this.refreshInFlight = undefined;
239
+ }
240
+ }
241
+ async performRefresh() {
242
+ const pair = await this.request("/openxiangda-api/v2/auth/refresh", {
243
+ method: "POST",
244
+ body: JSON.stringify({ refreshToken: this.session.refreshToken }),
245
+ });
246
+ if (!pair.accessToken || !pair.refreshToken) {
247
+ throw new DeveloperSessionError("OPENXIANGDA_AUTH_REFRESH_INVALID", "平台返回了无效的刷新结果");
248
+ }
249
+ await saveSession({ baseUrl: this.session.baseUrl, ...pair }, this.options.sessionPath);
250
+ this.session = {
251
+ schemaVersion: 2,
252
+ baseUrl: this.session.baseUrl,
253
+ ...pair,
254
+ savedAt: new Date(this.now()).toISOString(),
255
+ source: "file",
256
+ };
257
+ this.validated = false;
258
+ return this.session;
259
+ }
260
+ async requestWhoami(token) {
261
+ return await this.request("/openxiangda-api/v2/auth/whoami", { token });
262
+ }
263
+ async request(path, input = {}) {
264
+ const response = await this.fetch(`${this.session.baseUrl}${path}`, {
265
+ method: input.method || "GET",
266
+ headers: {
267
+ Accept: "application/json",
268
+ ...(input.body ? { "Content-Type": "application/json" } : {}),
269
+ ...(input.token ? { Authorization: `Bearer ${input.token}` } : {}),
270
+ },
271
+ ...(input.body ? { body: input.body } : {}),
272
+ });
273
+ return await parseEnvelope(response);
274
+ }
275
+ isUnauthorized(error) {
276
+ return (error instanceof DeveloperSessionError &&
277
+ (error.status === 401 || error.code === "OPENXIANGDA_AUTH_REQUIRED"));
278
+ }
279
+ get fetch() {
280
+ return this.options.fetch || globalThis.fetch.bind(globalThis);
281
+ }
282
+ now() {
283
+ return (this.options.now || Date.now)();
284
+ }
285
+ }
286
+ export async function authorizeDeveloperSession(input) {
287
+ const baseUrl = normalizePlatformBaseUrl(input.baseUrl);
288
+ const fetcher = input.fetch || globalThis.fetch.bind(globalThis);
289
+ const startResponse = await fetcher(`${baseUrl}/openxiangda-api/v2/auth/cli-sessions`, {
290
+ method: "POST",
291
+ headers: { Accept: "application/json", "Content-Type": "application/json" },
292
+ body: JSON.stringify({ baseUrl }),
293
+ });
294
+ const authorization = await parseEnvelope(startResponse);
295
+ await input.onAuthorization?.(authorization);
296
+ const deadline = Date.now() + authorization.expireIn * 1000;
297
+ while (Date.now() < deadline) {
298
+ await delay(Math.max(250, input.pollIntervalMs || 1500));
299
+ const pollResponse = await fetcher(`${baseUrl}/openxiangda-api/v2/auth/cli-sessions/${encodeURIComponent(authorization.sessionId)}`, {
300
+ headers: {
301
+ Accept: "application/json",
302
+ "X-OpenXiangda-CLI-Poll-Secret": authorization.pollSecret,
303
+ },
304
+ });
305
+ const poll = await parseEnvelope(pollResponse);
306
+ if (poll.status === "pending")
307
+ continue;
308
+ if (poll.status !== "authorized" || !poll.accessToken) {
309
+ throw new DeveloperSessionError("OPENXIANGDA_CLI_AUTH_NOT_AUTHORIZED", poll.status === "expired" ? "CLI 授权会话已过期" : "CLI 授权会话未获批准");
310
+ }
311
+ const transient = {
312
+ schemaVersion: 2,
313
+ baseUrl,
314
+ accessToken: poll.accessToken,
315
+ ...(poll.refreshToken ? { refreshToken: poll.refreshToken } : {}),
316
+ ...(poll.accessTokenExpiresAt
317
+ ? { accessTokenExpiresAt: poll.accessTokenExpiresAt }
318
+ : {}),
319
+ ...(poll.refreshTokenExpiresAt
320
+ ? { refreshTokenExpiresAt: poll.refreshTokenExpiresAt }
321
+ : {}),
322
+ savedAt: "validation",
323
+ source: "file",
324
+ };
325
+ const manager = new OpenXiangdaDeveloperSession(transient, { fetch: fetcher });
326
+ const identity = await manager.whoami();
327
+ const summary = await saveSession(transient, input.sessionPath);
328
+ return { session: summary, identity };
329
+ }
330
+ throw new DeveloperSessionError("OPENXIANGDA_CLI_AUTH_EXPIRED", "CLI 授权会话已过期");
331
+ }
332
+ async function parseEnvelope(response) {
333
+ let envelope;
334
+ try {
335
+ envelope = (await response.json());
336
+ }
337
+ catch {
338
+ throw new DeveloperSessionError("OPENXIANGDA_AUTH_RESPONSE_INVALID", "平台身份接口返回的不是有效 JSON", response.status);
339
+ }
340
+ if (!response.ok || Number(envelope.code) >= 400) {
341
+ throw new DeveloperSessionError(envelope.errorCode ||
342
+ (Number(envelope.code) === 401
343
+ ? "OPENXIANGDA_AUTH_REQUIRED"
344
+ : "OPENXIANGDA_AUTH_REQUEST_FAILED"), envelope.message || `平台身份请求失败: ${response.status}`, response.status === 200 ? Number(envelope.code) : response.status, envelope.data);
345
+ }
346
+ return envelope.data;
347
+ }
348
+ async function delay(milliseconds) {
349
+ await new Promise((resolve) => setTimeout(resolve, milliseconds));
350
+ }
48
351
  //# sourceMappingURL=session.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"session.js","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAS1C,MAAM,UAAU,kBAAkB;IAChC,OAAO,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAC;AACtE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,IAAI,GAAG,kBAAkB,EAAE;IAC3D,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACtE,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACjE,IAAI,OAAO,IAAI,KAAK,EAAE,CAAC;QACrB,OAAO,EAAE,aAAa,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,aAAa,EAA+B,CAAC;IACnG,CAAC;IACD,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAuB,CAAC;QAC7E,IAAI,KAAK,CAAC,aAAa,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QAC7E,OAAO,KAAK,CAAC;IACf,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAC;QACpE,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,KAAyC,EACzC,IAAI,GAAG,kBAAkB,EAAE;IAE3B,MAAM,OAAO,GAAuB;QAClC,aAAa,EAAE,CAAC;QAChB,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;QAC1C,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,OAAO,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;KAClC,CAAC;IACF,MAAM,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAC7D,MAAM,SAAS,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE;QAC7D,QAAQ,EAAE,MAAM;QAChB,IAAI,EAAE,KAAK;KACZ,CAAC,CAAC;IACH,MAAM,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACzB,OAAO,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;AAC3D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,IAAI,GAAG,kBAAkB,EAAE;IAC5D,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAClC,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,KAAa;IACvC,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC;QAAE,OAAO,UAAU,CAAC;IACzC,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AACnD,CAAC"}
1
+ {"version":3,"file":"session.js","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "openxiangda-devkit-core",
3
- "version": "2.0.0-alpha.12",
3
+ "version": "2.0.0-alpha.13",
4
4
  "description": "Framework-neutral OpenXiangda 2.0 workspace and control-plane use cases.",
5
5
  "type": "module",
6
6
  "main": "./dist/index.js",
@@ -22,7 +22,7 @@
22
22
  ],
23
23
  "dependencies": {
24
24
  "esbuild": "0.28.2",
25
- "openxiangda-compiler": "2.0.0-alpha.12",
25
+ "openxiangda-compiler": "2.0.0-alpha.13",
26
26
  "openxiangda-contracts": "2.0.0-alpha.12"
27
27
  },
28
28
  "engines": {