@devmoods/express-extras 0.42.1 → 0.44.0

package/dist/auth.d.ts

@@ -44,6 +44,7 @@ export interface AuthOptions<UserModel extends AnyUser> {
     providers: AuthProvider<UserModel>[];
     redis: RedisClient;
     filterUser(user: UserModel): Partial<UserModel>;
+    loginUrl?: string;
 }
 export interface CreateAuth<UserModel extends AnyUser> {
     createRouter: () => Router;
@@ -54,7 +55,7 @@ export interface CreateAuth<UserModel extends AnyUser> {
 export type AuthMiddlewareOptions<UserModel extends AnyUser> = false | {
     isAuthorized?: (user: UserModel) => Promise<boolean> | boolean;
 };
-export declare function createAuth<UserModel extends AnyUser>({ getUserByToken, filterUser, redis, providers, }: AuthOptions<UserModel>): CreateAuth<UserModel>;
+export declare function createAuth<UserModel extends AnyUser>({ getUserByToken, filterUser, redis, providers, loginUrl, }: AuthOptions<UserModel>): CreateAuth<UserModel>;
 /**
  * Extract a Bearer token from the HTTP Authorization header
  * of `req`.
@@ -66,6 +67,7 @@ export declare function parseAuthorizationHeader(req: Request): string | null;
  * Checks multiple places and uses the first match. Priority:
  *   1. Request header `Authorization: `
  *   2. Cookie named `access_token`
+ *
  */
 export declare function extractAccessTokenFromRequest(req: Request): string | null;
 /**

package/dist/auth.js

@@ -3,17 +3,17 @@ import bcrypt from 'bcrypt';
 import { Router, } from 'express';
 import jwt from 'jsonwebtoken';
 import { v4 } from 'uuid';
+import { config } from './config.js';
 import { setContext, useContext } from './context.js';
-import { ApiError, BadRequest, Forbidden, NotFound, Unauthorized, } from './errors.js';
+import { BadRequest, Forbidden, NotFound, Unauthorized } from './errors.js';
 import { getLogger } from './logger.js';
 import { route } from './middleware.js';
 import {} from './redis.js';
-import { readEnv } from './utils.js';
 import { validateBody, validateParams, } from './validate.js';
 const logger = getLogger('auth');
-const TOKEN_EXPIRES_IN = readEnv.number('AUTH_TOKEN_EXPIRES', 3600 * 48);
-const TEMP_TOKEN_EXIRES_IN = readEnv.number('AUTH_TEMP_TOKEN_EXPIRES', 3600);
-const AUTH_SECRET = readEnv('AUTH_JWT_SECRET', '');
+const TOKEN_EXPIRES_IN = config.value.AUTH_TOKEN_EXPIRES_IN;
+const TEMP_TOKEN_EXIRES_IN = config.value.AUTH_TEMP_TOKEN_EXPIRES_IN;
+const AUTH_SECRET = config.value.AUTH_SECRET;
 const tokenSchema = {
     type: 'string',
     minLength: 50,
@@ -40,7 +40,7 @@ export function decodeAuthToken(token, secret = AUTH_SECRET) {
         return { ...decoded };
     }
     catch (error) {
-        throw new Error(`Failed to decode auth token: ${error.message}`);
+        throw new InvalidToken(`Failed to decode auth token: ${error.message}`);
     }
 }
 export function EmailAndPasswordAuthProvider(options) {
@@ -140,7 +140,7 @@ export function EmailAndPasswordAuthProvider(options) {
         },
     };
 }
-export function createAuth({ getUserByToken, filterUser, redis, providers, }) {
+export function createAuth({ getUserByToken, filterUser, redis, providers, loginUrl = '/', }) {
     const useCurrentUser = () => useContext('currentUser');
     const setCurrentUser = (user) => setContext('currentUser', user);
     const login = async (res, user) => {
@@ -230,21 +230,27 @@ export function createAuth({ getUserByToken, filterUser, redis, providers, }) {
                     throw new InvalidToken('token expired');
                 }
                 const decoded = decodeAuthToken(token);
-                const user = await getUserByToken(decoded);
-                if (options.isAuthorized && !(await options.isAuthorized(user))) {
-                    throw Forbidden('Permission denied');
+                try {
+                    const user = await getUserByToken(decoded);
+                    if (options.isAuthorized && !(await options.isAuthorized(user))) {
+                        throw Forbidden('Permission denied');
+                    }
+                    setCurrentUser(user);
+                }
+                catch {
+                    throw new InvalidToken('User not found');
                 }
-                setCurrentUser(user);
                 next();
             }
             catch (error) {
                 logger.error(error);
-                if (error instanceof ApiError) {
-                    next(error);
-                }
-                else {
+                if (error instanceof InvalidToken) {
+                    if (req.accepts('html')) {
+                        return res.redirect(loginUrl);
+                    }
                     next(Unauthorized('Invalid token'));
                 }
+                next(error);
             }
         };
     }
@@ -284,7 +290,7 @@ export function parseAuthorizationHeader(req) {
         .split(' ')
         .map((s) => s.trim());
     if (token && type !== 'Bearer') {
-        throw new Error('Only Bearer type supported in jwt()');
+        throw new InvalidToken('Only Bearer type supported in jwt()');
     }
     // No token given, this is not necessarilly an error case
     if (!token) {
@@ -302,6 +308,7 @@ export function parseAuthorizationHeader(req) {
  * Checks multiple places and uses the first match. Priority:
  *   1. Request header `Authorization: `
  *   2. Cookie named `access_token`
+ *
  */
 export function extractAccessTokenFromRequest(req) {
     const authorizationHeader = parseAuthorizationHeader(req);

package/dist/config.d.ts

@@ -0,0 +1,19 @@
+export declare const config: {
+    value: {
+        CI: boolean;
+        PORT: number;
+        AUTH_TOKEN_EXPIRES_IN: number;
+        AUTH_TEMP_TOKEN_EXPIRES_IN: number;
+        AUTH_SECRET: string;
+        REDIS_URL: string;
+        POSTGRES_URL: string;
+        SENTRY_DSN: string;
+        LOG_LEVEL: string;
+        LOG_SQL: boolean;
+        NODE_ENV: string;
+        CSRF_SECRET: string;
+        READINESS_PERIOD_MS: number;
+        GRACE_PERIOD_MS: number;
+        SLACK_WEBHOOK_URL: string;
+    };
+};

package/dist/config.js

@@ -0,0 +1,27 @@
+import { readEnv } from './utils.js';
+function lazy(fn) {
+    return {
+        get value() {
+            const value = fn();
+            Object.defineProperty(this, 'value', { value });
+            return value;
+        },
+    };
+}
+export const config = lazy(() => ({
+    CI: readEnv.boolean('CI', false),
+    PORT: readEnv.number('PORT', 0),
+    AUTH_TOKEN_EXPIRES_IN: readEnv.number('AUTH_TOKEN_EXPIRES', 3600 * 24 * 30), // 30 days
+    AUTH_TEMP_TOKEN_EXPIRES_IN: readEnv.number('AUTH_TEMP_TOKEN_EXPIRES', 3600),
+    AUTH_SECRET: readEnv('AUTH_JWT_SECRET', ''),
+    REDIS_URL: readEnv('REDIS_URL', ''),
+    POSTGRES_URL: readEnv('POSTGRES_URL', ''),
+    SENTRY_DSN: readEnv('SENTRY_DSN', ''),
+    LOG_LEVEL: readEnv('LOG_LEVEL', 'INFO'),
+    LOG_SQL: readEnv.boolean('LOG_SQL', false),
+    NODE_ENV: readEnv('NODE_ENV', 'development'),
+    CSRF_SECRET: readEnv('CSRF_SECRET', ''),
+    READINESS_PERIOD_MS: readEnv.number('READINESS_PERIOD_MS', 0),
+    GRACE_PERIOD_MS: readEnv.number('GRACE_PERIOD_MS', 20000),
+    SLACK_WEBHOOK_URL: readEnv('SLACK_WEBHOOK_URL', ''),
+}));

package/dist/csrf.js

@@ -1,16 +1,16 @@
 import { createHash, randomBytes } from 'node:crypto';
 import {} from 'express';
+import { config } from './config.js';
 import { setContext, useContext } from './context.js';
 import { Forbidden } from './errors.js';
-import { readEnv } from './utils.js';
 const ignoredMethods = new Set(['GET', 'HEAD', 'OPTIONS']);
 const defaultCookieName = () => {
-    return process.env.NODE_ENV === 'production' && !readEnv.boolean('CI', false)
+    return config.value.NODE_ENV === 'production' && !config.value.CI
         ? '__Host-devmoods.x-csrf-token'
         : 'devmoods.x-csrf-token';
 };
 export const getCsrfSecret = () => {
-    const secret = readEnv('CSRF_SECRET', '');
+    const secret = config.value.CSRF_SECRET;
     if (!secret) {
         throw new Error('CSRF_SECRET is not set');
     }

package/dist/faktory.js

@@ -1,5 +1,5 @@
-import { AsyncLocalStorage } from 'async_hooks';
-import { randomUUID } from 'crypto';
+import { AsyncLocalStorage } from 'node:async_hooks';
+import { randomUUID } from 'node:crypto';
 import { create } from 'faktory-worker';
 import { getLogger } from './logger.js';
 import { startTimer } from './utils.js';

package/dist/listen.js

@@ -3,13 +3,14 @@ import {} from 'node:http';
 import {} from 'node:net';
 import { delay } from '@devmoods/fetch';
 import {} from 'express';
+import { config } from './config.js';
 import { getLogger } from './logger.js';
 import { before, route } from './middleware.js';
-import { envPort, readEnv } from './utils.js';
+import { envPort } from './utils.js';
 import { validateQuery } from './validate.js';
 const logger = getLogger('http');
-const READINESS_PERIOD = readEnv.number('READINESS_PERIOD_MS', 0);
-const GRACE_PERIOD = readEnv.number('GRACE_PERIOD_MS', 20000);
+const READINESS_PERIOD = config.value.READINESS_PERIOD_MS;
+const GRACE_PERIOD = config.value.GRACE_PERIOD_MS;
 export function stoppable(server, grace = Infinity) {
     let stopped = false;
     let gracefully = true;

package/dist/logger.js

@@ -1,7 +1,7 @@
 import * as os from 'node:os';
 import * as Sentry from '@sentry/node';
+import { config } from './config.js';
 import { useRequestId } from './context.js';
-import { readEnv } from './utils.js';
 const LEVELS = {
     TRACE: 10,
     DEBUG: 20,
@@ -24,7 +24,7 @@ function defaultGetContext() {
         ..._globalGetContext?.(),
     };
 }
-export function createLogger({ name, getContext, level = readEnv('LOG_LEVEL', 'INFO'), output = process.stdout, }) {
+export function createLogger({ name, getContext, level = config.value.LOG_LEVEL, output = process.stdout, }) {
     if (_loggers.has(name)) {
         throw new Error(`A logger named ${name} already exists`);
     }

package/dist/manage.js

@@ -2,6 +2,7 @@ import { program } from 'commander';
 import {} from 'express';
 import { hashPassword } from './auth.js';
 import { CLI } from './cli.js';
+import { config } from './config.js';
 import { asCli } from './migrate.js';
 import { parseRoutes } from './routes.js';
 export function registerManagementCommand(register) {
@@ -44,4 +45,9 @@ export function registerDefaultCommands(app) {
             cli.writeLine(`${hash}\n`);
         }));
     });
+    registerManagementCommand((command, cli) => {
+        command('show-config').action(cli.wrap(async () => {
+            console.log(config.value);
+        }));
+    });
 }

package/dist/postgres.d.ts

@@ -39,7 +39,7 @@ export declare class Transaction extends Connection {
  *
  * @param config
  */
-export declare function createPostgres({ onError, url, ...config }?: PostgresOptions): {
+export declare function createPostgres({ onError, url, ...postgresOptions }?: PostgresOptions): {
     insert: <T extends QueryResultRow>(text: string | SqlStatement, values?: Value[]) => Promise<QueryResult<T>>;
     query: <T extends QueryResultRow>(text: string | SqlStatement, values?: Value[]) => Promise<QueryResult<T>>;
     first: <T extends QueryResultRow>(text: string | SqlStatement, values?: Value[]) => Promise<T | null>;

package/dist/postgres.js

@@ -1,6 +1,7 @@
 import pg, {} from 'pg';
 import { format } from 'sql-formatter';
-import { readEnv, startTimer } from './utils.js';
+import { config } from './config.js';
+import { startTimer } from './utils.js';
 export const escapePostgresIdentifier = pg.escapeIdentifier;
 export const escapePostgresLiteral = pg.escapeLiteral;
 export const formatSql = (statement) => {
@@ -39,7 +40,7 @@ export class Connection {
         if (this.options.onLogStatement) {
             return this.options.onLogStatement(text, values, duration);
         }
-        if (readEnv.boolean('LOG_SQL', false)) {
+        if (config.value.LOG_SQL) {
             console.log(`\n${formatSql(text)}\n\nValues: ${JSON.stringify(values)}\nDuration: ${duration}ms\n`);
         }
     }
@@ -93,15 +94,17 @@ export class Transaction extends Connection {
  *
  * @param config
  */
-export function createPostgres({ onError, url = readEnv('POSTGRES_URL'), ...config } = {}) {
-    const pool = new pg.Pool({ connectionString: url, ...config });
+export function createPostgres({ onError, url = config.value.POSTGRES_URL, ...postgresOptions } = {}) {
+    const pool = new pg.Pool({ connectionString: url, ...postgresOptions });
     pool.on('error', (e, client) => {
         onError?.(e, client);
     });
     async function withConnection(callback) {
         const client = await pool.connect();
         try {
-            const result = await callback(new Connection(client, { onLogStatement: config.onLogStatement }));
+            const result = await callback(new Connection(client, {
+                onLogStatement: postgresOptions.onLogStatement,
+            }));
             return result;
         }
         finally {
@@ -127,7 +130,9 @@ export function createPostgres({ onError, url = readEnv('POSTGRES_URL'), ...conf
         const client = await pool.connect();
         try {
             await client.query('BEGIN');
-            const result = await callback(new Transaction(client, { onLogStatement: config.onLogStatement }));
+            const result = await callback(new Transaction(client, {
+                onLogStatement: postgresOptions.onLogStatement,
+            }));
             await client.query('COMMIT');
             return result;
         }

package/dist/redis.js

@@ -1,6 +1,6 @@
 import { createClient } from 'redis';
-import { readEnv } from './utils.js';
-export function createRedis({ url = readEnv('REDIS_URL', ''), onError, } = {}) {
+import { config } from './config.js';
+export function createRedis({ url = config.value.REDIS_URL, onError, } = {}) {
     const client = createClient({ url });
     // Always attach a listener even if
     // onError is not provided.

package/dist/sentry.js

@@ -1,8 +1,8 @@
 import { nodeProfilingIntegration } from '@sentry/profiling-node';
-import { readEnv } from './utils.js';
+import { config } from './config.js';
 export function sentryOptions(options = {}) {
     return {
-        dsn: readEnv('SENTRY_DSN'),
+        dsn: config.value.SENTRY_DSN,
         tracesSampleRate: 1.0,
         profilesSampleRate: 1.0,
         integrations: [nodeProfilingIntegration()],

package/dist/slack.js

@@ -1,6 +1,6 @@
 import { createFetch } from '@devmoods/fetch';
+import { config } from './config.js';
 import { getLogger } from './logger.js';
-import { readEnv } from './utils.js';
 const logger = getLogger('slack');
 /**
  * Send messages to Slack using Incoming Webhooks
@@ -15,7 +15,7 @@ const logger = getLogger('slack');
  *
  * See https://api.slack.com/messaging/webhooks
  */
-export function createSlack({ webhookUrl = readEnv('SLACK_WEBHOOK_URL', ''), dryRun = process.env.NODE_ENV !== 'production', } = {}) {
+export function createSlack({ webhookUrl = config.value.SLACK_WEBHOOK_URL, dryRun = process.env.NODE_ENV !== 'production', } = {}) {
     const fetch = createFetch();
     /**
      * Post a message to Slack

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devmoods/express-extras",
-  "version": "0.42.1",
+  "version": "0.44.0",
   "description": "Kubernetes-ready utilities for rapid Node.js application development",
   "type": "module",
   "main": "./dist/index.js",
@@ -18,19 +18,15 @@
   ],
   "license": "ISC",
   "devDependencies": {
-    "@devmoods/eslint-config": "^1.15.0",
+    "@devmoods/eslint-config": "^2.5.0",
     "@types/koa-compose": "^3.2.8",
     "@types/node": "22.10.1",
     "@types/supertest": "^6.0.2",
-    "@typescript-eslint/eslint-plugin": "^8.17.0",
-    "@typescript-eslint/parser": "^8.17.0",
     "@vitest/coverage-v8": "^2.1.8",
     "cookiejar": "^2.1.4",
-    "eslint": "^8.57.0",
-    "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-prettier": "^5.2.1",
+    "eslint": "^9.16.0",
     "faktory-worker": "^4.6.0",
-    "prettier": "3.4.1",
+    "prettier": "3.4.2",
     "supertest": "7.0.0",
     "ts-node": "10.9.2",
     "tsx": "^4.19.2",
@@ -40,8 +36,8 @@
   },
   "dependencies": {
     "@devmoods/fetch": "^4.0.1",
-    "@sentry/node": "^8.42.0",
-    "@sentry/profiling-node": "^8.42.0",
+    "@sentry/node": "^8.43.0",
+    "@sentry/profiling-node": "^8.43.0",
     "@types/bcrypt": "^5.0.2",
     "@types/body-parser": "^1.19.5",
     "@types/cookie-parser": "^1.4.8",
@@ -58,8 +54,8 @@
     "commander": "^12.1.0",
     "compose-middleware": "^5.0.1",
     "cookie-parser": "^1.4.7",
-    "dotenv": "^16.4.6",
-    "express": "^4.21.1",
+    "dotenv": "^16.4.7",
+    "express": "^4.21.2",
     "helmet": "^8.0.0",
     "jsonwebtoken": "^9.0.2",
     "nodemailer": "^6.9.16",
@@ -71,9 +67,6 @@
   "prettier": {
     "singleQuote": true
   },
-  "eslintConfig": {
-    "extends": "@devmoods/eslint-config"
-  },
   "peerDependencies": {
     "faktory-worker": "^4.5.1"
   },
@@ -84,7 +77,7 @@
     "start": "pushd example; pnpm run start --watch; popd example;",
     "start:worker": "pushd example; pnpm run start:worker; popd example;",
     "clean": "rm -rf dist",
-    "lint": "eslint src example/src",
+    "lint": "eslint",
     "test": "./test.sh",
     "build": "pnpm run clean && tsc --project tsconfig.build.json",
     "format": "prettier --write '**/*.{js,css,md,ts,tsx}'"