@xixka/dsh-hub 0.4.11 → 0.4.12
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/lib/atomcode-auth.js +3 -3
- package/lib/atomcode-auth.js.map +1 -1
- package/lib/atomcode-credits.js +3 -3
- package/lib/atomcode-credits.js.map +1 -1
- package/lib/atomcode-product.d.ts +8 -0
- package/lib/atomcode-product.d.ts.map +1 -1
- package/lib/atomcode-product.js +10 -0
- package/lib/atomcode-product.js.map +1 -1
- package/lib/chromium-session.d.ts +102 -51
- package/lib/chromium-session.d.ts.map +1 -1
- package/lib/chromium-session.js +361 -147
- package/lib/chromium-session.js.map +1 -1
- package/lib/doubao-login.d.ts +0 -20
- package/lib/doubao-login.d.ts.map +1 -1
- package/lib/doubao-login.js +53 -17
- package/lib/doubao-login.js.map +1 -1
- package/lib/doubao-signin.d.ts +0 -32
- package/lib/doubao-signin.d.ts.map +1 -1
- package/lib/doubao-signin.js +21 -35
- package/lib/doubao-signin.js.map +1 -1
- package/lib/login.d.ts +7 -20
- package/lib/login.d.ts.map +1 -1
- package/lib/login.js +7 -21
- package/lib/login.js.map +1 -1
- package/lib/loomy-adapter.d.ts.map +1 -1
- package/lib/loomy-adapter.js +23 -7
- package/lib/loomy-adapter.js.map +1 -1
- package/lib/openai-compat.d.ts.map +1 -1
- package/lib/openai-compat.js +6 -0
- package/lib/openai-compat.js.map +1 -1
- package/lib/raccoon-account-queue.d.ts +15 -0
- package/lib/raccoon-account-queue.d.ts.map +1 -0
- package/lib/raccoon-account-queue.js +59 -0
- package/lib/raccoon-account-queue.js.map +1 -0
- package/lib/raccoon-adapter.d.ts +3 -0
- package/lib/raccoon-adapter.d.ts.map +1 -1
- package/lib/raccoon-adapter.js +226 -190
- package/lib/raccoon-adapter.js.map +1 -1
- package/package.json +1 -1
package/lib/atomcode-auth.js
CHANGED
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
import { Service } from '@deepseek-ai/cordis';
|
|
26
26
|
import { credentialRef } from '@deepseek-ai/dsh-credentials';
|
|
27
27
|
import { shouldRefreshNow } from './expiry-sync.js';
|
|
28
|
-
import {
|
|
28
|
+
import { atomcodeCodingPlanUrl, ATOMCODE_HTTP_TIMEOUT_MS, ATOMCODE_PROVIDER_ID, } from './atomcode-product.js';
|
|
29
29
|
import { atomcodeCredentialExpiresAtMs, atomcodeRestHeaders, parseAtomcodeCredential, } from './atomcode.js';
|
|
30
30
|
import { refreshAtomcodeAccessToken } from './atomcode-oauth.js';
|
|
31
31
|
/** 续期失败的**终态**判据(refresh_token 已死 ⇒ 只能重新登录)。 */
|
|
@@ -208,13 +208,13 @@ export class AtomcodeAuth extends Service {
|
|
|
208
208
|
return undefined;
|
|
209
209
|
try {
|
|
210
210
|
// 档位先查 status-v2(拿不到按 Lite 保守);再用该档位查 models-v2。
|
|
211
|
-
const statusResponse = await this.fetcher()(
|
|
211
|
+
const statusResponse = await this.fetcher()(atomcodeCodingPlanUrl('status-v2'), {
|
|
212
212
|
method: 'GET',
|
|
213
213
|
headers: atomcodeRestHeaders({ accessToken: credential.access_token }),
|
|
214
214
|
signal: AbortSignal.timeout(ATOMCODE_HTTP_TIMEOUT_MS),
|
|
215
215
|
});
|
|
216
216
|
const tier = statusResponse.ok ? atomcodeTierOfStatus(await statusResponse.json().catch(() => undefined)) : 'Lite';
|
|
217
|
-
const modelsUrl =
|
|
217
|
+
const modelsUrl = atomcodeCodingPlanUrl('models-v2');
|
|
218
218
|
modelsUrl.searchParams.set('plan_type', tier);
|
|
219
219
|
const response = await this.fetcher()(modelsUrl, {
|
|
220
220
|
method: 'GET',
|
package/lib/atomcode-auth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"atomcode-auth.js","sourceRoot":"","sources":["../src/atomcode-auth.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EAAE,OAAO,EAAgB,MAAM,qBAAqB,CAAA;AAC3D,OAAO,EAAE,aAAa,EAAsB,MAAM,8BAA8B,CAAA;AAEhF,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"atomcode-auth.js","sourceRoot":"","sources":["../src/atomcode-auth.ts"],"names":[],"mappings":"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"}
|
package/lib/atomcode-credits.js
CHANGED
|
@@ -42,7 +42,7 @@
|
|
|
42
42
|
*
|
|
43
43
|
* @module atomcode-credits
|
|
44
44
|
*/
|
|
45
|
-
import {
|
|
45
|
+
import { atomcodeCodingPlanUrl, ATOMCODE_HTTP_TIMEOUT_MS, } from './atomcode-product.js';
|
|
46
46
|
import { atomcodeRestHeaders } from './atomcode.js';
|
|
47
47
|
/** 安全读字符串。 */
|
|
48
48
|
function readString(value) {
|
|
@@ -103,7 +103,7 @@ export async function fetchAtomcodeBalanceDetailed(credential, product, deps = {
|
|
|
103
103
|
const fetchImpl = deps.fetchImpl ?? fetch;
|
|
104
104
|
let response;
|
|
105
105
|
try {
|
|
106
|
-
response = await fetchImpl(
|
|
106
|
+
response = await fetchImpl(atomcodeCodingPlanUrl('status-v2'), {
|
|
107
107
|
method: 'GET',
|
|
108
108
|
headers: atomcodeRestHeaders({ accessToken: credential.access_token }),
|
|
109
109
|
signal: AbortSignal.timeout(product.balanceTimeoutMs ?? ATOMCODE_HTTP_TIMEOUT_MS),
|
|
@@ -228,7 +228,7 @@ export async function claimAtomcodeCodingPlan(credential, product, deps = {}) {
|
|
|
228
228
|
for (const tier of tiers) {
|
|
229
229
|
let response;
|
|
230
230
|
try {
|
|
231
|
-
response = await fetchImpl(
|
|
231
|
+
response = await fetchImpl(atomcodeCodingPlanUrl('claim-v2'), {
|
|
232
232
|
method: 'POST',
|
|
233
233
|
headers: atomcodeRestHeaders({ accessToken: credential.access_token, json: true }),
|
|
234
234
|
body: JSON.stringify({ plan_type: tier }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"atomcode-credits.js","sourceRoot":"","sources":["../src/atomcode-credits.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AAGH,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"atomcode-credits.js","sourceRoot":"","sources":["../src/atomcode-credits.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,6 +28,14 @@
|
|
|
28
28
|
export declare const ATOMCODE_PLATFORM_BASE = "https://acs.atomgit.com";
|
|
29
29
|
/** CodingPlan REST API 基址。 */
|
|
30
30
|
export declare const ATOMCODE_CODINGPLAN_BASE = "https://api.gitcode.com/api/v5";
|
|
31
|
+
/**
|
|
32
|
+
* 拼接 CodingPlan REST URL。
|
|
33
|
+
*
|
|
34
|
+
* ⚠️ 不能用 `new URL('/coding-plan/…', ATOMCODE_CODINGPLAN_BASE)`:前导斜杠
|
|
35
|
+
* 会丢弃基址里的 `/api/v5`,请求根路径并得到 openresty 404。这里与官方
|
|
36
|
+
* Rust 客户端、Atom2Api 的 `base + path` 语义保持一致。
|
|
37
|
+
*/
|
|
38
|
+
export declare function atomcodeCodingPlanUrl(path: 'claim-v2' | 'status-v2' | 'models-v2'): URL;
|
|
31
39
|
/** LLM 网关基址(OpenAI 兼容,含 /v1)。 */
|
|
32
40
|
export declare const ATOMCODE_LLM_BASE = "https://llm-api.atomgit.com/v1";
|
|
33
41
|
/** provider id(与 `provider-registry.ts` 里 atomcode 条目的 id 逐字一致)。 */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"atomcode-product.d.ts","sourceRoot":"","sources":["../src/atomcode-product.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,oEAAoE;AACpE,eAAO,MAAM,sBAAsB,4BAA4B,CAAA;AAC/D,8BAA8B;AAC9B,eAAO,MAAM,wBAAwB,mCAAmC,CAAA;
|
|
1
|
+
{"version":3,"file":"atomcode-product.d.ts","sourceRoot":"","sources":["../src/atomcode-product.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,oEAAoE;AACpE,eAAO,MAAM,sBAAsB,4BAA4B,CAAA;AAC/D,8BAA8B;AAC9B,eAAO,MAAM,wBAAwB,mCAAmC,CAAA;AAExE;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,UAAU,GAAG,WAAW,GAAG,WAAW,GAAG,GAAG,CAEvF;AACD,iCAAiC;AACjC,eAAO,MAAM,iBAAiB,mCAAmC,CAAA;AAEjE,oEAAoE;AACpE,eAAO,MAAM,oBAAoB,aAAa,CAAA;AAE9C,iEAAiE;AACjE,eAAO,MAAM,mBAAmB,mBAAmB,CAAA;AAEnD,wBAAwB;AACxB,eAAO,MAAM,wBAAwB,QAAS,CAAA;AAE9C,gEAAgE;AAChE,eAAO,MAAM,yBAAyB,OAAQ,CAAA;AAE9C,2CAA2C;AAC3C,eAAO,MAAM,yBAAyB,QAAc,CAAA;AAEpD,kBAAkB;AAClB,MAAM,WAAW,qBAAqB;IACpC,0EAA0E;IAC1E,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;IACnB,aAAa;IACb,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB;;;;;OAKG;IACH,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAA;IAC9B,wDAAwD;IACxD,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAA;IAC/B,uCAAuC;IACvC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;CAC1B;AAED;;;;;;GAMG;AACH,eAAO,MAAM,wBAAwB,EAAE,SAAS,qBAAqB,EAsBpE,CAAA;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,qBAAqB,GAAG,SAAS,CAEvF;AAED,YAAY;AACZ,MAAM,WAAW,eAAe;IAC9B,6DAA6D;IAC7D,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAA;IACvB,6DAA6D;IAC7D,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B,oCAAoC;IACpC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,kCAAkC;IAClC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,2BAA2B;IAC3B,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAA;IACpC,4BAA4B;IAC5B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAA;IAC/B,mBAAmB;IACnB,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAA;IACjC,kBAAkB;IAClB,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAA;IACjC,gBAAgB;IAChB,QAAQ,CAAC,oBAAoB,EAAE,MAAM,CAAA;CACtC;AAED,eAAO,MAAM,QAAQ,EAAE,eAUtB,CAAA;AAED,kCAAkC;AAClC,MAAM,MAAM,iBAAiB,GACzB,YAAY,GACZ,OAAO,GACP,MAAM,GACN,QAAQ,GACR,WAAW,GACX,iBAAiB,GACjB,gBAAgB,GAChB,mBAAmB,CAAA;AAEvB,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,iBAAiB,CAAA;IACvB,6BAA6B;IAC7B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,2BAA2B;IAC3B,MAAM,EAAE,MAAM,CAAA;CACf;AAsBD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GACzC,iBAAiB,CAgEnB;AAWD;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,GAAG,MAAM,CAmBrE"}
|
package/lib/atomcode-product.js
CHANGED
|
@@ -28,6 +28,16 @@
|
|
|
28
28
|
export const ATOMCODE_PLATFORM_BASE = 'https://acs.atomgit.com';
|
|
29
29
|
/** CodingPlan REST API 基址。 */
|
|
30
30
|
export const ATOMCODE_CODINGPLAN_BASE = 'https://api.gitcode.com/api/v5';
|
|
31
|
+
/**
|
|
32
|
+
* 拼接 CodingPlan REST URL。
|
|
33
|
+
*
|
|
34
|
+
* ⚠️ 不能用 `new URL('/coding-plan/…', ATOMCODE_CODINGPLAN_BASE)`:前导斜杠
|
|
35
|
+
* 会丢弃基址里的 `/api/v5`,请求根路径并得到 openresty 404。这里与官方
|
|
36
|
+
* Rust 客户端、Atom2Api 的 `base + path` 语义保持一致。
|
|
37
|
+
*/
|
|
38
|
+
export function atomcodeCodingPlanUrl(path) {
|
|
39
|
+
return new URL(`${ATOMCODE_CODINGPLAN_BASE}/coding-plan/${path}`);
|
|
40
|
+
}
|
|
31
41
|
/** LLM 网关基址(OpenAI 兼容,含 /v1)。 */
|
|
32
42
|
export const ATOMCODE_LLM_BASE = 'https://llm-api.atomgit.com/v1';
|
|
33
43
|
/** provider id(与 `provider-registry.ts` 里 atomcode 条目的 id 逐字一致)。 */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"atomcode-product.js","sourceRoot":"","sources":["../src/atomcode-product.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,oEAAoE;AACpE,MAAM,CAAC,MAAM,sBAAsB,GAAG,yBAAyB,CAAA;AAC/D,8BAA8B;AAC9B,MAAM,CAAC,MAAM,wBAAwB,GAAG,gCAAgC,CAAA;
|
|
1
|
+
{"version":3,"file":"atomcode-product.js","sourceRoot":"","sources":["../src/atomcode-product.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,6 +28,7 @@
|
|
|
28
28
|
* ⚠️ 浏览器**发现**({@link browserCandidates} 一族)与**窗口隐藏**也在这里:
|
|
29
29
|
* 它们回答的是「哪个 chromium 可用」「怎么让它别打扰用户」,同属浏览器设施。
|
|
30
30
|
*/
|
|
31
|
+
import { type ChildProcess, type SpawnOptions } from 'node:child_process';
|
|
31
32
|
/**
|
|
32
33
|
* 从 `PATH` 里的 scoop shim 反推 scoop 的**真实根目录**(Gitee issue IKQ4JN)。
|
|
33
34
|
*
|
|
@@ -222,6 +223,8 @@ export declare function decodeRegistryOutputWithFallback(raw: Buffer | string |
|
|
|
222
223
|
* 确实会登记;② `Data` 候选对**已注册**的绿色版软件仍然有效。
|
|
223
224
|
*/
|
|
224
225
|
export declare function registeredBrowserUserDataRoots(paths?: readonly string[]): string[];
|
|
226
|
+
export declare function defaultBrowserExecutable(): string | undefined;
|
|
227
|
+
export declare function isChromiumFamilyExecutable(executable: string): boolean;
|
|
225
228
|
/**
|
|
226
229
|
* 浏览器可执行文件的**候选链**(按优先级,`ZCODE_CHROME_PATH` 恒排第一)。
|
|
227
230
|
*
|
|
@@ -272,22 +275,31 @@ export declare function browserCandidates(input?: {
|
|
|
272
275
|
*/
|
|
273
276
|
exists?: (path: string) => boolean;
|
|
274
277
|
/**
|
|
275
|
-
*
|
|
278
|
+
* 覆盖用的环境变量名(缺省 `ZCODE_CHROME_PATH`)。
|
|
276
279
|
*
|
|
277
|
-
*
|
|
278
|
-
*
|
|
279
|
-
*
|
|
280
|
+
* ⚠️ 豆包的覆盖变量是 `DSH_DOUBAO_BROWSER_PATH`:链的形状与 trim /
|
|
281
|
+
* isAbsolute 判据必须**只有一份**(渠道间不得各自实现第二遍),差异只
|
|
282
|
+
* 允许剩「变量叫什么」这一个参数。
|
|
280
283
|
*/
|
|
281
|
-
|
|
284
|
+
overrideEnvName?: string;
|
|
285
|
+
/**
|
|
286
|
+
* 渠道**专用**候选(插在环境变量覆盖之后、平台通用链之前)。
|
|
287
|
+
*
|
|
288
|
+
* ⚠️ 只允许放「该渠道自己的客户端内核」这类**渠道专属兜底**(如豆包的
|
|
289
|
+
* Doubao.exe):它的排序契约是「渠道客户端优先于通用链」(存量用户的
|
|
290
|
+
* 解析结果不能漂,见 `tests/unit/doubao-browser-discovery.spec.ts` 的
|
|
291
|
+
* 「豆包客户端内核排在通用 Chrome 兜底之前」)。
|
|
292
|
+
* 通用 chromium 探测**永远不许**出现在这里 —— 出现即「一文件两套
|
|
293
|
+
* 同义判据」复发。
|
|
294
|
+
*/
|
|
295
|
+
channelCandidates?: readonly string[];
|
|
282
296
|
/**
|
|
283
|
-
*
|
|
284
|
-
* 浏览器档**之前**,通用链之前 —— 语义是「这条链自己的覆盖项」。
|
|
297
|
+
* 「系统默认浏览器」解析器(缺省 = {@link defaultBrowserExecutable})。
|
|
285
298
|
*
|
|
286
|
-
*
|
|
287
|
-
*
|
|
288
|
-
* 保留自己的门控纪律(见 doubao 笔记 §5.6)。
|
|
299
|
+
* ⚠️ 注入口存在的原因同 `exists`:默认实现读 Windows 注册表(真实子进程),
|
|
300
|
+
* 单测必须能在不碰注册表的前提下锁死「命中 / 跳过 / 读不到」三分支。
|
|
289
301
|
*/
|
|
290
|
-
|
|
302
|
+
defaultBrowser?: () => string | undefined;
|
|
291
303
|
}): string[];
|
|
292
304
|
/**
|
|
293
305
|
* 浏览器探测的**入参**(与 {@link browserCandidates} 逐字段同义)。
|
|
@@ -302,10 +314,15 @@ export interface BrowserLookup {
|
|
|
302
314
|
env?: Record<string, string | undefined>;
|
|
303
315
|
home?: string;
|
|
304
316
|
exists?: (path: string) => boolean;
|
|
305
|
-
/**
|
|
317
|
+
/**
|
|
318
|
+
* 覆盖用的环境变量名(缺省 `ZCODE_CHROME_PATH`;语义见
|
|
319
|
+
* {@link browserCandidates} 的同名字段)。
|
|
320
|
+
*/
|
|
321
|
+
overrideEnvName?: string;
|
|
322
|
+
/** 渠道专属候选(语义见 {@link browserCandidates} 的同名字段)。 */
|
|
323
|
+
channelCandidates?: readonly string[];
|
|
324
|
+
/** 默认浏览器解析器(语义见 {@link browserCandidates} 的同名字段)。 */
|
|
306
325
|
defaultBrowser?: () => string | undefined;
|
|
307
|
-
/** 渠道专属候选(豆包的覆盖档;透传给 {@link browserCandidates})。 */
|
|
308
|
-
extraCandidates?: readonly string[];
|
|
309
326
|
}
|
|
310
327
|
/**
|
|
311
328
|
* 在候选链里挑第一个**存在**的绝对路径。
|
|
@@ -377,42 +394,6 @@ export declare function browserNotFoundMessage(platform?: NodeJS.Platform, overr
|
|
|
377
394
|
* —— 那会把 `Brave Browser` 之类的路径误伤。
|
|
378
395
|
*/
|
|
379
396
|
export declare function isEdgeExecutable(executable: string): boolean;
|
|
380
|
-
/**
|
|
381
|
-
* 从 Windows 注册表取**系统默认浏览器**的可执行文件路径。
|
|
382
|
-
*
|
|
383
|
-
* ## 为什么搬到这里(2026-11-18,原在 `src/login.ts`)
|
|
384
|
-
*
|
|
385
|
-
* 它原本只服务「无痕开窗」(`openIncognitoWindow` 要绕过 `cmd /c start`
|
|
386
|
-
* 以附加 `--incognito`)。本次修「候选链不认系统默认浏览器」时,候选链
|
|
387
|
-
* {@link browserCandidates} 也需要它 —— 同一份注册表读取**不允许出现第二份**
|
|
388
|
-
* (`AGENTS.md`:「一文件两套同义判据」反模式),故整段搬到浏览器设施模块,
|
|
389
|
-
* `login.ts` 转为 import + re-export(既有 import `src/login.js` 的用例不动)。
|
|
390
|
-
*
|
|
391
|
-
* 读法:`UrlAssociations\https\UserChoice` 拿 ProgId,再读该 ProgId 的
|
|
392
|
-
* `shell\open\command`(用户装的可能是 Chrome / Edge / 360 / Firefox,
|
|
393
|
-
* 路径各不相同,不能硬编码)。
|
|
394
|
-
*
|
|
395
|
-
* ⚠️ 只用 `reg.exe` 而不引第三方依赖:注册表读取是本功能唯一的平台相关调用,
|
|
396
|
-
* 为它加一个 native 依赖不划算(且本插件的 peer 约束不允许)。
|
|
397
|
-
*
|
|
398
|
-
* ⚠️ 非零 / 良性 stderr 输出一律按「读不到」处理(返回 `undefined`),
|
|
399
|
-
* 不得据此断言「用户没有默认浏览器」或污染日志 —— 最多四轮、每轮 5 秒超时,
|
|
400
|
-
* 代价有界。
|
|
401
|
-
*
|
|
402
|
-
* @returns 可执行文件路径;读不到时 `undefined`(调用方静默落回既有候选链)。
|
|
403
|
-
*/
|
|
404
|
-
export declare function defaultBrowserExecutable(): string | undefined;
|
|
405
|
-
/**
|
|
406
|
-
* 该可执行文件是否**确定不是** chromium 内核(静态判据,零探测成本)。
|
|
407
|
-
*
|
|
408
|
-
* 用途:{@link browserCandidates} 的「系统默认浏览器」档只在**确属 chromium**
|
|
409
|
-
* 时入链 —— Firefox 等非 chromium 默认浏览器会被**跳过该档、落回后续候选**
|
|
410
|
-
* (不报错;那是用户的桌面选择,不是部署错误)。
|
|
411
|
-
*
|
|
412
|
-
* ⚠️ 返回 `false` 只代表「没认出是已知的非 chromium」,不代表「确属 chromium」:
|
|
413
|
-
* 未知包装名一律放行(本仓库候选链本来也只敢保「chromium 系可用」这一层)。
|
|
414
|
-
*/
|
|
415
|
-
export declare function isNonChromiumExecutable(executable: string): boolean;
|
|
416
397
|
/**
|
|
417
398
|
* **浏览器部署错误**:本机没配好(找不到可执行文件 / 起不来),
|
|
418
399
|
* 重试一万次也不会成功。
|
|
@@ -685,6 +666,16 @@ export interface ChromiumSessionOptions {
|
|
|
685
666
|
overrideEnvName?: string;
|
|
686
667
|
/** 诊断输出(缺省静默)。 */
|
|
687
668
|
log?: (message: string) => void;
|
|
669
|
+
/**
|
|
670
|
+
* 浏览器进程启动器(缺省 = `node:child_process` 的 `spawn`)。
|
|
671
|
+
*
|
|
672
|
+
* ⚠️⚠️ **测试注入口,生产永远不要传**:`chromium-relay-continuation.spec.ts`
|
|
673
|
+
* 用假 `ChildProcess` 驱动**真实**的 `launch()` 流程(spawn → exit → CDP 轮询
|
|
674
|
+
* → 接续/超时),不真起浏览器。与本模块其它注入口(`resolveBrowser`、
|
|
675
|
+
* `exists`、`windowsRegisteredBrowserPaths` 的 `execFile`)同一纪律:
|
|
676
|
+
* 「不可测的分支会静默烂掉」(IKJKNT 的教训)。
|
|
677
|
+
*/
|
|
678
|
+
spawnImpl?: (command: string, args: readonly string[], options: SpawnOptions) => ChildProcess;
|
|
688
679
|
}
|
|
689
680
|
/**
|
|
690
681
|
* 一个常驻的 chromium 会话:进程 + 调试端口 + CDP 通道。
|
|
@@ -717,13 +708,41 @@ export declare class ChromiumSession {
|
|
|
717
708
|
* 否则「浏览器秒退」要白等满 `readyTimeoutMs`(默认 30 秒)才报错。
|
|
718
709
|
*/
|
|
719
710
|
private spawnFailure;
|
|
711
|
+
/**
|
|
712
|
+
* ★ 中继形态(Chrome++ 等,PR-B / 旧仓 P25):spawn 的外层 exe 已以
|
|
713
|
+
* `code=0` 自行退出,但它拉起的真实 chromium 可能仍在 `--remote-debugging-port`
|
|
714
|
+
* 上就绪(见 `'exit'` 监听处的时序说明)。
|
|
715
|
+
*
|
|
716
|
+
* `true` = 已观察到外层 exe 的 code=0 退出 ⇒ 会话的生死**不再**以外层 exe
|
|
717
|
+
* 为准,改为以「接续的真实例」为准(`relayGone` / `relayPid`)。
|
|
718
|
+
*/
|
|
719
|
+
private relayExit;
|
|
720
|
+
/**
|
|
721
|
+
* 接续的真实例也没了(CDP ws 关闭/出错,或主动 `kill()`)。
|
|
722
|
+
*
|
|
723
|
+
* ⚠️ 只在 `relayExit` 时参与 {@link exited} 判据 —— 正常形态下 `child` 的
|
|
724
|
+
* `'exit'` 事件就是唯一判据,再挂 ws 监听就成了「一套性质两处判据」。
|
|
725
|
+
*/
|
|
726
|
+
private relayGone;
|
|
727
|
+
/**
|
|
728
|
+
* 接续的真实例主进程 pid(尽力而为捕获:`System.getProcessInfo`)。
|
|
729
|
+
*
|
|
730
|
+
* 外层 exe 已死 ⇒ `killProcessTree()` 对 `this.child` 打空;清理真实例
|
|
731
|
+
* 要靠这个 pid(`taskkill /T /F` / 进程组),拿不到时退回 `Browser.close`。
|
|
732
|
+
*/
|
|
733
|
+
private relayPid;
|
|
720
734
|
private readonly log;
|
|
721
735
|
constructor(options?: ChromiumSessionOptions);
|
|
722
736
|
/** 浏览器是否已就绪。 */
|
|
723
737
|
get ready(): boolean;
|
|
724
738
|
/** 调试端口(诊断与 `/json/list` 用)。 */
|
|
725
739
|
get debugPort(): number;
|
|
726
|
-
/**
|
|
740
|
+
/**
|
|
741
|
+
* 浏览器主进程 pid(清理与诊断用)。
|
|
742
|
+
*
|
|
743
|
+
* ⚠️ 中继形态下 `child` 已死:回落到捕获到的 `relayPid`(可能仍是
|
|
744
|
+
* `undefined` —— `System.getProcessInfo` 是异步尽力而为)。
|
|
745
|
+
*/
|
|
727
746
|
get pid(): number | undefined;
|
|
728
747
|
/**
|
|
729
748
|
* 本次会话的临时 profile 目录(即传给 chromium 的 `--user-data-dir`)。
|
|
@@ -745,6 +764,11 @@ export declare class ChromiumSession {
|
|
|
745
764
|
* 监听只在**它自己**退出时同时满足这两条(主动 `kill()` 会先把 `child` 置空,
|
|
746
765
|
* 那一刻 `spawnFailure` 仍是 `undefined`;启动前两者也都为空)。
|
|
747
766
|
*
|
|
767
|
+
* ⚠️ **中继形态(PR-B / P25)**:外层 exe 本来就会 code=0 秒退,它的生死
|
|
768
|
+
* 不再是会话的生死 ⇒ 改判「接续的真实例也没了」(`relayGone`:CDP ws
|
|
769
|
+
* 关闭/出错,含用户自己关掉真实浏览器窗口)。用户关窗时真实例进程树
|
|
770
|
+
* 退出,CDP ws 随之断开 —— 两个事件近同时发生,判据等价。
|
|
771
|
+
*
|
|
748
772
|
* 用途:登录类流程(`magicrew-browser-login.ts`)据它**提前**结束等待 ——
|
|
749
773
|
* 用户关窗后若还耗满 4 分钟预算,用户看到的是「明明关掉了却还在转圈」。
|
|
750
774
|
*/
|
|
@@ -759,6 +783,24 @@ export declare class ChromiumSession {
|
|
|
759
783
|
/** 启动(幂等:并发调用共享同一次启动)。 */
|
|
760
784
|
start(): Promise<void>;
|
|
761
785
|
private launch;
|
|
786
|
+
/**
|
|
787
|
+
* 中继形态:把「接续的真实例也没了」接到 {@link exited}。
|
|
788
|
+
*
|
|
789
|
+
* ⚠️ 只在 `relayExit` 时挂监听:正常形态下 `child` 的 `'exit'` 事件就是
|
|
790
|
+
* `exited` 的唯一判据,再挂 ws 监听就成了「一套性质两处判据」。
|
|
791
|
+
* 两个调用时机(都调,时序谁先都覆盖):`'exit'` 监听内(真实例可能
|
|
792
|
+
* 已先就绪)、ws 建立后(exit 可能先发生)。
|
|
793
|
+
*/
|
|
794
|
+
private watchRelayDeath;
|
|
795
|
+
/**
|
|
796
|
+
* 中继形态:尽力捕获真实例主进程 pid(CDP `System.getProcessInfo`)。
|
|
797
|
+
*
|
|
798
|
+
* 拿到 pid ⇒ `kill()` 的 `killProcessTree()` 能对真实例整棵树
|
|
799
|
+
* `taskkill /T /F` / `kill(-pid)`;拿不到 ⇒ 退回 `Browser.close`(kill 里
|
|
800
|
+
* 已先行发出)+ `dispose()` 的目录删除重试。失败一律吞掉 ——
|
|
801
|
+
* 接续会话不能因诊断性探测失败而中断。
|
|
802
|
+
*/
|
|
803
|
+
private captureRelayPid;
|
|
762
804
|
/**
|
|
763
805
|
* 终止浏览器进程**树**并清理所有 CDP 连接(**保留**临时 profile)。
|
|
764
806
|
*
|
|
@@ -801,6 +843,15 @@ export declare class ChromiumSession {
|
|
|
801
843
|
* 换来确定性的「返回即已终止」。
|
|
802
844
|
*/
|
|
803
845
|
private killProcessTree;
|
|
846
|
+
/**
|
|
847
|
+
* 按 pid 终止浏览器及其**全部子进程**(树)。
|
|
848
|
+
*
|
|
849
|
+
* ⚠ 从 {@link killProcessTree} 抽出(PR-B):中继形态的 `relayPid` 与正常
|
|
850
|
+
* 形态的 `child.pid` 需要**同一份**杀树判据 —— 抄两份必然分叉(方向恒定
|
|
851
|
+
* 是「漏修的那份」,见本文件头部的缺陷表)。行为逐字沿用原实现:
|
|
852
|
+
* `spawnSync`(同步)、`/T /F`、超时 10 秒、POSIX 进程组。
|
|
853
|
+
*/
|
|
854
|
+
private killPidTree;
|
|
804
855
|
/**
|
|
805
856
|
* 关闭浏览器并清理临时 profile。
|
|
806
857
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chromium-session.d.ts","sourceRoot":"","sources":["../src/chromium-session.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;
|
|
1
|
+
{"version":3,"file":"chromium-session.d.ts","sourceRoot":"","sources":["../src/chromium-session.ts"],"names":[],"mappings":"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"}
|