@vforsh/argus 0.1.10 → 0.1.11

package/dist/commands/startShared.js

@@ -0,0 +1,74 @@
+import fs from 'node:fs/promises';
+import { resolvePath } from '../utils/paths.js';
+/**
+ * Read an optional inject script once and keep command handlers free of file-system boilerplate.
+ */
+export const resolveInjectScript = async (inject, output) => {
+    if (!inject) {
+        return undefined;
+    }
+    const resolvedPath = resolvePath(inject.file);
+    let script;
+    try {
+        script = await fs.readFile(resolvedPath, 'utf8');
+    }
+    catch (error) {
+        output.writeWarn(`Failed to read inject script at ${resolvedPath}: ${error instanceof Error ? error.message : String(error)}. Skipping injection.`);
+        return undefined;
+    }
+    if (script.trim() === '') {
+        output.writeWarn(`Inject script at ${resolvedPath} is empty. Skipping injection.`);
+        return undefined;
+    }
+    return { script, exposeArgus: inject.exposeArgus };
+};
+export const normalizeHttpUrl = (value) => {
+    if (!value) {
+        return null;
+    }
+    if (value.startsWith('http://') || value.startsWith('https://')) {
+        return value;
+    }
+    return `http://${value}`;
+};
+/**
+ * Collect watcher target filters from CLI options and return `undefined` when nothing was set.
+ */
+export const buildWatcherMatch = (options) => {
+    const match = {};
+    const url = options.url?.trim();
+    if (url) {
+        match.url = url;
+    }
+    const type = options.type?.trim();
+    if (type) {
+        match.type = type;
+    }
+    const origin = options.origin?.trim();
+    if (origin) {
+        match.origin = origin;
+    }
+    const targetId = options.target?.trim();
+    if (targetId) {
+        match.targetId = targetId;
+    }
+    const parent = options.parent?.trim();
+    if (parent) {
+        match.parent = parent;
+    }
+    return Object.keys(match).length > 0 ? match : undefined;
+};
+/**
+ * Keep long-running commands consistent: terminate on SIGINT/SIGTERM, no per-command signal boilerplate.
+ */
+export const registerTerminationHandlers = (terminate) => {
+    const handleTermination = () => {
+        void terminate().then(() => process.exit(0));
+    };
+    process.on('SIGINT', handleTermination);
+    process.on('SIGTERM', handleTermination);
+};
+export const waitForever = async () => {
+    await new Promise(() => { });
+};
+//# sourceMappingURL=startShared.js.map

package/dist/commands/startShared.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"startShared.js","sourceRoot":"","sources":["../../src/commands/startShared.ts"],"names":[],"mappings":"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"}

package/dist/commands/tail.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tail.d.ts","sourceRoot":"","sources":["../../src/commands/tail.ts"],"names":[],"mappings":"AAQA,oCAAoC;AACpC,MAAM,MAAM,WAAW,GAAG;IACzB,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAChB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;CACd,CAAA;AAED,iDAAiD;AACjD,eAAO,MAAM,OAAO,GAAU,IAAI,MAAM,GAAG,SAAS,EAAE,SAAS,WAAW,KAAG,OAAO,CAAC,IAAI,CAgFxF,CAAA"}
+{"version":3,"file":"tail.d.ts","sourceRoot":"","sources":["../../src/commands/tail.ts"],"names":[],"mappings":"AASA,oCAAoC;AACpC,MAAM,MAAM,WAAW,GAAG;IACzB,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAChB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;CACd,CAAA;AAED,iDAAiD;AACjD,eAAO,MAAM,OAAO,GAAU,IAAI,MAAM,GAAG,SAAS,EAAE,SAAS,WAAW,KAAG,OAAO,CAAC,IAAI,CAgExF,CAAA"}

package/dist/commands/tail.js

@@ -2,8 +2,9 @@ import { fetchJson } from '../httpClient.js';
 import { formatLogEvent } from '../output/format.js';
 import { createOutput } from '../output/io.js';
 import { previewLogEvent } from '../output/preview.js';
