@vforsh/argus 0.1.11 → 0.1.13
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/.tsbuildinfo +1 -1
- package/dist/argus.js +12792 -7821
- package/dist/bin.js +4 -47
- package/dist/bin.js.map +1 -1
- package/dist/cdp/sendCdpCommand.d.ts +6 -2
- package/dist/cdp/sendCdpCommand.d.ts.map +1 -1
- package/dist/cdp/sendCdpCommand.js +18 -12
- package/dist/cdp/sendCdpCommand.js.map +1 -1
- package/dist/cli/plugins/registerPlugins.d.ts.map +1 -1
- package/dist/cli/plugins/registerPlugins.js +1 -1
- package/dist/cli/plugins/registerPlugins.js.map +1 -1
- package/dist/cli/program.d.ts.map +1 -1
- package/dist/cli/program.js +2 -1
- package/dist/cli/program.js.map +1 -1
- package/dist/cli/register/domCommandBuilder.d.ts +23 -0
- package/dist/cli/register/domCommandBuilder.d.ts.map +1 -0
- package/dist/cli/register/domCommandBuilder.js +36 -0
- package/dist/cli/register/domCommandBuilder.js.map +1 -0
- package/dist/cli/register/index.d.ts +4 -0
- package/dist/cli/register/index.d.ts.map +1 -0
- package/dist/cli/register/index.js +49 -0
- package/dist/cli/register/index.js.map +1 -0
- package/dist/cli/register/registerAuth.d.ts.map +1 -1
- package/dist/cli/register/registerAuth.js +103 -4
- package/dist/cli/register/registerAuth.js.map +1 -1
- package/dist/cli/register/registerChrome.d.ts.map +1 -1
- package/dist/cli/register/registerChrome.js +53 -14
- package/dist/cli/register/registerChrome.js.map +1 -1
- package/dist/cli/register/registerClick.d.ts.map +1 -1
- package/dist/cli/register/registerClick.js +2 -1
- package/dist/cli/register/registerClick.js.map +1 -1
- package/dist/cli/register/registerDialog.d.ts +3 -0
- package/dist/cli/register/registerDialog.d.ts.map +1 -0
- package/dist/cli/register/registerDialog.js +45 -0
- package/dist/cli/register/registerDialog.js.map +1 -0
- package/dist/cli/register/registerDom.d.ts.map +1 -1
- package/dist/cli/register/registerDom.js +142 -121
- package/dist/cli/register/registerDom.js.map +1 -1
- package/dist/cli/register/registerEval.js +1 -1
- package/dist/cli/register/registerEval.js.map +1 -1
- package/dist/cli/register/registerFill.d.ts.map +1 -1
- package/dist/cli/register/registerFill.js +4 -3
- package/dist/cli/register/registerFill.js.map +1 -1
- package/dist/cli/register/registerHover.d.ts.map +1 -1
- package/dist/cli/register/registerHover.js +2 -1
- package/dist/cli/register/registerHover.js.map +1 -1
- package/dist/cli/register/registerLocate.d.ts +3 -0
- package/dist/cli/register/registerLocate.d.ts.map +1 -0
- package/dist/cli/register/registerLocate.js +48 -0
- package/dist/cli/register/registerLocate.js.map +1 -0
- package/dist/cli/register/registerNet.d.ts.map +1 -1
- package/dist/cli/register/registerNet.js +234 -13
- package/dist/cli/register/registerNet.js.map +1 -1
- package/dist/cli/register/registerQuickAccess.d.ts.map +1 -1
- package/dist/cli/register/registerQuickAccess.js +33 -3
- package/dist/cli/register/registerQuickAccess.js.map +1 -1
- package/dist/cli/register/registerStorage.d.ts.map +1 -1
- package/dist/cli/register/registerStorage.js +26 -21
- package/dist/cli/register/registerStorage.js.map +1 -1
- package/dist/cli/validation.d.ts +1 -0
- package/dist/cli/validation.d.ts.map +1 -1
- package/dist/cli/validation.js +1 -0
- package/dist/cli/validation.js.map +1 -1
- package/dist/commands/auth.d.ts +39 -18
- package/dist/commands/auth.d.ts.map +1 -1
- package/dist/commands/auth.js +104 -122
- package/dist/commands/auth.js.map +1 -1
- package/dist/commands/authCookieSupport.d.ts +54 -0
- package/dist/commands/authCookieSupport.d.ts.map +1 -0
- package/dist/commands/authCookieSupport.js +206 -0
- package/dist/commands/authCookieSupport.js.map +1 -0
- package/dist/commands/authCookies.d.ts +60 -0
- package/dist/commands/authCookies.d.ts.map +1 -0
- package/dist/commands/authCookies.js +149 -0
- package/dist/commands/authCookies.js.map +1 -0
- package/dist/commands/chrome/authState.d.ts +23 -0
- package/dist/commands/chrome/authState.d.ts.map +1 -0
- package/dist/commands/chrome/authState.js +97 -0
- package/dist/commands/chrome/authState.js.map +1 -0
- package/dist/commands/chrome/browser.d.ts +5 -0
- package/dist/commands/chrome/browser.d.ts.map +1 -0
- package/dist/commands/chrome/browser.js +71 -0
- package/dist/commands/chrome/browser.js.map +1 -0
- package/dist/commands/chrome/processes.d.ts +24 -0
- package/dist/commands/chrome/processes.d.ts.map +1 -0
- package/dist/commands/chrome/processes.js +115 -0
- package/dist/commands/chrome/processes.js.map +1 -0
- package/dist/commands/chrome/shared.d.ts +31 -0
- package/dist/commands/chrome/shared.d.ts.map +1 -0
- package/dist/commands/chrome/shared.js +48 -0
- package/dist/commands/chrome/shared.js.map +1 -0
- package/dist/commands/chrome/targets.d.ts +26 -0
- package/dist/commands/chrome/targets.d.ts.map +1 -0
- package/dist/commands/chrome/targets.js +240 -0
- package/dist/commands/chrome/targets.js.map +1 -0
- package/dist/commands/chrome.d.ts +6 -63
- package/dist/commands/chrome.d.ts.map +1 -1
- package/dist/commands/chrome.js +3 -511
- package/dist/commands/chrome.js.map +1 -1
- package/dist/commands/chromeStart.d.ts +1 -0
- package/dist/commands/chromeStart.d.ts.map +1 -1
- package/dist/commands/chromeStart.js +28 -3
- package/dist/commands/chromeStart.js.map +1 -1
- package/dist/commands/code.d.ts.map +1 -1
- package/dist/commands/code.js +9 -1
- package/dist/commands/code.js.map +1 -1
- package/dist/commands/dialog.d.ts +13 -0
- package/dist/commands/dialog.d.ts.map +1 -0
- package/dist/commands/dialog.js +71 -0
- package/dist/commands/dialog.js.map +1 -0
- package/dist/commands/dom/shared.d.ts +16 -0
- package/dist/commands/dom/shared.d.ts.map +1 -0
- package/dist/commands/dom/shared.js +69 -0
- package/dist/commands/dom/shared.js.map +1 -0
- package/dist/commands/domAdd.d.ts.map +1 -1
- package/dist/commands/domAdd.js +11 -27
- package/dist/commands/domAdd.js.map +1 -1
- package/dist/commands/domClick.d.ts +1 -0
- package/dist/commands/domClick.d.ts.map +1 -1
- package/dist/commands/domClick.js +32 -48
- package/dist/commands/domClick.js.map +1 -1
- package/dist/commands/domFill.d.ts +1 -0
- package/dist/commands/domFill.d.ts.map +1 -1
- package/dist/commands/domFill.js +21 -38
- package/dist/commands/domFill.js.map +1 -1
- package/dist/commands/domFocus.d.ts +2 -1
- package/dist/commands/domFocus.d.ts.map +1 -1
- package/dist/commands/domFocus.js +12 -26
- package/dist/commands/domFocus.js.map +1 -1
- package/dist/commands/domHover.d.ts +2 -1
- package/dist/commands/domHover.d.ts.map +1 -1
- package/dist/commands/domHover.js +12 -26
- package/dist/commands/domHover.js.map +1 -1
- package/dist/commands/domInfo.d.ts +2 -1
- package/dist/commands/domInfo.d.ts.map +1 -1
- package/dist/commands/domInfo.js +11 -25
- package/dist/commands/domInfo.js.map +1 -1
- package/dist/commands/domModify.d.ts.map +1 -1
- package/dist/commands/domModify.js +14 -26
- package/dist/commands/domModify.js.map +1 -1
- package/dist/commands/domRemove.d.ts.map +1 -1
- package/dist/commands/domRemove.js +10 -25
- package/dist/commands/domRemove.js.map +1 -1
- package/dist/commands/domScroll.d.ts.map +1 -1
- package/dist/commands/domScroll.js +7 -33
- package/dist/commands/domScroll.js.map +1 -1
- package/dist/commands/domScrollTo.d.ts.map +1 -1
- package/dist/commands/domScrollTo.js +7 -33
- package/dist/commands/domScrollTo.js.map +1 -1
- package/dist/commands/domSetFile.d.ts.map +1 -1
- package/dist/commands/domSetFile.js +14 -36
- package/dist/commands/domSetFile.js.map +1 -1
- package/dist/commands/domTree.d.ts.map +1 -1
- package/dist/commands/domTree.js +12 -27
- package/dist/commands/domTree.js.map +1 -1
- package/dist/commands/extension/setup.js +1 -1
- package/dist/commands/extension/setup.js.map +1 -1
- package/dist/commands/locate.d.ts +17 -0
- package/dist/commands/locate.d.ts.map +1 -0
- package/dist/commands/locate.js +117 -0
- package/dist/commands/locate.js.map +1 -0
- package/dist/commands/net.d.ts +2 -5
- package/dist/commands/net.d.ts.map +1 -1
- package/dist/commands/net.js +5 -7
- package/dist/commands/net.js.map +1 -1
- package/dist/commands/netBody.d.ts +6 -0
- package/dist/commands/netBody.d.ts.map +1 -0
- package/dist/commands/netBody.js +32 -0
- package/dist/commands/netBody.js.map +1 -0
- package/dist/commands/netCapture.d.ts +36 -0
- package/dist/commands/netCapture.d.ts.map +1 -0
- package/dist/commands/netCapture.js +105 -0
- package/dist/commands/netCapture.js.map +1 -0
- package/dist/commands/netClear.d.ts +5 -0
- package/dist/commands/netClear.d.ts.map +1 -0
- package/dist/commands/netClear.js +20 -0
- package/dist/commands/netClear.js.map +1 -0
- package/dist/commands/netExport.d.ts +13 -0
- package/dist/commands/netExport.d.ts.map +1 -0
- package/dist/commands/netExport.js +124 -0
- package/dist/commands/netExport.js.map +1 -0
- package/dist/commands/netInspect.d.ts +12 -0
- package/dist/commands/netInspect.d.ts.map +1 -0
- package/dist/commands/netInspect.js +205 -0
- package/dist/commands/netInspect.js.map +1 -0
- package/dist/commands/netRequestClient.d.ts +17 -0
- package/dist/commands/netRequestClient.d.ts.map +1 -0
- package/dist/commands/netRequestClient.js +54 -0
- package/dist/commands/netRequestClient.js.map +1 -0
- package/dist/commands/netRequestTarget.d.ts +14 -0
- package/dist/commands/netRequestTarget.d.ts.map +1 -0
- package/dist/commands/netRequestTarget.js +36 -0
- package/dist/commands/netRequestTarget.js.map +1 -0
- package/dist/commands/netShared.d.ts +40 -0
- package/dist/commands/netShared.d.ts.map +1 -0
- package/dist/commands/netShared.js +108 -0
- package/dist/commands/netShared.js.map +1 -0
- package/dist/commands/netShow.d.ts +5 -0
- package/dist/commands/netShow.d.ts.map +1 -0
- package/dist/commands/netShow.js +28 -0
- package/dist/commands/netShow.js.map +1 -0
- package/dist/commands/netSummary.d.ts +6 -0
- package/dist/commands/netSummary.d.ts.map +1 -0
- package/dist/commands/netSummary.js +99 -0
- package/dist/commands/netSummary.js.map +1 -0
- package/dist/commands/netTail.d.ts +2 -5
- package/dist/commands/netTail.d.ts.map +1 -1
- package/dist/commands/netTail.js +7 -15
- package/dist/commands/netTail.js.map +1 -1
- package/dist/commands/netWatch.d.ts +11 -0
- package/dist/commands/netWatch.d.ts.map +1 -0
- package/dist/commands/netWatch.js +55 -0
- package/dist/commands/netWatch.js.map +1 -0
- package/dist/commands/resolveTestId.d.ts +2 -1
- package/dist/commands/resolveTestId.d.ts.map +1 -1
- package/dist/commands/resolveTestId.js +3 -3
- package/dist/commands/resolveTestId.js.map +1 -1
- package/dist/commands/start.d.ts +2 -1
- package/dist/commands/start.d.ts.map +1 -1
- package/dist/commands/start.js +77 -49
- package/dist/commands/start.js.map +1 -1
- package/dist/commands/storage.d.ts +17 -0
- package/dist/commands/storage.d.ts.map +1 -0
- package/dist/commands/storage.js +67 -0
- package/dist/commands/storage.js.map +1 -0
- package/dist/commands/watcherNativeHost.d.ts.map +1 -1
- package/dist/commands/watcherNativeHost.js +13 -2
- package/dist/commands/watcherNativeHost.js.map +1 -1
- package/dist/commands/watcherSession.d.ts +29 -0
- package/dist/commands/watcherSession.d.ts.map +1 -0
- package/dist/commands/watcherSession.js +64 -0
- package/dist/commands/watcherSession.js.map +1 -0
- package/dist/commands/watcherStart.d.ts +1 -1
- package/dist/commands/watcherStart.d.ts.map +1 -1
- package/dist/commands/watcherStart.js +15 -40
- package/dist/commands/watcherStart.js.map +1 -1
- package/dist/config/argusConfig.d.ts.map +1 -1
- package/dist/config/argusConfig.js +69 -81
- package/dist/config/argusConfig.js.map +1 -1
- package/dist/net/har.d.ts +86 -0
- package/dist/net/har.d.ts.map +1 -0
- package/dist/net/har.js +125 -0
- package/dist/net/har.js.map +1 -0
- package/dist/net/summary.d.ts +33 -0
- package/dist/net/summary.d.ts.map +1 -0
- package/dist/net/summary.js +128 -0
- package/dist/net/summary.js.map +1 -0
- package/dist/output/accessibility.js +16 -12
- package/dist/output/accessibility.js.map +1 -1
- package/dist/output/code.d.ts +2 -1
- package/dist/output/code.d.ts.map +1 -1
- package/dist/output/code.js +10 -0
- package/dist/output/code.js.map +1 -1
- package/dist/output/dom.d.ts.map +1 -1
- package/dist/output/dom.js +2 -1
- package/dist/output/dom.js.map +1 -1
- package/dist/output/format.d.ts +1 -3
- package/dist/output/format.d.ts.map +1 -1
- package/dist/output/format.js +0 -8
- package/dist/output/format.js.map +1 -1
- package/dist/output/locate.d.ts +3 -0
- package/dist/output/locate.d.ts.map +1 -0
- package/dist/output/locate.js +25 -0
- package/dist/output/locate.js.map +1 -0
- package/dist/output/net.d.ts +13 -0
- package/dist/output/net.d.ts.map +1 -0
- package/dist/output/net.js +239 -0
- package/dist/output/net.js.map +1 -0
- package/dist/watchers/queryParams.d.ts +17 -0
- package/dist/watchers/queryParams.d.ts.map +1 -1
- package/dist/watchers/queryParams.js +61 -0
- package/dist/watchers/queryParams.js.map +1 -1
- package/dist/watchers/requestWatcher.d.ts +13 -1
- package/dist/watchers/requestWatcher.d.ts.map +1 -1
- package/dist/watchers/requestWatcher.js +32 -0
- package/dist/watchers/requestWatcher.js.map +1 -1
- package/package.json +2 -5
- package/dist/commands/storageLocal.d.ts +0 -18
- package/dist/commands/storageLocal.d.ts.map +0 -1
- package/dist/commands/storageLocal.js +0 -92
- package/dist/commands/storageLocal.js.map +0 -1
- package/dist/plugin.d.ts +0 -29
- package/dist/plugin.d.ts.map +0 -1
- package/dist/plugin.js +0 -2
- package/dist/plugin.js.map +0 -1
|
@@ -0,0 +1,99 @@
|
|
|
1
|
+
import { appendNetCommandParams, validateNetCommandOptions } from './netShared.js';
|
|
2
|
+
import { createOutput } from '../output/io.js';
|
|
3
|
+
import { formatWatcherTransportError, fetchWatcherJson, resolveWatcherOrExit } from '../watchers/requestWatcher.js';
|
|
4
|
+
import { formatNetSummaryReport, summarizeNetworkRequests } from '../net/summary.js';
|
|
5
|
+
const NET_PAGE_LIMIT = 5_000;
|
|
6
|
+
export const runNetSummary = async (id, options) => {
|
|
7
|
+
const output = createOutput(options);
|
|
8
|
+
const resolved = await resolveWatcherOrExit({ id }, output);
|
|
9
|
+
if (!resolved) {
|
|
10
|
+
return;
|
|
11
|
+
}
|
|
12
|
+
const validation = validateNetCommandOptions(options);
|
|
13
|
+
if (validation.error) {
|
|
14
|
+
output.writeWarn(validation.error);
|
|
15
|
+
process.exitCode = 2;
|
|
16
|
+
return;
|
|
17
|
+
}
|
|
18
|
+
const { watcher } = resolved;
|
|
19
|
+
let requests;
|
|
20
|
+
try {
|
|
21
|
+
requests = await fetchAllRequests(watcher, options);
|
|
22
|
+
}
|
|
23
|
+
catch (error) {
|
|
24
|
+
output.writeWarn(formatWatcherTransportError(watcher, error));
|
|
25
|
+
process.exitCode = 1;
|
|
26
|
+
return;
|
|
27
|
+
}
|
|
28
|
+
const navigation = await fetchNavigationSummary(watcher).catch(() => null);
|
|
29
|
+
const summary = summarizeNetworkRequests(requests, { navigation });
|
|
30
|
+
if (options.json) {
|
|
31
|
+
output.writeJson(summary);
|
|
32
|
+
return;
|
|
33
|
+
}
|
|
34
|
+
for (const line of formatNetSummaryReport(summary)) {
|
|
35
|
+
output.writeHuman(line);
|
|
36
|
+
}
|
|
37
|
+
};
|
|
38
|
+
const fetchAllRequests = async (watcher, options) => {
|
|
39
|
+
const requests = [];
|
|
40
|
+
let after = 0;
|
|
41
|
+
const baseParams = new URLSearchParams();
|
|
42
|
+
const baseQuery = appendNetCommandParams(baseParams, options, { includeAfter: false, includeLimit: false });
|
|
43
|
+
if (baseQuery.error) {
|
|
44
|
+
throw new Error(baseQuery.error);
|
|
45
|
+
}
|
|
46
|
+
while (true) {
|
|
47
|
+
const params = new URLSearchParams(baseParams);
|
|
48
|
+
params.set('after', String(after));
|
|
49
|
+
params.set('limit', String(NET_PAGE_LIMIT));
|
|
50
|
+
const response = await fetchWatcherJson(watcher, {
|
|
51
|
+
path: '/net',
|
|
52
|
+
query: params,
|
|
53
|
+
timeoutMs: 5_000,
|
|
54
|
+
});
|
|
55
|
+
if (response.requests.length === 0) {
|
|
56
|
+
return requests;
|
|
57
|
+
}
|
|
58
|
+
requests.push(...response.requests);
|
|
59
|
+
after = response.nextAfter;
|
|
60
|
+
}
|
|
61
|
+
};
|
|
62
|
+
const fetchNavigationSummary = async (watcher) => {
|
|
63
|
+
const response = await fetchWatcherJson(watcher, {
|
|
64
|
+
path: '/eval',
|
|
65
|
+
method: 'POST',
|
|
66
|
+
timeoutMs: 5_000,
|
|
67
|
+
body: {
|
|
68
|
+
awaitPromise: true,
|
|
69
|
+
returnByValue: true,
|
|
70
|
+
expression: `(() => {
|
|
71
|
+
const entry = performance.getEntriesByType('navigation')[0]
|
|
72
|
+
if (!entry) return null
|
|
73
|
+
const round = (value) => (typeof value === 'number' && Number.isFinite(value) ? Math.round(value) : null)
|
|
74
|
+
return {
|
|
75
|
+
type: typeof entry.type === 'string' ? entry.type : null,
|
|
76
|
+
durationMs: round(entry.duration),
|
|
77
|
+
responseEndMs: round(entry.responseEnd),
|
|
78
|
+
domInteractiveMs: round(entry.domInteractive),
|
|
79
|
+
domContentLoadedMs: round(entry.domContentLoadedEventEnd),
|
|
80
|
+
loadEventEndMs: round(entry.loadEventEnd),
|
|
81
|
+
transferSize: round(entry.transferSize),
|
|
82
|
+
encodedBodySize: round(entry.encodedBodySize),
|
|
83
|
+
decodedBodySize: round(entry.decodedBodySize),
|
|
84
|
+
}
|
|
85
|
+
})()`,
|
|
86
|
+
},
|
|
87
|
+
});
|
|
88
|
+
if (response.exception) {
|
|
89
|
+
return null;
|
|
90
|
+
}
|
|
91
|
+
return isNavigationTimingSummary(response.result) ? response.result : null;
|
|
92
|
+
};
|
|
93
|
+
const isNavigationTimingSummary = (value) => {
|
|
94
|
+
if (!value || typeof value !== 'object') {
|
|
95
|
+
return false;
|
|
96
|
+
}
|
|
97
|
+
return 'durationMs' in value || 'responseEndMs' in value || 'type' in value;
|
|
98
|
+
};
|
|
99
|
+
//# sourceMappingURL=netSummary.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"netSummary.js","sourceRoot":"","sources":["../../src/commands/netSummary.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,8 @@
|
|
|
1
|
+
import type { NetCliListOptions } from './netShared.js';
|
|
1
2
|
/** Options for the net tail command. */
|
|
2
|
-
export type NetTailOptions = {
|
|
3
|
+
export type NetTailOptions = NetCliListOptions & {
|
|
3
4
|
json?: boolean;
|
|
4
|
-
after?: string;
|
|
5
|
-
limit?: string;
|
|
6
5
|
timeout?: string;
|
|
7
|
-
since?: string;
|
|
8
|
-
grep?: string;
|
|
9
6
|
};
|
|
10
7
|
/** Execute the net tail command for a watcher id. */
|
|
11
8
|
export declare const runNetTail: (id: string | undefined, options: NetTailOptions) => Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"netTail.d.ts","sourceRoot":"","sources":["../../src/commands/netTail.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"netTail.d.ts","sourceRoot":"","sources":["../../src/commands/netTail.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAQvD,wCAAwC;AACxC,MAAM,MAAM,cAAc,GAAG,iBAAiB,GAAG;IAChD,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,qDAAqD;AACrD,eAAO,MAAM,UAAU,GAAU,IAAI,MAAM,GAAG,SAAS,EAAE,SAAS,cAAc,KAAG,OAAO,CAAC,IAAI,CAmD9F,CAAA"}
|
package/dist/commands/netTail.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
+
import { appendNetCommandParams } from './netShared.js';
|
|
1
2
|
import { fetchJson } from '../httpClient.js';
|
|
2
|
-
import { formatNetworkRequest } from '../output/
|
|
3
|
+
import { formatNetworkRequest } from '../output/net.js';
|
|
3
4
|
import { createOutput } from '../output/io.js';
|
|
4
5
|
import { parseNumber } from '../cli/parse.js';
|
|
5
6
|
import { buildWatcherUrl, formatWatcherTransportError, resolveWatcherOrExit } from '../watchers/requestWatcher.js';
|
|
6
|
-
import { appendNetFilterParams, resolveSinceTimestamp } from '../watchers/queryParams.js';
|
|
7
7
|
/** Execute the net tail command for a watcher id. */
|
|
8
8
|
export const runNetTail = async (id, options) => {
|
|
9
9
|
const output = createOutput(options);
|
|
@@ -13,13 +13,6 @@ export const runNetTail = async (id, options) => {
|
|
|
13
13
|
const { watcher } = resolved;
|
|
14
14
|
let after = parseNumber(options.after) ?? 0;
|
|
15
15
|
const timeoutMs = parseNumber(options.timeout) ?? 25_000;
|
|
16
|
-
const limit = parseNumber(options.limit);
|
|
17
|
-
const since = resolveSinceTimestamp(options.since);
|
|
18
|
-
if (since.error) {
|
|
19
|
-
output.writeWarn(since.error);
|
|
20
|
-
process.exitCode = 2;
|
|
21
|
-
return;
|
|
22
|
-
}
|
|
23
16
|
let running = true;
|
|
24
17
|
const stop = () => {
|
|
25
18
|
running = false;
|
|
@@ -30,13 +23,12 @@ export const runNetTail = async (id, options) => {
|
|
|
30
23
|
const params = new URLSearchParams();
|
|
31
24
|
params.set('after', String(after));
|
|
32
25
|
params.set('timeoutMs', String(timeoutMs));
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
26
|
+
const query = appendNetCommandParams(params, options, { includeAfter: false });
|
|
27
|
+
if (query.error) {
|
|
28
|
+
output.writeWarn(query.error);
|
|
29
|
+
process.exitCode = 2;
|
|
30
|
+
return;
|
|
38
31
|
}
|
|
39
|
-
appendNetFilterParams(params, options);
|
|
40
32
|
const url = buildWatcherUrl(watcher, '/net/tail', params);
|
|
41
33
|
let response;
|
|
42
34
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"netTail.js","sourceRoot":"","sources":["../../src/commands/netTail.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"netTail.js","sourceRoot":"","sources":["../../src/commands/netTail.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAA;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAA;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,EAAE,eAAe,EAAE,2BAA2B,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAA;AAQlH,qDAAqD;AACrD,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAAE,EAAsB,EAAE,OAAuB,EAAiB,EAAE;IAClG,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;IACpC,MAAM,QAAQ,GAAG,MAAM,oBAAoB,CAAC,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA;IAC3D,IAAI,CAAC,QAAQ;QAAE,OAAM;IAErB,MAAM,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAA;IAE5B,IAAI,KAAK,GAAG,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAC3C,MAAM,SAAS,GAAG,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,MAAM,CAAA;IAExD,IAAI,OAAO,GAAG,IAAI,CAAA;IAClB,MAAM,IAAI,GAAG,GAAS,EAAE;QACvB,OAAO,GAAG,KAAK,CAAA;IAChB,CAAC,CAAA;IAED,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;IAC1B,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;IAE3B,OAAO,OAAO,EAAE,CAAC;QAChB,MAAM,MAAM,GAAG,IAAI,eAAe,EAAE,CAAA;QACpC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;QAClC,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAA;QAC1C,MAAM,KAAK,GAAG,sBAAsB,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,CAAA;QAC9E,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;YACjB,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;YAC7B,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;YACpB,OAAM;QACP,CAAC;QAED,MAAM,GAAG,GAAG,eAAe,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,CAAC,CAAA;QACzD,IAAI,QAAyB,CAAA;QAC7B,IAAI,CAAC;YACJ,QAAQ,GAAG,MAAM,SAAS,CAAkB,GAAG,EAAE,EAAE,SAAS,EAAE,SAAS,GAAG,KAAK,EAAE,CAAC,CAAA;QACnF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,CAAC,SAAS,CAAC,2BAA2B,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAA;YAC7D,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;YACpB,OAAM;QACP,CAAC;QAED,IAAI,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClC,KAAK,MAAM,OAAO,IAAI,QAAQ,CAAC,QAAQ,EAAE,CAAC;gBACzC,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;oBAClB,MAAM,CAAC,aAAa,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,EAAE,OAAO,EAAE,CAAC,CAAA;oBACtD,SAAQ;gBACT,CAAC;gBACD,MAAM,CAAC,UAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAA;YACjD,CAAC;QACF,CAAC;QAED,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAA;IAC3B,CAAC;AACF,CAAC,CAAA"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import type { NetCliFilterOptions } from './netShared.js';
|
|
2
|
+
export type NetWatchOptions = NetCliFilterOptions & {
|
|
3
|
+
json?: boolean;
|
|
4
|
+
reload?: boolean;
|
|
5
|
+
clear?: boolean;
|
|
6
|
+
settle?: string;
|
|
7
|
+
ignoreCache?: boolean;
|
|
8
|
+
maxTimeout?: string;
|
|
9
|
+
};
|
|
10
|
+
export declare const runNetWatch: (id: string | undefined, options: NetWatchOptions) => Promise<void>;
|
|
11
|
+
//# sourceMappingURL=netWatch.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"netWatch.d.ts","sourceRoot":"","sources":["../../src/commands/netWatch.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AAMzD,MAAM,MAAM,eAAe,GAAG,mBAAmB,GAAG;IACnD,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,UAAU,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,WAAW,GAAU,IAAI,MAAM,GAAG,SAAS,EAAE,SAAS,eAAe,KAAG,OAAO,CAAC,IAAI,CAuDhG,CAAA"}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
import { captureNetWindow, parseNetCaptureOptions } from './netCapture.js';
|
|
2
|
+
import { formatWatcherTransportError, resolveWatcherOrExit } from '../watchers/requestWatcher.js';
|
|
3
|
+
import { createOutput } from '../output/io.js';
|
|
4
|
+
import { formatNetworkRequest } from '../output/net.js';
|
|
5
|
+
export const runNetWatch = async (id, options) => {
|
|
6
|
+
const output = createOutput(options);
|
|
7
|
+
const resolved = await resolveWatcherOrExit({ id }, output);
|
|
8
|
+
if (!resolved) {
|
|
9
|
+
return;
|
|
10
|
+
}
|
|
11
|
+
const parsed = parseNetCaptureOptions(options, { defaultClear: true });
|
|
12
|
+
if (parsed.error || !parsed.value) {
|
|
13
|
+
output.writeWarn(parsed.error ?? 'Invalid net watch options.');
|
|
14
|
+
process.exitCode = 2;
|
|
15
|
+
return;
|
|
16
|
+
}
|
|
17
|
+
const { watcher } = resolved;
|
|
18
|
+
let cleared = 0;
|
|
19
|
+
let requests;
|
|
20
|
+
let timedOut = false;
|
|
21
|
+
try {
|
|
22
|
+
const captured = await captureNetWindow(watcher, options, parsed.value);
|
|
23
|
+
cleared = captured.cleared;
|
|
24
|
+
requests = captured.requests;
|
|
25
|
+
timedOut = captured.timedOut;
|
|
26
|
+
}
|
|
27
|
+
catch (error) {
|
|
28
|
+
output.writeWarn(formatWatcherTransportError(watcher, error));
|
|
29
|
+
process.exitCode = 1;
|
|
30
|
+
return;
|
|
31
|
+
}
|
|
32
|
+
if (options.json) {
|
|
33
|
+
output.writeJson({
|
|
34
|
+
ok: true,
|
|
35
|
+
cleared,
|
|
36
|
+
reloaded: options.reload === true,
|
|
37
|
+
settleMs: parsed.value.settleMs,
|
|
38
|
+
timedOut,
|
|
39
|
+
requests,
|
|
40
|
+
nextAfter: requests[requests.length - 1]?.id ?? 0,
|
|
41
|
+
});
|
|
42
|
+
return;
|
|
43
|
+
}
|
|
44
|
+
if (requests.length === 0) {
|
|
45
|
+
output.writeHuman(`no requests captured after ${parsed.value.settleMs}ms quiet window`);
|
|
46
|
+
return;
|
|
47
|
+
}
|
|
48
|
+
for (const request of requests) {
|
|
49
|
+
output.writeHuman(formatNetworkRequest(request));
|
|
50
|
+
}
|
|
51
|
+
output.writeHuman(timedOut
|
|
52
|
+
? `stopped after max timeout (${requests.length} requests collected; quiet window ${parsed.value.settleMs}ms not reached)`
|
|
53
|
+
: `settled after ${parsed.value.settleMs}ms quiet window (${requests.length} requests)`);
|
|
54
|
+
};
|
|
55
|
+
//# sourceMappingURL=netWatch.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"netWatch.js","sourceRoot":"","sources":["../../src/commands/netWatch.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAA;AAC1E,OAAO,EAAE,2BAA2B,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAA;AACjG,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAA;AAWvD,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,EAAE,EAAsB,EAAE,OAAwB,EAAiB,EAAE;IACpG,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;IACpC,MAAM,QAAQ,GAAG,MAAM,oBAAoB,CAAC,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA;IAC3D,IAAI,CAAC,QAAQ,EAAE,CAAC;QACf,OAAM;IACP,CAAC;IAED,MAAM,MAAM,GAAG,sBAAsB,CAAC,OAAO,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAA;IACtE,IAAI,MAAM,CAAC,KAAK,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACnC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,IAAI,4BAA4B,CAAC,CAAA;QAC9D,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;QACpB,OAAM;IACP,CAAC;IAED,MAAM,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAA;IAC5B,IAAI,OAAO,GAAG,CAAC,CAAA;IACf,IAAI,QAAiC,CAAA;IACrC,IAAI,QAAQ,GAAG,KAAK,CAAA;IACpB,IAAI,CAAC;QACJ,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;QACvE,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAA;QAC1B,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAA;QAC5B,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAA;IAC7B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,CAAC,SAAS,CAAC,2BAA2B,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAA;QAC7D,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;QACpB,OAAM;IACP,CAAC;IAED,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QAClB,MAAM,CAAC,SAAS,CAAC;YAChB,EAAE,EAAE,IAAI;YACR,OAAO;YACP,QAAQ,EAAE,OAAO,CAAC,MAAM,KAAK,IAAI;YACjC,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,QAAQ;YAC/B,QAAQ;YACR,QAAQ;YACR,SAAS,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC;SACjD,CAAC,CAAA;QACF,OAAM;IACP,CAAC;IAED,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3B,MAAM,CAAC,UAAU,CAAC,8BAA8B,MAAM,CAAC,KAAK,CAAC,QAAQ,iBAAiB,CAAC,CAAA;QACvF,OAAM;IACP,CAAC;IAED,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAChC,MAAM,CAAC,UAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAA;IACjD,CAAC;IACD,MAAM,CAAC,UAAU,CAChB,QAAQ;QACP,CAAC,CAAC,8BAA8B,QAAQ,CAAC,MAAM,qCAAqC,MAAM,CAAC,KAAK,CAAC,QAAQ,iBAAiB;QAC1H,CAAC,CAAC,iBAAiB,MAAM,CAAC,KAAK,CAAC,QAAQ,oBAAoB,QAAQ,CAAC,MAAM,YAAY,CACxF,CAAA;AACF,CAAC,CAAA"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Expand `--testid <id>` into `--selector "[data-testid='<id>']"`.
|
|
3
|
-
* Returns `false` (and prints an error) when `--testid`
|
|
3
|
+
* Returns `false` (and prints an error) when `--testid` is combined with another target flag.
|
|
4
4
|
*/
|
|
5
5
|
export declare const resolveTestId: (options: {
|
|
6
6
|
testid?: string;
|
|
7
7
|
selector?: string;
|
|
8
|
+
ref?: string;
|
|
8
9
|
json?: boolean;
|
|
9
10
|
}) => boolean;
|
|
10
11
|
//# sourceMappingURL=resolveTestId.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveTestId.d.ts","sourceRoot":"","sources":["../../src/commands/resolveTestId.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,eAAO,MAAM,aAAa,GAAI,SAAS;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,OAAO,CAAA;CAAE,KAAG,
|
|
1
|
+
{"version":3,"file":"resolveTestId.d.ts","sourceRoot":"","sources":["../../src/commands/resolveTestId.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,eAAO,MAAM,aAAa,GAAI,SAAS;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,OAAO,CAAA;CAAE,KAAG,OAY7G,CAAA"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Expand `--testid <id>` into `--selector "[data-testid='<id>']"`.
|
|
3
|
-
* Returns `false` (and prints an error) when `--testid`
|
|
3
|
+
* Returns `false` (and prints an error) when `--testid` is combined with another target flag.
|
|
4
4
|
*/
|
|
5
5
|
export const resolveTestId = (options) => {
|
|
6
|
-
if (options.testid && options.selector) {
|
|
7
|
-
console.error('Cannot use
|
|
6
|
+
if (options.testid && (options.selector || options.ref)) {
|
|
7
|
+
console.error('Cannot use --testid with --selector or --ref.');
|
|
8
8
|
process.exitCode = 2;
|
|
9
9
|
return false;
|
|
10
10
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveTestId.js","sourceRoot":"","sources":["../../src/commands/resolveTestId.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"resolveTestId.js","sourceRoot":"","sources":["../../src/commands/resolveTestId.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,OAA6E,EAAW,EAAE;IACvH,IAAI,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACzD,OAAO,CAAC,KAAK,CAAC,+CAA+C,CAAC,CAAA;QAC9D,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;QACpB,OAAO,KAAK,CAAA;IACb,CAAC;IAED,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACpB,OAAO,CAAC,QAAQ,GAAG,iBAAiB,OAAO,CAAC,MAAM,IAAI,CAAA;IACvD,CAAC;IAED,OAAO,IAAI,CAAA;AACZ,CAAC,CAAA"}
|
package/dist/commands/start.d.ts
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { PageConsoleLogging } from '@vforsh/argus-watcher';
|
|
2
2
|
import type { WatcherInjectConfig } from '../config/argusConfig.js';
|
|
3
3
|
export type StartOptions = {
|
|
4
4
|
id: string;
|
|
5
5
|
url?: string;
|
|
6
|
+
authFrom?: string;
|
|
6
7
|
json?: boolean;
|
|
7
8
|
profile?: 'temp' | 'default-full' | 'default-medium' | 'default-lite';
|
|
8
9
|
devTools?: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAK/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAInE,MAAM,MAAM,YAAY,GAAG;IAC1B,EAAE,EAAE,MAAM,CAAA;IACV,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,GAAG,cAAc,GAAG,gBAAgB,GAAG,cAAc,CAAA;IACrE,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,MAAM,CAAC,EAAE,mBAAmB,CAAA;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,kBAAkB,CAAC,EAAE,kBAAkB,CAAA;CACvC,CAAA;AAYD,eAAO,MAAM,QAAQ,GAAU,SAAS,YAAY,KAAG,OAAO,CAAC,IAAI,CA4JlE,CAAA"}
|
package/dist/commands/start.js
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
|
+
import { createAuthStateOriginUrl } from '@vforsh/argus-core';
|
|
1
2
|
import { rmSync } from 'node:fs';
|
|
2
|
-
import {
|
|
3
|
+
import { requestAuthStateSnapshot } from './auth.js';
|
|
4
|
+
import { applyAuthStateSnapshotToChrome } from './chrome/authState.js';
|
|
3
5
|
import { launchChrome } from './chromeStart.js';
|
|
4
6
|
import { createOutput } from '../output/io.js';
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
7
|
+
import { buildWatcherMatch, normalizeHttpUrl, registerTerminationHandlers, waitForever } from './startShared.js';
|
|
8
|
+
import { startManagedWatcher } from './watcherSession.js';
|
|
7
9
|
export const runStart = async (options) => {
|
|
8
10
|
const output = createOutput(options);
|
|
9
11
|
if (!options.id || options.id.trim() === '') {
|
|
@@ -12,12 +14,20 @@ export const runStart = async (options) => {
|
|
|
12
14
|
return;
|
|
13
15
|
}
|
|
14
16
|
const watcherId = options.id.trim();
|
|
15
|
-
|
|
16
|
-
|
|
17
|
+
if (options.authFrom && options.profile && options.profile !== 'temp') {
|
|
18
|
+
output.writeWarn('Cannot combine --auth-from with a copied Chrome profile. Use --profile temp or omit --profile.');
|
|
19
|
+
process.exitCode = 2;
|
|
20
|
+
return;
|
|
21
|
+
}
|
|
22
|
+
const authState = await resolveStartAuthState(options, output);
|
|
23
|
+
if (!authState) {
|
|
24
|
+
return;
|
|
25
|
+
}
|
|
17
26
|
// At least one targeting option is required for the watcher
|
|
18
|
-
const
|
|
27
|
+
const matchInput = resolveWatcherMatchInput(options, authState.startupUrl);
|
|
28
|
+
const hasTargeting = matchInput.url?.trim() || matchInput.target?.trim() || matchInput.origin?.trim() || matchInput.type?.trim();
|
|
19
29
|
if (!hasTargeting) {
|
|
20
|
-
output.writeWarn('At least one targeting option is required: --url, --target, --origin, or --type.');
|
|
30
|
+
output.writeWarn('At least one targeting option is required: --url, --auth-from, --target, --origin, or --type.');
|
|
21
31
|
process.exitCode = 2;
|
|
22
32
|
return;
|
|
23
33
|
}
|
|
@@ -28,8 +38,8 @@ export const runStart = async (options) => {
|
|
|
28
38
|
let chrome;
|
|
29
39
|
try {
|
|
30
40
|
chrome = await launchChrome({
|
|
31
|
-
url:
|
|
32
|
-
profile: options.profile,
|
|
41
|
+
url: authState.snapshot ? null : authState.startupUrl,
|
|
42
|
+
profile: authState.snapshot ? 'temp' : options.profile,
|
|
33
43
|
devTools: options.devTools,
|
|
34
44
|
headless: options.headless,
|
|
35
45
|
});
|
|
@@ -39,6 +49,23 @@ export const runStart = async (options) => {
|
|
|
39
49
|
process.exitCode = 1;
|
|
40
50
|
return;
|
|
41
51
|
}
|
|
52
|
+
if (authState.snapshot) {
|
|
53
|
+
try {
|
|
54
|
+
const hydrated = await applyAuthStateSnapshotToChrome({
|
|
55
|
+
snapshot: authState.snapshot,
|
|
56
|
+
cdpHost: chrome.cdpHost,
|
|
57
|
+
cdpPort: chrome.cdpPort,
|
|
58
|
+
startupUrl: authState.startupUrl,
|
|
59
|
+
});
|
|
60
|
+
authState.startupUrl = hydrated.startupUrl;
|
|
61
|
+
}
|
|
62
|
+
catch (error) {
|
|
63
|
+
await chrome.closeGracefully();
|
|
64
|
+
output.writeWarn(error instanceof Error ? error.message : String(error));
|
|
65
|
+
process.exitCode = 1;
|
|
66
|
+
return;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
42
69
|
if (!options.json) {
|
|
43
70
|
output.writeHuman(`Chrome started (pid=${chrome.chrome.pid}, cdp=${chrome.cdpHost}:${chrome.cdpPort})`);
|
|
44
71
|
}
|
|
@@ -46,41 +73,23 @@ export const runStart = async (options) => {
|
|
|
46
73
|
if (!options.json) {
|
|
47
74
|
output.writeHuman('Attaching watcher...');
|
|
48
75
|
}
|
|
49
|
-
const match = buildWatcherMatch(options);
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
}
|
|
61
|
-
|
|
62
|
-
let handle;
|
|
63
|
-
try {
|
|
64
|
-
handle = await startWatcher({
|
|
65
|
-
id: watcherId,
|
|
66
|
-
source: 'cdp',
|
|
67
|
-
match,
|
|
68
|
-
chrome: { host: chrome.cdpHost, port: chrome.cdpPort },
|
|
69
|
-
host: '127.0.0.1',
|
|
70
|
-
port: 0,
|
|
71
|
-
net: { enabled: true },
|
|
72
|
-
pageIndicator: options.pageIndicator === false ? { enabled: false } : { enabled: true },
|
|
73
|
-
artifacts: artifactsBaseDir ? { base: artifactsBaseDir } : undefined,
|
|
74
|
-
pageConsoleLogging: options.pageConsoleLogging,
|
|
75
|
-
inject: inject ?? undefined,
|
|
76
|
-
});
|
|
77
|
-
}
|
|
78
|
-
catch (error) {
|
|
79
|
-
output.writeWarn(`Failed to start watcher: ${error instanceof Error ? error.message : error}`);
|
|
76
|
+
const match = buildWatcherMatch(resolveWatcherMatchInput(options, authState.startupUrl));
|
|
77
|
+
const startedWatcher = await startManagedWatcher({
|
|
78
|
+
output,
|
|
79
|
+
watcherId,
|
|
80
|
+
source: 'cdp',
|
|
81
|
+
match,
|
|
82
|
+
chrome: { host: chrome.cdpHost, port: chrome.cdpPort },
|
|
83
|
+
pageIndicator: options.pageIndicator,
|
|
84
|
+
artifacts: options.artifacts,
|
|
85
|
+
pageConsoleLogging: options.pageConsoleLogging,
|
|
86
|
+
inject: options.inject,
|
|
87
|
+
});
|
|
88
|
+
if (!startedWatcher) {
|
|
80
89
|
chrome.cleanup();
|
|
81
|
-
process.exitCode = 1;
|
|
82
90
|
return;
|
|
83
91
|
}
|
|
92
|
+
const { handle } = startedWatcher;
|
|
84
93
|
// --- Cleanup on exit ---
|
|
85
94
|
const shutdown = async () => {
|
|
86
95
|
try {
|
|
@@ -99,14 +108,6 @@ export const runStart = async (options) => {
|
|
|
99
108
|
}
|
|
100
109
|
void handle.close().then(() => process.exit(0));
|
|
101
110
|
});
|
|
102
|
-
// --- CDP events ---
|
|
103
|
-
handle.events.on('cdpAttached', ({ target }) => {
|
|
104
|
-
const typeInfo = target?.type ? ` (type: ${target.type})` : '';
|
|
105
|
-
output.writeHuman(`[${watcherId}] CDP attached: ${target?.title} (${target?.url})${typeInfo}`);
|
|
106
|
-
});
|
|
107
|
-
handle.events.on('cdpDetached', ({ reason, target }) => {
|
|
108
|
-
output.writeHuman(`[${watcherId}] CDP detached: ${reason} (last target: ${target?.title})`);
|
|
109
|
-
});
|
|
110
111
|
// --- Output ---
|
|
111
112
|
const result = {
|
|
112
113
|
id: handle.watcher.id,
|
|
@@ -149,4 +150,31 @@ export const runStart = async (options) => {
|
|
|
149
150
|
}
|
|
150
151
|
await waitForever();
|
|
151
152
|
};
|
|
153
|
+
const resolveStartAuthState = async (options, output) => {
|
|
154
|
+
const startupUrl = normalizeHttpUrl(options.url);
|
|
155
|
+
if (!options.authFrom) {
|
|
156
|
+
return { snapshot: null, startupUrl };
|
|
157
|
+
}
|
|
158
|
+
const source = await requestAuthStateSnapshot(options.authFrom, {}, output);
|
|
159
|
+
if (!source) {
|
|
160
|
+
return null;
|
|
161
|
+
}
|
|
162
|
+
return {
|
|
163
|
+
snapshot: source.data,
|
|
164
|
+
startupUrl: startupUrl ?? resolveSnapshotStartupUrl(source.data),
|
|
165
|
+
};
|
|
166
|
+
};
|
|
167
|
+
const resolveSnapshotStartupUrl = (snapshot) => {
|
|
168
|
+
if (snapshot.url.trim()) {
|
|
169
|
+
return snapshot.url.trim();
|
|
170
|
+
}
|
|
171
|
+
if (snapshot.origin.trim()) {
|
|
172
|
+
return createAuthStateOriginUrl(snapshot.origin);
|
|
173
|
+
}
|
|
174
|
+
return null;
|
|
175
|
+
};
|
|
176
|
+
const resolveWatcherMatchInput = (options, startupUrl) => ({
|
|
177
|
+
...options,
|
|
178
|
+
url: options.url ?? startupUrl ?? undefined,
|
|
179
|
+
});
|
|
152
180
|
//# sourceMappingURL=start.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import type { StorageArea } from '@vforsh/argus-core';
|
|
2
|
+
/** Options shared by storage commands. */
|
|
3
|
+
export type StorageOptions = {
|
|
4
|
+
origin?: string;
|
|
5
|
+
json?: boolean;
|
|
6
|
+
};
|
|
7
|
+
/** Execute `argus storage <area> get`. */
|
|
8
|
+
export declare const runStorageGet: (area: StorageArea, id: string | undefined, key: string, options: StorageOptions) => Promise<void>;
|
|
9
|
+
/** Execute `argus storage <area> set`. */
|
|
10
|
+
export declare const runStorageSet: (area: StorageArea, id: string | undefined, key: string, value: string, options: StorageOptions) => Promise<void>;
|
|
11
|
+
/** Execute `argus storage <area> remove`. */
|
|
12
|
+
export declare const runStorageRemove: (area: StorageArea, id: string | undefined, key: string, options: StorageOptions) => Promise<void>;
|
|
13
|
+
/** Execute `argus storage <area> list`. */
|
|
14
|
+
export declare const runStorageList: (area: StorageArea, id: string | undefined, options: StorageOptions) => Promise<void>;
|
|
15
|
+
/** Execute `argus storage <area> clear`. */
|
|
16
|
+
export declare const runStorageClear: (area: StorageArea, id: string | undefined, options: StorageOptions) => Promise<void>;
|
|
17
|
+
//# sourceMappingURL=storage.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../src/commands/storage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEX,WAAW,EAOX,MAAM,oBAAoB,CAAA;AAI3B,0CAA0C;AAC1C,MAAM,MAAM,cAAc,GAAG;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,0CAA0C;AAC1C,eAAO,MAAM,aAAa,GAAU,MAAM,WAAW,EAAE,IAAI,MAAM,GAAG,SAAS,EAAE,KAAK,MAAM,EAAE,SAAS,cAAc,KAAG,OAAO,CAAC,IAAI,CAIjI,CAAA;AAED,0CAA0C;AAC1C,eAAO,MAAM,aAAa,GACzB,MAAM,WAAW,EACjB,IAAI,MAAM,GAAG,SAAS,EACtB,KAAK,MAAM,EACX,OAAO,MAAM,EACb,SAAS,cAAc,KACrB,OAAO,CAAC,IAAI,CAUd,CAAA;AAED,6CAA6C;AAC7C,eAAO,MAAM,gBAAgB,GAAU,MAAM,WAAW,EAAE,IAAI,MAAM,GAAG,SAAS,EAAE,KAAK,MAAM,EAAE,SAAS,cAAc,KAAG,OAAO,CAAC,IAAI,CAIpI,CAAA;AAED,2CAA2C;AAC3C,eAAO,MAAM,cAAc,GAAU,MAAM,WAAW,EAAE,IAAI,MAAM,GAAG,SAAS,EAAE,SAAS,cAAc,KAAG,OAAO,CAAC,IAAI,CAMrH,CAAA;AAED,4CAA4C;AAC5C,eAAO,MAAM,eAAe,GAAU,MAAM,WAAW,EAAE,IAAI,MAAM,GAAG,SAAS,EAAE,SAAS,cAAc,KAAG,OAAO,CAAC,IAAI,CAItH,CAAA"}
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import { createOutput } from '../output/io.js';
|
|
2
|
+
import { requestWatcherJson, writeRequestError } from '../watchers/requestWatcher.js';
|
|
3
|
+
/** Execute `argus storage <area> get`. */
|
|
4
|
+
export const runStorageGet = async (area, id, key, options) => {
|
|
5
|
+
await runStorageCommand(area, id, { action: 'get', key, origin: options.origin }, options, (response, output) => {
|
|
6
|
+
output.writeHuman(response.value ?? 'null');
|
|
7
|
+
});
|
|
8
|
+
};
|
|
9
|
+
/** Execute `argus storage <area> set`. */
|
|
10
|
+
export const runStorageSet = async (area, id, key, value, options) => {
|
|
11
|
+
await runStorageCommand(area, id, { action: 'set', key, value, origin: options.origin }, options, (response, output) => {
|
|
12
|
+
output.writeHuman(`Set ${response.key} on ${response.origin}`);
|
|
13
|
+
});
|
|
14
|
+
};
|
|
15
|
+
/** Execute `argus storage <area> remove`. */
|
|
16
|
+
export const runStorageRemove = async (area, id, key, options) => {
|
|
17
|
+
await runStorageCommand(area, id, { action: 'remove', key, origin: options.origin }, options, (response, output) => {
|
|
18
|
+
output.writeHuman(`Removed ${response.key} from ${response.origin}`);
|
|
19
|
+
});
|
|
20
|
+
};
|
|
21
|
+
/** Execute `argus storage <area> list`. */
|
|
22
|
+
export const runStorageList = async (area, id, options) => {
|
|
23
|
+
await runStorageCommand(area, id, { action: 'list', origin: options.origin }, options, (response, output) => {
|
|
24
|
+
for (const key of response.keys) {
|
|
25
|
+
output.writeHuman(key);
|
|
26
|
+
}
|
|
27
|
+
});
|
|
28
|
+
};
|
|
29
|
+
/** Execute `argus storage <area> clear`. */
|
|
30
|
+
export const runStorageClear = async (area, id, options) => {
|
|
31
|
+
await runStorageCommand(area, id, { action: 'clear', origin: options.origin }, options, (response, output) => {
|
|
32
|
+
output.writeHuman(`Cleared ${response.cleared} item(s) from ${response.origin}`);
|
|
33
|
+
});
|
|
34
|
+
};
|
|
35
|
+
const runStorageCommand = async (area, id, payload, options, writeHuman) => {
|
|
36
|
+
const output = createOutput(options);
|
|
37
|
+
const response = await callStorage(area, id, payload, output);
|
|
38
|
+
if (!response) {
|
|
39
|
+
return;
|
|
40
|
+
}
|
|
41
|
+
if (options.json) {
|
|
42
|
+
output.writeJson(response);
|
|
43
|
+
return;
|
|
44
|
+
}
|
|
45
|
+
writeHuman(response, output);
|
|
46
|
+
};
|
|
47
|
+
const callStorage = async (area, id, payload, output) => {
|
|
48
|
+
const result = await requestWatcherJson({
|
|
49
|
+
id,
|
|
50
|
+
path: `/storage/${area}`,
|
|
51
|
+
method: 'POST',
|
|
52
|
+
body: payload,
|
|
53
|
+
timeoutMs: 10_000,
|
|
54
|
+
returnErrorResponse: true,
|
|
55
|
+
});
|
|
56
|
+
if (!result.ok) {
|
|
57
|
+
writeRequestError(result, output);
|
|
58
|
+
return null;
|
|
59
|
+
}
|
|
60
|
+
if (!result.data.ok) {
|
|
61
|
+
output.writeWarn(`Error: ${result.data.error.message}`);
|
|
62
|
+
process.exitCode = 1;
|
|
63
|
+
return null;
|
|
64
|
+
}
|
|
65
|
+
return result.data;
|
|
66
|
+
};
|
|
67
|
+
//# sourceMappingURL=storage.js.map
|