@devmoods/express-extras 0.49.3 → 0.50.0

package/dist/auth/emailAndPassword.d.ts

@@ -1,8 +1,12 @@
 import { type AnyUser, type AuthProvider } from './types.js';
+export interface AuthPasswordChangedMetadata {
+    ip: string;
+    userAgent: string;
+}
 export interface EmailAndPasswordOptions<UserModel = AnyUser> {
     login: (email: string, verifyPassword: (realPassword: string) => Promise<string>) => Promise<UserModel>;
     onPasswordResetRequest?(user: UserModel, temporaryToken: string): void | Promise<void>;
-    onPasswordChanged?(user: UserModel, newPassword: string): Promise<void>;
+    onPasswordChanged?(user: UserModel, newPassword: string, metadata: AuthPasswordChangedMetadata): Promise<void>;
     onEmailVerificationRequest?(user: UserModel, temporaryToken: string): Promise<void>;
     onEmailVerified?(user: UserModel): Promise<void>;
 }

package/dist/auth/emailAndPassword.js

@@ -52,7 +52,10 @@ export function EmailAndPasswordAuthProvider(options) {
                     throw Unauthorized('Invalid token');
                 }
                 context.setCurrentUser(user);
-                await options.onPasswordChanged?.(user, await hashPassword(password));
+                await options.onPasswordChanged?.(user, await hashPassword(password), {
+                    ip: req.ip ?? '',
+                    userAgent: req.headers['user-agent'] ?? '',
+                });
                 logger.info('user changed password');
                 return 200;
             }));

package/dist/faktory.d.ts

