@vforsh/argus 0.1.9 → 0.1.11

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.
Files changed (117) hide show
  1. package/dist/.tsbuildinfo +1 -1
  2. package/dist/argus.js +1562 -1230
  3. package/dist/bin.js +2 -0
  4. package/dist/bin.js.map +1 -1
  5. package/dist/cdp/sendCdpCommand.d.ts +11 -0
  6. package/dist/cdp/sendCdpCommand.d.ts.map +1 -0
  7. package/dist/cdp/sendCdpCommand.js +103 -0
  8. package/dist/cdp/sendCdpCommand.js.map +1 -0
  9. package/dist/cli/program.js +1 -1
  10. package/dist/cli/program.js.map +1 -1
  11. package/dist/cli/register/registerAuth.d.ts +3 -0
  12. package/dist/cli/register/registerAuth.d.ts.map +1 -0
  13. package/dist/cli/register/registerAuth.js +29 -0
  14. package/dist/cli/register/registerAuth.js.map +1 -0
  15. package/dist/commands/auth.d.ts +22 -0
  16. package/dist/commands/auth.d.ts.map +1 -0
  17. package/dist/commands/auth.js +168 -0
  18. package/dist/commands/auth.js.map +1 -0
  19. package/dist/commands/chrome.d.ts.map +1 -1
  20. package/dist/commands/chrome.js +1 -99
  21. package/dist/commands/chrome.js.map +1 -1
  22. package/dist/commands/chromeStart.d.ts.map +1 -1
  23. package/dist/commands/chromeStart.js +14 -44
  24. package/dist/commands/chromeStart.js.map +1 -1
  25. package/dist/commands/list.d.ts.map +1 -1
  26. package/dist/commands/list.js +3 -5
  27. package/dist/commands/list.js.map +1 -1
  28. package/dist/commands/logs.d.ts.map +1 -1
  29. package/dist/commands/logs.js +10 -57
  30. package/dist/commands/logs.js.map +1 -1
  31. package/dist/commands/net.d.ts.map +1 -1
  32. package/dist/commands/net.js +8 -22
  33. package/dist/commands/net.js.map +1 -1
  34. package/dist/commands/netTail.d.ts.map +1 -1
  35. package/dist/commands/netTail.js +11 -25
  36. package/dist/commands/netTail.js.map +1 -1
  37. package/dist/commands/page.d.ts.map +1 -1
  38. package/dist/commands/page.js +1 -99
  39. package/dist/commands/page.js.map +1 -1
  40. package/dist/commands/start.d.ts.map +1 -1
  41. package/dist/commands/start.js +7 -46
  42. package/dist/commands/start.js.map +1 -1
  43. package/dist/commands/startShared.d.ts +32 -0
  44. package/dist/commands/startShared.d.ts.map +1 -0
  45. package/dist/commands/startShared.js +74 -0
  46. package/dist/commands/startShared.js.map +1 -0
  47. package/dist/commands/tail.d.ts.map +1 -1
  48. package/dist/commands/tail.js +8 -43
  49. package/dist/commands/tail.js.map +1 -1
  50. package/dist/commands/trace.d.ts.map +1 -1
  51. package/dist/commands/trace.js +7 -9
  52. package/dist/commands/trace.js.map +1 -1
  53. package/dist/commands/watcherNativeHost.d.ts.map +1 -1
  54. package/dist/commands/watcherNativeHost.js +1 -0
  55. package/dist/commands/watcherNativeHost.js.map +1 -1
  56. package/dist/commands/watcherStart.d.ts.map +1 -1
  57. package/dist/commands/watcherStart.js +11 -51
  58. package/dist/commands/watcherStart.js.map +1 -1
  59. package/dist/eval/evalClient.js +5 -14
  60. package/dist/eval/evalClient.js.map +1 -1
  61. package/dist/httpClient.d.ts +1 -12
  62. package/dist/httpClient.d.ts.map +1 -1
  63. package/dist/httpClient.js +1 -84
  64. package/dist/httpClient.js.map +1 -1
  65. package/dist/runtime-code/strings.js +9 -1
  66. package/dist/runtime-code/strings.js.map +1 -1
  67. package/dist/watchers/queryParams.d.ts +34 -0
  68. package/dist/watchers/queryParams.d.ts.map +1 -0
  69. package/dist/watchers/queryParams.js +80 -0
  70. package/dist/watchers/queryParams.js.map +1 -0
  71. package/dist/watchers/requestWatcher.d.ts +3 -0
  72. package/dist/watchers/requestWatcher.d.ts.map +1 -1
  73. package/dist/watchers/requestWatcher.js +15 -9
  74. package/dist/watchers/requestWatcher.js.map +1 -1
  75. package/dist/watchers/resolveWatcher.js +2 -3
  76. package/dist/watchers/resolveWatcher.js.map +1 -1
  77. package/package.json +3 -2
  78. package/dist/commands/contexts.d.ts +0 -7
  79. package/dist/commands/contexts.d.ts.map +0 -1
  80. package/dist/commands/contexts.js +0 -54
  81. package/dist/commands/contexts.js.map +0 -1
  82. package/dist/commands/domDiff.d.ts +0 -43
  83. package/dist/commands/domDiff.d.ts.map +0 -1
  84. package/dist/commands/domDiff.js +0 -279
  85. package/dist/commands/domDiff.js.map +0 -1
  86. package/dist/commands/domSubmit.d.ts +0 -10
  87. package/dist/commands/domSubmit.d.ts.map +0 -1
  88. package/dist/commands/domSubmit.js +0 -78
  89. package/dist/commands/domSubmit.js.map +0 -1
  90. package/dist/commands/extension/attach.d.ts +0 -8
  91. package/dist/commands/extension/attach.d.ts.map +0 -1
  92. package/dist/commands/extension/attach.js +0 -171
  93. package/dist/commands/extension/attach.js.map +0 -1
  94. package/dist/commands/extension/detach.d.ts +0 -6
  95. package/dist/commands/extension/detach.d.ts.map +0 -1
  96. package/dist/commands/extension/detach.js +0 -132
  97. package/dist/commands/extension/detach.js.map +0 -1
  98. package/dist/commands/extension/targets.d.ts +0 -13
  99. package/dist/commands/extension/targets.d.ts.map +0 -1
  100. package/dist/commands/extension/targets.js +0 -77
  101. package/dist/commands/extension/targets.js.map +0 -1
  102. package/dist/commands/frames.d.ts +0 -7
  103. package/dist/commands/frames.d.ts.map +0 -1
  104. package/dist/commands/frames.js +0 -90
  105. package/dist/commands/frames.js.map +0 -1
  106. package/dist/frame/frameSelector.d.ts +0 -14
  107. package/dist/frame/frameSelector.d.ts.map +0 -1
  108. package/dist/frame/frameSelector.js +0 -31
  109. package/dist/frame/frameSelector.js.map +0 -1
  110. package/dist/output/domDiff.d.ts +0 -14
  111. package/dist/output/domDiff.d.ts.map +0 -1
  112. package/dist/output/domDiff.js +0 -151
  113. package/dist/output/domDiff.js.map +0 -1
  114. package/dist/throttle/networkPresets.d.ts +0 -6
  115. package/dist/throttle/networkPresets.d.ts.map +0 -1
  116. package/dist/throttle/networkPresets.js +0 -24
  117. package/dist/throttle/networkPresets.js.map +0 -1
