@owlmeans/server-api 0.1.18-rc.5 → 0.1.18-rc.51

package/build/utils/context/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/build/utils/context/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/utils/context/types.ts"],"names":[],"mappings":""}

package/build/utils/context.d.ts

@@ -1,4 +1,4 @@
-import type { Config, Context, Request } from '../types.js';
-export declare const populateContext: <C extends Config, T extends Context<C>>(req: Request, context: T) => void;
-export declare const extractContext: <C extends Config, T extends Context<C>>(req: Request, ctx?: T, location?: string) => T;
+import type { Request } from '../types.js';
+import type { RequestContextHelper } from './context/types.js';
+export declare const makeRequestContextHelper: (req: Request) => RequestContextHelper;
 //# sourceMappingURL=context.d.ts.map

package/build/utils/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/utils/context.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAG3D,eAAO,MAAM,eAAe,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,OAAO,CAAC,CAAC,CAAC,OAAO,OAAO,WAAW,CAAC,KAAG,IAC/D,CAAA;AAEpC,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,OAAO,CAAC,CAAC,CAAC,OAAO,OAAO,QAAQ,CAAC,aAAa,MAAM,KAAG,CACxC,CAAA"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/utils/context.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAmB,OAAO,EAAE,MAAM,aAAa,CAAA;AAE3D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAA;AAE9D,eAAO,MAAM,wBAAwB,QAAS,OAAO,KAAG,oBAQvD,CAAA"}

package/build/utils/context.js

@@ -1,5 +1,8 @@
 import { assertContext } from '@owlmeans/context';
 import { DEFAULT_ALIAS } from '../consts.js';
-export const populateContext = (req, context) => void (req._ctx = context);
-export const extractContext = (req, ctx, location) => assertContext(req._ctx ?? ctx, location ?? DEFAULT_ALIAS);
+export const makeRequestContextHelper = (req) => {
+    const populateContext = (context) => void (req._ctx = context);
+    const extractContext = (ctx, location) => assertContext(req._ctx ?? ctx, location ?? DEFAULT_ALIAS);
+    return { populateContext, extractContext };
+};
 //# sourceMappingURL=context.js.map

package/build/utils/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/utils/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAEjD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAE5C,MAAM,CAAC,MAAM,eAAe,GAAG,CAAyC,GAAY,EAAE,OAAU,EAAQ,EAAE,CACxG,KAAK,CAAE,GAAW,CAAC,IAAI,GAAG,OAAO,CAAC,CAAA;AAEpC,MAAM,CAAC,MAAM,cAAc,GAAG,CAAyC,GAAY,EAAE,GAAO,EAAE,QAAiB,EAAK,EAAE,CACpH,aAAa,CAAQ,GAAW,CAAC,IAAI,IAAI,GAAG,EAAE,QAAQ,IAAI,aAAa,CAAC,CAAA"}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/utils/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAEjD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAG5C,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,GAAY,EAAwB,EAAE;IAC7E,MAAM,eAAe,GAAG,CAAyC,OAAU,EAAQ,EAAE,CACnF,KAAK,CAAE,GAAW,CAAC,IAAI,GAAG,OAAO,CAAC,CAAA;IAEpC,MAAM,cAAc,GAAG,CAAyC,GAAO,EAAE,QAAiB,EAAK,EAAE,CAC/F,aAAa,CAAQ,GAAW,CAAC,IAAI,IAAI,GAAG,EAAE,QAAQ,IAAI,aAAa,CAAC,CAAA;IAE1E,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,CAAA;AAC5C,CAAC,CAAA"}

package/build/utils/error/types.d.ts