@@ -14,7 +14,6 @@ export declare function createJobs<GlobalContext extends AnyJobContext>({ queueN
         $job: boolean;
         jobName: string;
         options: JobOptions;
-        readonly executionCount: number;
         delay(args?: Parameters<Fn>[0]): Promise<`${string}-${string}-${string}-${string}-${string}`>;
         execute(args: Parameters<Fn>[0], context: GlobalContext): Promise<any>;
     };

package/dist/faktory.js

@@ -14,7 +14,6 @@ export function createJobs({ queueName, faktory: createFactory = create, }) {
             throw new Error('job() must get a function as the first or second argument');
         }
         const jobName = fn.name;
-        let executionCount = 0;
         if (!jobName) {
             throw new Error('Can not create job without a name');
         }
@@ -22,9 +21,6 @@ export function createJobs({ queueName, faktory: createFactory = create, }) {
             $job: true,
             jobName,
             options,
-            get executionCount() {
-                return executionCount;
-            },
             async delay(args) {
                 const jid = randomUUID();
                 try {
@@ -49,7 +45,6 @@ export function createJobs({ queueName, faktory: createFactory = create, }) {
             async execute(args, context) {
                 try {
                     const result = await fn(args, context);
-                    executionCount += 1;
                     return result;
                 }
                 catch (error) {

package/dist/listen.js

@@ -6,7 +6,7 @@ import {} from 'express';
 import { config } from './config.js';
 import { BadRequest } from './errors.js';
 import { getLogger } from './logger.js';
-import { before, route } from './middleware.js';
+import { route } from './middleware.js';
 import { envPort, startTimer } from './utils.js';
 import { validateQuery } from './validate.js';
 const logger = getLogger('http');
@@ -103,7 +103,7 @@ export function createExpressServer(app, options = {}) {
     }
     const healthTypes = ['live', 'ready'];
     if (!app.get('__healthAttached')) {
-        app.get('/health/:type?', before(), validateQuery({
+        app.get('/health/:type?', validateQuery({
             type: 'object',
             properties: {
                 type: { type: 'string', enum: ['live', 'ready'] },

package/dist/manage.js

@@ -46,8 +46,16 @@ export function registerDefaultCommands(app) {
         }));
     });
     registerManagementCommand((command, cli) => {
-        command('show-config').action(cli.wrap(async () => {
-            console.log(config.value);
+        command('show-config')
+            .option('--json', 'Output JSON')
+            .action(cli.wrap(async (options) => {
+            if (options.json) {
+                console.log(JSON.stringify(config.value, null, 2));
+                return;
+            }
+            for (const [key, value] of Object.entries(config.value)) {
+                cli.writeLine(`${key}=${value}\n`);
+            }
         }));
     });
 }

package/dist/middleware.d.ts

@@ -13,18 +13,42 @@ export interface BeforeMiddlewareCSPDirectives {
     [key: string]: ContentSecurityPolicyDirectiveValue[];
 }
 export interface BeforeMiddlewareOptions {
+    /**
+     * Enable cookie parsing
+     */
     cookies?: boolean;
+    /**
+     * Enable helmet security headers
+     *
+     * https://github.com/helmetjs/helmet
+     */
     helmet?: boolean;
+    /**
+     * Enable JSON body parsing
+     */
     json?: boolean;
+    /**
+     * Enable URL encoded body parsing
+     */
+    urlencoded?: boolean;
+    /**
+     * Enable CSRF protection
+     */
     csrf?: boolean | CsrfMiddlewareOptions;
+    /**
+     * Allow unsafe inline scripts
+     */
     allowUnsafeInlineScripts?: boolean;
+    /**
+     * Custom CSP directives
+     */
     cspDirectives?: (defaults: BeforeMiddlewareCSPDirectives) => BeforeMiddlewareCSPDirectives;
 }
 export declare function useCspNonce(): string;
 /**
  * Register middleware that must come before the app routes.
  */
-export declare function before({ cookies, helmet: useHelmet, json: useJson, csrf: useCsrf, allowUnsafeInlineScripts, cspDirectives, }?: BeforeMiddlewareOptions): import("compose-middleware").RequestHandler<unknown, unknown, void>;
+export declare function before({ cookies, helmet: useHelmet, json: useJson, csrf: useCsrf, urlencoded: useUrlencoded, allowUnsafeInlineScripts, cspDirectives, }?: BeforeMiddlewareOptions): import("compose-middleware").RequestHandler<unknown, unknown, void>;
 /**
  * Middleware that sends a 404
  *
@@ -43,4 +67,4 @@ type ResponseWrapper<TResponseBody extends AnyResponseBody> = TResponseBody | TR
 /**
  * Alias of `route()`
  */
-export declare function asyncMiddleware<RequestBody, RequestQuery extends Record<string, any> = Record<string, any>, ResponseBody extends AnyResponseBody = Record<string, any>>(fn: (req: Request<Record<string, string>, ResponseBody, RequestBody, RequestQuery, Record<string, any>>, res: Response<ResponseBody, object>, next: NextFunction) => ResponseWrapper<ResponseBody> | Promise<ResponseWrapper<ResponseBody>>): RequestHandler<Record<string, string>, ResponseBody, RequestBody, RequestQuery>;
+export declare function asyncMiddleware<RequestBody, RequestQuery extends Record<string, any> = Record<string, any>, ResponseBody extends AnyResponseBody = Record<string, any>, ParamKeys extends string = string>(fn: (req: Request<Record<ParamKeys, string>, ResponseBody, RequestBody, RequestQuery, Record<string, any>>, res: Response<ResponseBody, object>, next: NextFunction) => ResponseWrapper<ResponseBody> | Promise<ResponseWrapper<ResponseBody>>): RequestHandler<Record<string, string>, ResponseBody, RequestBody, RequestQuery>;

package/dist/middleware.js

@@ -20,7 +20,7 @@ export function useCspNonce() {
 /**
  * Register middleware that must come before the app routes.
  */
-export function before({ cookies = false, helmet: useHelmet = true, json: useJson = true, csrf: useCsrf = false, allowUnsafeInlineScripts = false, cspDirectives = (x) => x, } = {}) {
+export function before({ cookies = false, helmet: useHelmet = true, json: useJson = true, csrf: useCsrf = false, urlencoded: useUrlencoded = false, allowUnsafeInlineScripts = false, cspDirectives = (x) => x, } = {}) {
     return compose([
         withRequestContext(),
         typeof useCsrf === 'object' && useCsrf != null
@@ -29,10 +29,7 @@ export function before({ cookies = false, helmet: useHelmet = true, json: useJso
                 ? csrf()
                 : undefined,
         logRequestDuration(),
-        ((req, res, next) => {
-            setContext(CSP_NONCE_KEY, crypto.randomBytes(16).toString('base64'));
-            next();
-        }),
+        setCspNonce(),
         useHelmet &&
             helmet({
                 contentSecurityPolicy: {
@@ -65,7 +62,7 @@ export function before({ cookies = false, helmet: useHelmet = true, json: useJso
                 },
             }),
         useJson && jsonParser(),
-        urlencodedParser({ extended: true }),
+        useUrlencoded && urlencodedParser({ extended: true }),
         (cookies || useCsrf) && cookieParser(),
         analyticsProxy(),
     ].filter(Boolean));
@@ -106,6 +103,15 @@ export function notFound() {
         next(NotFound(`Could not ${req.method} ${req.path}`));
     };
 }
+/**
+ * Set a CSP nonce for the request
+ */
+function setCspNonce() {
+    return (req, res, next) => {
+        setContext(CSP_NONCE_KEY, crypto.randomBytes(16).toString('base64'));
+        next();
+    };
+}
 /**
  * In production, we could directly proxy the url
  * to an analytics service from nginx, but in dev

package/dist/validate.d.ts

@@ -1,4 +1,5 @@
 import { type Options } from 'ajv';
+import { Type } from 'arktype';
 import { type RequestHandler } from 'express';
 export type ValidationSchema = {
     type?: 'string' | 'number' | 'integer' | 'boolean' | 'array' | 'object' | 'null';
@@ -27,9 +28,10 @@ export type ValidationSchema = {
     title?: string;
     description?: string;
 } | boolean;
-export declare function validateBody(schema: ValidationSchema): RequestHandler;
-export declare function validateQuery(schema: ValidationSchema): RequestHandler;
-export declare function validateParams(schema: ValidationSchema): RequestHandler;
+type AnySchema = Type | ValidationSchema;
+export declare function validateBody(schema: AnySchema): RequestHandler;
+export declare function validateQuery(schema: AnySchema): RequestHandler;
+export declare function validateParams(schema: AnySchema): RequestHandler;
 export type ValidationResult = {
     isValid: true;
     errors: null;
@@ -48,4 +50,5 @@ export declare function compileValidateSchema(schema: ValidationSchema, options?
         [key: string]: any[];
     };
 };
-export declare function validateSchema(data: any, schema: ValidationSchema, options?: Options): ValidationResult;
+export declare function validateSchema(data: any, schema: AnySchema, options?: Options): ValidationResult;
+export {};

package/dist/validate.js

@@ -1,8 +1,16 @@
 import _Ajv, {} from 'ajv';
+import { Type } from 'arktype';
 import {} from 'express';
 import { BadRequest } from './errors.js';
 const Ajv = _Ajv;
+const toValidationSchema = (schema) => {
+    if (schema instanceof Type) {
+        return schema.toJsonSchema();
+    }
+    return schema;
+};
 export function validateBody(schema) {
+    schema = toValidationSchema(schema);
     const validate = compileValidateSchema(schema);
     const middleware = (req, res, next) => {
         const result = validate(req.body);
@@ -15,6 +23,7 @@ export function validateBody(schema) {
     return middleware;
 }
 export function validateQuery(schema) {
+    schema = toValidationSchema(schema);
     const validate = compileValidateSchema(schema, { coerceTypes: true });
     const middleware = (req, res, next) => {
         const result = validate(req.query);
@@ -27,6 +36,7 @@ export function validateQuery(schema) {
     return middleware;
 }
 export function validateParams(schema) {
+    schema = toValidationSchema(schema);
     const validate = compileValidateSchema(schema, { coerceTypes: true });
     const middleware = (req, res, next) => {
         const result = validate(req.params);
@@ -68,6 +78,7 @@ export function compileValidateSchema(schema, options = {}) {
     };
 }
 export function validateSchema(data, schema, options = {}) {
+    schema = toValidationSchema(schema);
     const ajv = createAjv(options);
     const valid = ajv.validate(schema, data);
     if (valid) {

package/dist/vite/defineViteConfig.js

@@ -39,7 +39,7 @@ export function defineViteConfig({ base = '', reactCompiler = false, ssr = false
                 }
                 : {
                     input: {
-                        index: path.resolve(process.cwd(), '_index.html'),
+                        index: path.resolve(process.cwd(), 'index.html'),
                     },
                 },
         },
@@ -49,12 +49,12 @@ export function defineViteConfig({ base = '', reactCompiler = false, ssr = false
                 port,
                 strictPort: true,
                 origin: readEnv('VITE_ORIGIN', `http://localhost:${port}`),
-            }
-            : {
                 proxy: {
                     '/api': `http://localhost:${readEnv.number('PORT', 4000)}`,
+                    '/analytics.js': `http://localhost:${readEnv.number('PORT', 4000)}`,
                 },
-            },
+            }
+            : {},
         ssr: ssr
             ? {
                 noExternal: ['react-helmet-async'],

package/dist/vite/ssr.js

@@ -49,6 +49,7 @@ export async function createSsrMiddleware({ root = process.cwd(), getInitialData
             window.$RefreshSig$ = () => (type) => type
             window.__vite_plugin_react_preamble_installed__ = true
           `,
+                publicUrl: config.value.PUBLIC_URL,
             });
             const readManifest = async () => {
                 if (useDevServer) {

package/dist/vite/types.d.ts

@@ -5,6 +5,7 @@ export interface SsrRenderOptions {
     nonce: string;
     preamble: string;
     getInitialData: (req: string) => Promise<unknown>;
+    publicUrl: string;
 }
 export type EntryRenderFn = (req: Request, res: Response, options: SsrRenderOptions) => Promise<{
     html: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devmoods/express-extras",
-  "version": "0.49.3",
+  "version": "0.50.0",
   "description": "Kubernetes-ready utilities for rapid Node.js application development",
   "type": "module",
   "main": "./dist/index.js",
@@ -44,12 +44,12 @@
   ],
   "license": "ISC",
   "devDependencies": {
-    "@devmoods/eslint-config": "^2.5.0",
+    "@devmoods/eslint-config": "^2.6.0",
     "@types/koa-compose": "^3.2.8",
-    "@types/node": "22.10.5",
+    "@types/node": "22.10.7",
     "@types/supertest": "^6.0.2",
     "@vitejs/plugin-react": "^4.3.4",
-    "@vitest/coverage-v8": "^2.1.8",
+    "@vitest/coverage-v8": "^3.0.2",
     "cookiejar": "^2.1.4",
     "eslint": "^9.18.0",
     "faktory-worker": "^4.6.0",
@@ -59,13 +59,13 @@
     "tsx": "^4.19.2",
     "typescript": "5.7.3",
     "vite": "^6.0.7",
-    "vitest": "^2.1.8",
+    "vitest": "^3.0.2",
     "vitest-fail-on-console": "^0.7.1"
   },
   "dependencies": {
     "@devmoods/fetch": "^4.0.1",
-    "@sentry/node": "^8.48.0",
-    "@sentry/profiling-node": "^8.48.0",
+    "@sentry/node": "^8.50.0",
+    "@sentry/profiling-node": "^8.50.0",
     "@types/bcrypt": "^5.0.2",
     "@types/cookie-parser": "^1.4.8",
     "@types/express": "^5.0.0",
@@ -76,6 +76,7 @@
     "@types/uuid": "^10.0.0",
     "ajv": "^8.17.1",
     "argon2": "^0.41.1",
+    "arktype": "^2.0.0",
     "bcrypt": "^5.1.1",
     "chalk": "^5.4.1",
     "commander": "^13.0.0",