@vforsh/argus-watcher 0.3.1 → 0.4.0

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

@@ -0,0 +1,11 @@
+/**
+ * Coerce an attach/detach payload to the target id the source handle expects.
+ *
+ * Both requests accept either an explicit `targetId` or a numeric `tabId`; the source handle takes
+ * one string either way.
+ */
+export declare const resolveExtensionTargetId: (payload: {
+    targetId?: string;
+    tabId?: number;
+}) => string;
+//# sourceMappingURL=extensionTarget.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"extensionTarget.d.ts","sourceRoot":"","sources":["../../../src/http/routes/extensionTarget.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,eAAO,MAAM,wBAAwB,GAAI,SAAS;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,KAAG,MAAmD,CAAA"}

package/dist/http/routes/extensionTarget.js

@@ -0,0 +1,8 @@
+/**
+ * Coerce an attach/detach payload to the target id the source handle expects.
+ *
+ * Both requests accept either an explicit `targetId` or a numeric `tabId`; the source handle takes
+ * one string either way.
+ */
+export const resolveExtensionTargetId = (payload) => payload.targetId ?? String(payload.tabId);
+//# sourceMappingURL=extensionTarget.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"extensionTarget.js","sourceRoot":"","sources":["../../../src/http/routes/extensionTarget.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,OAA8C,EAAU,EAAE,CAAC,OAAO,CAAC,QAAQ,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA"}

package/dist/http/routes/getAuthCookies.js

@@ -1,4 +1,4 @@
-import { inspectAuthCookies } from '../../cdp/auth.js';
+import { inspectAuthCookies } from '../../cdp/authCookies.js';
 import { defineJsonRoute } from './defineRoute.js';
 import { normalizeQueryValue } from '../httpUtils.js';
 import { emitRequest } from './types.js';

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

