@vforsh/argus 0.3.1 → 0.4.0
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 +5285 -5575
- package/dist/cdp/resolveCdpEndpoint.d.ts.map +1 -1
- package/dist/cdp/resolveCdpEndpoint.js +2 -1
- package/dist/cdp/resolveCdpEndpoint.js.map +1 -1
- package/dist/cli/defineCommand.d.ts +12 -0
- package/dist/cli/defineCommand.d.ts.map +1 -1
- package/dist/cli/defineCommand.js +71 -1
- package/dist/cli/defineCommand.js.map +1 -1
- package/dist/cli/defineWatcherCommand.d.ts +12 -54
- package/dist/cli/defineWatcherCommand.d.ts.map +1 -1
- package/dist/cli/defineWatcherCommand.js +1 -1
- package/dist/cli/defineWatcherCommand.js.map +1 -1
- package/dist/cli/parse.d.ts +1 -2
- package/dist/cli/parse.d.ts.map +1 -1
- package/dist/cli/parse.js +2 -10
- package/dist/cli/parse.js.map +1 -1
- package/dist/cli/plugins/pluginHost.d.ts.map +1 -1
- package/dist/cli/plugins/pluginHost.js +1 -1
- package/dist/cli/plugins/pluginHost.js.map +1 -1
- package/dist/cli/plugins/registerPlugins.d.ts.map +1 -1
- package/dist/cli/plugins/registerPlugins.js +10 -8
- package/dist/cli/plugins/registerPlugins.js.map +1 -1
- package/dist/cli/program.d.ts.map +1 -1
- package/dist/cli/program.js +4 -0
- package/dist/cli/program.js.map +1 -1
- package/dist/cli/register/authCommands.d.ts.map +1 -1
- package/dist/cli/register/authCommands.js +8 -7
- package/dist/cli/register/authCommands.js.map +1 -1
- package/dist/cli/register/chromeCommands.d.ts.map +1 -1
- package/dist/cli/register/chromeCommands.js +12 -27
- package/dist/cli/register/chromeCommands.js.map +1 -1
- package/dist/cli/register/codeCommands.d.ts.map +1 -1
- package/dist/cli/register/codeCommands.js +7 -6
- package/dist/cli/register/codeCommands.js.map +1 -1
- package/dist/cli/register/dialogCommands.d.ts.map +1 -1
- package/dist/cli/register/dialogCommands.js +3 -2
- package/dist/cli/register/dialogCommands.js.map +1 -1
- package/dist/cli/register/domCommandBuilder.d.ts.map +1 -1
- package/dist/cli/register/domCommandBuilder.js +2 -1
- package/dist/cli/register/domCommandBuilder.js.map +1 -1
- package/dist/cli/register/domCommands.d.ts.map +1 -1
- package/dist/cli/register/domCommands.js +7 -6
- package/dist/cli/register/domCommands.js.map +1 -1
- package/dist/cli/register/evalCommands.d.ts.map +1 -1
- package/dist/cli/register/evalCommands.js +27 -57
- package/dist/cli/register/evalCommands.js.map +1 -1
- package/dist/cli/register/extensionCommands.d.ts.map +1 -1
- package/dist/cli/register/extensionCommands.js +1 -1
- package/dist/cli/register/extensionCommands.js.map +1 -1
- package/dist/cli/register/fillCommand.d.ts.map +1 -1
- package/dist/cli/register/fillCommand.js +5 -5
- package/dist/cli/register/fillCommand.js.map +1 -1
- package/dist/cli/register/hoverCommand.d.ts.map +1 -1
- package/dist/cli/register/hoverCommand.js +2 -1
- package/dist/cli/register/hoverCommand.js.map +1 -1
- package/dist/cli/register/keydownCommand.d.ts.map +1 -1
- package/dist/cli/register/keydownCommand.js +2 -1
- package/dist/cli/register/keydownCommand.js.map +1 -1
- package/dist/cli/register/locateCommands.d.ts.map +1 -1
- package/dist/cli/register/locateCommands.js +2 -1
- package/dist/cli/register/locateCommands.js.map +1 -1
- package/dist/cli/register/logsCommands.d.ts.map +1 -1
- package/dist/cli/register/logsCommands.js +8 -10
- package/dist/cli/register/logsCommands.js.map +1 -1
- package/dist/cli/register/netCommands.d.ts +0 -5
- package/dist/cli/register/netCommands.d.ts.map +1 -1
- package/dist/cli/register/netCommands.js +17 -143
- package/dist/cli/register/netCommands.js.map +1 -1
- package/dist/cli/register/pageCommands.d.ts.map +1 -1
- package/dist/cli/register/pageCommands.js +8 -7
- package/dist/cli/register/pageCommands.js.map +1 -1
- package/dist/cli/register/pluginCommands.d.ts.map +1 -1
- package/dist/cli/register/pluginCommands.js +3 -2
- package/dist/cli/register/pluginCommands.js.map +1 -1
- package/dist/cli/register/quickAccessCommands.d.ts.map +1 -1
- package/dist/cli/register/quickAccessCommands.js +16 -31
- package/dist/cli/register/quickAccessCommands.js.map +1 -1
- package/dist/cli/register/recordCommands.d.ts.map +1 -1
- package/dist/cli/register/recordCommands.js +12 -34
- package/dist/cli/register/recordCommands.js.map +1 -1
- package/dist/cli/register/scrollToCommand.d.ts.map +1 -1
- package/dist/cli/register/scrollToCommand.js +2 -1
- package/dist/cli/register/scrollToCommand.js.map +1 -1
- package/dist/cli/register/sharedOptions.d.ts +11 -0
- package/dist/cli/register/sharedOptions.d.ts.map +1 -0
- package/dist/cli/register/sharedOptions.js +10 -0
- package/dist/cli/register/sharedOptions.js.map +1 -0
- package/dist/cli/register/skillCommands.d.ts.map +1 -1
- package/dist/cli/register/skillCommands.js +2 -1
- package/dist/cli/register/skillCommands.js.map +1 -1
- package/dist/cli/register/snapshotCommands.d.ts.map +1 -1
- package/dist/cli/register/snapshotCommands.js +3 -2
- package/dist/cli/register/snapshotCommands.js.map +1 -1
- package/dist/cli/register/storageCommands.d.ts.map +1 -1
- package/dist/cli/register/storageCommands.js +2 -1
- package/dist/cli/register/storageCommands.js.map +1 -1
- package/dist/cli/register/throttleCommands.d.ts.map +1 -1
- package/dist/cli/register/throttleCommands.js +4 -3
- package/dist/cli/register/throttleCommands.js.map +1 -1
- package/dist/cli/register/traceCommands.d.ts.map +1 -1
- package/dist/cli/register/traceCommands.js +10 -30
- package/dist/cli/register/traceCommands.js.map +1 -1
- package/dist/cli/register/watcherCommands.d.ts.map +1 -1
- package/dist/cli/register/watcherCommands.js +12 -24
- package/dist/cli/register/watcherCommands.js.map +1 -1
- package/dist/cli/validation.d.ts +14 -0
- package/dist/cli/validation.d.ts.map +1 -1
- package/dist/cli/validation.js +17 -6
- package/dist/cli/validation.js.map +1 -1
- package/dist/commands/auth.d.ts.map +1 -1
- package/dist/commands/auth.js +3 -2
- package/dist/commands/auth.js.map +1 -1
- package/dist/commands/authCookieSupport.d.ts +4 -2
- package/dist/commands/authCookieSupport.d.ts.map +1 -1
- package/dist/commands/authCookieSupport.js +0 -4
- package/dist/commands/authCookieSupport.js.map +1 -1
- package/dist/commands/authCookies.d.ts +4 -4
- package/dist/commands/authCookies.d.ts.map +1 -1
- package/dist/commands/chrome/authState.d.ts +0 -12
- package/dist/commands/chrome/authState.d.ts.map +1 -1
- package/dist/commands/chrome/authState.js +0 -14
- package/dist/commands/chrome/authState.js.map +1 -1
- package/dist/commands/chrome/browser.d.ts.map +1 -1
- package/dist/commands/chrome/browser.js +2 -1
- package/dist/commands/chrome/browser.js.map +1 -1
- package/dist/commands/chrome/shared.d.ts.map +1 -1
- package/dist/commands/chrome/shared.js +3 -2
- package/dist/commands/chrome/shared.js.map +1 -1
- package/dist/commands/chrome/targets.d.ts.map +1 -1
- package/dist/commands/chrome/targets.js +6 -5
- package/dist/commands/chrome/targets.js.map +1 -1
- package/dist/commands/chromeStart.d.ts +10 -0
- package/dist/commands/chromeStart.d.ts.map +1 -1
- package/dist/commands/chromeStart.js +50 -41
- package/dist/commands/chromeStart.js.map +1 -1
- package/dist/commands/code.d.ts +2 -2
- package/dist/commands/code.d.ts.map +1 -1
- package/dist/commands/codeEdit.d.ts.map +1 -1
- package/dist/commands/codeEdit.js +3 -2
- package/dist/commands/codeEdit.js.map +1 -1
- package/dist/commands/configInit.d.ts +1 -0
- package/dist/commands/configInit.d.ts.map +1 -1
- package/dist/commands/configInit.js +17 -14
- package/dist/commands/configInit.js.map +1 -1
- package/dist/commands/dialog.d.ts +4 -4
- package/dist/commands/dialog.d.ts.map +1 -1
- package/dist/commands/doctor.d.ts.map +1 -1
- package/dist/commands/doctor.js +14 -10
- package/dist/commands/doctor.js.map +1 -1
- package/dist/commands/dom/shared.js +1 -1
- package/dist/commands/dom/shared.js.map +1 -1
- package/dist/commands/domAdd.d.ts +1 -1
- package/dist/commands/domAdd.d.ts.map +1 -1
- package/dist/commands/domAdd.js +10 -54
- package/dist/commands/domAdd.js.map +1 -1
- package/dist/commands/domAddScript.d.ts.map +1 -1
- package/dist/commands/domAddScript.js +14 -58
- package/dist/commands/domAddScript.js.map +1 -1
- package/dist/commands/domClick.d.ts +1 -2
- package/dist/commands/domClick.d.ts.map +1 -1
- package/dist/commands/domClick.js +2 -4
- package/dist/commands/domClick.js.map +1 -1
- package/dist/commands/domDrag.d.ts +1 -2
- package/dist/commands/domDrag.d.ts.map +1 -1
- package/dist/commands/domDrag.js +3 -5
- package/dist/commands/domDrag.js.map +1 -1
- package/dist/commands/domFill.d.ts +1 -1
- package/dist/commands/domFill.d.ts.map +1 -1
- package/dist/commands/domFill.js +10 -42
- package/dist/commands/domFill.js.map +1 -1
- package/dist/commands/domFocus.d.ts +1 -1
- package/dist/commands/domFocus.d.ts.map +1 -1
- package/dist/commands/domHover.d.ts +1 -1
- package/dist/commands/domHover.d.ts.map +1 -1
- package/dist/commands/domInfo.d.ts +1 -1
- package/dist/commands/domInfo.d.ts.map +1 -1
- package/dist/commands/domKeydown.d.ts +1 -1
- package/dist/commands/domKeydown.d.ts.map +1 -1
- package/dist/commands/domModify.d.ts.map +1 -1
- package/dist/commands/domModify.js +6 -7
- package/dist/commands/domModify.js.map +1 -1
- package/dist/commands/domRemove.d.ts +1 -1
- package/dist/commands/domRemove.d.ts.map +1 -1
- package/dist/commands/domScroll.d.ts +1 -1
- package/dist/commands/domScroll.d.ts.map +1 -1
- package/dist/commands/domScroll.js +16 -10
- package/dist/commands/domScroll.js.map +1 -1
- package/dist/commands/domScrollTo.d.ts +1 -1
- package/dist/commands/domScrollTo.d.ts.map +1 -1
- package/dist/commands/domSetFile.d.ts +1 -1
- package/dist/commands/domSetFile.d.ts.map +1 -1
- package/dist/commands/domTree.d.ts +1 -1
- package/dist/commands/domTree.d.ts.map +1 -1
- package/dist/commands/eval.d.ts +3 -32
- package/dist/commands/eval.d.ts.map +1 -1
- package/dist/commands/eval.js +14 -33
- package/dist/commands/eval.js.map +1 -1
- package/dist/commands/evalBundle.js +2 -1
- package/dist/commands/evalBundle.js.map +1 -1
- package/dist/commands/evalEmit.d.ts +35 -0
- package/dist/commands/evalEmit.d.ts.map +1 -0
- package/dist/commands/evalEmit.js +65 -0
- package/dist/commands/evalEmit.js.map +1 -0
- package/dist/commands/evalIframe.d.ts +16 -0
- package/dist/commands/evalIframe.d.ts.map +1 -0
- package/dist/commands/evalIframe.js +37 -0
- package/dist/commands/evalIframe.js.map +1 -0
- package/dist/commands/evalShared.d.ts +52 -44
- package/dist/commands/evalShared.d.ts.map +1 -1
- package/dist/commands/evalShared.js +64 -192
- package/dist/commands/evalShared.js.map +1 -1
- package/dist/commands/evalUntil.d.ts +4 -32
- package/dist/commands/evalUntil.d.ts.map +1 -1
- package/dist/commands/evalUntil.js +9 -29
- package/dist/commands/evalUntil.js.map +1 -1
- package/dist/commands/extension/attach.d.ts.map +1 -1
- package/dist/commands/extension/attach.js +12 -28
- package/dist/commands/extension/attach.js.map +1 -1
- package/dist/commands/extension/doctor.d.ts.map +1 -1
- package/dist/commands/extension/doctor.js +1 -1
- package/dist/commands/extension/doctor.js.map +1 -1
- package/dist/commands/extension/failures.d.ts +62 -0
- package/dist/commands/extension/failures.d.ts.map +1 -0
- package/dist/commands/extension/failures.js +70 -0
- package/dist/commands/extension/failures.js.map +1 -0
- package/dist/commands/extension/info.d.ts.map +1 -1
- package/dist/commands/extension/info.js +4 -14
- package/dist/commands/extension/info.js.map +1 -1
- package/dist/commands/extension/install.d.ts.map +1 -1
- package/dist/commands/extension/install.js +12 -22
- package/dist/commands/extension/install.js.map +1 -1
- package/dist/commands/extension/nativeHost.d.ts +22 -0
- package/dist/commands/extension/nativeHost.d.ts.map +1 -1
- package/dist/commands/extension/nativeHost.js +38 -7
- package/dist/commands/extension/nativeHost.js.map +1 -1
- package/dist/commands/extension/remove.d.ts.map +1 -1
- package/dist/commands/extension/remove.js +5 -15
- package/dist/commands/extension/remove.js.map +1 -1
- package/dist/commands/extension/resolveExtensionWatcher.d.ts.map +1 -1
- package/dist/commands/extension/resolveExtensionWatcher.js +3 -2
- package/dist/commands/extension/resolveExtensionWatcher.js.map +1 -1
- package/dist/commands/extension/select.js +11 -23
- package/dist/commands/extension/select.js.map +1 -1
- package/dist/commands/extension/setup.d.ts.map +1 -1
- package/dist/commands/extension/setup.js +8 -30
- package/dist/commands/extension/setup.js.map +1 -1
- package/dist/commands/extension/show.d.ts.map +1 -1
- package/dist/commands/extension/show.js +10 -17
- package/dist/commands/extension/show.js.map +1 -1
- package/dist/commands/extension/status.d.ts.map +1 -1
- package/dist/commands/extension/status.js +5 -14
- package/dist/commands/extension/status.js.map +1 -1
- package/dist/commands/extension/tabAttach.d.ts.map +1 -1
- package/dist/commands/extension/tabAttach.js +2 -2
- package/dist/commands/extension/tabAttach.js.map +1 -1
- package/dist/commands/extension/tabSelection.d.ts.map +1 -1
- package/dist/commands/extension/tabSelection.js +1 -1
- package/dist/commands/extension/tabSelection.js.map +1 -1
- package/dist/commands/extension/tabWatcher.d.ts +7 -1
- package/dist/commands/extension/tabWatcher.d.ts.map +1 -1
- package/dist/commands/extension/tabWatcher.js +17 -21
- package/dist/commands/extension/tabWatcher.js.map +1 -1
- package/dist/commands/extension/tabs.d.ts.map +1 -1
- package/dist/commands/extension/tabs.js +6 -31
- package/dist/commands/extension/tabs.js.map +1 -1
- package/dist/commands/extension/targetSelection.d.ts +10 -25
- package/dist/commands/extension/targetSelection.d.ts.map +1 -1
- package/dist/commands/extension/targetSelection.js +2 -2
- package/dist/commands/extension/targetSelection.js.map +1 -1
- package/dist/commands/extension/targets.js +2 -11
- package/dist/commands/extension/targets.js.map +1 -1
- package/dist/commands/iframeHelper.d.ts +13 -0
- package/dist/commands/iframeHelper.d.ts.map +1 -1
- package/dist/commands/iframeHelper.js +7 -1
- package/dist/commands/iframeHelper.js.map +1 -1
- package/dist/commands/inputSource.d.ts +57 -0
- package/dist/commands/inputSource.d.ts.map +1 -0
- package/dist/commands/inputSource.js +75 -0
- package/dist/commands/inputSource.js.map +1 -0
- package/dist/commands/list.d.ts.map +1 -1
- package/dist/commands/list.js +14 -6
- package/dist/commands/list.js.map +1 -1
- package/dist/commands/logs.d.ts +3 -3
- package/dist/commands/logs.d.ts.map +1 -1
- package/dist/commands/net.d.ts +1 -1
- package/dist/commands/net.d.ts.map +1 -1
- package/dist/commands/netClear.d.ts +1 -1
- package/dist/commands/netClear.d.ts.map +1 -1
- package/dist/commands/netExport.d.ts.map +1 -1
- package/dist/commands/netExport.js +9 -31
- package/dist/commands/netExport.js.map +1 -1
- package/dist/commands/netInspect.d.ts.map +1 -1
- package/dist/commands/netInspect.js +2 -1
- package/dist/commands/netInspect.js.map +1 -1
- package/dist/commands/netMock.d.ts +4 -4
- package/dist/commands/netMock.d.ts.map +1 -1
- package/dist/commands/netMock.js +2 -2
- package/dist/commands/netMock.js.map +1 -1
- package/dist/commands/netRequestClient.d.ts +2 -2
- package/dist/commands/netRequestClient.d.ts.map +1 -1
- package/dist/commands/netRequestClient.js.map +1 -1
- package/dist/commands/netShared.d.ts +22 -0
- package/dist/commands/netShared.d.ts.map +1 -1
- package/dist/commands/netShared.js +43 -16
- package/dist/commands/netShared.js.map +1 -1
- package/dist/commands/netSse.d.ts +1 -1
- package/dist/commands/netSse.d.ts.map +1 -1
- package/dist/commands/netSummary.js +6 -25
- package/dist/commands/netSummary.js.map +1 -1
- package/dist/commands/netWebSocket.d.ts +2 -2
- package/dist/commands/netWebSocket.d.ts.map +1 -1
- package/dist/commands/page.d.ts +8 -0
- package/dist/commands/page.d.ts.map +1 -1
- package/dist/commands/page.js +83 -83
- package/dist/commands/page.js.map +1 -1
- package/dist/commands/pageEmulation.d.ts +3 -3
- package/dist/commands/pageEmulation.d.ts.map +1 -1
- package/dist/commands/pageEmulation.js +17 -12
- package/dist/commands/pageEmulation.js.map +1 -1
- package/dist/commands/pluginConfig.d.ts.map +1 -1
- package/dist/commands/pluginConfig.js +21 -20
- package/dist/commands/pluginConfig.js.map +1 -1
- package/dist/commands/record.d.ts +3 -3
- package/dist/commands/record.d.ts.map +1 -1
- package/dist/commands/record.js +1 -1
- package/dist/commands/record.js.map +1 -1
- package/dist/commands/reload.d.ts +1 -1
- package/dist/commands/reload.d.ts.map +1 -1
- package/dist/commands/resolveTestId.d.ts.map +1 -1
- package/dist/commands/resolveTestId.js +2 -3
- package/dist/commands/resolveTestId.js.map +1 -1
- package/dist/commands/screenshot.d.ts +1 -1
- package/dist/commands/screenshot.d.ts.map +1 -1
- package/dist/commands/snapshot.d.ts +1 -1
- package/dist/commands/snapshot.d.ts.map +1 -1
- package/dist/commands/start.d.ts.map +1 -1
- package/dist/commands/start.js +6 -28
- package/dist/commands/start.js.map +1 -1
- package/dist/commands/startShared.d.ts.map +1 -1
- package/dist/commands/startShared.js +2 -1
- package/dist/commands/startShared.js.map +1 -1
- package/dist/commands/throttle.d.ts +3 -3
- package/dist/commands/throttle.d.ts.map +1 -1
- package/dist/commands/throttle.js +2 -3
- package/dist/commands/throttle.js.map +1 -1
- package/dist/commands/trace.d.ts.map +1 -1
- package/dist/commands/trace.js +2 -2
- package/dist/commands/trace.js.map +1 -1
- package/dist/commands/watcherNativeHost.d.ts.map +1 -1
- package/dist/commands/watcherNativeHost.js +4 -1
- package/dist/commands/watcherNativeHost.js.map +1 -1
- package/dist/commands/watcherPrune.d.ts.map +1 -1
- package/dist/commands/watcherPrune.js +3 -3
- package/dist/commands/watcherPrune.js.map +1 -1
- package/dist/commands/watcherSession.d.ts.map +1 -1
- package/dist/commands/watcherSession.js +2 -1
- package/dist/commands/watcherSession.js.map +1 -1
- package/dist/commands/watcherStatus.d.ts +1 -1
- package/dist/commands/watcherStatus.d.ts.map +1 -1
- package/dist/commands/watcherStatus.js +5 -0
- package/dist/commands/watcherStatus.js.map +1 -1
- package/dist/commands/watcherStop.d.ts.map +1 -1
- package/dist/commands/watcherStop.js +2 -2
- package/dist/commands/watcherStop.js.map +1 -1
- package/dist/config/configContext.d.ts +27 -0
- package/dist/config/configContext.d.ts.map +1 -0
- package/dist/config/configContext.js +57 -0
- package/dist/config/configContext.js.map +1 -0
- package/dist/config/loadConfig.d.ts.map +1 -1
- package/dist/config/loadConfig.js +3 -2
- package/dist/config/loadConfig.js.map +1 -1
- package/dist/eval/evalClient.d.ts.map +1 -1
- package/dist/eval/evalClient.js +2 -1
- package/dist/eval/evalClient.js.map +1 -1
- package/dist/extension/dist/background/service-worker.js +465 -448
- package/dist/extension/dist/background/service-worker.js.map +4 -4
- package/dist/extension/dist/popup/popup.js +279 -234
- package/dist/extension/dist/popup/popup.js.map +4 -4
- package/dist/extension/manifest.json +1 -1
- package/dist/internal.d.ts +22 -0
- package/dist/internal.d.ts.map +1 -0
- package/dist/internal.js +22 -0
- package/dist/internal.js.map +1 -0
- package/dist/output/io.d.ts +8 -9
- package/dist/output/io.d.ts.map +1 -1
- package/dist/output/io.js.map +1 -1
- package/dist/registry.d.ts +1 -4
- package/dist/registry.d.ts.map +1 -1
- package/dist/registry.js +4 -25
- package/dist/registry.js.map +1 -1
- package/dist/runtime-code/format.d.ts.map +1 -1
- package/dist/runtime-code/format.js +2 -1
- package/dist/runtime-code/format.js.map +1 -1
- package/dist/watchers/queryParams.d.ts +11 -9
- package/dist/watchers/queryParams.d.ts.map +1 -1
- package/dist/watchers/queryParams.js +63 -86
- package/dist/watchers/queryParams.js.map +1 -1
- package/dist/watchers/requestWatcher.d.ts +7 -25
- package/dist/watchers/requestWatcher.d.ts.map +1 -1
- package/dist/watchers/requestWatcher.js +9 -6
- package/dist/watchers/requestWatcher.js.map +1 -1
- package/dist/watchers/resolveWatcher.d.ts.map +1 -1
- package/dist/watchers/resolveWatcher.js +9 -2
- package/dist/watchers/resolveWatcher.js.map +1 -1
- package/package.json +9 -5
- package/dist/time.d.ts +0 -3
- package/dist/time.d.ts.map +0 -1
- package/dist/time.js +0 -19
- package/dist/time.js.map +0 -1
|
@@ -1,21 +1,12 @@
|
|
|
1
|
-
import { parseDurationMs } from '
|
|
1
|
+
import { parseDurationMs } from '@vforsh/argus-core';
|
|
2
|
+
import { fetchWatcherJson } from '../watchers/requestWatcher.js';
|
|
2
3
|
import { appendAfterLimitParams, appendNetFilterParams, appendNetIgnoreParams, appendSinceParam } from '../watchers/queryParams.js';
|
|
3
4
|
export const validateNetCommandOptions = (options) => appendNetCommandParams(new URLSearchParams(), options, { includeAfter: false, includeLimit: false });
|
|
4
5
|
export const appendNetCommandParams = (params, options, config = {}) => {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
params.set(key, value);
|
|
10
|
-
}
|
|
11
|
-
}
|
|
12
|
-
if (config.includeLimit !== false) {
|
|
13
|
-
const limitParams = new URLSearchParams();
|
|
14
|
-
appendAfterLimitParams(limitParams, { limit: options.limit });
|
|
15
|
-
for (const [key, value] of limitParams) {
|
|
16
|
-
params.set(key, value);
|
|
17
|
-
}
|
|
18
|
-
}
|
|
6
|
+
appendAfterLimitParams(params, {
|
|
7
|
+
after: config.includeAfter === false ? undefined : options.after,
|
|
8
|
+
limit: config.includeLimit === false ? undefined : options.limit,
|
|
9
|
+
});
|
|
19
10
|
if (options.scope && options.frame) {
|
|
20
11
|
return { error: 'Cannot combine --scope and --frame. Use one or the other.' };
|
|
21
12
|
}
|
|
@@ -23,7 +14,7 @@ export const appendNetCommandParams = (params, options, config = {}) => {
|
|
|
23
14
|
if (derived.error) {
|
|
24
15
|
return { error: derived.error };
|
|
25
16
|
}
|
|
26
|
-
appendNetFilterParams(params, {
|
|
17
|
+
const filters = appendNetFilterParams(params, {
|
|
27
18
|
grep: options.grep,
|
|
28
19
|
host: options.host,
|
|
29
20
|
method: options.method,
|
|
@@ -37,6 +28,9 @@ export const appendNetCommandParams = (params, options, config = {}) => {
|
|
|
37
28
|
minDurationMs: derived.minDurationMs,
|
|
38
29
|
minTransferBytes: derived.minTransferBytes,
|
|
39
30
|
});
|
|
31
|
+
if (filters.error) {
|
|
32
|
+
return filters;
|
|
33
|
+
}
|
|
40
34
|
const ignore = appendNetIgnoreParams(params, options);
|
|
41
35
|
if (ignore.error) {
|
|
42
36
|
return ignore;
|
|
@@ -105,4 +99,37 @@ const resolveDerivedNetFilters = (options) => {
|
|
|
105
99
|
minTransferBytes: minTransferBytes.value,
|
|
106
100
|
};
|
|
107
101
|
};
|
|
102
|
+
/**
|
|
103
|
+
* Drain every page of a `/net*` listing endpoint.
|
|
104
|
+
*
|
|
105
|
+
* `net export` and `net summary` both need the whole capture rather than one page, and both had
|
|
106
|
+
* written the same cursor loop: copy the base params, set `after`/`limit`, stop on an empty page,
|
|
107
|
+
* otherwise advance to `nextAfter`. The loop terminates because the watcher only ever returns
|
|
108
|
+
* `nextAfter > after` while it has rows, and answers an empty page once the cursor passes the end.
|
|
109
|
+
*
|
|
110
|
+
* @param path Watcher path to page through, e.g. `/net` or `/net/requests`.
|
|
111
|
+
* @param pageLimit Rows per request. The watcher clamps this to its own maximum.
|
|
112
|
+
* @param select Pull the page out of the response; its `nextAfter` drives the cursor.
|
|
113
|
+
*/
|
|
114
|
+
export const fetchAllNetPages = async (watcher, options, input) => {
|
|
115
|
+
const baseParams = new URLSearchParams();
|
|
116
|
+
const baseQuery = appendNetCommandParams(baseParams, options, { includeAfter: false, includeLimit: false });
|
|
117
|
+
if (baseQuery.error) {
|
|
118
|
+
throw new Error(baseQuery.error);
|
|
119
|
+
}
|
|
120
|
+
const rows = [];
|
|
121
|
+
let after = 0;
|
|
122
|
+
while (true) {
|
|
123
|
+
const params = new URLSearchParams(baseParams);
|
|
124
|
+
params.set('after', String(after));
|
|
125
|
+
params.set('limit', String(input.pageLimit));
|
|
126
|
+
const response = await fetchWatcherJson(watcher, { path: input.path, query: params, timeoutMs: 5_000 });
|
|
127
|
+
const page = input.select(response);
|
|
128
|
+
if (page.length === 0) {
|
|
129
|
+
return rows;
|
|
130
|
+
}
|
|
131
|
+
rows.push(...page);
|
|
132
|
+
after = response.nextAfter;
|
|
133
|
+
}
|
|
134
|
+
};
|
|
108
135
|
//# sourceMappingURL=netShared.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"netShared.js","sourceRoot":"","sources":["../../src/commands/netShared.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"netShared.js","sourceRoot":"","sources":["../../src/commands/netShared.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,5 +2,5 @@ import type { NetCliListOptions } from './netShared.js';
|
|
|
2
2
|
export type NetSseOptions = NetCliListOptions & {
|
|
3
3
|
json?: boolean;
|
|
4
4
|
};
|
|
5
|
-
export declare const runNetSse: import("
|
|
5
|
+
export declare const runNetSse: import("@vforsh/argus-plugin-api").ArgusWatcherCommandRunner<[], NetSseOptions>;
|
|
6
6
|
//# sourceMappingURL=netSse.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"netSse.d.ts","sourceRoot":"","sources":["../../src/commands/netSse.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAKvD,MAAM,MAAM,aAAa,GAAG,iBAAiB,GAAG;IAC/C,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,eAAO,MAAM,SAAS,
|
|
1
|
+
{"version":3,"file":"netSse.d.ts","sourceRoot":"","sources":["../../src/commands/netSse.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAKvD,MAAM,MAAM,aAAa,GAAG,iBAAiB,GAAG;IAC/C,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,eAAO,MAAM,SAAS,iFAiBpB,CAAA"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { fetchAllNetPages, validateNetCommandOptions } from './netShared.js';
|
|
2
2
|
import { createOutput } from '../output/io.js';
|
|
3
3
|
import { formatWatcherTransportError, fetchWatcherJson, resolveWatcherOrExit } from '../watchers/requestWatcher.js';
|
|
4
4
|
import { formatNetSummaryReport, summarizeNetworkRequests } from '../net/summary.js';
|
|
@@ -35,30 +35,11 @@ export const runNetSummary = async (id, options) => {
|
|
|
35
35
|
output.writeHuman(line);
|
|
36
36
|
}
|
|
37
37
|
};
|
|
38
|
-
const fetchAllRequests = async (watcher, options) => {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
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
|
-
};
|
|
38
|
+
const fetchAllRequests = async (watcher, options) => await fetchAllNetPages(watcher, options, {
|
|
39
|
+
path: '/net',
|
|
40
|
+
pageLimit: NET_PAGE_LIMIT,
|
|
41
|
+
select: (response) => response.requests,
|
|
42
|
+
});
|
|
62
43
|
const fetchNavigationSummary = async (watcher) => {
|
|
63
44
|
const response = await fetchWatcherJson(watcher, {
|
|
64
45
|
path: '/eval',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"netSummary.js","sourceRoot":"","sources":["../../src/commands/netSummary.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"netSummary.js","sourceRoot":"","sources":["../../src/commands/netSummary.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,6 @@ export type NetWebSocketOptions = NetCliListOptions & {
|
|
|
5
5
|
export type NetWebSocketShowOptions = {
|
|
6
6
|
json?: boolean;
|
|
7
7
|
};
|
|
8
|
-
export declare const runNetWebSocket: import("
|
|
9
|
-
export declare const runNetWebSocketShow: import("
|
|
8
|
+
export declare const runNetWebSocket: import("@vforsh/argus-plugin-api").ArgusWatcherCommandRunner<[], NetWebSocketOptions>;
|
|
9
|
+
export declare const runNetWebSocketShow: import("@vforsh/argus-plugin-api").ArgusWatcherCommandRunner<[connection: string], NetWebSocketShowOptions>;
|
|
10
10
|
//# sourceMappingURL=netWebSocket.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"netWebSocket.d.ts","sourceRoot":"","sources":["../../src/commands/netWebSocket.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAKvD,MAAM,MAAM,mBAAmB,GAAG,iBAAiB,GAAG;IACrD,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG;IACrC,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,eAAO,MAAM,eAAe,
|
|
1
|
+
{"version":3,"file":"netWebSocket.d.ts","sourceRoot":"","sources":["../../src/commands/netWebSocket.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAKvD,MAAM,MAAM,mBAAmB,GAAG,iBAAiB,GAAG;IACrD,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG;IACrC,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,eAAO,MAAM,eAAe,uFAiB1B,CAAA;AAEF,eAAO,MAAM,mBAAmB,6GAoB9B,CAAA"}
|
package/dist/commands/page.d.ts
CHANGED
|
@@ -8,5 +8,13 @@ export type PageReloadOptions = PageCommandOptions & {
|
|
|
8
8
|
param?: string[];
|
|
9
9
|
params?: string;
|
|
10
10
|
};
|
|
11
|
+
/**
|
|
12
|
+
* Reload the page, optionally rewriting query params.
|
|
13
|
+
*
|
|
14
|
+
* A target is reached one of two ways — by explicit `targetId`, or by resolving the page a
|
|
15
|
+
* watcher is attached to — and both paths then do the same thing. This used to be two
|
|
16
|
+
* branches that each hand-wrote watcher resolution, candidate printing, and `/json/list`
|
|
17
|
+
* fetching that `resolveWatcherOrExit` and `loadChromeTargets` already wrap.
|
|
18
|
+
*/
|
|
11
19
|
export declare const runPageReload: (options: PageReloadOptions) => Promise<void>;
|
|
12
20
|
//# sourceMappingURL=page.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../src/commands/page.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;
|
|
1
|
+
{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../src/commands/page.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AAUtE,MAAM,MAAM,mBAAmB,GAAG,kBAAkB,CAAA;AAEpD,MAAM,MAAM,kBAAkB,GAAG,mBAAmB,GAAG;IACtD,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAuCD,MAAM,MAAM,iBAAiB,GAAG,kBAAkB,GAAG;IACpD,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,aAAa,GAAU,SAAS,iBAAiB,KAAG,OAAO,CAAC,IAAI,CAY5E,CAAA"}
|
package/dist/commands/page.js
CHANGED
|
@@ -3,8 +3,9 @@ import { sendCdpCommand } from '../cdp/sendCdpCommand.js';
|
|
|
3
3
|
import { selectTargetFromCandidates } from '../cdp/selectTarget.js';
|
|
4
4
|
import { fetchJson } from '../httpClient.js';
|
|
5
5
|
import { createOutput } from '../output/io.js';
|
|
6
|
-
import {
|
|
7
|
-
import {
|
|
6
|
+
import { formatError } from '../cli/parse.js';
|
|
7
|
+
import { resolveWatcherOrExit } from '../watchers/requestWatcher.js';
|
|
8
|
+
import { loadChromeTargets } from './chrome/shared.js';
|
|
8
9
|
const parseParamPair = (value) => {
|
|
9
10
|
const eqIdx = value.indexOf('=');
|
|
10
11
|
if (eqIdx === -1) {
|
|
@@ -38,102 +39,101 @@ const parseParamsString = (value) => {
|
|
|
38
39
|
const isHttpUrl = (url) => {
|
|
39
40
|
return url.startsWith('http://') || url.startsWith('https://');
|
|
40
41
|
};
|
|
42
|
+
/**
|
|
43
|
+
* Reload the page, optionally rewriting query params.
|
|
44
|
+
*
|
|
45
|
+
* A target is reached one of two ways — by explicit `targetId`, or by resolving the page a
|
|
46
|
+
* watcher is attached to — and both paths then do the same thing. This used to be two
|
|
47
|
+
* branches that each hand-wrote watcher resolution, candidate printing, and `/json/list`
|
|
48
|
+
* fetching that `resolveWatcherOrExit` and `loadChromeTargets` already wrap.
|
|
49
|
+
*/
|
|
41
50
|
export const runPageReload = async (options) => {
|
|
42
51
|
const output = createOutput(options);
|
|
43
|
-
const
|
|
44
|
-
|
|
45
|
-
if (!options.targetId && options.id) {
|
|
46
|
-
if (options.cdp) {
|
|
47
|
-
output.writeWarn('--cdp cannot be used without a targetId. Use --id to resolve the endpoint.');
|
|
48
|
-
process.exitCode = 2;
|
|
49
|
-
return;
|
|
50
|
-
}
|
|
51
|
-
const resolvedWatcher = await resolveWatcher({ id: options.id });
|
|
52
|
-
if (!resolvedWatcher.ok) {
|
|
53
|
-
output.writeWarn(resolvedWatcher.error);
|
|
54
|
-
if (resolvedWatcher.candidates && resolvedWatcher.candidates.length > 0) {
|
|
55
|
-
writeWatcherCandidates(resolvedWatcher.candidates, output);
|
|
56
|
-
output.writeWarn('Hint: run `argus list` to see all watchers.');
|
|
57
|
-
}
|
|
58
|
-
process.exitCode = resolvedWatcher.exitCode;
|
|
59
|
-
return;
|
|
60
|
-
}
|
|
61
|
-
const statusUrl = `http://${resolvedWatcher.watcher.host}:${resolvedWatcher.watcher.port}/status`;
|
|
62
|
-
let status;
|
|
63
|
-
try {
|
|
64
|
-
status = await fetchJson(statusUrl, { timeoutMs: 2_000 });
|
|
65
|
-
}
|
|
66
|
-
catch (error) {
|
|
67
|
-
output.writeWarn(`${resolvedWatcher.watcher.id}: failed to reach watcher (${error instanceof Error ? error.message : error})`);
|
|
68
|
-
process.exitCode = 1;
|
|
69
|
-
return;
|
|
70
|
-
}
|
|
71
|
-
if (!status.attached || !status.target) {
|
|
72
|
-
output.writeWarn(`Watcher ${resolvedWatcher.watcher.id} is not attached to a target.`);
|
|
73
|
-
process.exitCode = 1;
|
|
74
|
-
return;
|
|
75
|
-
}
|
|
76
|
-
const endpoint = await resolveCdpEndpoint({ id: resolvedWatcher.watcher.id });
|
|
77
|
-
if (!endpoint.ok) {
|
|
78
|
-
output.writeWarn(endpoint.error);
|
|
79
|
-
process.exitCode = endpoint.exitCode;
|
|
80
|
-
return;
|
|
81
|
-
}
|
|
82
|
-
const targetsUrl = `http://${endpoint.host}:${endpoint.port}/json/list`;
|
|
83
|
-
let targets;
|
|
84
|
-
try {
|
|
85
|
-
targets = await fetchJson(targetsUrl);
|
|
86
|
-
}
|
|
87
|
-
catch (error) {
|
|
88
|
-
output.writeWarn(`Failed to load targets from ${endpoint.host}:${endpoint.port}: ${error instanceof Error ? error.message : error}`);
|
|
89
|
-
process.exitCode = 1;
|
|
90
|
-
return;
|
|
91
|
-
}
|
|
92
|
-
const candidates = findTargetsByAttached(status.target, targets);
|
|
93
|
-
const selection = await selectTargetFromCandidates(candidates, output, {
|
|
94
|
-
interactive: process.stdin.isTTY === true,
|
|
95
|
-
messages: {
|
|
96
|
-
empty: 'No targets matched the attached page.',
|
|
97
|
-
ambiguous: 'Multiple targets matched the attached page.',
|
|
98
|
-
},
|
|
99
|
-
});
|
|
100
|
-
if (!selection.ok) {
|
|
101
|
-
output.writeWarn(selection.error);
|
|
102
|
-
process.exitCode = selection.exitCode;
|
|
103
|
-
return;
|
|
104
|
-
}
|
|
105
|
-
await reloadTarget(selection.target, { hasParamFlag, hasParamsFlag, options, output });
|
|
52
|
+
const target = await resolveReloadTarget(options, output);
|
|
53
|
+
if (!target)
|
|
106
54
|
return;
|
|
55
|
+
await reloadTarget(target, {
|
|
56
|
+
hasParamFlag: (options.param?.length ?? 0) > 0,
|
|
57
|
+
hasParamsFlag: options.params != null,
|
|
58
|
+
options,
|
|
59
|
+
output,
|
|
60
|
+
});
|
|
61
|
+
};
|
|
62
|
+
/** Resolve the target to reload, by explicit id or via the watcher's attached page. */
|
|
63
|
+
const resolveReloadTarget = async (options, output) => {
|
|
64
|
+
const explicitId = options.targetId?.trim();
|
|
65
|
+
if (!explicitId && options.id) {
|
|
66
|
+
return await resolveAttachedTarget(options, output);
|
|
107
67
|
}
|
|
108
|
-
if (!
|
|
68
|
+
if (!explicitId) {
|
|
109
69
|
output.writeWarn('Provide a targetId or use --id <watcherId> to reload the attached page.');
|
|
110
70
|
process.exitCode = 2;
|
|
111
|
-
return;
|
|
71
|
+
return null;
|
|
112
72
|
}
|
|
113
73
|
const endpoint = await resolveCdpEndpoint(options);
|
|
114
74
|
if (!endpoint.ok) {
|
|
115
75
|
output.writeWarn(endpoint.error);
|
|
116
76
|
process.exitCode = endpoint.exitCode;
|
|
117
|
-
return;
|
|
77
|
+
return null;
|
|
118
78
|
}
|
|
119
|
-
const
|
|
120
|
-
|
|
121
|
-
|
|
79
|
+
const targets = await loadChromeTargets(endpoint, output);
|
|
80
|
+
if (!targets)
|
|
81
|
+
return null;
|
|
82
|
+
const target = targets.find((entry) => entry.id === explicitId);
|
|
83
|
+
if (!target) {
|
|
84
|
+
output.writeWarn(`Target not found: ${explicitId}`);
|
|
85
|
+
process.exitCode = 2;
|
|
86
|
+
return null;
|
|
87
|
+
}
|
|
88
|
+
return target;
|
|
89
|
+
};
|
|
90
|
+
/** Find the Chrome target a watcher is currently attached to. */
|
|
91
|
+
const resolveAttachedTarget = async (options, output) => {
|
|
92
|
+
if (options.cdp) {
|
|
93
|
+
output.writeWarn('--cdp cannot be used without a targetId. Use --id to resolve the endpoint.');
|
|
94
|
+
process.exitCode = 2;
|
|
95
|
+
return null;
|
|
96
|
+
}
|
|
97
|
+
const resolved = await resolveWatcherOrExit({ id: options.id }, output);
|
|
98
|
+
if (!resolved)
|
|
99
|
+
return null;
|
|
100
|
+
const statusUrl = `http://${resolved.watcher.host}:${resolved.watcher.port}/status`;
|
|
101
|
+
let status;
|
|
122
102
|
try {
|
|
123
|
-
|
|
103
|
+
status = await fetchJson(statusUrl, { timeoutMs: 2_000 });
|
|
124
104
|
}
|
|
125
105
|
catch (error) {
|
|
126
|
-
output.writeWarn(
|
|
106
|
+
output.writeWarn(`${resolved.watcher.id}: failed to reach watcher (${formatError(error)})`);
|
|
127
107
|
process.exitCode = 1;
|
|
128
|
-
return;
|
|
108
|
+
return null;
|
|
129
109
|
}
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
return;
|
|
110
|
+
if (!status.attached || !status.target) {
|
|
111
|
+
output.writeWarn(`Watcher ${resolved.watcher.id} is not attached to a target.`);
|
|
112
|
+
process.exitCode = 1;
|
|
113
|
+
return null;
|
|
135
114
|
}
|
|
136
|
-
await
|
|
115
|
+
const endpoint = await resolveCdpEndpoint({ id: resolved.watcher.id });
|
|
116
|
+
if (!endpoint.ok) {
|
|
117
|
+
output.writeWarn(endpoint.error);
|
|
118
|
+
process.exitCode = endpoint.exitCode;
|
|
119
|
+
return null;
|
|
120
|
+
}
|
|
121
|
+
const targets = await loadChromeTargets(endpoint, output);
|
|
122
|
+
if (!targets)
|
|
123
|
+
return null;
|
|
124
|
+
const selection = await selectTargetFromCandidates(findTargetsByAttached(status.target, targets), output, {
|
|
125
|
+
interactive: process.stdin.isTTY === true,
|
|
126
|
+
messages: {
|
|
127
|
+
empty: 'No targets matched the attached page.',
|
|
128
|
+
ambiguous: 'Multiple targets matched the attached page.',
|
|
129
|
+
},
|
|
130
|
+
});
|
|
131
|
+
if (!selection.ok) {
|
|
132
|
+
output.writeWarn(selection.error);
|
|
133
|
+
process.exitCode = selection.exitCode;
|
|
134
|
+
return null;
|
|
135
|
+
}
|
|
136
|
+
return selection.target;
|
|
137
137
|
};
|
|
138
138
|
const reloadTarget = async (target, context) => {
|
|
139
139
|
const { options, output } = context;
|
|
@@ -147,7 +147,7 @@ const reloadTarget = async (target, context) => {
|
|
|
147
147
|
await sendCdpCommand(target.webSocketDebuggerUrl, { id: 1, method: 'Page.reload' });
|
|
148
148
|
}
|
|
149
149
|
catch (error) {
|
|
150
|
-
output.writeWarn(`Failed to reload target ${target.id}: ${error
|
|
150
|
+
output.writeWarn(`Failed to reload target ${target.id}: ${formatError(error)}`);
|
|
151
151
|
process.exitCode = 1;
|
|
152
152
|
return;
|
|
153
153
|
}
|
|
@@ -174,7 +174,7 @@ const reloadTarget = async (target, context) => {
|
|
|
174
174
|
parsedUrl = new URL(target.url);
|
|
175
175
|
}
|
|
176
176
|
catch (error) {
|
|
177
|
-
output.writeWarn(`Invalid target URL "${target.url}": ${error
|
|
177
|
+
output.writeWarn(`Invalid target URL "${target.url}": ${formatError(error)}`);
|
|
178
178
|
process.exitCode = 2;
|
|
179
179
|
return;
|
|
180
180
|
}
|
|
@@ -206,7 +206,7 @@ const reloadTarget = async (target, context) => {
|
|
|
206
206
|
await sendCdpCommand(target.webSocketDebuggerUrl, { id: 1, method: 'Page.navigate', params: { url: nextUrl } });
|
|
207
207
|
}
|
|
208
208
|
catch (error) {
|
|
209
|
-
output.writeWarn(`Failed to navigate target ${target.id}: ${error
|
|
209
|
+
output.writeWarn(`Failed to navigate target ${target.id}: ${formatError(error)}`);
|
|
210
210
|
process.exitCode = 1;
|
|
211
211
|
return;
|
|
212
212
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/commands/page.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AACzD,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAA;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC5C,OAAO,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/commands/page.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,13 +8,13 @@ export type PageEmulationSetOptions = {
|
|
|
8
8
|
ua?: string;
|
|
9
9
|
json?: boolean;
|
|
10
10
|
};
|
|
11
|
-
export declare const runPageEmulationSet: import("
|
|
11
|
+
export declare const runPageEmulationSet: import("@vforsh/argus-plugin-api").ArgusWatcherCommandRunner<[], PageEmulationSetOptions>;
|
|
12
12
|
export type PageEmulationClearOptions = {
|
|
13
13
|
json?: boolean;
|
|
14
14
|
};
|
|
15
|
-
export declare const runPageEmulationClear: import("
|
|
15
|
+
export declare const runPageEmulationClear: import("@vforsh/argus-plugin-api").ArgusWatcherCommandRunner<[], PageEmulationClearOptions>;
|
|
16
16
|
export type PageEmulationStatusOptions = {
|
|
17
17
|
json?: boolean;
|
|
18
18
|
};
|
|
19
|
-
export declare const runPageEmulationStatus: import("
|
|
19
|
+
export declare const runPageEmulationStatus: import("@vforsh/argus-plugin-api").ArgusWatcherCommandRunner<[], PageEmulationStatusOptions>;
|
|
20
20
|
//# sourceMappingURL=pageEmulation.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pageEmulation.d.ts","sourceRoot":"","sources":["../../src/commands/pageEmulation.ts"],"names":[],"mappings":"AAeA,MAAM,MAAM,uBAAuB,GAAG;IACrC,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,eAAO,MAAM,mBAAmB,
|
|
1
|
+
{"version":3,"file":"pageEmulation.d.ts","sourceRoot":"","sources":["../../src/commands/pageEmulation.ts"],"names":[],"mappings":"AAeA,MAAM,MAAM,uBAAuB,GAAG;IACrC,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,eAAO,MAAM,mBAAmB,2FAgB9B,CAAA;AA+FF,MAAM,MAAM,yBAAyB,GAAG;IACvC,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,eAAO,MAAM,qBAAqB,6FAKhC,CAAA;AAMF,MAAM,MAAM,0BAA0B,GAAG;IACxC,IAAI,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,eAAO,MAAM,sBAAsB,8FAkCjC,CAAA"}
|
|
@@ -2,9 +2,8 @@ import { defineWatcherCommand } from '../cli/defineWatcherCommand.js';
|
|
|
2
2
|
import { resolvePreset, listPresetNames } from '../emulation/devices.js';
|
|
3
3
|
export const runPageEmulationSet = defineWatcherCommand({
|
|
4
4
|
build: (_args, options, output) => buildPageEmulationSetPlan(options, output),
|
|
5
|
-
formatHuman: (res, { output,
|
|
6
|
-
const
|
|
7
|
-
const label = formatViewportLabel(state.viewport, state.touch.enabled, state.userAgent.value);
|
|
5
|
+
formatHuman: (res, { output, meta }) => {
|
|
6
|
+
const label = formatViewportLabel(meta.viewport, meta.touch.enabled, meta.userAgent.value);
|
|
8
7
|
if (res.applied) {
|
|
9
8
|
output.writeHuman(`Applied emulation: ${label}`);
|
|
10
9
|
}
|
|
@@ -23,16 +22,22 @@ const buildPageEmulationSetPlan = (options, output) => {
|
|
|
23
22
|
const state = buildEmulationState(options, output);
|
|
24
23
|
if (!state)
|
|
25
24
|
return null;
|
|
26
|
-
return { path: '/emulation', method: 'POST', body: { action: 'set', state }, timeoutMs: 10_000 };
|
|
25
|
+
return { path: '/emulation', method: 'POST', body: { action: 'set', state }, timeoutMs: 10_000, meta: state };
|
|
27
26
|
};
|
|
27
|
+
/**
|
|
28
|
+
* Resolve the desired emulation state from flags.
|
|
29
|
+
*
|
|
30
|
+
* `output` used to be optional so `formatHuman` could re-run this without repeating the
|
|
31
|
+
* warnings; the state now travels on the plan's `meta`, so this runs exactly once.
|
|
32
|
+
*/
|
|
28
33
|
const buildEmulationState = (options, output) => {
|
|
29
34
|
// Resolve base from preset (if any)
|
|
30
35
|
let base = null;
|
|
31
36
|
if (options.device) {
|
|
32
37
|
const preset = resolvePreset(options.device);
|
|
33
38
|
if (!preset) {
|
|
34
|
-
output
|
|
35
|
-
output
|
|
39
|
+
output.writeWarn(`Unknown device: ${options.device}`);
|
|
40
|
+
output.writeWarn(`Available: ${listPresetNames().join(', ')}`);
|
|
36
41
|
process.exitCode = 2;
|
|
37
42
|
return null;
|
|
38
43
|
}
|
|
@@ -43,17 +48,17 @@ const buildEmulationState = (options, output) => {
|
|
|
43
48
|
const heightRaw = options.height != null ? Number(options.height) : null;
|
|
44
49
|
const dprRaw = options.dpr != null ? Number(options.dpr) : null;
|
|
45
50
|
if (widthRaw != null && (!Number.isInteger(widthRaw) || widthRaw <= 0)) {
|
|
46
|
-
output
|
|
51
|
+
output.writeWarn('--width must be a positive integer');
|
|
47
52
|
process.exitCode = 2;
|
|
48
53
|
return null;
|
|
49
54
|
}
|
|
50
55
|
if (heightRaw != null && (!Number.isInteger(heightRaw) || heightRaw <= 0)) {
|
|
51
|
-
output
|
|
56
|
+
output.writeWarn('--height must be a positive integer');
|
|
52
57
|
process.exitCode = 2;
|
|
53
58
|
return null;
|
|
54
59
|
}
|
|
55
60
|
if (dprRaw != null && (!Number.isFinite(dprRaw) || dprRaw <= 0)) {
|
|
56
|
-
output
|
|
61
|
+
output.writeWarn('--dpr must be a positive number');
|
|
57
62
|
process.exitCode = 2;
|
|
58
63
|
return null;
|
|
59
64
|
}
|
|
@@ -62,15 +67,15 @@ const buildEmulationState = (options, output) => {
|
|
|
62
67
|
const hasHeight = heightRaw != null;
|
|
63
68
|
if ((hasWidth || hasHeight) && !base) {
|
|
64
69
|
if (!hasWidth || !hasHeight) {
|
|
65
|
-
output
|
|
70
|
+
output.writeWarn('Both --width and --height are required when not using --device');
|
|
66
71
|
process.exitCode = 2;
|
|
67
72
|
return null;
|
|
68
73
|
}
|
|
69
74
|
}
|
|
70
75
|
// If no preset and no viewport override → error
|
|
71
76
|
if (!base && !hasWidth) {
|
|
72
|
-
output
|
|
73
|
-
output
|
|
77
|
+
output.writeWarn('Provide --device or --width + --height');
|
|
78
|
+
output.writeWarn(`Available devices: ${listPresetNames().join(', ')}`);
|
|
74
79
|
process.exitCode = 2;
|
|
75
80
|
return null;
|
|
76
81
|
}
|