@@ -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,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
+ {"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;AAGzH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAInE,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;AAyBD,eAAO,MAAM,eAAe,GAAU,SAAS,mBAAmB,KAAG,OAAO,CAAC,IAAI,CA2JhF,CAAA"}
@@ -1,32 +1,13 @@
1
1
  import { startWatcher } from '@vforsh/argus-watcher';
2
2
  import crypto from 'node:crypto';
3
- import fs from 'node:fs/promises';
4
3
  import { createOutput } from '../output/io.js';
5
4
  import { resolvePath } from '../utils/paths.js';
5
+ import { buildWatcherMatch, registerTerminationHandlers, resolveInjectScript, waitForever } from './startShared.js';
6
6
  const isValidPort = (port) => Number.isFinite(port) && port >= 1 && port <= 65535;
7
7
  const parsePort = (value) => {
8
8
  const port = typeof value === 'string' ? parseInt(value, 10) : value;
9
9
  return isValidPort(port) ? port : null;
10
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
- };
30
11
  export const runWatcherStart = async (options) => {
31
12
  const output = createOutput(options);
32
13
  // Validate source option
@@ -81,7 +62,6 @@ export const runWatcherStart = async (options) => {
81
62
  }
82
63
  }
83
64
  const watcherId = options.id?.trim() || generateWatcherId();
84
- const matchUrl = options.url?.trim();
85
65
  let artifactsBaseDir;
