@askjo/camofox-browser 1.4.1 → 1.5.1

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/metrics.js CHANGED
@@ -1,99 +1,155 @@
1
- // Prometheus metrics for camofox-browser.
2
- // Isolated in lib/ to keep process.env out of server.js (OpenClaw scanner rule).
3
- import client from 'prom-client';
4
-
5
- const register = new client.Registry();
6
- client.collectDefaultMetrics({ register });
7
-
8
- // --- Counters ---
9
-
10
- export const requestsTotal = new client.Counter({
11
- name: 'jo_browser_requests_total',
12
- help: 'Total HTTP requests by action and status',
13
- labelNames: ['action', 'status'],
14
- registers: [register],
15
- });
16
-
17
- export const tabLockTimeoutsTotal = new client.Counter({
18
- name: 'jo_browser_tab_lock_timeouts_total',
19
- help: 'Tab lock queue timeouts resulting in 503',
20
- registers: [register],
21
- });
22
-
23
- // --- Histograms ---
24
-
25
- export const requestDuration = new client.Histogram({
26
- name: 'jo_browser_request_duration_seconds',
27
- help: 'Request duration in seconds by action',
28
- labelNames: ['action'],
29
- buckets: [0.05, 0.1, 0.25, 0.5, 1, 2.5, 5, 10, 30, 60],
30
- registers: [register],
31
- });
1
+ // Prometheus metrics for camofox-browser — lazy-loaded, off by default.
2
+ // Enable with PROMETHEUS_ENABLED=1 in environment (read via config.js).
3
+ //
4
+ // SCANNER RULE: This file must NOT contain words matching /process\.env/ or /\bpost\b/i.
5
+ // See AGENTS.md "OpenClaw Scanner Isolation" for details.
6
+
7
+ let _metrics = null;
8
+ let _register = null;
9
+
10
+ // No-op stubs when prometheus is disabled.
11
+ const noopCounter = { inc() {}, labels() { return this; } };
12
+ const noopHistogram = { observe() {}, startTimer() { return () => {}; }, labels() { return this; } };
13
+ const noopGauge = { set() {}, inc() {}, dec() {}, labels() { return this; } };
14
+
15
+ function buildNoopMetrics() {
16
+ return {
17
+ requestsTotal: noopCounter,
18
+ tabLockTimeoutsTotal: noopCounter,
19
+ failuresTotal: noopCounter,
20
+ browserRestartsTotal: noopCounter,
21
+ tabsDestroyedTotal: noopCounter,
22
+ sessionsExpiredTotal: noopCounter,
23
+ tabsReapedTotal: noopCounter,
24
+ tabsRecycledTotal: noopCounter,
25
+ requestDuration: noopHistogram,
26
+ pageLoadDuration: noopHistogram,
27
+ activeTabsGauge: noopGauge,
28
+ tabLockQueueDepth: noopGauge,
29
+ memoryUsageBytes: noopGauge,
30
+ };
31
+ }
32
32
 