@@ -0,0 +1,52 @@
+import type { FastifyReply } from 'fastify';
+import type { Config, HttpErrorExposure } from '../../types.js';
+import type { SerializedHttpError } from '../types.js';
+/** How the HTTP boundary answers a thrown error: its status, its wire body, its headers and its log entry. */
+export interface HttpErrorHelper {
+    /**
+     * The HTTP status an error's class declares, or `null` when it declares none that may be honoured.
+     *
+     * Read through the constructor chain — a static property is inherited, so a subclass answers what
+     * its nearest declaring ancestor says, and redeclares to change it. An integer 4xx is honoured
+     * directly. A 5xx is honoured only with `allowServerErrorStatus = true`, so a domain class must
+     * explicitly opt in to exposing a precise availability response. The read is structural, so a
+     * class from a duplicate module copy declares exactly what the imported one does.
+     */
+    declaredErrorStatus: (error: unknown) => number | null;
+    /**
+     * The HTTP status an error is answered with, read off the error exactly as given.
+     *
+     * Two families reach here and both must be recognised. `AuthFailedError` / `AccessError` are this
+     * package's own, raised by the request pipeline itself. `AuthorizationError` / `AuthForbidden`
+     * come from `@owlmeans/auth` and are what the guards and gates actually throw — an unrecognised
+     * one answers 500, which reports a refused request as a crashed server: the client cannot tell
+     * "sign in again" from "the service is broken", and a consumer watching statuses concludes the
+     * application fell over. A family member is recognised by class OR by registered type name, so a
+     * class from a duplicate module copy answers the same status.
+     *
+     * **Order matters.** `AuthForbidden extends AuthorizationError`, so the 403 branch has to be
+     * tested first or every refusal of a permission is reported as a failure to authenticate. Both
+     * auth branches come before a class's own declaration, so an auth refusal can never be restated
+     * as something else. Everything that is neither an auth error nor a class declaring an allowed
+     * {@link HttpErrorHelper.declaredErrorStatus} answers 500.
+     */
+    errorStatus: (error: unknown) => number;
+    /** Invalid or absent configuration always resolves to the production-safe policy. */
+    errorExposure: (config?: Pick<Config, 'http'>) => HttpErrorExposure;
+    /** One central wire shape for every server error. */
+    serializeError: (error: Error, exposure?: HttpErrorExposure) => SerializedHttpError;
+    /** Apply safe response metadata carried by an error without coupling its package to Fastify. */
+    applyErrorHeaders: (error: unknown, reply: FastifyReply) => void;
+    /**
+     * Answer a thrown error: a status, and the marshalled `ResilientError` as the body.
+     *
+     * The status is resolved in two steps. The error AS THROWN comes first: it is the one object whose
+     * class is certainly the class that was raised, while `ResilientError.ensure` rebuilds through the
+     * registry of whichever `@owlmeans/error` copy this module loaded — under duplicate module copies
+     * that turns a perfectly recognisable auth refusal into a plain `ResilientError` answering 500.
+     * Only when the thrown error answers 500 is the ENSURED error asked, because the rebuild is what
+     * gives a status to a marshalled error that crossed a hop as a plain `Error`.
+     */
+    handleError: (error: Error, reply: FastifyReply, exposure?: HttpErrorExposure) => void;
+}
+//# sourceMappingURL=types.d.ts.map

package/build/utils/error/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/utils/error/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAC3C,OAAO,KAAK,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAC/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AAEtD,8GAA8G;AAC9G,MAAM,WAAW,eAAe;IAC9B;;;;;;;;OAQG;IACH,mBAAmB,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,MAAM,GAAG,IAAI,CAAA;IACtD;;;;;;;;;;;;;;;;OAgBG;IACH,WAAW,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,MAAM,CAAA;IACvC,qFAAqF;IACrF,aAAa,EAAE,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,iBAAiB,CAAA;IACnE,qDAAqD;IACrD,cAAc,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,iBAAiB,KAAK,mBAAmB,CAAA;IACnF,gGAAgG;IAChG,iBAAiB,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,KAAK,IAAI,CAAA;IAChE;;;;;;;;;OASG;IACH,WAAW,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,QAAQ,CAAC,EAAE,iBAAiB,KAAK,IAAI,CAAA;CACvF"}

package/build/utils/error/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/build/utils/error/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/utils/error/types.ts"],"names":[],"mappings":""}

package/build/utils/error.d.ts

@@ -1,3 +1,6 @@
-import type { FastifyReply } from 'fastify';
-export declare const handleError: (error: Error, reply: FastifyReply) => void;
+import type { HttpErrorHelper } from './error/types.js';
+export declare const createHttpErrorHelper: () => HttpErrorHelper;
+export declare const httpErrorHelper: HttpErrorHelper;
+/** @deprecated compat:factory-refactor — use `httpErrorHelper.errorStatus(…)` */
+export declare const errorStatus: (error: unknown) => number;
 //# sourceMappingURL=error.d.ts.map