86
66
  if (options.artifacts != null) {
87
67
  const trimmed = options.artifacts.trim();
@@ -93,32 +73,17 @@ export const runWatcherStart = async (options) => {
93
73
  artifactsBaseDir = resolvePath(trimmed);
94
74
  }
95
75
  const inject = await resolveInjectScript(options.inject, output);
96
- // Build the match object from various filter options
97
- const match = {};
98
- if (matchUrl) {
99
- match.url = matchUrl;
100
- }
101
- if (options.type?.trim()) {
102
- match.type = options.type.trim();
103
- }
104
- if (options.origin?.trim()) {
105
- match.origin = options.origin.trim();
106
- }
107
- if (options.target?.trim()) {
108
- match.targetId = options.target.trim();
109
- }
110
- if (options.parent?.trim()) {
111
- match.parent = options.parent.trim();
112
- }
76
+ const match = sourceMode === 'cdp' ? buildWatcherMatch(options) : undefined;
113
77
  let handle;
114
78
  try {
115
79
  handle = await startWatcher({
116
80
  id: watcherId,
117
81
  source: sourceMode,
118
- match: sourceMode === 'cdp' && Object.keys(match).length > 0 ? match : undefined,
82
+ match,
119
83
  chrome: sourceMode === 'cdp' ? { host: chromeHost, port: chromePort } : undefined,
120
84
  host: '127.0.0.1',
121
85
  port: 0,
86
+ net: { enabled: true },
122
87
  pageIndicator: options.pageIndicator === false ? { enabled: false } : { enabled: true },
123
88
  artifacts: artifactsBaseDir ? { base: artifactsBaseDir } : undefined,
124
89
  pageConsoleLogging: options.pageConsoleLogging,
@@ -136,11 +101,11 @@ export const runWatcherStart = async (options) => {
136
101
  port: handle.watcher.port,
137
102
  pid: handle.watcher.pid,
138
103
  source: sourceMode,
139
- matchUrl: match.url,
140
- matchType: match.type,
141
- matchOrigin: match.origin,
142
- matchTarget: match.targetId,
143
- matchParent: match.parent,
104
+ matchUrl: match?.url,
105
+ matchType: match?.type,
106
+ matchOrigin: match?.origin,
107
+ matchTarget: match?.targetId,
108
+ matchParent: match?.parent,
144
109
  chromeHost,
145
110
  chromePort,
146
111
  artifactsBaseDir,
@@ -151,12 +116,7 @@ export const runWatcherStart = async (options) => {
151
116
  }
152
117
  catch { }
153
118
  };
154
- process.on('SIGINT', () => {
155
- void cleanup().then(() => process.exit(0));
156
- });
157
- process.on('SIGTERM', () => {
158
- void cleanup().then(() => process.exit(0));
159
- });
119
+ registerTerminationHandlers(cleanup);
160
120
  handle.events.on('cdpAttached', ({ target }) => {
161
121
  const typeInfo = target?.type ? ` (type: ${target.type})` : '';
162
122
  output.writeHuman(`[${handle.watcher.id}] CDP attached: ${target?.title} (${target?.url})${typeInfo}`);
@@ -195,7 +155,7 @@ export const runWatcherStart = async (options) => {
195
155
  output.writeHuman(` artifacts=${result.artifactsBaseDir}`);
196
156
  }
197
157
  }
198
- await new Promise(() => { });
158
+ await waitForever();
199
159
  };
200
160
  /** Generate a short random watcher ID (e.g. "a3f1b2"). */
201
161
  const generateWatcherId = () => crypto.randomBytes(3).toString('hex');
@@ -1 +1 @@
1
- {"version":3,"file":"watcherStart.js","sourceRoot":"","sources":["../../src/commands/watcherStart.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"watcherStart.js","sourceRoot":"","sources":["../../src/commands/watcherStart.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,5 @@
1
- import { fetchJson } from '../httpClient.js';
1
+ import { fetchWatcherJson, formatWatcherTransportError } from '../watchers/requestWatcher.js';
2
2
  export const evalOnce = async (input) => {
3
- const url = `http://${input.watcher.host}:${input.watcher.port}/eval`;
4
3
  const body = {
5
4
  expression: input.expression,
6
5
  awaitPromise: input.awaitPromise,
@@ -10,7 +9,8 @@ export const evalOnce = async (input) => {
10
9
  };
11
10
  let response;
12
11
  try {
13
- response = await fetchJson(url, {
12
+ response = await fetchWatcherJson(input.watcher, {
13
+ path: '/eval',
14
14
  method: 'POST',
15
15
  body,
16
16
  timeoutMs: input.timeoutMs ? input.timeoutMs + 5_000 : 10_000,
@@ -20,7 +20,7 @@ export const evalOnce = async (input) => {
20
20
  return {
21
21
  ok: false,
22
22
  kind: 'transport',
23
- error: `${input.watcher.id}: failed to reach watcher (${formatError(error)})`,
23
+ error: formatWatcherTransportError(input.watcher, error),
24
24
  };
25
25
  }
26
26
  if (response.exception && input.failOnException) {
@@ -57,17 +57,8 @@ export const evalWithRetries = async (input) => {
57
57
  return {
58
58
  ok: false,
59
59
  kind: 'transport',
60
- error: `${input.watcher.id}: failed to reach watcher (unknown error)`,
60
+ error: formatWatcherTransportError(input.watcher, 'unknown error'),
61
61
  attempt,
62
62
  };
63
63
  };
64
- const formatError = (error) => {
65
- if (!error) {
66
- return 'unknown error';
67
- }
68
- if (error instanceof Error) {
69
- return error.message;
70
- }
71
- return String(error);
72
- };
73
64
  //# sourceMappingURL=evalClient.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"evalClient.js","sourceRoot":"","sources":["../../src/eval/evalClient.ts"],"names":[],"mappings":"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"}
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;AAwB7F,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAAE,KAAoB,EAAwB,EAAE;IAC5E,MAAM,IAAI,GAAG;QACZ,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,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;IAED,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,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,MAAM;SAC7D,CAAC,CAAA;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,OAAO;YACN,EAAE,EAAE,KAAK;YACT,IAAI,EAAE,WAAW;YACjB,KAAK,EAAE,2BAA2B,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC;SACxD,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,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,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"}
@@ -1,13 +1,2 @@
1
- /** Fetch options for watcher HTTP calls. */
2
- export type HttpOptions = {
3
- timeoutMs?: number;
4
- method?: 'GET' | 'POST' | 'PUT';
5
- body?: unknown;
6
- /** If true, return JSON body for 4xx responses instead of throwing. Default: false. */
7
- returnErrorResponse?: boolean;
8
- };
9
- /** Fetch JSON with timeout and typed response. */
10
- export declare const fetchJson: <T>(url: string, options?: HttpOptions) => Promise<T>;
11
- /** Fetch text with timeout. */
12
- export declare const fetchText: (url: string, options?: HttpOptions) => Promise<string>;
1
+ export { fetchJson, fetchText, type HttpOptions } from '@vforsh/argus-core';
13
2
  //# sourceMappingURL=httpClient.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"httpClient.d.ts","sourceRoot":"","sources":["../src/httpClient.ts"],"names":[],"mappings":"AAAA,4CAA4C;AAC5C,MAAM,MAAM,WAAW,GAAG;IACzB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,CAAA;IAC/B,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,uFAAuF;IACvF,mBAAmB,CAAC,EAAE,OAAO,CAAA;CAC7B,CAAA;AAED,kDAAkD;AAClD,eAAO,MAAM,SAAS,GAAU,CAAC,EAAE,KAAK,MAAM,EAAE,UAAS,WAAgB,KAAG,OAAO,CAAC,CAAC,CAiCpF,CAAA;AA0BD,+BAA+B;AAC/B,eAAO,MAAM,SAAS,GAAU,KAAK,MAAM,EAAE,UAAS,WAAgB,KAAG,OAAO,CAAC,MAAM,CA2BtF,CAAA"}
1
+ {"version":3,"file":"httpClient.d.ts","sourceRoot":"","sources":["../src/httpClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,WAAW,EAAE,MAAM,oBAAoB,CAAA"}
@@ -1,85 +1,2 @@
1
- /** Fetch JSON with timeout and typed response. */
2
- export const fetchJson = async (url, options = {}) => {
3
- const controller = new AbortController();
4
- const timeoutMs = options.timeoutMs ?? 5_000;
5
- const timer = setTimeout(() => controller.abort(), timeoutMs);
6
- const body = options.body != null ? JSON.stringify(options.body) : undefined;
7
- try {
8
- const response = await fetch(url, {
9
- method: options.method ?? 'GET',
10
- signal: controller.signal,
11
- body,
12
- headers: body ? { 'Content-Type': 'application/json' } : undefined,
13
- });
14
- // For error responses, try to extract the error message from the JSON body
15
- if (!response.ok) {
16
- if (options.returnErrorResponse && response.status >= 400) {
17
- return (await response.json());
18
- }
19
- // Try to read the error message from the response body
20
- const errorMessage = await extractErrorMessage(response);
21
- throw new Error(errorMessage ?? `Request failed (${response.status} ${response.statusText})`);
22
- }
23
- return (await response.json());
24
- }
25
- catch (error) {
26
- if (isAbortError(error)) {
27
- throw new Error(`Request timed out after ${timeoutMs}ms`);
28
- }
29
- throw error;
30
- }
31
- finally {
32
- clearTimeout(timer);
33
- }
34
- };
35
- const isAbortError = (error) => {
36
- if (!error || typeof error !== 'object' || !('name' in error)) {
37
- return false;
38
- }
39
- return error.name === 'AbortError';
40
- };
41
- /** Try to extract an error message from a response's JSON body. */
42
- const extractErrorMessage = async (response) => {
43
- try {
44
- const body = await response.json();
45
- if (body && typeof body === 'object' && 'error' in body) {
46
- const error = body.error;
47
- if (error && typeof error === 'object' && 'message' in error) {
48
- return error.message;
49
- }
50
- }
51
- }
52
- catch {
53
- // Ignore JSON parse errors - fall back to status text
54
- }
55
- return null;
56
- };
57
- /** Fetch text with timeout. */
58
- export const fetchText = async (url, options = {}) => {
59
- const controller = new AbortController();
60
- const timeoutMs = options.timeoutMs ?? 5_000;
61
- const timer = setTimeout(() => controller.abort(), timeoutMs);
62
- const body = options.body != null ? JSON.stringify(options.body) : undefined;
63
- try {
64
- const response = await fetch(url, {
65
- method: options.method ?? 'GET',
66
- signal: controller.signal,
67
- body,
68
- headers: body ? { 'Content-Type': 'application/json' } : undefined,
69
- });
70
- if (!response.ok) {
71
- throw new Error(`Request failed (${response.status} ${response.statusText})`);
72
- }
73
- return await response.text();
74
- }
75
- catch (error) {
76
- if (isAbortError(error)) {
77
- throw new Error(`Request timed out after ${timeoutMs}ms`);
78
- }
79
- throw error;
80
- }
81
- finally {
82
- clearTimeout(timer);
83
- }
84
- };
1
+ export { fetchJson, fetchText } from '@vforsh/argus-core';
85
2
  //# sourceMappingURL=httpClient.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"httpClient.js","sourceRoot":"","sources":["../src/httpClient.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"httpClient.js","sourceRoot":"","sources":["../src/httpClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAoB,MAAM,oBAAoB,CAAA"}
@@ -128,7 +128,7 @@ const readQuotedLiteral = (source, startIndex, startLineNumber, quote) => {
128
128
  return { value: null, nextIndex: index, lineNumber, startLineNumber };
129
129
  };
130
130
  const classifyCodeString = (value, includeAll) => {
131
- if (/[\u0000-\u001f]/.test(value)) {
131
+ if (hasControlChars(value)) {
132
132
  return null;
133
133
  }
134
134
  const kind = detectInterestingKind(value);
@@ -152,6 +152,14 @@ const detectInterestingKind = (value) => {
152
152
  }
153
153
  return null;
154
154
  };
155
+ const hasControlChars = (value) => {
156
+ for (let index = 0; index < value.length; index += 1) {
157
+ if (value.charCodeAt(index) < 32) {
158
+ return true;
159
+ }
160
+ }
161
+ return false;
162
+ };
155
163
  const rankCodeStrings = (matches) => matches
156
164
  .map((match) => ({
157
165
  ...match,
@@ -1 +1 @@
1
- {"version":3,"file":"strings.js","sourceRoot":"","sources":["../../src/runtime-code/strings.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"strings.js","sourceRoot":"","sources":["../../src/runtime-code/strings.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,34 @@
1
+ type MatchCaseOptions = {
2
+ ignoreCase?: boolean;
3
+ caseSensitive?: boolean;
4
+ };
5
+ export declare const appendAfterLimitParams: (params: URLSearchParams, options: {
6
+ after?: string;
7
+ limit?: string;
8
+ }) => void;
9
+ export declare const appendSinceParam: (params: URLSearchParams, since?: string) => {
10
+ error?: string;
11
+ };
12
+ export declare const resolveSinceTimestamp: (since?: string) => {
13
+ sinceTs: number | null;
14
+ error?: string;
15
+ };
16
+ export declare const appendLogFilterParams: (params: URLSearchParams, options: {
17
+ levels?: string;
18
+ match?: string[];
19
+ source?: string;
20
+ ignoreCase?: boolean;
21
+ caseSensitive?: boolean;
22
+ }) => {
23
+ error?: string;
24
+ };
25
+ export declare const appendNetFilterParams: (params: URLSearchParams, options: {
26
+ grep?: string;
27
+ }) => void;
28
+ export declare const normalizeMatchPatterns: (match?: string[]) => {
29
+ patterns: string[];
30
+ error?: string;
31
+ };
32
+ export declare const resolveMatchCase: (options: MatchCaseOptions) => "sensitive" | "insensitive" | undefined;
33
+ export {};
34
+ //# sourceMappingURL=queryParams.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"queryParams.d.ts","sourceRoot":"","sources":["../../src/watchers/queryParams.ts"],"names":[],"mappings":"AAGA,KAAK,gBAAgB,GAAG;IACvB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,aAAa,CAAC,EAAE,OAAO,CAAA;CACvB,CAAA;AAED,eAAO,MAAM,sBAAsB,GAAI,QAAQ,eAAe,EAAE,SAAS;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,KAAG,IAU7G,CAAA;AAED,eAAO,MAAM,gBAAgB,GAAI,QAAQ,eAAe,EAAE,QAAQ,MAAM,KAAG;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAW1F,CAAA;AAED,eAAO,MAAM,qBAAqB,GAAI,QAAQ,MAAM,KAAG;IAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAW9F,CAAA;AAED,eAAO,MAAM,qBAAqB,GACjC,QAAQ,eAAe,EACvB,SAAS;IACR,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,aAAa,CAAC,EAAE,OAAO,CAAA;CACvB,KACC;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAwBlB,CAAA;AAED,eAAO,MAAM,qBAAqB,GAAI,QAAQ,eAAe,EAAE,SAAS;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,KAAG,IAK3F,CAAA;AAED,eAAO,MAAM,sBAAsB,GAAI,QAAQ,MAAM,EAAE,KAAG;IAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAW7F,CAAA;AAED,eAAO,MAAM,gBAAgB,GAAI,SAAS,gBAAgB,KAAG,WAAW,GAAG,aAAa,GAAG,SAQ1F,CAAA"}
@@ -0,0 +1,80 @@
1
+ import { normalizeQueryValue, parseNumber } from '../cli/parse.js';
2
+ import { parseDurationMs } from '../time.js';
3
+ export const appendAfterLimitParams = (params, options) => {
4
+ const after = parseNumber(options.after);
5
+ if (after != null) {
6
+ params.set('after', String(after));
7
+ }
8
+ const limit = parseNumber(options.limit);
9
+ if (limit != null) {
10
+ params.set('limit', String(limit));
11
+ }
12
+ };
13
+ export const appendSinceParam = (params, since) => {
14
+ const resolved = resolveSinceTimestamp(since);
15
+ if (resolved.error) {
16
+ return resolved;
17
+ }
18
+ if (resolved.sinceTs == null) {
19
+ return {};
20
+ }
21
+ params.set('sinceTs', String(resolved.sinceTs));
22
+ return {};
23
+ };
24
+ export const resolveSinceTimestamp = (since) => {
25
+ if (!since) {
26
+ return { sinceTs: null };
27
+ }
28
+ const duration = parseDurationMs(since);
29
+ if (!duration) {
30
+ return { sinceTs: null, error: `Invalid --since value: ${since}` };
31
+ }
32
+ return { sinceTs: Date.now() - duration };
33
+ };
34
+ export const appendLogFilterParams = (params, options) => {
35
+ if (options.levels) {
36
+ params.set('levels', options.levels);
37
+ }
38
+ const normalizedMatch = normalizeMatchPatterns(options.match);
39
+ if (normalizedMatch.error) {
40
+ return normalizedMatch;
41
+ }
42
+ for (const pattern of normalizedMatch.patterns) {
43
+ params.append('match', pattern);
44
+ }
45
+ const matchCase = resolveMatchCase(options);
46
+ if (matchCase) {
47
+ params.set('matchCase', matchCase);
48
+ }
49
+ const source = normalizeQueryValue(options.source);
50
+ if (source) {
51
+ params.set('source', source);
52
+ }
53
+ return {};
54
+ };
55
+ export const appendNetFilterParams = (params, options) => {
56
+ const grep = normalizeQueryValue(options.grep);
57
+ if (grep) {
58
+ params.set('grep', grep);
59
+ }
60
+ };
61
+ export const normalizeMatchPatterns = (match) => {
62
+ if (!match || match.length === 0) {
63
+ return { patterns: [] };
64
+ }
65
+ const patterns = match.map((value) => value.trim());
66
+ if (patterns.some((value) => value.length === 0)) {
67
+ return { patterns: [], error: 'Invalid --match value: empty pattern.' };
68
+ }
69
+ return { patterns };
70
+ };
71
+ export const resolveMatchCase = (options) => {
72
+ if (options.caseSensitive) {
73
+ return 'sensitive';
74
+ }
75
+ if (options.ignoreCase) {
76
+ return 'insensitive';
77
+ }
78
+ return undefined;
79
+ };
80
+ //# sourceMappingURL=queryParams.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"queryParams.js","sourceRoot":"","sources":["../../src/watchers/queryParams.ts"],"names":[],"mappings":"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"}
@@ -26,6 +26,9 @@ export type WatcherRequestError = {
26
26
  candidates?: WatcherRecord[];
27
27
  };
28
28
  export type WatcherRequestResult<T> = WatcherRequestSuccess<T> | WatcherRequestError;
29
+ export declare const buildWatcherUrl: (watcher: Pick<WatcherRecord, "host" | "port">, path: string, query?: URLSearchParams) => string;
30
+ export declare const formatWatcherTransportError: (watcher: Pick<WatcherRecord, "id">, error: unknown) => string;
31
+ export declare function fetchWatcherJson<T>(watcher: Pick<WatcherRecord, 'host' | 'port'>, input: Omit<WatcherRequestInput, 'id'>): Promise<T>;
29
32
  /**
30
33
  * Resolve a watcher, build a URL, and fetch JSON in one call.
31
34
  * Handles resolve failures and transport errors uniformly.
@@ -1 +1 @@
1
- {"version":3,"file":"requestWatcher.d.ts","sourceRoot":"","sources":["../../src/watchers/requestWatcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AACvD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAUnD,4CAA4C;AAC5C,MAAM,MAAM,mBAAmB,GAAG;IACjC,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,eAAe,CAAA;IACvB,MAAM,CAAC,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAA;IAC9B,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,mBAAmB,CAAC,EAAE,OAAO,CAAA;CAC7B,CAAA;AAED,kCAAkC;AAClC,MAAM,MAAM,qBAAqB,CAAC,CAAC,IAAI;IACtC,EAAE,EAAE,IAAI,CAAA;IACR,OAAO,EAAE,aAAa,CAAA;IACtB,IAAI,EAAE,CAAC,CAAA;CACP,CAAA;AAED,mEAAmE;AACnE,MAAM,MAAM,mBAAmB,GAAG;IACjC,EAAE,EAAE,KAAK,CAAA;IACT,OAAO,CAAC,EAAE,aAAa,CAAA;IACvB,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,UAAU,CAAC,EAAE,aAAa,EAAE,CAAA;CAC5B,CAAA;AAED,MAAM,MAAM,oBAAoB,CAAC,CAAC,IAAI,qBAAqB,CAAC,CAAC,CAAC,GAAG,mBAAmB,CAAA;AAEpF;;;GAGG;AACH,wBAAsB,kBAAkB,CAAC,CAAC,EAAE,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CA+BxG;AAMD,+GAA+G;AAC/G,wBAAsB,oBAAoB,CAAC,KAAK,EAAE;IAAE,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;IAAE,OAAO,EAAE,aAAa,CAAA;CAAE,GAAG,IAAI,CAAC,CAO7H;AAMD,mGAAmG;AACnG,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,mBAAmB,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CASnF"}
1
+ {"version":3,"file":"requestWatcher.d.ts","sourceRoot":"","sources":["../../src/watchers/requestWatcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AACvD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAUnD,4CAA4C;AAC5C,MAAM,MAAM,mBAAmB,GAAG;IACjC,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,eAAe,CAAA;IACvB,MAAM,CAAC,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAA;IAC9B,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,mBAAmB,CAAC,EAAE,OAAO,CAAA;CAC7B,CAAA;AAED,kCAAkC;AAClC,MAAM,MAAM,qBAAqB,CAAC,CAAC,IAAI;IACtC,EAAE,EAAE,IAAI,CAAA;IACR,OAAO,EAAE,aAAa,CAAA;IACtB,IAAI,EAAE,CAAC,CAAA;CACP,CAAA;AAED,mEAAmE;AACnE,MAAM,MAAM,mBAAmB,GAAG;IACjC,EAAE,EAAE,KAAK,CAAA;IACT,OAAO,CAAC,EAAE,aAAa,CAAA;IACvB,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,UAAU,CAAC,EAAE,aAAa,EAAE,CAAA;CAC5B,CAAA;AAED,MAAM,MAAM,oBAAoB,CAAC,CAAC,IAAI,qBAAqB,CAAC,CAAC,CAAC,GAAG,mBAAmB,CAAA;AAEpF,eAAO,MAAM,eAAe,GAAI,SAAS,IAAI,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAAC,EAAE,MAAM,MAAM,EAAE,QAAQ,eAAe,KAAG,MAGtH,CAAA;AAED,eAAO,MAAM,2BAA2B,GAAI,SAAS,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,EAAE,OAAO,OAAO,KAAG,MAChC,CAAA;AAEjE,wBAAsB,gBAAgB,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAO3I;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CAAC,CAAC,EAAE,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAwBxG;AAMD,+GAA+G;AAC/G,wBAAsB,oBAAoB,CAAC,KAAK,EAAE;IAAE,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;IAAE,OAAO,EAAE,aAAa,CAAA;CAAE,GAAG,IAAI,CAAC,CAO7H;AAMD,mGAAmG;AACnG,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,mBAAmB,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CASnF"}
@@ -2,6 +2,19 @@ import { fetchJson } from '../httpClient.js';
2
2
  import { formatError } from '../cli/parse.js';
3
3
  import { formatWatcherLine } from '../output/format.js';
4
4
  import { resolveWatcher } from './resolveWatcher.js';
5
+ export const buildWatcherUrl = (watcher, path, query) => {
6
+ const qs = query?.toString();
7
+ return `http://${watcher.host}:${watcher.port}${path}${qs ? `?${qs}` : ''}`;
8
+ };
9
+ export const formatWatcherTransportError = (watcher, error) => `${watcher.id}: failed to reach watcher (${formatError(error)})`;
10
+ export async function fetchWatcherJson(watcher, input) {
11
+ return fetchJson(buildWatcherUrl(watcher, input.path, input.query), {
12
+ method: input.method,
13
+ body: input.body,
14
+ timeoutMs: input.timeoutMs,
15
+ returnErrorResponse: input.returnErrorResponse,
16
+ });
17
+ }
5
18
  /**
6
19
  * Resolve a watcher, build a URL, and fetch JSON in one call.
7
20
  * Handles resolve failures and transport errors uniformly.
@@ -17,15 +30,8 @@ export async function requestWatcherJson(input) {
17
30
  };
18
31
  }
19
32
  const { watcher } = resolved;
20
- const qs = input.query?.toString();
21
- const url = `http://${watcher.host}:${watcher.port}${input.path}${qs ? `?${qs}` : ''}`;
22
33
  try {
23
- const data = await fetchJson(url, {
24
- method: input.method,
25
- body: input.body,
26
- timeoutMs: input.timeoutMs,
27
- returnErrorResponse: input.returnErrorResponse,
28
- });
34
+ const data = await fetchWatcherJson(watcher, input);
29
35
  return { ok: true, watcher, data };
30
36
  }
31
37
  catch (error) {
@@ -33,7 +39,7 @@ export async function requestWatcherJson(input) {
33
39
  ok: false,
34
40
  watcher,
35
41
  exitCode: 1,
36
- message: `${watcher.id}: failed to reach watcher (${formatError(error)})`,
42
+ message: formatWatcherTransportError(watcher, error),
37
43
  };
38
44
  }
39
45
  }
@@ -1 +1 @@
1
- {"version":3,"file":"requestWatcher.js","sourceRoot":"","sources":["../../src/watchers/requestWatcher.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"requestWatcher.js","sourceRoot":"","sources":["../../src/watchers/requestWatcher.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAmCpD,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,OAA6C,EAAE,IAAY,EAAE,KAAuB,EAAU,EAAE;IAC/H,MAAM,EAAE,GAAG,KAAK,EAAE,QAAQ,EAAE,CAAA;IAC5B,OAAO,UAAU,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,GAAG,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAA;AAC5E,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,OAAkC,EAAE,KAAc,EAAU,EAAE,CACzG,GAAG,OAAO,CAAC,EAAE,8BAA8B,WAAW,CAAC,KAAK,CAAC,GAAG,CAAA;AAEjE,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAI,OAA6C,EAAE,KAAsC;IAC9H,OAAO,SAAS,CAAI,eAAe,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE;QACtE,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,mBAAmB,EAAE,KAAK,CAAC,mBAAmB;KAC9C,CAAC,CAAA;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAI,KAA0B;IACrE,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAA;IACvD,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QAClB,OAAO;YACN,EAAE,EAAE,KAAK;YACT,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,OAAO,EAAE,QAAQ,CAAC,KAAK;YACvB,UAAU,EAAE,QAAQ,CAAC,UAAU;SAC/B,CAAA;IACF,CAAC;IAED,MAAM,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAA;IAE5B,IAAI,CAAC;QACJ,MAAM,IAAI,GAAG,MAAM,gBAAgB,CAAI,OAAO,EAAE,KAAK,CAAC,CAAA;QACtD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;IACnC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,OAAO;YACN,EAAE,EAAE,KAAK;YACT,OAAO;YACP,QAAQ,EAAE,CAAC;YACX,OAAO,EAAE,2BAA2B,CAAC,OAAO,EAAE,KAAK,CAAC;SACpD,CAAA;IACF,CAAC;AACF,CAAC;AAED,8EAA8E;AAC9E,sDAAsD;AACtD,8EAA8E;AAE9E,+GAA+G;AAC/G,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,KAAsB,EAAE,MAAc;IAChF,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,KAAK,CAAC,CAAA;IAC5C,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QAClB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;QACnC,OAAO,IAAI,CAAA;IACZ,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAA;AACrC,CAAC;AAED,8EAA8E;AAC9E,eAAe;AACf,8EAA8E;AAE9E,mGAAmG;AACnG,MAAM,UAAU,iBAAiB,CAAC,MAA2B,EAAE,MAAc;IAC5E,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IAChC,IAAI,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvD,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YACzC,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAA;QAC7C,CAAC;QACD,MAAM,CAAC,SAAS,CAAC,6CAA6C,CAAC,CAAA;IAChE,CAAC;IACD,OAAO,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAA;AACnC,CAAC;AAED,0CAA0C;AAC1C,SAAS,iBAAiB,CAAC,QAAsF,EAAE,MAAc;IAChI,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IAChC,IAAI,QAAQ,CAAC,UAAU,IAAI,QAAQ,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3D,KAAK,MAAM,OAAO,IAAI,QAAQ,CAAC,UAAU,EAAE,CAAC;YAC3C,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAA;QAC7C,CAAC;QACD,MAAM,CAAC,SAAS,CAAC,6CAA6C,CAAC,CAAA;IAChE,CAAC;IACD,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAA;AACrC,CAAC"}
@@ -1,5 +1,5 @@
1
- import { fetchJson } from '../httpClient.js';
2
1
  import { pruneRegistry } from '../registry.js';
2
+ import { fetchWatcherJson } from './requestWatcher.js';
3
3
  export const resolveWatcher = async (input) => {
4
4
  let registry;
5
5
  try {
@@ -38,9 +38,8 @@ export const resolveWatcher = async (input) => {
38
38
  return { ok: false, error: 'Watcher id required.', exitCode: 2, candidates: watchers };
39
39
  };
40
40
  const checkWatcherStatus = async (watcher) => {
41
- const url = `http://${watcher.host}:${watcher.port}/status`;
42
41
  try {
43
- const status = await fetchJson(url, { timeoutMs: 1_500 });
42
+ const status = await fetchWatcherJson(watcher, { path: '/status', timeoutMs: 1_500 });
44
43
  return { ok: true, status };
45
44
  }
46
45
  catch (error) {