@vforsh/argus-watcher 0.3.1 → 0.4.0

package/dist/http/httpUtils.js

@@ -1,30 +1,54 @@
+import { getErrorCode } from '../errors.js';
 import http from 'node:http';
+import { formatError } from '@vforsh/argus-core';
 export const respondJson = (res, body, status = 200) => {
     const payload = JSON.stringify(body);
     res.statusCode = status;
     res.setHeader('Content-Type', 'application/json');
     res.end(payload);
 };
+/**
+ * Send an `ok: false` failure envelope.
+ *
+ * The only way a route should build one. Routes used to hand-roll the object literal without a
+ * `satisfies ErrorResponse`, so their `code` was an unchecked string and a rename of an
+ * {@link ArgusErrorCode} member would not have broken them — the typed `code` parameter here closes
+ * that hole for every caller at once. `undefined` is allowed only because an arbitrary thrown error
+ * may not map to a known code (see {@link respondError}).
+ */
+export const respondApiError = (res, status, code, message) => {
+    respondJson(res, { ok: false, error: { message, code } }, status);
+};
 export const respondInvalidMatch = (res, message) => {
-    respondJson(res, { ok: false, error: { message, code: 'invalid_match' } }, 400);
+    respondApiError(res, 400, 'invalid_match', message);
 };
 export const respondInvalidMatchCase = (res) => {
-    respondJson(res, { ok: false, error: { message: 'Invalid matchCase value', code: 'invalid_match_case' } }, 400);
+    respondApiError(res, 400, 'invalid_match_case', 'Invalid matchCase value');
 };
 export const respondInvalidBody = (res, message) => {
-    respondJson(res, { ok: false, error: { message, code: 'invalid_request' } }, 400);
+    respondApiError(res, 400, 'invalid_request', message);
 };
 export const respondInvalidJson = (res) => {
-    respondJson(res, { ok: false, error: { message: 'Invalid JSON body', code: 'invalid_json' } }, 400);
+    respondApiError(res, 400, 'invalid_json', 'Invalid JSON body');
 };
 export const respondPayloadTooLarge = (res) => {
-    respondJson(res, { ok: false, error: { message: 'Request body too large', code: 'payload_too_large' } }, 413);
+    respondApiError(res, 413, 'payload_too_large', 'Request body too large');
 };
 export const respondError = (res, error) => {
-    const message = formatError(error);
-    const code = resolveErrorCode(error);
-    respondJson(res, { ok: false, error: { message, code } }, 500);
-};
+    respondApiError(res, 500, getErrorCode(error), formatError(error));
+};
+/**
+ * Read and parse a JSON request body.
+ *
+ * An absent or empty body yields `{}` rather than an error: `defineJsonRoute` hands the
+ * result straight to a protocol schema, which rejects it with a real per-field message.
+ * This used to be a documented gotcha ("routes must validate required fields explicitly")
+ * because the empty object was cast to the route's body type and reached the handler
+ * unvalidated; the schema layer now owns that proof.
+ *
+ * @returns The parsed body, or `null` when a response has already been sent (oversized
+ *   payload or malformed JSON).
+ */
 export const readJsonBody = async (req, res) => {
     const chunks = [];
     let size = 0;
@@ -58,14 +82,54 @@ export const readJsonBody = async (req, res) => {
         return null;
     }
 };
+/**
+ * Read a numeric query param that always resolves to a number.
+ *
+ * Absent or non-numeric values fall back to `fallback`; in-range values are clamped
+ * into `[min, max]`. Use {@link optionalNumber} when "absent" must stay distinguishable
+ * from a real value — this function cannot express it.
+ */
 export const clampNumber = (value, fallback, min, max) => {
+    const parsed = value == null ? Number.NaN : Number(value);
+    if (!Number.isFinite(parsed)) {
+        return fallback;
+    }
+    return clampToRange(parsed, min, max);
+};
+/**
+ * Read an optional numeric query param.
+ *
+ * Returns `undefined` when the param is absent or non-numeric, so callers can tell
+ * "not provided" from a provided `0`. Provided values are clamped into `[min, max]`.
+ */
+export const optionalNumber = (value, min, max) => {
     if (value == null) {
-        return fallback ?? 0;
+        return undefined;
     }
     const parsed = Number(value);
     if (!Number.isFinite(parsed)) {
-        return fallback ?? 0;
+        return undefined;
+    }
+    return clampToRange(parsed, min, max);
+};
+/**
+ * Read an optional positive-integer query param (buffer ids and other 1-based handles).
+ *
+ * Unlike {@link optionalNumber} this rejects rather than clamps: fractional, negative,
+ * zero, and unsafe-integer values all yield `undefined` so a bad id can never be
+ * silently coerced into a valid lookup.
+ */
+export const optionalPositiveInt = (value) => {
+    if (!value) {
+        return undefined;
     }
+    const parsed = Number(value);
+    if (!Number.isSafeInteger(parsed) || parsed < 1) {
+        return undefined;
+    }
+    return parsed;
+};
+const clampToRange = (parsed, min, max) => {
     if (min != null && parsed < min) {
         return min;
     }
@@ -149,22 +213,4 @@ export const normalizeTimeout = (value) => {
     }
     return parsed;
 };
-const resolveErrorCode = (error) => {
-    if (!error || typeof error !== 'object') {
-        return undefined;
-    }
-    if ('code' in error && typeof error.code === 'string') {
-        return error.code;
-    }
-    return undefined;
-};
-const formatError = (error) => {
-    if (!error) {
-        return 'unknown error';
-    }
-    if (error instanceof Error) {
-        return error.message;
-    }
-    return String(error);
-};
 //# sourceMappingURL=httpUtils.js.map

package/dist/http/httpUtils.js.map

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

package/dist/http/router.js