@@ -1 +1 @@
-{"version":3,"file":"getAuthCookies.js","sourceRoot":"","sources":["../../../src/http/routes/getAuthCookies.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC,MAAM,CAAC,MAAM,KAAK,GAAG,eAAe,CAAiC;IACpE,MAAM,EAAE,KAAK;IACb,IAAI,EAAE,eAAe;IACrB,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE;QAC7B,MAAM,MAAM,GAAG,mBAAmB,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAA;QAClE,MAAM,aAAa,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,eAAe,CAAC,KAAK,MAAM,CAAA;QAEtE,mEAAmE;QACnE,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,cAAc,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAA;QAEhE,OAAO,kBAAkB,CAAC,GAAG,CAAC,UAAU,EAAE;YACzC,MAAM,EAAE,MAAM,IAAI,SAAS;YAC3B,aAAa;SACb,CAAC,CAAA;IACH,CAAC;CACD,CAAC,CAAA"}
+{"version":3,"file":"getAuthCookies.js","sourceRoot":"","sources":["../../../src/http/routes/getAuthCookies.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC,MAAM,CAAC,MAAM,KAAK,GAAG,eAAe,CAAiC;IACpE,MAAM,EAAE,KAAK;IACb,IAAI,EAAE,eAAe;IACrB,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE;QAC7B,MAAM,MAAM,GAAG,mBAAmB,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAA;QAClE,MAAM,aAAa,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,eAAe,CAAC,KAAK,MAAM,CAAA;QAEtE,mEAAmE;QACnE,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,cAAc,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAA;QAEhE,OAAO,kBAAkB,CAAC,GAAG,CAAC,UAAU,EAAE;YACzC,MAAM,EAAE,MAAM,IAAI,SAAS;YAC3B,aAAa;SACb,CAAC,CAAA;IACH,CAAC;CACD,CAAC,CAAA"}

package/dist/http/routes/getAuthState.js

@@ -1,4 +1,4 @@
-import { inspectAuthState } from '../../cdp/auth.js';
+import { inspectAuthState } from '../../cdp/authSnapshot.js';
 import { defineJsonRoute } from './defineRoute.js';
 import { normalizeQueryValue } from '../httpUtils.js';
 import { emitRequest } from './types.js';

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

@@ -1 +1 @@
-{"version":3,"file":"getAuthState.js","sourceRoot":"","sources":["../../../src/http/routes/getAuthState.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC,MAAM,CAAC,MAAM,KAAK,GAAG,eAAe,CAA+B;IAClE,MAAM,EAAE,KAAK;IACb,IAAI,EAAE,aAAa;IACnB,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE;QAC7B,MAAM,MAAM,GAAG,mBAAmB,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAA;QAElE,mEAAmE;QACnE,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;QAE/C,MAAM,OAAO,GAAG,GAAG,CAAC,UAAU,EAAE,CAAA;QAChC,OAAO,gBAAgB,CAAC,GAAG,CAAC,UAAU,EAAE;YACvC,MAAM,EAAE,MAAM,IAAI,SAAS;YAC3B,kBAAkB,EAAE,GAAG,CAAC,kBAAkB;YAC1C,QAAQ,EAAE;gBACT,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;gBACpC,SAAS,EAAE,OAAO,CAAC,EAAE;gBACrB,aAAa,EAAE,OAAO,CAAC,MAAM,IAAI,IAAI;aACrC;SACD,CAAC,CAAA;IACH,CAAC;CACD,CAAC,CAAA"}
+{"version":3,"file":"getAuthState.js","sourceRoot":"","sources":["../../../src/http/routes/getAuthState.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAA;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC,MAAM,CAAC,MAAM,KAAK,GAAG,eAAe,CAA+B;IAClE,MAAM,EAAE,KAAK;IACb,IAAI,EAAE,aAAa;IACnB,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE;QAC7B,MAAM,MAAM,GAAG,mBAAmB,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAA;QAElE,mEAAmE;QACnE,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;QAE/C,MAAM,OAAO,GAAG,GAAG,CAAC,UAAU,EAAE,CAAA;QAChC,OAAO,gBAAgB,CAAC,GAAG,CAAC,UAAU,EAAE;YACvC,MAAM,EAAE,MAAM,IAAI,SAAS;YAC3B,kBAAkB,EAAE,GAAG,CAAC,kBAAkB;YAC1C,QAAQ,EAAE;gBACT,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;gBACpC,SAAS,EAAE,OAAO,CAAC,EAAE;gBACrB,aAAa,EAAE,OAAO,CAAC,MAAM,IAAI,IAAI;aACrC;SACD,CAAC,CAAA;IACH,CAAC;CACD,CAAC,CAAA"}

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

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

package/dist/http/routes/getExtensionDiagnostics.js

@@ -1,16 +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: '/extension/diagnostics',
-    extensionOnly: true,
-    handle: async ({ res, ctx }) => {
-        if (!ctx.sourceHandle?.getExtensionDiagnostics) {
-            return respondJson(res, { ok: false, error: { message: 'Not available', code: 'not_available' } }, 400);
-        }
+    capability: 'getExtensionDiagnostics',
+    handle: async ({ res, ctx, capability }) => {
         emitRequest(ctx, res, 'extension/diagnostics');
-        return await ctx.sourceHandle.getExtensionDiagnostics();
+        return await capability();
     },
 });
 //# sourceMappingURL=getExtensionDiagnostics.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"getExtensionDiagnostics.js","sourceRoot":"","sources":["../../../src/http/routes/getExtensionDiagnostics.ts"],"names":[],"mappings":"AACA,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,CAA0C;IAC7E,MAAM,EAAE,KAAK;IACb,IAAI,EAAE,wBAAwB;IAC9B,aAAa,EAAE,IAAI;IACnB,MAAM,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE;QAC9B,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,uBAAuB,EAAE,CAAC;YAChD,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,uBAAuB,CAAC,CAAA;QAC9C,OAAO,MAAM,GAAG,CAAC,YAAY,CAAC,uBAAuB,EAAE,CAAA;IACxD,CAAC;CACD,CAAC,CAAA"}
+{"version":3,"file":"getExtensionDiagnostics.js","sourceRoot":"","sources":["../../../src/http/routes/getExtensionDiagnostics.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,CAAqE;IAC7G,MAAM,EAAE,KAAK;IACb,IAAI,EAAE,wBAAwB;IAC9B,UAAU,EAAE,yBAAyB;IACrC,MAAM,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,EAAE;QAC1C,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,uBAAuB,CAAC,CAAA;QAC9C,OAAO,MAAM,UAAU,EAAE,CAAA;IAC1B,CAAC;CACD,CAAC,CAAA"}

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

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

package/dist/http/routes/getExtensionTabs.js

@@ -1,24 +1,18 @@
-import { defineJsonRoute } from './defineRoute.js';
-import { normalizeQueryValue, respondJson } from '../httpUtils.js';
+import { normalizeQueryValue } from '@vforsh/argus-core';
+import { defineExtensionRoute } from './defineExtensionRoute.js';
 import { emitRequest } from './types.js';
-export const route = defineJsonRoute({
+export const route = defineExtensionRoute({
     method: 'GET',
     path: '/tabs',
-    extensionOnly: true,
-    handle: async ({ res, url, ctx }) => {
-        if (!ctx.sourceHandle?.listTabs) {
-            return respondJson(res, { ok: false, error: { message: 'Not available', code: 'not_available' } }, 400);
-        }
-        // Emitted manually to include query metadata in the request event.
-        emitRequest(ctx, res, 'tabs', {
-            url: url.searchParams.get('url') ?? undefined,
-            title: url.searchParams.get('title') ?? undefined,
-        });
-        const tabs = await ctx.sourceHandle.listTabs({
+    capability: 'listTabs',
+    handle: async ({ res, url, ctx, capability }) => {
+        const filter = {
             url: normalizeQueryValue(url.searchParams.get('url')),
             title: normalizeQueryValue(url.searchParams.get('title')),
-        });
-        return { ok: true, tabs };
+        };
+        // Emitted manually to include query metadata in the request event.
+        emitRequest(ctx, res, 'tabs', filter);
+        return { ok: true, tabs: await capability(filter) };
     },
 });
 //# sourceMappingURL=getExtensionTabs.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"getExtensionTabs.js","sourceRoot":"","sources":["../../../src/http/routes/getExtensionTabs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC,MAAM,CAAC,MAAM,KAAK,GAAG,eAAe,CAAmC;IACtE,MAAM,EAAE,KAAK;IACb,IAAI,EAAE,OAAO;IACb,aAAa,EAAE,IAAI;IACnB,MAAM,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE;QACnC,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,QAAQ,EAAE,CAAC;YACjC,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,mEAAmE;QACnE,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE;YAC7B,GAAG,EAAE,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,SAAS;YAC7C,KAAK,EAAE,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,SAAS;SACjD,CAAC,CAAA;QAEF,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC;YAC5C,GAAG,EAAE,mBAAmB,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACrD,KAAK,EAAE,mBAAmB,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;SACzD,CAAC,CAAA;QACF,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAA;IAC1B,CAAC;CACD,CAAC,CAAA"}
+{"version":3,"file":"getExtensionTabs.js","sourceRoot":"","sources":["../../../src/http/routes/getExtensionTabs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC,MAAM,CAAC,MAAM,KAAK,GAAG,oBAAoB,CAA+C;IACvF,MAAM,EAAE,KAAK;IACb,IAAI,EAAE,OAAO;IACb,UAAU,EAAE,UAAU;IACtB,MAAM,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,EAAE;QAC/C,MAAM,MAAM,GAAG;YACd,GAAG,EAAE,mBAAmB,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACrD,KAAK,EAAE,mBAAmB,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;SACzD,CAAA;QAED,mEAAmE;QACnE,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;QAErC,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC,MAAM,CAAC,EAAE,CAAA;IACpD,CAAC;CACD,CAAC,CAAA"}

package/dist/http/routes/getLogCursor.js

@@ -2,6 +2,6 @@ import { defineJsonRoute } from './defineRoute.js';
 export const route = defineJsonRoute({
     method: 'GET',
     path: '/logs/cursor',
-    handle: ({ ctx }) => ({ ok: true, cursor: ctx.buffer.getCursor() }),
+    handle: ({ ctx }) => ({ ok: true, cursor: ctx.buffer.beginLogEpoch() }),
 });
 //# sourceMappingURL=getLogCursor.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"getLogCursor.js","sourceRoot":"","sources":["../../../src/http/routes/getLogCursor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAElD,MAAM,CAAC,MAAM,KAAK,GAAG,eAAe,CAA+B;IAClE,MAAM,EAAE,KAAK;IACb,IAAI,EAAE,cAAc;IACpB,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,CAAC;CACnE,CAAC,CAAA"}
+{"version":3,"file":"getLogCursor.js","sourceRoot":"","sources":["../../../src/http/routes/getLogCursor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAElD,MAAM,CAAC,MAAM,KAAK,GAAG,eAAe,CAA+B;IAClE,MAAM,EAAE,KAAK;IACb,IAAI,EAAE,cAAc;IACpB,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,aAAa,EAAE,EAAE,CAAC;CACvE,CAAC,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"getLogs.d.ts","sourceRoot":"","sources":["../../../src/http/routes/getLogs.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,KAAK,mDAiDhB,CAAA"}
+{"version":3,"file":"getLogs.d.ts","sourceRoot":"","sources":["../../../src/http/routes/getLogs.ts"],"names":[],"mappings":"AAiBA,eAAO,MAAM,KAAK,mDAiDhB,CAAA"}

package/dist/http/routes/getLogs.js

@@ -1,8 +1,8 @@
 import { LogEpochError } from '../../buffer/LogBuffer.js';
 import { defineJsonRoute } from './defineRoute.js';
 import { emitRequest } from './types.js';
-import { respondInvalidMatch, respondInvalidMatchCase, clampNumber, parseLevels, resolveMatchCase, normalizeMatchPatterns, compileMatchPatterns, normalizeQueryValue, } from '../httpUtils.js';
-import { listLogsFromPosition, parseLogPosition, respondLogEpochError } from './logEpochQuery.js';
+import { respondInvalidMatch, respondInvalidMatchCase, clampNumber, optionalNumber, parseLevels, resolveMatchCase, normalizeMatchPatterns, compileMatchPatterns, normalizeQueryValue, } from '../httpUtils.js';
+import { listLogsFromPosition, logParam, logParams, parseLogPosition, respondLogEpochError } from './logEpochQuery.js';
 export const route = defineJsonRoute({
     method: 'GET',
     path: '/logs',
@@ -11,15 +11,15 @@ export const route = defineJsonRoute({
         if ('error' in position) {
             return respondLogEpochError(res, new LogEpochError('invalid', position.error));
         }
-        const limit = clampNumber(url.searchParams.get('limit'), 500, 1, 5000);
-        const levels = parseLevels(url.searchParams.get('levels'));
-        const match = url.searchParams.getAll('match');
-        const matchCase = resolveMatchCase(url.searchParams.get('matchCase'));
+        const limit = clampNumber(logParam(url, 'limit'), 500, 1, 5000);
+        const levels = parseLevels(logParam(url, 'levels'));
+        const match = logParams(url, 'match');
+        const matchCase = resolveMatchCase(logParam(url, 'matchCase'));
         if (!matchCase) {
             return respondInvalidMatchCase(res);
         }
-        const source = normalizeQueryValue(url.searchParams.get('source'));
-        const sinceTs = clampNumber(url.searchParams.get('sinceTs'), undefined);
+        const source = normalizeQueryValue(logParam(url, 'source'));
+        const sinceTs = optionalNumber(logParam(url, 'sinceTs'));
         const matchPatterns = normalizeMatchPatterns(match);
         if (matchPatterns.error) {
             return respondInvalidMatch(res, matchPatterns.error);

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

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

package/dist/http/routes/getNet.js

@@ -1,6 +1,6 @@
 import { defineJsonRoute } from './defineRoute.js';
 import { emitRequest } from './types.js';
-import { readNetFiltersFromUrl, respondNetDisabled, toNetRequestEventQuery } from './netFilters.js';
+import { nextAfterCursor, readNetFiltersFromUrl, respondNetDisabled, toNetRequestEventQuery } from './netFilters.js';
 export const route = defineJsonRoute({
     method: 'GET',
     path: '/net',
@@ -14,7 +14,7 @@ export const route = defineJsonRoute({
         }
         emitRequest(ctx, res, 'net', toNetRequestEventQuery(filters));
         const requests = ctx.netBuffer.listAfter(filters.after, filters, filters.limit);
-        const nextAfter = requests.length > 0 ? (requests[requests.length - 1]?.id ?? filters.after) : filters.after;
+        const nextAfter = nextAfterCursor(requests, filters.after);
         return { ok: true, requests, nextAfter };
     },
 });

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

@@ -1 +1 @@
-{"version":3,"file":"getNet.js","sourceRoot":"","sources":["../../../src/http/routes/getNet.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAA;AAEnG,MAAM,CAAC,MAAM,KAAK,GAAG,eAAe,CAAyB;IAC5D,MAAM,EAAE,KAAK;IACb,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE;QAC7B,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO,kBAAkB,CAAC,GAAG,CAAC,CAAA;QAC/B,CAAC;QAED,MAAM,OAAO,GAAG,qBAAqB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;QACpD,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,OAAM;QACP,CAAC;QAED,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,sBAAsB,CAAC,OAAO,CAAC,CAAC,CAAA;QAE7D,MAAM,QAAQ,GAAG,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;QAC/E,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,EAAE,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAA;QAC5G,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAA;IACzC,CAAC;CACD,CAAC,CAAA"}
+{"version":3,"file":"getNet.js","sourceRoot":"","sources":["../../../src/http/routes/getNet.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAA;AAEpH,MAAM,CAAC,MAAM,KAAK,GAAG,eAAe,CAAyB;IAC5D,MAAM,EAAE,KAAK;IACb,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE;QAC7B,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO,kBAAkB,CAAC,GAAG,CAAC,CAAA;QAC/B,CAAC;QAED,MAAM,OAAO,GAAG,qBAAqB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;QACpD,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,OAAM;QACP,CAAC;QAED,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,sBAAsB,CAAC,OAAO,CAAC,CAAC,CAAA;QAE7D,MAAM,QAAQ,GAAG,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;QAC/E,MAAM,SAAS,GAAG,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;QAC1D,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAA;IACzC,CAAC;CACD,CAAC,CAAA"}

package/dist/http/routes/getNetRequest.js

@@ -2,7 +2,7 @@ import { defineJsonRoute } from './defineRoute.js';
 import { emitRequest } from './types.js';
 import { respondNetDisabled } from './netFilters.js';
 import { parseNetRequestLookup, resolveNetRequestLookup } from './netRequestLookup.js';
-import { respondJson } from '../httpUtils.js';
+import { respondApiError } from '../httpUtils.js';
 export const route = defineJsonRoute({
     method: 'GET',
     path: '/net/request',
@@ -12,12 +12,12 @@ export const route = defineJsonRoute({
         }
         const lookup = parseNetRequestLookup(url.searchParams);
         if (!lookup) {
-            return respondJson(res, { ok: false, error: { code: 'invalid_request', message: 'Either id or requestId is required' } }, 400);
+            return respondApiError(res, 400, 'invalid_request', 'Either id or requestId is required');
         }
         emitRequest(ctx, res, 'net/request', { id: lookup.id, requestId: lookup.requestId });
         const request = resolveNetRequestLookup(ctx.netBuffer, lookup);
         if (!request) {
-            return respondJson(res, { ok: false, error: { code: 'not_found', message: 'Network request not found' } }, 404);
+            return respondApiError(res, 404, 'not_found', 'Network request not found');
         }
         return { ok: true, request };
     },

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

@@ -1 +1 @@
-{"version":3,"file":"getNetRequest.js","sourceRoot":"","sources":["../../../src/http/routes/getNetRequest.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AACpD,OAAO,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AACtF,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAE7C,MAAM,CAAC,MAAM,KAAK,GAAG,eAAe,CAAgC;IACnE,MAAM,EAAE,KAAK;IACb,IAAI,EAAE,cAAc;IACpB,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE;QAC7B,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO,kBAAkB,CAAC,GAAG,CAAC,CAAA;QAC/B,CAAC;QAED,MAAM,MAAM,GAAG,qBAAqB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;QACtD,IAAI,CAAC,MAAM,EAAE,CAAC;YACb,OAAO,WAAW,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,oCAAoC,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;QAC/H,CAAC;QAED,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,aAAa,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC,CAAA;QAEpF,MAAM,OAAO,GAAG,uBAAuB,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;QAC9D,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,OAAO,WAAW,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,2BAA2B,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;QAChH,CAAC;QAED,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAA;IAC7B,CAAC;CACD,CAAC,CAAA"}
+{"version":3,"file":"getNetRequest.js","sourceRoot":"","sources":["../../../src/http/routes/getNetRequest.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AACpD,OAAO,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AACtF,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEjD,MAAM,CAAC,MAAM,KAAK,GAAG,eAAe,CAAgC;IACnE,MAAM,EAAE,KAAK;IACb,IAAI,EAAE,cAAc;IACpB,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE;QAC7B,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO,kBAAkB,CAAC,GAAG,CAAC,CAAA;QAC/B,CAAC;QAED,MAAM,MAAM,GAAG,qBAAqB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;QACtD,IAAI,CAAC,MAAM,EAAE,CAAC;YACb,OAAO,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,iBAAiB,EAAE,oCAAoC,CAAC,CAAA;QAC1F,CAAC;QAED,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,aAAa,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC,CAAA;QAEpF,MAAM,OAAO,GAAG,uBAAuB,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;QAC9D,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,OAAO,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,WAAW,EAAE,2BAA2B,CAAC,CAAA;QAC3E,CAAC;QAED,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAA;IAC7B,CAAC;CACD,CAAC,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"getNetRequestBody.d.ts","sourceRoot":"","sources":["../../../src/http/routes/getNetRequestBody.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,KAAK,mDA4DhB,CAAA"}
+{"version":3,"file":"getNetRequestBody.d.ts","sourceRoot":"","sources":["../../../src/http/routes/getNetRequestBody.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,KAAK,mDAwDhB,CAAA"}

package/dist/http/routes/getNetRequestBody.js

@@ -1,9 +1,10 @@
+import { hasErrorCode } from '../../errors.js';
 import { defineJsonRoute } from './defineRoute.js';
 import { emitRequest } from './types.js';
 import { normalizeNetBodyError, readNetworkBody } from '../../cdp/networkBody.js';
 import { respondNetDisabled } from './netFilters.js';
 import { parseNetRequestLookup, resolveNetRequestLookupRecord } from './netRequestLookup.js';
-import { respondJson } from '../httpUtils.js';
+import { respondApiError } from '../httpUtils.js';
 export const route = defineJsonRoute({
     method: 'GET',
     path: '/net/request/body',
@@ -13,20 +14,20 @@ export const route = defineJsonRoute({
         }
         const lookup = parseNetRequestLookup(url.searchParams);
         if (!lookup) {
-            return respondJson(res, { ok: false, error: { code: 'invalid_request', message: 'Either id or requestId is required' } }, 400);
+            return respondApiError(res, 400, 'invalid_request', 'Either id or requestId is required');
         }
         const part = parseBodyPart(url.searchParams.get('part'));
         if (!part) {
-            return respondJson(res, { ok: false, error: { code: 'invalid_request', message: 'part must be "request" or "response"' } }, 400);
+            return respondApiError(res, 400, 'invalid_request', 'part must be "request" or "response"');
         }
         emitRequest(ctx, res, 'net/request/body', { id: lookup.id, requestId: lookup.requestId, part });
         const record = resolveNetRequestLookupRecord(ctx.netBuffer, lookup);
         if (!record) {
-            return respondJson(res, { ok: false, error: { code: 'not_found', message: 'Network request not found' } }, 404);
+            return respondApiError(res, 404, 'not_found', 'Network request not found');
         }
         const { detail: request, bodySessionId } = record;
         if (!request.body[part]) {
-            return respondJson(res, { ok: false, error: { code: 'body_not_available', message: `${capitalizePart(part)} body not available for this request` } }, 404);
+            return respondApiError(res, 404, 'body_not_available', `${capitalizePart(part)} body not available for this request`);
         }
         try {
             const body = await readNetworkBody({
@@ -48,8 +49,8 @@ export const route = defineJsonRoute({
         catch (error) {
             // normalizeNetBodyError maps CDP failures onto stable codes; body_not_available stays a 404.
             const normalizedError = normalizeNetBodyError(error, part);
-            if (normalizedError.code === 'body_not_available') {
-                return respondJson(res, { ok: false, error: { code: 'body_not_available', message: normalizedError.message } }, 404);
+            if (hasErrorCode(normalizedError, 'body_not_available')) {
+                return respondApiError(res, 404, 'body_not_available', normalizedError.message);
             }
             throw normalizedError;
         }

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

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

package/dist/http/routes/getNetRequests.js

@@ -1,6 +1,6 @@
 import { defineJsonRoute } from './defineRoute.js';
 import { emitRequest } from './types.js';
-import { readNetFiltersFromUrl, respondNetDisabled, toNetRequestEventQuery } from './netFilters.js';
+import { nextAfterCursor, readNetFiltersFromUrl, respondNetDisabled, toNetRequestEventQuery } from './netFilters.js';
 export const route = defineJsonRoute({
     method: 'GET',
     path: '/net/requests',
@@ -14,7 +14,7 @@ export const route = defineJsonRoute({
         }
         emitRequest(ctx, res, 'net/requests', toNetRequestEventQuery(filters));
         const requests = ctx.netBuffer.listDetailsAfter(filters.after, filters, filters.limit);
-        const nextAfter = requests.length > 0 ? (requests[requests.length - 1]?.id ?? filters.after) : filters.after;
+        const nextAfter = nextAfterCursor(requests, filters.after);
         return { ok: true, requests, nextAfter };
     },
 });

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

@@ -1 +1 @@
-{"version":3,"file":"getNetRequests.js","sourceRoot":"","sources":["../../../src/http/routes/getNetRequests.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAA;AAEnG,MAAM,CAAC,MAAM,KAAK,GAAG,eAAe,CAAiC;IACpE,MAAM,EAAE,KAAK;IACb,IAAI,EAAE,eAAe;IACrB,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE;QAC7B,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO,kBAAkB,CAAC,GAAG,CAAC,CAAA;QAC/B,CAAC;QAED,MAAM,OAAO,GAAG,qBAAqB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;QACpD,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,OAAM;QACP,CAAC;QAED,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,cAAc,EAAE,sBAAsB,CAAC,OAAO,CAAC,CAAC,CAAA;QAEtE,MAAM,QAAQ,GAAG,GAAG,CAAC,SAAS,CAAC,gBAAgB,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;QACtF,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,EAAE,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAA;QAC5G,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAA;IACzC,CAAC;CACD,CAAC,CAAA"}
+{"version":3,"file":"getNetRequests.js","sourceRoot":"","sources":["../../../src/http/routes/getNetRequests.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAA;AAEpH,MAAM,CAAC,MAAM,KAAK,GAAG,eAAe,CAAiC;IACpE,MAAM,EAAE,KAAK;IACb,IAAI,EAAE,eAAe;IACrB,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE;QAC7B,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO,kBAAkB,CAAC,GAAG,CAAC,CAAA;QAC/B,CAAC;QAED,MAAM,OAAO,GAAG,qBAAqB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;QACpD,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,OAAM;QACP,CAAC;QAED,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,cAAc,EAAE,sBAAsB,CAAC,OAAO,CAAC,CAAC,CAAA;QAEtE,MAAM,QAAQ,GAAG,GAAG,CAAC,SAAS,CAAC,gBAAgB,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;QACtF,MAAM,SAAS,GAAG,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;QAC1D,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAA;IACzC,CAAC;CACD,CAAC,CAAA"}

package/dist/http/routes/getNetSse.js

@@ -1,6 +1,6 @@
 import { defineJsonRoute } from './defineRoute.js';
 import { emitRequest } from './types.js';
-import { readNetFiltersFromUrl, respondNetDisabled, toNetRequestEventQuery } from './netFilters.js';
+import { nextAfterCursor, readNetFiltersFromUrl, respondNetDisabled, toNetRequestEventQuery } from './netFilters.js';
 export const route = defineJsonRoute({
     method: 'GET',
     path: '/net/sse',
@@ -14,7 +14,7 @@ export const route = defineJsonRoute({
         }
         emitRequest(ctx, res, 'net/sse', toNetRequestEventQuery(filters));
         const streams = ctx.realtimeNetBuffer.listSseAfter(filters.after, filters, filters.limit);
-        const nextAfter = streams.length > 0 ? (streams[streams.length - 1]?.id ?? filters.after) : filters.after;
+        const nextAfter = nextAfterCursor(streams, filters.after);
         return { ok: true, streams, nextAfter };
     },
 });

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

@@ -1 +1 @@
-{"version":3,"file":"getNetSse.js","sourceRoot":"","sources":["../../../src/http/routes/getNetSse.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAA;AAEnG,MAAM,CAAC,MAAM,KAAK,GAAG,eAAe,CAA4B;IAC/D,MAAM,EAAE,KAAK;IACb,IAAI,EAAE,UAAU;IAChB,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE;QAC7B,IAAI,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC;YAC5B,OAAO,kBAAkB,CAAC,GAAG,CAAC,CAAA;QAC/B,CAAC;QAED,MAAM,OAAO,GAAG,qBAAqB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;QACpD,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,OAAM;QACP,CAAC;QAED,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,sBAAsB,CAAC,OAAO,CAAC,CAAC,CAAA;QAEjE,MAAM,OAAO,GAAG,GAAG,CAAC,iBAAiB,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;QACzF,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,EAAE,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAA;QACzG,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,CAAA;IACxC,CAAC;CACD,CAAC,CAAA"}
+{"version":3,"file":"getNetSse.js","sourceRoot":"","sources":["../../../src/http/routes/getNetSse.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAA;AAEpH,MAAM,CAAC,MAAM,KAAK,GAAG,eAAe,CAA4B;IAC/D,MAAM,EAAE,KAAK;IACb,IAAI,EAAE,UAAU;IAChB,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE;QAC7B,IAAI,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC;YAC5B,OAAO,kBAAkB,CAAC,GAAG,CAAC,CAAA;QAC/B,CAAC;QAED,MAAM,OAAO,GAAG,qBAAqB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;QACpD,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,OAAM;QACP,CAAC;QAED,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,sBAAsB,CAAC,OAAO,CAAC,CAAC,CAAA;QAEjE,MAAM,OAAO,GAAG,GAAG,CAAC,iBAAiB,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;QACzF,MAAM,SAAS,GAAG,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;QACzD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,CAAA;IACxC,CAAC;CACD,CAAC,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"getNetTail.d.ts","sourceRoot":"","sources":["../../../src/http/routes/getNetTail.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,KAAK,mDAoBhB,CAAA"}
+{"version":3,"file":"getNetTail.d.ts","sourceRoot":"","sources":["../../../src/http/routes/getNetTail.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,KAAK,mDAoBhB,CAAA"}

package/dist/http/routes/getNetTail.js

@@ -1,7 +1,8 @@
 import { defineJsonRoute } from './defineRoute.js';
 import { emitRequest } from './types.js';
-import { readNetFiltersFromUrl, respondNetDisabled, toNetRequestEventQuery } from './netFilters.js';
+import { nextAfterCursor, readNetFiltersFromUrl, respondNetDisabled, toNetRequestEventQuery } from './netFilters.js';
 import { clampNumber } from '../httpUtils.js';
+import { delay } from '@vforsh/argus-core';
 export const route = defineJsonRoute({
     method: 'GET',
     path: '/net/tail',
@@ -16,7 +17,7 @@ export const route = defineJsonRoute({
         const timeoutMs = clampNumber(url.searchParams.get('timeoutMs'), 25_000, 1000, 120_000);
         emitRequest(ctx, res, 'net/tail', toNetRequestEventQuery(filters, { timeoutMs }));
         const requests = await pollNetBuffer(ctx.netBuffer, filters.after, filters, filters.limit, timeoutMs);
-        const nextAfter = requests.length > 0 ? (requests[requests.length - 1]?.id ?? filters.after) : filters.after;
+        const nextAfter = nextAfterCursor(requests, filters.after);
         return { ok: true, requests, nextAfter, timedOut: requests.length === 0 };
     },
 });
@@ -40,5 +41,4 @@ const pollNetBuffer = async (buffer, after, filters, limit, timeoutMs) => {
         await delay(Math.min(NET_TAIL_POLL_INTERVAL_MS, remainingMs));
     }
 };
-const delay = (timeoutMs) => new Promise((resolve) => setTimeout(resolve, timeoutMs));
 //# sourceMappingURL=getNetTail.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"getNetTail.js","sourceRoot":"","sources":["../../../src/http/routes/getNetTail.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAA;AACnG,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAE7C,MAAM,CAAC,MAAM,KAAK,GAAG,eAAe,CAA6B;IAChE,MAAM,EAAE,KAAK;IACb,IAAI,EAAE,WAAW;IACjB,MAAM,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE;QACnC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO,kBAAkB,CAAC,GAAG,CAAC,CAAA;QAC/B,CAAC;QAED,MAAM,OAAO,GAAG,qBAAqB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;QACpD,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,OAAM;QACP,CAAC;QAED,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;QACvF,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,UAAU,EAAE,sBAAsB,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,CAAA;QAEjF,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;QACrG,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,EAAE,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAA;QAC5G,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAA;IAC1E,CAAC;CACD,CAAC,CAAA;AAEF,MAAM,yBAAyB,GAAG,GAAG,CAAA;AAErC;;;;GAIG;AACH,MAAM,aAAa,GAAG,KAAK,EAC1B,MAAiB,EACjB,KAAa,EACb,OAAyB,EACzB,KAAa,EACb,SAAiB,EACsB,EAAE;IACzC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAA;IACvC,OAAO,IAAI,EAAE,CAAC;QACb,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,CAAA;QACxD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,OAAO,QAAQ,CAAA;QAChB,CAAC;QAED,MAAM,WAAW,GAAG,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QACzC,IAAI,WAAW,IAAI,CAAC,EAAE,CAAC;YACtB,OAAO,EAAE,CAAA;QACV,CAAC;QAED,MAAM,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,yBAAyB,EAAE,WAAW,CAAC,CAAC,CAAA;IAC9D,CAAC;AACF,CAAC,CAAA;AAED,MAAM,KAAK,GAAG,CAAC,SAAiB,EAAiB,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAA"}
+{"version":3,"file":"getNetTail.js","sourceRoot":"","sources":["../../../src/http/routes/getNetTail.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAA;AACpH,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAE1C,MAAM,CAAC,MAAM,KAAK,GAAG,eAAe,CAA6B;IAChE,MAAM,EAAE,KAAK;IACb,IAAI,EAAE,WAAW;IACjB,MAAM,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE;QACnC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO,kBAAkB,CAAC,GAAG,CAAC,CAAA;QAC/B,CAAC;QAED,MAAM,OAAO,GAAG,qBAAqB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;QACpD,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,OAAM;QACP,CAAC;QAED,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;QACvF,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,UAAU,EAAE,sBAAsB,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,CAAA;QAEjF,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;QACrG,MAAM,SAAS,GAAG,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;QAC1D,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAA;IAC1E,CAAC;CACD,CAAC,CAAA;AAEF,MAAM,yBAAyB,GAAG,GAAG,CAAA;AAErC;;;;GAIG;AACH,MAAM,aAAa,GAAG,KAAK,EAC1B,MAAiB,EACjB,KAAa,EACb,OAAyB,EACzB,KAAa,EACb,SAAiB,EACsB,EAAE;IACzC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAA;IACvC,OAAO,IAAI,EAAE,CAAC;QACb,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,CAAA;QACxD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,OAAO,QAAQ,CAAA;QAChB,CAAC;QAED,MAAM,WAAW,GAAG,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QACzC,IAAI,WAAW,IAAI,CAAC,EAAE,CAAC;YACtB,OAAO,EAAE,CAAA;QACV,CAAC;QAED,MAAM,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,yBAAyB,EAAE,WAAW,CAAC,CAAC,CAAA;IAC9D,CAAC;AACF,CAAC,CAAA"}

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

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

package/dist/http/routes/getNetWebSocketConnection.js

@@ -1,7 +1,8 @@
 import { defineJsonRoute } from './defineRoute.js';
 import { emitRequest } from './types.js';
 import { respondNetDisabled } from './netFilters.js';
-import { clampNumber, normalizeQueryValue, respondJson } from '../httpUtils.js';
+import { parseNetRequestLookup } from './netRequestLookup.js';
+import { respondApiError } from '../httpUtils.js';
 export const route = defineJsonRoute({
     method: 'GET',
     path: '/net/ws/connection',
@@ -9,15 +10,14 @@ export const route = defineJsonRoute({
         if (!ctx.realtimeNetBuffer) {
             return respondNetDisabled(res);
         }
-        const id = clampNumber(url.searchParams.get('id'), undefined, 1);
-        const requestId = normalizeQueryValue(url.searchParams.get('requestId'));
-        if (id == null && !requestId) {
-            return respondJson(res, { ok: false, error: { code: 'invalid_net_request', message: 'Missing WebSocket connection id' } }, 400);
+        const lookup = parseNetRequestLookup(url.searchParams);
+        if (!lookup) {
+            return respondApiError(res, 400, 'invalid_net_request', 'Missing WebSocket connection id');
         }
-        emitRequest(ctx, res, 'net/ws/connection', { id, requestId: requestId ?? undefined });
-        const connection = id != null ? ctx.realtimeNetBuffer.getWebSocketById(id) : ctx.realtimeNetBuffer.getWebSocketByRequestId(requestId);
+        emitRequest(ctx, res, 'net/ws/connection', { id: lookup.id, requestId: lookup.requestId });
+        const connection = lookup.id != null ? ctx.realtimeNetBuffer.getWebSocketById(lookup.id) : ctx.realtimeNetBuffer.getWebSocketByRequestId(lookup.requestId);
         if (!connection) {
-            return respondJson(res, { ok: false, error: { code: 'net_request_not_found', message: 'WebSocket connection not found' } }, 404);
+            return respondApiError(res, 404, 'net_request_not_found', 'WebSocket connection not found');
         }
         return { ok: true, connection };
     },

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

@@ -1 +1 @@
-{"version":3,"file":"getNetWebSocketConnection.js","sourceRoot":"","sources":["../../../src/http/routes/getNetWebSocketConnection.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AACpD,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAE/E,MAAM,CAAC,MAAM,KAAK,GAAG,eAAe,CAAkC;IACrE,MAAM,EAAE,KAAK;IACb,IAAI,EAAE,oBAAoB;IAC1B,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE;QAC7B,IAAI,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC;YAC5B,OAAO,kBAAkB,CAAC,GAAG,CAAC,CAAA;QAC/B,CAAC;QAED,MAAM,EAAE,GAAG,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAA;QAChE,MAAM,SAAS,GAAG,mBAAmB,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAA;QACxE,IAAI,EAAE,IAAI,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YAC9B,OAAO,WAAW,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,qBAAqB,EAAE,OAAO,EAAE,iCAAiC,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;QAChI,CAAC;QAED,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,mBAAmB,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,SAAS,IAAI,SAAS,EAAE,CAAC,CAAA;QAErF,MAAM,UAAU,GAAG,EAAE,IAAI,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,iBAAiB,CAAC,uBAAuB,CAAC,SAAU,CAAC,CAAA;QACtI,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,OAAO,WAAW,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,uBAAuB,EAAE,OAAO,EAAE,gCAAgC,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;QACjI,CAAC;QAED,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,CAAA;IAChC,CAAC;CACD,CAAC,CAAA"}
+{"version":3,"file":"getNetWebSocketConnection.js","sourceRoot":"","sources":["../../../src/http/routes/getNetWebSocketConnection.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AACpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAA;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEjD,MAAM,CAAC,MAAM,KAAK,GAAG,eAAe,CAAkC;IACrE,MAAM,EAAE,KAAK;IACb,IAAI,EAAE,oBAAoB;IAC1B,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE;QAC7B,IAAI,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC;YAC5B,OAAO,kBAAkB,CAAC,GAAG,CAAC,CAAA;QAC/B,CAAC;QAED,MAAM,MAAM,GAAG,qBAAqB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;QACtD,IAAI,CAAC,MAAM,EAAE,CAAC;YACb,OAAO,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,qBAAqB,EAAE,iCAAiC,CAAC,CAAA;QAC3F,CAAC;QAED,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,mBAAmB,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC,CAAA;QAE1F,MAAM,UAAU,GACf,MAAM,CAAC,EAAE,IAAI,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,iBAAiB,CAAC,uBAAuB,CAAC,MAAM,CAAC,SAAU,CAAC,CAAA;QACzI,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,OAAO,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,uBAAuB,EAAE,gCAAgC,CAAC,CAAA;QAC5F,CAAC;QAED,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,CAAA;IAChC,CAAC;CACD,CAAC,CAAA"}

package/dist/http/routes/getNetWebSockets.js

@@ -1,6 +1,6 @@
 import { defineJsonRoute } from './defineRoute.js';
 import { emitRequest } from './types.js';
-import { readNetFiltersFromUrl, respondNetDisabled, toNetRequestEventQuery } from './netFilters.js';
+import { nextAfterCursor, readNetFiltersFromUrl, respondNetDisabled, toNetRequestEventQuery } from './netFilters.js';
 export const route = defineJsonRoute({
     method: 'GET',
     path: '/net/ws',
@@ -14,7 +14,7 @@ export const route = defineJsonRoute({
         }
         emitRequest(ctx, res, 'net/ws', toNetRequestEventQuery(filters));
         const connections = ctx.realtimeNetBuffer.listWebSocketsAfter(filters.after, filters, filters.limit);
-        const nextAfter = connections.length > 0 ? (connections[connections.length - 1]?.id ?? filters.after) : filters.after;
+        const nextAfter = nextAfterCursor(connections, filters.after);
         return { ok: true, connections, nextAfter };
     },
 });

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

@@ -1 +1 @@
-{"version":3,"file":"getNetWebSockets.js","sourceRoot":"","sources":["../../../src/http/routes/getNetWebSockets.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAA;AAEnG,MAAM,CAAC,MAAM,KAAK,GAAG,eAAe,CAAmC;IACtE,MAAM,EAAE,KAAK;IACb,IAAI,EAAE,SAAS;IACf,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE;QAC7B,IAAI,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC;YAC5B,OAAO,kBAAkB,CAAC,GAAG,CAAC,CAAA;QAC/B,CAAC;QAED,MAAM,OAAO,GAAG,qBAAqB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;QACpD,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,OAAM;QACP,CAAC;QAED,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,sBAAsB,CAAC,OAAO,CAAC,CAAC,CAAA;QAEhE,MAAM,WAAW,GAAG,GAAG,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;QACpG,MAAM,SAAS,GAAG,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,EAAE,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAA;QACrH,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,CAAA;IAC5C,CAAC;CACD,CAAC,CAAA"}
+{"version":3,"file":"getNetWebSockets.js","sourceRoot":"","sources":["../../../src/http/routes/getNetWebSockets.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAA;AAEpH,MAAM,CAAC,MAAM,KAAK,GAAG,eAAe,CAAmC;IACtE,MAAM,EAAE,KAAK;IACb,IAAI,EAAE,SAAS;IACf,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE;QAC7B,IAAI,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC;YAC5B,OAAO,kBAAkB,CAAC,GAAG,CAAC,CAAA;QAC/B,CAAC;QAED,MAAM,OAAO,GAAG,qBAAqB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;QACpD,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,OAAM;QACP,CAAC;QAED,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,sBAAsB,CAAC,OAAO,CAAC,CAAC,CAAA;QAEhE,MAAM,WAAW,GAAG,GAAG,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;QACpG,MAAM,SAAS,GAAG,eAAe,CAAC,WAAW,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;QAC7D,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,CAAA;IAC5C,CAAC;CACD,CAAC,CAAA"}

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

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

package/dist/http/routes/getStatus.js

@@ -1,4 +1,5 @@
 import { ARGUS_PROTOCOL_VERSION } from '@vforsh/argus-core';
+import packageJson from '../../../package.json' with { type: 'json' };
 import { defineJsonRoute } from './defineRoute.js';
 export const route = defineJsonRoute({
     method: 'GET',
@@ -20,6 +21,8 @@ const buildStatus = (ctx) => {
         buffer,
         watcher,
         protocolVersion: ARGUS_PROTOCOL_VERSION,
+        watcherVersion: packageJson.version,
+        counters: ctx.getCounters(),
     };
 };
 //# sourceMappingURL=getStatus.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"getStatus.js","sourceRoot":"","sources":["../../../src/http/routes/getStatus.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAA;AAE3D,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAElD,MAAM,CAAC,MAAM,KAAK,GAAG,eAAe,CAA4B;IAC/D,MAAM,EAAE,KAAK;IACb,IAAI,EAAE,SAAS;IACf,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC;CACrC,CAAC,CAAA;AAEF,MAAM,WAAW,GAAG,CAAC,GAAiB,EAAkB,EAAE;IACzD,MAAM,OAAO,GAAG,GAAG,CAAC,UAAU,EAAE,CAAA;IAChC,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAA;IACpC,MAAM,SAAS,GAAG,GAAG,CAAC,YAAY,EAAE,CAAA;IAEpC,OAAO;QACN,EAAE,EAAE,IAAI;QACR,EAAE,EAAE,OAAO,CAAC,EAAE;QACd,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,QAAQ,EAAE,SAAS,CAAC,QAAQ;QAC5B,WAAW,EAAE,SAAS,CAAC,WAAW,IAAI,IAAI;QAC1C,MAAM,EAAE,SAAS,CAAC,MAAM;QACxB,MAAM,EAAE,GAAG,CAAC,SAAS,EAAE;QACvB,MAAM;QACN,OAAO;QACP,eAAe,EAAE,sBAAsB;KACvC,CAAA;AACF,CAAC,CAAA"}
+{"version":3,"file":"getStatus.js","sourceRoot":"","sources":["../../../src/http/routes/getStatus.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAA;AAC3D,OAAO,WAAW,MAAM,uBAAuB,CAAC,OAAO,IAAI,EAAE,MAAM,EAAE,CAAA;AAErE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAElD,MAAM,CAAC,MAAM,KAAK,GAAG,eAAe,CAA4B;IAC/D,MAAM,EAAE,KAAK;IACb,IAAI,EAAE,SAAS;IACf,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC;CACrC,CAAC,CAAA;AAEF,MAAM,WAAW,GAAG,CAAC,GAAiB,EAAkB,EAAE;IACzD,MAAM,OAAO,GAAG,GAAG,CAAC,UAAU,EAAE,CAAA;IAChC,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAA;IACpC,MAAM,SAAS,GAAG,GAAG,CAAC,YAAY,EAAE,CAAA;IAEpC,OAAO;QACN,EAAE,EAAE,IAAI;QACR,EAAE,EAAE,OAAO,CAAC,EAAE;QACd,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,QAAQ,EAAE,SAAS,CAAC,QAAQ;QAC5B,WAAW,EAAE,SAAS,CAAC,WAAW,IAAI,IAAI;QAC1C,MAAM,EAAE,SAAS,CAAC,MAAM;QACxB,MAAM,EAAE,GAAG,CAAC,SAAS,EAAE;QACvB,MAAM;QACN,OAAO;QACP,eAAe,EAAE,sBAAsB;QACvC,cAAc,EAAE,WAAW,CAAC,OAAO;QACnC,QAAQ,EAAE,GAAG,CAAC,WAAW,EAAE;KAC3B,CAAA;AACF,CAAC,CAAA"}

package/dist/http/routes/getTail.js

@@ -2,7 +2,7 @@ import { LogEpochError } from '../../buffer/LogBuffer.js';
 import { defineJsonRoute } from './defineRoute.js';
 import { emitRequest } from './types.js';
 import { respondInvalidMatch, respondInvalidMatchCase, clampNumber, parseLevels, resolveMatchCase, normalizeMatchPatterns, compileMatchPatterns, normalizeQueryValue, } from '../httpUtils.js';
-import { parseLogPosition, respondLogEpochError, waitForLogsFromPosition } from './logEpochQuery.js';
+import { logParam, logParams, parseLogPosition, respondLogEpochError, waitForLogsFromPosition } from './logEpochQuery.js';
 export const route = defineJsonRoute({
     method: 'GET',
     path: '/tail',
@@ -11,15 +11,15 @@ export const route = defineJsonRoute({
         if ('error' in position) {
             return respondLogEpochError(res, new LogEpochError('invalid', position.error));
         }
-        const limit = clampNumber(url.searchParams.get('limit'), 500, 1, 5000);
-        const timeoutMs = clampNumber(url.searchParams.get('timeoutMs'), 25_000, 1000, 120_000);
-        const levels = parseLevels(url.searchParams.get('levels'));
-        const match = url.searchParams.getAll('match');
-        const matchCase = resolveMatchCase(url.searchParams.get('matchCase'));
+        const limit = clampNumber(logParam(url, 'limit'), 500, 1, 5000);
+        const timeoutMs = clampNumber(logParam(url, 'timeoutMs'), 25_000, 1000, 120_000);
+        const levels = parseLevels(logParam(url, 'levels'));
+        const match = logParams(url, 'match');
+        const matchCase = resolveMatchCase(logParam(url, 'matchCase'));
         if (!matchCase) {
             return respondInvalidMatchCase(res);
         }
-        const source = normalizeQueryValue(url.searchParams.get('source'));
+        const source = normalizeQueryValue(logParam(url, 'source'));
         const matchPatterns = normalizeMatchPatterns(match);
         if (matchPatterns.error) {
             return respondInvalidMatch(res, matchPatterns.error);