@vforsh/argus-watcher 0.3.0 → 0.4.0

package/dist/http/routes/getTail.js.map

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

package/dist/http/routes/getTargets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getTargets.d.ts","sourceRoot":"","sources":["../../../src/http/routes/getTargets.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,KAAK,mDAahB,CAAA"}
+{"version":3,"file":"getTargets.d.ts","sourceRoot":"","sources":["../../../src/http/routes/getTargets.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,KAAK,mDAQhB,CAAA"}

package/dist/http/routes/getTargets.js

@@ -1,17 +1,12 @@
-import { defineJsonRoute } from './defineRoute.js';
-import { respondJson } from '../httpUtils.js';
+import { defineExtensionRoute } from './defineExtensionRoute.js';
 import { emitRequest } from './types.js';
-export const route = defineJsonRoute({
+export const route = defineExtensionRoute({
     method: 'GET',
     path: '/targets',
-    extensionOnly: true,
-    handle: async ({ res, ctx }) => {
-        if (!ctx.sourceHandle?.listTargets) {
-            return respondJson(res, { ok: false, error: { message: 'Not available', code: 'not_available' } }, 400);
-        }
+    capability: 'listTargets',
+    handle: async ({ res, ctx, capability }) => {
         emitRequest(ctx, res, 'targets');
-        const targets = await ctx.sourceHandle.listTargets();
-        return { ok: true, targets };
+        return { ok: true, targets: await capability() };
     },
 });
 //# sourceMappingURL=getTargets.js.map

package/dist/http/routes/getTargets.js.map

@@ -1 +1 @@
-{"version":3,"file":"getTargets.js","sourceRoot":"","sources":["../../../src/http/routes/getTargets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC,MAAM,CAAC,MAAM,KAAK,GAAG,eAAe,CAAC;IACpC,MAAM,EAAE,KAAK;IACb,IAAI,EAAE,UAAU;IAChB,aAAa,EAAE,IAAI;IACnB,MAAM,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE;QAC9B,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,WAAW,EAAE,CAAC;YACpC,OAAO,WAAW,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;QACxG,CAAC;QAED,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,CAAC,CAAA;QAChC,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,YAAY,CAAC,WAAW,EAAE,CAAA;QACpD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAA;IAC7B,CAAC;CACD,CAAC,CAAA"}
+{"version":3,"file":"getTargets.js","sourceRoot":"","sources":["../../../src/http/routes/getTargets.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC,MAAM,CAAC,MAAM,KAAK,GAAG,oBAAoB,CAAqD;IAC7F,MAAM,EAAE,KAAK;IACb,IAAI,EAAE,UAAU;IAChB,UAAU,EAAE,aAAa;IACzB,MAAM,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,EAAE;QAC1C,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,CAAC,CAAA;QAChC,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,UAAU,EAAE,EAAE,CAAA;IACjD,CAAC;CACD,CAAC,CAAA"}

package/dist/http/routes/logEpochQuery.d.ts

@@ -1,5 +1,5 @@
 import type http from 'node:http';
-import type { LogEpoch } from '@vforsh/argus-core';
+import type { LogEpoch, LogsQuery } from '@vforsh/argus-core';
 import { LogEpochError, type LogBuffer, type LogEpochQueryResult, type LogFilters } from '../../buffer/LogBuffer.js';
 export type LogPositionQuery = {
     kind: 'all';
@@ -7,6 +7,13 @@ export type LogPositionQuery = {
     kind: 'epoch';
     epoch: LogEpoch;
 };
+/**
+ * Read a log query param. The key is checked against {@link LogsQuery}, so renaming a param in the
+ * protocol breaks these parsers at compile time instead of silently dropping the filter.
+ */
+export declare const logParam: (url: URL, key: keyof LogsQuery) => string | null;
+/** Repeatable counterpart to {@link logParam}. */
+export declare const logParams: (url: URL, key: keyof LogsQuery) => string[];
 /** Parse the opaque epoch form, or the unbounded query with no marker. */
 export declare const parseLogPosition: (url: URL) => LogPositionQuery | {
     error: string;

package/dist/http/routes/logEpochQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logEpochQuery.d.ts","sourceRoot":"","sources":["../../../src/http/routes/logEpochQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AACjC,OAAO,KAAK,EAAE,QAAQ,EAAY,MAAM,oBAAoB,CAAA;AAC5D,OAAO,EAAE,aAAa,EAAE,KAAK,SAAS,EAAE,KAAK,mBAAmB,EAAE,KAAK,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAGpH,MAAM,MAAM,gBAAgB,GAAG;IAAE,IAAI,EAAE,KAAK,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,QAAQ,CAAA;CAAE,CAAA;AAEnF,0EAA0E;AAC1E,eAAO,MAAM,gBAAgB,GAAI,KAAK,GAAG,KAAG,gBAAgB,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAe7E,CAAA;AAED,uFAAuF;AACvF,eAAO,MAAM,oBAAoB,GAAI,KAAK,IAAI,CAAC,cAAc,EAAE,OAAO,aAAa,KAAG,IAarF,CAAA;AAED,wFAAwF;AACxF,eAAO,MAAM,oBAAoB,GAAI,QAAQ,SAAS,EAAE,UAAU,gBAAgB,EAAE,SAAS,UAAU,EAAE,OAAO,MAAM,KAAG,mBAMxH,CAAA;AAED,0EAA0E;AAC1E,eAAO,MAAM,uBAAuB,GACnC,QAAQ,SAAS,EACjB,UAAU,gBAAgB,EAC1B,SAAS,UAAU,EACnB,OAAO,MAAM,EACb,WAAW,MAAM,KACf,OAAO,CAAC,mBAAmB,CAO7B,CAAA"}
+{"version":3,"file":"logEpochQuery.d.ts","sourceRoot":"","sources":["../../../src/http/routes/logEpochQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AACjC,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAC7D,OAAO,EAAE,aAAa,EAAE,KAAK,SAAS,EAAE,KAAK,mBAAmB,EAAE,KAAK,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAGpH,MAAM,MAAM,gBAAgB,GAAG;IAAE,IAAI,EAAE,KAAK,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,QAAQ,CAAA;CAAE,CAAA;AAEnF;;;GAGG;AACH,eAAO,MAAM,QAAQ,GAAI,KAAK,GAAG,EAAE,KAAK,MAAM,SAAS,KAAG,MAAM,GAAG,IAAiC,CAAA;AAEpG,kDAAkD;AAClD,eAAO,MAAM,SAAS,GAAI,KAAK,GAAG,EAAE,KAAK,MAAM,SAAS,KAAG,MAAM,EAAkC,CAAA;AAEnG,0EAA0E;AAC1E,eAAO,MAAM,gBAAgB,GAAI,KAAK,GAAG,KAAG,gBAAgB,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAe7E,CAAA;AAED,uFAAuF;AACvF,eAAO,MAAM,oBAAoB,GAAI,KAAK,IAAI,CAAC,cAAc,EAAE,OAAO,aAAa,KAAG,IAarF,CAAA;AAWD,wFAAwF;AACxF,eAAO,MAAM,oBAAoB,GAAI,QAAQ,SAAS,EAAE,UAAU,gBAAgB,EAAE,SAAS,UAAU,EAAE,OAAO,MAAM,KAAG,mBACrD,CAAA;AAEpE,0EAA0E;AAC1E,eAAO,MAAM,uBAAuB,GACnC,QAAQ,SAAS,EACjB,UAAU,gBAAgB,EAC1B,SAAS,UAAU,EACnB,OAAO,MAAM,EACb,WAAW,MAAM,KACf,OAAO,CAAC,mBAAmB,CAA4F,CAAA"}

package/dist/http/routes/logEpochQuery.js

@@ -1,9 +1,16 @@
 import { LogEpochError } from '../../buffer/LogBuffer.js';
 import { normalizeQueryValue, respondJson } from '../httpUtils.js';
+/**
+ * Read a log query param. The key is checked against {@link LogsQuery}, so renaming a param in the
+ * protocol breaks these parsers at compile time instead of silently dropping the filter.
+ */
+export const logParam = (url, key) => url.searchParams.get(key);
+/** Repeatable counterpart to {@link logParam}. */
+export const logParams = (url, key) => url.searchParams.getAll(key);
 /** Parse the opaque epoch form, or the unbounded query with no marker. */
 export const parseLogPosition = (url) => {
-    const after = normalizeQueryValue(url.searchParams.get('after') ?? null);
-    const sinceEpoch = normalizeQueryValue(url.searchParams.get('sinceEpoch'));
+    const after = normalizeQueryValue(logParam(url, 'after'));
+    const sinceEpoch = normalizeQueryValue(logParam(url, 'sinceEpoch'));
     if (after && sinceEpoch) {
         return { error: 'Use either after or sinceEpoch, not both.' };
     }
@@ -26,32 +33,15 @@ export const respondLogEpochError = (res, error) => {
         },
     }, status);
 };
+/**
+ * The epoch a position query starts from.
+ *
+ * "Everything retained" is just the epoch at the oldest surviving entry, so both forms take the
+ * same buffer path instead of the whole-buffer one needing its own id-based long-poll subsystem.
+ */
+const startEpoch = (buffer, position) => position.kind === 'epoch' ? position.epoch : buffer.epochAtStart();
 /** Read a bounded log page from either the full retained buffer or an opaque cursor. */
-export const listLogsFromPosition = (buffer, position, filters, limit) => {
-    if (position.kind === 'epoch') {
-        return buffer.listAfterEpoch(position.epoch, filters, limit);
-    }
-    return createQueryResult(buffer, position, buffer.listAfter(0, filters, limit));
-};
+export const listLogsFromPosition = (buffer, position, filters, limit) => buffer.listAfterEpoch(startEpoch(buffer, position), filters, limit);
 /** Long-poll from either the full retained buffer or an opaque cursor. */
-export const waitForLogsFromPosition = async (buffer, position, filters, limit, timeoutMs) => {
-    if (position.kind === 'epoch') {
-        return buffer.waitForAfterEpoch(position.epoch, filters, limit, timeoutMs);
-    }
-    const events = await buffer.waitForAfter(0, filters, limit, timeoutMs);
-    return createQueryResult(buffer, position, events);
-};
-const createQueryResult = (buffer, position, events) => ({
-    events,
-    nextCursor: resolveNextCursor(buffer, position, events),
-});
-const resolveNextCursor = (buffer, position, events) => {
-    if (events.length > 0) {
-        return buffer.getEpochAt(events[events.length - 1]?.id ?? 0);
-    }
-    if (position.kind === 'epoch') {
-        return position.epoch;
-    }
-    return buffer.getEpoch();
-};
+export const waitForLogsFromPosition = async (buffer, position, filters, limit, timeoutMs) => await buffer.waitForAfterEpoch(startEpoch(buffer, position), filters, limit, timeoutMs);
 //# sourceMappingURL=logEpochQuery.js.map

package/dist/http/routes/logEpochQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"logEpochQuery.js","sourceRoot":"","sources":["../../../src/http/routes/logEpochQuery.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"logEpochQuery.js","sourceRoot":"","sources":["../../../src/http/routes/logEpochQuery.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAA6D,MAAM,2BAA2B,CAAA;AACpH,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAIlE;;;GAGG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAQ,EAAE,GAAoB,EAAiB,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;AAEpG,kDAAkD;AAClD,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,GAAQ,EAAE,GAAoB,EAAY,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;AAEnG,0EAA0E;AAC1E,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,GAAQ,EAAwC,EAAE;IAClF,MAAM,KAAK,GAAG,mBAAmB,CAAC,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;IACzD,MAAM,UAAU,GAAG,mBAAmB,CAAC,QAAQ,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC,CAAA;IACnE,IAAI,KAAK,IAAI,UAAU,EAAE,CAAC;QACzB,OAAO,EAAE,KAAK,EAAE,2CAA2C,EAAE,CAAA;IAC9D,CAAC;IAED,IAAI,UAAU,EAAE,CAAC;QAChB,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,CAAA;IAC5C,CAAC;IACD,IAAI,KAAK,EAAE,CAAC;QACX,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACvC,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAA;AACvB,CAAC,CAAA;AAED,uFAAuF;AACvF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,GAAwB,EAAE,KAAoB,EAAQ,EAAE;IAC5F,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAA;IAC9E,WAAW,CACV,GAAG,EACH;QACC,EAAE,EAAE,KAAK;QACT,KAAK,EAAE;YACN,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,IAAI,EAAE,aAAa,KAAK,CAAC,IAAI,EAAE;SAC/B;KACD,EACD,MAAM,CACN,CAAA;AACF,CAAC,CAAA;AAED;;;;;GAKG;AACH,MAAM,UAAU,GAAG,CAAC,MAAiB,EAAE,QAA0B,EAAY,EAAE,CAC9E,QAAQ,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,EAAE,CAAA;AAEnE,wFAAwF;AACxF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,MAAiB,EAAE,QAA0B,EAAE,OAAmB,EAAE,KAAa,EAAuB,EAAE,CAC9I,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,CAAA;AAEpE,0EAA0E;AAC1E,MAAM,CAAC,MAAM,uBAAuB,GAAG,KAAK,EAC3C,MAAiB,EACjB,QAA0B,EAC1B,OAAmB,EACnB,KAAa,EACb,SAAiB,EACc,EAAE,CAAC,MAAM,MAAM,CAAC,iBAAiB,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,CAAC,CAAA"}

package/dist/http/routes/netFilters.d.ts

@@ -20,6 +20,16 @@ type ParseNetFilterResult = {
 };
 /** Respond 400 `net_disabled`. Shared precondition failure for all `/net*` routes. */
 export declare const respondNetDisabled: (res: http.ServerResponse) => void;
+/**
+ * Cursor the client should send as `after` on its next poll.
+ *
+ * The last id in the page, or the cursor it already had when the page is empty — never a value the
+ * client would have to interpret. Every `/net*` listing route paginates this way; keeping the
+ * expression in one place is what stops one of them from quietly resetting a poller to 0.
+ */
+export declare const nextAfterCursor: (page: readonly {
+    id: number;
+}[], after: number) => number;
 /**
  * Parse network filters from a route URL with the standard after/limit/sinceTs
  * defaults shared by the `/net*` listing routes. Responds 400 `invalid_net_filter`

package/dist/http/routes/netFilters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"netFilters.d.ts","sourceRoot":"","sources":["../../../src/http/routes/netFilters.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AACjC,OAAO,KAAK,EAAE,gBAAgB,EAAE,UAAU,EAAY,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AAE9F,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAA;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAG9C,MAAM,MAAM,gBAAgB,GAAG,UAAU,GAAG;IAC3C,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,QAAQ,CAAA;IACf,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;CACpB,CAAA;AAED,KAAK,qBAAqB,GAAG;IAC5B,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAA;CACjC,CAAA;AAED,KAAK,oBAAoB,GAAG;IAC3B,KAAK,CAAC,EAAE,gBAAgB,CAAA;IACxB,KAAK,CAAC,EAAE,MAAM,CAAA;CACd,CAAA;AAOD,sFAAsF;AACtF,eAAO,MAAM,kBAAkB,GAAI,KAAK,IAAI,CAAC,cAAc,KAAG,IAE7D,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,GAAI,KAAK,GAAG,EAAE,KAAK,YAAY,EAAE,KAAK,IAAI,CAAC,cAAc,KAAG,gBAAgB,GAAG,IAYhH,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,GAAI,cAAc,eAAe,EAAE,SAAS,qBAAqB,KAAG,oBAiDtG,CAAA;AAED,eAAO,MAAM,sBAAsB,GAAI,SAAS,gBAAgB,EAAE,UAAS;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,KAAG,wBAAwB,CAAC,OAAO,CAmBvI,CAAA"}
+{"version":3,"file":"netFilters.d.ts","sourceRoot":"","sources":["../../../src/http/routes/netFilters.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AAGjC,OAAO,KAAK,EAAE,gBAAgB,EAAE,UAAU,EAAY,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AAE9F,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAA;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAG9C,MAAM,MAAM,gBAAgB,GAAG,UAAU,GAAG;IAC3C,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,QAAQ,CAAA;IACf,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;CACpB,CAAA;AAED,KAAK,qBAAqB,GAAG;IAC5B,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAA;CACjC,CAAA;AAED,KAAK,oBAAoB,GAAG;IAC3B,KAAK,CAAC,EAAE,gBAAgB,CAAA;IACxB,KAAK,CAAC,EAAE,MAAM,CAAA;CACd,CAAA;AAgBD,sFAAsF;AACtF,eAAO,MAAM,kBAAkB,GAAI,KAAK,IAAI,CAAC,cAAc,KAAG,IAE7D,CAAA;AAED;;;;;;GAMG;AACH,eAAO,MAAM,eAAe,GAAI,MAAM,SAAS;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,EAAE,EAAE,OAAO,MAAM,KAAG,MAA4C,CAAA;AAE7H;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,GAAI,KAAK,GAAG,EAAE,KAAK,YAAY,EAAE,KAAK,IAAI,CAAC,cAAc,KAAG,gBAAgB,GAAG,IAYhH,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,GAAI,cAAc,eAAe,EAAE,SAAS,qBAAqB,KAAG,oBAiDtG,CAAA;AAED,eAAO,MAAM,sBAAsB,GAAI,SAAS,gBAAgB,EAAE,UAAS;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,KAAG,wBAAwB,CAAC,OAAO,CAmBvI,CAAA"}

package/dist/http/routes/netFilters.js

@@ -1,9 +1,25 @@
+import { NET_PARTIES, NET_SCOPES } from '@vforsh/argus-core';
 import { derivePartyHost, normalizeNetUrlKey } from '../../net/filtering.js';
-import { clampNumber, normalizeQueryValue, respondJson } from '../httpUtils.js';
+import { clampNumber, normalizeQueryValue, optionalNumber, respondApiError } from '../httpUtils.js';
+/**
+ * Read a network query param. The key is checked against {@link NetQuery}, so renaming a param in
+ * the protocol breaks this parser at compile time instead of silently dropping the filter.
+ */
+const netParam = (searchParams, key) => searchParams.get(key);
+/** Repeatable counterpart to {@link netParam}. */
+const netParams = (searchParams, key) => searchParams.getAll(key);
 /** Respond 400 `net_disabled`. Shared precondition failure for all `/net*` routes. */
 export const respondNetDisabled = (res) => {
-    respondJson(res, { ok: false, error: { code: 'net_disabled', message: 'Network capture is disabled for this watcher' } }, 400);
+    respondApiError(res, 400, 'net_disabled', 'Network capture is disabled for this watcher');
 };
+/**
+ * Cursor the client should send as `after` on its next poll.
+ *
+ * The last id in the page, or the cursor it already had when the page is empty — never a value the
+ * client would have to interpret. Every `/net*` listing route paginates this way; keeping the
+ * expression in one place is what stops one of them from quietly resetting a poller to 0.
+ */
+export const nextAfterCursor = (page, after) => page[page.length - 1]?.id ?? after;
 /**
  * Parse network filters from a route URL with the standard after/limit/sinceTs
  * defaults shared by the `/net*` listing routes. Responds 400 `invalid_net_filter`
@@ -11,13 +27,13 @@ export const respondNetDisabled = (res) => {
  */
 export const readNetFiltersFromUrl = (url, ctx, res) => {
     const filters = parseNetRequestFilters(url.searchParams, {
-        after: clampNumber(url.searchParams.get('after'), 0),
-        limit: clampNumber(url.searchParams.get('limit'), 500, 1, 5000),
-        sinceTs: clampNumber(url.searchParams.get('sinceTs'), undefined),
+        after: clampNumber(netParam(url.searchParams, 'after'), 0),
+        limit: clampNumber(netParam(url.searchParams, 'limit'), 500, 1, 5000),
+        sinceTs: optionalNumber(netParam(url.searchParams, 'sinceTs')),
         context: ctx.getNetFilterContext?.() ?? null,
     });
     if (filters.error || !filters.value) {
-        respondJson(res, { ok: false, error: { code: 'invalid_net_filter', message: filters.error ?? 'Invalid network filter' } }, 400);
+        respondApiError(res, 400, 'invalid_net_filter', filters.error ?? 'Invalid network filter');
         return null;
     }
     return filters.value;
@@ -28,23 +44,23 @@ export const readNetFiltersFromUrl = (url, ctx, res) => {
  * to guess whether an iframe is currently selected.
  */
 export const parseNetRequestFilters = (searchParams, options) => {
-    const scope = normalizeScope(searchParams.get('scope'));
+    const scope = normalizeScope(netParam(searchParams, 'scope'));
     if (scope.error) {
         return { error: scope.error };
     }
-    const frame = normalizeFrame(searchParams.get('frame'));
+    const frame = normalizeFrame(netParam(searchParams, 'frame'));
     if (frame.error) {
         return { error: frame.error };
     }
     if (scope.value && frame.value) {
         return { error: 'Cannot combine scope and frame filters. Use one or the other.' };
     }
-    const party = normalizeParty(searchParams.get('party'));
+    const party = normalizeParty(netParam(searchParams, 'party'));
     if (party.error) {
         return { error: party.error };
     }
     const context = options.context ?? null;
-    const resolvedScope = scope.value ?? defaultScope(context);
+    const resolvedScope = scope.value ?? DEFAULT_NET_SCOPE;
     const resolvedFrameId = resolveFrameId({ frame: frame.value ?? null, scope: resolvedScope, context });
     const partyHost = derivePartyHost(resolvePartyReferenceUrl(resolvedScope, context));
     return {
@@ -52,21 +68,21 @@ export const parseNetRequestFilters = (searchParams, options) => {
             after: options.after,
             limit: options.limit,
             sinceTs: options.sinceTs,
-            grep: normalizeQueryValue(searchParams.get('grep')),
-            ignoreHosts: normalizeRepeatedValues(searchParams.getAll('ignoreHost')),
-            ignorePatterns: normalizeRepeatedValues(searchParams.getAll('ignorePattern')),
-            hosts: normalizeRepeatedValues(searchParams.getAll('host')),
-            methods: normalizeRepeatedValues(searchParams.getAll('method')),
-            statuses: normalizeStatusValues(searchParams.getAll('status')),
-            resourceTypes: normalizeRepeatedValues(searchParams.getAll('resourceType')),
-            mimeTypes: normalizeRepeatedValues(searchParams.getAll('mime')),
+            grep: normalizeQueryValue(netParam(searchParams, 'grep')),
+            ignoreHosts: normalizeRepeatedValues(netParams(searchParams, 'ignoreHost')),
+            ignorePatterns: normalizeRepeatedValues(netParams(searchParams, 'ignorePattern')),
+            hosts: normalizeRepeatedValues(netParams(searchParams, 'host')),
+            methods: normalizeRepeatedValues(netParams(searchParams, 'method')),
+            statuses: normalizeStatusValues(netParams(searchParams, 'status')),
+            resourceTypes: normalizeRepeatedValues(netParams(searchParams, 'resourceType')),
+            mimeTypes: normalizeRepeatedValues(netParams(searchParams, 'mime')),
             party: party.value,
             partyHost,
             frameId: resolvedFrameId,
             documentUrlKey: resolveDocumentUrlKey({ frame: frame.value ?? null, scope: resolvedScope, context }),
             failedOnly: hasTruthyFlag(searchParams, 'failedOnly'),
-            minDurationMs: optionalClampNumber(searchParams.get('minDurationMs'), 1),
-            minTransferBytes: optionalClampNumber(searchParams.get('minTransferBytes'), 1),
+            minDurationMs: optionalNumber(netParam(searchParams, 'minDurationMs'), 1),
+            minTransferBytes: optionalNumber(netParam(searchParams, 'minTransferBytes'), 1),
             scope: resolvedScope,
             frame: frame.value ?? null,
         },
@@ -106,7 +122,6 @@ const resolveDocumentUrlKey = (options) => {
             : resolvePartyReferenceUrl(options.scope, options.context);
     return normalizeNetUrlKey(baseUrl);
 };
-const defaultScope = (_context) => 'tab';
 const resolveFrameId = (options) => {
     if (options.frame === 'selected') {
         return options.context?.selectedFrameId ?? options.context?.topFrameId ?? undefined;
@@ -134,21 +149,20 @@ const resolvePartyReferenceUrl = (scope, context) => {
     }
     return context.pageUrl ?? context.selectedTargetUrl;
 };
+/** Scope applied when a request does not specify one. */
+const DEFAULT_NET_SCOPE = 'tab';
 const normalizeScope = (value) => {
-    return normalizeChoice(value, ['selected', 'page', 'tab'], 'scope filter');
+    return normalizeChoice(value, NET_SCOPES, 'scope filter');
 };
 const normalizeFrame = (value) => {
     const normalized = normalizeQueryValue(value);
     if (!normalized) {
         return {};
     }
-    if (normalized === 'selected' || normalized === 'page') {
-        return { value: normalized };
-    }
     return { value: normalized };
 };
 const normalizeParty = (value) => {
-    return normalizeChoice(value, ['first', 'third'], 'party filter');
+    return normalizeChoice(value, NET_PARTIES, 'party filter');
 };
 const normalizeChoice = (value, allowed, label) => {
     const normalized = normalizeQueryValue(value);
@@ -172,12 +186,11 @@ const normalizeStatusValues = (values) => {
     return normalized;
 };
 const hasTruthyFlag = (searchParams, key) => {
-    const value = searchParams.get(key);
+    const value = netParam(searchParams, key);
     if (value == null) {
         return false;
     }
     const normalized = value.trim().toLowerCase();
     return normalized !== '' && normalized !== '0' && normalized !== 'false';
 };
-const optionalClampNumber = (value, min) => value == null ? undefined : clampNumber(value, undefined, min);
 //# sourceMappingURL=netFilters.js.map

package/dist/http/routes/netFilters.js.map

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

package/dist/http/routes/netMock.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"netMock.d.ts","sourceRoot":"","sources":["../../../src/http/routes/netMock.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAA;AAI9D,eAAO,MAAM,aAAa,EAAE,sBAAsB,EAmCjD,CAAA"}
+{"version":3,"file":"netMock.d.ts","sourceRoot":"","sources":["../../../src/http/routes/netMock.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAA;AAI9D,eAAO,MAAM,aAAa,EAAE,sBAAsB,EA2BjD,CAAA"}

package/dist/http/routes/netMock.js

@@ -1,4 +1,4 @@
-import { NET_MOCK_FAIL_REASONS } from '@vforsh/argus-core';
+import { netMockAddRequestSchema, netMockRemoveRequestSchema } from '@vforsh/argus-core';
 import { defineJsonRoute } from './defineRoute.js';
 export const netMockRoutes = [
     defineJsonRoute({
@@ -10,23 +10,15 @@ export const netMockRoutes = [
     defineJsonRoute({
         method: 'POST',
         path: '/net/mock/add',
-        parseBody: true,
+        bodySchema: netMockAddRequestSchema,
         endpoint: 'net/mock/add',
-        validate: validateAddRequest,
         handle: ({ ctx, body }) => ctx.netMockController.addRule(body, ctx.getCdpStatus().attached),
     }),
     defineJsonRoute({
         method: 'POST',
         path: '/net/mock/remove',
-        parseBody: true,
+        bodySchema: netMockRemoveRequestSchema,
         endpoint: 'net/mock/remove',
-        validate: (body) => {
-            const id = body.id;
-            if (!Number.isInteger(id) || id < 1) {
-                return 'id must be an integer >= 1';
-            }
-            return null;
-        },
         handle: ({ ctx, body }) => ctx.netMockController.removeRule(body.id),
     }),
     defineJsonRoute({
@@ -36,109 +28,4 @@ export const netMockRoutes = [
         handle: ({ ctx }) => ctx.netMockController.clearRules(),
     }),
 ];
-/** Validate an add payload. Returns an error message, or null when valid. */
-function validateAddRequest(body) {
-    const payload = body;
-    if (!payload || typeof payload !== 'object') {
-        return 'body must be an object';
-    }
-    const matchIssue = validateMatch(payload.match);
-    if (matchIssue) {
-        return matchIssue;
-    }
-    const actionIssue = validateAction(payload.action, payload.delayMs);
-    if (actionIssue) {
-        return actionIssue;
-    }
-    if (payload.delayMs !== undefined && (typeof payload.delayMs !== 'number' || !Number.isFinite(payload.delayMs) || payload.delayMs < 0)) {
-        return 'delayMs must be a finite number >= 0';
-    }
-    if (payload.times !== undefined && (!Number.isInteger(payload.times) || payload.times < 1)) {
-        return 'times must be an integer >= 1';
-    }
-    if (payload.scope !== undefined && payload.scope !== 'page' && payload.scope !== 'selected') {
-        return 'scope must be one of: page, selected';
-    }
-    return null;
-}
-const validateMatch = (match) => {
-    const value = match;
-    if (!value || typeof value !== 'object') {
-        return 'match must be an object';
-    }
-    if (typeof value.url !== 'string' || value.url.trim() === '') {
-        return 'match.url must be a non-empty string';
-    }
-    if (value.method !== undefined && (typeof value.method !== 'string' || value.method.trim() === '')) {
-        return 'match.method must be a non-empty string';
-    }
-    if (value.resourceType !== undefined && (typeof value.resourceType !== 'string' || value.resourceType.trim() === '')) {
-        return 'match.resourceType must be a non-empty string';
-    }
-    return null;
-};
-const validateAction = (action, delayMs) => {
-    const value = action;
-    if (!value || typeof value !== 'object' || typeof value.kind !== 'string') {
-        return 'action.kind must be one of: block, fail, fulfill, continue';
-    }
-    if (value.kind === 'block') {
-        return null;
-    }
-    if (value.kind === 'fail') {
-        const reason = value.reason;
-        if (typeof reason !== 'string' || !NET_MOCK_FAIL_REASONS.includes(reason)) {
-            return `action.reason must be one of: ${NET_MOCK_FAIL_REASONS.join(', ')}`;
-        }
-        return null;
-    }
-    if (value.kind === 'fulfill') {
-        const fulfill = value;
-        if (!Number.isInteger(fulfill.status) || fulfill.status < 100 || fulfill.status > 599) {
-            return 'action.status must be an integer between 100 and 599';
-        }
-        const headersIssue = validateHeaders(fulfill.headers, 'action.headers');
-        if (headersIssue) {
-            return headersIssue;
-        }
-        if (fulfill.bodyBase64 !== undefined && typeof fulfill.bodyBase64 !== 'string') {
-            return 'action.bodyBase64 must be a string';
-        }
-        return null;
-    }
-    if (value.kind === 'continue') {
-        const cont = value;
-        const headersIssue = validateHeaders(cont.setHeaders, 'action.setHeaders');
-        if (headersIssue) {
-            return headersIssue;
-        }
-        if (cont.rewriteHost !== undefined && (typeof cont.rewriteHost !== 'string' || cont.rewriteHost.trim() === '')) {
-            return 'action.rewriteHost must be a non-empty string';
-        }
-        const hasEffect = (Array.isArray(cont.setHeaders) && cont.setHeaders.length > 0) || cont.rewriteHost !== undefined || delayMs !== undefined;
-        if (!hasEffect) {
-            return 'continue action requires at least one of: setHeaders, rewriteHost, delayMs';
-        }
-        return null;
-    }
-    return 'action.kind must be one of: block, fail, fulfill, continue';
-};
-const validateHeaders = (headers, path) => {
-    if (headers === undefined) {
-        return null;
-    }
-    if (!Array.isArray(headers)) {
-        return `${path} must be an array of { name, value } entries`;
-    }
-    for (const header of headers) {
-        if (!header ||
-            typeof header !== 'object' ||
-            typeof header.name !== 'string' ||
-            header.name.trim() === '' ||
-            typeof header.value !== 'string') {
-            return `${path} entries must have a non-empty string name and a string value`;
-        }
-    }
-    return null;
-};
 //# sourceMappingURL=netMock.js.map

package/dist/http/routes/netMock.js.map

@@ -1 +1 @@
-{"version":3,"file":"netMock.js","sourceRoot":"","sources":["../../../src/http/routes/netMock.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"netMock.js","sourceRoot":"","sources":["../../../src/http/routes/netMock.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,0BAA0B,EAAE,MAAM,oBAAoB,CAAA;AACxF,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAElD,MAAM,CAAC,MAAM,aAAa,GAA6B;IACtD,eAAe,CAAC;QACf,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,WAAW;QACjB,QAAQ,EAAE,UAAU;QACpB,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,GAAG,CAAC,YAAY,EAAE,CAAC,QAAQ,EAAE,CAAC;KAC/F,CAAC;IACF,eAAe,CAAoB;QAClC,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,eAAe;QACrB,UAAU,EAAE,uBAAuB;QACnC,QAAQ,EAAE,cAAc;QACxB,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,iBAAiB,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,YAAY,EAAE,CAAC,QAAQ,CAAC;KAC3F,CAAC;IACF,eAAe,CAAuB;QACrC,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,kBAAkB;QACxB,UAAU,EAAE,0BAA0B;QACtC,QAAQ,EAAE,iBAAiB;QAC3B,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,iBAAiB,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;KACpE,CAAC;IACF,eAAe,CAAC;QACf,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,iBAAiB;QACvB,QAAQ,EAAE,gBAAgB;QAC1B,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,iBAAiB,CAAC,UAAU,EAAE;KACvD,CAAC;CACF,CAAA"}

package/dist/http/routes/netRequestLookup.js

@@ -1,16 +1,16 @@
-import { normalizeQueryValue } from '../httpUtils.js';
+import { normalizeQueryValue, optionalPositiveInt } from '../httpUtils.js';
 /**
  * Parse a network-request selector from query params.
  * Routes accept either an Argus buffer id or a raw CDP request id.
  */
 export const parseNetRequestLookup = (searchParams) => {
-    const id = parsePositiveInt(searchParams.get('id'));
+    const id = optionalPositiveInt(searchParams.get('id'));
     const requestId = normalizeQueryValue(searchParams.get('requestId'));
     if (id == null && !requestId) {
         return null;
     }
     return {
-        id: id ?? undefined,
+        id,
         requestId,
     };
 };
@@ -26,14 +26,4 @@ export const resolveNetRequestLookupRecord = (buffer, lookup) => {
     }
     return null;
 };
-const parsePositiveInt = (value) => {
-    if (!value) {
-        return null;
-    }
-    const parsed = Number(value);
-    if (!Number.isSafeInteger(parsed) || parsed < 1) {
-        return null;
-    }
-    return parsed;
-};
 //# sourceMappingURL=netRequestLookup.js.map

package/dist/http/routes/netRequestLookup.js.map

@@ -1 +1 @@
-{"version":3,"file":"netRequestLookup.js","sourceRoot":"","sources":["../../../src/http/routes/netRequestLookup.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AAOrD;;;GAGG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,YAA6B,EAA2B,EAAE;IAC/F,MAAM,EAAE,GAAG,gBAAgB,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAA;IACnD,MAAM,SAAS,GAAG,mBAAmB,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAA;IACpE,IAAI,EAAE,IAAI,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;QAC9B,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,OAAO;QACN,EAAE,EAAE,EAAE,IAAI,SAAS;QACnB,SAAS;KACT,CAAA;AACF,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,MAAiB,EAAE,MAAwB,EAA+B,EAAE;IACnH,OAAO,6BAA6B,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,IAAI,IAAI,CAAA;AACrE,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,MAAiB,EAAE,MAAwB,EAA0B,EAAE;IACpH,IAAI,MAAM,CAAC,EAAE,IAAI,IAAI,EAAE,CAAC;QACvB,OAAO,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IACvC,CAAC;IAED,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;QACtB,OAAO,MAAM,CAAC,oBAAoB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;IACrD,CAAC;IAED,OAAO,IAAI,CAAA;AACZ,CAAC,CAAA;AAED,MAAM,gBAAgB,GAAG,CAAC,KAAoB,EAAiB,EAAE;IAChE,IAAI,CAAC,KAAK,EAAE,CAAC;QACZ,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;IAC5B,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,MAAM,GAAG,CAAC,EAAE,CAAC;QACjD,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,OAAO,MAAM,CAAA;AACd,CAAC,CAAA"}
+{"version":3,"file":"netRequestLookup.js","sourceRoot":"","sources":["../../../src/http/routes/netRequestLookup.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AAO1E;;;GAGG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,YAA6B,EAA2B,EAAE;IAC/F,MAAM,EAAE,GAAG,mBAAmB,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAA;IACtD,MAAM,SAAS,GAAG,mBAAmB,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAA;IACpE,IAAI,EAAE,IAAI,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;QAC9B,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,OAAO;QACN,EAAE;QACF,SAAS;KACT,CAAA;AACF,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,MAAiB,EAAE,MAAwB,EAA+B,EAAE;IACnH,OAAO,6BAA6B,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,IAAI,IAAI,CAAA;AACrE,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,MAAiB,EAAE,MAAwB,EAA0B,EAAE;IACpH,IAAI,MAAM,CAAC,EAAE,IAAI,IAAI,EAAE,CAAC;QACvB,OAAO,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IACvC,CAAC;IAED,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;QACtB,OAAO,MAAM,CAAC,oBAAoB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;IACrD,CAAC;IAED,OAAO,IAAI,CAAA;AACZ,CAAC,CAAA"}

package/dist/http/routes/postAttach.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"postAttach.d.ts","sourceRoot":"","sources":["../../../src/http/routes/postAttach.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,KAAK,mDA0BhB,CAAA"}
+{"version":3,"file":"postAttach.d.ts","sourceRoot":"","sources":["../../../src/http/routes/postAttach.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,KAAK,mDAShB,CAAA"}