-import { formatError, parseNumber, normalizeQueryValue } from '../cli/parse.js';
-import { resolveWatcherOrExit } from '../watchers/requestWatcher.js';
+import { parseNumber } from '../cli/parse.js';
+import { buildWatcherUrl, formatWatcherTransportError, resolveWatcherOrExit } from '../watchers/requestWatcher.js';
+import { appendLogFilterParams } from '../watchers/queryParams.js';
 /** Execute the tail command for a watcher id. */
 export const runTail = async (id, options) => {
     const output = createOutput(options);
@@ -27,35 +28,19 @@ export const runTail = async (id, options) => {
         if (limit != null) {
             params.set('limit', String(limit));
         }
-        if (options.levels) {
-            params.set('levels', options.levels);
-        }
-        const normalizedMatch = normalizeMatch(options.match);
-        if (normalizedMatch.error) {
-            output.writeWarn(normalizedMatch.error);
+        const filters = appendLogFilterParams(params, options);
+        if (filters.error) {
+            output.writeWarn(filters.error);
             process.exitCode = 2;
             return;
         }
-        if (normalizedMatch.match) {
-            for (const pattern of normalizedMatch.match) {
-                params.append('match', pattern);
-            }
-        }
-        const matchCase = resolveMatchCase(options);
-        if (matchCase) {
-            params.set('matchCase', matchCase);
-        }
-        const source = normalizeQueryValue(options.source);
-        if (source) {
-            params.set('source', source);
-        }
-        const url = `http://${watcher.host}:${watcher.port}/tail?${params.toString()}`;
+        const url = buildWatcherUrl(watcher, '/tail', params);
         let response;
         try {
             response = await fetchJson(url, { timeoutMs: timeoutMs + 5_000 });
         }
         catch (error) {
-            output.writeWarn(`${watcher.id}: failed to reach watcher (${formatError(error)})`);
+            output.writeWarn(formatWatcherTransportError(watcher, error));
             process.exitCode = 1;
             return;
         }
@@ -78,24 +63,4 @@ export const runTail = async (id, options) => {
         after = response.nextAfter;
     }
 };
-const normalizeMatch = (match) => {
-    if (!match || match.length === 0) {
-        return {};
-    }
-    const normalized = match.map((value) => value.trim());
-    const invalid = normalized.find((value) => value.length === 0);
-    if (invalid != null) {
-        return { error: 'Invalid --match value: empty pattern.' };
-    }
-    return { match: normalized };
-};
-const resolveMatchCase = (options) => {
-    if (options.caseSensitive) {
-        return 'sensitive';
-    }
-    if (options.ignoreCase) {
-        return 'insensitive';
-    }
-    return undefined;
-};
 //# sourceMappingURL=tail.js.map

package/dist/commands/tail.js.map

@@ -1 +1 @@
-{"version":3,"file":"tail.js","sourceRoot":"","sources":["../../src/commands/tail.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tail.js","sourceRoot":"","sources":["../../src/commands/tail.ts"],"names":[],"mappings":"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"}

package/dist/commands/trace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"trace.d.ts","sourceRoot":"","sources":["../../src/commands/trace.ts"],"names":[],"mappings":"AAOA,oDAAoD;AACpD,MAAM,MAAM,YAAY,GAAG;IAC1B,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,OAAO,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,2CAA2C;AAC3C,MAAM,MAAM,iBAAiB,GAAG;IAC/B,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,OAAO,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,0CAA0C;AAC1C,MAAM,MAAM,gBAAgB,GAAG;IAC9B,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,GAAG,CAAC,EAAE,MAAM,CAAA;CACZ,CAAA;AAED,gDAAgD;AAChD,eAAO,MAAM,QAAQ,GAAU,IAAI,MAAM,GAAG,SAAS,EAAE,SAAS,YAAY,KAAG,OAAO,CAAC,IAAI,CAsC1F,CAAA;AAED,wDAAwD;AACxD,eAAO,MAAM,aAAa,GAAU,IAAI,MAAM,GAAG,SAAS,EAAE,SAAS,iBAAiB,KAAG,OAAO,CAAC,IAAI,CAkBpG,CAAA;AAED,uDAAuD;AACvD,eAAO,MAAM,YAAY,GAAU,IAAI,MAAM,GAAG,SAAS,EAAE,SAAS,gBAAgB,KAAG,OAAO,CAAC,IAAI,CAgBlG,CAAA"}
+{"version":3,"file":"trace.d.ts","sourceRoot":"","sources":["../../src/commands/trace.ts"],"names":[],"mappings":"AAKA,oDAAoD;AACpD,MAAM,MAAM,YAAY,GAAG;IAC1B,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,OAAO,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,2CAA2C;AAC3C,MAAM,MAAM,iBAAiB,GAAG;IAC/B,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,OAAO,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,0CAA0C;AAC1C,MAAM,MAAM,gBAAgB,GAAG;IAC9B,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,GAAG,CAAC,EAAE,MAAM,CAAA;CACZ,CAAA;AAED,gDAAgD;AAChD,eAAO,MAAM,QAAQ,GAAU,IAAI,MAAM,GAAG,SAAS,EAAE,SAAS,YAAY,KAAG,OAAO,CAAC,IAAI,CAsC1F,CAAA;AAED,wDAAwD;AACxD,eAAO,MAAM,aAAa,GAAU,IAAI,MAAM,GAAG,SAAS,EAAE,SAAS,iBAAiB,KAAG,OAAO,CAAC,IAAI,CAkBpG,CAAA;AAED,uDAAuD;AACvD,eAAO,MAAM,YAAY,GAAU,IAAI,MAAM,GAAG,SAAS,EAAE,SAAS,gBAAgB,KAAG,OAAO,CAAC,IAAI,CAgBlG,CAAA"}

package/dist/commands/trace.js

@@ -1,8 +1,6 @@
-import { fetchJson } from '../httpClient.js';
 import { createOutput } from '../output/io.js';
-import { formatError } from '../cli/parse.js';
 import { parseDurationMs } from '../time.js';
-import { resolveWatcherOrExit } from '../watchers/requestWatcher.js';
+import { fetchWatcherJson, formatWatcherTransportError, resolveWatcherOrExit } from '../watchers/requestWatcher.js';
 /** Execute trace start + stop with duration. */
 export const runTrace = async (id, options) => {
     const output = createOutput(options);
@@ -71,9 +69,9 @@ export const runTraceStop = async (id, options) => {
     output.writeHuman(`Trace saved: ${stop.outFile} (${stop.eventCount} events, ${formatDurationMs(stop.durationMs)})`);
 };
 const runTraceStartInternal = async (watcher, options, output) => {
-    const url = `http://${watcher.host}:${watcher.port}/trace/start`;
     try {
-        const response = await fetchJson(url, {
+        const response = await fetchWatcherJson(watcher, {
+            path: '/trace/start',
             method: 'POST',
             body: {
                 outFile: options.out,
@@ -85,15 +83,15 @@ const runTraceStartInternal = async (watcher, options, output) => {
         return response;
     }
     catch (error) {
-        output.writeWarn(`${watcher.id}: failed to reach watcher (${formatError(error)})`);
+        output.writeWarn(formatWatcherTransportError(watcher, error));
         process.exitCode = 1;
         return null;
     }
 };
 const runTraceStopInternal = async (watcher, options, output) => {
-    const url = `http://${watcher.host}:${watcher.port}/trace/stop`;
     try {
-        const response = await fetchJson(url, {
+        const response = await fetchWatcherJson(watcher, {
+            path: '/trace/stop',
             method: 'POST',
             body: { traceId: options.traceId, outFile: options.outFile },
             timeoutMs: 20_000,
@@ -101,7 +99,7 @@ const runTraceStopInternal = async (watcher, options, output) => {
         return response;
     }
     catch (error) {
-        output.writeWarn(`${watcher.id}: failed to reach watcher (${formatError(error)})`);
+        output.writeWarn(formatWatcherTransportError(watcher, error));
         process.exitCode = 1;
         return null;
     }

package/dist/commands/trace.js.map

@@ -1 +1 @@
-{"version":3,"file":"trace.js","sourceRoot":"","sources":["../../src/commands/trace.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"trace.js","sourceRoot":"","sources":["../../src/commands/trace.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAC5C,OAAO,EAAE,gBAAgB,EAAE,2BAA2B,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAA;AA0BnH,gDAAgD;AAChD,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAAE,EAAsB,EAAE,OAAqB,EAAiB,EAAE;IAC9F,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;IACpC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QACvB,MAAM,CAAC,SAAS,CAAC,0BAA0B,CAAC,CAAA;QAC5C,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;QACpB,OAAM;IACP,CAAC;IAED,MAAM,UAAU,GAAG,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IACpD,IAAI,CAAC,UAAU,EAAE,CAAC;QACjB,MAAM,CAAC,SAAS,CAAC,6BAA6B,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAA;QACjE,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;QACpB,OAAM;IACP,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,oBAAoB,CAAC,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA;IAC3D,IAAI,CAAC,QAAQ;QAAE,OAAM;IAErB,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAA;IAEhC,MAAM,KAAK,GAAG,MAAM,qBAAqB,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;IACnE,IAAI,CAAC,KAAK,EAAE,CAAC;QACZ,OAAM;IACP,CAAC;IAED,MAAM,KAAK,CAAC,UAAU,CAAC,CAAA;IAEvB,MAAM,IAAI,GAAG,MAAM,oBAAoB,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAA;IAClF,IAAI,CAAC,IAAI,EAAE,CAAC;QACX,OAAM;IACP,CAAC;IAED,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QAClB,MAAM,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;QACjC,OAAM;IACP,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,gBAAgB,IAAI,CAAC,OAAO,KAAK,IAAI,CAAC,UAAU,YAAY,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;AACpH,CAAC,CAAA;AAED,wDAAwD;AACxD,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAAE,EAAsB,EAAE,OAA0B,EAAiB,EAAE;IACxG,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;IACpC,MAAM,QAAQ,GAAG,MAAM,oBAAoB,CAAC,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA;IAC3D,IAAI,CAAC,QAAQ;QAAE,OAAM;IAErB,MAAM,KAAK,GAAG,MAAM,qBAAqB,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;IAC5E,IAAI,CAAC,KAAK,EAAE,CAAC;QACZ,OAAM;IACP,CAAC;IAED,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QAClB,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;QACvB,OAAM;IACP,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,kBAAkB,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IACpD,MAAM,CAAC,UAAU,CAAC,YAAY,KAAK,CAAC,WAAW,EAAE,CAAC,CAAA;IAClD,MAAM,CAAC,UAAU,CAAC,WAAW,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;AAC9C,CAAC,CAAA;AAED,uDAAuD;AACvD,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAAE,EAAsB,EAAE,OAAyB,EAAiB,EAAE;IACtG,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;IACpC,MAAM,QAAQ,GAAG,MAAM,oBAAoB,CAAC,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA;IAC3D,IAAI,CAAC,QAAQ;QAAE,OAAM;IAErB,MAAM,IAAI,GAAG,MAAM,oBAAoB,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAA;IACrH,IAAI,CAAC,IAAI,EAAE,CAAC;QACX,OAAM;IACP,CAAC;IAED,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QAClB,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;QACtB,OAAM;IACP,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,gBAAgB,IAAI,CAAC,OAAO,KAAK,IAAI,CAAC,UAAU,YAAY,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;AACpH,CAAC,CAAA;AAED,MAAM,qBAAqB,GAAG,KAAK,EAClC,OAAsB,EACtB,OAAgE,EAChE,MAAuC,EACF,EAAE;IACvC,IAAI,CAAC;QACJ,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAqB,OAAO,EAAE;YACpE,IAAI,EAAE,cAAc;YACpB,MAAM,EAAE,MAAM;YACd,IAAI,EAAE;gBACL,OAAO,EAAE,OAAO,CAAC,GAAG;gBACpB,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,OAAO,EAAE,OAAO,CAAC,OAAO;aACxB;YACD,SAAS,EAAE,MAAM;SACjB,CAAC,CAAA;QACF,OAAO,QAAQ,CAAA;IAChB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,CAAC,SAAS,CAAC,2BAA2B,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAA;QAC7D,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;QACpB,OAAO,IAAI,CAAA;IACZ,CAAC;AACF,CAAC,CAAA;AAED,MAAM,oBAAoB,GAAG,KAAK,EACjC,OAAsB,EACtB,OAA+C,EAC/C,MAAuC,EACH,EAAE;IACtC,IAAI,CAAC;QACJ,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAoB,OAAO,EAAE;YACnE,IAAI,EAAE,aAAa;YACnB,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE;YAC5D,SAAS,EAAE,MAAM;SACjB,CAAC,CAAA;QACF,OAAO,QAAQ,CAAA;IAChB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,CAAC,SAAS,CAAC,2BAA2B,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAA;QAC7D,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;QACpB,OAAO,IAAI,CAAA;IACZ,CAAC;AACF,CAAC,CAAA;AAED,MAAM,KAAK,GAAG,CAAC,EAAU,EAAiB,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAA;AAE9F,MAAM,gBAAgB,GAAG,CAAC,EAAU,EAAU,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAA"}

package/dist/commands/watcherStart.d.ts.map

@@ -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,CAyLhF,CAAA"}
+{"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"}

package/dist/commands/watcherStart.js

@@ -1,32 +1,13 @@
 import { startWatcher } from '@vforsh/argus-watcher';
 import crypto from 'node:crypto';
-import fs from 'node:fs/promises';
 import { createOutput } from '../output/io.js';
 import { resolvePath } from '../utils/paths.js';
+import { buildWatcherMatch, registerTerminationHandlers, resolveInjectScript, waitForever } from './startShared.js';
 const isValidPort = (port) => Number.isFinite(port) && port >= 1 && port <= 65535;
 const parsePort = (value) => {
     const port = typeof value === 'string' ? parseInt(value, 10) : value;
     return isValidPort(port) ? port : null;
 };
-const resolveInjectScript = async (inject, output) => {
-    if (!inject) {
-        return null;
-    }
-    const resolvedPath = resolvePath(inject.file);
-    let script;
-    try {
-        script = await fs.readFile(resolvedPath, 'utf8');
-    }
-    catch (error) {
-        output.writeWarn(`Failed to read inject script at ${resolvedPath}: ${error instanceof Error ? error.message : String(error)}. Skipping injection.`);
-        return null;
-    }
-    if (script.trim() === '') {
-        output.writeWarn(`Inject script at ${resolvedPath} is empty. Skipping injection.`);
-        return null;
-    }
-    return { script, exposeArgus: inject.exposeArgus };
-};
 export const runWatcherStart = async (options) => {
     const output = createOutput(options);
     // Validate source option
@@ -81,7 +62,6 @@ export const runWatcherStart = async (options) => {
         }
     }
     const watcherId = options.id?.trim() || generateWatcherId();
-    const matchUrl = options.url?.trim();
     let artifactsBaseDir;
     if (options.artifacts != null) {
         const trimmed = options.artifacts.trim();
@@ -93,29 +73,13 @@ export const runWatcherStart = async (options) => {
         artifactsBaseDir = resolvePath(trimmed);
     }
     const inject = await resolveInjectScript(options.inject, output);
-    // Build the match object from various filter options
-    const match = {};
-    if (matchUrl) {
-        match.url = matchUrl;
-    }
-    if (options.type?.trim()) {
-        match.type = options.type.trim();
-    }
-    if (options.origin?.trim()) {
-        match.origin = options.origin.trim();
-    }
-    if (options.target?.trim()) {
-        match.targetId = options.target.trim();
-    }
-    if (options.parent?.trim()) {
-        match.parent = options.parent.trim();
-    }
+    const match = sourceMode === 'cdp' ? buildWatcherMatch(options) : undefined;
     let handle;
     try {
         handle = await startWatcher({
             id: watcherId,
             source: sourceMode,
-            match: sourceMode === 'cdp' && Object.keys(match).length > 0 ? match : undefined,
+            match,
             chrome: sourceMode === 'cdp' ? { host: chromeHost, port: chromePort } : undefined,
             host: '127.0.0.1',
             port: 0,
@@ -137,11 +101,11 @@ export const runWatcherStart = async (options) => {
         port: handle.watcher.port,
         pid: handle.watcher.pid,
         source: sourceMode,
-        matchUrl: match.url,
-        matchType: match.type,
-        matchOrigin: match.origin,
-        matchTarget: match.targetId,
-        matchParent: match.parent,
+        matchUrl: match?.url,
+        matchType: match?.type,
+        matchOrigin: match?.origin,
+        matchTarget: match?.targetId,
+        matchParent: match?.parent,
         chromeHost,
         chromePort,
         artifactsBaseDir,
@@ -152,12 +116,7 @@ export const runWatcherStart = async (options) => {
         }
         catch { }
     };
-    process.on('SIGINT', () => {
-        void cleanup().then(() => process.exit(0));
-    });
-    process.on('SIGTERM', () => {
-        void cleanup().then(() => process.exit(0));
-    });
+    registerTerminationHandlers(cleanup);
     handle.events.on('cdpAttached', ({ target }) => {
         const typeInfo = target?.type ? ` (type: ${target.type})` : '';
         output.writeHuman(`[${handle.watcher.id}] CDP attached: ${target?.title} (${target?.url})${typeInfo}`);
@@ -196,7 +155,7 @@ export const runWatcherStart = async (options) => {
             output.writeHuman(`  artifacts=${result.artifactsBaseDir}`);
         }
     }
-    await new Promise(() => { });
+    await waitForever();
 };
 /** Generate a short random watcher ID (e.g. "a3f1b2"). */
 const generateWatcherId = () => crypto.randomBytes(3).toString('hex');

package/dist/commands/watcherStart.js.map

@@ -1 +1 @@
-{"version":3,"file":"watcherStart.js","sourceRoot":"","sources":["../../src/commands/watcherStart.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"watcherStart.js","sourceRoot":"","sources":["../../src/commands/watcherStart.ts"],"names":[],"mappings":"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"}

package/dist/eval/evalClient.js

@@ -1,6 +1,5 @@
-import { fetchJson } from '../httpClient.js';
+import { fetchWatcherJson, formatWatcherTransportError } from '../watchers/requestWatcher.js';
 export const evalOnce = async (input) => {
-    const url = `http://${input.watcher.host}:${input.watcher.port}/eval`;
     const body = {
         expression: input.expression,
         awaitPromise: input.awaitPromise,
@@ -10,7 +9,8 @@ export const evalOnce = async (input) => {
     };
     let response;
     try {
-        response = await fetchJson(url, {
+        response = await fetchWatcherJson(input.watcher, {
+            path: '/eval',
             method: 'POST',
             body,
             timeoutMs: input.timeoutMs ? input.timeoutMs + 5_000 : 10_000,
@@ -20,7 +20,7 @@ export const evalOnce = async (input) => {
         return {
             ok: false,
             kind: 'transport',
-            error: `${input.watcher.id}: failed to reach watcher (${formatError(error)})`,
+            error: formatWatcherTransportError(input.watcher, error),
         };
     }
     if (response.exception && input.failOnException) {
@@ -57,17 +57,8 @@ export const evalWithRetries = async (input) => {
     return {
         ok: false,
         kind: 'transport',
-        error: `${input.watcher.id}: failed to reach watcher (unknown error)`,
+        error: formatWatcherTransportError(input.watcher, 'unknown error'),
         attempt,
     };
 };
-const formatError = (error) => {
-    if (!error) {
-        return 'unknown error';
-    }
-    if (error instanceof Error) {
-        return error.message;
-    }
-    return String(error);
-};
 //# sourceMappingURL=evalClient.js.map

package/dist/eval/evalClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"evalClient.js","sourceRoot":"","sources":["../../src/eval/evalClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAwB5C,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAAE,KAAoB,EAAwB,EAAE;IAC5E,MAAM,GAAG,GAAG,UAAU,KAAK,CAAC,OAAO,CAAC,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,OAAO,CAAA;IACrE,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,SAAS,CAAe,GAAG,EAAE;YAC7C,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,GAAG,KAAK,CAAC,OAAO,CAAC,EAAE,8BAA8B,WAAW,CAAC,KAAK,CAAC,GAAG;SAC7E,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,GAAG,KAAK,CAAC,OAAO,CAAC,EAAE,2CAA2C;QACrE,OAAO;KACP,CAAA;AACF,CAAC,CAAA;AAED,MAAM,WAAW,GAAG,CAAC,KAAc,EAAU,EAAE;IAC9C,IAAI,CAAC,KAAK,EAAE,CAAC;QACZ,OAAO,eAAe,CAAA;IACvB,CAAC;IACD,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;QAC5B,OAAO,KAAK,CAAC,OAAO,CAAA;IACrB,CAAC;IACD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAA;AACrB,CAAC,CAAA"}
+{"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"}

package/dist/httpClient.d.ts

@@ -1,13 +1,2 @@
-/** Fetch options for watcher HTTP calls. */
-export type HttpOptions = {
-    timeoutMs?: number;
-    method?: 'GET' | 'POST' | 'PUT';
-    body?: unknown;
-    /** If true, return JSON body for 4xx responses instead of throwing. Default: false. */
-    returnErrorResponse?: boolean;
-};
-/** Fetch JSON with timeout and typed response. */
-export declare const fetchJson: <T>(url: string, options?: HttpOptions) => Promise<T>;
-/** Fetch text with timeout. */
-export declare const fetchText: (url: string, options?: HttpOptions) => Promise<string>;
+export { fetchJson, fetchText, type HttpOptions } from '@vforsh/argus-core';
 //# sourceMappingURL=httpClient.d.ts.map

package/dist/httpClient.d.ts.map

@@ -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"}
+{"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"}

package/dist/httpClient.js

@@ -1,85 +1,2 @@
-/** Fetch JSON with timeout and typed response. */
-export const fetchJson = async (url, options = {}) => {
-    const controller = new AbortController();
-    const timeoutMs = options.timeoutMs ?? 5_000;
-    const timer = setTimeout(() => controller.abort(), timeoutMs);
-    const body = options.body != null ? JSON.stringify(options.body) : undefined;
-    try {
-        const response = await fetch(url, {
-            method: options.method ?? 'GET',
-            signal: controller.signal,
-            body,
-            headers: body ? { 'Content-Type': 'application/json' } : undefined,
-        });
-        // For error responses, try to extract the error message from the JSON body
-        if (!response.ok) {
-            if (options.returnErrorResponse && response.status >= 400) {
-                return (await response.json());
-            }
-            // Try to read the error message from the response body
-            const errorMessage = await extractErrorMessage(response);
-            throw new Error(errorMessage ?? `Request failed (${response.status} ${response.statusText})`);
-        }
-        return (await response.json());
-    }
-    catch (error) {
-        if (isAbortError(error)) {
-            throw new Error(`Request timed out after ${timeoutMs}ms`);
-        }
-        throw error;
-    }
-    finally {
-        clearTimeout(timer);
-    }
-};
-const isAbortError = (error) => {
-    if (!error || typeof error !== 'object' || !('name' in error)) {
-        return false;
-    }
-    return error.name === 'AbortError';
-};
-/** Try to extract an error message from a response's JSON body. */
-const extractErrorMessage = async (response) => {
-    try {
-        const body = await response.json();
-        if (body && typeof body === 'object' && 'error' in body) {
-            const error = body.error;
-            if (error && typeof error === 'object' && 'message' in error) {
-                return error.message;
-            }
-        }
-    }
-    catch {
-        // Ignore JSON parse errors - fall back to status text
-    }
-    return null;
-};
-/** Fetch text with timeout. */
-export const fetchText = async (url, options = {}) => {
-    const controller = new AbortController();
-    const timeoutMs = options.timeoutMs ?? 5_000;
-    const timer = setTimeout(() => controller.abort(), timeoutMs);
-    const body = options.body != null ? JSON.stringify(options.body) : undefined;
-    try {
-        const response = await fetch(url, {
-            method: options.method ?? 'GET',
-            signal: controller.signal,
-            body,
-            headers: body ? { 'Content-Type': 'application/json' } : undefined,
-        });
-        if (!response.ok) {
-            throw new Error(`Request failed (${response.status} ${response.statusText})`);
-        }
-        return await response.text();
-    }
-    catch (error) {
-        if (isAbortError(error)) {
-            throw new Error(`Request timed out after ${timeoutMs}ms`);
-        }
-        throw error;
-    }
-    finally {
-        clearTimeout(timer);
-    }
-};
+export { fetchJson, fetchText } from '@vforsh/argus-core';
 //# sourceMappingURL=httpClient.js.map

package/dist/httpClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"httpClient.js","sourceRoot":"","sources":["../src/httpClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"httpClient.js","sourceRoot":"","sources":["../src/httpClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAoB,MAAM,oBAAoB,CAAA"}

package/dist/runtime-code/strings.js

@@ -128,7 +128,7 @@ const readQuotedLiteral = (source, startIndex, startLineNumber, quote) => {
     return { value: null, nextIndex: index, lineNumber, startLineNumber };
 };
 const classifyCodeString = (value, includeAll) => {
-    if (/[\u0000-\u001f]/.test(value)) {
+    if (hasControlChars(value)) {
         return null;
     }
     const kind = detectInterestingKind(value);
@@ -152,6 +152,14 @@ const detectInterestingKind = (value) => {
     }
     return null;
 };
+const hasControlChars = (value) => {
+    for (let index = 0; index < value.length; index += 1) {
+        if (value.charCodeAt(index) < 32) {
+            return true;
+        }
+    }
+    return false;
+};
 const rankCodeStrings = (matches) => matches
     .map((match) => ({
     ...match,