dp-worker 0.1.18 → 0.1.19
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/browser/cloakbrowser-backend.js +27 -10
- package/dist/browser/cloakbrowser-backend.js.map +1 -1
- package/dist/browser/proxy-relay.d.ts +50 -0
- package/dist/browser/proxy-relay.js +50 -0
- package/dist/browser/proxy-relay.js.map +1 -0
- package/dist/chrome-extension/omni-flow/manifest.json +1 -1
- package/package.json +2 -1
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import fs from "node:fs";
|
|
2
2
|
import path from "node:path";
|
|
3
3
|
import { OmniFlowSessionExportSchema, cloakFingerprintSeed, } from "dp-shared";
|
|
4
|
+
import { relayProxyIfAuthed } from "./proxy-relay.js";
|
|
4
5
|
const OMNI_FLOW_SESSION_FILENAME = "omni-flow-session.json";
|
|
5
6
|
/** Read + parse the local养号 session blob, or null if missing/invalid. */
|
|
6
7
|
function readSessionBlob(config) {
|
|
@@ -220,23 +221,39 @@ export async function launchCloakBrowserContext(params) {
|
|
|
220
221
|
// path → each point re-curved by CloakBrowser). We keep our humanize.ts as the
|
|
221
222
|
// single, backend-agnostic behavior layer; only the binary-level fingerprint +
|
|
222
223
|
// proxy come from CloakBrowser.
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
224
|
+
// Authenticated proxies must NOT go straight to CloakBrowser's `--proxy-server`
|
|
225
|
+
// path: Chromium's native proxy-auth handling deadlocks on Google/YouTube's
|
|
226
|
+
// parallel-connection fan-out (blank page). Route them through a loopback
|
|
227
|
+
// no-auth relay instead — extension-free and fingerprint/TLS-safe. No-auth
|
|
228
|
+
// proxies pass straight through. See proxy-relay.ts for the full rationale.
|
|
229
|
+
const relayed = await relayProxyIfAuthed(routing.proxy);
|
|
230
|
+
let ctx;
|
|
231
|
+
try {
|
|
232
|
+
ctx = (await cloak.launchPersistentContext({
|
|
233
|
+
userDataDir,
|
|
234
|
+
headless: config.browser.headless,
|
|
235
|
+
...(relayed.proxy ? { proxy: relayed.proxy } : {}),
|
|
236
|
+
...(routing.timezone ? { timezone: routing.timezone } : {}),
|
|
237
|
+
locale: localeFromTimezone(routing.timezone),
|
|
238
|
+
args: [`--fingerprint=${seed}`],
|
|
239
|
+
humanize: false,
|
|
240
|
+
}));
|
|
241
|
+
}
|
|
242
|
+
catch (err) {
|
|
243
|
+
await relayed.dispose();
|
|
244
|
+
throw err;
|
|
245
|
+
}
|
|
246
|
+
// Tear the relay down with the context (idle-close, crash, or shutdown).
|
|
247
|
+
ctx.once("close", () => void relayed.dispose());
|
|
232
248
|
// Inject cookies before any navigation happens.
|
|
233
249
|
const cookies = (blob?.cookies ?? [])
|
|
234
250
|
.map(toPlaywrightCookie)
|
|
235
251
|
.filter((c) => c !== null);
|
|
236
252
|
const injected = await injectCookies(ctx, cookies);
|
|
253
|
+
const relayNote = relayed.proxy && relayed.proxy !== routing.proxy ? " via local relay" : "";
|
|
237
254
|
console.log(`🛡️ CloakBrowser launched (no extension) — fingerprint seed: ${seed} (stable per worker), ` +
|
|
238
255
|
`proxy/timezone source: ${routing.source} ` +
|
|
239
|
-
`(proxy: ${routing.proxy?.server ?? "none"}, timezone: ${routing.timezone ?? "system"}), ` +
|
|
256
|
+
`(proxy: ${routing.proxy?.server ?? "none"}${relayNote}, timezone: ${routing.timezone ?? "system"}), ` +
|
|
240
257
|
`cookies injected: ${injected}/${cookies.length}`);
|
|
241
258
|
return ctx;
|
|
242
259
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloakbrowser-backend.js","sourceRoot":"","sources":["../../src/browser/cloakbrowser-backend.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EACL,2BAA2B,EAC3B,oBAAoB,GAGrB,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"cloakbrowser-backend.js","sourceRoot":"","sources":["../../src/browser/cloakbrowser-backend.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import type { CloakProxy } from "dp-shared";
|
|
2
|
+
/**
|
|
3
|
+
* Authenticated-proxy relay for the CloakBrowser backend.
|
|
4
|
+
*
|
|
5
|
+
* WHY THIS EXISTS
|
|
6
|
+
* When CloakBrowser (Chromium) gets an *authenticated* proxy via the
|
|
7
|
+
* `--proxy-server` binary flag (i.e. Playwright's `proxy: {server, username,
|
|
8
|
+
* password}` option), Chromium handles the proxy-auth (407) challenge itself.
|
|
9
|
+
* That native path deadlocks on Google/YouTube: opening one YouTube page fans
|
|
10
|
+
* out to ~19 parallel connections (youtube.com + googlevideo + ytimg + gstatic
|
|
11
|
+
* + …), which all hit the proxy-auth gate at once and jam Chromium's built-in
|
|
12
|
+
* auth handling — the page hangs on a blank screen. Ordinary single-connection
|
|
13
|
+
* sites (X) and `curl` don't trigger it, which is why "curl works / X works /
|
|
14
|
+
* YouTube blank" was so confusing. Reproduced identically on stock Google
|
|
15
|
+
* Chrome, so it is NOT a CloakBrowser bug — it is Chromium's authenticated
|
|
16
|
+
* `--proxy-server` path choking on Google's connection fan-out.
|
|
17
|
+
*
|
|
18
|
+
* THE FIX (extension-free, fingerprint-safe)
|
|
19
|
+
* Move the proxy authentication OUT of the browser. `proxy-chain` starts a tiny
|
|
20
|
+
* loopback proxy on 127.0.0.1 with NO auth, which forwards to the real upstream
|
|
21
|
+
* proxy WITH the credentials attached. CloakBrowser only ever talks to the
|
|
22
|
+
* no-auth localhost proxy, so it never touches the auth gate and Google loads.
|
|
23
|
+
*
|
|
24
|
+
* This is invisible to any remote site and to anti-bot fingerprinting:
|
|
25
|
+
* - it lives on 127.0.0.1 — remote sites only ever see the upstream exit IP;
|
|
26
|
+
* - it is a pure TCP CONNECT tunnel — the browser's TLS handshake is
|
|
27
|
+
* end-to-end with the target *through* the tunnel, so the JA3/JA4 TLS
|
|
28
|
+
* fingerprint is CloakBrowser's real one, byte-for-byte untouched;
|
|
29
|
+
* - no browser extension, no page/script injection — the process is identical
|
|
30
|
+
* to the bare `--proxy-server` case, just pointed at a local port.
|
|
31
|
+
*
|
|
32
|
+
* Only proxies that actually carry credentials are relayed; a no-auth proxy is
|
|
33
|
+
* passed straight through (Chromium handles those fine, no deadlock).
|
|
34
|
+
*
|
|
35
|
+
* Mirror: dp-cloak/src/main/proxy-relay.ts keeps a copy of this for the desktop
|
|
36
|
+
* app's launch paths (see SYNC.md — CloakBrowser is a dp-worker/dp-cloak-only
|
|
37
|
+
* divergence and cannot live in dp-shared, which the Cloudflare center bundles).
|
|
38
|
+
*/
|
|
39
|
+
export interface RelayedProxy {
|
|
40
|
+
/** Proxy option to hand to cloakbrowser (a no-auth localhost proxy when the
|
|
41
|
+
* upstream is authenticated; the original proxy otherwise). */
|
|
42
|
+
proxy: CloakProxy | undefined;
|
|
43
|
+
/** Tear down the relay. Idempotent; safe to call on context close. */
|
|
44
|
+
dispose: () => Promise<void>;
|
|
45
|
+
}
|
|
46
|
+
/**
|
|
47
|
+
* If `proxy` carries credentials, spin up a loopback no-auth relay to it and
|
|
48
|
+
* return the local proxy to use instead. Otherwise return the proxy unchanged.
|
|
49
|
+
*/
|
|
50
|
+
export declare function relayProxyIfAuthed(proxy: CloakProxy | undefined): Promise<RelayedProxy>;
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import { anonymizeProxy, closeAnonymizedProxy } from "proxy-chain";
|
|
2
|
+
const NOOP_DISPOSE = async () => { };
|
|
3
|
+
/**
|
|
4
|
+
* If `proxy` carries credentials, spin up a loopback no-auth relay to it and
|
|
5
|
+
* return the local proxy to use instead. Otherwise return the proxy unchanged.
|
|
6
|
+
*/
|
|
7
|
+
export async function relayProxyIfAuthed(proxy) {
|
|
8
|
+
// No proxy, or a no-auth proxy: nothing to relay — Chromium handles it.
|
|
9
|
+
if (!proxy || (!proxy.username && !proxy.password)) {
|
|
10
|
+
return { proxy, dispose: NOOP_DISPOSE };
|
|
11
|
+
}
|
|
12
|
+
const upstreamUrl = buildUpstreamUrl(proxy);
|
|
13
|
+
let localUrl;
|
|
14
|
+
try {
|
|
15
|
+
localUrl = await anonymizeProxy(upstreamUrl);
|
|
16
|
+
}
|
|
17
|
+
catch (err) {
|
|
18
|
+
// Relay failed to start (e.g. no free loopback port). Fall back to the
|
|
19
|
+
// proxy as-is — never worse than the pre-relay behavior (Google may hang,
|
|
20
|
+
// but every other task keeps working). Do NOT fail the browser launch.
|
|
21
|
+
console.warn(`⚠️ proxy auth relay failed to start; using the proxy directly ` +
|
|
22
|
+
`(Google/YouTube may not load): ${String(err)}`);
|
|
23
|
+
return { proxy, dispose: NOOP_DISPOSE };
|
|
24
|
+
}
|
|
25
|
+
let closed = false;
|
|
26
|
+
return {
|
|
27
|
+
proxy: { server: localUrl },
|
|
28
|
+
dispose: async () => {
|
|
29
|
+
if (closed)
|
|
30
|
+
return;
|
|
31
|
+
closed = true;
|
|
32
|
+
// closeConnections=true so in-flight tunnels don't keep the port alive.
|
|
33
|
+
await closeAnonymizedProxy(localUrl, true).catch(() => { });
|
|
34
|
+
},
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
/**
|
|
38
|
+
* Build a single credential-embedded URL (`scheme://user:pass@host:port`) for
|
|
39
|
+
* proxy-chain from CloakBrowser's split {server, username, password} form.
|
|
40
|
+
* Credentials are percent-encoded so `@`, `:` etc. in a password stay safe.
|
|
41
|
+
*/
|
|
42
|
+
function buildUpstreamUrl(p) {
|
|
43
|
+
const m = /^([a-z][a-z0-9+.-]*):\/\/(.+)$/i.exec(p.server.trim());
|
|
44
|
+
const scheme = (m ? m[1] : "http").toLowerCase();
|
|
45
|
+
const hostport = m ? m[2] : p.server.trim();
|
|
46
|
+
const user = p.username ? encodeURIComponent(p.username) : "";
|
|
47
|
+
const pass = p.password ? `:${encodeURIComponent(p.password)}` : "";
|
|
48
|
+
return `${scheme}://${user}${pass}@${hostport}`;
|
|
49
|
+
}
|
|
50
|
+
//# sourceMappingURL=proxy-relay.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"proxy-relay.js","sourceRoot":"","sources":["../../src/browser/proxy-relay.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAgDnE,MAAM,YAAY,GAAG,KAAK,IAAmB,EAAE,GAAE,CAAC,CAAC;AAEnD;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,KAA6B;IAE7B,wEAAwE;IACxE,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;QACnD,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC;IAC1C,CAAC;IAED,MAAM,WAAW,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAC5C,IAAI,QAAgB,CAAC;IACrB,IAAI,CAAC;QACH,QAAQ,GAAG,MAAM,cAAc,CAAC,WAAW,CAAC,CAAC;IAC/C,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,uEAAuE;QACvE,0EAA0E;QAC1E,uEAAuE;QACvE,OAAO,CAAC,IAAI,CACV,iEAAiE;YAC/D,kCAAkC,MAAM,CAAC,GAAG,CAAC,EAAE,CAClD,CAAC;QACF,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC;IAC1C,CAAC;IACD,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,OAAO;QACL,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE;QAC3B,OAAO,EAAE,KAAK,IAAI,EAAE;YAClB,IAAI,MAAM;gBAAE,OAAO;YACnB,MAAM,GAAG,IAAI,CAAC;YACd,wEAAwE;YACxE,MAAM,oBAAoB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAC7D,CAAC;KACF,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAS,gBAAgB,CAAC,CAAa;IACrC,MAAM,CAAC,GAAG,iCAAiC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IAClE,MAAM,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC;IACjD,MAAM,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IAC5C,MAAM,IAAI,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9D,MAAM,IAAI,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,kBAAkB,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACpE,OAAO,GAAG,MAAM,MAAM,IAAI,GAAG,IAAI,IAAI,QAAQ,EAAE,CAAC;AAClD,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dp-worker",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.19",
|
|
4
4
|
"description": "Dipclaw Worker (worker) — browser automation agent with scheduling, skills, and LLM integration. Connects to dp-center via center mode or runs standalone.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"bin": {
|
|
@@ -52,6 +52,7 @@
|
|
|
52
52
|
"node-cron": "^4.2.1",
|
|
53
53
|
"openai": "^6.34.0",
|
|
54
54
|
"playwright-core": "^1.59.1",
|
|
55
|
+
"proxy-chain": "^3.0.0",
|
|
55
56
|
"sharp": "^0.34.5",
|
|
56
57
|
"ws": "^8.20.1",
|
|
57
58
|
"zod": "^4.3.6"
|