@devmoods/express-extras 0.67.0 → 0.69.0

package/dist/auth/emailAndPassword.js

@@ -1,7 +1,6 @@
 import { startTimer } from '@devmoods/observability';
 import argon2 from 'argon2';
 import bcrypt from 'bcrypt';
-import {} from 'express';
 import { createTokenResponse, tokenSchema } from './token.js';
 import {} from './types.js';
 import { Unauthorized } from '../errors.js';
@@ -57,8 +56,9 @@ export function EmailAndPasswordAuthProvider(options) {
                 }
                 context.setCurrentUser(user);
                 await options.onPasswordChanged?.(user, await hashPassword(password), {
-                    /* c8 ignore next 2 */
+                    /* v8 ignore next -- @preserve */
                     ip: req.ip ?? '',
+                    /* v8 ignore next -- @preserve */
                     userAgent: req.headers['user-agent'] ?? '',
                 });
                 logger.info('user changed password');

package/dist/auth/google.js

@@ -1,6 +1,5 @@
 import { config } from '@devmoods/config';
 import { type } from 'arktype';
-import {} from 'express';
 import { OAuth2Client } from 'google-auth-library';
 import { BadRequest, Unauthorized } from '../errors.js';
 import { getLogger } from '../logger.js';

package/dist/auth/passwordless.js

@@ -1,5 +1,4 @@
 import { DoesNotExistError } from '@devmoods/postgres';
-import {} from 'express';
 import { createTokenResponse } from './token.js';
 import {} from './types.js';
 import { getLogger } from '../logger.js';
@@ -11,10 +10,11 @@ export function PasswordlessAuthProvider(options) {
             return await options.getUserByEmail(email);
         }
         catch (error) {
+            /* v8 ignore next -- @preserve */
             if (error instanceof DoesNotExistError) {
                 return null;
-                /* c8 ignore next 3 */
             }
+            /* v8 ignore next -- @preserve */
             throw error;
         }
     };

package/dist/auth/token.d.ts

@@ -6,28 +6,28 @@ export declare function createTokenResponse(accessToken: AccessToken): readonly
 }, {
     readonly 'Cache-Control': "no-store";
 }];
-export type AccessToken = ReturnType<typeof createAccessToken>;
+export type AccessToken = Awaited<ReturnType<typeof createAccessToken>>;
 /**
  * Returns a signed JWT token.
  */
-export declare function createAccessToken(payload: any, version?: string, secret?: string): {
+export declare function createAccessToken(payload: any, version?: string, secret?: string): Promise<{
     token: string;
     tokenType: "Bearer";
     expiresIn: number;
-};
+}>;
 /**
  * Decode the given JWT token.
  */
-export declare function decodeAccessToken(token: string, secret?: string): {
-    [key: string]: any;
-    iss?: string | undefined;
-    sub?: string | undefined;
-    aud?: string | string[] | undefined;
-    exp?: number | undefined;
-    nbf?: number | undefined;
-    iat?: number | undefined;
-    jti?: string | undefined;
-};
+export declare function decodeAccessToken(token: string, secret?: string): Promise<{
+    [propName: string]: unknown;
+    iss?: string;
+    sub?: string;
+    aud?: string | string[];
+    jti?: string;
+    nbf?: number;
+    exp?: number;
+    iat?: number;
+}>;
 /**
  * Extract a Bearer token from the HTTP Authorization header
  * of `req`.

package/dist/auth/token.js

@@ -1,6 +1,6 @@
 import { config } from '@devmoods/config';
 import {} from 'express';
-import jwt from 'jsonwebtoken';
+import { SignJWT, jwtVerify } from 'jose';
 import { v4 } from 'uuid';
 import { InvalidToken } from './errors.js';
 import {} from '../validate.js';
@@ -24,24 +24,24 @@ export function createTokenResponse(accessToken) {
 /**
  * Returns a signed JWT token.
  */