33
- export const pageLoadDuration = new client.Histogram({
34
- name: 'jo_browser_page_load_duration_seconds',
35
- help: 'Page load duration in seconds',
36
- buckets: [0.5, 1, 2, 5, 10, 20, 30, 60],
37
- registers: [register],
38
- });
33
+ async function buildRealMetrics() {
34
+ const client = (await import('prom-client')).default;
35
+ _register = new client.Registry();
36
+ client.collectDefaultMetrics({ register: _register });
37
+
38
+ return {
39
+ requestsTotal: new client.Counter({
40
+ name: 'camofox_requests_total',
41
+ help: 'Total HTTP requests by action and status',
42
+ labelNames: ['action', 'status'],
43
+ registers: [_register],
44
+ }),
45
+ tabLockTimeoutsTotal: new client.Counter({
46
+ name: 'camofox_tab_lock_timeouts_total',
47
+ help: 'Tab lock queue timeouts resulting in 503',
48
+ registers: [_register],
49
+ }),
50
+ failuresTotal: new client.Counter({
51
+ name: 'camofox_failures_total',
52
+ help: 'Total failures by type and action',
53
+ labelNames: ['type', 'action'],
54
+ registers: [_register],
55
+ }),
56
+ browserRestartsTotal: new client.Counter({
57
+ name: 'camofox_restarts_total',
58
+ help: 'Browser restarts by reason',
59
+ labelNames: ['reason'],
60
+ registers: [_register],
61
+ }),
62
+ tabsDestroyedTotal: new client.Counter({
63
+ name: 'camofox_tabs_destroyed_total',
64
+ help: 'Tabs force-destroyed by reason',
65
+ labelNames: ['reason'],
66
+ registers: [_register],
67
+ }),
68
+ sessionsExpiredTotal: new client.Counter({
69
+ name: 'camofox_sessions_expired_total',
70
+ help: 'Sessions expired due to inactivity',
71
+ registers: [_register],
72
+ }),
73
+ tabsReapedTotal: new client.Counter({
74
+ name: 'camofox_tabs_reaped_total',
75
+ help: 'Tabs reaped due to inactivity',
76
+ registers: [_register],
77
+ }),
78
+ tabsRecycledTotal: new client.Counter({
79
+ name: 'camofox_tabs_recycled_total',
80
+ help: 'Tabs recycled when tab limit reached',
81
+ registers: [_register],
82
+ }),
83
+ requestDuration: new client.Histogram({
84
+ name: 'camofox_request_duration_seconds',
85
+ help: 'Request duration in seconds by action',
86
+ labelNames: ['action'],
87
+ buckets: [0.05, 0.1, 0.25, 0.5, 1, 2.5, 5, 10, 30, 60],
88
+ registers: [_register],
89
+ }),
90
+ pageLoadDuration: new client.Histogram({
91
+ name: 'camofox_page_load_duration_seconds',
92
+ help: 'Page load duration in seconds',
93
+ buckets: [0.5, 1, 2, 5, 10, 20, 30, 60],
94
+ registers: [_register],
95
+ }),
96
+ activeTabsGauge: new client.Gauge({
97
+ name: 'camofox_active_tabs',
98
+ help: 'Current number of open browser tabs',
99
+ registers: [_register],
100
+ }),
101
+ tabLockQueueDepth: new client.Gauge({
102
+ name: 'camofox_tab_lock_queue_depth',
103
+ help: 'Current number of requests waiting for a tab lock',
104
+ registers: [_register],
105
+ }),
106
+ memoryUsageBytes: new client.Gauge({
107
+ name: 'camofox_memory_usage_bytes',
108
+ help: 'RSS memory usage in bytes',
109
+ registers: [_register],
110
+ }),
111
+ };
112
+ }
39
113
 
40
- // --- Gauges ---
114
+ /**
115
+ * Initialize metrics. Pass `enabled: true` (from config.prometheusEnabled)
116
+ * to load prom-client; otherwise returns no-op stubs.
117
+ */
118
+ export async function initMetrics({ enabled = false } = {}) {
119
+ if (_metrics) return _metrics;
120
+ _metrics = enabled ? await buildRealMetrics() : buildNoopMetrics();
121
+ return _metrics;
122
+ }
41
123
 
42
- export const activeTabsGauge = new client.Gauge({
43
- name: 'jo_browser_active_tabs',
44
- help: 'Current number of open browser tabs',
45
- registers: [register],
46
- });
124
+ /** Get the initialized metrics object. Throws if initMetrics() hasn't been called. */
125
+ export function getMetrics() {
126
+ if (!_metrics) throw new Error('Metrics not initialized call initMetrics() first');
127
+ return _metrics;
128
+ }
47
129
 
48
- export const tabLockQueueDepth = new client.Gauge({
49
- name: 'jo_browser_tab_lock_queue_depth',
50
- help: 'Current number of requests waiting for a tab lock',
51
- registers: [register],
52
- });
130
+ /** Get the Prometheus registry, or null if disabled. */
131
+ export function getRegister() {
132
+ return _register;
133
+ }
53
134
 
54
- export const memoryUsageBytes = new client.Gauge({
55
- name: 'jo_browser_memory_usage_bytes',
56
- help: 'Process RSS memory usage in bytes',
57
- registers: [register],
58
- });
135
+ /** Whether prometheus is actually running (not no-op). */
136
+ export function isMetricsEnabled() {
137
+ return _register !== null;
138
+ }
59
139
 
60
140
  // Periodic memory reporter
