@staticn0va/wigolo 0.3.0 → 0.4.0
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/README.md +67 -2
- package/SKILL.md +149 -0
- package/dist/cache/change-detector.d.ts +7 -0
- package/dist/cache/change-detector.d.ts.map +1 -0
- package/dist/cache/change-detector.js +43 -0
- package/dist/cache/change-detector.js.map +1 -0
- package/dist/cache/diff-summary.d.ts +2 -0
- package/dist/cache/diff-summary.d.ts.map +1 -0
- package/dist/cache/diff-summary.js +87 -0
- package/dist/cache/diff-summary.js.map +1 -0
- package/dist/cache/store.d.ts +2 -0
- package/dist/cache/store.d.ts.map +1 -1
- package/dist/cache/store.js +10 -0
- package/dist/cache/store.js.map +1 -1
- package/dist/cli/auth.d.ts +2 -0
- package/dist/cli/auth.d.ts.map +1 -0
- package/dist/cli/auth.js +95 -0
- package/dist/cli/auth.js.map +1 -0
- package/dist/cli/daemon.d.ts +6 -1
- package/dist/cli/daemon.d.ts.map +1 -1
- package/dist/cli/daemon.js +56 -3
- package/dist/cli/daemon.js.map +1 -1
- package/dist/cli/doctor.d.ts +8 -0
- package/dist/cli/doctor.d.ts.map +1 -0
- package/dist/cli/doctor.js +153 -0
- package/dist/cli/doctor.js.map +1 -0
- package/dist/cli/health.d.ts +1 -1
- package/dist/cli/health.d.ts.map +1 -1
- package/dist/cli/health.js +41 -3
- package/dist/cli/health.js.map +1 -1
- package/dist/cli/index.d.ts +1 -1
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +1 -1
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/plugin.d.ts +5 -0
- package/dist/cli/plugin.d.ts.map +1 -0
- package/dist/cli/plugin.js +188 -0
- package/dist/cli/plugin.js.map +1 -0
- package/dist/cli/shell.d.ts +2 -0
- package/dist/cli/shell.d.ts.map +1 -0
- package/dist/cli/shell.js +86 -0
- package/dist/cli/shell.js.map +1 -0
- package/dist/cli/warmup.d.ts +4 -0
- package/dist/cli/warmup.d.ts.map +1 -1
- package/dist/cli/warmup.js +78 -2
- package/dist/cli/warmup.js.map +1 -1
- package/dist/config.d.ts +10 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +27 -0
- package/dist/config.js.map +1 -1
- package/dist/daemon/health-check.d.ts +16 -0
- package/dist/daemon/health-check.d.ts.map +1 -0
- package/dist/daemon/health-check.js +36 -0
- package/dist/daemon/health-check.js.map +1 -0
- package/dist/daemon/http-server.d.ts +26 -0
- package/dist/daemon/http-server.d.ts.map +1 -0
- package/dist/daemon/http-server.js +282 -0
- package/dist/daemon/http-server.js.map +1 -0
- package/dist/daemon/proxy.d.ts +10 -0
- package/dist/daemon/proxy.d.ts.map +1 -0
- package/dist/daemon/proxy.js +99 -0
- package/dist/daemon/proxy.js.map +1 -0
- package/dist/fetch/action-executor.d.ts +28 -0
- package/dist/fetch/action-executor.d.ts.map +1 -0
- package/dist/fetch/action-executor.js +86 -0
- package/dist/fetch/action-executor.js.map +1 -0
- package/dist/fetch/auth.d.ts +2 -1
- package/dist/fetch/auth.d.ts.map +1 -1
- package/dist/fetch/auth.js +30 -2
- package/dist/fetch/auth.js.map +1 -1
- package/dist/fetch/browser-pool.d.ts +30 -11
- package/dist/fetch/browser-pool.d.ts.map +1 -1
- package/dist/fetch/browser-pool.js +165 -49
- package/dist/fetch/browser-pool.js.map +1 -1
- package/dist/fetch/browser-selector.d.ts +17 -0
- package/dist/fetch/browser-selector.d.ts.map +1 -0
- package/dist/fetch/browser-selector.js +70 -0
- package/dist/fetch/browser-selector.js.map +1 -0
- package/dist/fetch/browser-types.d.ts +3 -0
- package/dist/fetch/browser-types.d.ts.map +1 -0
- package/dist/fetch/browser-types.js +45 -0
- package/dist/fetch/browser-types.js.map +1 -0
- package/dist/fetch/cdp-client.d.ts +9 -0
- package/dist/fetch/cdp-client.d.ts.map +1 -0
- package/dist/fetch/cdp-client.js +90 -0
- package/dist/fetch/cdp-client.js.map +1 -0
- package/dist/fetch/router.d.ts +4 -1
- package/dist/fetch/router.d.ts.map +1 -1
- package/dist/fetch/router.js +8 -2
- package/dist/fetch/router.js.map +1 -1
- package/dist/index.js +39 -3
- package/dist/index.js.map +1 -1
- package/dist/instructions.d.ts +26 -0
- package/dist/instructions.d.ts.map +1 -0
- package/dist/instructions.js +101 -0
- package/dist/instructions.js.map +1 -0
- package/dist/logger.d.ts +1 -1
- package/dist/logger.d.ts.map +1 -1
- package/dist/plugins/loader.d.ts +20 -0
- package/dist/plugins/loader.d.ts.map +1 -0
- package/dist/plugins/loader.js +162 -0
- package/dist/plugins/loader.js.map +1 -0
- package/dist/plugins/registry.d.ts +26 -0
- package/dist/plugins/registry.d.ts.map +1 -0
- package/dist/plugins/registry.js +68 -0
- package/dist/plugins/registry.js.map +1 -0
- package/dist/plugins/validate.d.ts +9 -0
- package/dist/plugins/validate.d.ts.map +1 -0
- package/dist/plugins/validate.js +70 -0
- package/dist/plugins/validate.js.map +1 -0
- package/dist/repl/commands/cache.d.ts +4 -0
- package/dist/repl/commands/cache.d.ts.map +1 -0
- package/dist/repl/commands/cache.js +44 -0
- package/dist/repl/commands/cache.js.map +1 -0
- package/dist/repl/commands/crawl.d.ts +7 -0
- package/dist/repl/commands/crawl.d.ts.map +1 -0
- package/dist/repl/commands/crawl.js +42 -0
- package/dist/repl/commands/crawl.js.map +1 -0
- package/dist/repl/commands/extract.d.ts +5 -0
- package/dist/repl/commands/extract.d.ts.map +1 -0
- package/dist/repl/commands/extract.js +37 -0
- package/dist/repl/commands/extract.js.map +1 -0
- package/dist/repl/commands/fetch.d.ts +5 -0
- package/dist/repl/commands/fetch.d.ts.map +1 -0
- package/dist/repl/commands/fetch.js +53 -0
- package/dist/repl/commands/fetch.js.map +1 -0
- package/dist/repl/commands/search.d.ts +5 -0
- package/dist/repl/commands/search.d.ts.map +1 -0
- package/dist/repl/commands/search.js +62 -0
- package/dist/repl/commands/search.js.map +1 -0
- package/dist/repl/commands/types.d.ts +9 -0
- package/dist/repl/commands/types.d.ts.map +1 -0
- package/dist/repl/commands/types.js +2 -0
- package/dist/repl/commands/types.js.map +1 -0
- package/dist/repl/formatters.d.ts +10 -0
- package/dist/repl/formatters.d.ts.map +1 -0
- package/dist/repl/formatters.js +209 -0
- package/dist/repl/formatters.js.map +1 -0
- package/dist/repl/parser.d.ts +9 -0
- package/dist/repl/parser.d.ts.map +1 -0
- package/dist/repl/parser.js +84 -0
- package/dist/repl/parser.js.map +1 -0
- package/dist/repl/shell.d.ts +8 -0
- package/dist/repl/shell.d.ts.map +1 -0
- package/dist/repl/shell.js +156 -0
- package/dist/repl/shell.js.map +1 -0
- package/dist/search/context-formatter.d.ts +3 -0
- package/dist/search/context-formatter.d.ts.map +1 -0
- package/dist/search/context-formatter.js +56 -0
- package/dist/search/context-formatter.js.map +1 -0
- package/dist/search/engines/bing.d.ts +1 -0
- package/dist/search/engines/bing.d.ts.map +1 -1
- package/dist/search/engines/bing.js +27 -1
- package/dist/search/engines/bing.js.map +1 -1
- package/dist/searxng/bootstrap.d.ts +30 -0
- package/dist/searxng/bootstrap.d.ts.map +1 -1
- package/dist/searxng/bootstrap.js +150 -23
- package/dist/searxng/bootstrap.js.map +1 -1
- package/dist/searxng/process.d.ts +13 -1
- package/dist/searxng/process.d.ts.map +1 -1
- package/dist/searxng/process.js +52 -2
- package/dist/searxng/process.js.map +1 -1
- package/dist/server/backend-status.d.ts +11 -0
- package/dist/server/backend-status.d.ts.map +1 -0
- package/dist/server/backend-status.js +27 -0
- package/dist/server/backend-status.js.map +1 -0
- package/dist/server.d.ts +17 -0
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +228 -91
- package/dist/server.js.map +1 -1
- package/dist/tools/cache.d.ts +2 -1
- package/dist/tools/cache.d.ts.map +1 -1
- package/dist/tools/cache.js +56 -1
- package/dist/tools/cache.js.map +1 -1
- package/dist/tools/fetch.d.ts.map +1 -1
- package/dist/tools/fetch.js +16 -1
- package/dist/tools/fetch.js.map +1 -1
- package/dist/tools/search.d.ts +2 -1
- package/dist/tools/search.d.ts.map +1 -1
- package/dist/tools/search.js +26 -4
- package/dist/tools/search.js.map +1 -1
- package/dist/types.d.ts +49 -0
- package/dist/types.d.ts.map +1 -1
- package/package.json +36 -3
|
@@ -1,28 +1,47 @@
|
|
|
1
1
|
import { type BrowserContext } from 'playwright';
|
|
2
|
-
import
|
|
2
|
+
import { type SelectionStrategy } from './browser-selector.js';
|
|
3
|
+
import type { RawFetchResult, BrowserType, BrowserAction } from '../types.js';
|
|
3
4
|
export interface BrowserFetchOptions {
|
|
4
5
|
timeoutMs?: number;
|
|
5
6
|
storageStatePath?: string;
|
|
6
7
|
userDataDir?: string;
|
|
7
8
|
headers?: Record<string, string>;
|
|
8
9
|
screenshot?: boolean;
|
|
10
|
+
actions?: BrowserAction[];
|
|
11
|
+
cdpUrl?: string;
|
|
12
|
+
browserType?: BrowserType;
|
|
9
13
|
}
|
|
10
14
|
export interface BrowserPoolOptions {
|
|
11
15
|
browserType?: BrowserType;
|
|
12
16
|
}
|
|
13
|
-
export
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
17
|
+
export interface MultiBrowserPoolOptions {
|
|
18
|
+
browserTypes?: BrowserType[];
|
|
19
|
+
selectionStrategy?: SelectionStrategy;
|
|
20
|
+
}
|
|
21
|
+
export interface PoolTypeStat {
|
|
22
|
+
type: BrowserType;
|
|
23
|
+
activeCount: number;
|
|
24
|
+
pooledCount: number;
|
|
25
|
+
}
|
|
26
|
+
export declare class MultiBrowserPool {
|
|
27
|
+
private readonly pools;
|
|
28
|
+
private readonly selector;
|
|
29
|
+
private readonly configuredTypes;
|
|
19
30
|
private shutdownCalled;
|
|
20
|
-
|
|
21
|
-
|
|
31
|
+
constructor(options?: MultiBrowserPoolOptions);
|
|
32
|
+
getConfiguredTypes(): BrowserType[];
|
|
33
|
+
getStats(): PoolTypeStat[];
|
|
34
|
+
protected resolveType(requested?: BrowserType, url?: string): BrowserType;
|
|
22
35
|
private launchBrowser;
|
|
23
|
-
|
|
24
|
-
|
|
36
|
+
protected acquireForType(type: BrowserType): Promise<BrowserContext>;
|
|
37
|
+
protected releaseForType(type: BrowserType, ctx: BrowserContext): void;
|
|
25
38
|
fetchWithBrowser(url: string, options?: BrowserFetchOptions): Promise<RawFetchResult>;
|
|
26
39
|
shutdown(): Promise<void>;
|
|
27
40
|
}
|
|
41
|
+
export declare class BrowserPool extends MultiBrowserPool {
|
|
42
|
+
private readonly singleType;
|
|
43
|
+
constructor(options?: BrowserPoolOptions);
|
|
44
|
+
acquire(): Promise<BrowserContext>;
|
|
45
|
+
release(ctx: BrowserContext): void;
|
|
46
|
+
}
|
|
28
47
|
//# sourceMappingURL=browser-pool.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser-pool.d.ts","sourceRoot":"","sources":["../../src/fetch/browser-pool.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2C,KAAK,cAAc,EAAE,MAAM,YAAY,CAAC;AAG1F,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"browser-pool.d.ts","sourceRoot":"","sources":["../../src/fetch/browser-pool.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2C,KAAK,cAAc,EAAE,MAAM,YAAY,CAAC;AAG1F,OAAO,EAAmB,KAAK,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAEhF,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAgB,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5F,MAAM,WAAW,mBAAmB;IAClC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAED,MAAM,WAAW,kBAAkB;IACjC,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAED,MAAM,WAAW,uBAAuB;IACtC,YAAY,CAAC,EAAE,WAAW,EAAE,CAAC;IAC7B,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;CACvC;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,WAAW,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;CACrB;AAoBD,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAoC;IAC1D,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkB;IAC3C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAgB;IAChD,OAAO,CAAC,cAAc,CAAS;gBAEnB,OAAO,CAAC,EAAE,uBAAuB;IAyB7C,kBAAkB,IAAI,WAAW,EAAE;IAInC,QAAQ,IAAI,YAAY,EAAE;IAW1B,SAAS,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,WAAW;YAuB3D,aAAa;cAUX,cAAc,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC;IA0B1E,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,cAAc,GAAG,IAAI;IA0BhE,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,mBAAwB,GAAG,OAAO,CAAC,cAAc,CAAC;IA+FzF,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAuBhC;AAGD,qBAAa,WAAY,SAAQ,gBAAgB;IAC/C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAc;gBAE7B,OAAO,CAAC,EAAE,kBAAkB;IAQlC,OAAO,IAAI,OAAO,CAAC,cAAc,CAAC;IAIxC,OAAO,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;CAGnC"}
|
|
@@ -1,73 +1,160 @@
|
|
|
1
1
|
import { chromium, firefox, webkit } from 'playwright';
|
|
2
2
|
import { getConfig } from '../config.js';
|
|
3
3
|
import { createLogger } from '../logger.js';
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
4
|
+
import { BrowserSelector } from './browser-selector.js';
|
|
5
|
+
import { executeActions } from './action-executor.js';
|
|
6
|
+
const log = createLogger('fetch');
|
|
7
|
+
function getLauncher(type) {
|
|
8
|
+
switch (type) {
|
|
9
|
+
case 'firefox': return firefox;
|
|
10
|
+
case 'webkit': return webkit;
|
|
11
|
+
default: return chromium;
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
export class MultiBrowserPool {
|
|
15
|
+
pools = new Map();
|
|
16
|
+
selector;
|
|
17
|
+
configuredTypes;
|
|
10
18
|
shutdownCalled = false;
|
|
11
|
-
browserType;
|
|
12
19
|
constructor(options) {
|
|
13
|
-
|
|
20
|
+
let types = options?.browserTypes ?? ['chromium'];
|
|
21
|
+
if (types.length === 0) {
|
|
22
|
+
log.warn('empty browserTypes, defaulting to chromium');
|
|
23
|
+
types = ['chromium'];
|
|
24
|
+
}
|
|
25
|
+
this.configuredTypes = [...types];
|
|
26
|
+
this.selector = new BrowserSelector(types, options?.selectionStrategy ?? 'round-robin');
|
|
27
|
+
for (const type of types) {
|
|
28
|
+
this.pools.set(type, {
|
|
29
|
+
browser: null,
|
|
30
|
+
pool: [],
|
|
31
|
+
activeCount: 0,
|
|
32
|
+
waitQueue: [],
|
|
33
|
+
idleTimers: new Map(),
|
|
34
|
+
});
|
|
35
|
+
}
|
|
36
|
+
log.info('multi-browser pool initialized', {
|
|
37
|
+
types: this.configuredTypes,
|
|
38
|
+
strategy: options?.selectionStrategy ?? 'round-robin',
|
|
39
|
+
});
|
|
40
|
+
}
|
|
41
|
+
getConfiguredTypes() {
|
|
42
|
+
return [...this.configuredTypes];
|
|
43
|
+
}
|
|
44
|
+
getStats() {
|
|
45
|
+
return this.configuredTypes.map(type => {
|
|
46
|
+
const p = this.pools.get(type);
|
|
47
|
+
return {
|
|
48
|
+
type,
|
|
49
|
+
activeCount: p.activeCount,
|
|
50
|
+
pooledCount: p.pool.length,
|
|
51
|
+
};
|
|
52
|
+
});
|
|
14
53
|
}
|
|
15
|
-
|
|
16
|
-
if (
|
|
17
|
-
|
|
18
|
-
: this.browserType === 'webkit' ? webkit
|
|
19
|
-
: chromium;
|
|
20
|
-
this.browser = await launcher.launch({ headless: true });
|
|
54
|
+
resolveType(requested, url) {
|
|
55
|
+
if (requested && this.pools.has(requested)) {
|
|
56
|
+
return requested;
|
|
21
57
|
}
|
|
22
|
-
|
|
58
|
+
if (requested && !this.pools.has(requested)) {
|
|
59
|
+
log.warn('requested browser type not configured, falling back', {
|
|
60
|
+
requested,
|
|
61
|
+
available: this.configuredTypes,
|
|
62
|
+
});
|
|
63
|
+
return this.configuredTypes[0];
|
|
64
|
+
}
|
|
65
|
+
// For hostname-hash strategy, use the URL hostname for deterministic selection
|
|
66
|
+
if (url && this.selector.getStrategy() === 'hostname-hash') {
|
|
67
|
+
try {
|
|
68
|
+
const hostname = new URL(url).hostname;
|
|
69
|
+
return this.selector.selectForHostname(hostname);
|
|
70
|
+
}
|
|
71
|
+
catch {
|
|
72
|
+
return this.selector.select();
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
return this.selector.select();
|
|
23
76
|
}
|
|
24
|
-
async
|
|
77
|
+
async launchBrowser(type) {
|
|
78
|
+
const typePool = this.pools.get(type);
|
|
79
|
+
if (!typePool.browser) {
|
|
80
|
+
const launcher = getLauncher(type);
|
|
81
|
+
log.debug('launching browser', { type });
|
|
82
|
+
typePool.browser = await launcher.launch({ headless: true });
|
|
83
|
+
}
|
|
84
|
+
return typePool.browser;
|
|
85
|
+
}
|
|
86
|
+
async acquireForType(type) {
|
|
25
87
|
const config = getConfig();
|
|
26
88
|
const maxBrowsers = config.maxBrowsers;
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
const
|
|
89
|
+
const typePool = this.pools.get(type);
|
|
90
|
+
if (typePool.pool.length > 0) {
|
|
91
|
+
const ctx = typePool.pool.pop();
|
|
92
|
+
const timer = typePool.idleTimers.get(ctx);
|
|
30
93
|
if (timer !== undefined) {
|
|
31
94
|
clearTimeout(timer);
|
|
32
|
-
|
|
95
|
+
typePool.idleTimers.delete(ctx);
|
|
33
96
|
}
|
|
34
97
|
return ctx;
|
|
35
98
|
}
|
|
36
|
-
if (
|
|
37
|
-
|
|
38
|
-
const browser = await this.launchBrowser();
|
|
99
|
+
if (typePool.activeCount < maxBrowsers) {
|
|
100
|
+
typePool.activeCount++;
|
|
101
|
+
const browser = await this.launchBrowser(type);
|
|
39
102
|
return browser.newContext();
|
|
40
103
|
}
|
|
41
104
|
return new Promise((resolve) => {
|
|
42
|
-
|
|
105
|
+
typePool.waitQueue.push(resolve);
|
|
43
106
|
});
|
|
44
107
|
}
|
|
45
|
-
|
|
108
|
+
releaseForType(type, ctx) {
|
|
46
109
|
const config = getConfig();
|
|
47
110
|
const idleTimeoutMs = config.browserIdleTimeoutMs;
|
|
48
|
-
|
|
49
|
-
|
|
111
|
+
const typePool = this.pools.get(type);
|
|
112
|
+
if (typePool.waitQueue.length > 0) {
|
|
113
|
+
const resolve = typePool.waitQueue.shift();
|
|
50
114
|
resolve(ctx);
|
|
51
115
|
return;
|
|
52
116
|
}
|
|
53
|
-
|
|
117
|
+
typePool.pool.push(ctx);
|
|
54
118
|
const timer = setTimeout(() => {
|
|
55
|
-
const idx =
|
|
119
|
+
const idx = typePool.pool.indexOf(ctx);
|
|
56
120
|
if (idx !== -1) {
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
121
|
+
typePool.pool.splice(idx, 1);
|
|
122
|
+
typePool.idleTimers.delete(ctx);
|
|
123
|
+
typePool.activeCount = Math.max(0, typePool.activeCount - 1);
|
|
60
124
|
ctx.close().catch(() => { });
|
|
61
125
|
}
|
|
62
126
|
}, idleTimeoutMs);
|
|
63
|
-
|
|
127
|
+
typePool.idleTimers.set(ctx, timer);
|
|
64
128
|
}
|
|
65
129
|
async fetchWithBrowser(url, options = {}) {
|
|
66
130
|
const config = getConfig();
|
|
67
|
-
const logger = createLogger('fetch');
|
|
68
131
|
const navTimeoutMs = options.timeoutMs ?? config.playwrightNavTimeoutMs;
|
|
69
132
|
const loadTimeoutMs = config.playwrightLoadTimeoutMs;
|
|
70
|
-
|
|
133
|
+
let ctx;
|
|
134
|
+
let cdpBrowser = null;
|
|
135
|
+
let resolvedType;
|
|
136
|
+
if (options.cdpUrl) {
|
|
137
|
+
// CDP is always Chromium
|
|
138
|
+
resolvedType = 'chromium';
|
|
139
|
+
try {
|
|
140
|
+
log.info('connecting via CDP', { cdpUrl: options.cdpUrl });
|
|
141
|
+
cdpBrowser = await chromium.connectOverCDP(options.cdpUrl);
|
|
142
|
+
const contexts = cdpBrowser.contexts();
|
|
143
|
+
ctx = contexts.length > 0 ? contexts[0] : await cdpBrowser.newContext();
|
|
144
|
+
}
|
|
145
|
+
catch (err) {
|
|
146
|
+
log.warn('CDP connection failed, falling back to launch', {
|
|
147
|
+
cdpUrl: options.cdpUrl,
|
|
148
|
+
error: err instanceof Error ? err.message : String(err),
|
|
149
|
+
});
|
|
150
|
+
ctx = await this.acquireForType(resolvedType);
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
else {
|
|
154
|
+
resolvedType = this.resolveType(options.browserType, url);
|
|
155
|
+
log.debug('fetching with browser', { url, type: resolvedType });
|
|
156
|
+
ctx = await this.acquireForType(resolvedType);
|
|
157
|
+
}
|
|
71
158
|
const page = await ctx.newPage();
|
|
72
159
|
if (options.headers) {
|
|
73
160
|
await page.setExtraHTTPHeaders(options.headers);
|
|
@@ -92,8 +179,11 @@ export class BrowserPool {
|
|
|
92
179
|
await page.waitForLoadState('networkidle', { timeout: loadTimeoutMs });
|
|
93
180
|
}
|
|
94
181
|
catch {
|
|
95
|
-
|
|
96
|
-
|
|
182
|
+
log.debug('networkidle timeout, using page content as-is', { url, type: resolvedType });
|
|
183
|
+
}
|
|
184
|
+
let actionResults;
|
|
185
|
+
if (options.actions && options.actions.length > 0) {
|
|
186
|
+
actionResults = await executeActions(page, options.actions);
|
|
97
187
|
}
|
|
98
188
|
const html = await page.content();
|
|
99
189
|
let screenshotBase64;
|
|
@@ -110,29 +200,55 @@ export class BrowserPool {
|
|
|
110
200
|
method: 'playwright',
|
|
111
201
|
headers: responseHeaders,
|
|
112
202
|
screenshot: screenshotBase64,
|
|
203
|
+
actionResults,
|
|
113
204
|
};
|
|
114
205
|
}
|
|
115
206
|
finally {
|
|
116
207
|
await page.close();
|
|
117
|
-
|
|
208
|
+
if (cdpBrowser) {
|
|
209
|
+
await cdpBrowser.close().catch(() => { });
|
|
210
|
+
}
|
|
211
|
+
else {
|
|
212
|
+
this.releaseForType(resolvedType, ctx);
|
|
213
|
+
}
|
|
118
214
|
}
|
|
119
215
|
}
|
|
120
216
|
async shutdown() {
|
|
121
217
|
if (this.shutdownCalled)
|
|
122
218
|
return;
|
|
123
219
|
this.shutdownCalled = true;
|
|
124
|
-
for (const [,
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
220
|
+
for (const [type, typePool] of this.pools) {
|
|
221
|
+
for (const [, timer] of typePool.idleTimers) {
|
|
222
|
+
clearTimeout(timer);
|
|
223
|
+
}
|
|
224
|
+
typePool.idleTimers.clear();
|
|
225
|
+
const closePromises = typePool.pool.map(ctx => ctx.close().catch(() => { }));
|
|
226
|
+
typePool.pool = [];
|
|
227
|
+
await Promise.all(closePromises);
|
|
228
|
+
if (typePool.browser) {
|
|
229
|
+
await typePool.browser.close().catch(() => { });
|
|
230
|
+
typePool.browser = null;
|
|
231
|
+
}
|
|
232
|
+
typePool.activeCount = 0;
|
|
233
|
+
log.debug('browser pool shut down', { type });
|
|
134
234
|
}
|
|
135
|
-
|
|
235
|
+
}
|
|
236
|
+
}
|
|
237
|
+
// Backwards-compatible wrapper for existing code
|
|
238
|
+
export class BrowserPool extends MultiBrowserPool {
|
|
239
|
+
singleType;
|
|
240
|
+
constructor(options) {
|
|
241
|
+
const type = options?.browserType ?? 'chromium';
|
|
242
|
+
super({
|
|
243
|
+
browserTypes: [type],
|
|
244
|
+
});
|
|
245
|
+
this.singleType = type;
|
|
246
|
+
}
|
|
247
|
+
async acquire() {
|
|
248
|
+
return this.acquireForType(this.singleType);
|
|
249
|
+
}
|
|
250
|
+
release(ctx) {
|
|
251
|
+
this.releaseForType(this.singleType, ctx);
|
|
136
252
|
}
|
|
137
253
|
}
|
|
138
254
|
//# sourceMappingURL=browser-pool.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser-pool.js","sourceRoot":"","sources":["../../src/fetch/browser-pool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAqC,MAAM,YAAY,CAAC;AAC1F,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"browser-pool.js","sourceRoot":"","sources":["../../src/fetch/browser-pool.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import type { BrowserType } from '../types.js';
|
|
2
|
+
export type SelectionStrategy = 'round-robin' | 'hostname-hash' | 'random';
|
|
3
|
+
export declare class BrowserSelector {
|
|
4
|
+
private readonly types;
|
|
5
|
+
private readonly strategy;
|
|
6
|
+
private roundRobinIndex;
|
|
7
|
+
constructor(types: BrowserType[], strategy?: SelectionStrategy);
|
|
8
|
+
select(): BrowserType;
|
|
9
|
+
selectForHostname(hostname: string): BrowserType;
|
|
10
|
+
getTypes(): BrowserType[];
|
|
11
|
+
getStrategy(): SelectionStrategy;
|
|
12
|
+
reset(): void;
|
|
13
|
+
private selectRoundRobin;
|
|
14
|
+
private selectRandom;
|
|
15
|
+
private selectByHostnameHash;
|
|
16
|
+
}
|
|
17
|
+
//# sourceMappingURL=browser-selector.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"browser-selector.d.ts","sourceRoot":"","sources":["../../src/fetch/browser-selector.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAI/C,MAAM,MAAM,iBAAiB,GAAG,aAAa,GAAG,eAAe,GAAG,QAAQ,CAAC;AAY3E,qBAAa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgB;IACtC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoB;IAC7C,OAAO,CAAC,eAAe,CAAK;gBAEhB,KAAK,EAAE,WAAW,EAAE,EAAE,QAAQ,CAAC,EAAE,iBAAiB;IAY9D,MAAM,IAAI,WAAW;IAcrB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,WAAW;IAOhD,QAAQ,IAAI,WAAW,EAAE;IAIzB,WAAW,IAAI,iBAAiB;IAIhC,KAAK,IAAI,IAAI;IAIb,OAAO,CAAC,gBAAgB;IAMxB,OAAO,CAAC,YAAY;IAKpB,OAAO,CAAC,oBAAoB;CAK7B"}
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
import { createLogger } from '../logger.js';
|
|
2
|
+
const log = createLogger('fetch');
|
|
3
|
+
function hashString(str) {
|
|
4
|
+
let hash = 0;
|
|
5
|
+
for (let i = 0; i < str.length; i++) {
|
|
6
|
+
const char = str.charCodeAt(i);
|
|
7
|
+
hash = ((hash << 5) - hash) + char;
|
|
8
|
+
hash = hash & hash; // Convert to 32-bit integer
|
|
9
|
+
}
|
|
10
|
+
return Math.abs(hash);
|
|
11
|
+
}
|
|
12
|
+
export class BrowserSelector {
|
|
13
|
+
types;
|
|
14
|
+
strategy;
|
|
15
|
+
roundRobinIndex = 0;
|
|
16
|
+
constructor(types, strategy) {
|
|
17
|
+
if (types.length === 0) {
|
|
18
|
+
throw new Error('BrowserSelector requires at least one browser type');
|
|
19
|
+
}
|
|
20
|
+
this.types = [...types];
|
|
21
|
+
this.strategy = strategy ?? 'round-robin';
|
|
22
|
+
log.debug('browser selector initialized', {
|
|
23
|
+
types: this.types,
|
|
24
|
+
strategy: this.strategy,
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
select() {
|
|
28
|
+
switch (this.strategy) {
|
|
29
|
+
case 'round-robin':
|
|
30
|
+
return this.selectRoundRobin();
|
|
31
|
+
case 'random':
|
|
32
|
+
return this.selectRandom();
|
|
33
|
+
case 'hostname-hash':
|
|
34
|
+
// Without a hostname, fall back to round-robin
|
|
35
|
+
return this.selectRoundRobin();
|
|
36
|
+
default:
|
|
37
|
+
return this.selectRoundRobin();
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
selectForHostname(hostname) {
|
|
41
|
+
if (this.strategy === 'hostname-hash' && hostname) {
|
|
42
|
+
return this.selectByHostnameHash(hostname);
|
|
43
|
+
}
|
|
44
|
+
return this.select();
|
|
45
|
+
}
|
|
46
|
+
getTypes() {
|
|
47
|
+
return [...this.types];
|
|
48
|
+
}
|
|
49
|
+
getStrategy() {
|
|
50
|
+
return this.strategy;
|
|
51
|
+
}
|
|
52
|
+
reset() {
|
|
53
|
+
this.roundRobinIndex = 0;
|
|
54
|
+
}
|
|
55
|
+
selectRoundRobin() {
|
|
56
|
+
const type = this.types[this.roundRobinIndex % this.types.length];
|
|
57
|
+
this.roundRobinIndex++;
|
|
58
|
+
return type;
|
|
59
|
+
}
|
|
60
|
+
selectRandom() {
|
|
61
|
+
const index = Math.floor(Math.random() * this.types.length);
|
|
62
|
+
return this.types[index];
|
|
63
|
+
}
|
|
64
|
+
selectByHostnameHash(hostname) {
|
|
65
|
+
const hash = hashString(hostname);
|
|
66
|
+
const index = hash % this.types.length;
|
|
67
|
+
return this.types[index];
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
//# sourceMappingURL=browser-selector.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"browser-selector.js","sourceRoot":"","sources":["../../src/fetch/browser-selector.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"browser-types.d.ts","sourceRoot":"","sources":["../../src/fetch/browser-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAW/C,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,WAAW,EAAE,CA6CjF"}
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
const VALID_BROWSER_TYPES = new Set(['chromium', 'firefox', 'webkit']);
|
|
2
|
+
const DEFAULT_BROWSER_TYPES = ['chromium'];
|
|
3
|
+
function warn(msg, data) {
|
|
4
|
+
const line = JSON.stringify({ ts: new Date().toISOString(), level: 'warn', msg, module: 'fetch', data });
|
|
5
|
+
process.stderr.write(line + '\n');
|
|
6
|
+
}
|
|
7
|
+
export function parseBrowserTypes(input) {
|
|
8
|
+
if (!input || typeof input !== 'string') {
|
|
9
|
+
return [...DEFAULT_BROWSER_TYPES];
|
|
10
|
+
}
|
|
11
|
+
const trimmed = input.trim();
|
|
12
|
+
if (trimmed.length === 0) {
|
|
13
|
+
return [...DEFAULT_BROWSER_TYPES];
|
|
14
|
+
}
|
|
15
|
+
const parts = trimmed
|
|
16
|
+
.split(',')
|
|
17
|
+
.map(s => s.trim())
|
|
18
|
+
.filter(s => s.length > 0);
|
|
19
|
+
if (parts.length === 0) {
|
|
20
|
+
return [...DEFAULT_BROWSER_TYPES];
|
|
21
|
+
}
|
|
22
|
+
const seen = new Set();
|
|
23
|
+
const valid = [];
|
|
24
|
+
const invalid = [];
|
|
25
|
+
for (const part of parts) {
|
|
26
|
+
if (!VALID_BROWSER_TYPES.has(part)) {
|
|
27
|
+
invalid.push(part);
|
|
28
|
+
continue;
|
|
29
|
+
}
|
|
30
|
+
if (seen.has(part)) {
|
|
31
|
+
continue;
|
|
32
|
+
}
|
|
33
|
+
seen.add(part);
|
|
34
|
+
valid.push(part);
|
|
35
|
+
}
|
|
36
|
+
if (invalid.length > 0) {
|
|
37
|
+
warn('ignored invalid browser types', { invalid, valid: [...valid] });
|
|
38
|
+
}
|
|
39
|
+
if (valid.length === 0) {
|
|
40
|
+
warn('no valid browser types found, falling back to chromium', { input });
|
|
41
|
+
return [...DEFAULT_BROWSER_TYPES];
|
|
42
|
+
}
|
|
43
|
+
return valid;
|
|
44
|
+
}
|
|
45
|
+
//# sourceMappingURL=browser-types.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"browser-types.js","sourceRoot":"","sources":["../../src/fetch/browser-types.ts"],"names":[],"mappings":"AAEA,MAAM,mBAAmB,GAAwB,IAAI,GAAG,CAAC,CAAC,UAAU,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;AAE5F,MAAM,qBAAqB,GAAkB,CAAC,UAAU,CAAC,CAAC;AAE1D,SAAS,IAAI,CAAC,GAAW,EAAE,IAA6B;IACtD,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IACzG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC;AACpC,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,KAAgC;IAChE,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACxC,OAAO,CAAC,GAAG,qBAAqB,CAAC,CAAC;IACpC,CAAC;IAED,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC7B,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,CAAC,GAAG,qBAAqB,CAAC,CAAC;IACpC,CAAC;IAED,MAAM,KAAK,GAAG,OAAO;SAClB,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;SAClB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAE7B,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,CAAC,GAAG,qBAAqB,CAAC,CAAC;IACpC,CAAC;IAED,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,MAAM,KAAK,GAAkB,EAAE,CAAC;IAChC,MAAM,OAAO,GAAa,EAAE,CAAC;IAE7B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACnC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACnB,SAAS;QACX,CAAC;QACD,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACnB,SAAS;QACX,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACf,KAAK,CAAC,IAAI,CAAC,IAAmB,CAAC,CAAC;IAClC,CAAC;IAED,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,IAAI,CAAC,+BAA+B,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC;IACxE,CAAC;IAED,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,IAAI,CAAC,wDAAwD,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QAC1E,OAAO,CAAC,GAAG,qBAAqB,CAAC,CAAC;IACpC,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { CDPSession } from '../types.js';
|
|
2
|
+
export interface DiscoverOptions {
|
|
3
|
+
timeoutMs?: number;
|
|
4
|
+
filterPages?: boolean;
|
|
5
|
+
}
|
|
6
|
+
export declare function parseCDPResponse(raw: string): CDPSession[];
|
|
7
|
+
export declare function discoverSessions(cdpUrl: string, options?: DiscoverOptions): Promise<CDPSession[]>;
|
|
8
|
+
export declare function isCDPReachable(cdpUrl: string, timeoutMs?: number): Promise<boolean>;
|
|
9
|
+
//# sourceMappingURL=cdp-client.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cdp-client.d.ts","sourceRoot":"","sources":["../../src/fetch/cdp-client.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAM9C,MAAM,WAAW,eAAe;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAiCD,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,EAAE,CA2B1D;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,eAAe,GACxB,OAAO,CAAC,UAAU,EAAE,CAAC,CA6BvB;AAED,wBAAsB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,SAAqB,GAAG,OAAO,CAAC,OAAO,CAAC,CAQrG"}
|
|
@@ -0,0 +1,90 @@
|
|
|
1
|
+
import * as http from 'node:http';
|
|
2
|
+
import { createLogger } from '../logger.js';
|
|
3
|
+
const log = createLogger('fetch');
|
|
4
|
+
const DEFAULT_TIMEOUT_MS = 3000;
|
|
5
|
+
function httpGet(url, timeoutMs) {
|
|
6
|
+
return new Promise((resolve, reject) => {
|
|
7
|
+
const req = http.get(url, { timeout: timeoutMs }, (res) => {
|
|
8
|
+
let body = '';
|
|
9
|
+
res.on('data', (chunk) => { body += chunk; });
|
|
10
|
+
res.on('end', () => {
|
|
11
|
+
resolve({ statusCode: res.statusCode ?? 0, body });
|
|
12
|
+
});
|
|
13
|
+
});
|
|
14
|
+
req.on('error', (err) => {
|
|
15
|
+
reject(err);
|
|
16
|
+
});
|
|
17
|
+
req.on('timeout', () => {
|
|
18
|
+
req.destroy();
|
|
19
|
+
reject(new Error(`CDP request timed out after ${timeoutMs}ms`));
|
|
20
|
+
});
|
|
21
|
+
});
|
|
22
|
+
}
|
|
23
|
+
export function parseCDPResponse(raw) {
|
|
24
|
+
try {
|
|
25
|
+
const parsed = JSON.parse(raw);
|
|
26
|
+
if (!Array.isArray(parsed)) {
|
|
27
|
+
log.debug('CDP response is not an array');
|
|
28
|
+
return [];
|
|
29
|
+
}
|
|
30
|
+
return parsed
|
|
31
|
+
.filter((entry) => {
|
|
32
|
+
if (!entry || typeof entry !== 'object')
|
|
33
|
+
return false;
|
|
34
|
+
if (!entry.id || typeof entry.id !== 'string')
|
|
35
|
+
return false;
|
|
36
|
+
if (!entry.webSocketDebuggerUrl || typeof entry.webSocketDebuggerUrl !== 'string')
|
|
37
|
+
return false;
|
|
38
|
+
return true;
|
|
39
|
+
})
|
|
40
|
+
.map((entry) => ({
|
|
41
|
+
id: entry.id,
|
|
42
|
+
url: entry.url ?? '',
|
|
43
|
+
title: entry.title ?? '',
|
|
44
|
+
webSocketDebuggerUrl: entry.webSocketDebuggerUrl,
|
|
45
|
+
type: entry.type,
|
|
46
|
+
devtoolsFrontendUrl: entry.devtoolsFrontendUrl,
|
|
47
|
+
}));
|
|
48
|
+
}
|
|
49
|
+
catch (err) {
|
|
50
|
+
log.debug('failed to parse CDP response', { error: err instanceof Error ? err.message : String(err) });
|
|
51
|
+
return [];
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
export async function discoverSessions(cdpUrl, options) {
|
|
55
|
+
const timeoutMs = options?.timeoutMs ?? DEFAULT_TIMEOUT_MS;
|
|
56
|
+
const filterPages = options?.filterPages ?? false;
|
|
57
|
+
const jsonUrl = cdpUrl.endsWith('/') ? `${cdpUrl}json` : `${cdpUrl}/json`;
|
|
58
|
+
try {
|
|
59
|
+
log.debug('discovering CDP sessions', { url: jsonUrl, timeoutMs });
|
|
60
|
+
const { statusCode, body } = await httpGet(jsonUrl, timeoutMs);
|
|
61
|
+
if (statusCode !== 200) {
|
|
62
|
+
log.warn('CDP endpoint returned non-200', { statusCode, url: jsonUrl });
|
|
63
|
+
return [];
|
|
64
|
+
}
|
|
65
|
+
let sessions = parseCDPResponse(body);
|
|
66
|
+
if (filterPages) {
|
|
67
|
+
sessions = sessions.filter(s => s.type === 'page' || s.type === undefined);
|
|
68
|
+
}
|
|
69
|
+
log.info('CDP sessions discovered', { count: sessions.length, url: jsonUrl });
|
|
70
|
+
return sessions;
|
|
71
|
+
}
|
|
72
|
+
catch (err) {
|
|
73
|
+
log.debug('CDP discovery failed', {
|
|
74
|
+
url: jsonUrl,
|
|
75
|
+
error: err instanceof Error ? err.message : String(err),
|
|
76
|
+
});
|
|
77
|
+
return [];
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
export async function isCDPReachable(cdpUrl, timeoutMs = DEFAULT_TIMEOUT_MS) {
|
|
81
|
+
const jsonUrl = cdpUrl.endsWith('/') ? `${cdpUrl}json` : `${cdpUrl}/json`;
|
|
82
|
+
try {
|
|
83
|
+
const { statusCode } = await httpGet(jsonUrl, timeoutMs);
|
|
84
|
+
return statusCode === 200;
|
|
85
|
+
}
|
|
86
|
+
catch {
|
|
87
|
+
return false;
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
//# sourceMappingURL=cdp-client.js.map
|