-export function createAccessToken(payload, version = '1', secret = config.AUTH_JWT_SECRET) {
+export async function createAccessToken(payload, version = '1', secret = config.AUTH_JWT_SECRET) {
     const expiresIn = config.AUTH_TOKEN_EXPIRES;
-    const token = jwt.sign({ v: version, ...payload }, secret, {
-        expiresIn,
-    });
+    const secretKey = new TextEncoder().encode(secret);
+    const token = await new SignJWT({ v: version, ...payload })
+        .setProtectedHeader({ alg: 'HS256' })
+        .setExpirationTime(`${expiresIn}s`)
+        .setIssuedAt(new Date())
+        .sign(secretKey);
     return { token, tokenType: 'Bearer', expiresIn };
 }
 /**
  * Decode the given JWT token.
  */
-export function decodeAccessToken(token, secret = config.AUTH_JWT_SECRET) {
+export async function decodeAccessToken(token, secret = config.AUTH_JWT_SECRET) {
     try {
-        const decoded = jwt.verify(token.trim(), secret);
-        /* c8 ignore next 3 */
-        if (typeof decoded === 'string') {
-            throw new Error('decoded value not an object');
-        }
-        return { ...decoded };
+        const secretKey = new TextEncoder().encode(secret);
+        const { payload } = await jwtVerify(token.trim(), secretKey);
+        return { ...payload };
     }
     catch (error) {
         throw new InvalidToken(`Failed to decode auth token: ${error.message}`, {
@@ -65,10 +65,11 @@ export function parseAuthorizationHeader(req) {
     }
     // No token given, this is not necessarilly an error case
     if (!token) {
+        /* v8 ignore next -- @preserve */
         if (type) {
             return type;
-            /* c8 ignore next 3 */
         }
+        /* v8 ignore next -- @preserve */
         return null;
     }
     return token;

package/dist/auth.js

@@ -22,15 +22,16 @@ export function createAuth({ getUserById, filterUser, tokenStorage, providers, l
     const useCurrentUser = () => useRequestContext('currentUser');
     const setCurrentUser = (user) => setRequestContext('currentUser', user);
     const login = async (req, res, user, isRefresh = false) => {
-        const accessToken = createAccessToken({ uid: user.id }, sessionTokenVersion);
+        const accessToken = await createAccessToken({ uid: user.id }, sessionTokenVersion);
         const sessionId = sha256(accessToken.token);
         await tokenStorage.set(sessionId, String(user.id), accessToken.expiresIn);
         setAccessTokenCookie(res, accessToken.token);
         setCurrentUser(user);
         if (!isRefresh) {
             await onUserLoggedIn?.(user, {
-                /* c8 ignore next 2 */
+                /* v8 ignore next -- @preserve */
                 ip: req.ip ?? '',
+                /* v8 ignore next -- @preserve */
                 userAgent: req.headers['user-agent'] ?? '',
                 sessionId,
             });
@@ -46,12 +47,12 @@ export function createAuth({ getUserById, filterUser, tokenStorage, providers, l
     };
     // Make timing attacks harder
     const jitter = (duration = 0) => {
-        /* c8 ignore start */
+        /* v8 ignore next -- @preserve */
         if (process.env.NODE_ENV === 'test') {
             return Promise.resolve();
         }
+        /* v8 ignore next -- @preserve */
         return new Promise((resolve) => void setTimeout(resolve, Math.max((0.5 - duration) * 1000, 200)));
-        /* c8 ignore end */
     };
     /**
      * API for auth providers to use
@@ -138,7 +139,7 @@ export function createAuth({ getUserById, filterUser, tokenStorage, providers, l
                     await logout(req, res);
                     throw new InvalidToken('session token expired');
                 }
-                const decoded = decodeAccessToken(token);
+                const decoded = await decodeAccessToken(token);
                 if (decoded.v !== sessionTokenVersion) {
                     await logout(req, res);
                     throw new InvalidToken('Invalid token version');
@@ -157,7 +158,7 @@ export function createAuth({ getUserById, filterUser, tokenStorage, providers, l
                 const tokenLifetimeMs = decoded.exp * 1000 - decoded.iat * 1000;
                 const remainingMs = decoded.exp * 1000 - Date.now();
                 const shouldRefresh = remainingMs < tokenLifetimeMs * 0.25;
-                /* c8 ignore next 3 */
+                /* v8 ignore next -- @preserve */
                 if (shouldRefresh) {
                     await providerContext.login(req, res, user, true);
                 }
@@ -166,18 +167,19 @@ export function createAuth({ getUserById, filterUser, tokenStorage, providers, l
             }
             catch (error) {
                 logger.error(error);
+                /* v8 ignore next -- @preserve */
                 if (error instanceof InvalidToken) {
                     if (req.accepts('html')) {
                         return res.redirect(loginUrl);
                     }
                     return next(Unauthorized(`Invalid token: ${error.message}`, { cause: error }));
                 }
-                /* c8 ignore next 3 */
+                /* v8 ignore next -- @preserve */
                 next(error);
             }
         };
     }
-    function protect(isAuthorized = () => true) {
+    function protect(isAuthorized) {
         return async function authorizationMiddleware(req, res, next) {
             try {
                 const user = useCurrentUser();
@@ -197,13 +199,14 @@ export function createAuth({ getUserById, filterUser, tokenStorage, providers, l
                     }
                     return next(Forbidden('Permission denied', { cause: error }));
                 }
+                /* v8 ignore next -- @preserve */
                 if (error instanceof InvalidToken) {
                     if (req.accepts('html')) {
                         return res.redirect(loginUrl);
                     }
                     return next(Unauthorized(`Invalid token: ${error.message}`, { cause: error }));
                 }
-                /* c8 ignore next 3 */
+                /* v8 ignore next -- @preserve */
                 next(error);
             }
         };
@@ -268,7 +271,7 @@ export function createAuth({ getUserById, filterUser, tokenStorage, providers, l
             .update(JSON.stringify(decoded.payload))
             .digest('base64')
             .slice(0, 12);
-        /* c8 ignore next 3 */
+        /* v8 ignore next -- @preserve */
         if (expectedSignature !== decoded.signature) {
             throw new InvalidToken('Invalid signature');
         }
@@ -289,6 +292,7 @@ export function createAuth({ getUserById, filterUser, tokenStorage, providers, l
     }
     return {
         protect,
+        /* v8 ignore next -- @preserve */
         before: () => middleware(false),
         createRouter: () => createAuthRouter().getRouter(),
         useCurrentUser,

package/dist/channels.js

@@ -8,7 +8,7 @@ import {} from './router.js';
 import { writeChunk } from './streams.js';
 const logger = getLogger();
 const defaultGetIdFromMessage = (message) => {
-    /* c8 ignore next 5 */
+    /* v8 ignore next -- @preserve */
     if (typeof message === 'object' && message !== null && 'id' in message) {
         return `${message.id}`;
     }
@@ -24,7 +24,7 @@ export class RedisEventStreamBackend {
     }
     async createSubscriber() {
         const subscriber = this.redis.duplicate();
-        /* c8 ignore next 3 */
+        /* v8 ignore next -- @preserve */
         subscriber.on('error', (error) => {
             logger.error(error);
         });
@@ -42,13 +42,14 @@ export function createEventStream(backend, options) {
                 const subscriber = await backend.createSubscriber();
                 const heartbeat = setInterval(() => {
                     try {
+                        /* v8 ignore next -- @preserve */
                         if (!res.writableEnded) {
                             writeChunk(res, 'event: heartbeat\n', state);
                             writeChunk(res, 'data: ping\n\n', state);
                         }
-                        /* c8 ignore next 3 */
                     }
                     catch (error) {
+                        /* v8 ignore next -- @preserve */
                         logger.error(error);
                     }
                 }, options.heartbeatInterval ?? 15000);
@@ -61,6 +62,7 @@ export function createEventStream(backend, options) {
                 const listener = (value) => {
                     try {
                         requestContext.run(store, () => {
+                            /* v8 ignore next -- @preserve */
                             if (!res.writableEnded) {
                                 const id = getIdFromMessage?.(value);
                                 if (id) {
@@ -70,9 +72,9 @@ export function createEventStream(backend, options) {
                                 writeChunk(res, `data: ${JSON.stringify(value)}\n\n`, state);
                             }
                         });
-                        /* c8 ignore next 3 */
                     }
                     catch (error) {
+                        /* v8 ignore next -- @preserve */
                         logger.error(error);
                     }
                 };
@@ -81,11 +83,12 @@ export function createEventStream(backend, options) {
                     let parsedMessage;
                     try {
                         parsedMessage = JSON.parse(message);
-                        /* c8 ignore next 3 */
                     }
                     catch (error) {
+                        /* v8 ignore next -- @preserve */
                         logger.error(error);
                     }
+                    /* v8 ignore next -- @preserve */
                     if (parsedMessage) {
                         listener(parsedMessage);
                     }
@@ -112,10 +115,11 @@ export function createEventStream(backend, options) {
                     });
                 };
                 const gracefulClose = () => {
-                    /* c8 ignore next 3 */
+                    /* v8 ignore next -- @preserve */
                     if (closed) {
                         return;
                     }
+                    /* v8 ignore next -- @preserve */
                     if (!res.writableEnded) {
                         writeChunk(res, 'event: close\n', state);
                         writeChunk(res, 'data: shutdown\n\n', state);
@@ -132,9 +136,9 @@ export function createEventStream(backend, options) {
                 res.on('finish', cleanup);
                 req.on('aborted', cleanup);
                 req.socket.on('error', cleanup);
-                /* c8 ignore next 3 */
             }
             catch (error) {
+                /* v8 ignore next -- @preserve */
                 next(error);
             }
         };

package/dist/cli.js

@@ -36,6 +36,7 @@ export class CLI {
             }
             catch (error) {
                 this.redLine(error.message);
+                /* v8 ignore next -- @preserve */
                 if (this.options.printStackTraces) {
                     this.writeLine('\nStack trace:\n', stderr);
                     this.redLine(error.stack);

package/dist/composeMiddleware.js

@@ -29,15 +29,15 @@ function generate(handlers) {
             }
             // eslint-disable-next-line @typescript-eslint/no-shadow
             function next(err) {
-                /* c8 ignore start */
+                /* v8 ignore next -- @preserve */
                 if (pos < index) {
                     throw new TypeError('`next()` called multiple times');
                 }
-                /* c8 ignore end */
                 return dispatch(pos + 1, err);
             }
             try {
                 if (handler.length === 4) {
+                    /* v8 ignore next -- @preserve */
                     if (err) {
                         return handler(err, req, res, next);
                     }
@@ -49,12 +49,12 @@ function generate(handlers) {
                 }
             }
             catch (e) {
-                /* c8 ignore start */
+                /* v8 ignore next -- @preserve */
                 if (index > pos) {
                     throw e;
                 }
+                /* v8 ignore next -- @preserve */
                 return next(e);
-                /* c8 ignore end */
             }
             return next(err);
         }

package/dist/context.js

@@ -30,6 +30,7 @@ export function useRequestContext(key) {
  */
 export function setRequestContext(key, value) {
     const store = requestContext.getStore();
+    /* v8 ignore next -- @preserve */
     if (store) {
         store.set(key, value);
     }

package/dist/csrf.js

@@ -11,7 +11,7 @@ const defaultCookieName = () => {
 };
 export const getCsrfSecret = () => {
     const secret = config.CSRF_SECRET;
-    /* c8 ignore next 3 */
+    /* v8 ignore next -- @preserve */
     if (!secret) {
         throw new Error('CSRF_SECRET is not set');
     }

package/dist/faktory.js

@@ -65,7 +65,7 @@ export async function createFaktoryWorker({ queues, jobs, faktory: createFactory
             return job.execute(...args, jobContext);
         });
     }
-    /* c8 ignore start */
+    /* v8 ignore next -- @preserve */
     const onSignal = async (signal) => {
         logger.info('faktory worker received signal', { signal });
     };

package/dist/listen.js

@@ -24,7 +24,7 @@ export function stoppable(server, gracePeriodMs = Infinity) {
         /* c8 ignore next 1 */
         (requestsPerSocket.get(req.socket) ?? 0) + 1);
         res.once('finish', () => {
-            /* c8 ignore next 1 */
+            /* v8 ignore next -- @preserve */
             const pending = Math.max(0, (requestsPerSocket.get(req.socket) ?? 0) - 1);
             requestsPerSocket.set(req.socket, pending);
             if (stopped && pending === 0) {
@@ -71,7 +71,7 @@ export function stoppable(server, gracePeriodMs = Infinity) {
         if (address == null) {
             throw new Error('address is null, server not listening?');
         }
-        /* c8 ignore next 3 */
+        /* v8 ignore next -- @preserve */
         if (typeof address === 'string') {
             throw new Error('address was a string, should not happen');
         }
@@ -139,6 +139,7 @@ export function createExpressServer(app, options = {}) {
         process.on(signal, onSignal);
     }
     const healthTypes = ['live', 'ready'];
+    /* v8 ignore next -- @preserve */
     if (!app.get('__healthAttached')) {
         app.get('/health/:type?', before(), route(async (req) => {
             const timestamp = new Date().toISOString();

package/dist/logger.js

@@ -17,25 +17,24 @@ export class JsonStreamAdapter {
 export class SentryLoggerAdapter {
     constructor() { }
     captureError(error, attributes) {
-        /* c8 ignore start */
+        /* v8 ignore next -- @preserve */
         if (error == null) {
             return;
         }
+        /* v8 ignore next -- @preserve */
         if (Sentry.isInitialized()) {
             Sentry.captureException(error, {
                 tags: attributes,
             });
         }
-        /* c8 ignore end */
     }
     write(log) {
         const { message, ...attributes } = log;
-        /* c8 ignore start */
+        /* v8 ignore next -- @preserve */
         if (Sentry.isInitialized()) {
             const fn = log.level;
             Sentry.logger[fn](message, attributes);
         }
-        /* c8 ignore end */
         return true;
     }
 }
@@ -57,7 +56,7 @@ export function clearGlobalLoggerContext() {
     _getGlobalContextFns.length = 0;
 }
 const nameArgIndex = process.argv.indexOf('--name');
-/* c8 ignore next 1 */
+/* v8 ignore next -- @preserve */
 const app = nameArgIndex > -1 ? process.argv.at(nameArgIndex + 1) : undefined;
 const hostname = os.hostname();
 const pid = process.pid;

package/dist/middleware.js

@@ -17,7 +17,7 @@ export { asyncMiddleware as route };
 export { compose as composeMiddleware };
 const CSP_NONCE_KEY = 'csp-nonce';
 export function useCspNonce() {
-    /* c8 ignore next 1 */
+    /* v8 ignore next -- @preserve */
     return useRequestContext(CSP_NONCE_KEY) ?? '__CSP_NOT_SET__';
 }
 /**
@@ -97,11 +97,15 @@ function logRequestDuration() {
             path: req.path,
             query: req.query,
             ip: req.ip,
-            /* c8 ignore next 5 */
+            /* v8 ignore next -- @preserve */
             userAgent: req.headers['user-agent'] ?? 'unknown',
+            /* v8 ignore next -- @preserve */
             accept: req.headers['accept'] ?? 'unknown',
+            /* v8 ignore next -- @preserve */
             host: req.headers['host'] ?? 'unknown',
+            /* v8 ignore next -- @preserve */
             referer: req.headers['referer'] ?? 'unknown',
+            /* v8 ignore next -- @preserve */
             origin: req.headers['origin'] ?? 'unknown',
         });
         res.on('finish', () => {
@@ -205,7 +209,7 @@ export function asyncMiddleware(fn) {
             else if (typeof result === 'number') {
                 res.status(result).end();
             }
-            else if (typeof result !== 'undefined') {
+            else {
                 // @ts-expect-error custom value
                 const successStatus = req.__successStatus;
                 if (successStatus != null) {
@@ -228,10 +232,10 @@ export function withTransaction(wrapper) {
                     res.on('error', reject);
                     next();
                 });
-                /* c8 ignore next 5 */
             });
         }
         catch (error) {
+            /* v8 ignore next -- @preserve */
             next(error);
         }
     };

package/dist/rate-limit.js

@@ -48,6 +48,7 @@ getKey = (req) => req.ip || 'unknown', } = {}) {
             });
             cursor = result.cursor;
             const keys = result.keys;
+            /* v8 ignore next -- @preserve */
             if (keys.length > 0) {
                 // Use UNLINK instead of DEL - asynchronous deletion
                 await redis.unlink(keys);

package/dist/router.d.ts

@@ -12,7 +12,7 @@ export type ExtractParams<Path extends string> = Prettify<Path extends `${string
 } & ExtractParams<`/${Rest}`> : Path extends `${string}:${infer Param}` ? {
     [K in Param extends `${infer P}?` ? P : Param]: string;
 } : {}>;
-export type TypedRequestHandler<Params, ResponseBodySchema extends StandardSchemaV1 | undefined, RequestBodySchema extends StandardSchemaV1 | undefined, RequestQuery extends StandardSchemaV1 | undefined, RequestParamsSchema extends StandardSchemaV1 | undefined = undefined> = (req: Request<Params, never, RequestBodySchema extends StandardSchemaV1<any> ? StandardSchemaV1.InferOutput<RequestBodySchema> : unknown, RequestQuery extends StandardSchemaV1<any> ? StandardSchemaV1.InferOutput<RequestQuery> : Record<string, string | string[]>>, res: Response<ResponseBodySchema extends StandardSchemaV1<any> ? StandardSchemaV1.InferOutput<ResponseBodySchema> : unknown>, next: NextFunction) => ResponseWrapper<ResponseBodySchema extends StandardSchemaV1<any> ? StandardSchemaV1.InferOutput<ResponseBodySchema> : unknown> | Promise<ResponseWrapper<ResponseBodySchema extends StandardSchemaV1<any> ? StandardSchemaV1.InferOutput<ResponseBodySchema> : unknown>>;
+export type TypedRequestHandler<Params, ResponseBodySchema extends StandardSchemaV1 | undefined, RequestBodySchema extends StandardSchemaV1 | undefined, RequestQuery extends StandardSchemaV1 | undefined, RequestParamsSchema extends StandardSchemaV1 | undefined = undefined> = (req: Request<Params, any, RequestBodySchema extends StandardSchemaV1<any> ? StandardSchemaV1.InferOutput<RequestBodySchema> : unknown, RequestQuery extends StandardSchemaV1<any> ? StandardSchemaV1.InferOutput<RequestQuery> : Record<string, string | string[]>>, res: Response<ResponseBodySchema extends StandardSchemaV1<any> ? StandardSchemaV1.InferOutput<ResponseBodySchema> : unknown>, next: NextFunction) => ResponseWrapper<ResponseBodySchema extends StandardSchemaV1<any> ? StandardSchemaV1.InferOutput<ResponseBodySchema> : unknown> | Promise<ResponseWrapper<ResponseBodySchema extends StandardSchemaV1<any> ? StandardSchemaV1.InferOutput<ResponseBodySchema> : unknown>>;
 export declare class TypedRouter {
     #private;
     router: import("express-serve-static-core").Router;

package/dist/routes.js

@@ -38,7 +38,7 @@ const buildPathParamsSchema = (pathParams) => {
     const required = [];
     const params = [];
     for (const param of pathParams) {
-        /* c8 ignore next 3 */
+        /* v8 ignore next -- @preserve */
         if (param.in !== 'path') {
             continue;
         }
@@ -102,14 +102,14 @@ class ExpressPathParser {
     };
 }
 const pathRegexParser = (layerRegexPath, keys) => {
-    /* c8 ignore next 3 */
+    /* v8 ignore next -- @preserve */
     if (typeof layerRegexPath === 'string') {
         return layerRegexPath;
     }
     if (layerRegexPath.fast_slash) {
         return '';
     }
-    /* c8 ignore next 3 */
+    /* v8 ignore next -- @preserve */
     if (layerRegexPath.fast_star) {
         return '*';
     }
@@ -122,10 +122,11 @@ const pathRegexParser = (layerRegexPath, keys) => {
     if (match) {
         return match[1].replace(/\\(.)/g, '$1').slice(1);
     }
+    /* v8 ignore next -- @preserve */
     if (mappedPath) {
         return mappedPath.slice(1);
-        /* c8 ignore next 3 */
     }
+    /* v8 ignore next -- @preserve */
     return layerRegexPath.toString();
 };
 const mapKeysToPath = (layerRegexPath, keys) => {
@@ -197,6 +198,7 @@ export function toOpenAPISpec(app, info = {
         }
         // Convert Express path params to OpenAPI path params
         const openApiPath = path.replace(/:([^/]+)/g, '{$1}');
+        /* v8 ignore next -- @preserve */
         if (!paths[openApiPath]) {
             paths[openApiPath] = {};
         }
@@ -214,8 +216,9 @@ export function toOpenAPISpec(app, info = {
         // Add query parameters
         if (query && typeof query === 'object' && 'properties' in query) {
             const querySchema = query;
-            /* c8 ignore next 1 */
+            /* v8 ignore next -- @preserve */
             const properties = querySchema.properties || {};
+            /* v8 ignore next -- @preserve */
             parameters.push(...Object.keys(properties).map((name) => ({
                 name,
                 in: 'query',

package/dist/streams.js

@@ -17,6 +17,7 @@ export function writeChunk(writable, chunk, state) {
     const flush = () => {
         while (state.queue.length) {
             const next = state.queue.shift();
+            /* v8 ignore next -- @preserve */
             if (!writable.write(next)) {
                 state.draining = true;
                 writable.once('drain', flush);

package/dist/validate.js

@@ -27,12 +27,12 @@ export async function validateSchema(data, schema) {
     catch (error) {
         return {
             isValid: false,
+            /* v8 ignore next -- @preserve */
             errors: (error instanceof ValidationError
-                ? /* c8 ignore next 5*/
-                    error.issues.map((issue) => [
-                        String(issue.path ?? '/'),
-                        issue.message,
-                    ])
+                ? error.issues.map((issue) => [
+                    String(issue.path ?? '/'),
+                    issue.message,
+                ])
                 : []).reduce((result, item) => {
                 const [key, value] = item;
                 if (Array.isArray(result[key])) {
@@ -66,9 +66,9 @@ export function validateStandardSchema(schemas, extraMetadata) {
                 }
             }
             next();
-            /* c8 ignore next 3 */
         }
         catch (error) {
+            /* v8 ignore next -- @preserve */
             next(error);
         }
     };
@@ -93,15 +93,16 @@ export function validateStandardSchema(schemas, extraMetadata) {
     return middleware;
 }
 function toJsonSchema(standardSchema) {
+    /* v8 ignore next -- @preserve */
     if ('toJsonSchema' in standardSchema &&
         typeof standardSchema.toJsonSchema === 'function') {
         return standardSchema.toJsonSchema();
-        /* c8 ignore next 3 */
     }
+    /* v8 ignore next -- @preserve */
     return {};
 }
 function transformAjvErrors(errors) {
-    /* c8 ignore next 3 */
+    /* v8 ignore next -- @preserve */
     if (errors == null) {
         return {};
     }

package/dist/vite/defineViteConfig.js

@@ -13,11 +13,11 @@ export function defineViteConfig({ base = '', reactCompiler = false, ssr = false
         `${process.cwd().split('/').pop()}.local`,
         `${process.cwd().split('/').pop()}.test`,
     ];
-    /* c8 ignore next 4 */
+    /* v8 ignore next -- @preserve */
     const globalSetup = existsSync(path.resolve('./src/setupTests.global.ts'))
         ? [path.resolve('./src/setupTests.global.ts')]
         : undefined;
-    /* c8 ignore next 4 */
+    /* v8 ignore next -- @preserve */
     const setupFiles = existsSync(path.resolve('./src/setupTests.ts'))
         ? [path.resolve('./src/setupTests.ts')]
         : undefined;
@@ -77,6 +77,7 @@ export function defineViteConfig({ base = '', reactCompiler = false, ssr = false
                 noExternal: ['react-helmet-async'],
             }
             : undefined,
+        // @ts-expect-error i dont know
         test: {
             setupFiles,
             globalSetup,

package/dist/vite/ssr.js

@@ -16,7 +16,6 @@ import { createFetchRequest } from '../webapi.js';
 export async function createSsrMiddleware({ root = process.cwd(), getInitialData, useDevServer = config.VITE_USE_DEV_SERVER, } = {}) {
     const resolve = (p) => path.resolve(root, p);
     let vite;
-    let render;
     let assetLinks = { preload: '', css: '', js: '' };
     const middlewares = [];
     if (useDevServer) {
@@ -25,18 +24,22 @@ export async function createSsrMiddleware({ root = process.cwd(), getInitialData
             server: { middlewareMode: true },
             appType: 'custom',
         }));
-        render = (await vite.ssrLoadModule('/src/entry-server.tsx')).render;
         middlewares.push(vite.middlewares);
     }
     else {
-        const result = await import(path.join(root, 'dist/server/entry-server.js'));
-        render = result.render;
         assetLinks = await getAssetLinks(resolve('dist/client/.vite/manifest.json'), 'src/entry-client.tsx');
         middlewares.push(express.static(resolve('dist/client'), { index: false }));
     }
     middlewares.push(route(async (req, res) => {
         try {
             const nonce = useCspNonce();
+            let render;
+            if (useDevServer) {
+                render = (await vite.ssrLoadModule('/src/entry-server.tsx')).render;
+            }
+            else {
+                render = (await import(path.join(root, 'dist/server/entry-server.js'))).render;
+            }
             const rendered = await render(createFetchRequest(req, res), {
                 useDevServer,
                 getInitialData: getInitialData || (async () => ({})),
@@ -76,15 +79,17 @@ export async function createSsrMiddleware({ root = process.cwd(), getInitialData
             return [200, html, { 'Content-type': 'text/html' }];
         }
         catch (error) {
+            /* v8 ignore next -- @preserve */
             if (error instanceof Response &&
                 error.status >= 300 &&
                 error.status <= 399) {
                 return res.redirect(error.status, error.headers.get('Location') || '');
-                /* c8 ignore next 9 */
             }
+            /* v8 ignore next -- @preserve */
             if (useDevServer) {
                 vite.ssrFixStacktrace(error);
             }
+            /* v8 ignore next -- @preserve */
             throw error;
         }
     }));
@@ -104,24 +109,24 @@ export function replaceSsrPlaceholders(template, values) {
 }
 async function getAssetLinks(manifestPath, input, publicPath = '/') {
     const manifest = JSON.parse(await fs.readFile(manifestPath, 'utf-8'));
-    /* c8 ignore next 3 */
+    /* v8 ignore next -- @preserve */
     if (!manifest[input]) {
         throw Error('Entry not found in the manifest.json file');
     }
     const chunk = manifest[input];
-    /* c8 ignore next 3 */
+    /* v8 ignore next -- @preserve */
     const cssHtml = (chunk.css || [])
         .map((href) => `<link rel="stylesheet" href="${publicPath}${href}" />`)
         .join(' ');
     // Generate HTML for preload links
     const preloadList = [input];
-    /* c8 ignore next 3 */
+    /* v8 ignore next -- @preserve */
     if (Array.isArray(chunk.imports)) {
         preloadList.push(...chunk.imports);
     }
     const preloadHtml = preloadList
         .map((pre) => {
-        /* c8 ignore next 3 */
+        /* v8 ignore next -- @preserve */
         if (!manifest[pre]?.file) {
             return '';
         }

package/dist/vitest/matchers.js

@@ -1,7 +1,7 @@
 import {} from 'vitest';
 import failOnConsole from 'vitest-fail-on-console';
 export { failOnConsole };
-/* c8 ignore start */
+/* v8 ignore next -- @preserve */
 export function extendMatchers(expect) {
     expect.extend({
         async toMatchResponse(received, expectedStatusCode, expectedBody) {
@@ -77,4 +77,3 @@ export function extendMatchers(expect) {
         },
     });
 }
-/* c8 ignore stop */

package/dist/vitest/testClient.js

@@ -9,7 +9,7 @@ export async function createTestClient(server, options) {
         server = createServer(server);
     }
     let address = server.address();
-    /* c8 ignore next 5 */
+    /* v8 ignore next 5 -- @preserve */
     if (typeof address === 'string') {
         throw new Error(`Can't use a server listening on a UNIX domain socket: ${address}`);
     }

package/dist/webapi.js

@@ -3,7 +3,7 @@ export function createFetchHeaders(requestHeaders) {
     const headers = new Headers();
     for (const [key, values] of Object.entries(requestHeaders)) {
         if (values) {
-            /* c8 ignore next 4 */
+            /* v8 ignore next -- @preserve */
             if (Array.isArray(values)) {
                 for (const value of values) {
                     headers.append(key, value);
@@ -18,7 +18,7 @@ export function createFetchHeaders(requestHeaders) {
 }
 export function createFetchRequest(req, res) {
     const origin = `${req.protocol}://${req.get('host')}`;
-    /* c8 ignore next 1 */
+    /* v8 ignore next -- @preserve */
     const url = new URL(req.originalUrl || req.url, origin);
     let controller = new AbortController();
     const init = {
@@ -26,10 +26,11 @@ export function createFetchRequest(req, res) {
         headers: createFetchHeaders(req.headers),
         signal: controller.signal,
     };
-    /* c8 ignore next 6 */
+    /* v8 ignore next -- @preserve */
     res.on('finish', () => {
         controller = null;
     });
+    /* v8 ignore next -- @preserve */
     res.on('close', () => {
         controller?.abort();
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devmoods/express-extras",
-  "version": "0.67.0",
+  "version": "0.69.0",
   "description": "Kubernetes-ready utilities for rapid Node.js application development",
   "type": "module",
   "main": "./dist/index.js",
@@ -60,43 +60,42 @@
   ],
   "license": "ISC",
   "devDependencies": {
-    "@vitejs/plugin-react": "^5.0.4",
-    "arktype": "^2.1.23",
+    "@vitejs/plugin-react": "^5.1.0",
+    "arktype": "^2.1.25",
     "faktory-worker": "^4.7.1",
     "react": "^19.2.0",
     "react-dom": "^19.2.0",
-    "vite": "^7.1.10"
+    "vite": "^7.1.12"
   },
   "dependencies": {
     "@devmoods/config": "0.2.0",
     "@devmoods/fetch": "^4.2.0",
     "@devmoods/observability": "0.1.1",
-    "@devmoods/postgres": "0.2.1",
-    "@hey-api/openapi-ts": "^0.86.0",
-    "@sentry/node": "^10.20.0",
-    "@sentry/node-native": "^10.20.0",
-    "@sentry/profiling-node": "^10.20.0",
+    "@devmoods/postgres": "0.2.2",
+    "@hey-api/openapi-ts": "^0.86.11",
+    "@sentry/node": "^10.22.0",
+    "@sentry/node-native": "^10.22.0",
+    "@sentry/profiling-node": "^10.22.0",
     "@standard-schema/spec": "^1.0.0",
     "@types/bcrypt": "^6.0.0",
-    "@types/cookie-parser": "^1.4.9",
-    "@types/express": "^5.0.3",
-    "@types/jsonwebtoken": "^9.0.10",
-    "@types/koa-compose": "^3.2.8",
-    "@types/nodemailer": "^7.0.2",
+    "@types/cookie-parser": "^1.4.10",
+    "@types/express": "^5.0.5",
+    "@types/koa-compose": "^3.2.9",
+    "@types/nodemailer": "^7.0.3",
     "@types/qs": "^6.14.0",
     "ajv": "^8.17.1",
     "argon2": "^0.44.0",
     "bcrypt": "^6.0.0",
     "chalk": "^5.6.2",
-    "commander": "^14.0.1",
+    "commander": "^14.0.2",
     "cookie-parser": "^1.4.7",
     "dotenv": "^17.2.3",
     "express": "^4.21.2",
-    "google-auth-library": "^10.4.1",
+    "google-auth-library": "^10.5.0",
     "helmet": "^8.1.0",
-    "jsonwebtoken": "^9.0.2",
-    "nodemailer": "^7.0.9",
-    "redis": "^5.8.3",
+    "jose": "^6.1.0",
+    "nodemailer": "^7.0.10",
+    "redis": "^5.9.0",
     "sonda": "^0.9.0",
     "tough-cookie": "^6.0.0",
     "uuid": "^13.0.0",
@@ -112,5 +111,5 @@
   "engines": {
     "node": ">=20 <25"
   },
-  "gitHead": "ddc79e0157d354d9c25cfbb0ba86d8e61d560fbc"
+  "gitHead": "eb2f12e0a86234754ebf2977be7f4a14ccf8bed3"
 }