@vforsh/argus 0.1.16 → 0.1.19
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/.tsbuildinfo +1 -1
- package/dist/argus.js +14994 -10474
- package/dist/cli/defineCommand.d.ts +3 -0
- package/dist/cli/defineCommand.d.ts.map +1 -1
- package/dist/cli/defineCommand.js +11 -0
- package/dist/cli/defineCommand.js.map +1 -1
- package/dist/cli/plugins/pluginHost.d.ts.map +1 -1
- package/dist/cli/plugins/pluginHost.js +1 -0
- package/dist/cli/plugins/pluginHost.js.map +1 -1
- package/dist/cli/plugins/registerPlugins.d.ts +3 -1
- package/dist/cli/plugins/registerPlugins.d.ts.map +1 -1
- package/dist/cli/plugins/registerPlugins.js +31 -12
- package/dist/cli/plugins/registerPlugins.js.map +1 -1
- package/dist/cli/register/authCommands.d.ts +3 -0
- package/dist/cli/register/authCommands.d.ts.map +1 -0
- package/dist/cli/register/authCommands.js +230 -0
- package/dist/cli/register/authCommands.js.map +1 -0
- package/dist/cli/register/chromeCommands.d.ts +3 -0
- package/dist/cli/register/chromeCommands.d.ts.map +1 -0
- package/dist/cli/register/chromeCommands.js +153 -0
- package/dist/cli/register/chromeCommands.js.map +1 -0
- package/dist/cli/register/codeCommands.d.ts +3 -0
- package/dist/cli/register/codeCommands.d.ts.map +1 -0
- package/dist/cli/register/codeCommands.js +116 -0
- package/dist/cli/register/codeCommands.js.map +1 -0
- package/dist/cli/register/configCommands.d.ts +3 -0
- package/dist/cli/register/configCommands.d.ts.map +1 -0
- package/dist/cli/register/configCommands.js +23 -0
- package/dist/cli/register/configCommands.js.map +1 -0
- package/dist/cli/register/dialogCommands.d.ts +3 -0
- package/dist/cli/register/dialogCommands.d.ts.map +1 -0
- package/dist/cli/register/dialogCommands.js +52 -0
- package/dist/cli/register/dialogCommands.js.map +1 -0
- package/dist/cli/register/domCommandBuilder.d.ts +7 -5
- package/dist/cli/register/domCommandBuilder.d.ts.map +1 -1
- package/dist/cli/register/domCommandBuilder.js +28 -23
- package/dist/cli/register/domCommandBuilder.js.map +1 -1
- package/dist/cli/register/domCommands.d.ts +3 -0
- package/dist/cli/register/domCommands.d.ts.map +1 -0
- package/dist/cli/register/domCommands.js +318 -0
- package/dist/cli/register/domCommands.js.map +1 -0
- package/dist/cli/register/evalCommands.d.ts +3 -0
- package/dist/cli/register/evalCommands.d.ts.map +1 -0
- package/dist/cli/register/evalCommands.js +173 -0
- package/dist/cli/register/evalCommands.js.map +1 -0
- package/dist/cli/register/extensionCommands.d.ts +3 -0
- package/dist/cli/register/extensionCommands.d.ts.map +1 -0
- package/dist/cli/register/extensionCommands.js +215 -0
- package/dist/cli/register/extensionCommands.js.map +1 -0
- package/dist/cli/register/fillCommand.d.ts +3 -0
- package/dist/cli/register/fillCommand.d.ts.map +1 -0
- package/dist/cli/register/fillCommand.js +44 -0
- package/dist/cli/register/fillCommand.js.map +1 -0
- package/dist/cli/register/hoverCommand.d.ts +3 -0
- package/dist/cli/register/hoverCommand.d.ts.map +1 -0
- package/dist/cli/register/hoverCommand.js +27 -0
- package/dist/cli/register/hoverCommand.js.map +1 -0
- package/dist/cli/register/index.d.ts.map +1 -1
- package/dist/cli/register/index.js +57 -52
- package/dist/cli/register/index.js.map +1 -1
- package/dist/cli/register/keydownCommand.d.ts +3 -0
- package/dist/cli/register/keydownCommand.d.ts.map +1 -0
- package/dist/cli/register/keydownCommand.js +21 -0
- package/dist/cli/register/keydownCommand.js.map +1 -0
- package/dist/cli/register/locateCommands.d.ts +3 -0
- package/dist/cli/register/locateCommands.d.ts.map +1 -0
- package/dist/cli/register/locateCommands.js +60 -0
- package/dist/cli/register/locateCommands.js.map +1 -0
- package/dist/cli/register/logsCommands.d.ts +3 -0
- package/dist/cli/register/logsCommands.d.ts.map +1 -0
- package/dist/cli/register/logsCommands.js +67 -0
- package/dist/cli/register/logsCommands.js.map +1 -0
- package/dist/cli/register/netCommands.d.ts +3 -0
- package/dist/cli/register/netCommands.d.ts.map +1 -0
- package/dist/cli/register/netCommands.js +442 -0
- package/dist/cli/register/netCommands.js.map +1 -0
- package/dist/cli/register/pageCommands.d.ts +3 -0
- package/dist/cli/register/pageCommands.d.ts.map +1 -0
- package/dist/cli/register/pageCommands.js +188 -0
- package/dist/cli/register/pageCommands.js.map +1 -0
- package/dist/cli/register/pluginCommands.d.ts +3 -0
- package/dist/cli/register/pluginCommands.d.ts.map +1 -0
- package/dist/cli/register/pluginCommands.js +51 -0
- package/dist/cli/register/pluginCommands.js.map +1 -0
- package/dist/cli/register/quickAccessCommands.d.ts +3 -0
- package/dist/cli/register/quickAccessCommands.d.ts.map +1 -0
- package/dist/cli/register/quickAccessCommands.js +138 -0
- package/dist/cli/register/quickAccessCommands.js.map +1 -0
- package/dist/cli/register/recordCommands.d.ts +3 -0
- package/dist/cli/register/recordCommands.d.ts.map +1 -0
- package/dist/cli/register/recordCommands.js +90 -0
- package/dist/cli/register/recordCommands.js.map +1 -0
- package/dist/cli/register/scrollToCommand.d.ts +3 -0
- package/dist/cli/register/scrollToCommand.d.ts.map +1 -0
- package/dist/cli/register/scrollToCommand.js +30 -0
- package/dist/cli/register/scrollToCommand.js.map +1 -0
- package/dist/cli/register/skillCommands.d.ts +3 -0
- package/dist/cli/register/skillCommands.d.ts.map +1 -0
- package/dist/cli/register/skillCommands.js +13 -0
- package/dist/cli/register/skillCommands.js.map +1 -0
- package/dist/cli/register/snapshotCommands.d.ts +3 -0
- package/dist/cli/register/snapshotCommands.d.ts.map +1 -0
- package/dist/cli/register/snapshotCommands.js +57 -0
- package/dist/cli/register/snapshotCommands.js.map +1 -0
- package/dist/cli/register/storageCommands.d.ts +3 -0
- package/dist/cli/register/storageCommands.d.ts.map +1 -0
- package/dist/cli/register/storageCommands.js +78 -0
- package/dist/cli/register/storageCommands.js.map +1 -0
- package/dist/cli/register/throttleCommands.d.ts +3 -0
- package/dist/cli/register/throttleCommands.d.ts.map +1 -0
- package/dist/cli/register/throttleCommands.js +48 -0
- package/dist/cli/register/throttleCommands.js.map +1 -0
- package/dist/cli/register/traceCommands.d.ts +3 -0
- package/dist/cli/register/traceCommands.d.ts.map +1 -0
- package/dist/cli/register/traceCommands.js +72 -0
- package/dist/cli/register/traceCommands.js.map +1 -0
- package/dist/cli/register/watcherCommands.d.ts +3 -0
- package/dist/cli/register/watcherCommands.d.ts.map +1 -0
- package/dist/cli/register/watcherCommands.js +180 -0
- package/dist/cli/register/watcherCommands.js.map +1 -0
- package/dist/commands/auth.d.ts.map +1 -1
- package/dist/commands/auth.js.map +1 -1
- package/dist/commands/code.d.ts +2 -2
- package/dist/commands/code.d.ts.map +1 -1
- package/dist/commands/code.js +42 -45
- package/dist/commands/code.js.map +1 -1
- package/dist/commands/codeEdit.d.ts.map +1 -1
- package/dist/commands/codeEdit.js.map +1 -1
- package/dist/commands/domDrag.d.ts +21 -0
- package/dist/commands/domDrag.d.ts.map +1 -0
- package/dist/commands/domDrag.js +179 -0
- package/dist/commands/domDrag.js.map +1 -0
- package/dist/commands/eval.d.ts +9 -1
- package/dist/commands/eval.d.ts.map +1 -1
- package/dist/commands/eval.js +20 -10
- package/dist/commands/eval.js.map +1 -1
- package/dist/commands/evalArgs.d.ts +31 -0
- package/dist/commands/evalArgs.d.ts.map +1 -0
- package/dist/commands/evalArgs.js +103 -0
- package/dist/commands/evalArgs.js.map +1 -0
- package/dist/commands/evalBundle.d.ts +4 -5
- package/dist/commands/evalBundle.d.ts.map +1 -1
- package/dist/commands/evalBundle.js +88 -69
- package/dist/commands/evalBundle.js.map +1 -1
- package/dist/commands/evalModuleSyntax.d.ts +6 -0
- package/dist/commands/evalModuleSyntax.d.ts.map +1 -0
- package/dist/commands/evalModuleSyntax.js +33 -0
- package/dist/commands/evalModuleSyntax.js.map +1 -0
- package/dist/commands/evalPolling.d.ts +1 -1
- package/dist/commands/evalPolling.d.ts.map +1 -1
- package/dist/commands/evalPolling.js +1 -1
- package/dist/commands/evalPolling.js.map +1 -1
- package/dist/commands/evalResultOutput.d.ts +25 -0
- package/dist/commands/evalResultOutput.d.ts.map +1 -0
- package/dist/commands/evalResultOutput.js +85 -0
- package/dist/commands/evalResultOutput.js.map +1 -0
- package/dist/commands/evalShared.d.ts +42 -17
- package/dist/commands/evalShared.d.ts.map +1 -1
- package/dist/commands/evalShared.js +96 -53
- package/dist/commands/evalShared.js.map +1 -1
- package/dist/commands/evalUntil.d.ts +7 -1
- package/dist/commands/evalUntil.d.ts.map +1 -1
- package/dist/commands/evalUntil.js +16 -27
- package/dist/commands/evalUntil.js.map +1 -1
- package/dist/commands/extension/attach.d.ts +5 -1
- package/dist/commands/extension/attach.d.ts.map +1 -1
- package/dist/commands/extension/attach.js +44 -84
- package/dist/commands/extension/attach.js.map +1 -1
- package/dist/commands/extension/doctor.d.ts +6 -0
- package/dist/commands/extension/doctor.d.ts.map +1 -0
- package/dist/commands/extension/doctor.js +185 -0
- package/dist/commands/extension/doctor.js.map +1 -0
- package/dist/commands/extension/select.d.ts +7 -0
- package/dist/commands/extension/select.d.ts.map +1 -0
- package/dist/commands/extension/select.js +73 -0
- package/dist/commands/extension/select.js.map +1 -0
- package/dist/commands/extension/show.d.ts +16 -0
- package/dist/commands/extension/show.d.ts.map +1 -0
- package/dist/commands/extension/show.js +132 -0
- package/dist/commands/extension/show.js.map +1 -0
- package/dist/commands/extension/tabAttach.d.ts +28 -0
- package/dist/commands/extension/tabAttach.d.ts.map +1 -0
- package/dist/commands/extension/tabAttach.js +106 -0
- package/dist/commands/extension/tabAttach.js.map +1 -0
- package/dist/commands/extension/tabSelection.d.ts +45 -0
- package/dist/commands/extension/tabSelection.d.ts.map +1 -0
- package/dist/commands/extension/tabSelection.js +76 -0
- package/dist/commands/extension/tabSelection.js.map +1 -0
- package/dist/commands/extension/tabWatcher.d.ts +22 -0
- package/dist/commands/extension/tabWatcher.d.ts.map +1 -0
- package/dist/commands/extension/tabWatcher.js +89 -0
- package/dist/commands/extension/tabWatcher.js.map +1 -0
- package/dist/commands/extension/targetSelection.d.ts +62 -0
- package/dist/commands/extension/targetSelection.d.ts.map +1 -0
- package/dist/commands/extension/targetSelection.js +210 -0
- package/dist/commands/extension/targetSelection.js.map +1 -0
- package/dist/commands/extension/targets.d.ts +7 -0
- package/dist/commands/extension/targets.d.ts.map +1 -0
- package/dist/commands/extension/targets.js +73 -0
- package/dist/commands/extension/targets.js.map +1 -0
- package/dist/commands/extension/use.d.ts +13 -0
- package/dist/commands/extension/use.d.ts.map +1 -0
- package/dist/commands/extension/use.js +66 -0
- package/dist/commands/extension/use.js.map +1 -0
- package/dist/commands/locate.d.ts.map +1 -1
- package/dist/commands/locate.js.map +1 -1
- package/dist/commands/netMock.d.ts +34 -0
- package/dist/commands/netMock.d.ts.map +1 -0
- package/dist/commands/netMock.js +323 -0
- package/dist/commands/netMock.js.map +1 -0
- package/dist/commands/netSse.d.ts +1 -1
- package/dist/commands/netSse.d.ts.map +1 -1
- package/dist/commands/netSse.js +19 -23
- package/dist/commands/netSse.js.map +1 -1
- package/dist/commands/netWebSocket.d.ts +2 -2
- package/dist/commands/netWebSocket.d.ts.map +1 -1
- package/dist/commands/netWebSocket.js +42 -55
- package/dist/commands/netWebSocket.js.map +1 -1
- package/dist/commands/pluginConfig.d.ts +1 -0
- package/dist/commands/pluginConfig.d.ts.map +1 -1
- package/dist/commands/pluginConfig.js +12 -2
- package/dist/commands/pluginConfig.js.map +1 -1
- package/dist/commands/record.d.ts +35 -0
- package/dist/commands/record.d.ts.map +1 -0
- package/dist/commands/record.js +210 -0
- package/dist/commands/record.js.map +1 -0
- package/dist/commands/skill.d.ts +6 -0
- package/dist/commands/skill.d.ts.map +1 -0
- package/dist/commands/skill.js +42 -0
- package/dist/commands/skill.js.map +1 -0
- package/dist/commands/start.d.ts +2 -2
- package/dist/commands/start.d.ts.map +1 -1
- package/dist/commands/startShared.d.ts +1 -1
- package/dist/commands/startShared.d.ts.map +1 -1
- package/dist/commands/watcherNativeHost.js +48 -1
- package/dist/commands/watcherNativeHost.js.map +1 -1
- package/dist/commands/watcherSession.d.ts +3 -3
- package/dist/commands/watcherSession.d.ts.map +1 -1
- package/dist/commands/watcherSession.js.map +1 -1
- package/dist/commands/watcherStart.d.ts +2 -2
- package/dist/commands/watcherStart.d.ts.map +1 -1
- package/dist/config/argusHome.d.ts +3 -0
- package/dist/config/argusHome.d.ts.map +1 -0
- package/dist/config/argusHome.js +11 -0
- package/dist/config/argusHome.js.map +1 -0
- package/dist/config/loadConfig.d.ts +13 -0
- package/dist/config/loadConfig.d.ts.map +1 -0
- package/dist/config/loadConfig.js +59 -0
- package/dist/config/loadConfig.js.map +1 -0
- package/dist/config/mergeConfig.d.ts +34 -0
- package/dist/config/mergeConfig.d.ts.map +1 -0
- package/dist/config/mergeConfig.js +57 -0
- package/dist/config/mergeConfig.js.map +1 -0
- package/dist/config/types.d.ts +51 -0
- package/dist/config/types.d.ts.map +1 -0
- package/dist/config/types.js +2 -0
- package/dist/config/types.js.map +1 -0
- package/dist/config/validateConfig.d.ts +14 -0
- package/dist/config/validateConfig.d.ts.map +1 -0
- package/dist/config/{argusConfig.js → validateConfig.js} +136 -244
- package/dist/config/validateConfig.js.map +1 -0
- package/dist/eval/evalClient.d.ts +2 -0
- package/dist/eval/evalClient.d.ts.map +1 -1
- package/dist/eval/evalClient.js +26 -2
- package/dist/eval/evalClient.js.map +1 -1
- package/dist/skill/argus/SKILL.md +200 -0
- package/dist/skill/argus/reference/CAPTURE.md +77 -0
- package/dist/skill/argus/reference/DIALOG.md +31 -0
- package/dist/skill/argus/reference/EVAL.md +137 -0
- package/dist/skill/argus/reference/EXTENSION.md +38 -0
- package/dist/skill/argus/reference/EXTENSION_IFRAME_EVAL.md +58 -0
- package/dist/skill/argus/reference/IFRAMES.md +46 -0
- package/dist/skill/argus/reference/INJECT.md +145 -0
- package/dist/skill/argus/reference/INSPECT.md +175 -0
- package/dist/skill/argus/reference/NET.md +108 -0
- package/dist/skill/argus/reference/PLUGINS.md +172 -0
- package/dist/skill/argus/reference/RUNTIME_CODE.md +42 -0
- package/dist/skill/argus/reference/START.md +120 -0
- package/dist/skill/argus/start-watcher.ts +108 -0
- package/package.json +4 -2
- package/dist/cli/register/registerAuth.d.ts +0 -3
- package/dist/cli/register/registerAuth.d.ts.map +0 -1
- package/dist/cli/register/registerAuth.js +0 -133
- package/dist/cli/register/registerAuth.js.map +0 -1
- package/dist/cli/register/registerChrome.d.ts +0 -3
- package/dist/cli/register/registerChrome.d.ts.map +0 -1
- package/dist/cli/register/registerChrome.js +0 -118
- package/dist/cli/register/registerChrome.js.map +0 -1
- package/dist/cli/register/registerCode.d.ts +0 -3
- package/dist/cli/register/registerCode.d.ts.map +0 -1
- package/dist/cli/register/registerCode.js +0 -74
- package/dist/cli/register/registerCode.js.map +0 -1
- package/dist/cli/register/registerConfig.d.ts +0 -3
- package/dist/cli/register/registerConfig.d.ts.map +0 -1
- package/dist/cli/register/registerConfig.js +0 -14
- package/dist/cli/register/registerConfig.js.map +0 -1
- package/dist/cli/register/registerDialog.d.ts +0 -3
- package/dist/cli/register/registerDialog.d.ts.map +0 -1
- package/dist/cli/register/registerDialog.js +0 -45
- package/dist/cli/register/registerDialog.js.map +0 -1
- package/dist/cli/register/registerDom.d.ts +0 -3
- package/dist/cli/register/registerDom.d.ts.map +0 -1
- package/dist/cli/register/registerDom.js +0 -284
- package/dist/cli/register/registerDom.js.map +0 -1
- package/dist/cli/register/registerEval.d.ts +0 -3
- package/dist/cli/register/registerEval.d.ts.map +0 -1
- package/dist/cli/register/registerEval.js +0 -149
- package/dist/cli/register/registerEval.js.map +0 -1
- package/dist/cli/register/registerExtension.d.ts +0 -3
- package/dist/cli/register/registerExtension.d.ts.map +0 -1
- package/dist/cli/register/registerExtension.js +0 -72
- package/dist/cli/register/registerExtension.js.map +0 -1
- package/dist/cli/register/registerFill.d.ts +0 -3
- package/dist/cli/register/registerFill.d.ts.map +0 -1
- package/dist/cli/register/registerFill.js +0 -31
- package/dist/cli/register/registerFill.js.map +0 -1
- package/dist/cli/register/registerHover.d.ts +0 -3
- package/dist/cli/register/registerHover.d.ts.map +0 -1
- package/dist/cli/register/registerHover.js +0 -21
- package/dist/cli/register/registerHover.js.map +0 -1
- package/dist/cli/register/registerKeydown.d.ts +0 -3
- package/dist/cli/register/registerKeydown.d.ts.map +0 -1
- package/dist/cli/register/registerKeydown.js +0 -20
- package/dist/cli/register/registerKeydown.js.map +0 -1
- package/dist/cli/register/registerLocate.d.ts +0 -3
- package/dist/cli/register/registerLocate.d.ts.map +0 -1
- package/dist/cli/register/registerLocate.js +0 -48
- package/dist/cli/register/registerLocate.js.map +0 -1
- package/dist/cli/register/registerLogs.d.ts +0 -3
- package/dist/cli/register/registerLogs.d.ts.map +0 -1
- package/dist/cli/register/registerLogs.js +0 -64
- package/dist/cli/register/registerLogs.js.map +0 -1
- package/dist/cli/register/registerNet.d.ts +0 -3
- package/dist/cli/register/registerNet.d.ts.map +0 -1
- package/dist/cli/register/registerNet.js +0 -287
- package/dist/cli/register/registerNet.js.map +0 -1
- package/dist/cli/register/registerPage.d.ts +0 -3
- package/dist/cli/register/registerPage.d.ts.map +0 -1
- package/dist/cli/register/registerPage.js +0 -123
- package/dist/cli/register/registerPage.js.map +0 -1
- package/dist/cli/register/registerPlugin.d.ts +0 -3
- package/dist/cli/register/registerPlugin.d.ts.map +0 -1
- package/dist/cli/register/registerPlugin.js +0 -34
- package/dist/cli/register/registerPlugin.js.map +0 -1
- package/dist/cli/register/registerQuickAccess.d.ts +0 -3
- package/dist/cli/register/registerQuickAccess.d.ts.map +0 -1
- package/dist/cli/register/registerQuickAccess.js +0 -112
- package/dist/cli/register/registerQuickAccess.js.map +0 -1
- package/dist/cli/register/registerScrollTo.d.ts +0 -3
- package/dist/cli/register/registerScrollTo.d.ts.map +0 -1
- package/dist/cli/register/registerScrollTo.js +0 -22
- package/dist/cli/register/registerScrollTo.js.map +0 -1
- package/dist/cli/register/registerSnapshot.d.ts +0 -3
- package/dist/cli/register/registerSnapshot.d.ts.map +0 -1
- package/dist/cli/register/registerSnapshot.js +0 -38
- package/dist/cli/register/registerSnapshot.js.map +0 -1
- package/dist/cli/register/registerStorage.d.ts +0 -3
- package/dist/cli/register/registerStorage.d.ts.map +0 -1
- package/dist/cli/register/registerStorage.js +0 -61
- package/dist/cli/register/registerStorage.js.map +0 -1
- package/dist/cli/register/registerThrottle.d.ts +0 -3
- package/dist/cli/register/registerThrottle.d.ts.map +0 -1
- package/dist/cli/register/registerThrottle.js +0 -33
- package/dist/cli/register/registerThrottle.js.map +0 -1
- package/dist/cli/register/registerTrace.d.ts +0 -3
- package/dist/cli/register/registerTrace.d.ts.map +0 -1
- package/dist/cli/register/registerTrace.js +0 -57
- package/dist/cli/register/registerTrace.js.map +0 -1
- package/dist/cli/register/registerWatcher.d.ts +0 -3
- package/dist/cli/register/registerWatcher.d.ts.map +0 -1
- package/dist/cli/register/registerWatcher.js +0 -135
- package/dist/cli/register/registerWatcher.js.map +0 -1
- package/dist/config/argusConfig.d.ts +0 -76
- package/dist/config/argusConfig.d.ts.map +0 -1
- package/dist/config/argusConfig.js.map +0 -1
|
@@ -1,107 +1,53 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
console.error(`Invalid Argus config at ${configPath}: ${message} ${EXPECTED_SHAPE_HINT}`);
|
|
8
|
-
process.exitCode = 2;
|
|
9
|
-
return null;
|
|
10
|
-
};
|
|
11
|
-
const invalidConfigPath = (configPath, message) => {
|
|
12
|
-
console.error(`Argus config error at ${configPath}: ${message}`);
|
|
13
|
-
process.exitCode = 2;
|
|
14
|
-
return null;
|
|
15
|
-
};
|
|
16
|
-
const assignDefined = (target, key, value) => {
|
|
17
|
-
if (value !== undefined) {
|
|
18
|
-
target[key] = value;
|
|
19
|
-
}
|
|
20
|
-
};
|
|
21
|
-
const validateOptionalString = (value, label) => {
|
|
22
|
-
if (value === undefined) {
|
|
23
|
-
return { ok: true };
|
|
24
|
-
}
|
|
25
|
-
if (typeof value !== 'string') {
|
|
26
|
-
return { ok: false, error: `${label} must be a string.` };
|
|
27
|
-
}
|
|
28
|
-
return { ok: true, value };
|
|
29
|
-
};
|
|
30
|
-
const validateOptionalBoolean = (value, label) => {
|
|
31
|
-
if (value === undefined) {
|
|
32
|
-
return { ok: true };
|
|
33
|
-
}
|
|
34
|
-
if (typeof value !== 'boolean') {
|
|
35
|
-
return { ok: false, error: `${label} must be a boolean.` };
|
|
36
|
-
}
|
|
37
|
-
return { ok: true, value };
|
|
38
|
-
};
|
|
39
|
-
const validateOptionalPort = (value, label) => {
|
|
40
|
-
if (value === undefined) {
|
|
41
|
-
return { ok: true };
|
|
42
|
-
}
|
|
43
|
-
if (typeof value !== 'number' || !Number.isFinite(value) || !Number.isInteger(value)) {
|
|
44
|
-
return { ok: false, error: `${label} must be an integer.` };
|
|
45
|
-
}
|
|
46
|
-
if (value < 1 || value > 65535) {
|
|
47
|
-
return { ok: false, error: `${label} must be between 1 and 65535.` };
|
|
48
|
-
}
|
|
49
|
-
return { ok: true, value };
|
|
50
|
-
};
|
|
51
|
-
const PAGE_CONSOLE_LOGGING_VALUES = ['none', 'minimal', 'full'];
|
|
52
|
-
const validateOptionalPageConsoleLogging = (value, label) => {
|
|
53
|
-
if (value === undefined) {
|
|
54
|
-
return { ok: true };
|
|
55
|
-
}
|
|
56
|
-
if (typeof value !== 'string' || !PAGE_CONSOLE_LOGGING_VALUES.includes(value)) {
|
|
57
|
-
return { ok: false, error: `${label} must be one of: none, minimal, full.` };
|
|
1
|
+
/** One-line shape reminder appended to every config validation error. */
|
|
2
|
+
export const EXPECTED_SHAPE_HINT = 'Expected shape: { plugins?: string[], pluginAliases?: Record<string, string>, 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 } } } }.';
|
|
3
|
+
/** Validate a parsed config file against the {@link ArgusConfig} shape. */
|
|
4
|
+
export const validateArgusConfig = (value) => {
|
|
5
|
+
if (!isRecord(value)) {
|
|
6
|
+
return { ok: false, error: 'Config root must be an object.' };
|
|
58
7
|
}
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
if (value === undefined) {
|
|
63
|
-
return { ok: true };
|
|
8
|
+
const pluginsResult = validateOptionalStringArray(value.plugins, '"plugins"');
|
|
9
|
+
if (!pluginsResult.ok) {
|
|
10
|
+
return pluginsResult;
|
|
64
11
|
}
|
|
65
|
-
|
|
66
|
-
|
|
12
|
+
const pluginAliasesResult = validateOptionalStringMap(value.pluginAliases, '"pluginAliases"');
|
|
13
|
+
if (!pluginAliasesResult.ok) {
|
|
14
|
+
return pluginAliasesResult;
|
|
67
15
|
}
|
|
68
|
-
|
|
69
|
-
if (
|
|
70
|
-
return { ok:
|
|
16
|
+
const chromeResult = validateOptionalSection(value.chrome, '"chrome"', (section) => {
|
|
17
|
+
if (section.start === undefined) {
|
|
18
|
+
return { ok: true, value: {} };
|
|
71
19
|
}
|
|
72
|
-
|
|
73
|
-
|
|
20
|
+
const startResult = validateChromeStartConfig(section.start);
|
|
21
|
+
if (!startResult.ok) {
|
|
22
|
+
return startResult;
|
|
74
23
|
}
|
|
24
|
+
return { ok: true, value: { start: startResult.value } };
|
|
25
|
+
});
|
|
26
|
+
if (!chromeResult.ok) {
|
|
27
|
+
return chromeResult;
|
|
75
28
|
}
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
if (value === undefined) {
|
|
80
|
-
return { ok: true };
|
|
81
|
-
}
|
|
82
|
-
if (!isRecord(value)) {
|
|
83
|
-
return { ok: false, error: `${label} must be an object with string values.` };
|
|
84
|
-
}
|
|
85
|
-
const entries = [];
|
|
86
|
-
for (const [key, item] of Object.entries(value)) {
|
|
87
|
-
if (key.trim() === '') {
|
|
88
|
-
return { ok: false, error: `${label} keys must be non-empty strings.` };
|
|
29
|
+
const watcherResult = validateOptionalSection(value.watcher, '"watcher"', (section) => {
|
|
30
|
+
if (section.start === undefined) {
|
|
31
|
+
return { ok: true, value: {} };
|
|
89
32
|
}
|
|
90
|
-
|
|
91
|
-
|
|
33
|
+
const startResult = validateWatcherStartConfig(section.start);
|
|
34
|
+
if (!startResult.ok) {
|
|
35
|
+
return startResult;
|
|
92
36
|
}
|
|
93
|
-
|
|
94
|
-
}
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
const validateOptionalSection = (value, label, validate) => {
|
|
98
|
-
if (value === undefined) {
|
|
99
|
-
return { ok: true };
|
|
100
|
-
}
|
|
101
|
-
if (!isRecord(value)) {
|
|
102
|
-
return { ok: false, error: `${label} must be an object.` };
|
|
37
|
+
return { ok: true, value: { start: startResult.value } };
|
|
38
|
+
});
|
|
39
|
+
if (!watcherResult.ok) {
|
|
40
|
+
return watcherResult;
|
|
103
41
|
}
|
|
104
|
-
return
|
|
42
|
+
return {
|
|
43
|
+
ok: true,
|
|
44
|
+
value: {
|
|
45
|
+
chrome: chromeResult.value,
|
|
46
|
+
watcher: watcherResult.value,
|
|
47
|
+
plugins: pluginsResult.value,
|
|
48
|
+
pluginAliases: pluginAliasesResult.value,
|
|
49
|
+
},
|
|
50
|
+
};
|
|
105
51
|
};
|
|
106
52
|
const validateChromeStartConfig = (value) => {
|
|
107
53
|
if (!isRecord(value)) {
|
|
@@ -141,32 +87,6 @@ const validateChromeStartConfig = (value) => {
|
|
|
141
87
|
assignDefined(config, 'headless', headlessResult.value);
|
|
142
88
|
return { ok: true, value: config };
|
|
143
89
|
};
|
|
144
|
-
const validateOptionalInjectConfig = (value) => {
|
|
145
|
-
if (value === undefined) {
|
|
146
|
-
return { ok: true };
|
|
147
|
-
}
|
|
148
|
-
if (!isRecord(value)) {
|
|
149
|
-
return { ok: false, error: '"watcher.start.inject" must be an object.' };
|
|
150
|
-
}
|
|
151
|
-
const fileResult = validateOptionalString(value.file, '"watcher.start.inject.file"');
|
|
152
|
-
if (!fileResult.ok) {
|
|
153
|
-
return fileResult;
|
|
154
|
-
}
|
|
155
|
-
if (fileResult.value === undefined || fileResult.value.trim() === '') {
|
|
156
|
-
return { ok: false, error: '"watcher.start.inject.file" is required and must be a non-empty string.' };
|
|
157
|
-
}
|
|
158
|
-
const exposeArgusResult = validateOptionalBoolean(value.exposeArgus, '"watcher.start.inject.exposeArgus"');
|
|
159
|
-
if (!exposeArgusResult.ok) {
|
|
160
|
-
return exposeArgusResult;
|
|
161
|
-
}
|
|
162
|
-
return {
|
|
163
|
-
ok: true,
|
|
164
|
-
value: {
|
|
165
|
-
file: fileResult.value,
|
|
166
|
-
exposeArgus: exposeArgusResult.value,
|
|
167
|
-
},
|
|
168
|
-
};
|
|
169
|
-
};
|
|
170
90
|
const validateWatcherStartConfig = (value) => {
|
|
171
91
|
if (!isRecord(value)) {
|
|
172
92
|
return { ok: false, error: '"watcher.start" must be an object.' };
|
|
@@ -217,149 +137,121 @@ const validateWatcherStartConfig = (value) => {
|
|
|
217
137
|
assignDefined(config, 'inject', injectResult.value);
|
|
218
138
|
return { ok: true, value: config };
|
|
219
139
|
};
|
|
220
|
-
const
|
|
221
|
-
if (
|
|
222
|
-
return { ok:
|
|
140
|
+
const validateOptionalInjectConfig = (value) => {
|
|
141
|
+
if (value === undefined) {
|
|
142
|
+
return { ok: true };
|
|
223
143
|
}
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
return pluginsResult;
|
|
144
|
+
if (!isRecord(value)) {
|
|
145
|
+
return { ok: false, error: '"watcher.start.inject" must be an object.' };
|
|
227
146
|
}
|
|
228
|
-
const
|
|
229
|
-
if (!
|
|
230
|
-
return
|
|
147
|
+
const fileResult = validateOptionalString(value.file, '"watcher.start.inject.file"');
|
|
148
|
+
if (!fileResult.ok) {
|
|
149
|
+
return fileResult;
|
|
231
150
|
}
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
return { ok: true, value: {} };
|
|
235
|
-
}
|
|
236
|
-
const startResult = validateChromeStartConfig(section.start);
|
|
237
|
-
if (!startResult.ok) {
|
|
238
|
-
return startResult;
|
|
239
|
-
}
|
|
240
|
-
return { ok: true, value: { start: startResult.value } };
|
|
241
|
-
});
|
|
242
|
-
if (!chromeResult.ok) {
|
|
243
|
-
return chromeResult;
|
|
151
|
+
if (fileResult.value === undefined || fileResult.value.trim() === '') {
|
|
152
|
+
return { ok: false, error: '"watcher.start.inject.file" is required and must be a non-empty string.' };
|
|
244
153
|
}
|
|
245
|
-
const
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
}
|
|
249
|
-
const startResult = validateWatcherStartConfig(section.start);
|
|
250
|
-
if (!startResult.ok) {
|
|
251
|
-
return startResult;
|
|
252
|
-
}
|
|
253
|
-
return { ok: true, value: { start: startResult.value } };
|
|
254
|
-
});
|
|
255
|
-
if (!watcherResult.ok) {
|
|
256
|
-
return watcherResult;
|
|
154
|
+
const exposeArgusResult = validateOptionalBoolean(value.exposeArgus, '"watcher.start.inject.exposeArgus"');
|
|
155
|
+
if (!exposeArgusResult.ok) {
|
|
156
|
+
return exposeArgusResult;
|
|
257
157
|
}
|
|
258
158
|
return {
|
|
259
159
|
ok: true,
|
|
260
160
|
value: {
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
plugins: pluginsResult.value,
|
|
264
|
-
pluginAliases: pluginAliasesResult.value,
|
|
161
|
+
file: fileResult.value,
|
|
162
|
+
exposeArgus: exposeArgusResult.value,
|
|
265
163
|
},
|
|
266
164
|
};
|
|
267
165
|
};
|
|
268
|
-
|
|
269
|
-
if (
|
|
270
|
-
|
|
271
|
-
if (!fs.existsSync(resolved)) {
|
|
272
|
-
return invalidConfigPath(resolved, 'File not found.');
|
|
273
|
-
}
|
|
274
|
-
return resolved;
|
|
166
|
+
const validateOptionalSection = (value, label, validate) => {
|
|
167
|
+
if (value === undefined) {
|
|
168
|
+
return { ok: true };
|
|
275
169
|
}
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
if (fs.existsSync(resolved)) {
|
|
279
|
-
return resolved;
|
|
280
|
-
}
|
|
170
|
+
if (!isRecord(value)) {
|
|
171
|
+
return { ok: false, error: `${label} must be an object.` };
|
|
281
172
|
}
|
|
282
|
-
return
|
|
173
|
+
return validate(value);
|
|
283
174
|
};
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
raw = fs.readFileSync(resolvedPath, 'utf8');
|
|
175
|
+
const validateOptionalString = (value, label) => {
|
|
176
|
+
if (value === undefined) {
|
|
177
|
+
return { ok: true };
|
|
288
178
|
}
|
|
289
|
-
|
|
290
|
-
return
|
|
179
|
+
if (typeof value !== 'string') {
|
|
180
|
+
return { ok: false, error: `${label} must be a string.` };
|
|
291
181
|
}
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
182
|
+
return { ok: true, value };
|
|
183
|
+
};
|
|
184
|
+
const validateOptionalBoolean = (value, label) => {
|
|
185
|
+
if (value === undefined) {
|
|
186
|
+
return { ok: true };
|
|
187
|
+
}
|
|
188
|
+
if (typeof value !== 'boolean') {
|
|
189
|
+
return { ok: false, error: `${label} must be a boolean.` };
|
|
295
190
|
}
|
|
296
|
-
|
|
297
|
-
|
|
191
|
+
return { ok: true, value };
|
|
192
|
+
};
|
|
193
|
+
const validateOptionalPort = (value, label) => {
|
|
194
|
+
if (value === undefined) {
|
|
195
|
+
return { ok: true };
|
|
298
196
|
}
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
return invalidConfig(resolvedPath, validated.error);
|
|
197
|
+
if (typeof value !== 'number' || !Number.isFinite(value) || !Number.isInteger(value)) {
|
|
198
|
+
return { ok: false, error: `${label} must be an integer.` };
|
|
302
199
|
}
|
|
303
|
-
|
|
200
|
+
if (value < 1 || value > 65535) {
|
|
201
|
+
return { ok: false, error: `${label} must be between 1 and 65535.` };
|
|
202
|
+
}
|
|
203
|
+
return { ok: true, value };
|
|
304
204
|
};
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
}
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
}
|
|
314
|
-
const mergeOption = (command, key, cliValue, configValue) => {
|
|
315
|
-
if (command.getOptionValueSource(key) === 'cli') {
|
|
316
|
-
return cliValue;
|
|
317
|
-
}
|
|
318
|
-
if (configValue !== undefined) {
|
|
319
|
-
return configValue;
|
|
320
|
-
}
|
|
321
|
-
return cliValue;
|
|
205
|
+
const PAGE_CONSOLE_LOGGING_VALUES = ['none', 'minimal', 'full'];
|
|
206
|
+
const validateOptionalPageConsoleLogging = (value, label) => {
|
|
207
|
+
if (value === undefined) {
|
|
208
|
+
return { ok: true };
|
|
209
|
+
}
|
|
210
|
+
if (typeof value !== 'string' || !PAGE_CONSOLE_LOGGING_VALUES.includes(value)) {
|
|
211
|
+
return { ok: false, error: `${label} must be one of: none, minimal, full.` };
|
|
212
|
+
}
|
|
213
|
+
return { ok: true, value: value };
|
|
322
214
|
};
|
|
323
|
-
|
|
324
|
-
if (
|
|
325
|
-
return
|
|
326
|
-
}
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
215
|
+
const validateOptionalStringArray = (value, label) => {
|
|
216
|
+
if (value === undefined) {
|
|
217
|
+
return { ok: true };
|
|
218
|
+
}
|
|
219
|
+
if (!Array.isArray(value)) {
|
|
220
|
+
return { ok: false, error: `${label} must be an array of strings.` };
|
|
221
|
+
}
|
|
222
|
+
for (const [index, item] of value.entries()) {
|
|
223
|
+
if (typeof item !== 'string') {
|
|
224
|
+
return { ok: false, error: `${label}[${index}] must be a string.` };
|
|
225
|
+
}
|
|
226
|
+
if (item.trim() === '') {
|
|
227
|
+
return { ok: false, error: `${label}[${index}] must be a non-empty string.` };
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
return { ok: true, value };
|
|
231
|
+
};
|
|
232
|
+
const validateOptionalStringMap = (value, label) => {
|
|
233
|
+
if (value === undefined) {
|
|
234
|
+
return { ok: true };
|
|
235
|
+
}
|
|
236
|
+
if (!isRecord(value)) {
|
|
237
|
+
return { ok: false, error: `${label} must be an object with string values.` };
|
|
238
|
+
}
|
|
239
|
+
const entries = [];
|
|
240
|
+
for (const [key, item] of Object.entries(value)) {
|
|
241
|
+
if (key.trim() === '') {
|
|
242
|
+
return { ok: false, error: `${label} keys must be non-empty strings.` };
|
|
243
|
+
}
|
|
244
|
+
if (typeof item !== 'string' || item.trim() === '') {
|
|
245
|
+
return { ok: false, error: `${label}.${key} must be a non-empty string.` };
|
|
246
|
+
}
|
|
247
|
+
entries.push([key, item]);
|
|
248
|
+
}
|
|
249
|
+
return { ok: true, value: Object.fromEntries(entries) };
|
|
343
250
|
};
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
if (!watcherStart) {
|
|
350
|
-
return options;
|
|
351
|
-
}
|
|
352
|
-
const merged = { ...options };
|
|
353
|
-
const configArtifacts = watcherStart.artifacts !== undefined ? resolveArtifactsPath(configResult.configDir, watcherStart.artifacts) : undefined;
|
|
354
|
-
const configInject = watcherStart.inject !== undefined ? resolveInjectPath(configResult.configDir, watcherStart.inject) : undefined;
|
|
355
|
-
merged.id = mergeOption(command, 'id', options.id, watcherStart.id);
|
|
356
|
-
merged.url = mergeOption(command, 'url', options.url, watcherStart.url);
|
|
357
|
-
merged.chromeHost = mergeOption(command, 'chromeHost', options.chromeHost, watcherStart.chromeHost);
|
|
358
|
-
merged.chromePort = mergeOption(command, 'chromePort', options.chromePort, watcherStart.chromePort);
|
|
359
|
-
merged.pageIndicator = mergeOption(command, 'pageIndicator', options.pageIndicator, watcherStart.pageIndicator);
|
|
360
|
-
merged.pageConsoleLogging = mergeOption(command, 'pageConsoleLogging', options.pageConsoleLogging, watcherStart.pageConsoleLogging);
|
|
361
|
-
merged.artifacts = mergeOption(command, 'artifacts', options.artifacts, configArtifacts);
|
|
362
|
-
merged.inject = mergeOption(command, 'inject', options.inject, configInject);
|
|
363
|
-
return merged;
|
|
251
|
+
const isRecord = (value) => typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
252
|
+
const assignDefined = (target, key, value) => {
|
|
253
|
+
if (value !== undefined) {
|
|
254
|
+
target[key] = value;
|
|
255
|
+
}
|
|
364
256
|
};
|
|
365
|
-
//# sourceMappingURL=
|
|
257
|
+
//# sourceMappingURL=validateConfig.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validateConfig.js","sourceRoot":"","sources":["../../src/config/validateConfig.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,5 +33,7 @@ export type EvalAttemptResult = {
|
|
|
33
33
|
attempt: number;
|
|
34
34
|
};
|
|
35
35
|
export declare const evalOnce: (input: EvalOnceInput) => Promise<EvalOutcome>;
|
|
36
|
+
/** Format transport errors with an eval-specific timeout hint when a long-running script likely exceeded the request budget. */
|
|
37
|
+
export declare const formatEvalTransportError: (watcher: Pick<WatcherRecord, "id">, error: unknown, timeoutMs: number | undefined) => string;
|
|
36
38
|
export declare const evalWithRetries: (input: EvalWithRetriesInput) => Promise<EvalAttemptResult>;
|
|
37
39
|
//# sourceMappingURL=evalClient.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evalClient.d.ts","sourceRoot":"","sources":["../../src/eval/evalClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"evalClient.d.ts","sourceRoot":"","sources":["../../src/eval/evalClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAMrE,MAAM,MAAM,aAAa,GAAG;IAC3B,OAAO,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,CAAC,CAAA;IACpD,UAAU,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC7B,YAAY,EAAE,OAAO,CAAA;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,aAAa,EAAE,OAAO,CAAA;IACtB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,eAAe,EAAE,OAAO,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG,aAAa,GAAG;IAClD,UAAU,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,WAAW,GACpB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,EAAE,YAAY,CAAA;CAAE,GACpC;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,WAAW,GAAG,WAAW,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,YAAY,CAAA;CAAE,CAAA;AAEzF,MAAM,MAAM,iBAAiB,GAC1B;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,EAAE,YAAY,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GACrD;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,WAAW,GAAG,WAAW,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,YAAY,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAA;AAE1G,eAAO,MAAM,QAAQ,GAAU,OAAO,aAAa,KAAG,OAAO,CAAC,WAAW,CAqCxE,CAAA;AAED,gIAAgI;AAChI,eAAO,MAAM,wBAAwB,GAAI,SAAS,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,EAAE,OAAO,OAAO,EAAE,WAAW,MAAM,GAAG,SAAS,KAAG,MAY5H,CAAA;AAcD,eAAO,MAAM,eAAe,GAAU,OAAO,oBAAoB,KAAG,OAAO,CAAC,iBAAiB,CA+B5F,CAAA"}
|
package/dist/eval/evalClient.js
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { fetchWatcherJson, formatWatcherTransportError } from '../watchers/requestWatcher.js';
|
|
2
|
+
const DEFAULT_EVAL_REQUEST_TIMEOUT_MS = 10_000;
|
|
3
|
+
const MIN_SUGGESTED_TIMEOUT_MS = 60_000;
|
|
2
4
|
export const evalOnce = async (input) => {
|
|
3
5
|
const body = {
|
|
4
6
|
expression: input.expression,
|
|
@@ -8,20 +10,21 @@ export const evalOnce = async (input) => {
|
|
|
8
10
|
returnByValue: input.returnByValue,
|
|
9
11
|
timeoutMs: input.timeoutMs,
|
|
10
12
|
};
|
|
13
|
+
const requestTimeoutMs = input.timeoutMs ? input.timeoutMs + 5_000 : DEFAULT_EVAL_REQUEST_TIMEOUT_MS;
|
|
11
14
|
let response;
|
|
12
15
|
try {
|
|
13
16
|
response = await fetchWatcherJson(input.watcher, {
|
|
14
17
|
path: '/eval',
|
|
15
18
|
method: 'POST',
|
|
16
19
|
body,
|
|
17
|
-
timeoutMs:
|
|
20
|
+
timeoutMs: requestTimeoutMs,
|
|
18
21
|
});
|
|
19
22
|
}
|
|
20
23
|
catch (error) {
|
|
21
24
|
return {
|
|
22
25
|
ok: false,
|
|
23
26
|
kind: 'transport',
|
|
24
|
-
error:
|
|
27
|
+
error: formatEvalTransportError(input.watcher, error, input.timeoutMs),
|
|
25
28
|
};
|
|
26
29
|
}
|
|
27
30
|
if (response.exception && input.failOnException) {
|
|
@@ -34,6 +37,27 @@ export const evalOnce = async (input) => {
|
|
|
34
37
|
}
|
|
35
38
|
return { ok: true, response };
|
|
36
39
|
};
|
|
40
|
+
/** Format transport errors with an eval-specific timeout hint when a long-running script likely exceeded the request budget. */
|
|
41
|
+
export const formatEvalTransportError = (watcher, error, timeoutMs) => {
|
|
42
|
+
const baseMessage = formatWatcherTransportError(watcher, error);
|
|
43
|
+
if (!isTimeoutError(error)) {
|
|
44
|
+
return baseMessage;
|
|
45
|
+
}
|
|
46
|
+
const suggestedTimeoutMs = Math.max(MIN_SUGGESTED_TIMEOUT_MS, (timeoutMs ?? DEFAULT_EVAL_REQUEST_TIMEOUT_MS) * 2);
|
|
47
|
+
return (`${baseMessage}. ` +
|
|
48
|
+
`Eval may need more time; pass a longer timeout as milliseconds or a duration, for example: ` +
|
|
49
|
+
`\`argus eval ${watcher.id} --timeout ${formatSuggestedDuration(suggestedTimeoutMs)} ...\``);
|
|
50
|
+
};
|
|
51
|
+
const isTimeoutError = (error) => {
|
|
52
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
53
|
+
return /timed out|timeout/i.test(message);
|
|
54
|
+
};
|
|
55
|
+
const formatSuggestedDuration = (timeoutMs) => {
|
|
56
|
+
if (timeoutMs % 1_000 === 0) {
|
|
57
|
+
return `${timeoutMs / 1_000}s`;
|
|
58
|
+
}
|
|
59
|
+
return String(timeoutMs);
|
|
60
|
+
};
|
|
37
61
|
export const evalWithRetries = async (input) => {
|
|
38
62
|
let attempt = 0;
|
|
39
63
|
while (attempt <= input.retryCount) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evalClient.js","sourceRoot":"","sources":["../../src/eval/evalClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAA;
|
|
1
|
+
{"version":3,"file":"evalClient.js","sourceRoot":"","sources":["../../src/eval/evalClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAA;AAE7F,MAAM,+BAA+B,GAAG,MAAM,CAAA;AAC9C,MAAM,wBAAwB,GAAG,MAAM,CAAA;AAyBvC,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAAE,KAAoB,EAAwB,EAAE;IAC5E,MAAM,IAAI,GAAG;QACZ,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,YAAY,EAAE,KAAK,CAAC,YAAY;QAChC,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,aAAa,EAAE,KAAK,CAAC,aAAa;QAClC,SAAS,EAAE,KAAK,CAAC,SAAS;KAC1B,CAAA;IACD,MAAM,gBAAgB,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,+BAA+B,CAAA;IAEpG,IAAI,QAAsB,CAAA;IAC1B,IAAI,CAAC;QACJ,QAAQ,GAAG,MAAM,gBAAgB,CAAe,KAAK,CAAC,OAAO,EAAE;YAC9D,IAAI,EAAE,OAAO;YACb,MAAM,EAAE,MAAM;YACd,IAAI;YACJ,SAAS,EAAE,gBAAgB;SAC3B,CAAC,CAAA;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,OAAO;YACN,EAAE,EAAE,KAAK;YACT,IAAI,EAAE,WAAW;YACjB,KAAK,EAAE,wBAAwB,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC;SACtE,CAAA;IACF,CAAC;IAED,IAAI,QAAQ,CAAC,SAAS,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;QACjD,OAAO;YACN,EAAE,EAAE,KAAK;YACT,IAAI,EAAE,WAAW;YACjB,QAAQ;YACR,KAAK,EAAE,cAAc,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE;SAC9C,CAAA;IACF,CAAC;IAED,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAA;AAC9B,CAAC,CAAA;AAED,gIAAgI;AAChI,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,OAAkC,EAAE,KAAc,EAAE,SAA6B,EAAU,EAAE;IACrI,MAAM,WAAW,GAAG,2BAA2B,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;IAC/D,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO,WAAW,CAAA;IACnB,CAAC;IAED,MAAM,kBAAkB,GAAG,IAAI,CAAC,GAAG,CAAC,wBAAwB,EAAE,CAAC,SAAS,IAAI,+BAA+B,CAAC,GAAG,CAAC,CAAC,CAAA;IACjH,OAAO,CACN,GAAG,WAAW,IAAI;QAClB,6FAA6F;QAC7F,gBAAgB,OAAO,CAAC,EAAE,cAAc,uBAAuB,CAAC,kBAAkB,CAAC,QAAQ,CAC3F,CAAA;AACF,CAAC,CAAA;AAED,MAAM,cAAc,GAAG,CAAC,KAAc,EAAW,EAAE;IAClD,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IACtE,OAAO,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;AAC1C,CAAC,CAAA;AAED,MAAM,uBAAuB,GAAG,CAAC,SAAiB,EAAU,EAAE;IAC7D,IAAI,SAAS,GAAG,KAAK,KAAK,CAAC,EAAE,CAAC;QAC7B,OAAO,GAAG,SAAS,GAAG,KAAK,GAAG,CAAA;IAC/B,CAAC;IACD,OAAO,MAAM,CAAC,SAAS,CAAC,CAAA;AACzB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAAE,KAA2B,EAA8B,EAAE;IAChG,IAAI,OAAO,GAAG,CAAC,CAAA;IACf,OAAO,OAAO,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;QACpC,OAAO,IAAI,CAAC,CAAA;QACZ,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC;YAC9B,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,UAAU,EAAE,KAAK,CAAC,UAAU;YAC5B,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,aAAa,EAAE,KAAK,CAAC,aAAa;YAClC,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,eAAe,EAAE,KAAK,CAAC,eAAe;SACtC,CAAC,CAAA;QAEF,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;YAChB,OAAO,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,CAAA;QAC/B,CAAC;QAED,MAAM,QAAQ,GAAG,OAAO,IAAI,KAAK,CAAC,UAAU,CAAA;QAC5C,IAAI,CAAC,QAAQ,EAAE,CAAC;YACf,OAAO,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,CAAA;QAC/B,CAAC;IACF,CAAC;IAED,OAAO;QACN,EAAE,EAAE,KAAK;QACT,IAAI,EAAE,WAAW;QACjB,KAAK,EAAE,2BAA2B,CAAC,KAAK,CAAC,OAAO,EAAE,eAAe,CAAC;QAClE,OAAO;KACP,CAAA;AACF,CAAC,CAAA"}
|