@staticn0va/wigolo 0.3.1 → 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.
Files changed (163) hide show
  1. package/README.md +57 -2
  2. package/SKILL.md +149 -0
  3. package/dist/cache/change-detector.d.ts +7 -0
  4. package/dist/cache/change-detector.d.ts.map +1 -0
  5. package/dist/cache/change-detector.js +43 -0
  6. package/dist/cache/change-detector.js.map +1 -0
  7. package/dist/cache/diff-summary.d.ts +2 -0
  8. package/dist/cache/diff-summary.d.ts.map +1 -0
  9. package/dist/cache/diff-summary.js +87 -0
  10. package/dist/cache/diff-summary.js.map +1 -0
  11. package/dist/cache/store.d.ts +2 -0
  12. package/dist/cache/store.d.ts.map +1 -1
  13. package/dist/cache/store.js +10 -0
  14. package/dist/cache/store.js.map +1 -1
  15. package/dist/cli/auth.d.ts +2 -0
  16. package/dist/cli/auth.d.ts.map +1 -0
  17. package/dist/cli/auth.js +95 -0
  18. package/dist/cli/auth.js.map +1 -0
  19. package/dist/cli/daemon.d.ts +6 -1
  20. package/dist/cli/daemon.d.ts.map +1 -1
  21. package/dist/cli/daemon.js +56 -3
  22. package/dist/cli/daemon.js.map +1 -1
  23. package/dist/cli/health.d.ts +1 -1
  24. package/dist/cli/health.d.ts.map +1 -1
  25. package/dist/cli/health.js +41 -3
  26. package/dist/cli/health.js.map +1 -1
  27. package/dist/cli/index.d.ts +1 -1
  28. package/dist/cli/index.d.ts.map +1 -1
  29. package/dist/cli/index.js +1 -1
  30. package/dist/cli/index.js.map +1 -1
  31. package/dist/cli/plugin.d.ts +5 -0
  32. package/dist/cli/plugin.d.ts.map +1 -0
  33. package/dist/cli/plugin.js +188 -0
  34. package/dist/cli/plugin.js.map +1 -0
  35. package/dist/cli/shell.d.ts +2 -0
  36. package/dist/cli/shell.d.ts.map +1 -0
  37. package/dist/cli/shell.js +86 -0
  38. package/dist/cli/shell.js.map +1 -0
  39. package/dist/cli/warmup.d.ts +4 -0
  40. package/dist/cli/warmup.d.ts.map +1 -1
  41. package/dist/cli/warmup.js +48 -1
  42. package/dist/cli/warmup.js.map +1 -1
  43. package/dist/config.d.ts +7 -0
  44. package/dist/config.d.ts.map +1 -1
  45. package/dist/config.js +15 -0
  46. package/dist/config.js.map +1 -1
  47. package/dist/daemon/health-check.d.ts +16 -0
  48. package/dist/daemon/health-check.d.ts.map +1 -0
  49. package/dist/daemon/health-check.js +36 -0
  50. package/dist/daemon/health-check.js.map +1 -0
  51. package/dist/daemon/http-server.d.ts +26 -0
  52. package/dist/daemon/http-server.d.ts.map +1 -0
  53. package/dist/daemon/http-server.js +282 -0
  54. package/dist/daemon/http-server.js.map +1 -0
  55. package/dist/daemon/proxy.d.ts +10 -0
  56. package/dist/daemon/proxy.d.ts.map +1 -0
  57. package/dist/daemon/proxy.js +99 -0
  58. package/dist/daemon/proxy.js.map +1 -0
  59. package/dist/fetch/action-executor.d.ts +28 -0
  60. package/dist/fetch/action-executor.d.ts.map +1 -0
  61. package/dist/fetch/action-executor.js +86 -0
  62. package/dist/fetch/action-executor.js.map +1 -0
  63. package/dist/fetch/auth.d.ts +2 -1
  64. package/dist/fetch/auth.d.ts.map +1 -1
  65. package/dist/fetch/auth.js +30 -2
  66. package/dist/fetch/auth.js.map +1 -1
  67. package/dist/fetch/browser-pool.d.ts +30 -11
  68. package/dist/fetch/browser-pool.d.ts.map +1 -1
  69. package/dist/fetch/browser-pool.js +165 -49
  70. package/dist/fetch/browser-pool.js.map +1 -1
  71. package/dist/fetch/browser-selector.d.ts +17 -0
  72. package/dist/fetch/browser-selector.d.ts.map +1 -0
  73. package/dist/fetch/browser-selector.js +70 -0
  74. package/dist/fetch/browser-selector.js.map +1 -0
  75. package/dist/fetch/browser-types.d.ts +3 -0
  76. package/dist/fetch/browser-types.d.ts.map +1 -0
  77. package/dist/fetch/browser-types.js +45 -0
  78. package/dist/fetch/browser-types.js.map +1 -0
  79. package/dist/fetch/cdp-client.d.ts +9 -0
  80. package/dist/fetch/cdp-client.d.ts.map +1 -0
  81. package/dist/fetch/cdp-client.js +90 -0
  82. package/dist/fetch/cdp-client.js.map +1 -0
  83. package/dist/fetch/router.d.ts +4 -1
  84. package/dist/fetch/router.d.ts.map +1 -1
  85. package/dist/fetch/router.js +8 -2
  86. package/dist/fetch/router.js.map +1 -1
  87. package/dist/index.js +32 -3
  88. package/dist/index.js.map +1 -1
  89. package/dist/instructions.d.ts +26 -0
  90. package/dist/instructions.d.ts.map +1 -0
  91. package/dist/instructions.js +101 -0
  92. package/dist/instructions.js.map +1 -0
  93. package/dist/logger.d.ts +1 -1
  94. package/dist/logger.d.ts.map +1 -1
  95. package/dist/plugins/loader.d.ts +20 -0
  96. package/dist/plugins/loader.d.ts.map +1 -0
  97. package/dist/plugins/loader.js +162 -0
  98. package/dist/plugins/loader.js.map +1 -0
  99. package/dist/plugins/registry.d.ts +26 -0
  100. package/dist/plugins/registry.d.ts.map +1 -0
  101. package/dist/plugins/registry.js +68 -0
  102. package/dist/plugins/registry.js.map +1 -0
  103. package/dist/plugins/validate.d.ts +9 -0
  104. package/dist/plugins/validate.d.ts.map +1 -0
  105. package/dist/plugins/validate.js +70 -0
  106. package/dist/plugins/validate.js.map +1 -0
  107. package/dist/repl/commands/cache.d.ts +4 -0
  108. package/dist/repl/commands/cache.d.ts.map +1 -0
  109. package/dist/repl/commands/cache.js +44 -0
  110. package/dist/repl/commands/cache.js.map +1 -0
  111. package/dist/repl/commands/crawl.d.ts +7 -0
  112. package/dist/repl/commands/crawl.d.ts.map +1 -0
  113. package/dist/repl/commands/crawl.js +42 -0
  114. package/dist/repl/commands/crawl.js.map +1 -0
  115. package/dist/repl/commands/extract.d.ts +5 -0
  116. package/dist/repl/commands/extract.d.ts.map +1 -0
  117. package/dist/repl/commands/extract.js +37 -0
  118. package/dist/repl/commands/extract.js.map +1 -0
  119. package/dist/repl/commands/fetch.d.ts +5 -0
  120. package/dist/repl/commands/fetch.d.ts.map +1 -0
  121. package/dist/repl/commands/fetch.js +53 -0
  122. package/dist/repl/commands/fetch.js.map +1 -0
  123. package/dist/repl/commands/search.d.ts +5 -0
  124. package/dist/repl/commands/search.d.ts.map +1 -0
  125. package/dist/repl/commands/search.js +62 -0
  126. package/dist/repl/commands/search.js.map +1 -0
  127. package/dist/repl/commands/types.d.ts +9 -0
  128. package/dist/repl/commands/types.d.ts.map +1 -0
  129. package/dist/repl/commands/types.js +2 -0
  130. package/dist/repl/commands/types.js.map +1 -0
  131. package/dist/repl/formatters.d.ts +10 -0
  132. package/dist/repl/formatters.d.ts.map +1 -0
  133. package/dist/repl/formatters.js +209 -0
  134. package/dist/repl/formatters.js.map +1 -0
  135. package/dist/repl/parser.d.ts +9 -0
  136. package/dist/repl/parser.d.ts.map +1 -0
  137. package/dist/repl/parser.js +84 -0
  138. package/dist/repl/parser.js.map +1 -0
  139. package/dist/repl/shell.d.ts +8 -0
  140. package/dist/repl/shell.d.ts.map +1 -0
  141. package/dist/repl/shell.js +156 -0
  142. package/dist/repl/shell.js.map +1 -0
  143. package/dist/search/context-formatter.d.ts +3 -0
  144. package/dist/search/context-formatter.d.ts.map +1 -0
  145. package/dist/search/context-formatter.js +56 -0
  146. package/dist/search/context-formatter.js.map +1 -0
  147. package/dist/server.d.ts +17 -0
  148. package/dist/server.d.ts.map +1 -1
  149. package/dist/server.js +204 -104
  150. package/dist/server.js.map +1 -1
  151. package/dist/tools/cache.d.ts +2 -1
  152. package/dist/tools/cache.d.ts.map +1 -1
  153. package/dist/tools/cache.js +56 -1
  154. package/dist/tools/cache.js.map +1 -1
  155. package/dist/tools/fetch.d.ts.map +1 -1
  156. package/dist/tools/fetch.js +16 -1
  157. package/dist/tools/fetch.js.map +1 -1
  158. package/dist/tools/search.d.ts.map +1 -1
  159. package/dist/tools/search.js +10 -0
  160. package/dist/tools/search.js.map +1 -1
  161. package/dist/types.d.ts +48 -0
  162. package/dist/types.d.ts.map +1 -1
  163. package/package.json +36 -3
