@vforsh/argus 0.1.3 → 0.1.4
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/README.md +6 -4
- package/dist/.tsbuildinfo +1 -1
- package/dist/argus.js +16346 -0
- package/dist/bin.d.ts +1 -1
- package/dist/bin.js +47 -759
- package/dist/bin.js.map +1 -1
- package/dist/cdp/resolveCdpEndpoint.js +2 -2
- package/dist/cdp/resolveCdpEndpoint.js.map +1 -1
- package/dist/cli/parse.d.ts +11 -0
- package/dist/cli/parse.d.ts.map +1 -0
- package/dist/cli/parse.js +48 -0
- package/dist/cli/parse.js.map +1 -0
- package/dist/cli/program.d.ts +3 -0
- package/dist/cli/program.d.ts.map +1 -0
- package/dist/cli/program.js +21 -0
- package/dist/cli/program.js.map +1 -0
- package/dist/cli/register/registerChrome.d.ts +3 -0
- package/dist/cli/register/registerChrome.d.ts.map +1 -0
- package/dist/cli/register/registerChrome.js +79 -0
- package/dist/cli/register/registerChrome.js.map +1 -0
- package/dist/cli/register/registerClick.d.ts +3 -0
- package/dist/cli/register/registerClick.d.ts.map +1 -0
- package/dist/cli/register/registerClick.js +23 -0
- package/dist/cli/register/registerClick.js.map +1 -0
- package/dist/cli/register/registerConfig.d.ts +3 -0
- package/dist/cli/register/registerConfig.d.ts.map +1 -0
- package/dist/cli/register/registerConfig.js +14 -0
- package/dist/cli/register/registerConfig.js.map +1 -0
- package/dist/cli/register/registerDom.d.ts +3 -0
- package/dist/cli/register/registerDom.d.ts.map +1 -0
- package/dist/cli/register/registerDom.js +261 -0
- package/dist/cli/register/registerDom.js.map +1 -0
- package/dist/cli/register/registerEval.d.ts +3 -0
- package/dist/cli/register/registerEval.d.ts.map +1 -0
- package/dist/cli/register/registerEval.js +129 -0
- package/dist/cli/register/registerEval.js.map +1 -0
- package/dist/cli/register/registerExtension.d.ts +3 -0
- package/dist/cli/register/registerExtension.d.ts.map +1 -0
- package/dist/cli/register/registerExtension.js +46 -0
- package/dist/cli/register/registerExtension.js.map +1 -0
- package/dist/cli/register/registerFill.d.ts +3 -0
- package/dist/cli/register/registerFill.d.ts.map +1 -0
- package/dist/cli/register/registerFill.js +30 -0
- package/dist/cli/register/registerFill.js.map +1 -0
- package/dist/cli/register/registerHover.d.ts +3 -0
- package/dist/cli/register/registerHover.d.ts.map +1 -0
- package/dist/cli/register/registerHover.js +20 -0
- package/dist/cli/register/registerHover.js.map +1 -0
- package/dist/cli/register/registerKeydown.d.ts +3 -0
- package/dist/cli/register/registerKeydown.d.ts.map +1 -0
- package/dist/cli/register/registerKeydown.js +20 -0
- package/dist/cli/register/registerKeydown.js.map +1 -0
- package/dist/cli/register/registerLogs.d.ts +3 -0
- package/dist/cli/register/registerLogs.d.ts.map +1 -0
- package/dist/cli/register/registerLogs.js +64 -0
- package/dist/cli/register/registerLogs.js.map +1 -0
- package/dist/cli/register/registerNet.d.ts +3 -0
- package/dist/cli/register/registerNet.d.ts.map +1 -0
- package/dist/cli/register/registerNet.js +32 -0
- package/dist/cli/register/registerNet.js.map +1 -0
- package/dist/cli/register/registerPage.d.ts +3 -0
- package/dist/cli/register/registerPage.d.ts.map +1 -0
- package/dist/cli/register/registerPage.js +106 -0
- package/dist/cli/register/registerPage.js.map +1 -0
- package/dist/cli/register/registerQuickAccess.d.ts +3 -0
- package/dist/cli/register/registerQuickAccess.d.ts.map +1 -0
- package/dist/cli/register/registerQuickAccess.js +82 -0
- package/dist/cli/register/registerQuickAccess.js.map +1 -0
- package/dist/cli/register/registerScrollTo.d.ts +3 -0
- package/dist/cli/register/registerScrollTo.d.ts.map +1 -0
- package/dist/cli/register/registerScrollTo.js +22 -0
- package/dist/cli/register/registerScrollTo.js.map +1 -0
- package/dist/cli/register/registerSnapshot.d.ts +3 -0
- package/dist/cli/register/registerSnapshot.d.ts.map +1 -0
- package/dist/cli/register/registerSnapshot.js +37 -0
- package/dist/cli/register/registerSnapshot.js.map +1 -0
- package/dist/cli/register/registerStorage.d.ts +3 -0
- package/dist/cli/register/registerStorage.d.ts.map +1 -0
- package/dist/cli/register/registerStorage.js +56 -0
- package/dist/cli/register/registerStorage.js.map +1 -0
- package/dist/cli/register/registerThrottle.d.ts +3 -0
- package/dist/cli/register/registerThrottle.d.ts.map +1 -0
- package/dist/cli/register/registerThrottle.js +33 -0
- package/dist/cli/register/registerThrottle.js.map +1 -0
- package/dist/cli/register/registerTrace.d.ts +3 -0
- package/dist/cli/register/registerTrace.d.ts.map +1 -0
- package/dist/cli/register/registerTrace.js +39 -0
- package/dist/cli/register/registerTrace.js.map +1 -0
- package/dist/cli/register/registerWatcher.d.ts +3 -0
- package/dist/cli/register/registerWatcher.d.ts.map +1 -0
- package/dist/cli/register/registerWatcher.js +115 -0
- package/dist/cli/register/registerWatcher.js.map +1 -0
- package/dist/cli/validation.d.ts +10 -0
- package/dist/cli/validation.d.ts.map +1 -0
- package/dist/cli/validation.js +24 -0
- package/dist/cli/validation.js.map +1 -0
- package/dist/commands/chrome.d.ts +23 -0
- package/dist/commands/chrome.d.ts.map +1 -1
- package/dist/commands/chrome.js +120 -0
- package/dist/commands/chrome.js.map +1 -1
- package/dist/commands/chromeStart.d.ts +24 -0
- package/dist/commands/chromeStart.d.ts.map +1 -1
- package/dist/commands/chromeStart.js +175 -105
- package/dist/commands/chromeStart.js.map +1 -1
- package/dist/commands/configInit.d.ts.map +1 -1
- package/dist/commands/configInit.js +27 -13
- package/dist/commands/configInit.js.map +1 -1
- package/dist/commands/domAdd.d.ts.map +1 -1
- package/dist/commands/domAdd.js +25 -47
- package/dist/commands/domAdd.js.map +1 -1
- package/dist/commands/domAddScript.d.ts +14 -0
- package/dist/commands/domAddScript.d.ts.map +1 -0
- package/dist/commands/domAddScript.js +172 -0
- package/dist/commands/domAddScript.js.map +1 -0
- package/dist/commands/domClick.d.ts +5 -1
- package/dist/commands/domClick.d.ts.map +1 -1
- package/dist/commands/domClick.js +74 -36
- package/dist/commands/domClick.js.map +1 -1
- package/dist/commands/domFill.d.ts +14 -0
- package/dist/commands/domFill.d.ts.map +1 -0
- package/dist/commands/domFill.js +129 -0
- package/dist/commands/domFill.js.map +1 -0
- package/dist/commands/domFocus.d.ts +10 -0
- package/dist/commands/domFocus.d.ts.map +1 -0
- package/dist/commands/domFocus.js +52 -0
- package/dist/commands/domFocus.js.map +1 -0
- package/dist/commands/domHover.d.ts +1 -0
- package/dist/commands/domHover.d.ts.map +1 -1
- package/dist/commands/domHover.js +17 -40
- package/dist/commands/domHover.js.map +1 -1
- package/dist/commands/domInfo.d.ts +1 -0
- package/dist/commands/domInfo.d.ts.map +1 -1
- package/dist/commands/domInfo.js +19 -51
- package/dist/commands/domInfo.js.map +1 -1
- package/dist/commands/domKeydown.d.ts +10 -0
- package/dist/commands/domKeydown.d.ts.map +1 -0
- package/dist/commands/domKeydown.js +46 -0
- package/dist/commands/domKeydown.js.map +1 -0
- package/dist/commands/domModify.d.ts +1 -0
- package/dist/commands/domModify.d.ts.map +1 -1
- package/dist/commands/domModify.js +14 -40
- package/dist/commands/domModify.js.map +1 -1
- package/dist/commands/domRemove.d.ts +1 -0
- package/dist/commands/domRemove.d.ts.map +1 -1
- package/dist/commands/domRemove.js +17 -40
- package/dist/commands/domRemove.js.map +1 -1
- package/dist/commands/domScroll.d.ts +12 -0
- package/dist/commands/domScroll.d.ts.map +1 -0
- package/dist/commands/domScroll.js +105 -0
- package/dist/commands/domScroll.js.map +1 -0
- package/dist/commands/domScrollTo.d.ts +12 -0
- package/dist/commands/domScrollTo.d.ts.map +1 -0
- package/dist/commands/domScrollTo.js +107 -0
- package/dist/commands/domScrollTo.js.map +1 -0
- package/dist/commands/domSetFile.d.ts +12 -0
- package/dist/commands/domSetFile.d.ts.map +1 -0
- package/dist/commands/domSetFile.js +87 -0
- package/dist/commands/domSetFile.js.map +1 -0
- package/dist/commands/domTree.d.ts +1 -0
- package/dist/commands/domTree.d.ts.map +1 -1
- package/dist/commands/domTree.js +20 -52
- package/dist/commands/domTree.js.map +1 -1
- package/dist/commands/eval.d.ts +5 -1
- package/dist/commands/eval.d.ts.map +1 -1
- package/dist/commands/eval.js +8 -148
- package/dist/commands/eval.js.map +1 -1
- package/dist/commands/evalShared.d.ts +64 -0
- package/dist/commands/evalShared.d.ts.map +1 -0
- package/dist/commands/evalShared.js +205 -0
- package/dist/commands/evalShared.js.map +1 -0
- package/dist/commands/evalUntil.d.ts +27 -0
- package/dist/commands/evalUntil.d.ts.map +1 -0
- package/dist/commands/evalUntil.js +128 -0
- package/dist/commands/evalUntil.js.map +1 -0
- package/dist/commands/extension/doctor.d.ts +5 -0
- package/dist/commands/extension/doctor.d.ts.map +1 -0
- package/dist/commands/extension/doctor.js +262 -0
- package/dist/commands/extension/doctor.js.map +1 -0
- package/dist/commands/extension/id.d.ts +9 -0
- package/dist/commands/extension/id.d.ts.map +1 -0
- package/dist/commands/extension/id.js +122 -0
- package/dist/commands/extension/id.js.map +1 -0
- package/dist/commands/extension/list.d.ts +8 -0
- package/dist/commands/extension/list.d.ts.map +1 -0
- package/dist/commands/extension/list.js +194 -0
- package/dist/commands/extension/list.js.map +1 -0
- package/dist/commands/list.d.ts.map +1 -1
- package/dist/commands/list.js +36 -25
- package/dist/commands/list.js.map +1 -1
- package/dist/commands/logs.d.ts.map +1 -1
- package/dist/commands/logs.js +14 -55
- package/dist/commands/logs.js.map +1 -1
- package/dist/commands/net.d.ts.map +1 -1
- package/dist/commands/net.js +12 -53
- package/dist/commands/net.js.map +1 -1
- package/dist/commands/netTail.d.ts.map +1 -1
- package/dist/commands/netTail.js +4 -40
- package/dist/commands/netTail.js.map +1 -1
- package/dist/commands/page.d.ts +0 -1
- package/dist/commands/page.d.ts.map +1 -1
- package/dist/commands/page.js +3 -13
- package/dist/commands/page.js.map +1 -1
- package/dist/commands/pageEmulation.d.ts +20 -0
- package/dist/commands/pageEmulation.d.ts.map +1 -0
- package/dist/commands/pageEmulation.js +215 -0
- package/dist/commands/pageEmulation.js.map +1 -0
- package/dist/commands/reload.d.ts.map +1 -1
- package/dist/commands/reload.js +12 -39
- package/dist/commands/reload.js.map +1 -1
- package/dist/commands/resolveTestId.d.ts +10 -0
- package/dist/commands/resolveTestId.d.ts.map +1 -0
- package/dist/commands/resolveTestId.js +16 -0
- package/dist/commands/resolveTestId.js.map +1 -0
- package/dist/commands/screenshot.d.ts.map +1 -1
- package/dist/commands/screenshot.js +16 -41
- package/dist/commands/screenshot.js.map +1 -1
- package/dist/commands/snapshot.d.ts +10 -0
- package/dist/commands/snapshot.d.ts.map +1 -0
- package/dist/commands/snapshot.js +54 -0
- package/dist/commands/snapshot.js.map +1 -0
- package/dist/commands/start.d.ts +20 -0
- package/dist/commands/start.d.ts.map +1 -0
- package/dist/commands/start.js +191 -0
- package/dist/commands/start.js.map +1 -0
- package/dist/commands/storageLocal.d.ts.map +1 -1
- package/dist/commands/storageLocal.js +16 -43
- package/dist/commands/storageLocal.js.map +1 -1
- package/dist/commands/tail.d.ts.map +1 -1
- package/dist/commands/tail.js +4 -40
- package/dist/commands/tail.js.map +1 -1
- package/dist/commands/throttle.d.ts +13 -0
- package/dist/commands/throttle.d.ts.map +1 -0
- package/dist/commands/throttle.js +124 -0
- package/dist/commands/throttle.js.map +1 -0
- package/dist/commands/trace.d.ts.map +1 -1
- package/dist/commands/trace.js +8 -38
- package/dist/commands/trace.js.map +1 -1
- package/dist/commands/watcherPrune.d.ts.map +1 -1
- package/dist/commands/watcherPrune.js +3 -4
- package/dist/commands/watcherPrune.js.map +1 -1
- package/dist/commands/watcherStart.d.ts +3 -0
- package/dist/commands/watcherStart.d.ts.map +1 -1
- package/dist/commands/watcherStart.js +28 -8
- package/dist/commands/watcherStart.js.map +1 -1
- package/dist/commands/watcherStatus.d.ts.map +1 -1
- package/dist/commands/watcherStatus.js +10 -32
- package/dist/commands/watcherStatus.js.map +1 -1
- package/dist/commands/watcherStop.d.ts.map +1 -1
- package/dist/commands/watcherStop.js +7 -14
- package/dist/commands/watcherStop.js.map +1 -1
- package/dist/config/argusConfig.d.ts +8 -10
- package/dist/config/argusConfig.d.ts.map +1 -1
- package/dist/config/argusConfig.js +49 -56
- package/dist/config/argusConfig.js.map +1 -1
- package/dist/emulation/devices.d.ts +15 -0
- package/dist/emulation/devices.d.ts.map +1 -0
- package/dist/emulation/devices.js +54 -0
- package/dist/emulation/devices.js.map +1 -0
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/output/accessibility.d.ts +16 -0
- package/dist/output/accessibility.d.ts.map +1 -0
- package/dist/output/accessibility.js +61 -0
- package/dist/output/accessibility.js.map +1 -0
- package/dist/registry.d.ts +6 -6
- package/dist/registry.d.ts.map +1 -1
- package/dist/registry.js +20 -21
- package/dist/registry.js.map +1 -1
- package/dist/utils/paths.d.ts +3 -0
- package/dist/utils/paths.d.ts.map +1 -0
- package/dist/utils/paths.js +8 -0
- package/dist/utils/paths.js.map +1 -0
- package/dist/watchers/requestWatcher.d.ts +42 -0
- package/dist/watchers/requestWatcher.d.ts.map +1 -0
- package/dist/watchers/requestWatcher.js +77 -0
- package/dist/watchers/requestWatcher.js.map +1 -0
- package/dist/watchers/resolveWatcher.js +2 -2
- package/dist/watchers/resolveWatcher.js.map +1 -1
- package/package.json +10 -15
- package/schemas/argus.config.schema.json +16 -0
- package/dist/commands/contexts.d.ts +0 -7
- package/dist/commands/contexts.d.ts.map +0 -1
- package/dist/commands/contexts.js +0 -54
- package/dist/commands/contexts.js.map +0 -1
- package/dist/commands/domDiff.d.ts +0 -43
- package/dist/commands/domDiff.d.ts.map +0 -1
- package/dist/commands/domDiff.js +0 -279
- package/dist/commands/domDiff.js.map +0 -1
- package/dist/commands/extension/attach.d.ts +0 -8
- package/dist/commands/extension/attach.d.ts.map +0 -1
- package/dist/commands/extension/attach.js +0 -171
- package/dist/commands/extension/attach.js.map +0 -1
- package/dist/commands/extension/detach.d.ts +0 -6
- package/dist/commands/extension/detach.d.ts.map +0 -1
- package/dist/commands/extension/detach.js +0 -132
- package/dist/commands/extension/detach.js.map +0 -1
- package/dist/commands/extension/targets.d.ts +0 -13
- package/dist/commands/extension/targets.d.ts.map +0 -1
- package/dist/commands/extension/targets.js +0 -77
- package/dist/commands/extension/targets.js.map +0 -1
- package/dist/commands/frames.d.ts +0 -7
- package/dist/commands/frames.d.ts.map +0 -1
- package/dist/commands/frames.js +0 -90
- package/dist/commands/frames.js.map +0 -1
- package/dist/frame/frameSelector.d.ts +0 -14
- package/dist/frame/frameSelector.d.ts.map +0 -1
- package/dist/frame/frameSelector.js +0 -31
- package/dist/frame/frameSelector.js.map +0 -1
- package/dist/output/domDiff.d.ts +0 -14
- package/dist/output/domDiff.d.ts.map +0 -1
- package/dist/output/domDiff.js +0 -151
- package/dist/output/domDiff.js.map +0 -1
- package/dist/plugins/argusApi.d.ts +0 -22
- package/dist/plugins/argusApi.d.ts.map +0 -1
- package/dist/plugins/argusApi.js +0 -92
- package/dist/plugins/argusApi.js.map +0 -1
- package/dist/plugins/loader.d.ts +0 -12
- package/dist/plugins/loader.d.ts.map +0 -1
- package/dist/plugins/loader.js +0 -92
- package/dist/plugins/loader.js.map +0 -1
- package/dist/plugins/registry.d.ts +0 -17
- package/dist/plugins/registry.d.ts.map +0 -1
- package/dist/plugins/registry.js +0 -44
- package/dist/plugins/registry.js.map +0 -1
- package/dist/plugins/resolver.d.ts +0 -6
- package/dist/plugins/resolver.d.ts.map +0 -1
- package/dist/plugins/resolver.js +0 -86
- package/dist/plugins/resolver.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trace.js","sourceRoot":"","sources":["../../src/commands/trace.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"trace.js","sourceRoot":"","sources":["../../src/commands/trace.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watcherPrune.d.ts","sourceRoot":"","sources":["../../src/commands/watcherPrune.ts"],"names":[],"mappings":"AAKA,6CAA6C;AAC7C,MAAM,MAAM,mBAAmB,GAAG;IACjC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AASD,yCAAyC;AACzC,eAAO,MAAM,eAAe,GAAU,SAAS,mBAAmB,KAAG,OAAO,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"watcherPrune.d.ts","sourceRoot":"","sources":["../../src/commands/watcherPrune.ts"],"names":[],"mappings":"AAKA,6CAA6C;AAC7C,MAAM,MAAM,mBAAmB,GAAG;IACjC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AASD,yCAAyC;AACzC,eAAO,MAAM,eAAe,GAAU,SAAS,mBAAmB,KAAG,OAAO,CAAC,IAAI,CAuEhF,CAAA"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { pruneRegistry, removeWatchersAndPersist } from '../registry.js';
|
|
2
2
|
import { fetchJson } from '../httpClient.js';
|
|
3
3
|
import { createOutput } from '../output/io.js';
|
|
4
4
|
/** Execute the watcher prune command. */
|
|
@@ -10,8 +10,7 @@ export const runWatcherPrune = async (options) => {
|
|
|
10
10
|
process.exitCode = 2;
|
|
11
11
|
return;
|
|
12
12
|
}
|
|
13
|
-
|
|
14
|
-
registry = await pruneRegistry(registry);
|
|
13
|
+
const registry = await pruneRegistry();
|
|
15
14
|
let watchers = Object.values(registry.watchers);
|
|
16
15
|
// Filter by cwd if specified
|
|
17
16
|
if (options.byCwd) {
|
|
@@ -61,7 +60,7 @@ export const runWatcherPrune = async (options) => {
|
|
|
61
60
|
}
|
|
62
61
|
return;
|
|
63
62
|
}
|
|
64
|
-
await removeWatchersAndPersist(
|
|
63
|
+
await removeWatchersAndPersist(removedIds);
|
|
65
64
|
if (options.json) {
|
|
66
65
|
output.writeJson({ keptIds, removedIds, dryRun: false });
|
|
67
66
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watcherPrune.js","sourceRoot":"","sources":["../../src/commands/watcherPrune.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"watcherPrune.js","sourceRoot":"","sources":["../../src/commands/watcherPrune.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { type PageConsoleLogging, type WatcherSourceMode } from '@vforsh/argus-watcher';
|
|
2
|
+
import type { WatcherInjectConfig } from '../config/argusConfig.js';
|
|
2
3
|
export type WatcherStartOptions = {
|
|
3
4
|
id?: string;
|
|
4
5
|
/** Source mode for CDP connection: 'cdp' (default) or 'extension'. */
|
|
@@ -10,6 +11,8 @@ export type WatcherStartOptions = {
|
|
|
10
11
|
pageIndicator?: boolean;
|
|
11
12
|
artifacts?: string;
|
|
12
13
|
pageConsoleLogging?: PageConsoleLogging;
|
|
14
|
+
/** JavaScript injection on watcher attach. */
|
|
15
|
+
inject?: WatcherInjectConfig;
|
|
13
16
|
/** Filter by target type (e.g., 'page', 'iframe'). */
|
|
14
17
|
type?: string;
|
|
15
18
|
/** Match against URL origin only (protocol + host + port). */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watcherStart.d.ts","sourceRoot":"","sources":["../../src/commands/watcherStart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoC,KAAK,kBAAkB,EAAE,KAAK,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AAIzH,MAAM,MAAM,mBAAmB,GAAG;IACjC,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,sEAAsE;IACtE,MAAM,CAAC,EAAE,iBAAiB,CAAA;IAC1B,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IAC5B,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,kBAAkB,CAAC,EAAE,kBAAkB,CAAA;IACvC,sDAAsD;IACtD,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,8DAA8D;IAC9D,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,4DAA4D;IAC5D,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,2CAA2C;IAC3C,MAAM,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;
|
|
1
|
+
{"version":3,"file":"watcherStart.d.ts","sourceRoot":"","sources":["../../src/commands/watcherStart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoC,KAAK,kBAAkB,EAAE,KAAK,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AAIzH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAGnE,MAAM,MAAM,mBAAmB,GAAG;IACjC,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,sEAAsE;IACtE,MAAM,CAAC,EAAE,iBAAiB,CAAA;IAC1B,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IAC5B,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,kBAAkB,CAAC,EAAE,kBAAkB,CAAA;IACvC,8CAA8C;IAC9C,MAAM,CAAC,EAAE,mBAAmB,CAAA;IAC5B,sDAAsD;IACtD,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,8DAA8D;IAC9D,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,4DAA4D;IAC5D,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,2CAA2C;IAC3C,MAAM,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;AAoDD,eAAO,MAAM,eAAe,GAAU,SAAS,mBAAmB,KAAG,OAAO,CAAC,IAAI,CAwLhF,CAAA"}
|
|
@@ -1,18 +1,34 @@
|
|
|
1
1
|
import { startWatcher } from '@vforsh/argus-watcher';
|
|
2
|
-
import
|
|
2
|
+
import crypto from 'node:crypto';
|
|
3
|
+
import fs from 'node:fs/promises';
|
|
3
4
|
import { createOutput } from '../output/io.js';
|
|
5
|
+
import { resolvePath } from '../utils/paths.js';
|
|
4
6
|
const isValidPort = (port) => Number.isFinite(port) && port >= 1 && port <= 65535;
|
|
5
7
|
const parsePort = (value) => {
|
|
6
8
|
const port = typeof value === 'string' ? parseInt(value, 10) : value;
|
|
7
9
|
return isValidPort(port) ? port : null;
|
|
8
10
|
};
|
|
11
|
+
const resolveInjectScript = async (inject, output) => {
|
|
12
|
+
if (!inject) {
|
|
13
|
+
return null;
|
|
14
|
+
}
|
|
15
|
+
const resolvedPath = resolvePath(inject.file);
|
|
16
|
+
let script;
|
|
17
|
+
try {
|
|
18
|
+
script = await fs.readFile(resolvedPath, 'utf8');
|
|
19
|
+
}
|
|
20
|
+
catch (error) {
|
|
21
|
+
output.writeWarn(`Failed to read inject script at ${resolvedPath}: ${error instanceof Error ? error.message : String(error)}. Skipping injection.`);
|
|
22
|
+
return null;
|
|
23
|
+
}
|
|
24
|
+
if (script.trim() === '') {
|
|
25
|
+
output.writeWarn(`Inject script at ${resolvedPath} is empty. Skipping injection.`);
|
|
26
|
+
return null;
|
|
27
|
+
}
|
|
28
|
+
return { script, exposeArgus: inject.exposeArgus };
|
|
29
|
+
};
|
|
9
30
|
export const runWatcherStart = async (options) => {
|
|
10
31
|
const output = createOutput(options);
|
|
11
|
-
if (!options.id || options.id.trim() === '') {
|
|
12
|
-
output.writeWarn('--id is required.');
|
|
13
|
-
process.exitCode = 2;
|
|
14
|
-
return;
|
|
15
|
-
}
|
|
16
32
|
// Validate source option
|
|
17
33
|
const sourceMode = options.source ?? 'cdp';
|
|
18
34
|
if (sourceMode !== 'cdp' && sourceMode !== 'extension') {
|
|
@@ -64,7 +80,7 @@ export const runWatcherStart = async (options) => {
|
|
|
64
80
|
chromePort = parsed;
|
|
65
81
|
}
|
|
66
82
|
}
|
|
67
|
-
const watcherId = options.id
|
|
83
|
+
const watcherId = options.id?.trim() || generateWatcherId();
|
|
68
84
|
const matchUrl = options.url?.trim();
|
|
69
85
|
let artifactsBaseDir;
|
|
70
86
|
if (options.artifacts != null) {
|
|
@@ -74,8 +90,9 @@ export const runWatcherStart = async (options) => {
|
|
|
74
90
|
process.exitCode = 2;
|
|
75
91
|
return;
|
|
76
92
|
}
|
|
77
|
-
artifactsBaseDir =
|
|
93
|
+
artifactsBaseDir = resolvePath(trimmed);
|
|
78
94
|
}
|
|
95
|
+
const inject = await resolveInjectScript(options.inject, output);
|
|
79
96
|
// Build the match object from various filter options
|
|
80
97
|
const match = {};
|
|
81
98
|
if (matchUrl) {
|
|
@@ -105,6 +122,7 @@ export const runWatcherStart = async (options) => {
|
|
|
105
122
|
pageIndicator: sourceMode === 'cdp' ? (options.pageIndicator === false ? { enabled: false } : { enabled: true }) : { enabled: false },
|
|
106
123
|
artifacts: artifactsBaseDir ? { base: artifactsBaseDir } : undefined,
|
|
107
124
|
pageConsoleLogging: options.pageConsoleLogging,
|
|
125
|
+
inject: inject ?? undefined,
|
|
108
126
|
});
|
|
109
127
|
}
|
|
110
128
|
catch (error) {
|
|
@@ -179,4 +197,6 @@ export const runWatcherStart = async (options) => {
|
|
|
179
197
|
}
|
|
180
198
|
await new Promise(() => { });
|
|
181
199
|
};
|
|
200
|
+
/** Generate a short random watcher ID (e.g. "a3f1b2"). */
|
|
201
|
+
const generateWatcherId = () => crypto.randomBytes(3).toString('hex');
|
|
182
202
|
//# sourceMappingURL=watcherStart.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watcherStart.js","sourceRoot":"","sources":["../../src/commands/watcherStart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAuE,MAAM,uBAAuB,CAAA;AACzH,OAAO,
|
|
1
|
+
{"version":3,"file":"watcherStart.js","sourceRoot":"","sources":["../../src/commands/watcherStart.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watcherStatus.d.ts","sourceRoot":"","sources":["../../src/commands/watcherStatus.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"watcherStatus.d.ts","sourceRoot":"","sources":["../../src/commands/watcherStatus.ts"],"names":[],"mappings":"AAIA,8CAA8C;AAC9C,MAAM,MAAM,oBAAoB,GAAG;IAClC,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,0CAA0C;AAC1C,eAAO,MAAM,gBAAgB,GAAU,IAAI,MAAM,GAAG,SAAS,EAAE,SAAS,oBAAoB,KAAG,OAAO,CAAC,IAAI,CAqB1G,CAAA"}
|
|
@@ -1,44 +1,22 @@
|
|
|
1
|
-
import { fetchJson } from '../httpClient.js';
|
|
2
1
|
import { createOutput } from '../output/io.js';
|
|
3
|
-
import {
|
|
4
|
-
import { resolveWatcher } from '../watchers/resolveWatcher.js';
|
|
2
|
+
import { requestWatcherJson, writeRequestError } from '../watchers/requestWatcher.js';
|
|
5
3
|
/** Execute the watcher status command. */
|
|
6
4
|
export const runWatcherStatus = async (id, options) => {
|
|
7
5
|
const output = createOutput(options);
|
|
8
|
-
const
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
process.exitCode = resolved.exitCode;
|
|
16
|
-
return;
|
|
17
|
-
}
|
|
18
|
-
const { watcher } = resolved;
|
|
19
|
-
const url = `http://${watcher.host}:${watcher.port}/status`;
|
|
20
|
-
let status;
|
|
21
|
-
try {
|
|
22
|
-
status = await fetchJson(url, { timeoutMs: 2_000 });
|
|
23
|
-
}
|
|
24
|
-
catch (error) {
|
|
25
|
-
output.writeWarn(`unreachable ${watcher.id} ${watcher.host}:${watcher.port} (${formatError(error)})`);
|
|
26
|
-
process.exitCode = 1;
|
|
6
|
+
const result = await requestWatcherJson({
|
|
7
|
+
id,
|
|
8
|
+
path: '/status',
|
|
9
|
+
timeoutMs: 2_000,
|
|
10
|
+
});
|
|
11
|
+
if (!result.ok) {
|
|
12
|
+
writeRequestError(result, output);
|
|
27
13
|
return;
|
|
28
14
|
}
|
|
29
15
|
if (options.json) {
|
|
30
|
-
output.writeJson(
|
|
16
|
+
output.writeJson(result.data);
|
|
31
17
|
return;
|
|
32
18
|
}
|
|
19
|
+
const { watcher, data: status } = result;
|
|
33
20
|
output.writeHuman(`ok ${watcher.id} ${watcher.host}:${watcher.port} pid=${status.pid} attached=${status.attached}`);
|
|
34
21
|
};
|
|
35
|
-
const formatError = (error) => {
|
|
36
|
-
if (!error) {
|
|
37
|
-
return 'unknown error';
|
|
38
|
-
}
|
|
39
|
-
if (error instanceof Error) {
|
|
40
|
-
return error.message;
|
|
41
|
-
}
|
|
42
|
-
return String(error);
|
|
43
|
-
};
|
|
44
22
|
//# sourceMappingURL=watcherStatus.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watcherStatus.js","sourceRoot":"","sources":["../../src/commands/watcherStatus.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"watcherStatus.js","sourceRoot":"","sources":["../../src/commands/watcherStatus.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AAOrF,0CAA0C;AAC1C,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EAAE,EAAsB,EAAE,OAA6B,EAAiB,EAAE;IAC9G,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;IAEpC,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAiB;QACvD,EAAE;QACF,IAAI,EAAE,SAAS;QACf,SAAS,EAAE,KAAK;KAChB,CAAC,CAAA;IAEF,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;QAChB,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QACjC,OAAM;IACP,CAAC;IAED,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QAClB,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAC7B,OAAM;IACP,CAAC;IAED,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,CAAA;IACxC,MAAM,CAAC,UAAU,CAAC,MAAM,OAAO,CAAC,EAAE,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,QAAQ,MAAM,CAAC,GAAG,aAAa,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAA;AACpH,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watcherStop.d.ts","sourceRoot":"","sources":["../../src/commands/watcherStop.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"watcherStop.d.ts","sourceRoot":"","sources":["../../src/commands/watcherStop.ts"],"names":[],"mappings":"AAQA,4CAA4C;AAC5C,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;AAEtD,wCAAwC;AACxC,eAAO,MAAM,cAAc,GAAU,IAAI,MAAM,GAAG,SAAS,EAAE,UAAU,kBAAkB,KAAG,OAAO,CAAC,IAAI,CA0DvG,CAAA"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { removeWatcherAndPersist } from '../registry.js';
|
|
2
2
|
import { fetchJson } from '../httpClient.js';
|
|
3
|
+
import { formatError } from '../cli/parse.js';
|
|
4
|
+
import { formatWatcherLine } from '../output/format.js';
|
|
3
5
|
import { createOutput } from '../output/io.js';
|
|
4
|
-
import { writeWatcherCandidates } from '../watchers/candidates.js';
|
|
5
6
|
import { resolveWatcher } from '../watchers/resolveWatcher.js';
|
|
6
7
|
/** Execute the watcher stop command. */
|
|
7
8
|
export const runWatcherStop = async (id, _options) => {
|
|
@@ -10,14 +11,15 @@ export const runWatcherStop = async (id, _options) => {
|
|
|
10
11
|
if (!resolved.ok) {
|
|
11
12
|
output.writeWarn(resolved.error);
|
|
12
13
|
if (resolved.candidates && resolved.candidates.length > 0) {
|
|
13
|
-
|
|
14
|
+
for (const watcher of resolved.candidates) {
|
|
15
|
+
output.writeWarn(formatWatcherLine(watcher));
|
|
16
|
+
}
|
|
14
17
|
output.writeWarn('Hint: run `argus list` to see all watchers.');
|
|
15
18
|
}
|
|
16
19
|
process.exitCode = resolved.exitCode;
|
|
17
20
|
return;
|
|
18
21
|
}
|
|
19
22
|
const { watcher } = resolved;
|
|
20
|
-
let registry = resolved.registry;
|
|
21
23
|
const shutdownUrl = `http://${watcher.host}:${watcher.port}/shutdown`;
|
|
22
24
|
try {
|
|
23
25
|
const response = await fetchJson(shutdownUrl, { method: 'POST', timeoutMs: 2_000 });
|
|
@@ -40,7 +42,7 @@ export const runWatcherStop = async (id, _options) => {
|
|
|
40
42
|
}
|
|
41
43
|
catch (error) {
|
|
42
44
|
if (isNoSuchProcessError(error)) {
|
|
43
|
-
|
|
45
|
+
await removeWatcherAndPersist(watcher.id);
|
|
44
46
|
output.writeHuman(`stopped ${watcher.id}`);
|
|
45
47
|
return;
|
|
46
48
|
}
|
|
@@ -50,7 +52,7 @@ export const runWatcherStop = async (id, _options) => {
|
|
|
50
52
|
}
|
|
51
53
|
const waitResult = await waitForProcessExit(pid, 2_000, 100);
|
|
52
54
|
if (waitResult.state === 'dead') {
|
|
53
|
-
|
|
55
|
+
await removeWatcherAndPersist(watcher.id);
|
|
54
56
|
output.writeHuman(`stopped ${watcher.id}`);
|
|
55
57
|
return;
|
|
56
58
|
}
|
|
@@ -91,13 +93,4 @@ const isNoSuchProcessError = (error) => {
|
|
|
91
93
|
const isErrnoError = (error) => {
|
|
92
94
|
return !!error && typeof error === 'object' && 'code' in error;
|
|
93
95
|
};
|
|
94
|
-
const formatError = (error) => {
|
|
95
|
-
if (!error) {
|
|
96
|
-
return 'unknown error';
|
|
97
|
-
}
|
|
98
|
-
if (error instanceof Error) {
|
|
99
|
-
return error.message;
|
|
100
|
-
}
|
|
101
|
-
return String(error);
|
|
102
|
-
};
|
|
103
96
|
//# sourceMappingURL=watcherStop.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watcherStop.js","sourceRoot":"","sources":["../../src/commands/watcherStop.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAA;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC5C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"watcherStop.js","sourceRoot":"","sources":["../../src/commands/watcherStop.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,15 @@
|
|
|
1
|
-
import type { PluginConfig } from '@vforsh/argus-core';
|
|
2
1
|
export type ChromeStartConfig = {
|
|
3
2
|
url?: string;
|
|
4
3
|
watcherId?: string;
|
|
5
4
|
profile?: 'temp' | 'default-full' | 'default-medium' | 'default-lite';
|
|
6
5
|
devTools?: boolean;
|
|
6
|
+
headless?: boolean;
|
|
7
7
|
};
|
|
8
8
|
export type PageConsoleLogging = 'none' | 'minimal' | 'full';
|
|
9
|
+
export type WatcherInjectConfig = {
|
|
10
|
+
file: string;
|
|
11
|
+
exposeArgus?: boolean;
|
|
12
|
+
};
|
|
9
13
|
export type WatcherStartConfig = {
|
|
10
14
|
id?: string;
|
|
11
15
|
url?: string;
|
|
@@ -14,6 +18,7 @@ export type WatcherStartConfig = {
|
|
|
14
18
|
artifacts?: string;
|
|
15
19
|
pageIndicator?: boolean;
|
|
16
20
|
pageConsoleLogging?: PageConsoleLogging;
|
|
21
|
+
inject?: WatcherInjectConfig;
|
|
17
22
|
};
|
|
18
23
|
export type ArgusConfig = {
|
|
19
24
|
chrome?: {
|
|
@@ -22,15 +27,6 @@ export type ArgusConfig = {
|
|
|
22
27
|
watcher?: {
|
|
23
28
|
start?: WatcherStartConfig;
|
|
24
29
|
};
|
|
25
|
-
/**
|
|
26
|
-
* Plugin modules to load.
|
|
27
|
-
* Each entry can be:
|
|
28
|
-
* - npm package name: "gameX-argus-plugin"
|
|
29
|
-
* - relative path: "./plugins/gameX.js"
|
|
30
|
-
* - absolute path: "/path/to/plugin.js"
|
|
31
|
-
* - object with metadata: { name: "gameX", module: "./plugins/gameX.js" }
|
|
32
|
-
*/
|
|
33
|
-
plugins?: PluginConfig[];
|
|
34
30
|
};
|
|
35
31
|
export type ArgusConfigLoadResult = {
|
|
36
32
|
config: ArgusConfig;
|
|
@@ -53,6 +49,7 @@ export declare const mergeChromeStartOptionsWithConfig: <T extends {
|
|
|
53
49
|
fromWatcher?: string;
|
|
54
50
|
profile?: ChromeStartConfig["profile"];
|
|
55
51
|
devTools?: boolean;
|
|
52
|
+
headless?: boolean;
|
|
56
53
|
}>(options: T, command: OptionSourceProvider, configResult: ArgusConfigLoadResult | null) => T | null;
|
|
57
54
|
export declare const mergeWatcherStartOptionsWithConfig: <T extends {
|
|
58
55
|
id?: string;
|
|
@@ -62,6 +59,7 @@ export declare const mergeWatcherStartOptionsWithConfig: <T extends {
|
|
|
62
59
|
pageIndicator?: boolean;
|
|
63
60
|
artifacts?: string;
|
|
64
61
|
pageConsoleLogging?: PageConsoleLogging;
|
|
62
|
+
inject?: WatcherInjectConfig;
|
|
65
63
|
}>(options: T, command: OptionSourceProvider, configResult: ArgusConfigLoadResult | null) => T | null;
|
|
66
64
|
export {};
|
|
67
65
|
//# sourceMappingURL=argusConfig.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"argusConfig.d.ts","sourceRoot":"","sources":["../../src/config/argusConfig.ts"],"names":[],"mappings":"AAEA,
|
|
1
|
+
{"version":3,"file":"argusConfig.d.ts","sourceRoot":"","sources":["../../src/config/argusConfig.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import fs from 'node:fs';
|
|
2
2
|
import path from 'node:path';
|
|
3
3
|
const AUTO_CONFIG_CANDIDATES = ['.argus/config.json', '.config/argus.json', 'argus.config.json', 'argus/config.json'];
|
|
4
|
-
const EXPECTED_SHAPE_HINT = 'Expected shape: { chrome?: { start?: { url?: string, watcherId?: string, profile?: "temp"|"default-full"|"default-medium"|"default-lite", devTools?: boolean } }, watcher?: { start?: { id?: string, url?: string, chromeHost?: string, chromePort?: number, artifacts?: string, pageIndicator?: boolean, pageConsoleLogging?: "none"|"minimal"|"full" } } }.';
|
|
4
|
+
const EXPECTED_SHAPE_HINT = 'Expected shape: { chrome?: { start?: { url?: string, watcherId?: string, profile?: "temp"|"default-full"|"default-medium"|"default-lite", devTools?: boolean, headless?: boolean } }, watcher?: { start?: { id?: string, url?: string, chromeHost?: string, chromePort?: number, artifacts?: string, pageIndicator?: boolean, pageConsoleLogging?: "none"|"minimal"|"full", inject?: { file: string, exposeArgus?: boolean } } } }.';
|
|
5
5
|
const isRecord = (value) => typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
6
6
|
const invalidConfig = (configPath, message) => {
|
|
7
7
|
console.error(`Invalid Argus config at ${configPath}: ${message} ${EXPECTED_SHAPE_HINT}`);
|
|
@@ -73,6 +73,10 @@ const validateChromeStartConfig = (value) => {
|
|
|
73
73
|
if (!devToolsResult.ok) {
|
|
74
74
|
return devToolsResult;
|
|
75
75
|
}
|
|
76
|
+
const headlessResult = validateOptionalBoolean(value.headless, '"chrome.start.headless"');
|
|
77
|
+
if (!headlessResult.ok) {
|
|
78
|
+
return headlessResult;
|
|
79
|
+
}
|
|
76
80
|
if (urlResult.value !== undefined && watcherIdResult.value !== undefined) {
|
|
77
81
|
return { ok: false, error: '"chrome.start.url" and "chrome.start.watcherId" are mutually exclusive.' };
|
|
78
82
|
}
|
|
@@ -92,8 +96,37 @@ const validateChromeStartConfig = (value) => {
|
|
|
92
96
|
if (devToolsResult.value !== undefined) {
|
|
93
97
|
config.devTools = devToolsResult.value;
|
|
94
98
|
}
|
|
99
|
+
if (headlessResult.value !== undefined) {
|
|
100
|
+
config.headless = headlessResult.value;
|
|
101
|
+
}
|
|
95
102
|
return { ok: true, value: config };
|
|
96
103
|
};
|
|
104
|
+
const validateOptionalInjectConfig = (value) => {
|
|
105
|
+
if (value === undefined) {
|
|
106
|
+
return { ok: true };
|
|
107
|
+
}
|
|
108
|
+
if (!isRecord(value)) {
|
|
109
|
+
return { ok: false, error: '"watcher.start.inject" must be an object.' };
|
|
110
|
+
}
|
|
111
|
+
const fileResult = validateOptionalString(value.file, '"watcher.start.inject.file"');
|
|
112
|
+
if (!fileResult.ok) {
|
|
113
|
+
return fileResult;
|
|
114
|
+
}
|
|
115
|
+
if (fileResult.value === undefined || fileResult.value.trim() === '') {
|
|
116
|
+
return { ok: false, error: '"watcher.start.inject.file" is required and must be a non-empty string.' };
|
|
117
|
+
}
|
|
118
|
+
const exposeArgusResult = validateOptionalBoolean(value.exposeArgus, '"watcher.start.inject.exposeArgus"');
|
|
119
|
+
if (!exposeArgusResult.ok) {
|
|
120
|
+
return exposeArgusResult;
|
|
121
|
+
}
|
|
122
|
+
return {
|
|
123
|
+
ok: true,
|
|
124
|
+
value: {
|
|
125
|
+
file: fileResult.value,
|
|
126
|
+
exposeArgus: exposeArgusResult.value,
|
|
127
|
+
},
|
|
128
|
+
};
|
|
129
|
+
};
|
|
97
130
|
const validateWatcherStartConfig = (value) => {
|
|
98
131
|
if (!isRecord(value)) {
|
|
99
132
|
return { ok: false, error: '"watcher.start" must be an object.' };
|
|
@@ -126,6 +159,10 @@ const validateWatcherStartConfig = (value) => {
|
|
|
126
159
|
if (!pageConsoleLoggingResult.ok) {
|
|
127
160
|
return pageConsoleLoggingResult;
|
|
128
161
|
}
|
|
162
|
+
const injectResult = validateOptionalInjectConfig(value.inject);
|
|
163
|
+
if (!injectResult.ok) {
|
|
164
|
+
return injectResult;
|
|
165
|
+
}
|
|
129
166
|
if (artifactsResult.value !== undefined && artifactsResult.value.trim() === '') {
|
|
130
167
|
return { ok: false, error: '"watcher.start.artifacts" must be a non-empty string.' };
|
|
131
168
|
}
|
|
@@ -151,53 +188,10 @@ const validateWatcherStartConfig = (value) => {
|
|
|
151
188
|
if (pageConsoleLoggingResult.value !== undefined) {
|
|
152
189
|
config.pageConsoleLogging = pageConsoleLoggingResult.value;
|
|
153
190
|
}
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
const validatePluginsConfig = (value) => {
|
|
157
|
-
if (!Array.isArray(value)) {
|
|
158
|
-
return { ok: false, error: '"plugins" must be an array.' };
|
|
159
|
-
}
|
|
160
|
-
const plugins = [];
|
|
161
|
-
for (let i = 0; i < value.length; i++) {
|
|
162
|
-
const item = value[i];
|
|
163
|
-
// String format
|
|
164
|
-
if (typeof item === 'string') {
|
|
165
|
-
plugins.push(item);
|
|
166
|
-
continue;
|
|
167
|
-
}
|
|
168
|
-
// Object format
|
|
169
|
-
if (!isRecord(item)) {
|
|
170
|
-
return { ok: false, error: `"plugins[${i}]" must be a string or an object.` };
|
|
171
|
-
}
|
|
172
|
-
const nameResult = validateOptionalString(item.name, `"plugins[${i}].name"`);
|
|
173
|
-
if (!nameResult.ok) {
|
|
174
|
-
return nameResult;
|
|
175
|
-
}
|
|
176
|
-
const moduleResult = validateOptionalString(item.module, `"plugins[${i}].module"`);
|
|
177
|
-
if (!moduleResult.ok) {
|
|
178
|
-
return moduleResult;
|
|
179
|
-
}
|
|
180
|
-
if (!moduleResult.value) {
|
|
181
|
-
return { ok: false, error: `"plugins[${i}].module" is required.` };
|
|
182
|
-
}
|
|
183
|
-
const enabledResult = validateOptionalBoolean(item.enabled, `"plugins[${i}].enabled"`);
|
|
184
|
-
if (!enabledResult.ok) {
|
|
185
|
-
return enabledResult;
|
|
186
|
-
}
|
|
187
|
-
const pluginConfig = {
|
|
188
|
-
name: nameResult.value || moduleResult.value,
|
|
189
|
-
module: moduleResult.value,
|
|
190
|
-
enabled: enabledResult.value,
|
|
191
|
-
};
|
|
192
|
-
if (item.config !== undefined) {
|
|
193
|
-
if (!isRecord(item.config)) {
|
|
194
|
-
return { ok: false, error: `"plugins[${i}].config" must be an object.` };
|
|
195
|
-
}
|
|
196
|
-
pluginConfig.config = item.config;
|
|
197
|
-
}
|
|
198
|
-
plugins.push(pluginConfig);
|
|
191
|
+
if (injectResult.value !== undefined) {
|
|
192
|
+
config.inject = injectResult.value;
|
|
199
193
|
}
|
|
200
|
-
return { ok: true, value:
|
|
194
|
+
return { ok: true, value: config };
|
|
201
195
|
};
|
|
202
196
|
const validateArgusConfig = (value) => {
|
|
203
197
|
if (!isRecord(value)) {
|
|
@@ -235,15 +229,7 @@ const validateArgusConfig = (value) => {
|
|
|
235
229
|
watcherConfig = {};
|
|
236
230
|
}
|
|
237
231
|
}
|
|
238
|
-
|
|
239
|
-
if (value.plugins !== undefined) {
|
|
240
|
-
const pluginsResult = validatePluginsConfig(value.plugins);
|
|
241
|
-
if (!pluginsResult.ok) {
|
|
242
|
-
return pluginsResult;
|
|
243
|
-
}
|
|
244
|
-
pluginsConfig = pluginsResult.value;
|
|
245
|
-
}
|
|
246
|
-
return { ok: true, value: { chrome: chromeConfig, watcher: watcherConfig, plugins: pluginsConfig } };
|
|
232
|
+
return { ok: true, value: { chrome: chromeConfig, watcher: watcherConfig } };
|
|
247
233
|
};
|
|
248
234
|
export const resolveArgusConfigPath = ({ cliPath, cwd }) => {
|
|
249
235
|
if (cliPath) {
|
|
@@ -287,6 +273,10 @@ export const getConfigStartDefaults = (config) => ({
|
|
|
287
273
|
watcherStart: config.watcher?.start,
|
|
288
274
|
});
|
|
289
275
|
const resolveArtifactsPath = (configDir, artifacts) => path.resolve(configDir, artifacts);
|
|
276
|
+
const resolveInjectPath = (configDir, inject) => ({
|
|
277
|
+
file: path.resolve(configDir, inject.file),
|
|
278
|
+
exposeArgus: inject.exposeArgus,
|
|
279
|
+
});
|
|
290
280
|
const mergeOption = (command, key, cliValue, configValue) => {
|
|
291
281
|
if (command.getOptionValueSource(key) === 'cli') {
|
|
292
282
|
return cliValue;
|
|
@@ -309,6 +299,7 @@ export const mergeChromeStartOptionsWithConfig = (options, command, configResult
|
|
|
309
299
|
merged.fromWatcher = mergeOption(command, 'fromWatcher', options.fromWatcher, chromeStart.watcherId);
|
|
310
300
|
merged.profile = mergeOption(command, 'profile', options.profile, chromeStart.profile);
|
|
311
301
|
merged.devTools = mergeOption(command, 'devTools', options.devTools, chromeStart.devTools);
|
|
302
|
+
merged.headless = mergeOption(command, 'headless', options.headless, chromeStart.headless);
|
|
312
303
|
if (merged.url && merged.fromWatcher) {
|
|
313
304
|
console.error('Cannot combine --url with --from-watcher. Use one or the other.');
|
|
314
305
|
process.exitCode = 2;
|
|
@@ -326,6 +317,7 @@ export const mergeWatcherStartOptionsWithConfig = (options, command, configResul
|
|
|
326
317
|
}
|
|
327
318
|
const merged = { ...options };
|
|
328
319
|
const configArtifacts = watcherStart.artifacts !== undefined ? resolveArtifactsPath(configResult.configDir, watcherStart.artifacts) : undefined;
|
|
320
|
+
const configInject = watcherStart.inject !== undefined ? resolveInjectPath(configResult.configDir, watcherStart.inject) : undefined;
|
|
329
321
|
merged.id = mergeOption(command, 'id', options.id, watcherStart.id);
|
|
330
322
|
merged.url = mergeOption(command, 'url', options.url, watcherStart.url);
|
|
331
323
|
merged.chromeHost = mergeOption(command, 'chromeHost', options.chromeHost, watcherStart.chromeHost);
|
|
@@ -333,6 +325,7 @@ export const mergeWatcherStartOptionsWithConfig = (options, command, configResul
|
|
|
333
325
|
merged.pageIndicator = mergeOption(command, 'pageIndicator', options.pageIndicator, watcherStart.pageIndicator);
|
|
334
326
|
merged.pageConsoleLogging = mergeOption(command, 'pageConsoleLogging', options.pageConsoleLogging, watcherStart.pageConsoleLogging);
|
|
335
327
|
merged.artifacts = mergeOption(command, 'artifacts', options.artifacts, configArtifacts);
|
|
328
|
+
merged.inject = mergeOption(command, 'inject', options.inject, configInject);
|
|
336
329
|
return merged;
|
|
337
330
|
};
|
|
338
331
|
//# sourceMappingURL=argusConfig.js.map
|