package/build/utils/error.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../src/utils/error.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAI3C,eAAO,MAAM,WAAW,UAAW,KAAK,SAAS,YAAY,SAY5D,CAAA"}
+{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../src/utils/error.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAEvD,eAAO,MAAM,qBAAqB,QAAO,eAyKxC,CAAA;AAED,eAAO,MAAM,eAAe,iBAA0B,CAAA;AAEtD,iFAAiF;AACjF,eAAO,MAAM,WAAW,UAAW,OAAO,KAAG,MAA4C,CAAA"}

package/build/utils/error.js

@@ -1,16 +1,166 @@
-import { FORBIDDEN_ERROR, SERVER_ERROR, UNAUTHORIZED_ERROR } from '@owlmeans/api';
+import { FORBIDDEN_ERROR, SERVER_ERROR, UNAUTHORIZED_ERROR, DENIAL_KIND_HEADER, ACCESS_DENIED_KIND, } from '@owlmeans/api';
 import { AccessError, AuthFailedError } from '../errors.js';
-import { ResilientError } from '@owlmeans/error';
-export const handleError = (error, reply) => {
-    let code = SERVER_ERROR;
-    if (error instanceof AuthFailedError) {
-        code = UNAUTHORIZED_ERROR;
-    }
-    else if (error instanceof AccessError) {
-        code = FORBIDDEN_ERROR;
-    }
-    if (!reply.sent) {
-        reply.code(code).send(ResilientError.marshal(ResilientError.ensure(error)).message);
-    }
+import { AuthForbidden, AuthorizationError } from '@owlmeans/auth';
+import { isResilientError, ResilientError, SEPARATOR } from '@owlmeans/error';
+import { randomUUID } from 'node:crypto';
+import { logger } from '@owlmeans/log';
+import { CLIENT_ERROR_FIRST, CLIENT_ERROR_LAST, SERVER_ERROR_FIRST, SERVER_ERROR_LAST } from './consts.local.js';
+import { INCIDENT_ID_HEADER } from './consts.js';
+export const createHttpErrorHelper = () => {
+    const declaredErrorStatus = (error) => {
+        if (error == null || typeof error !== 'object') {
+            return null;
+        }
+        const declaration = error.constructor;
+        const status = declaration?.httpStatus;
+        if (typeof status !== 'number' || !Number.isInteger(status)) {
+            return null;
+        }
+        if (status >= CLIENT_ERROR_FIRST && status <= CLIENT_ERROR_LAST)
+            return status;
+        if (status >= SERVER_ERROR_FIRST && status <= SERVER_ERROR_LAST
+            && declaration?.allowServerErrorStatus === true)
+            return status;
+        return null;
+    };
+    /**
+     * The registered type names an error carries: its own `type`, and the static `typeName` of every
+     * class on its constructor chain.
+     *
+     * This is how a class is recognised when `instanceof` cannot see it. A process that loads a package
+     * twice — `bun --preserve-symlinks` over a linked workspace resolves one package through several
+     * `node_modules` paths — holds several copies of every error class, and an error built by one copy
+     * is not an instance of another. The registered names are the same in every copy. A subclass's
+     * `typeName` does not reliably embed its parent's (`EntitlementRefusal` extends `AuthForbidden`), so
+     * a family is recognised by walking the chain and matching names exactly, never by a substring.
+     */
+    const typeNamesOf = (error) => {
+        const names = new Set();
+        const type = error.type;
+        if (typeof type === 'string') {
+            names.add(type);
+        }
+        let ctor = error.constructor;
+        while (typeof ctor === 'function') {
+            const name = ctor.typeName;
+            if (typeof name === 'string') {
+                names.add(name);
+            }
+            ctor = Object.getPrototypeOf(ctor);
+        }
+        return names;
+    };
+    const isOfFamily = (names, family) => family.some(typeName => names.has(typeName));
+    const errorStatus = (error) => {
+        if (error == null || typeof error !== 'object') {
+            return SERVER_ERROR;
+        }
+        const names = typeNamesOf(error);
+        if (error instanceof AuthForbidden || error instanceof AccessError
+            || isOfFamily(names, [AuthForbidden.typeName, AccessError.typeName])) {
+            // An established identity that lacks the permission. Re-authenticating changes nothing.
+            return FORBIDDEN_ERROR;
+        }
+        if (error instanceof AuthorizationError || error instanceof AuthFailedError
+            || isOfFamily(names, [AuthorizationError.typeName, AuthFailedError.typeName])) {
+            // No usable credential — absent, expired, revoked, or naming a session this server no longer
+            // holds. The caller is told to sign in, not that signing in would not help.
+            return UNAUTHORIZED_ERROR;
+        }
+        return declaredErrorStatus(error) ?? SERVER_ERROR;
+    };
+    const errorExposure = (config) => config?.http?.errors?.exposure === 'development' ? 'development' : 'production';
+    /**
+     * Preserve a typed/marshalled error when possible without asking `ensure` to convert a plain
+     * error. In particular, `ensure` deliberately rethrows SyntaxError; an HTTP boundary still has
+     * to serialize it safely and let the incident log retain the original object.
+     */
+    const normalizeForWire = (error) => {
+        if (error instanceof SyntaxError || isResilientError(error)) {
+            return error;
+        }
+        if (error.message.includes(SEPARATOR)) {
+            const ensured = ResilientError.ensure(error);
+            // The catch-all converter's legacy constructor shape shifts an ordinary error's fields.
+            // Only keep `ensure`'s result when a registered wire prefix actually rebuilt something.
+            if (ensured.type !== error.message || ensured.message !== error.stack) {
+                return ensured;
+            }
+        }
+        return error;
+    };
+    const serializeError = (error, exposure = 'production') => {
+        const normalized = normalizeForWire(error);
+        const thrown = errorStatus(error);
+        const status = thrown !== SERVER_ERROR ? thrown : errorStatus(normalized);
+        const incidentId = randomUUID();
+        // The server log owns every diagnostic. Production callers receive only its correlation key;
+        // development keeps the typed wire form so local clients can retain their usual error details.
+        Object.assign(error, { incidentId });
+        if (isResilientError(normalized))
+            normalized.incidentId = incidentId;
+        const body = exposure === 'production'
+            ? incidentId
+            : ResilientError.marshal(normalized, { includeStack: true, incidentId }).message;
+        return { status, body, incidentId };
+    };
+    const applyErrorHeaders = (error, reply) => {
+        if (error == null || typeof error !== 'object') {
+            return;
+        }
+        const retryAfter = error.retryAfter;
+        if (typeof retryAfter === 'number' && Number.isFinite(retryAfter) && retryAfter > 0) {
+            reply.header('Retry-After', String(Math.ceil(retryAfter)));
+        }
+        // Match exact registered types. EntitlementRefusal also extends AuthForbidden but is a plan
+        // decision, not a person's IAM permission denial.
+        const type = error.type;
+        if (type === AuthForbidden.typeName || type === AccessError.typeName) {
+            reply.header(DENIAL_KIND_HEADER, ACCESS_DENIED_KIND);
+        }
+    };
+    const http = logger('http');
+    /**
+     * The one log entry of a failed request, by what the failure means:
+     *
+     * | Status | Level | Why |
+     * |---|---|---|
+     * | 5xx | error | a fault — the one entry that owns type, message and stack, keyed by the incident id |
+     * | 403 | warn, `access.forbidden` | an established identity was refused; worth an operator's eye |
+     * | 401 | debug, `auth.refused` | an absent or expired credential is the ordinary shape of a sign-in |
+     * | other 4xx | debug | the caller's mistake, not the server's |
+     *
+     * The method and path are logged; the query string is not — it can carry a token.
+     */
+    const logFailure = (error, reply, status, incidentId) => {
+        const request = reply.request;
+        const where = { method: request?.method, path: request?.url?.split('?')[0], status, incidentId };
+        if (status >= SERVER_ERROR) {
+            http.error('Request failed', { err: error, ...where });
+        }
+        else if (status === FORBIDDEN_ERROR) {
+            http.warn('Access forbidden', { type: error.type, message: error.message, ...where }, { event: 'access.forbidden' });
+        }
+        else if (status === UNAUTHORIZED_ERROR) {
+            http.debug('Authentication refused', { message: error.message, ...where }, { event: 'auth.refused' });
+        }
+        else {
+            http.debug('Request refused', { message: error.message, ...where });
+        }
+    };
+    const handleError = (error, reply, exposure = 'production') => {
+        if (!reply.sent) {
+            const serialized = serializeError(error, exposure);
+            applyErrorHeaders(error, reply);
+            logFailure(error, reply, serialized.status, serialized.incidentId);
+            reply.header(INCIDENT_ID_HEADER, serialized.incidentId)
+                .code(serialized.status)
+                .send(serialized.body);
+        }
+    };
+    return { declaredErrorStatus, errorStatus, errorExposure, serializeError, applyErrorHeaders, handleError };
 };
+export const httpErrorHelper = createHttpErrorHelper();
+/** @deprecated compat:factory-refactor — use `httpErrorHelper.errorStatus(…)` */
+export const errorStatus = (error) => httpErrorHelper.errorStatus(error);
 //# sourceMappingURL=error.js.map

package/build/utils/error.js.map

@@ -1 +1 @@
-{"version":3,"file":"error.js","sourceRoot":"","sources":["../../src/utils/error.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAEjF,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAEhD,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,KAAY,EAAE,KAAmB,EAAE,EAAE;IAC/D,IAAI,IAAI,GAAW,YAAY,CAAA;IAC/B,IAAI,KAAK,YAAY,eAAe,EAAE,CAAC;QACrC,IAAI,GAAG,kBAAkB,CAAA;IAC3B,CAAC;SAAM,IAAI,KAAK,YAAY,WAAW,EAAE,CAAC;QACxC,IAAI,GAAG,eAAe,CAAA;IACxB,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QAChB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CACnB,cAAc,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,KAAc,CAAC,CAAC,CAAC,OAAO,CACtE,CAAA;IACH,CAAC;AACH,CAAC,CAAA"}
+{"version":3,"file":"error.js","sourceRoot":"","sources":["../../src/utils/error.ts"],"names":[],"mappings":"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"}

package/build/utils/guards.d.ts

@@ -1,9 +1,5 @@
 import type { FastifyReply, FastifyRequest } from 'fastify';
 import type { ServerEntrypoint } from '@owlmeans/server-entrypoint';
-import type { ServerConfig, ServerContext } from '@owlmeans/server-context';
-type Config = ServerConfig;
-interface Context<C extends Config = Config> extends ServerContext<C> {
-}
+import type { Config, Context } from './types.local.js';
 export declare const authorize: <C extends Config, T extends Context<C>>(context: T, module: ServerEntrypoint<FastifyRequest>, req: FastifyRequest, reply: FastifyReply) => Promise<[T, ServerEntrypoint<FastifyRequest>]>;
-export {};
 //# sourceMappingURL=guards.d.ts.map

package/build/utils/guards.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"guards.d.ts","sourceRoot":"","sources":["../../src/utils/guards.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAC3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAGnE,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAK3E,KAAK,MAAM,GAAG,YAAY,CAAA;AAC1B,UAAU,OAAO,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,CAAE,SAAQ,aAAa,CAAC,CAAC,CAAC;CAAI;AAEzE,eAAO,MAAM,SAAS,GAAU,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,OAAO,CAAC,CAAC,CAAC,WAC3D,CAAC,UAAU,gBAAgB,CAAC,cAAc,CAAC,OAC/C,cAAc,SAAS,YAAY,KACvC,OAAO,CAAC,CAAC,CAAC,EAAE,gBAAgB,CAAC,cAAc,CAAC,CAAC,CA0D/C,CAAA"}
+{"version":3,"file":"guards.d.ts","sourceRoot":"","sources":["../../src/utils/guards.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAC3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAKnE,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAIvD,eAAO,MAAM,SAAS,GAAU,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,OAAO,CAAC,CAAC,CAAC,WAC3D,CAAC,UAAU,gBAAgB,CAAC,cAAc,CAAC,OAC/C,cAAc,SAAS,YAAY,KACvC,OAAO,CAAC,CAAC,CAAC,EAAE,gBAAgB,CAAC,cAAc,CAAC,CAAC,CAmD/C,CAAA"}

package/build/utils/guards.js

@@ -1,19 +1,19 @@
-import { isContextWithoutIds, Layer } from '@owlmeans/context';
 import { provideResponse } from '@owlmeans/entrypoint';
-import { executeResponse, provideRequest } from './payload.js';
+import { payloadHelper } from './payload.js';
 import { AuthFailedError } from '../errors.js';
+import { makeEntityScope } from '@owlmeans/auth-common';
 export const authorize = async (context, module, req, reply) => {
     const guards = module.getGuards();
     if (guards.length > 0) {
         const response = provideResponse(reply);
-        const request = provideRequest(module.alias, req);
+        const request = payloadHelper.provideRequest(module.alias, req);
         let guard = undefined;
         for (const alias of guards) {
             const _guard = context.service(alias);
             if (await _guard.match(request, response)) {
                 guard = _guard;
             }
-            executeResponse(response, reply, true);
+            payloadHelper.executeResponse(response, reply, true);
             if (guard != null) {
                 break;
             }
@@ -25,7 +25,7 @@ export const authorize = async (context, module, req, reply) => {
         if (!await guard.handle(request, authResponse)) {
             throw new AuthFailedError(guard.alias);
         }
-        executeResponse(authResponse, reply, true);
+        payloadHelper.executeResponse(authResponse, reply, true);
         // Guard that returns true and does not provide an error is an optional guard
         // if (authResponse.value == null) {
         //   throw SyntaxError(`Guard that returns true and does not provide an error, should provide authorization`)
@@ -34,20 +34,16 @@ export const authorize = async (context, module, req, reply) => {
         if (request.auth != null) {
             req._auth = request.auth;
         }
-        if (request.auth?.entityId != null) {
-            // @TODO Probably we need to downgrade context in this case
-            if (!isContextWithoutIds(context)) {
-                throw SyntaxError(`Context should be without ids during authorization ${context.cfg.layer}:${context.cfg.layerId}`);
-            }
-            if (isContextWithoutIds(context) && context.cfg.layer !== Layer.Service) {
-                context = await context.updateContext(undefined, Layer.Service);
-                await context.waitForInitialized();
-            }
-            context = await context.updateContext(request.auth.entityId, Layer.Entity);
-            await context.waitForInitialized();
-            // We elevate module to the context level if it was changed
-            module = context.entrypoint(module.alias);
-            await module.resolve();
+        // The token names the organization by slug; everything downstream — grants, records, minted
+        // infrastructure names — keys on the entity's stable id. Resolving here, once, is what keeps a
+        // rename from being a sweep of every handler: the id arrives on the request, and a slug that
+        // has since been retired still resolves to the entity that retired it.
+        const entity = await makeEntityScope(request).attachEntity(context);
+        if (entity != null) {
+            // Carried on the raw request the same way `_auth` is, so the request the handler is given
+            // later — a different object, built after this runs — sees the same resolution.
+            ;
+            req._entity = entity;
         }
     }
     // Update context in request object

package/build/utils/guards.js.map

@@ -1 +1 @@
-{"version":3,"file":"guards.js","sourceRoot":"","sources":["../../src/utils/guards.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"guards.js","sourceRoot":"","sources":["../../src/utils/guards.ts"],"names":[],"mappings":"AAEA,OAAO,EAAqB,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAG9C,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAGvD,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,EAC5B,OAAU,EAAE,MAAwC,EACpD,GAAmB,EAAE,KAAmB,EACQ,EAAE;IAClD,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,EAAE,CAAA;IACjC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,MAAM,QAAQ,GAAG,eAAe,CAAC,KAAK,CAAC,CAAA;QACvC,MAAM,OAAO,GAAG,aAAa,CAAC,cAAc,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;QAE/D,IAAI,KAAK,GAA6B,SAAS,CAAA;QAC/C,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,MAAM,MAAM,GAAiB,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;YACnD,IAAI,MAAM,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,CAAC;gBAC1C,KAAK,GAAG,MAAM,CAAA;YAChB,CAAC;YACD,aAAa,CAAC,eAAe,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;YACpD,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;gBAClB,MAAK;YACP,CAAC;QACH,CAAC;QAED,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;YAClB,MAAM,IAAI,eAAe,EAAE,CAAA;QAC7B,CAAC;QAED,MAAM,YAAY,GAAG,eAAe,CAAO,KAAK,CAAC,CAAA;QACjD,IAAI,CAAC,MAAM,KAAK,CAAC,MAAM,CAAU,OAAO,EAAE,YAAY,CAAC,EAAE,CAAC;YACxD,MAAM,IAAI,eAAe,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QACxC,CAAC;QACD,aAAa,CAAC,eAAe,CAAC,YAAY,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;QACxD,6EAA6E;QAC7E,oCAAoC;QACpC,6GAA6G;QAC7G,IAAI;QACJ,OAAO,CAAC,IAAI,GAAG,YAAY,CAAC,KAAK,CAAC;QAClC,IAAI,OAAO,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;YACxB,GAAW,CAAC,KAAK,GAAG,OAAO,CAAC,IAAI,CAAA;QACnC,CAAC;QAED,4FAA4F;QAC5F,+FAA+F;QAC/F,6FAA6F;QAC7F,uEAAuE;QACvE,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;QACnE,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;YACnB,0FAA0F;YAC1F,gFAAgF;YAChF,CAAC;YAAC,GAAW,CAAC,OAAO,GAAG,MAAM,CAAA;QAChC,CAAC;IACH,CAAC;IACD,mCAAmC;IAClC,GAAW,CAAC,IAAI,GAAG,OAAO,CAAA;IAE3B,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;AAC1B,CAAC,CAAA"}

package/build/utils/index.d.ts

@@ -1,7 +1,12 @@
 export * from './error.js';
+export * from './consts.js';
+export type * from './types.js';
+export type * from './error/types.js';
+export type * from './payload/types.js';
+export type * from './context/types.js';
 export * from './server.js';
 export * from './payload.js';
-export * from './server.js';
+export * from './schema.js';
 export * from './guards.js';
 export * from './context.js';
 //# sourceMappingURL=index.d.ts.map

package/build/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AACA,cAAc,YAAY,CAAA;AAC1B,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA;AAC5B,cAAc,aAAa,CAAA;AAC3B,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AACA,cAAc,YAAY,CAAA;AAC1B,cAAc,aAAa,CAAA;AAC3B,mBAAmB,YAAY,CAAA;AAC/B,mBAAmB,kBAAkB,CAAA;AACrC,mBAAmB,oBAAoB,CAAA;AACvC,mBAAmB,oBAAoB,CAAA;AACvC,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA;AAC5B,cAAc,aAAa,CAAA;AAC3B,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA"}

package/build/utils/index.js

@@ -1,7 +1,8 @@
 export * from './error.js';
+export * from './consts.js';
 export * from './server.js';
 export * from './payload.js';
-export * from './server.js';
+export * from './schema.js';
 export * from './guards.js';
 export * from './context.js';
 //# sourceMappingURL=index.js.map

package/build/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AACA,cAAc,YAAY,CAAA;AAC1B,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA;AAC5B,cAAc,aAAa,CAAA;AAC3B,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AACA,cAAc,YAAY,CAAA;AAC1B,cAAc,aAAa,CAAA;AAK3B,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA;AAC5B,cAAc,aAAa,CAAA;AAC3B,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA"}

package/build/utils/log.d.ts

@@ -0,0 +1,11 @@
+import type { FastifyBaseLogger } from 'fastify';
+import { type Logger } from '@owlmeans/log';
+/**
+ * A pino-shaped logger over `@owlmeans/log`, handed to Fastify as its `loggerInstance`.
+ *
+ * Fastify then logs through the process's own level, format and plugins instead of a second pino
+ * instance that ignores them. `(object, message)` and `(message)` are the two shapes Fastify and
+ * its plugins call with; an `err` in the object travels as the record's error.
+ */
+export declare const fastifyLogger: (log?: Logger, bindings?: Record<string, unknown>) => FastifyBaseLogger;
+//# sourceMappingURL=log.d.ts.map

package/build/utils/log.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../../src/utils/log.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAA;AAChD,OAAO,EAAyB,KAAK,MAAM,EAAE,MAAM,eAAe,CAAA;AA0BlE;;;;;;GAMG;AACH,eAAO,MAAM,aAAa,SAAS,MAAM,aAA8B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAG,iBAsBhG,CAAA"}

package/build/utils/log.js

@@ -0,0 +1,57 @@
+import { logger } from '@owlmeans/log';
+/**
+ * What Fastify says about itself, mapped to what an operator needs at each level.
+ *
+ * Fastify writes a pair of `info` lines for EVERY request and one for each unknown route, and
+ * announces its own listening address. The server writes one `debug` record per request itself
+ * (`onResponse`), a failed request is classified once in `handleError`, and the listening line is
+ * `server.listening` — so these are dropped or lowered here, by their fixed wording, rather than by
+ * a Fastify option (`disableRequestLogging` is deprecated from 5.12, `logController` does not exist
+ * before it).
+ */
+const levelOf = (level, message) => {
+    if (typeof message !== 'string' || level !== 'info') {
+        return level;
+    }
+    if (message === 'incoming request' || message === 'request completed') {
+        return undefined;
+    }
+    if (message.startsWith('Server listening at') || /^Route .* not found$/.test(message)) {
+        return 'debug';
+    }
+    return level;
+};
+/**
+ * A pino-shaped logger over `@owlmeans/log`, handed to Fastify as its `loggerInstance`.
+ *
+ * Fastify then logs through the process's own level, format and plugins instead of a second pino
+ * instance that ignores them. `(object, message)` and `(message)` are the two shapes Fastify and
+ * its plugins call with; an `err` in the object travels as the record's error.
+ */
+export const fastifyLogger = (log = logger('http'), bindings) => {
+    const call = (requested) => (first, second) => {
+        const [object, message] = typeof first === 'string' || first instanceof Error
+            ? [undefined, first] : [first, second];
+        const level = levelOf(requested, message);
+        if (level == null) {
+            return;
+        }
+        const data = bindings != null && Object.keys(bindings).length > 0
+            ? { ...bindings, ...(object != null && typeof object === 'object' ? object : {}) } : object;
+        log[level](message == null ? '' : message instanceof Error ? message : String(message), data);
+    };
+    const adapter = {
+        get level() { return levelName(log); },
+        set level(_value) { },
+        fatal: call('error'), error: call('error'), warn: call('warn'),
+        info: call('info'), debug: call('debug'), trace: call('debug'),
+        silent: () => undefined,
+        child: (extra) => fastifyLogger(log, { ...bindings, ...extra }),
+    };
+    return adapter;
+};
+const levelName = (log) => {
+    const order = ['debug', 'info', 'warn', 'error'];
+    return order.find(level => log.enabled(level)) ?? 'silent';
+};
+//# sourceMappingURL=log.js.map

package/build/utils/log.js.map

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

package/build/utils/payload/types.d.ts

@@ -0,0 +1,18 @@
+import type { AbstractRequest, AbstractResponse } from '@owlmeans/entrypoint';
+import type { Request, Response } from '../../types.js';
+/** Moves an exchange between Fastify and the entrypoint shapes: the request in, the response out. */
+export interface PayloadHelper {
+    /** The entrypoint request of a Fastify request; `provision` keeps the original on it. */
+    provideRequest: (alias: string, req: Request, provision?: boolean) => AbstractRequest;
+    /**
+     * Emits the response onto the fastify reply if the handler produced an
+     * error or an outcome. Returns `true` when something was actually sent so
+     * callers don't rely on `reply.sent`, which in fastify v5 only flips once
+     * the raw socket finishes writing (asynchronously) and therefore reads
+     * `false` synchronously right after `reply.send()`.
+     *
+     * @throws {Error}
+     */
+    executeResponse: <T>(response: AbstractResponse<T>, reply: Response, throwOnError?: boolean) => boolean;
+}
+//# sourceMappingURL=types.d.ts.map

package/build/utils/payload/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/utils/payload/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAC7E,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEvD,qGAAqG;AACrG,MAAM,WAAW,aAAa;IAC5B,yFAAyF;IACzF,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,OAAO,KAAK,eAAe,CAAA;IACrF;;;;;;;;OAQG;IACH,eAAe,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,YAAY,CAAC,EAAE,OAAO,KAAK,OAAO,CAAA;CACxG"}

package/build/utils/payload/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/build/utils/payload/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/utils/payload/types.ts"],"names":[],"mappings":""}

package/build/utils/payload.d.ts

@@ -1,16 +1,4 @@
-import type { AbstractResponse, AbstractRequest } from '@owlmeans/entrypoint';
-import type { Request, Response } from '../types.js';
-import type { AnySchemaObject } from 'ajv';
-export declare const provideRequest: (alias: string, req: Request, provision?: boolean) => AbstractRequest;
-/**
- * Emits the response onto the fastify reply if the handler produced an
- * error or an outcome. Returns `true` when something was actually sent so
- * callers don't rely on `reply.sent`, which in fastify v5 only flips once
- * the raw socket finishes writing (asynchronously) and therefore reads
- * `false` synchronously right after `reply.send()`.
- *
- * @throws {Error}
- */
-export declare const executeResponse: <T>(response: AbstractResponse<T>, reply: Response, throwOnError?: boolean) => boolean;
-export declare const fixFormatDates: (schema: AnySchemaObject) => AnySchemaObject;
+import type { PayloadHelper } from './payload/types.js';
+export declare const createPayloadHelper: () => PayloadHelper;
+export declare const payloadHelper: PayloadHelper;
 //# sourceMappingURL=payload.d.ts.map

package/build/utils/payload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"payload.d.ts","sourceRoot":"","sources":["../../src/utils/payload.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC7E,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAEpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,KAAK,CAAA;AAE1C,eAAO,MAAM,cAAc,UAAW,MAAM,OAAO,OAAO,cAAc,OAAO,KAAG,eAYjF,CAAA;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,eAAe,GAAI,CAAC,YAAY,gBAAgB,CAAC,CAAC,CAAC,SAAS,QAAQ,iBAAiB,OAAO,KAAG,OAuB3G,CAAA;AAGD,eAAO,MAAM,cAAc,WAAY,eAAe,oBAgBrD,CAAA"}
+{"version":3,"file":"payload.d.ts","sourceRoot":"","sources":["../../src/utils/payload.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAEvD,eAAO,MAAM,mBAAmB,QAAO,aA4CtC,CAAA;AAED,eAAO,MAAM,aAAa,eAAwB,CAAA"}