@@ -0,0 +1,86 @@
1
+ import { createLogger } from '../logger.js';
2
+ const log = createLogger('fetch');
3
+ const DEFAULT_PER_ACTION_TIMEOUT_MS = 5000;
4
+ const DEFAULT_WAIT_FOR_TIMEOUT_MS = 5000;
5
+ export async function executeActions(page, actions, opts) {
6
+ if (!actions || actions.length === 0) {
7
+ return [];
8
+ }
9
+ const perActionTimeout = opts?.perActionTimeoutMs ?? DEFAULT_PER_ACTION_TIMEOUT_MS;
10
+ const results = [];
11
+ for (let i = 0; i < actions.length; i++) {
12
+ const action = actions[i];
13
+ const result = {
14
+ action_index: i,
15
+ type: action.type,
16
+ success: false,
17
+ };
18
+ try {
19
+ switch (action.type) {
20
+ case 'click': {
21
+ log.debug('action: click', { index: i, selector: action.selector });
22
+ await page.click(action.selector, { timeout: perActionTimeout });
23
+ result.success = true;
24
+ break;
25
+ }
26
+ case 'type': {
27
+ log.debug('action: type', { index: i, selector: action.selector, textLength: action.text.length });
28
+ await page.fill(action.selector, action.text, { timeout: perActionTimeout });
29
+ result.success = true;
30
+ break;
31
+ }
32
+ case 'wait': {
33
+ const MAX_WAIT_MS = 10000;
34
+ const ms = Math.min(Math.max(0, action.ms), MAX_WAIT_MS);
35
+ log.debug('action: wait', { index: i, ms });
36
+ await page.waitForTimeout(ms);
37
+ result.success = true;
38
+ break;
39
+ }
40
+ case 'wait_for': {
41
+ const timeout = action.timeout ?? DEFAULT_WAIT_FOR_TIMEOUT_MS;
42
+ log.debug('action: wait_for', { index: i, selector: action.selector, timeout });
43
+ await page.waitForSelector(action.selector, { timeout });
44
+ result.success = true;
45
+ break;
46
+ }
47
+ case 'scroll': {
48
+ const viewport = page.viewportSize();
49
+ const defaultAmount = viewport?.height ?? 720;
50
+ const pixels = action.amount ?? defaultAmount;
51
+ const scrollY = action.direction === 'up' ? -pixels : pixels;
52
+ log.debug('action: scroll', { index: i, direction: action.direction, pixels: scrollY });
53
+ await page.evaluate((dy) => window.scrollBy(0, dy), scrollY);
54
+ result.success = true;
55
+ break;
56
+ }
57
+ case 'screenshot': {
58
+ log.debug('action: screenshot', { index: i });
59
+ const buf = await page.screenshot({ fullPage: true });
60
+ result.success = true;
61
+ result.screenshot = buf.toString('base64');
62
+ break;
63
+ }
64
+ default: {
65
+ const unknownType = action.type;
66
+ log.warn('unknown action type', { index: i, type: unknownType });
67
+ result.error = `Unknown action type: ${unknownType}`;
68
+ break;
69
+ }
70
+ }
71
+ }
72
+ catch (err) {
73
+ const message = err instanceof Error ? err.message : String(err);
74
+ log.warn('action failed', { index: i, type: action.type, error: message });
75
+ result.error = message;
76
+ }
77
+ results.push(result);
78
+ }
79
+ log.info('actions complete', {
80
+ total: actions.length,
81
+ succeeded: results.filter(r => r.success).length,
82
+ failed: results.filter(r => !r.success).length,
83
+ });
84
+ return results;
85
+ }
86
+ //# sourceMappingURL=action-executor.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"action-executor.js","sourceRoot":"","sources":["../../src/fetch/action-executor.ts"],"names":[],"mappings":"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"}
@@ -2,7 +2,8 @@ import type { CDPSession } from '../types.js';
2
2
  export interface AuthOptions {
3
3
  storageStatePath?: string;
4
4
  userDataDir?: string;
5
+ cdpUrl?: string;
5
6
  }