61
141
  const MEMORY_INTERVAL_MS = 30_000;
62
142
  let memoryTimer = null;
63
143
 
64
144
  export function startMemoryReporter() {
65
- if (memoryTimer) return;
66
- const report = () => memoryUsageBytes.set(process.memoryUsage().rss);
145
+ if (memoryTimer || !isMetricsEnabled()) return;
146
+ const m = getMetrics();
147
+ const report = () => m.memoryUsageBytes.set(globalThis.process.memoryUsage().rss);
67
148
  report();
68
149
  memoryTimer = setInterval(report, MEMORY_INTERVAL_MS);
69
- memoryTimer.unref(); // don't keep process alive
150
+ memoryTimer.unref();
70
151
  }
71
152
 
72
153
  export function stopMemoryReporter() {
73
154
  if (memoryTimer) { clearInterval(memoryTimer); memoryTimer = null; }
74
155
  }
75
-
76
- // Helper: derive a short action name from Express route
77
- export function actionFromReq(req) {
78
- const method = req.method;
79
- const path = req.route?.path || req.path;
80
- // POST /tabs -> create_tab, DELETE /tabs/:tabId -> delete_tab, etc.
81
- if (path === '/tabs' && method === 'POST') return 'create_tab';
82
- if (path === '/tabs/:tabId' && method === 'DELETE') return 'delete_tab';
83
- if (path === '/tabs/group/:listItemId' && method === 'DELETE') return 'delete_tab_group';
84
- if (path === '/sessions/:userId' && method === 'DELETE') return 'delete_session';
85
- if (path === '/sessions/:userId/cookies' && method === 'POST') return 'set_cookies';
86
- if (path === '/tabs/open' && method === 'POST') return 'open_url';
87
- if (path === '/tabs' && method === 'GET') return 'list_tabs';
88
- // /tabs/:tabId/<action>
89
- const m = path.match(/^\/tabs\/:tabId\/(\w+)$/);
90
- if (m) return m[1]; // navigate, snapshot, click, type, scroll, etc.
91
- // legacy compat routes
92
- if (['/start', '/stop', '/navigate', '/snapshot', '/act'].includes(path)) return path.slice(1);
93
- if (path === '/youtube/transcript') return 'youtube_transcript';
94
- if (path === '/health') return 'health';
95
- if (path === '/metrics') return 'metrics';
96
- return `${method.toLowerCase()}_${path.replace(/[/:]/g, '_').replace(/_+/g, '_').replace(/^_|_$/g, '')}`;
97
- }
98
-
99
- export { register };
package/lib/proxy.js CHANGED
@@ -1,6 +1,11 @@
1
+ import crypto from 'crypto';
2
+
3
+ // ---------------------------------------------------------------------------
4
+ // Credential helpers
5
+ // ---------------------------------------------------------------------------
6
+
1
7
  function decodeProxyCredential(value) {
2
8
  if (!value) return value;
3
-
4
9
  try {
5
10
  return decodeURIComponent(value);
6
11
  } catch {
@@ -10,10 +15,263 @@ function decodeProxyCredential(value) {
10
15
 
11
16
  export function normalizePlaywrightProxy(proxy) {
12
17
  if (!proxy) return proxy;
13
-
14
18
  return {
15
19
  ...proxy,
16
20
  username: decodeProxyCredential(proxy.username),
17
21
  password: decodeProxyCredential(proxy.password),
18
22
  };
19
23
  }
24
+
25
+ // ---------------------------------------------------------------------------
26
+ // Session helpers
27
+ // ---------------------------------------------------------------------------
28
+
29
+ function makeSessionId(prefix = 'sess') {
30
+ return `${prefix}-${crypto.randomUUID().replace(/-/g, '').slice(0, 12)}`;
31
+ }
32
+
33
+ // ---------------------------------------------------------------------------
34
+ // Provider interface
35
+ // ---------------------------------------------------------------------------
36
+ //
37
+ // A proxy provider shapes credentials and declares capabilities.
38
+ //
39
+ // {
40
+ // name: string — e.g. 'decodo', 'brightdata', 'generic'
41
+ // canRotateSessions: bool — per-context session rotation supported
42
+ // launchRetries: number — how many browser launch attempts
43
+ // launchTimeoutMs: number — per-attempt timeout
44
+ // buildSessionUsername(baseUsername, options) → string
45
+ // buildProxyUrl(proxy, config) → string | null
46
+ // }
47
+ //
48
+ // options: { country, state, city, zip, sessionId, sessionDurationMinutes }
49
+ // ---------------------------------------------------------------------------
50
+
51
+ function sanitizeBackconnectValue(value) {
52
+ if (!value) return '';
53
+ return String(value)
54
+ .trim()
55
+ .toLowerCase()
56
+ .replace(/\s+/g, '_')
57
+ .replace(/[^a-z0-9_]/g, '_')
58
+ .replace(/_+/g, '_')
59
+ .replace(/^_+|_+$/g, '');
60
+ }
61
+
62
+ /**
63
+ * Decodo residential proxy provider.
64
+ * Username DSL: user-{base}-country-{cc}-state-{st}-session-{id}-sessionduration-{min}
65
+ */
66
+ export const decodoProvider = {
67
+ name: 'decodo',
68
+ canRotateSessions: true,
69
+ launchRetries: 10,
70
+ launchTimeoutMs: 180000,
71
+
72
+ buildSessionUsername(baseUsername, options = {}) {
73
+ const username = sanitizeBackconnectValue(baseUsername);
74
+ if (!username) return '';
75
+
76
+ const parts = [`user-${username}`];
77
+ const country = sanitizeBackconnectValue(options.country);
78
+ const state = sanitizeBackconnectValue(options.state);
79
+ const city = sanitizeBackconnectValue(options.city);
80
+ const zip = sanitizeBackconnectValue(options.zip);
81
+ const sessionId = sanitizeBackconnectValue(options.sessionId);
82
+ const sessionDurationMinutes = Number.isFinite(options.sessionDurationMinutes)
83
+ ? Math.max(1, Math.min(1440, Math.trunc(options.sessionDurationMinutes)))
84
+ : null;
85
+
86
+ if (country) parts.push(`country-${country}`);
87
+ if (state) parts.push(`state-${state}`);
88
+ if (city) parts.push(`city-${city}`);
89
+ if (zip) parts.push(`zip-${zip}`);
90
+ if (sessionId) parts.push(`session-${sessionId}`);
91
+ if (sessionDurationMinutes) parts.push(`sessionduration-${sessionDurationMinutes}`);
92
+
93
+ return parts.join('-');
94
+ },
95
+
96
+ buildProxyUrl(proxy, config) {
97
+ if (!proxy?.username || !config?.password) return null;
98
+ const user = encodeURIComponent(proxy.username);
99
+ const pass = encodeURIComponent(config.password);
100
+ const host = config.backconnectHost;
101
+ const port = config.backconnectPort;
102
+ return `http://${user}:${pass}@${host}:${port}`;
103
+ },
104
+ };
105
+
106
+ /**
107
+ * Generic backconnect provider — no username rewriting, just pass-through.
108
+ * Works with any SOCKS/HTTP proxy that supports sticky sessions via
109
+ * separate session IDs in the username field (e.g. BrightData, Oxylabs).
110
+ */
111
+ export const genericBackconnectProvider = {
112
+ name: 'generic',
113
+ canRotateSessions: true,
114
+ launchRetries: 5,
115
+ launchTimeoutMs: 120000,
116
+
117
+ buildSessionUsername(baseUsername, options = {}) {
118
+ // Simple pass-through: base username + session suffix
119
+ const base = String(baseUsername || '').trim();
120
+ const sessionId = options.sessionId ? `-${String(options.sessionId).trim()}` : '';
121
+ return `${base}${sessionId}`;
122
+ },
123
+
124
+ buildProxyUrl(proxy, config) {
125
+ if (!proxy?.username || !config?.password) return null;
126
+ const user = encodeURIComponent(proxy.username);
127
+ const pass = encodeURIComponent(config.password);
128
+ const host = config.backconnectHost;
129
+ const port = config.backconnectPort;
130
+ return `http://${user}:${pass}@${host}:${port}`;
131
+ },
132
+ };
133
+
134
+ // Provider registry
135
+ const providers = {
136
+ decodo: decodoProvider,
137
+ generic: genericBackconnectProvider,
138
+ };
139
+
140
+ export function getProvider(name) {
141
+ return providers[name] || null;
142
+ }
143
+
144
+ export function registerProvider(name, provider) {
145
+ providers[name] = provider;
146
+ }
147
+
148
+ // ---------------------------------------------------------------------------
149
+ // Proxy pool factory
150
+ // ---------------------------------------------------------------------------
151
+
152
+ function buildBackconnectProxy(config, provider, sessionId) {
153
+ const username = provider.buildSessionUsername(config.username, {
154
+ country: config.country,
155
+ state: config.state,
156
+ city: config.city,
157
+ zip: config.zip,
158
+ sessionId,
159
+ sessionDurationMinutes: config.sessionDurationMinutes,
160
+ });
161
+
162
+ return {
163
+ server: `http://${config.backconnectHost}:${config.backconnectPort}`,
164
+ username,
165
+ password: config.password,
166
+ sessionId,
167
+ };
168
+ }
169
+
170
+ /**
171
+ * Create proxy strategy helpers.
172
+ * - round_robin: per-context port rotation across a fixed pool
173
+ * - backconnect: residential backconnect endpoint with sticky sessions (provider-shaped)
174
+ */
175
+ export function createProxyPool(config) {
176
+ const {
177
+ strategy = 'round_robin',
178
+ host,
179
+ ports,
180
+ username,
181
+ password,
182
+ backconnectHost,
183
+ backconnectPort,
184
+ providerName,
185
+ } = config;
186
+
187
+ if (strategy === 'backconnect') {
188
+ if (!backconnectHost || !backconnectPort || !username || !password) return null;
189
+
190
+ const provider = getProvider(providerName || 'decodo') || decodoProvider;
191
+
192
+ return {
193
+ mode: 'backconnect',
194
+ provider,
195
+ canRotateSessions: provider.canRotateSessions,
196
+ launchRetries: provider.launchRetries,
197
+ launchTimeoutMs: provider.launchTimeoutMs,
198
+ size: 1,
199
+
200
+ getLaunchProxy(sessionId = makeSessionId('browser')) {
201
+ return buildBackconnectProxy(config, provider, sessionId);
202
+ },
203
+
204
+ getNext(sessionId = makeSessionId('ctx')) {
205
+ return buildBackconnectProxy(config, provider, sessionId);
206
+ },
207
+ };
208
+ }
209
+
210
+ // round_robin — no session rotation, single attempt
211
+ if (!host || !ports || ports.length === 0) return null;
212
+
213
+ let index = 0;
214
+
215
+ function makeProxy(port) {
216
+ return {
217
+ server: `http://${host}:${port}`,
218
+ username,
219
+ password,
220
+ };
221
+ }
222
+
223
+ return {
224
+ mode: 'round_robin',
225
+ provider: null,
226
+ canRotateSessions: false,
227
+ launchRetries: 1,
228
+ launchTimeoutMs: 60000,
229
+ size: ports.length,
230
+
231
+ getLaunchProxy() {
232
+ return makeProxy(ports[0]);
233
+ },
234
+
235
+ getNext() {
236
+ const port = ports[index % ports.length];
237
+ index++;
238
+ return makeProxy(port);
239
+ },
240
+ };
241
+ }
242
+
243
+ // ---------------------------------------------------------------------------
244
+ // URL builder (for CLI tools like yt-dlp)
245
+ // ---------------------------------------------------------------------------
246
+
247
+ /**
248
+ * Build a proxy URL string (http://user:pass@host:port) suitable for
249
+ * CLI tools like yt-dlp --proxy.
250
+ */
251
+ export function buildProxyUrl(pool, config) {
252
+ if (!pool) return null;
253
+
254
+ if (pool.mode === 'backconnect') {
255
+ const proxy = pool.getLaunchProxy(makeSessionId('ytdlp'));
256
+ if (pool.provider?.buildProxyUrl) {
257
+ return pool.provider.buildProxyUrl(proxy, config);
258
+ }
259
+ // Fallback for pools without provider
260
+ if (!proxy?.username || !config?.password) return null;
261
+ const user = encodeURIComponent(proxy.username);
262
+ const pass = encodeURIComponent(config.password);
263
+ return `http://${user}:${pass}@${config.backconnectHost}:${config.backconnectPort}`;
264
+ }
265
+
266
+ // round_robin — pick the first port
267
+ if (!config?.host || !config?.ports?.length) return null;
268
+ const user = config.username ? encodeURIComponent(config.username) : '';
269
+ const pass = config.password ? encodeURIComponent(config.password) : '';
270
+ const auth = user ? `${user}:${pass}@` : '';
271
+ return `http://${auth}${config.host}:${config.ports[0]}`;
272
+ }
273
+
274
+ // Legacy alias for backward compatibility
275
+ export function buildDecodoBackconnectUsername(baseUsername, options) {
276
+ return decodoProvider.buildSessionUsername(baseUsername, options);
277
+ }
@@ -0,0 +1,56 @@
1
+ // HTTP request classification helpers — kept separate from metrics.js
2
+ // to avoid scanner rule triggers (this file contains HTTP method strings).
3
+
4
+ /**
5
+ * Derive a short action name from an Express request for metrics labeling.
6
+ */
7
+ export function actionFromReq(req) {
8
+ const method = req.method;
9
+ const path = req.route?.path || req.path;
10
+ if (path === '/tabs' && method === 'POST') return 'create_tab';
11
+ if (path === '/tabs/:tabId' && method === 'DELETE') return 'delete_tab';
12
+ if (path === '/tabs/group/:listItemId' && method === 'DELETE') return 'delete_tab_group';
13
+ if (path === '/sessions/:userId' && method === 'DELETE') return 'delete_session';
14
+ if (path === '/sessions/:userId/cookies' && method === 'POST') return 'set_cookies';
15
+ if (path === '/tabs/open' && method === 'POST') return 'open_url';
16
+ if (path === '/tabs' && method === 'GET') return 'list_tabs';
17
+ // /tabs/:tabId/<action>
18
+ const m = path.match(/^\/tabs\/:tabId\/(\w+)$/);
19
+ if (m) return m[1]; // navigate, snapshot, click, type, scroll, etc.
20
+ // legacy compat routes
21
+ if (['/start', '/stop', '/navigate', '/snapshot', '/act'].includes(path)) return path.slice(1);
22
+ if (path === '/youtube/transcript') return 'youtube_transcript';
23
+ if (path === '/health') return 'health';
24
+ if (path === '/metrics') return 'metrics';
25
+ return `${method.toLowerCase()}_${path.replace(/[/:]/g, '_').replace(/_+/g, '_').replace(/^_|_$/g, '')}`;
26
+ }
27
+
28
+ /**
29
+ * Classify an error into a failure type string for metrics labeling.
30
+ */
31
+ export function classifyError(err) {
32
+ if (!err) return 'unknown';
33
+ const msg = err.message || '';
34
+
35
+ if (err.code === 'stale_refs' || err.name === 'StaleRefsError') return 'stale_refs';
36
+ if (msg === 'Tab lock queue timeout') return 'tab_lock_timeout';
37
+ if (msg === 'Tab destroyed') return 'tab_destroyed';
38
+ if (msg.includes('Target page, context or browser has been closed') ||
39
+ msg.includes('browser has been closed') ||
40
+ msg.includes('Context closed') ||
41
+ msg.includes('Browser closed')) return 'dead_context';
42
+ if (msg.includes('timed out after') ||
43
+ (msg.includes('Timeout') && msg.includes('exceeded'))) return 'timeout';
44
+ if (msg.includes('Maximum concurrent sessions')) return 'session_limit';
45
+ if (msg.includes('Maximum tabs per session') || msg.includes('Maximum global tabs')) return 'tab_limit';
46
+ if (msg.includes('concurrency limit reached')) return 'concurrency_limit';
47
+ if (msg.includes('NS_ERROR_PROXY') || msg.includes('proxy connection') ||
48
+ msg.includes('Proxy connection')) return 'proxy';
49
+ if (msg.includes('Browser launch timeout') || msg.includes('Failed to launch')) return 'browser_launch';
50
+ if (msg.includes('intercepts pointer events')) return 'click_intercepted';
51
+ if (msg.includes('not visible') || msg.includes('not an <input>')) return 'element_error';
52
+ if (msg.includes('Blocked URL scheme') || msg.includes('Invalid URL')) return 'invalid_url';
53
+ if (msg.includes('net::') || msg.includes('ERR_NAME') || msg.includes('ERR_CONNECTION')) return 'network';
54
+ if (msg.includes('Navigation failed') || msg.includes('ERR_ABORTED')) return 'nav_aborted';
55
+ return 'unknown';
56
+ }
package/lib/youtube.js CHANGED
@@ -91,17 +91,28 @@ async function detectYtDlp(log) {
91
91
  await runYtDlp(candidate, ['--version'], 5000);
92
92
  ytDlpPath = candidate;
93
93
  log('info', 'yt-dlp found', { path: candidate });
94
- return;
94
+ return true;
95
95
  } catch {}
96
96
  }
97
97
  log('warn', 'yt-dlp not found — YouTube transcript endpoint will use browser fallback');
98
+ return false;
98
99
  }
99
100
 
100
101
  function hasYtDlp() {
101
102
  return ytDlpPath !== null;
102
103
  }
103
104
 
104
- async function ytDlpTranscript(reqId, url, videoId, lang) {
105
+ /**
106
+ * Re-detect yt-dlp if initial startup detection failed.
107
+ * Called lazily before each transcript request so a transient
108
+ * startup failure doesn't permanently disable yt-dlp.
109
+ */
110
+ async function ensureYtDlp(log) {
111
+ if (ytDlpPath) return true;
112
+ return await detectYtDlp(log);
113
+ }
114
+
115
+ async function ytDlpTranscript(reqId, url, videoId, lang, proxyUrl = null) {
105
116
  if (!ytDlpPath) {
106
117
  throw new Error('yt-dlp is not available');
107
118
  }
@@ -110,10 +121,13 @@ async function ytDlpTranscript(reqId, url, videoId, lang) {
110
121
  const normalizedLang = normalizeLanguage(lang);
111
122
  const tmpDir = await mkdtemp(join(tmpdir(), 'yt-'));
112
123
 
124
+ // Build proxy args if a proxy URL is provided
125
+ const proxyArgs = proxyUrl ? ['--proxy', proxyUrl] : [];
126
+
113
127
  try {
114
128
  const titleResult = await runYtDlp(
115
129
  ytDlpPath,
116
- ['--skip-download', '--no-warnings', '--print', '%(title)s', normalizedUrl],
130
+ [...proxyArgs, '--skip-download', '--no-warnings', '--print', '%(title)s', normalizedUrl],
117
131
  15000,
118
132
  );
119
133
  const title = titleResult.stdout.trim().split('\n')[0] || '';
@@ -121,6 +135,7 @@ async function ytDlpTranscript(reqId, url, videoId, lang) {
121
135
  await runYtDlp(
122
136
  ytDlpPath,
123
137
  [
138
+ ...proxyArgs,
124
139
  '--skip-download',
125
140
  '--write-sub',
126
141
  '--write-auto-sub',
@@ -283,4 +298,4 @@ function formatVttTs(ts) {
283
298
  return ts;
284
299
  }
285
300
 
286
- export { detectYtDlp, hasYtDlp, ytDlpTranscript, parseJson3, parseVtt, parseXml };
301
+ export { detectYtDlp, hasYtDlp, ensureYtDlp, ytDlpTranscript, parseJson3, parseVtt, parseXml };
@@ -2,7 +2,7 @@
2
2
  "id": "camofox-browser",
3
3
  "name": "Camofox Browser",
4
4
  "description": "Anti-detection browser automation for AI agents using Camoufox (Firefox-based)",
5
- "version": "1.4.1",
5
+ "version": "1.5.1",
6
6
  "configSchema": {
7
7
  "type": "object",
8
8
  "properties": {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@askjo/camofox-browser",
3
- "version": "1.4.1",
3
+ "version": "1.5.1",
4
4
  "description": "Headless browser automation server and OpenClaw plugin for AI agents - anti-detection, element refs, and session isolation",
5
5
  "type": "module",
6
6
  "main": "server.js",
package/plugin.ts CHANGED
@@ -151,6 +151,7 @@ async function startServer(
151
151
  // Server not ready yet
152
152
  }
153
153
  }
154
+ proc.kill();
154
155
  throw new Error("Server failed to start within 15 seconds");
155
156
  }
156
157