sweetlink 0.2.0 → 0.2.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/CHANGELOG.md +6 -2
- package/LICENSE +1 -1
- package/README.md +6 -6
- package/dist/daemon/src/codename.d.ts.map +1 -1
- package/dist/daemon/src/codename.js +11 -11
- package/dist/daemon/src/codename.js.map +1 -1
- package/dist/daemon/src/index.d.ts +1 -1
- package/dist/daemon/src/index.js +131 -122
- package/dist/daemon/src/index.js.map +1 -1
- package/dist/shared/src/env.d.ts.map +1 -1
- package/dist/shared/src/env.js +12 -12
- package/dist/shared/src/env.js.map +1 -1
- package/dist/shared/src/index.d.ts +30 -30
- package/dist/shared/src/index.d.ts.map +1 -1
- package/dist/shared/src/index.js +17 -17
- package/dist/shared/src/index.js.map +1 -1
- package/dist/shared/src/node.d.ts +1 -1
- package/dist/shared/src/node.d.ts.map +1 -1
- package/dist/shared/src/node.js +18 -18
- package/dist/shared/src/node.js.map +1 -1
- package/dist/src/codex.d.ts +1 -1
- package/dist/src/codex.js +19 -19
- package/dist/src/codex.js.map +1 -1
- package/dist/src/commands/click.d.ts +1 -1
- package/dist/src/commands/click.d.ts.map +1 -1
- package/dist/src/commands/click.js +32 -24
- package/dist/src/commands/click.js.map +1 -1
- package/dist/src/commands/run-js.d.ts +1 -1
- package/dist/src/commands/run-js.d.ts.map +1 -1
- package/dist/src/commands/run-js.js +10 -10
- package/dist/src/commands/run-js.js.map +1 -1
- package/dist/src/commands/trust-ca.d.ts +1 -1
- package/dist/src/commands/trust-ca.js +15 -15
- package/dist/src/core/config-file.d.ts.map +1 -1
- package/dist/src/core/config-file.js +49 -41
- package/dist/src/core/config-file.js.map +1 -1
- package/dist/src/core/config.d.ts +2 -2
- package/dist/src/core/config.d.ts.map +1 -1
- package/dist/src/core/config.js +22 -18
- package/dist/src/core/config.js.map +1 -1
- package/dist/src/core/dev-bootstrap.d.ts +1 -1
- package/dist/src/core/dev-bootstrap.d.ts.map +1 -1
- package/dist/src/core/dev-bootstrap.js +12 -12
- package/dist/src/core/dev-bootstrap.js.map +1 -1
- package/dist/src/core/env.d.ts +1 -1
- package/dist/src/core/env.d.ts.map +1 -1
- package/dist/src/core/env.js +3 -3
- package/dist/src/core/env.js.map +1 -1
- package/dist/src/devtools-registry.d.ts.map +1 -1
- package/dist/src/devtools-registry.js +48 -46
- package/dist/src/devtools-registry.js.map +1 -1
- package/dist/src/env.d.ts +1 -1
- package/dist/src/env.js +1 -1
- package/dist/src/http.d.ts.map +1 -1
- package/dist/src/http.js +7 -6
- package/dist/src/http.js.map +1 -1
- package/dist/src/index.d.ts +7 -7
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +399 -367
- package/dist/src/index.js.map +1 -1
- package/dist/src/runtime/browser/client.d.ts +3 -3
- package/dist/src/runtime/browser/client.d.ts.map +1 -1
- package/dist/src/runtime/browser/client.js +79 -72
- package/dist/src/runtime/browser/client.js.map +1 -1
- package/dist/src/runtime/browser/commands/index.d.ts +2 -2
- package/dist/src/runtime/browser/commands/index.js +17 -17
- package/dist/src/runtime/browser/commands/index.js.map +1 -1
- package/dist/src/runtime/browser/dom-to-image-loader.d.ts.map +1 -1
- package/dist/src/runtime/browser/dom-to-image-loader.js +7 -7
- package/dist/src/runtime/browser/dom-to-image-loader.js.map +1 -1
- package/dist/src/runtime/browser/index.d.ts +3 -3
- package/dist/src/runtime/browser/index.js +2 -2
- package/dist/src/runtime/browser/module-loader.js +2 -2
- package/dist/src/runtime/browser/screenshot/hooks.d.ts +5 -5
- package/dist/src/runtime/browser/screenshot/hooks.d.ts.map +1 -1
- package/dist/src/runtime/browser/screenshot/hooks.js +32 -29
- package/dist/src/runtime/browser/screenshot/hooks.js.map +1 -1
- package/dist/src/runtime/browser/screenshot/index.d.ts +3 -3
- package/dist/src/runtime/browser/screenshot/index.d.ts.map +1 -1
- package/dist/src/runtime/browser/screenshot/index.js +17 -15
- package/dist/src/runtime/browser/screenshot/index.js.map +1 -1
- package/dist/src/runtime/browser/screenshot/renderers/dom-to-image.d.ts +1 -1
- package/dist/src/runtime/browser/screenshot/renderers/dom-to-image.js +13 -13
- package/dist/src/runtime/browser/screenshot/renderers/dom-to-image.js.map +1 -1
- package/dist/src/runtime/browser/screenshot/renderers/html2canvas.d.ts +1 -1
- package/dist/src/runtime/browser/screenshot/renderers/html2canvas.d.ts.map +1 -1
- package/dist/src/runtime/browser/screenshot/renderers/html2canvas.js +24 -24
- package/dist/src/runtime/browser/screenshot/renderers/html2canvas.js.map +1 -1
- package/dist/src/runtime/browser/screenshot/targets.d.ts +2 -2
- package/dist/src/runtime/browser/screenshot/targets.js +9 -9
- package/dist/src/runtime/browser/screenshot/utils.d.ts +1 -1
- package/dist/src/runtime/browser/screenshot/utils.d.ts.map +1 -1
- package/dist/src/runtime/browser/screenshot/utils.js +73 -71
- package/dist/src/runtime/browser/screenshot/utils.js.map +1 -1
- package/dist/src/runtime/browser/selector-discovery.d.ts +1 -1
- package/dist/src/runtime/browser/selector-discovery.d.ts.map +1 -1
- package/dist/src/runtime/browser/selector-discovery.js +24 -22
- package/dist/src/runtime/browser/selector-discovery.js.map +1 -1
- package/dist/src/runtime/browser/storage/session-storage.d.ts +1 -1
- package/dist/src/runtime/browser/storage/session-storage.d.ts.map +1 -1
- package/dist/src/runtime/browser/storage/session-storage.js +12 -10
- package/dist/src/runtime/browser/storage/session-storage.js.map +1 -1
- package/dist/src/runtime/browser/types.d.ts +7 -7
- package/dist/src/runtime/browser/types.js +1 -1
- package/dist/src/runtime/browser/utils/console.d.ts +1 -1
- package/dist/src/runtime/browser/utils/console.js +16 -16
- package/dist/src/runtime/browser/utils/console.js.map +1 -1
- package/dist/src/runtime/browser/utils/environment.js +2 -2
- package/dist/src/runtime/browser/utils/errors.d.ts.map +1 -1
- package/dist/src/runtime/browser/utils/errors.js +11 -11
- package/dist/src/runtime/browser/utils/number.d.ts.map +1 -1
- package/dist/src/runtime/browser/utils/number.js.map +1 -1
- package/dist/src/runtime/browser/utils/object.d.ts.map +1 -1
- package/dist/src/runtime/browser/utils/object.js +2 -2
- package/dist/src/runtime/browser/utils/object.js.map +1 -1
- package/dist/src/runtime/browser/utils/sanitize.js +2 -2
- package/dist/src/runtime/browser/utils/time.d.ts.map +1 -1
- package/dist/src/runtime/browser/utils/time.js +1 -1
- package/dist/src/runtime/chrome/cookies.d.ts +4 -4
- package/dist/src/runtime/chrome/cookies.d.ts.map +1 -1
- package/dist/src/runtime/chrome/cookies.js +31 -31
- package/dist/src/runtime/chrome/cookies.js.map +1 -1
- package/dist/src/runtime/chrome/deep-link.d.ts +1 -1
- package/dist/src/runtime/chrome/deep-link.d.ts.map +1 -1
- package/dist/src/runtime/chrome/deep-link.js +46 -36
- package/dist/src/runtime/chrome/deep-link.js.map +1 -1
- package/dist/src/runtime/chrome/diagnostics.d.ts.map +1 -1
- package/dist/src/runtime/chrome/diagnostics.js +13 -11
- package/dist/src/runtime/chrome/diagnostics.js.map +1 -1
- package/dist/src/runtime/chrome/focus.d.ts.map +1 -1
- package/dist/src/runtime/chrome/focus.js +5 -5
- package/dist/src/runtime/chrome/focus.js.map +1 -1
- package/dist/src/runtime/chrome/launch.d.ts.map +1 -1
- package/dist/src/runtime/chrome/launch.js +30 -30
- package/dist/src/runtime/chrome/launch.js.map +1 -1
- package/dist/src/runtime/chrome/puppeteer.d.ts +2 -2
- package/dist/src/runtime/chrome/puppeteer.d.ts.map +1 -1
- package/dist/src/runtime/chrome/puppeteer.js +16 -11
- package/dist/src/runtime/chrome/puppeteer.js.map +1 -1
- package/dist/src/runtime/chrome/reuse.d.ts.map +1 -1
- package/dist/src/runtime/chrome/reuse.js +38 -35
- package/dist/src/runtime/chrome/reuse.js.map +1 -1
- package/dist/src/runtime/chrome/session.d.ts +1 -1
- package/dist/src/runtime/chrome/session.d.ts.map +1 -1
- package/dist/src/runtime/chrome/session.js +12 -10
- package/dist/src/runtime/chrome/session.js.map +1 -1
- package/dist/src/runtime/chrome.d.ts +8 -8
- package/dist/src/runtime/chrome.js +8 -8
- package/dist/src/runtime/cookies.d.ts +1 -16
- package/dist/src/runtime/cookies.d.ts.map +1 -1
- package/dist/src/runtime/cookies.js +175 -286
- package/dist/src/runtime/cookies.js.map +1 -1
- package/dist/src/runtime/devstack.d.ts +1 -1
- package/dist/src/runtime/devstack.d.ts.map +1 -1
- package/dist/src/runtime/devstack.js +31 -28
- package/dist/src/runtime/devstack.js.map +1 -1
- package/dist/src/runtime/devtools/background.js +22 -22
- package/dist/src/runtime/devtools/cdp.d.ts +3 -3
- package/dist/src/runtime/devtools/cdp.d.ts.map +1 -1
- package/dist/src/runtime/devtools/cdp.js +59 -55
- package/dist/src/runtime/devtools/cdp.js.map +1 -1
- package/dist/src/runtime/devtools/config.d.ts.map +1 -1
- package/dist/src/runtime/devtools/config.js +15 -15
- package/dist/src/runtime/devtools/config.js.map +1 -1
- package/dist/src/runtime/devtools/constants.d.ts.map +1 -1
- package/dist/src/runtime/devtools/constants.js +18 -10
- package/dist/src/runtime/devtools/constants.js.map +1 -1
- package/dist/src/runtime/devtools/diagnostics.d.ts +4 -4
- package/dist/src/runtime/devtools/diagnostics.d.ts.map +1 -1
- package/dist/src/runtime/devtools/diagnostics.js +40 -38
- package/dist/src/runtime/devtools/diagnostics.js.map +1 -1
- package/dist/src/runtime/devtools/oauth.d.ts +1 -1
- package/dist/src/runtime/devtools/oauth.d.ts.map +1 -1
- package/dist/src/runtime/devtools/oauth.js +35 -28
- package/dist/src/runtime/devtools/oauth.js.map +1 -1
- package/dist/src/runtime/devtools/types.d.ts +3 -3
- package/dist/src/runtime/devtools/types.d.ts.map +1 -1
- package/dist/src/runtime/devtools.d.ts +7 -7
- package/dist/src/runtime/devtools.js +7 -7
- package/dist/src/runtime/next-devtools.d.ts.map +1 -1
- package/dist/src/runtime/next-devtools.js +12 -12
- package/dist/src/runtime/next-devtools.js.map +1 -1
- package/dist/src/runtime/screenshot.d.ts +9 -9
- package/dist/src/runtime/screenshot.d.ts.map +1 -1
- package/dist/src/runtime/screenshot.js +65 -46
- package/dist/src/runtime/screenshot.js.map +1 -1
- package/dist/src/runtime/scripts.d.ts +1 -1
- package/dist/src/runtime/scripts.d.ts.map +1 -1
- package/dist/src/runtime/scripts.js +28 -28
- package/dist/src/runtime/scripts.js.map +1 -1
- package/dist/src/runtime/session.d.ts +6 -6
- package/dist/src/runtime/session.d.ts.map +1 -1
- package/dist/src/runtime/session.js +35 -35
- package/dist/src/runtime/session.js.map +1 -1
- package/dist/src/runtime/smoke.d.ts +3 -3
- package/dist/src/runtime/smoke.d.ts.map +1 -1
- package/dist/src/runtime/smoke.js +85 -79
- package/dist/src/runtime/smoke.js.map +1 -1
- package/dist/src/runtime/url.d.ts +2 -2
- package/dist/src/runtime/url.d.ts.map +1 -1
- package/dist/src/runtime/url.js +20 -20
- package/dist/src/runtime/url.js.map +1 -1
- package/dist/src/screenshot-hooks.d.ts +1 -1
- package/dist/src/screenshot-hooks.d.ts.map +1 -1
- package/dist/src/screenshot-hooks.js +12 -12
- package/dist/src/screenshot-hooks.js.map +1 -1
- package/dist/src/shared/env.d.ts.map +1 -1
- package/dist/src/shared/env.js +11 -11
- package/dist/src/shared/env.js.map +1 -1
- package/dist/src/shared/index.d.ts +30 -30
- package/dist/src/shared/index.d.ts.map +1 -1
- package/dist/src/shared/index.js +17 -17
- package/dist/src/shared/index.js.map +1 -1
- package/dist/src/shared/node.d.ts +1 -1
- package/dist/src/shared/node.d.ts.map +1 -1
- package/dist/src/shared/node.js +18 -18
- package/dist/src/shared/node.js.map +1 -1
- package/dist/src/token.d.ts +1 -1
- package/dist/src/token.d.ts.map +1 -1
- package/dist/src/token.js +16 -16
- package/dist/src/token.js.map +1 -1
- package/dist/src/types.d.ts +1 -1
- package/dist/src/util/app-label.js +4 -4
- package/dist/src/util/errors.d.ts.map +1 -1
- package/dist/src/util/errors.js +12 -10
- package/dist/src/util/errors.js.map +1 -1
- package/dist/src/util/path.js +2 -2
- package/dist/src/util/regex.js +4 -4
- package/package.json +45 -39
|
@@ -1,19 +1,19 @@
|
|
|
1
|
-
import { spawn } from
|
|
2
|
-
import { existsSync, mkdirSync } from
|
|
3
|
-
import os from
|
|
4
|
-
import path from
|
|
5
|
-
import { cliEnv } from
|
|
6
|
-
import { saveDevToolsConfig } from
|
|
7
|
-
import { primeControlledChromeCookies } from
|
|
8
|
-
import { findAvailablePort } from
|
|
9
|
-
const DEFAULT_MAC_CHROME =
|
|
1
|
+
import { spawn } from "node:child_process";
|
|
2
|
+
import { existsSync, mkdirSync } from "node:fs";
|
|
3
|
+
import os from "node:os";
|
|
4
|
+
import path from "node:path";
|
|
5
|
+
import { cliEnv } from "../../env.js";
|
|
6
|
+
import { saveDevToolsConfig } from "../devtools.js";
|
|
7
|
+
import { primeControlledChromeCookies } from "./cookies.js";
|
|
8
|
+
import { findAvailablePort } from "./reuse.js";
|
|
9
|
+
const DEFAULT_MAC_CHROME = "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome";
|
|
10
10
|
export async function launchChrome(target, options = {}) {
|
|
11
11
|
const chromePath = cliEnv.chromePath ?? DEFAULT_MAC_CHROME;
|
|
12
12
|
if (!existsSync(chromePath)) {
|
|
13
13
|
throw new Error(`Google Chrome is required but was not found at "${chromePath}". Set SWEETLINK_CHROME_PATH to override the location.`);
|
|
14
14
|
}
|
|
15
|
-
const background = process.platform ===
|
|
16
|
-
await spawnChromeDetached(chromePath, [
|
|
15
|
+
const background = process.platform === "darwin" && options.foreground !== true;
|
|
16
|
+
await spawnChromeDetached(chromePath, ["--new-tab", target], { background });
|
|
17
17
|
}
|
|
18
18
|
export async function launchControlledChrome(target, options) {
|
|
19
19
|
const chromePath = cliEnv.chromePath ?? DEFAULT_MAC_CHROME;
|
|
@@ -26,18 +26,18 @@ export async function launchControlledChrome(target, options) {
|
|
|
26
26
|
const args = [
|
|
27
27
|
`--remote-debugging-port=${port}`,
|
|
28
28
|
`--user-data-dir=${userDataDirectory}`,
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
29
|
+
"--no-first-run",
|
|
30
|
+
"--no-default-browser-check",
|
|
31
|
+
"--disable-background-networking",
|
|
32
|
+
"--disable-renderer-backgrounding",
|
|
33
|
+
"--allow-insecure-localhost",
|
|
34
|
+
"--new-window",
|
|
35
35
|
target,
|
|
36
36
|
];
|
|
37
37
|
if (options.headless) {
|
|
38
|
-
args.push(
|
|
38
|
+
args.push("--headless=new", "--disable-gpu", "--hide-scrollbars");
|
|
39
39
|
}
|
|
40
|
-
const background = process.platform ===
|
|
40
|
+
const background = process.platform === "darwin" && options.foreground !== true;
|
|
41
41
|
await spawnChromeDetached(chromePath, args, { background });
|
|
42
42
|
const devtoolsUrl = `http://127.0.0.1:${port}`;
|
|
43
43
|
await saveDevToolsConfig({
|
|
@@ -47,27 +47,27 @@ export async function launchControlledChrome(target, options) {
|
|
|
47
47
|
updatedAt: Date.now(),
|
|
48
48
|
targetUrl: target,
|
|
49
49
|
}).catch((error) => {
|
|
50
|
-
console.warn(
|
|
50
|
+
console.warn("Failed to persist DevTools config:", error);
|
|
51
51
|
});
|
|
52
52
|
if (options.cookieSync) {
|
|
53
53
|
await primeControlledChromeCookies({
|
|
54
54
|
devtoolsUrl,
|
|
55
55
|
targetUrl: target,
|
|
56
56
|
reload: true,
|
|
57
|
-
context:
|
|
57
|
+
context: "new-window",
|
|
58
58
|
});
|
|
59
59
|
}
|
|
60
60
|
return { port, userDataDir: userDataDirectory, devtoolsUrl };
|
|
61
61
|
}
|
|
62
62
|
export function prepareChromeLaunch(platform, chromePath, chromeArgs, options = {}) {
|
|
63
63
|
const background = Boolean(options.background);
|
|
64
|
-
if (platform ===
|
|
65
|
-
const appTarget = deriveMacChromeApplication(chromePath) ??
|
|
66
|
-
const args = [
|
|
64
|
+
if (platform === "darwin" && background) {
|
|
65
|
+
const appTarget = deriveMacChromeApplication(chromePath) ?? "Google Chrome";
|
|
66
|
+
const args = ["-g", "-n", "-a", appTarget];
|
|
67
67
|
if (chromeArgs.length > 0) {
|
|
68
|
-
args.push(
|
|
68
|
+
args.push("--args", ...chromeArgs);
|
|
69
69
|
}
|
|
70
|
-
return { command:
|
|
70
|
+
return { command: "open", args };
|
|
71
71
|
}
|
|
72
72
|
return { command: chromePath, args: chromeArgs };
|
|
73
73
|
}
|
|
@@ -76,10 +76,10 @@ export async function spawnChromeDetached(chromePath, chromeArgs, options = {})
|
|
|
76
76
|
await new Promise((resolve, reject) => {
|
|
77
77
|
const child = spawn(spec.command, spec.args, {
|
|
78
78
|
detached: true,
|
|
79
|
-
stdio:
|
|
79
|
+
stdio: "ignore",
|
|
80
80
|
});
|
|
81
|
-
child.once(
|
|
82
|
-
child.once(
|
|
81
|
+
child.once("error", (error) => reject(error));
|
|
82
|
+
child.once("spawn", () => {
|
|
83
83
|
child.unref();
|
|
84
84
|
resolve();
|
|
85
85
|
});
|
|
@@ -88,7 +88,7 @@ export async function spawnChromeDetached(chromePath, chromeArgs, options = {})
|
|
|
88
88
|
function deriveMacChromeApplication(chromePath) {
|
|
89
89
|
let candidate = chromePath;
|
|
90
90
|
for (let depth = 0; depth < 4; depth += 1) {
|
|
91
|
-
if (candidate.endsWith(
|
|
91
|
+
if (candidate.endsWith(".app")) {
|
|
92
92
|
return candidate;
|
|
93
93
|
}
|
|
94
94
|
const parent = path.dirname(candidate);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launch.js","sourceRoot":"","sources":["../../../../src/runtime/chrome/launch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAChD,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,4BAA4B,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAE/C,MAAM,kBAAkB,GAAG,8DAA8D,CAAC;AAE1F,MAAM,CAAC,KAAK,UAAU,YAAY,
|
|
1
|
+
{"version":3,"file":"launch.js","sourceRoot":"","sources":["../../../../src/runtime/chrome/launch.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { Browser as PuppeteerBrowser, Page as PuppeteerPage } from
|
|
2
|
-
export declare function connectPuppeteerBrowser(puppeteer: typeof import(
|
|
1
|
+
import type { Browser as PuppeteerBrowser, Page as PuppeteerPage } from "puppeteer-core";
|
|
2
|
+
export declare function connectPuppeteerBrowser(puppeteer: typeof import("puppeteer-core").default, browserURL: string, attempts: number): Promise<PuppeteerBrowser | null>;
|
|
3
3
|
export declare function resolvePuppeteerPage(browser: PuppeteerBrowser, targetUrl: string): Promise<PuppeteerPage | null>;
|
|
4
4
|
export declare function navigatePuppeteerPage(page: PuppeteerPage, targetUrl: string, attempts?: number): Promise<boolean>;
|
|
5
5
|
export declare function waitForPageReady(page: PuppeteerPage): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"puppeteer.d.ts","sourceRoot":"","sources":["../../../../src/runtime/chrome/puppeteer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,IAAI,gBAAgB,EAAE,IAAI,IAAI,aAAa,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"puppeteer.d.ts","sourceRoot":"","sources":["../../../../src/runtime/chrome/puppeteer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,IAAI,gBAAgB,EAAE,IAAI,IAAI,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAWzF,wBAAsB,uBAAuB,CAC3C,SAAS,EAAE,cAAc,gBAAgB,EAAE,OAAO,EAClD,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAwBlC;AAED,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,gBAAgB,EACzB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAmB/B;AAED,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,aAAa,EACnB,SAAS,EAAE,MAAM,EACjB,QAAQ,SAAI,GACX,OAAO,CAAC,OAAO,CAAC,CAiBlB;AAED,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAczE;AAED,wBAAsB,sBAAsB,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAM/E"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { logDebugError } from
|
|
2
|
-
import { delay } from
|
|
3
|
-
import { urlsRoughlyMatch } from
|
|
4
|
-
import { PAGE_READY_PRIMARY_TIMEOUT_MS, PAGE_READY_SECONDARY_TIMEOUT_MS, PUPPETEER_NAVIGATION_TIMEOUT_MS, PUPPETEER_PROTOCOL_TIMEOUT_MS, } from
|
|
1
|
+
import { logDebugError } from "../../util/errors.js";
|
|
2
|
+
import { delay } from "../../util/time.js";
|
|
3
|
+
import { urlsRoughlyMatch } from "../url.js";
|
|
4
|
+
import { PAGE_READY_PRIMARY_TIMEOUT_MS, PAGE_READY_SECONDARY_TIMEOUT_MS, PUPPETEER_NAVIGATION_TIMEOUT_MS, PUPPETEER_PROTOCOL_TIMEOUT_MS, } from "./constants.js";
|
|
5
5
|
export async function connectPuppeteerBrowser(puppeteer, browserURL, attempts) {
|
|
6
6
|
let lastError;
|
|
7
7
|
const totalAttempts = Math.max(1, attempts);
|
|
@@ -21,7 +21,7 @@ export async function connectPuppeteerBrowser(puppeteer, browserURL, attempts) {
|
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
|
-
console.warn(
|
|
24
|
+
console.warn("Unable to connect to DevTools endpoint at", browserURL, lastError ?? "unknown error");
|
|
25
25
|
return null;
|
|
26
26
|
}
|
|
27
27
|
export async function resolvePuppeteerPage(browser, targetUrl) {
|
|
@@ -49,11 +49,14 @@ export async function navigatePuppeteerPage(page, targetUrl, attempts = 2) {
|
|
|
49
49
|
for (let attempt = 0; attempt < Math.max(1, attempts); attempt += 1) {
|
|
50
50
|
try {
|
|
51
51
|
// biome-ignore lint/performance/noAwaitInLoops: navigation retries must happen sequentially.
|
|
52
|
-
await page.goto(targetUrl, {
|
|
52
|
+
await page.goto(targetUrl, {
|
|
53
|
+
waitUntil: "domcontentloaded",
|
|
54
|
+
timeout: PUPPETEER_NAVIGATION_TIMEOUT_MS,
|
|
55
|
+
});
|
|
53
56
|
return true;
|
|
54
57
|
}
|
|
55
58
|
catch (error) {
|
|
56
|
-
logDebugError(
|
|
59
|
+
logDebugError("Unable to navigate controlled Chrome tab to target", error);
|
|
57
60
|
if (attempt < attempts - 1) {
|
|
58
61
|
await delay(300 * (attempt + 1));
|
|
59
62
|
}
|
|
@@ -63,11 +66,13 @@ export async function navigatePuppeteerPage(page, targetUrl, attempts = 2) {
|
|
|
63
66
|
}
|
|
64
67
|
export async function waitForPageReady(page) {
|
|
65
68
|
try {
|
|
66
|
-
await page.waitForFunction(() => document.readyState ===
|
|
69
|
+
await page.waitForFunction(() => document.readyState === "complete", {
|
|
70
|
+
timeout: PAGE_READY_PRIMARY_TIMEOUT_MS,
|
|
71
|
+
});
|
|
67
72
|
}
|
|
68
73
|
catch {
|
|
69
74
|
try {
|
|
70
|
-
await page.waitForFunction(() => document.readyState ===
|
|
75
|
+
await page.waitForFunction(() => document.readyState === "interactive", {
|
|
71
76
|
timeout: PAGE_READY_SECONDARY_TIMEOUT_MS,
|
|
72
77
|
});
|
|
73
78
|
}
|
|
@@ -78,10 +83,10 @@ export async function waitForPageReady(page) {
|
|
|
78
83
|
}
|
|
79
84
|
export async function attemptPuppeteerReload(page) {
|
|
80
85
|
try {
|
|
81
|
-
await page.reload({ waitUntil:
|
|
86
|
+
await page.reload({ waitUntil: "domcontentloaded", timeout: PUPPETEER_NAVIGATION_TIMEOUT_MS });
|
|
82
87
|
}
|
|
83
88
|
catch (error) {
|
|
84
|
-
logDebugError(
|
|
89
|
+
logDebugError("Reloading the controlled tab failed", error);
|
|
85
90
|
}
|
|
86
91
|
}
|
|
87
92
|
//# sourceMappingURL=puppeteer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"puppeteer.js","sourceRoot":"","sources":["../../../../src/runtime/chrome/puppeteer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EACL,6BAA6B,EAC7B,+BAA+B,EAC/B,+BAA+B,EAC/B,6BAA6B,GAC9B,MAAM,gBAAgB,CAAC;AAExB,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,
|
|
1
|
+
{"version":3,"file":"puppeteer.js","sourceRoot":"","sources":["../../../../src/runtime/chrome/puppeteer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reuse.d.ts","sourceRoot":"","sources":["../../../../src/runtime/chrome/reuse.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"reuse.d.ts","sourceRoot":"","sources":["../../../../src/runtime/chrome/reuse.ts"],"names":[],"mappings":"AAkBA,wBAAsB,6BAA6B,CACjD,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IAAE,aAAa,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC;IAAC,YAAY,CAAC,EAAE,OAAO,CAAA;CAAE,GAC/E,OAAO,CAAC;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,iBAAiB,EAAE,OAAO,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CAkI3F;AAED,wBAAsB,iBAAiB,CACrC,KAAK,GAAE,MAAiC,EACxC,GAAG,GAAE,MAA+B,GACnC,OAAO,CAAC,MAAM,CAAC,CASjB;AAeD,wBAAsB,oBAAoB,CACxC,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,GAAG,IAAI,EACnB,MAAM,EAAE,MAAM,EACd,qBAAqB,CAAC,EAAE,MAAM,GAAG,IAAI,GACpC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAiBxB;AAED,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAiBrE"}
|
|
@@ -1,27 +1,27 @@
|
|
|
1
|
-
import { regex } from
|
|
2
|
-
import net from
|
|
3
|
-
import { cliEnv } from
|
|
4
|
-
import { logDebugError } from
|
|
5
|
-
import { loadDevToolsConfig, saveDevToolsConfig } from
|
|
6
|
-
import { discoverDevToolsEndpoints } from
|
|
7
|
-
import { urlsRoughlyMatch } from
|
|
8
|
-
import { primeControlledChromeCookies } from
|
|
9
|
-
import { connectPuppeteerBrowser, navigatePuppeteerPage } from
|
|
10
|
-
import { DEVTOOLS_PORT_SCAN_END, DEVTOOLS_PORT_SCAN_START, PUPPETEER_RELOAD_TIMEOUT_MS } from
|
|
11
|
-
const TRAILING_SLASH_PATTERN = regex.as(
|
|
1
|
+
import { regex } from "arkregex";
|
|
2
|
+
import net from "node:net";
|
|
3
|
+
import { cliEnv } from "../../env.js";
|
|
4
|
+
import { logDebugError } from "../../util/errors.js";
|
|
5
|
+
import { loadDevToolsConfig, saveDevToolsConfig } from "../devtools.js";
|
|
6
|
+
import { discoverDevToolsEndpoints } from "../devtools/cdp.js";
|
|
7
|
+
import { urlsRoughlyMatch } from "../url.js";
|
|
8
|
+
import { primeControlledChromeCookies } from "./cookies.js";
|
|
9
|
+
import { connectPuppeteerBrowser, navigatePuppeteerPage } from "./puppeteer.js";
|
|
10
|
+
import { DEVTOOLS_PORT_SCAN_END, DEVTOOLS_PORT_SCAN_START, PUPPETEER_RELOAD_TIMEOUT_MS, } from "./reuse/constants.js";
|
|
11
|
+
const TRAILING_SLASH_PATTERN = regex.as("/$");
|
|
12
12
|
export async function reuseExistingControlledChrome(target, options) {
|
|
13
13
|
const explicitDevtoolsUrl = cliEnv.devtoolsUrl?.trim();
|
|
14
14
|
const existingConfig = await loadDevToolsConfig();
|
|
15
15
|
const candidates = [];
|
|
16
16
|
if (explicitDevtoolsUrl) {
|
|
17
|
-
candidates.push({ url: explicitDevtoolsUrl, source:
|
|
17
|
+
candidates.push({ url: explicitDevtoolsUrl, source: "env" });
|
|
18
18
|
}
|
|
19
19
|
if (existingConfig?.devtoolsUrl) {
|
|
20
|
-
candidates.push({ url: existingConfig.devtoolsUrl, source:
|
|
20
|
+
candidates.push({ url: existingConfig.devtoolsUrl, source: "config" });
|
|
21
21
|
}
|
|
22
22
|
const discovered = await discoverDevToolsEndpoints();
|
|
23
23
|
for (const url of discovered) {
|
|
24
|
-
candidates.push({ url, source:
|
|
24
|
+
candidates.push({ url, source: "scan" });
|
|
25
25
|
}
|
|
26
26
|
if (candidates.length === 0) {
|
|
27
27
|
return null;
|
|
@@ -29,15 +29,15 @@ export async function reuseExistingControlledChrome(target, options) {
|
|
|
29
29
|
const seen = new Set();
|
|
30
30
|
let puppeteer = null;
|
|
31
31
|
try {
|
|
32
|
-
const puppeteerModule = await import(
|
|
32
|
+
const puppeteerModule = await import("puppeteer-core");
|
|
33
33
|
puppeteer = puppeteerModule.default;
|
|
34
34
|
}
|
|
35
35
|
catch (error) {
|
|
36
|
-
console.warn(
|
|
36
|
+
console.warn("Unable to load Puppeteer while reusing DevTools chrome:", error);
|
|
37
37
|
return null;
|
|
38
38
|
}
|
|
39
39
|
for (const candidate of candidates) {
|
|
40
|
-
const normalized = candidate.url.replace(TRAILING_SLASH_PATTERN,
|
|
40
|
+
const normalized = candidate.url.replace(TRAILING_SLASH_PATTERN, "");
|
|
41
41
|
if (seen.has(normalized)) {
|
|
42
42
|
continue;
|
|
43
43
|
}
|
|
@@ -57,14 +57,17 @@ export async function reuseExistingControlledChrome(target, options) {
|
|
|
57
57
|
let targetPageInfo = null;
|
|
58
58
|
if (matchPage) {
|
|
59
59
|
try {
|
|
60
|
-
await matchPage.reload({
|
|
61
|
-
|
|
60
|
+
await matchPage.reload({
|
|
61
|
+
waitUntil: "domcontentloaded",
|
|
62
|
+
timeout: PUPPETEER_RELOAD_TIMEOUT_MS,
|
|
63
|
+
});
|
|
64
|
+
targetPageInfo = { page: matchPage, context: "existing-tab" };
|
|
62
65
|
}
|
|
63
66
|
catch (error) {
|
|
64
|
-
logDebugError(
|
|
67
|
+
logDebugError("Failed to reload existing controlled Chrome tab", error);
|
|
65
68
|
const navigated = await navigatePuppeteerPage(matchPage, target, 3);
|
|
66
69
|
if (navigated) {
|
|
67
|
-
targetPageInfo = { page: matchPage, context:
|
|
70
|
+
targetPageInfo = { page: matchPage, context: "existing-tab" };
|
|
68
71
|
}
|
|
69
72
|
}
|
|
70
73
|
}
|
|
@@ -77,7 +80,7 @@ export async function reuseExistingControlledChrome(target, options) {
|
|
|
77
80
|
});
|
|
78
81
|
continue;
|
|
79
82
|
}
|
|
80
|
-
targetPageInfo = { page: newPage, context:
|
|
83
|
+
targetPageInfo = { page: newPage, context: "new-tab" };
|
|
81
84
|
}
|
|
82
85
|
if (!targetPageInfo) {
|
|
83
86
|
continue;
|
|
@@ -87,14 +90,14 @@ export async function reuseExistingControlledChrome(target, options) {
|
|
|
87
90
|
await targetPageInfo.page.bringToFront();
|
|
88
91
|
}
|
|
89
92
|
catch (error) {
|
|
90
|
-
logDebugError(
|
|
93
|
+
logDebugError("Failed to focus reused controlled Chrome tab", error);
|
|
91
94
|
}
|
|
92
95
|
}
|
|
93
96
|
const { context: cookieContext } = targetPageInfo;
|
|
94
|
-
const userDataDirectoryHint = candidate.source ===
|
|
97
|
+
const userDataDirectoryHint = candidate.source === "config" ? (existingConfig?.userDataDir ?? null) : null;
|
|
95
98
|
const userDataDirectory = await persistDevToolsReuse(normalized, port, target, userDataDirectoryHint);
|
|
96
99
|
if (options.cookieSync) {
|
|
97
|
-
const shouldReload = cookieContext !==
|
|
100
|
+
const shouldReload = cookieContext !== "existing-tab";
|
|
98
101
|
await primeControlledChromeCookies({
|
|
99
102
|
devtoolsUrl: normalized,
|
|
100
103
|
targetUrl: target,
|
|
@@ -104,12 +107,12 @@ export async function reuseExistingControlledChrome(target, options) {
|
|
|
104
107
|
}
|
|
105
108
|
return {
|
|
106
109
|
devtoolsUrl: normalized,
|
|
107
|
-
targetAlreadyOpen: cookieContext ===
|
|
110
|
+
targetAlreadyOpen: cookieContext === "existing-tab",
|
|
108
111
|
userDataDir: userDataDirectory ?? undefined,
|
|
109
112
|
};
|
|
110
113
|
}
|
|
111
114
|
catch (error) {
|
|
112
|
-
console.warn(
|
|
115
|
+
console.warn("Failed to reuse DevTools instance at", normalized, error);
|
|
113
116
|
}
|
|
114
117
|
finally {
|
|
115
118
|
try {
|
|
@@ -130,18 +133,18 @@ export async function findAvailablePort(start = DEVTOOLS_PORT_SCAN_START, end =
|
|
|
130
133
|
return port;
|
|
131
134
|
}
|
|
132
135
|
}
|
|
133
|
-
throw new Error(
|
|
136
|
+
throw new Error("No available DevTools port found between 9222 and 9322");
|
|
134
137
|
}
|
|
135
138
|
async function isPortAvailable(port) {
|
|
136
139
|
return await new Promise((resolve) => {
|
|
137
140
|
const server = net.createServer();
|
|
138
|
-
server.once(
|
|
141
|
+
server.once("error", () => {
|
|
139
142
|
resolve(false);
|
|
140
143
|
});
|
|
141
|
-
server.once(
|
|
144
|
+
server.once("listening", () => {
|
|
142
145
|
server.close(() => resolve(true));
|
|
143
146
|
});
|
|
144
|
-
server.listen(port,
|
|
147
|
+
server.listen(port, "127.0.0.1");
|
|
145
148
|
});
|
|
146
149
|
}
|
|
147
150
|
export async function persistDevToolsReuse(devtoolsUrl, port, target, userDataDirectoryHint) {
|
|
@@ -149,7 +152,7 @@ export async function persistDevToolsReuse(devtoolsUrl, port, target, userDataDi
|
|
|
149
152
|
if (derivedPort === null) {
|
|
150
153
|
return userDataDirectoryHint ?? null;
|
|
151
154
|
}
|
|
152
|
-
const userDataDirectory = userDataDirectoryHint ??
|
|
155
|
+
const userDataDirectory = userDataDirectoryHint ?? "[external-profile]";
|
|
153
156
|
await saveDevToolsConfig({
|
|
154
157
|
devtoolsUrl,
|
|
155
158
|
port: derivedPort,
|
|
@@ -157,7 +160,7 @@ export async function persistDevToolsReuse(devtoolsUrl, port, target, userDataDi
|
|
|
157
160
|
updatedAt: Date.now(),
|
|
158
161
|
targetUrl: target,
|
|
159
162
|
}).catch((error) => {
|
|
160
|
-
console.warn(
|
|
163
|
+
console.warn("Failed to persist DevTools config for reused session:", error);
|
|
161
164
|
});
|
|
162
165
|
return userDataDirectory;
|
|
163
166
|
}
|
|
@@ -168,10 +171,10 @@ export function extractPortFromUrl(devtoolsUrl) {
|
|
|
168
171
|
const value = Number(parsed.port);
|
|
169
172
|
return Number.isFinite(value) ? value : null;
|
|
170
173
|
}
|
|
171
|
-
if (parsed.protocol ===
|
|
174
|
+
if (parsed.protocol === "http:") {
|
|
172
175
|
return 80;
|
|
173
176
|
}
|
|
174
|
-
if (parsed.protocol ===
|
|
177
|
+
if (parsed.protocol === "https:") {
|
|
175
178
|
return 443;
|
|
176
179
|
}
|
|
177
180
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reuse.js","sourceRoot":"","sources":["../../../../src/runtime/chrome/reuse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,GAAG,MAAM,UAAU,CAAC;AAE3B,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,4BAA4B,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAE,uBAAuB,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAChF,OAAO,
|
|
1
|
+
{"version":3,"file":"reuse.js","sourceRoot":"","sources":["../../../../src/runtime/chrome/reuse.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { CliConfig } from
|
|
1
|
+
import type { CliConfig } from "../../types.js";
|
|
2
2
|
export declare function signalSweetLinkBootstrap(devtoolsUrl: string, targetUrl: string): Promise<void>;
|
|
3
3
|
export declare function waitForSweetLinkSession(params: {
|
|
4
4
|
config: CliConfig;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../../src/runtime/chrome/session.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../../src/runtime/chrome/session.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAOhD,wBAAsB,wBAAwB,CAC5C,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CAcf;AAED,wBAAsB,uBAAuB,CAAC,MAAM,EAAE;IACpD,MAAM,EAAE,SAAS,CAAC;IAClB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,GAAG,OAAO,CAAC;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CA8BrD"}
|
|
@@ -1,21 +1,23 @@
|
|
|
1
|
-
import { fetchJson } from
|
|
2
|
-
import { logDebugError } from
|
|
3
|
-
import { delay } from
|
|
4
|
-
import { saveDevToolsConfig } from
|
|
5
|
-
import { urlsRoughlyMatch } from
|
|
6
|
-
import { OPTIONAL_TRAILING_SLASH_PATTERN } from
|
|
1
|
+
import { fetchJson } from "../../http.js";
|
|
2
|
+
import { logDebugError } from "../../util/errors.js";
|
|
3
|
+
import { delay } from "../../util/time.js";
|
|
4
|
+
import { saveDevToolsConfig } from "../devtools.js";
|
|
5
|
+
import { urlsRoughlyMatch } from "../url.js";
|
|
6
|
+
import { OPTIONAL_TRAILING_SLASH_PATTERN } from "../../util/regex.js";
|
|
7
7
|
export async function signalSweetLinkBootstrap(devtoolsUrl, targetUrl) {
|
|
8
8
|
try {
|
|
9
9
|
const payload = { devtoolsUrl, targetUrl };
|
|
10
|
-
await fetch(`${devtoolsUrl.replace(OPTIONAL_TRAILING_SLASH_PATTERN,
|
|
10
|
+
await fetch(`${devtoolsUrl.replace(OPTIONAL_TRAILING_SLASH_PATTERN, "")}/json/version`, {
|
|
11
|
+
method: "GET",
|
|
12
|
+
});
|
|
11
13
|
await fetch(`${targetUrl}/sweetlink/bootstrap`, {
|
|
12
|
-
method:
|
|
13
|
-
headers: {
|
|
14
|
+
method: "POST",
|
|
15
|
+
headers: { "Content-Type": "application/json" },
|
|
14
16
|
body: JSON.stringify(payload),
|
|
15
17
|
});
|
|
16
18
|
}
|
|
17
19
|
catch (error) {
|
|
18
|
-
logDebugError(
|
|
20
|
+
logDebugError("Failed to signal SweetLink bootstrap", error);
|
|
19
21
|
}
|
|
20
22
|
}
|
|
21
23
|
export async function waitForSweetLinkSession(params) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../../src/runtime/chrome/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,+BAA+B,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../../src/runtime/chrome/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,+BAA+B,EAAE,MAAM,qBAAqB,CAAC;AAEtE,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,WAAmB,EACnB,SAAiB;IAEjB,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC;QAC3C,MAAM,KAAK,CAAC,GAAG,WAAW,CAAC,OAAO,CAAC,+BAA+B,EAAE,EAAE,CAAC,eAAe,EAAE;YACtF,MAAM,EAAE,KAAK;SACd,CAAC,CAAC;QACH,MAAM,KAAK,CAAC,GAAG,SAAS,sBAAsB,EAAE;YAC9C,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;YAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;SAC9B,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,aAAa,CAAC,sCAAsC,EAAE,KAAK,CAAC,CAAC;IAC/D,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,MAM7C;IACC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAClB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC;IAC3D,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAC;QAC7B,IAAI,CAAC;YACH,yFAAyF;YACzF,MAAM,QAAQ,GAAG,MAAM,SAAS,CAC9B,GAAG,MAAM,CAAC,MAAM,CAAC,aAAa,WAAW,EACzC;gBACE,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,MAAM,CAAC,KAAK,EAAE,EAAE;aACrD,CACF,CAAC;YACF,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAC/C,gBAAgB,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,SAAS,CAAC,CAChD,CAAC;YACF,IAAI,KAAK,EAAE,CAAC;gBACV,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;oBACvB,MAAM,kBAAkB,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC;gBAC5F,CAAC;gBACD,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,mCAAmC;QACrC,CAAC;QACD,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
export * from
|
|
2
|
-
export * from
|
|
3
|
-
export * from
|
|
4
|
-
export * from
|
|
5
|
-
export * from
|
|
6
|
-
export * from
|
|
7
|
-
export * from
|
|
8
|
-
export * from
|
|
1
|
+
export * from "./chrome/constants.js";
|
|
2
|
+
export * from "./chrome/cookies.js";
|
|
3
|
+
export * from "./chrome/diagnostics.js";
|
|
4
|
+
export * from "./chrome/focus.js";
|
|
5
|
+
export * from "./chrome/launch.js";
|
|
6
|
+
export * from "./chrome/puppeteer.js";
|
|
7
|
+
export * from "./chrome/reuse.js";
|
|
8
|
+
export * from "./chrome/session.js";
|
|
9
9
|
//# sourceMappingURL=chrome.d.ts.map
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
/* biome-ignore lint/performance/noBarrelFile: chrome entrypoint re-exports modules for backwards compatibility. */
|
|
2
|
-
export * from
|
|
3
|
-
export * from
|
|
4
|
-
export * from
|
|
5
|
-
export * from
|
|
6
|
-
export * from
|
|
7
|
-
export * from
|
|
8
|
-
export * from
|
|
9
|
-
export * from
|
|
2
|
+
export * from "./chrome/constants.js";
|
|
3
|
+
export * from "./chrome/cookies.js";
|
|
4
|
+
export * from "./chrome/diagnostics.js";
|
|
5
|
+
export * from "./chrome/focus.js";
|
|
6
|
+
export * from "./chrome/launch.js";
|
|
7
|
+
export * from "./chrome/puppeteer.js";
|
|
8
|
+
export * from "./chrome/reuse.js";
|
|
9
|
+
export * from "./chrome/session.js";
|
|
10
10
|
//# sourceMappingURL=chrome.js.map
|
|
@@ -1,17 +1,3 @@
|
|
|
1
|
-
export interface ChromeCookiesSecureModule {
|
|
2
|
-
getCookiesPromised(url: string, format: 'object', profilePath?: string): Promise<Record<string, ChromeCookieEntry>>;
|
|
3
|
-
getCookiesPromised(url: string, format: 'puppeteer', profilePath?: string): Promise<Record<string, unknown>[]>;
|
|
4
|
-
}
|
|
5
|
-
interface ChromeCookieEntry {
|
|
6
|
-
name?: string;
|
|
7
|
-
value?: string;
|
|
8
|
-
domain?: string;
|
|
9
|
-
path?: string;
|
|
10
|
-
secure?: boolean;
|
|
11
|
-
httpOnly?: boolean;
|
|
12
|
-
sameSite?: string;
|
|
13
|
-
expirationDate?: number;
|
|
14
|
-
}
|
|
15
1
|
export interface PuppeteerCookieParam {
|
|
16
2
|
name: string;
|
|
17
3
|
value: string;
|
|
@@ -20,7 +6,7 @@ export interface PuppeteerCookieParam {
|
|
|
20
6
|
path?: string;
|
|
21
7
|
secure?: boolean;
|
|
22
8
|
httpOnly?: boolean;
|
|
23
|
-
sameSite?:
|
|
9
|
+
sameSite?: "Strict" | "Lax" | "None";
|
|
24
10
|
expires?: number;
|
|
25
11
|
}
|
|
26
12
|
/** Collects cookies from the main Chrome profile matching the provided URL. */
|
|
@@ -33,5 +19,4 @@ export declare function normalizePuppeteerCookie(cookie: Record<string, unknown>
|
|
|
33
19
|
sourceBase: URL;
|
|
34
20
|
targetBase: URL;
|
|
35
21
|
}): PuppeteerCookieParam | null;
|
|
36
|
-
export {};
|
|
37
22
|
//# sourceMappingURL=cookies.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cookies.d.ts","sourceRoot":"","sources":["../../../src/runtime/cookies.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cookies.d.ts","sourceRoot":"","sources":["../../../src/runtime/cookies.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,QAAQ,GAAG,KAAK,GAAG,MAAM,CAAC;IACrC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAqBD,+EAA+E;AAC/E,wBAAsB,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC,CA0C7F;AAED,gFAAgF;AAChF,wBAAsB,8BAA8B,CAClD,OAAO,EAAE,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,GACvC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAC,CAAC,CA6DjD;AAED,gFAAgF;AAChF,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAU9D;AA6LD,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,KAAK,EAAE;IAAE,UAAU,EAAE,GAAG,CAAC;IAAC,UAAU,EAAE,GAAG,CAAA;CAAE,GAC1C,oBAAoB,GAAG,IAAI,CAmF7B"}
|