6
- export declare function getAuthOptions(): AuthOptions | null;
7
+ export declare function getAuthOptions(): Promise<AuthOptions | null>;
7
8
  export declare function listSessions(): Promise<CDPSession[]>;
8
9
  //# sourceMappingURL=auth.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/fetch/auth.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,MAAM,WAAW,WAAW;IAC1B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,wBAAgB,cAAc,IAAI,WAAW,GAAG,IAAI,CAyBnD;AAED,wBAAsB,YAAY,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC,CAE1D"}
1
+ {"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/fetch/auth.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,MAAM,WAAW,WAAW;IAC1B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,wBAAsB,cAAc,IAAI,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAyClE;AAED,wBAAsB,YAAY,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC,CAc1D"}
@@ -3,7 +3,8 @@ import { join } from 'node:path';
3
3
  import { tmpdir } from 'node:os';
4
4
  import { getConfig } from '../config.js';
5
5
  import { createLogger } from '../logger.js';
6
- export function getAuthOptions() {
6
+ import { discoverSessions, isCDPReachable } from './cdp-client.js';
7
+ export async function getAuthOptions() {
7
8
  const config = getConfig();
8
9
  const logger = createLogger('fetch');
9
10
  if (config.authStatePath) {
@@ -24,9 +25,36 @@ export function getAuthOptions() {
24
25
  logger.debug('copied Chrome profile to temp directory', { from: config.chromeProfilePath, to: tempDir });
25
26
  return { userDataDir: tempDir };
26
27
  }
28
+ if (config.cdpUrl) {
29
+ try {
30
+ const reachable = await isCDPReachable(config.cdpUrl);
31
+ if (reachable) {
32
+ logger.info('CDP endpoint reachable, using for auth', { cdpUrl: config.cdpUrl });
33
+ return { cdpUrl: config.cdpUrl };
34
+ }
35
+ logger.debug('CDP endpoint not reachable', { cdpUrl: config.cdpUrl });
36
+ }
37
+ catch (err) {
38
+ logger.warn('CDP reachability check failed', {
39
+ cdpUrl: config.cdpUrl,
40
+ error: err instanceof Error ? err.message : String(err),
41
+ });
42
+ }
43
+ }
27
44
  return null;
28
45
  }
29
46
  export async function listSessions() {
30
- return [];
47
+ const config = getConfig();
48
+ if (!config.cdpUrl) {
49
+ return [];
50
+ }
51
+ try {
52
+ return await discoverSessions(config.cdpUrl);
53
+ }
54
+ catch (err) {
55
+ const logger = createLogger('fetch');
56
+ logger.warn('listSessions failed', { error: err instanceof Error ? err.message : String(err) });
57
+ return [];
58
+ }
31
59
  }
32
60
  //# sourceMappingURL=auth.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/fetch/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAQ5C,MAAM,UAAU,cAAc;IAC5B,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;IAErC,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;QACzB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;YACtC,MAAM,IAAI,KAAK,CAAC,8BAA8B,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC;QACxE,CAAC;QACD,OAAO,EAAE,gBAAgB,EAAE,MAAM,CAAC,aAAa,EAAE,CAAC;IACpD,CAAC;IAED,IAAI,MAAM,CAAC,iBAAiB,EAAE,CAAC;QAC7B,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAC;QACjE,IAAI,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YACzB,MAAM,CAAC,IAAI,CAAC,4FAA4F,EAAE;gBACxG,WAAW,EAAE,MAAM,CAAC,iBAAiB;aACtC,CAAC,CAAC;QACL,CAAC;QACD,MAAM,OAAO,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,gBAAgB,CAAC,CAAC,CAAC;QAC9D,MAAM,CAAC,MAAM,CAAC,iBAAiB,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/D,MAAM,CAAC,KAAK,CAAC,yCAAyC,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,iBAAiB,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;QACzG,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC;IAClC,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY;IAChC,OAAO,EAAE,CAAC;AACZ,CAAC"}
1
+ {"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/fetch/auth.ts"],"names":[],"mappings":"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"}
@@ -1,28 +1,47 @@
1
1
  import { type BrowserContext } from 'playwright';
2
- import type { RawFetchResult, BrowserType } from '../types.js';
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 declare class BrowserPool {
14
- private browser;
15
- private pool;
16
- private activeCount;
17
- private waitQueue;
18
- private idleTimers;
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
- private readonly browserType;
21
- constructor(options?: BrowserPoolOptions);
31
+ constructor(options?: MultiBrowserPoolOptions);
32
+ getConfiguredTypes(): BrowserType[];
33
+ getStats(): PoolTypeStat[];
34
+ protected resolveType(requested?: BrowserType, url?: string): BrowserType;
22
35
  private launchBrowser;
23
- acquire(): Promise<BrowserContext>;
24
- release(ctx: BrowserContext): void;
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;AAE/D,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;CACtB;AAED,MAAM,WAAW,kBAAkB;IACjC,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAED,qBAAa,WAAW;IACtB,OAAO,CAAC,OAAO,CAAwB;IACvC,OAAO,CAAC,IAAI,CAAwB;IACpC,OAAO,CAAC,WAAW,CAAK;IACxB,OAAO,CAAC,SAAS,CAA4C;IAC7D,OAAO,CAAC,UAAU,CAA4D;IAC9E,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAc;gBAE9B,OAAO,CAAC,EAAE,kBAAkB;YAI1B,aAAa;IAUrB,OAAO,IAAI,OAAO,CAAC,cAAc,CAAC;IAyBxC,OAAO,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IAyB5B,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,mBAAwB,GAAG,OAAO,CAAC,cAAc,CAAC;IA+DzF,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAoBhC"}
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
- export class BrowserPool {
5
- browser = null;
6
- pool = [];
7
- activeCount = 0;
8
- waitQueue = [];
9
- idleTimers = new Map();
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
- this.browserType = options?.browserType ?? 'chromium';
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
- async launchBrowser() {
16
- if (!this.browser) {
17
- const launcher = this.browserType === 'firefox' ? firefox
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
- return this.browser;
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 acquire() {
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
- if (this.pool.length > 0) {
28
- const ctx = this.pool.pop();
29
- const timer = this.idleTimers.get(ctx);
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
- this.idleTimers.delete(ctx);
95
+ typePool.idleTimers.delete(ctx);
33
96
  }
34
97
  return ctx;
35
98
  }
36
- if (this.activeCount < maxBrowsers) {
37
- this.activeCount++;
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
- this.waitQueue.push(resolve);
105
+ typePool.waitQueue.push(resolve);
43
106
  });
44
107
  }
45
- release(ctx) {
108
+ releaseForType(type, ctx) {
46
109
  const config = getConfig();
47
110
  const idleTimeoutMs = config.browserIdleTimeoutMs;
48
- if (this.waitQueue.length > 0) {
49
- const resolve = this.waitQueue.shift();
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
- this.pool.push(ctx);
117
+ typePool.pool.push(ctx);
54
118
  const timer = setTimeout(() => {
55
- const idx = this.pool.indexOf(ctx);
119
+ const idx = typePool.pool.indexOf(ctx);
56
120
  if (idx !== -1) {
57
- this.pool.splice(idx, 1);
58
- this.idleTimers.delete(ctx);
59
- this.activeCount = Math.max(0, this.activeCount - 1);
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
- this.idleTimers.set(ctx, timer);
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
- const ctx = await this.acquire();
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
- // networkidle timeout is non-fatal — page content is still usable
96
- logger.debug('networkidle timeout, using page content as-is', { url });
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
- this.release(ctx);
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 [, timer] of this.idleTimers) {
125
- clearTimeout(timer);
126
- }
127
- this.idleTimers.clear();
128
- const closePromises = this.pool.map((ctx) => ctx.close().catch(() => { }));
129
- this.pool = [];
130
- await Promise.all(closePromises);
131
- if (this.browser) {
132
- await this.browser.close().catch(() => { });
133
- this.browser = null;
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
- this.activeCount = 0;
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":"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"}
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