@@ -1,11 +1,11 @@
-import { respondJson } from './httpUtils.js';
+import { respondApiError } from './httpUtils.js';
 import { watcherRoutes } from './routes/index.js';
 const routes = new Map(watcherRoutes.map((route) => [`${route.method} ${route.path}`, route]));
 /** Dispatch an incoming request to the matching route handler, or respond 404. */
 export const dispatch = (req, res, url, ctx) => {
     const entry = routes.get(`${req.method} ${url.pathname}`);
     if (!entry || (entry.extensionOnly && !ctx.sourceHandle)) {
-        respondJson(res, { ok: false, error: { message: 'Not found', code: 'not_found' } }, 404);
+        respondApiError(res, 404, 'not_found', 'Not found');
         return;
     }
     void entry.handler(req, res, url, ctx);

package/dist/http/router.js.map

@@ -1 +1 @@
-{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/http/router.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAEjD,MAAM,MAAM,GAAG,IAAI,GAAG,CAAyC,aAAa,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,IAAI,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,CAAA;AAEtI,kFAAkF;AAClF,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,GAAwB,EAAE,GAAQ,EAAE,GAAiB,EAAQ,EAAE;IAClH,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAA;IACzD,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,aAAa,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;QAC1D,WAAW,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;QACxF,OAAM;IACP,CAAC;IACD,KAAK,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;AACvC,CAAC,CAAA"}
+{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/http/router.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAEjD,MAAM,MAAM,GAAG,IAAI,GAAG,CAAyC,aAAa,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,IAAI,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,CAAA;AAEtI,kFAAkF;AAClF,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAyB,EAAE,GAAwB,EAAE,GAAQ,EAAE,GAAiB,EAAQ,EAAE;IAClH,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAA;IACzD,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,aAAa,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;QAC1D,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,WAAW,EAAE,WAAW,CAAC,CAAA;QACnD,OAAM;IACP,CAAC;IACD,KAAK,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;AACvC,CAAC,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"authCookies.d.ts","sourceRoot":"","sources":["../../../src/http/routes/authCookies.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAA;AAoH9D,eAAO,MAAM,cAAc,wBAQzB,CAAA;AAEF,eAAO,MAAM,cAAc,wBAQzB,CAAA;AAEF,eAAO,MAAM,iBAAiB,wBAQ5B,CAAA;AAEF,eAAO,MAAM,gBAAgB,wBAQ3B,CAAA"}
+{"version":3,"file":"authCookies.d.ts","sourceRoot":"","sources":["../../../src/http/routes/authCookies.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAA;AAiB9D,eAAO,MAAM,cAAc,wBAQzB,CAAA;AAEF,eAAO,MAAM,cAAc,wBAQzB,CAAA;AAEF,eAAO,MAAM,iBAAiB,wBAQ5B,CAAA;AAEF,eAAO,MAAM,gBAAgB,wBAQ3B,CAAA"}

package/dist/http/routes/authCookies.js

@@ -1,102 +1,16 @@
-import { normalizeCookieDomainFilter, normalizeCookieSameSite, } from '@vforsh/argus-core';
-import { clearAuthCookies, deleteAuthCookie, inspectAuthCookie, setAuthCookie } from '../../cdp/auth.js';
+import { authCookieClearRequestSchema, authCookieDeleteRequestSchema, authCookieGetRequestSchema, authCookieSetRequestSchema, } from '@vforsh/argus-core';
+import { clearAuthCookies, deleteAuthCookie, inspectAuthCookie, setAuthCookie } from '../../cdp/authCookies.js';
 import { defineJsonRoute } from './defineRoute.js';
-const CLEAR_SCOPES = new Set(['origin', 'site', 'domain', 'browserContext']);
-const validateCookieGetPayload = (payload) => {
-    const identityError = validateCookieIdentityPayload(payload);
-    if (identityError) {
-        return identityError;
-    }
-    if (payload.includeValue != null && typeof payload.includeValue !== 'boolean') {
-        return 'includeValue must be a boolean';
-    }
-    return null;
-};
-const validateCookieDeletePayload = (payload) => validateCookieIdentityPayload(payload);
-const validateCookieSetPayload = (payload) => {
-    if (!payload.cookie || typeof payload.cookie !== 'object') {
-        return 'cookie is required';
-    }
-    const identityError = validateCookieIdentityPayload(payload.cookie);
-    if (identityError) {
-        return identityError;
-    }
-    if (typeof payload.cookie.value !== 'string') {
-        return 'cookie.value must be a string';
-    }
-    if (typeof payload.cookie.secure !== 'boolean') {
-        return 'cookie.secure must be a boolean';
-    }
-    if (typeof payload.cookie.httpOnly !== 'boolean') {
-        return 'cookie.httpOnly must be a boolean';
-    }
-    if (typeof payload.cookie.session !== 'boolean') {
-        return 'cookie.session must be a boolean';
-    }
-    if (payload.cookie.expires !== null && (typeof payload.cookie.expires !== 'number' || !Number.isFinite(payload.cookie.expires))) {
-        return 'cookie.expires must be a finite number or null';
-    }
-    if (payload.cookie.sameSite !== null && payload.cookie.sameSite !== undefined && typeof payload.cookie.sameSite !== 'string') {
-        return 'cookie.sameSite must be a string or null';
-    }
-    if (payload.cookie.sameSite && !normalizeCookieSameSite(payload.cookie.sameSite)) {
-        return 'cookie.sameSite must be one of: Strict, Lax, None';
-    }
-    if (payload.cookie.session && payload.cookie.expires != null) {
-        return 'cookie.expires must be null when cookie.session is true';
-    }
-    if (!payload.cookie.session && payload.cookie.expires == null) {
-        return 'cookie.expires is required when cookie.session is false';
-    }
-    if (normalizeCookieSameSite(payload.cookie.sameSite) === 'None' && !payload.cookie.secure) {
-        return 'cookie.secure must be true when cookie.sameSite is None';
-    }
-    return null;
-};
-const validateCookieClearPayload = (payload) => {
-    if (!CLEAR_SCOPES.has(payload.scope)) {
-        return 'scope must be one of: origin, site, domain, browserContext';
-    }
-    if (payload.scope === 'domain' && !normalizeCookieDomainFilter(payload.domain)) {
-        return 'domain is required when scope is "domain"';
-    }
-    if (payload.scope !== 'domain' && payload.domain != null && typeof payload.domain !== 'string') {
-        return 'domain must be a string when provided';
-    }
-    if (payload.sessionOnly != null && typeof payload.sessionOnly !== 'boolean') {
-        return 'sessionOnly must be a boolean';
-    }
-    if (payload.authOnly != null && typeof payload.authOnly !== 'boolean') {
-        return 'authOnly must be a boolean';
-    }
-    return null;
-};
 const createAuthCookieRoute = (options) => defineJsonRoute({
     method: 'POST',
     path: `/${options.endpoint}`,
-    parseBody: true,
+    bodySchema: options.bodySchema,
     endpoint: options.endpoint,
-    validate: options.validate,
     handle: ({ ctx, body: payload }) => options.run(payload, ctx),
 });
-const validateCookieIdentityPayload = (payload) => {
-    if (typeof payload.name !== 'string' || payload.name.trim() === '') {
-        return 'name is required';
-    }
-    if (typeof payload.domain !== 'string' || payload.domain.trim() === '') {
-        return 'domain is required';
-    }
-    if (typeof payload.path !== 'string' || payload.path.trim() === '') {
-        return 'path is required';
-    }
-    if (!payload.path.startsWith('/')) {
-        return 'path must start with "/"';
-    }
-    return null;
-};
 export const cookieGetRoute = createAuthCookieRoute({
     endpoint: 'auth/cookies/get',
-    validate: validateCookieGetPayload,
+    bodySchema: authCookieGetRequestSchema,
     run: (payload, ctx) => inspectAuthCookie(ctx.cdpSession, {
         ...payload,
         readBrowserCookies: ctx.readBrowserCookies,
@@ -104,7 +18,7 @@ export const cookieGetRoute = createAuthCookieRoute({
 });
 export const cookieSetRoute = createAuthCookieRoute({
     endpoint: 'auth/cookies/set',
-    validate: validateCookieSetPayload,
+    bodySchema: authCookieSetRequestSchema,
     run: (payload, ctx) => setAuthCookie(ctx.cdpSession, {
         ...payload,
         readBrowserCookies: ctx.readBrowserCookies,
@@ -112,7 +26,7 @@ export const cookieSetRoute = createAuthCookieRoute({
 });
 export const cookieDeleteRoute = createAuthCookieRoute({
     endpoint: 'auth/cookies/delete',
-    validate: validateCookieDeletePayload,
+    bodySchema: authCookieDeleteRequestSchema,
     run: (payload, ctx) => deleteAuthCookie(ctx.cdpSession, {
         ...payload,
         readBrowserCookies: ctx.readBrowserCookies,
@@ -120,7 +34,7 @@ export const cookieDeleteRoute = createAuthCookieRoute({
 });
 export const cookieClearRoute = createAuthCookieRoute({
     endpoint: 'auth/cookies/clear',
-    validate: validateCookieClearPayload,
+    bodySchema: authCookieClearRequestSchema,
     run: (payload, ctx) => clearAuthCookies(ctx.cdpSession, {
         ...payload,
         readBrowserCookies: ctx.readBrowserCookies,

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

@@ -1 +1 @@
-{"version":3,"file":"authCookies.js","sourceRoot":"","sources":["../../../src/http/routes/authCookies.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"authCookies.js","sourceRoot":"","sources":["../../../src/http/routes/authCookies.ts"],"names":[],"mappings":"AAWA,OAAO,EACN,4BAA4B,EAC5B,6BAA6B,EAC7B,0BAA0B,EAC1B,0BAA0B,GAC1B,MAAM,oBAAoB,CAAA;AAG3B,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAC/G,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAElD,MAAM,qBAAqB,GAAG,CAA2C,OAIxE,EAA0B,EAAE,CAC5B,eAAe,CAAsB;IACpC,MAAM,EAAE,MAAM;IACd,IAAI,EAAE,IAAI,OAAO,CAAC,QAAQ,EAAE;IAC5B,UAAU,EAAE,OAAO,CAAC,UAAU;IAC9B,QAAQ,EAAE,OAAO,CAAC,QAAQ;IAC1B,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC;CAC7D,CAAC,CAAA;AAEH,MAAM,CAAC,MAAM,cAAc,GAAG,qBAAqB,CAA8C;IAChG,QAAQ,EAAE,kBAAkB;IAC5B,UAAU,EAAE,0BAA0B;IACtC,GAAG,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,CACrB,iBAAiB,CAAC,GAAG,CAAC,UAAU,EAAE;QACjC,GAAG,OAAO;QACV,kBAAkB,EAAE,GAAG,CAAC,kBAAkB;KAC1C,CAAC;CACH,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,qBAAqB,CAA8C;IAChG,QAAQ,EAAE,kBAAkB;IAC5B,UAAU,EAAE,0BAA0B;IACtC,GAAG,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,CACrB,aAAa,CAAC,GAAG,CAAC,UAAU,EAAE;QAC7B,GAAG,OAAO;QACV,kBAAkB,EAAE,GAAG,CAAC,kBAAkB;KAC1C,CAAC;CACH,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,qBAAqB,CAAoD;IACzG,QAAQ,EAAE,qBAAqB;IAC/B,UAAU,EAAE,6BAA6B;IACzC,GAAG,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,CACrB,gBAAgB,CAAC,GAAG,CAAC,UAAU,EAAE;QAChC,GAAG,OAAO;QACV,kBAAkB,EAAE,GAAG,CAAC,kBAAkB;KAC1C,CAAC;CACH,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,qBAAqB,CAAkD;IACtG,QAAQ,EAAE,oBAAoB;IAC9B,UAAU,EAAE,4BAA4B;IACxC,GAAG,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,CACrB,gBAAgB,CAAC,GAAG,CAAC,UAAU,EAAE;QAChC,GAAG,OAAO;QACV,kBAAkB,EAAE,GAAG,CAAC,kBAAkB;KAC1C,CAAC;CACH,CAAC,CAAA"}

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

@@ -1,3 +1,4 @@
+import type { ProtocolSchema } from '@vforsh/argus-core';
 import type { HttpRequestEventMetadata } from '../server.js';
 import type { DomNodeHandle } from '../../cdp/dom/selector.js';
 import type { WatcherRouteDefinition } from './defineRoute.js';
@@ -25,11 +26,8 @@ type DomTargetRouteInput<TBody extends DomTargetRequestBody, TExtra extends obje
      * `all` is false.
      */
     action: string;
-    /**
-     * Extra body validation, run after the shared selector/ref/all checks.
-     * Returns an error message to respond 400 `invalid_request`, or null.
-     */
-    validate?: (payload: TBody) => string | null;
+    /** Schema that validates this route's body, including the shared target fields. */
+    bodySchema: ProtocolSchema<TBody>;
     /**
      * Run the DOM action against the resolved handles. Receives both the
      * "filtered" handles (subject to `text`/`all`) and `allHandles` for routes

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

@@ -1 +1 @@
-{"version":3,"file":"defineDomTargetRoute.d.ts","sourceRoot":"","sources":["../../../src/http/routes/defineDomTargetRoute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAA;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAC9D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAA;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAK9C;;;GAGG;AACH,MAAM,MAAM,oBAAoB,GAAG;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,6EAA6E;IAC7E,IAAI,CAAC,EAAE,MAAM,CAAA;CACb,CAAA;AAED,KAAK,mBAAmB,CAAC,KAAK,SAAS,oBAAoB,EAAE,MAAM,SAAS,MAAM,IAAI;IACrF,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,4CAA4C;IAC5C,QAAQ,EAAE,wBAAwB,CAAC,UAAU,CAAC,CAAA;IAC9C;;;;OAIG;IACH,MAAM,EAAE,MAAM,CAAA;IACd;;;OAGG;IACH,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,KAAK,MAAM,GAAG,IAAI,CAAA;IAC5C;;;;;;;;OAQG;IACH,GAAG,EAAE,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,aAAa,EAAE,CAAC;QAAC,UAAU,EAAE,aAAa,EAAE,CAAC;QAAC,OAAO,EAAE,KAAK,CAAC;QAAC,GAAG,EAAE,YAAY,CAAA;KAAE,KAAK,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAA;CACtI,CAAA;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,oBAAoB,GAAI,KAAK,SAAS,oBAAoB,EAAE,MAAM,SAAS,MAAM,EAC7F,OAAO,mBAAmB,CAAC,KAAK,EAAE,MAAM,CAAC,KACvC,sBA6BA,CAAA"}
+{"version":3,"file":"defineDomTargetRoute.d.ts","sourceRoot":"","sources":["../../../src/http/routes/defineDomTargetRoute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAA;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAC9D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAA;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAK9C;;;GAGG;AACH,MAAM,MAAM,oBAAoB,GAAG;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,6EAA6E;IAC7E,IAAI,CAAC,EAAE,MAAM,CAAA;CACb,CAAA;AAED,KAAK,mBAAmB,CAAC,KAAK,SAAS,oBAAoB,EAAE,MAAM,SAAS,MAAM,IAAI;IACrF,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,4CAA4C;IAC5C,QAAQ,EAAE,wBAAwB,CAAC,UAAU,CAAC,CAAA;IAC9C;;;;OAIG;IACH,MAAM,EAAE,MAAM,CAAA;IACd,mFAAmF;IACnF,UAAU,EAAE,cAAc,CAAC,KAAK,CAAC,CAAA;IACjC;;;;;;;;OAQG;IACH,GAAG,EAAE,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,aAAa,EAAE,CAAC;QAAC,UAAU,EAAE,aAAa,EAAE,CAAC;QAAC,OAAO,EAAE,KAAK,CAAC;QAAC,GAAG,EAAE,YAAY,CAAA;KAAE,KAAK,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAA;CACtI,CAAA;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,oBAAoB,GAAI,KAAK,SAAS,oBAAoB,EAAE,MAAM,SAAS,MAAM,EAC7F,OAAO,mBAAmB,CAAC,KAAK,EAAE,MAAM,CAAC,KACvC,sBA4BA,CAAA"}

package/dist/http/routes/defineDomTargetRoute.js

@@ -1,6 +1,6 @@
 import { resolveElementTargets } from '../../cdp/dom/selector.js';
 import { defineJsonRoute } from './defineRoute.js';
-import { respondMissingElementRef, respondMultipleMatches, respondTargetResolutionError, validateDomTargetBody } from './domSelectorRoute.js';
+import { respondMissingElementRef, respondMultipleMatches, respondTargetResolutionError } from './domSelectorRoute.js';
 /**
  * Build a `WatcherRouteDefinition` for routes that resolve an element target
  * (selector/ref + text/all/wait) and perform a DOM action.
@@ -12,9 +12,8 @@ import { respondMissingElementRef, respondMultipleMatches, respondTargetResoluti
 export const defineDomTargetRoute = (input) => defineJsonRoute({
     method: input.method ?? 'POST',
     path: input.path,
-    parseBody: true,
+    bodySchema: input.bodySchema,
     endpoint: input.endpoint,
-    validate: (payload) => validateDomTargetBody(payload) ?? input.validate?.(payload) ?? null,
     handle: async ({ res, ctx, body: payload }) => {
         const all = payload.all ?? false;
         const resolved = await resolveElementTargets(ctx.cdpSession, ctx.elementRefs, {

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

@@ -1 +1 @@
-{"version":3,"file":"defineDomTargetRoute.js","sourceRoot":"","sources":["../../../src/http/routes/defineDomTargetRoute.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAA;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,4BAA4B,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAA;AA2C7I;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CACnC,KAAyC,EAChB,EAAE,CAC3B,eAAe,CAAgD;IAC9D,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,MAAM;IAC9B,IAAI,EAAE,KAAK,CAAC,IAAI;IAChB,SAAS,EAAE,IAAI;IACf,QAAQ,EAAE,KAAK,CAAC,QAAQ;IACxB,QAAQ,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,qBAAqB,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,IAAI,IAAI;IAC1F,MAAM,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE;QAC7C,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,KAAK,CAAA;QAChC,MAAM,QAAQ,GAAG,MAAM,qBAAqB,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,WAAW,EAAE;YAC7E,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,GAAG;YACH,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,MAAM,EAAE,OAAO,CAAC,IAAI;SACpB,CAAC,CAAA;QACF,IAAI,QAAQ,CAAC,UAAU,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;YACxC,OAAO,wBAAwB,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,CAAA;QAClD,CAAC;QAED,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAA;QACxC,IAAI,CAAC,GAAG,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnC,OAAO,sBAAsB,CAAC,GAAG,EAAE,UAAU,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;QACpE,CAAC;QAED,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAA;QACpE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,CAAC,MAAM,EAAE,GAAG,KAAK,EAAE,CAAA;IAC1D,CAAC;IACD,WAAW,EAAE,4BAA4B;CACzC,CAAC,CAAA"}
+{"version":3,"file":"defineDomTargetRoute.js","sourceRoot":"","sources":["../../../src/http/routes/defineDomTargetRoute.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAA;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAA;AAwCtH;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CACnC,KAAyC,EAChB,EAAE,CAC3B,eAAe,CAAgD;IAC9D,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,MAAM;IAC9B,IAAI,EAAE,KAAK,CAAC,IAAI;IAChB,UAAU,EAAE,KAAK,CAAC,UAAU;IAC5B,QAAQ,EAAE,KAAK,CAAC,QAAQ;IACxB,MAAM,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE;QAC7C,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,KAAK,CAAA;QAChC,MAAM,QAAQ,GAAG,MAAM,qBAAqB,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,WAAW,EAAE;YAC7E,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,GAAG;YACH,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,MAAM,EAAE,OAAO,CAAC,IAAI;SACpB,CAAC,CAAA;QACF,IAAI,QAAQ,CAAC,UAAU,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;YACxC,OAAO,wBAAwB,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,CAAA;QAClD,CAAC;QAED,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAA;QACxC,IAAI,CAAC,GAAG,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnC,OAAO,sBAAsB,CAAC,GAAG,EAAE,UAAU,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;QACpE,CAAC;QAED,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAA;QACpE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,CAAC,MAAM,EAAE,GAAG,KAAK,EAAE,CAAA;IAC1D,CAAC;IACD,WAAW,EAAE,4BAA4B;CACzC,CAAC,CAAA"}

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

@@ -0,0 +1,30 @@
+import type { CdpSourceHandle } from '../../sources/types.js';
+import { defineJsonRoute, type JsonRouteHandlerInput, type WatcherRouteDefinition } from './defineRoute.js';
+/** The optional members of {@link CdpSourceHandle} that only an extension-backed source provides. */
+export type ExtensionCapability = {
+    [K in keyof CdpSourceHandle]-?: undefined extends CdpSourceHandle[K] ? NonNullable<CdpSourceHandle[K]> extends (...args: never[]) => unknown ? K : never : never;
+}[keyof CdpSourceHandle];
+/** The capability method itself, with its optionality resolved. */
+type ExtensionCapabilityFn<K extends ExtensionCapability> = NonNullable<CdpSourceHandle[K]>;
+type ExtensionRouteInput<TBody, TResponse extends object, TCapability extends ExtensionCapability> = {
+    method: 'GET' | 'POST';
+    path: string;
+    bodySchema?: Parameters<typeof defineJsonRoute<TBody, TResponse>>[0]['bodySchema'];
+    /** The source-handle method this route needs. Absent on the active source means 400 `not_available`. */
+    capability: TCapability;
+    handle: (input: JsonRouteHandlerInput<TBody> & {
+        capability: ExtensionCapabilityFn<TCapability>;
+    }) => Promise<TResponse | void> | TResponse | void;
+};
+/**
+ * Build a route that only an extension-backed source can serve.
+ *
+ * Capability used to be checked three times per request — the `extensionOnly` route flag, the
+ * router's `sourceHandle` presence check, and a per-method `if (!ctx.sourceHandle?.x)` in the
+ * handler — because the handle expresses capability as method optionality. This owns the third
+ * check, the shared "Not available" response, and the shared `extension_action_failed` error
+ * mapping, and hands the handler a method it does not have to re-narrow.
+ */
+export declare const defineExtensionRoute: <TBody = undefined, TResponse extends object = object, TCapability extends ExtensionCapability = ExtensionCapability>(input: ExtensionRouteInput<TBody, TResponse, TCapability>) => WatcherRouteDefinition;
+export {};
+//# sourceMappingURL=defineExtensionRoute.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"defineExtensionRoute.d.ts","sourceRoot":"","sources":["../../../src/http/routes/defineExtensionRoute.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAG7D,OAAO,EAAE,eAAe,EAAE,KAAK,qBAAqB,EAAE,KAAK,sBAAsB,EAAE,MAAM,kBAAkB,CAAA;AAE3G,qGAAqG;AACrG,MAAM,MAAM,mBAAmB,GAAG;KAChC,CAAC,IAAI,MAAM,eAAe,CAAC,CAAC,GAAG,SAAS,SAAS,eAAe,CAAC,CAAC,CAAC,GACjE,WAAW,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,KAAK,EAAE,KAAK,OAAO,GACpE,CAAC,GACD,KAAK,GACN,KAAK;CACR,CAAC,MAAM,eAAe,CAAC,CAAA;AAExB,mEAAmE;AACnE,KAAK,qBAAqB,CAAC,CAAC,SAAS,mBAAmB,IAAI,WAAW,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAA;AAE3F,KAAK,mBAAmB,CAAC,KAAK,EAAE,SAAS,SAAS,MAAM,EAAE,WAAW,SAAS,mBAAmB,IAAI;IACpG,MAAM,EAAE,KAAK,GAAG,MAAM,CAAA;IACtB,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,CAAC,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAA;IAClF,wGAAwG;IACxG,UAAU,EAAE,WAAW,CAAA;IACvB,MAAM,EAAE,CAAC,KAAK,EAAE,qBAAqB,CAAC,KAAK,CAAC,GAAG;QAAE,UAAU,EAAE,qBAAqB,CAAC,WAAW,CAAC,CAAA;KAAE,KAAK,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,SAAS,GAAG,IAAI,CAAA;CAClJ,CAAA;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,oBAAoB,GAChC,KAAK,GAAG,SAAS,EACjB,SAAS,SAAS,MAAM,GAAG,MAAM,EACjC,WAAW,SAAS,mBAAmB,GAAG,mBAAmB,EAE7D,OAAO,mBAAmB,CAAC,KAAK,EAAE,SAAS,EAAE,WAAW,CAAC,KACvD,sBAkBA,CAAA"}

package/dist/http/routes/defineExtensionRoute.js

@@ -0,0 +1,33 @@
+import { formatError } from '@vforsh/argus-core';
+import { respondApiError } from '../httpUtils.js';
+import { defineJsonRoute } from './defineRoute.js';
+/**
+ * Build a route that only an extension-backed source can serve.
+ *
+ * Capability used to be checked three times per request — the `extensionOnly` route flag, the
+ * router's `sourceHandle` presence check, and a per-method `if (!ctx.sourceHandle?.x)` in the
+ * handler — because the handle expresses capability as method optionality. This owns the third
+ * check, the shared "Not available" response, and the shared `extension_action_failed` error
+ * mapping, and hands the handler a method it does not have to re-narrow.
+ */
+export const defineExtensionRoute = (input) => defineJsonRoute({
+    method: input.method,
+    path: input.path,
+    bodySchema: input.bodySchema,
+    extensionOnly: true,
+    handle: (handlerInput) => {
+        const capability = handlerInput.ctx.sourceHandle?.[input.capability];
+        if (!capability) {
+            return respondNotAvailable(handlerInput.res);
+        }
+        return input.handle({ ...handlerInput, capability });
+    },
+    handleError: (res, error) => {
+        respondApiError(res, 400, 'extension_action_failed', formatError(error));
+        return true;
+    },
+});
+const respondNotAvailable = (res) => {
+    respondApiError(res, 400, 'not_available', 'Not available');
+};
+//# sourceMappingURL=defineExtensionRoute.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"defineExtensionRoute.js","sourceRoot":"","sources":["../../../src/http/routes/defineExtensionRoute.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,eAAe,EAA2D,MAAM,kBAAkB,CAAA;AAuB3G;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAKnC,KAAyD,EAChC,EAAE,CAC3B,eAAe,CAAmB;IACjC,MAAM,EAAE,KAAK,CAAC,MAAM;IACpB,IAAI,EAAE,KAAK,CAAC,IAAI;IAChB,UAAU,EAAE,KAAK,CAAC,UAAU;IAC5B,aAAa,EAAE,IAAI;IACnB,MAAM,EAAE,CAAC,YAAY,EAAE,EAAE;QACxB,MAAM,UAAU,GAAG,YAAY,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,KAAK,CAAC,UAAU,CAAmD,CAAA;QACtH,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,OAAO,mBAAmB,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;QAC7C,CAAC;QAED,OAAO,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,YAAY,EAAE,UAAU,EAAE,CAAC,CAAA;IACrD,CAAC;IACD,WAAW,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;QAC3B,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,yBAAyB,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,CAAA;QACxE,OAAO,IAAI,CAAA;IACZ,CAAC;CACD,CAAC,CAAA;AAEH,MAAM,mBAAmB,GAAG,CAAC,GAAwB,EAAQ,EAAE;IAC9D,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,eAAe,EAAE,eAAe,CAAC,CAAA;AAC5D,CAAC,CAAA"}

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

@@ -11,16 +11,16 @@ export type WatcherRouteDefinition = {
 type JsonRouteInput<TBody, TResponse extends object> = {
     method: 'GET' | 'POST';
     path: string;
-    bodySchema?: ProtocolSchema<TBody>;
-    parseBody?: boolean;
     /**
-     * Route-specific body validation, run after schema parsing and before the
-     * request event is emitted. Return an error message to respond 400
-     * `invalid_request`, or null when the body is valid. Prefer `bodySchema`
-     * when a protocol schema exists; use this for validation rules that a
-     * schema cannot express.
+     * Schema that parses and validates the request body.
+     *
+     * This is the only way to read a body. There used to be a `parseBody: true` escape
+     * hatch that handed the route an unvalidated payload already typed as `TBody` — the
+     * type parameter was a lie until a hand-written `validate` closure re-proved it, and
+     * ~450 LOC of per-route `typeof` checks and casts grew in that gap. Omit this and the
+     * handler receives no body at all.
      */
-    validate?: (body: TBody) => string | null;
+    bodySchema?: ProtocolSchema<TBody>;
     endpoint?: HttpRequestEventMetadata['endpoint'];
     extensionOnly?: boolean;
     handle: (input: JsonRouteHandlerInput<TBody>) => Promise<TResponse | void> | TResponse | void;

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

@@ -1 +1 @@
-{"version":3,"file":"defineRoute.d.ts","sourceRoot":"","sources":["../../../src/http/routes/defineRoute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AACjC,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAA;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAK5D,MAAM,MAAM,sBAAsB,GAAG;IACpC,MAAM,EAAE,KAAK,GAAG,MAAM,CAAA;IACtB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,YAAY,CAAA;IACrB,aAAa,CAAC,EAAE,OAAO,CAAA;CACvB,CAAA;AAED,KAAK,cAAc,CAAC,KAAK,EAAE,SAAS,SAAS,MAAM,IAAI;IACtD,MAAM,EAAE,KAAK,GAAG,MAAM,CAAA;IACtB,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,CAAC,EAAE,cAAc,CAAC,KAAK,CAAC,CAAA;IAClC,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,MAAM,GAAG,IAAI,CAAA;IACzC,QAAQ,CAAC,EAAE,wBAAwB,CAAC,UAAU,CAAC,CAAA;IAC/C,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,MAAM,EAAE,CAAC,KAAK,EAAE,qBAAqB,CAAC,KAAK,CAAC,KAAK,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,SAAS,GAAG,IAAI,CAAA;IAC7F,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,cAAc,EAAE,KAAK,EAAE,OAAO,KAAK,OAAO,GAAG,IAAI,CAAA;CAC1E,CAAA;AAED,MAAM,MAAM,qBAAqB,CAAC,KAAK,IAAI;IAC1C,GAAG,EAAE,IAAI,CAAC,eAAe,CAAA;IACzB,GAAG,EAAE,IAAI,CAAC,cAAc,CAAA;IACxB,GAAG,EAAE,GAAG,CAAA;IACR,GAAG,EAAE,YAAY,CAAA;IACjB,IAAI,EAAE,KAAK,CAAA;CACX,CAAA;AAED,0GAA0G;AAC1G,eAAO,MAAM,eAAe,GAAI,KAAK,GAAG,SAAS,EAAE,SAAS,SAAS,MAAM,GAAG,MAAM,EACnF,OAAO,cAAc,CAAC,KAAK,EAAE,SAAS,CAAC,KACrC,sBAsCD,CAAA"}
+{"version":3,"file":"defineRoute.d.ts","sourceRoot":"","sources":["../../../src/http/routes/defineRoute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AACjC,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAA;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAK5D,MAAM,MAAM,sBAAsB,GAAG;IACpC,MAAM,EAAE,KAAK,GAAG,MAAM,CAAA;IACtB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,YAAY,CAAA;IACrB,aAAa,CAAC,EAAE,OAAO,CAAA;CACvB,CAAA;AAED,KAAK,cAAc,CAAC,KAAK,EAAE,SAAS,SAAS,MAAM,IAAI;IACtD,MAAM,EAAE,KAAK,GAAG,MAAM,CAAA;IACtB,IAAI,EAAE,MAAM,CAAA;IACZ;;;;;;;;OAQG;IACH,UAAU,CAAC,EAAE,cAAc,CAAC,KAAK,CAAC,CAAA;IAClC,QAAQ,CAAC,EAAE,wBAAwB,CAAC,UAAU,CAAC,CAAA;IAC/C,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,MAAM,EAAE,CAAC,KAAK,EAAE,qBAAqB,CAAC,KAAK,CAAC,KAAK,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,SAAS,GAAG,IAAI,CAAA;IAC7F,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,cAAc,EAAE,KAAK,EAAE,OAAO,KAAK,OAAO,GAAG,IAAI,CAAA;CAC1E,CAAA;AAED,MAAM,MAAM,qBAAqB,CAAC,KAAK,IAAI;IAC1C,GAAG,EAAE,IAAI,CAAC,eAAe,CAAA;IACzB,GAAG,EAAE,IAAI,CAAC,cAAc,CAAA;IACxB,GAAG,EAAE,GAAG,CAAA;IACR,GAAG,EAAE,YAAY,CAAA;IACjB,IAAI,EAAE,KAAK,CAAA;CACX,CAAA;AAED,0GAA0G;AAC1G,eAAO,MAAM,eAAe,GAAI,KAAK,GAAG,SAAS,EAAE,SAAS,SAAS,MAAM,GAAG,MAAM,EACnF,OAAO,cAAc,CAAC,KAAK,EAAE,SAAS,CAAC,KACrC,sBAmCD,CAAA"}

package/dist/http/routes/defineRoute.js

@@ -7,19 +7,17 @@ export const defineJsonRoute = (input) => ({
     path: input.path,
     extensionOnly: input.extensionOnly,
     handler: async (req, res, url, ctx) => {
-        const shouldReadBody = input.bodySchema != null || input.parseBody === true;
-        const rawBody = shouldReadBody ? await readJsonBody(req, res) : undefined;
-        if (shouldReadBody && rawBody == null) {
-            return;
-        }
-        const parsedBody = input.bodySchema?.parse(rawBody);
-        if (parsedBody && !parsedBody.ok) {
-            return respondInvalidBody(res, formatProtocolValidationIssues(parsedBody.issues));
-        }
-        const body = (parsedBody?.value ?? rawBody);
-        const validationError = input.validate?.(body);
-        if (validationError) {
-            return respondInvalidBody(res, validationError);
+        let body = undefined;
+        if (input.bodySchema) {
+            const rawBody = await readJsonBody(req, res);
+            if (rawBody == null) {
+                return;
+            }
+            const parsed = input.bodySchema.parse(rawBody);
+            if (!parsed.ok) {
+                return respondInvalidBody(res, formatProtocolValidationIssues(parsed.issues));
+            }
+            body = parsed.value;
         }
         if (input.endpoint) {
             emitRequest(ctx, res, input.endpoint);

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

@@ -1 +1 @@
-{"version":3,"file":"defineRoute.js","sourceRoot":"","sources":["../../../src/http/routes/defineRoute.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,8BAA8B,EAAE,MAAM,oBAAoB,CAAA;AACnE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAC7F,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAoCxC,0GAA0G;AAC1G,MAAM,CAAC,MAAM,eAAe,GAAG,CAC9B,KAAuC,EACd,EAAE,CAAC,CAAC;IAC7B,MAAM,EAAE,KAAK,CAAC,MAAM;IACpB,IAAI,EAAE,KAAK,CAAC,IAAI;IAChB,aAAa,EAAE,KAAK,CAAC,aAAa;IAClC,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;QACrC,MAAM,cAAc,GAAG,KAAK,CAAC,UAAU,IAAI,IAAI,IAAI,KAAK,CAAC,SAAS,KAAK,IAAI,CAAA;QAC3E,MAAM,OAAO,GAAG,cAAc,CAAC,CAAC,CAAC,MAAM,YAAY,CAAU,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;QAClF,IAAI,cAAc,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;YACvC,OAAM;QACP,CAAC;QAED,MAAM,UAAU,GAAG,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;QACnD,IAAI,UAAU,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC;YAClC,OAAO,kBAAkB,CAAC,GAAG,EAAE,8BAA8B,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAA;QAClF,CAAC;QAED,MAAM,IAAI,GAAG,CAAC,UAAU,EAAE,KAAK,IAAI,OAAO,CAAU,CAAA;QACpD,MAAM,eAAe,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAA;QAC9C,IAAI,eAAe,EAAE,CAAC;YACrB,OAAO,kBAAkB,CAAC,GAAG,EAAE,eAAe,CAAC,CAAA;QAChD,CAAC;QAED,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YACpB,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAA;QACtC,CAAC;QAED,IAAI,CAAC;YACJ,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAA;YACjE,IAAI,QAAQ,EAAE,CAAC;gBACd,WAAW,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;YAC3B,CAAC;QACF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC;gBACrC,OAAM;YACP,CAAC;YACD,YAAY,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;QACzB,CAAC;IACF,CAAC;CACD,CAAC,CAAA"}
+{"version":3,"file":"defineRoute.js","sourceRoot":"","sources":["../../../src/http/routes/defineRoute.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,8BAA8B,EAAE,MAAM,oBAAoB,CAAA;AACnE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAC7F,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAoCxC,0GAA0G;AAC1G,MAAM,CAAC,MAAM,eAAe,GAAG,CAC9B,KAAuC,EACd,EAAE,CAAC,CAAC;IAC7B,MAAM,EAAE,KAAK,CAAC,MAAM;IACpB,IAAI,EAAE,KAAK,CAAC,IAAI;IAChB,aAAa,EAAE,KAAK,CAAC,aAAa;IAClC,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;QACrC,IAAI,IAAI,GAAG,SAAkB,CAAA;QAC7B,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;YACtB,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;YAC5C,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;gBACrB,OAAM;YACP,CAAC;YAED,MAAM,MAAM,GAAG,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;YAC9C,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;gBAChB,OAAO,kBAAkB,CAAC,GAAG,EAAE,8BAA8B,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;YAC9E,CAAC;YACD,IAAI,GAAG,MAAM,CAAC,KAAK,CAAA;QACpB,CAAC;QAED,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YACpB,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAA;QACtC,CAAC;QAED,IAAI,CAAC;YACJ,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAA;YACjE,IAAI,QAAQ,EAAE,CAAC;gBACd,WAAW,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;YAC3B,CAAC;QACF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC;gBACrC,OAAM;YACP,CAAC;YACD,YAAY,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;QACzB,CAAC;IACF,CAAC;CACD,CAAC,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"domSelectorRoute.d.ts","sourceRoot":"","sources":["../../../src/http/routes/domSelectorRoute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AAGjC,KAAK,eAAe,GAAG;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,GAAG,CAAC,EAAE,OAAO,CAAA;CACb,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,GAAI,SAAS,eAAe,KAAG,MAAM,GAAG,IAYzE,CAAA;AAED,eAAO,MAAM,sBAAsB,GAAI,KAAK,IAAI,CAAC,cAAc,EAAE,SAAS,MAAM,EAAE,QAAQ,MAAM,KAAG,IAYlG,CAAA;AAED,eAAO,MAAM,wBAAwB,GAAI,KAAK,IAAI,CAAC,cAAc,EAAE,KAAK,MAAM,KAAG,IAYhF,CAAA;AAED,eAAO,MAAM,4BAA4B,GAAI,KAAK,IAAI,CAAC,cAAc,EAAE,OAAO,OAAO,KAAG,OAavF,CAAA"}
+{"version":3,"file":"domSelectorRoute.d.ts","sourceRoot":"","sources":["../../../src/http/routes/domSelectorRoute.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AAGjC,KAAK,eAAe,GAAG;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,GAAG,CAAC,EAAE,OAAO,CAAA;CACb,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,GAAI,SAAS,eAAe,KAAG,MAAM,GAAG,IAYzE,CAAA;AAED,eAAO,MAAM,sBAAsB,GAAI,KAAK,IAAI,CAAC,cAAc,EAAE,SAAS,MAAM,EAAE,QAAQ,MAAM,KAAG,IAYlG,CAAA;AAED,eAAO,MAAM,wBAAwB,GAAI,KAAK,IAAI,CAAC,cAAc,EAAE,KAAK,MAAM,KAAG,IAYhF,CAAA;AAED,eAAO,MAAM,4BAA4B,GAAI,KAAK,IAAI,CAAC,cAAc,EAAE,OAAO,OAAO,KAAG,OAQvF,CAAA"}

package/dist/http/routes/domSelectorRoute.js

@@ -1,4 +1,5 @@
-import { respondJson } from '../httpUtils.js';
+import { hasErrorCode } from '../../errors.js';
+import { respondApiError, respondJson } from '../httpUtils.js';
 /**
  * Validate the shared DOM target body shape (exactly one of selector/ref, plus
  * an optional `all` toggle). Returns an error message, or null when valid.
@@ -34,15 +35,11 @@ export const respondMissingElementRef = (res, ref) => {
     }, 400);
 };
 export const respondTargetResolutionError = (res, error) => {
-    if (!error || typeof error !== 'object') {
-        return false;
-    }
-    const code = 'code' in error ? error.code : undefined;
-    if (code !== 'invalid_ref') {
+    if (!hasErrorCode(error, 'invalid_ref')) {
         return false;
     }
     const message = error instanceof Error && error.message ? error.message : 'Unknown or stale element ref. Run argus snapshot or locate again.';
-    respondJson(res, { ok: false, error: { message, code: 'invalid_ref' } }, 400);
+    respondApiError(res, 400, 'invalid_ref', message);
     return true;
 };
 //# sourceMappingURL=domSelectorRoute.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"domSelectorRoute.js","sourceRoot":"","sources":["../../../src/http/routes/domSelectorRoute.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAQ7C;;;;GAIG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,OAAwB,EAAiB,EAAE;IAChF,MAAM,WAAW,GAAG,OAAO,OAAO,CAAC,QAAQ,KAAK,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,CAAA;IAC1F,MAAM,MAAM,GAAG,OAAO,OAAO,CAAC,GAAG,KAAK,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,CAAA;IAC3E,IAAI,WAAW,KAAK,MAAM,EAAE,CAAC;QAC5B,OAAO,4CAA4C,CAAA;IACpD,CAAC;IAED,IAAI,OAAO,CAAC,OAAO,CAAC,GAAG,IAAI,KAAK,CAAC,KAAK,SAAS,EAAE,CAAC;QACjD,OAAO,uBAAuB,CAAA;IAC/B,CAAC;IAED,OAAO,IAAI,CAAA;AACZ,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,GAAwB,EAAE,OAAe,EAAE,MAAc,EAAQ,EAAE;IACzG,WAAW,CACV,GAAG,EACH;QACC,EAAE,EAAE,KAAK;QACT,KAAK,EAAE;YACN,OAAO,EAAE,oBAAoB,OAAO,+BAA+B,MAAM,cAAc;YACvF,IAAI,EAAE,kBAAkB;SACxB;KACD,EACD,GAAG,CACH,CAAA;AACF,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,GAAwB,EAAE,GAAW,EAAQ,EAAE;IACvF,WAAW,CACV,GAAG,EACH;QACC,EAAE,EAAE,KAAK;QACT,KAAK,EAAE;YACN,OAAO,EAAE,iCAAiC,GAAG,uCAAuC;YACpF,IAAI,EAAE,aAAa;SACnB;KACD,EACD,GAAG,CACH,CAAA;AACF,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,GAAwB,EAAE,KAAc,EAAW,EAAE;IACjG,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACzC,OAAO,KAAK,CAAA;IACb,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,IAAI,KAAK,CAAC,CAAC,CAAE,KAA4B,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAA;IAC7E,IAAI,IAAI,KAAK,aAAa,EAAE,CAAC;QAC5B,OAAO,KAAK,CAAA;IACb,CAAC;IAED,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,mEAAmE,CAAA;IAC7I,WAAW,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;IAC7E,OAAO,IAAI,CAAA;AACZ,CAAC,CAAA"}
+{"version":3,"file":"domSelectorRoute.js","sourceRoot":"","sources":["../../../src/http/routes/domSelectorRoute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAE9C,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAQ9D;;;;GAIG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,OAAwB,EAAiB,EAAE;IAChF,MAAM,WAAW,GAAG,OAAO,OAAO,CAAC,QAAQ,KAAK,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,CAAA;IAC1F,MAAM,MAAM,GAAG,OAAO,OAAO,CAAC,GAAG,KAAK,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,CAAA;IAC3E,IAAI,WAAW,KAAK,MAAM,EAAE,CAAC;QAC5B,OAAO,4CAA4C,CAAA;IACpD,CAAC;IAED,IAAI,OAAO,CAAC,OAAO,CAAC,GAAG,IAAI,KAAK,CAAC,KAAK,SAAS,EAAE,CAAC;QACjD,OAAO,uBAAuB,CAAA;IAC/B,CAAC;IAED,OAAO,IAAI,CAAA;AACZ,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,GAAwB,EAAE,OAAe,EAAE,MAAc,EAAQ,EAAE;IACzG,WAAW,CACV,GAAG,EACH;QACC,EAAE,EAAE,KAAK;QACT,KAAK,EAAE;YACN,OAAO,EAAE,oBAAoB,OAAO,+BAA+B,MAAM,cAAc;YACvF,IAAI,EAAE,kBAAkB;SACxB;KACD,EACD,GAAG,CACH,CAAA;AACF,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,GAAwB,EAAE,GAAW,EAAQ,EAAE;IACvF,WAAW,CACV,GAAG,EACH;QACC,EAAE,EAAE,KAAK;QACT,KAAK,EAAE;YACN,OAAO,EAAE,iCAAiC,GAAG,uCAAuC;YACpF,IAAI,EAAE,aAAa;SACnB;KACD,EACD,GAAG,CACH,CAAA;AACF,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,GAAwB,EAAE,KAAc,EAAW,EAAE;IACjG,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,aAAa,CAAC,EAAE,CAAC;QACzC,OAAO,KAAK,CAAA;IACb,CAAC;IAED,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,mEAAmE,CAAA;IAC7I,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,aAAa,EAAE,OAAO,CAAC,CAAA;IACjD,OAAO,IAAI,CAAA;AACZ,CAAC,CAAA"}