@devmoods/express-extras 0.28.8 → 0.30.0

package/bin/migrate

@@ -2,4 +2,4 @@
 
 set -e
 
-node_modules/.bin/ts-node --esm node_modules/@devmoods/express-extras/dist/cli/migrate.js ${*:1}
+node --no-warnings --loader ts-node/esm node_modules/@devmoods/express-extras/dist/cli/migrate.js ${*:1}

package/dist/auth.js

@@ -25,7 +25,6 @@ const emailSchema = { type: 'string', minLength: 4 };
  * Returns a signed JWT token.
  */
 export function createAuthToken(payload, secret = AUTH_SECRET) {
-    // eslint-disable-next-line import/no-named-as-default-member
     return jwt.sign(payload, secret, { expiresIn: TOKEN_EXPIRES_IN });
 }
 /**
@@ -33,7 +32,6 @@ export function createAuthToken(payload, secret = AUTH_SECRET) {
  */
 export function decodeAuthToken(token, secret = AUTH_SECRET) {
     try {
-        // eslint-disable-next-line import/no-named-as-default-member
         const decoded = jwt.verify(token.trim(), secret);
         /* c8 ignore next 3 */
         if (typeof decoded === 'string') {
@@ -332,7 +330,6 @@ export async function checkIfPasswordsMatch(realPassword, attemptedPassword) {
     if (!realPassword) {
         throw new Error('User has no defined password');
     }
-    // eslint-disable-next-line import/no-named-as-default-member
     const validPassword = await bcrypt.compare(attemptedPassword, realPassword);
     if (!validPassword) {
         throw new Error(`Passwords do not match`);
@@ -343,6 +340,5 @@ export async function checkIfPasswordsMatch(realPassword, attemptedPassword) {
  * Returns a hash of a password suitable for storage.
  */
 export function hashPassword(password) {
-    // eslint-disable-next-line import/no-named-as-default-member
     return bcrypt.hash(password, 10);
 }

package/dist/email.js

@@ -14,7 +14,7 @@ export function createEmail({ host, port, user, pass, senderName, senderAddress,
             from: `${senderName} <${senderAddress}>`,
             to,
             subject,
-            text: message,
+            text: message, // plain text,
             ...rest,
         };
         const result = await transporter.sendMail(payload);

package/dist/faktory.d.ts

@@ -4,11 +4,11 @@ export interface JobsOptions {
     faktory?: typeof create;
 }
 export declare function createJobs({ queueName, faktory: createFactory, }: JobsOptions): {
-    job: <K extends Record<string, any>, T extends (input: K) => void | Promise<any>>(fn: T) => {
+    job: <K extends Record<string, any>, T extends (input: K) => undefined | Promise<any>>(fn: T) => {
         $job: boolean;
         jobName: string;
         readonly executionCount: number;
-        delay(args?: Parameters<T>[0] | undefined): Promise<`${string}-${string}-${string}-${string}-${string}`>;
+        delay(args?: Parameters<T>[0]): Promise<`${string}-${string}-${string}-${string}-${string}`>;
         execute(args: Parameters<T>[0]): Promise<any>;
     };
     queueName: string;

package/dist/listen.js

@@ -4,7 +4,7 @@ import {} from 'node:net';
 import { delay } from '@devmoods/fetch';
 import {} from 'express';
 import { getLogger } from './logger.js';
-import { route } from './middleware.js';
+import { before, route } from './middleware.js';
 import { envPort, readEnv } from './utils.js';
 const logger = getLogger('http');
 const READINESS_PERIOD = readEnv.number('READINESS_PERIOD_MS', 0);
@@ -61,9 +61,9 @@ export function stoppable(server, grace = Infinity) {
     }
     server.on('connection', onConnection);
     server.on('request', onRequest);
-    // @ts-ignore
+    // @ts-expect-error attach stop
     server.stop = stop;
-    // @ts-ignore
+    // @ts-expect-error attach inspect
     server.inspect = () => {
         return {
             sockets: requestsPerSocket.size,
@@ -95,7 +95,7 @@ export function createExpressServer(app, options = {}) {
     for (const signal of ['SIGTERM', 'SIGINT']) {
         process.on(signal, onSignal);
     }
-    app.get('/health', route(async () => {
+    app.get('/health', before(), route(async () => {
         const timestamp = new Date().toISOString();
         try {
             if (stopping) {
@@ -125,8 +125,11 @@ export function createExpressServer(app, options = {}) {
             return onSignal('SIGTERM');
         },
         get port() {
-            // @ts-ignore
-            return server.address().port;
+            const address = server.address();
+            if (address == null || typeof address === 'string') {
+                throw new Error('address was a string, should not happen');
+            }
+            return address.port;
         },
     };
 }

package/dist/middleware.d.ts

@@ -5,16 +5,23 @@ type JsonParser = typeof bodyParser.json;
 export declare const urlencodedParser: UrlencodedParser;
 export declare const jsonParser: JsonParser;
 export { asyncMiddleware as route };
+export interface BeforeMiddlewareCSPDirectives {
+    'script-src': string[];
+    'style-src': string[];
+    'connect-src': string[];
+    [key: string]: string[];
+}
 export interface BeforeMiddlewareOptions {
     cookies?: boolean;
     helmet?: boolean;
     json?: boolean;
     allowUnsafeInlineScripts?: boolean;
+    cspDirectives?: (defaults: BeforeMiddlewareCSPDirectives) => BeforeMiddlewareCSPDirectives;
 }
 /**
  * Register middleware that must come before the app routes.
  */
-export declare function before({ cookies, helmet: useHelmet, json: useJson, allowUnsafeInlineScripts, }?: BeforeMiddlewareOptions): import("compose-middleware").RequestHandler<unknown, unknown, void>;
+export declare function before({ cookies, helmet: useHelmet, json: useJson, allowUnsafeInlineScripts, cspDirectives, }?: BeforeMiddlewareOptions): import("compose-middleware").RequestHandler<unknown, unknown, void>;
 /**
  * Middleware that sends a 404
  *

package/dist/middleware.js

@@ -15,7 +15,7 @@ export { asyncMiddleware as route };
 /**
  * Register middleware that must come before the app routes.
  */
-export function before({ cookies = false, helmet: useHelmet = true, json: useJson = true, allowUnsafeInlineScripts = false, } = {}) {
+export function before({ cookies = false, helmet: useHelmet = true, json: useJson = true, allowUnsafeInlineScripts = false, cspDirectives = (x) => x, } = {}) {
     return compose([
         withRequestContext(),
         logRequestDuration(),
@@ -24,13 +24,14 @@ export function before({ cookies = false, helmet: useHelmet = true, json: useJso
         useHelmet &&
             helmet({
                 contentSecurityPolicy: {
-                    directives: {
+                    directives: cspDirectives({
                         'default-src': ["'self'"],
                         'base-uri': ["'self'"],
                         'connect-src': [
                             "'self'",
                             'ws:',
                             '*.sentry.io',
+                            '*.ingest.sentry.io',
                             '*.cdn-apple.com',
                         ],
                         'font-src': ["'self'", 'https:', 'data:'],
@@ -46,7 +47,7 @@ export function before({ cookies = false, helmet: useHelmet = true, json: useJso
                         'script-src-attr': ["'none'"],
                         'style-src': ["'self'", 'https:', "'unsafe-inline'"],
                         'upgrade-insecure-requests': [],
-                    },
+                    }),
                 },
             }),
         useJson && jsonParser(),

package/dist/migrate.d.ts

@@ -6,8 +6,8 @@ interface Migration {
 }
 interface MigrationFileAPI {
     useTransaction?: boolean;
-    up(fn: any): Promise<string> | Promise<void> | string | void;
-    down(fn: any): Promise<string> | Promise<void> | string | void;
+    up(fn: any): Promise<void> | Promise<void> | string | undefined;
+    down(fn: any): Promise<string> | Promise<void> | string | undefined;
 }
 export declare function cli(): Promise<void>;
 export declare function runCli(input: string[], flags: Record<string, any>, showHelp?: () => void): Promise<number>;

package/dist/postgres.js

@@ -70,7 +70,6 @@ export class Transaction extends Connection {
  * @param config
  */
 export function createPostgres({ onError, url = readEnv('POSTGRES_URL'), ...config } = {}) {
-    // eslint-disable-next-line import/no-named-as-default-member
     const pool = new pg.Pool({ connectionString: url, ...config });
     if (onError) {
         pool.on('error', onError);

package/dist/sentry.d.ts

@@ -59,6 +59,7 @@ export declare function createSentryOptions(app: Application | null, options?: S
     serverName?: string | undefined;
     includeLocalVariables?: boolean | undefined;
     clientClass?: typeof Sentry.NodeClient | undefined;
+    spotlight?: string | boolean | undefined;
     shouldCreateSpanForRequest?(this: void, url: string): boolean;
     onFatalError?(this: void, error: Error): void;
 };

package/dist/setupTests.js

@@ -1,9 +1,3 @@
 import 'dotenv/config';
-import * as crypto from 'node:crypto';
-try {
-    // @ts-ignore
-    globalThis.crypto = crypto;
-}
-catch (e) {
-    // empty
-}
+import failOnConsole from 'vitest-fail-on-console';
+failOnConsole();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devmoods/express-extras",
-  "version": "0.28.8",
+  "version": "0.30.0",
   "description": "Kubernetes-ready utilities for rapid Node.js application development",
   "type": "module",
   "main": "./dist/index.js",
@@ -8,16 +8,6 @@
   "bin": {
     "migrate": "bin/migrate"
   },
-  "scripts": {
-    "start": "ts-node --esm example/index.ts",
-    "start:worker": "ts-node --esm example/worker.ts",
-    "clean": "rm -rf dist",
-    "lint": "eslint src",
-    "test": "./test.sh src",
-    "build": "pnpm run clean && tsc --project tsconfig.build.json",
-    "prepublishOnly": "pnpm run clean && pnpm run build",
-    "format": "prettier --write '**/*.{js,css,md,ts,tsx}'"
-  },
   "author": {
     "name": "hanse",
     "email": "hanse@koren.im"
@@ -33,56 +23,57 @@
   ],
   "license": "ISC",
   "devDependencies": {
-    "@devmoods/eslint-config": "^1.8.0",
+    "@devmoods/eslint-config": "^1.12.0",
     "@types/koa-compose": "^3.2.8",
-    "@types/node": "20.9.0",
-    "@types/supertest": "^2.0.16",
-    "@typescript-eslint/eslint-plugin": "^6.10.0",
-    "@typescript-eslint/parser": "^6.10.0",
-    "@vitest/coverage-v8": "^0.34.6",
+    "@types/node": "20.12.12",
+    "@types/supertest": "^6.0.2",
+    "@typescript-eslint/eslint-plugin": "^7.1.0",
+    "@typescript-eslint/parser": "^7.1.0",
+    "@vitest/coverage-v8": "^1.3.1",
     "chalk": "^5.3.0",
-    "eslint": "^8.53.0",
-    "eslint-plugin-import": "^2.29.0",
+    "eslint": "^8.57.0",
+    "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-jsx-a11y": "^6.8.0",
-    "eslint-plugin-prettier": "^5.0.1",
+    "eslint-plugin-prettier": "^5.1.3",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
     "faktory-worker": "^4.5.1",
-    "prettier": "3.0.3",
-    "supertest": "6.3.3",
-    "ts-node": "10.9.1",
-    "typescript": "5.2.2",
-    "vitest": "^0.34.6"
+    "prettier": "3.2.5",
+    "supertest": "7.0.0",
+    "ts-node": "10.9.2",
+    "typescript": "5.4.5",
+    "vitest": "^1.3.1"
   },
   "dependencies": {
     "@devmoods/fetch": "^4.0.1",
-    "@sentry/node": "^7.80.0",
+    "@sentry/node": "^7.116.0",
     "@types/bcrypt": "^5.0.2",
     "@types/body-parser": "^1.19.5",
-    "@types/cookie-parser": "^1.4.6",
+    "@types/cookie-parser": "^1.4.7",
     "@types/express": "^4.17.21",
-    "@types/jsonwebtoken": "^9.0.5",
+    "@types/jsonwebtoken": "^9.0.6",
     "@types/nodemailer": "^6.4.14",
-    "@types/pg": "^8.10.9",
-    "@types/superagent": "^4.1.21",
-    "@types/uuid": "^9.0.7",
+    "@types/pg": "^8.11.2",
+    "@types/superagent": "^8.1.4",
+    "@types/uuid": "^9.0.8",
     "ajv": "^8.12.0",
     "bcrypt": "^5.1.1",
     "body-parser": "^1.20.2",
-    "commander": "^11.1.0",
+    "commander": "^12.0.0",
     "compose-middleware": "^5.0.1",
     "cookie-parser": "^1.4.6",
-    "dotenv": "^16.3.1",
-    "express": "^4.18.2",
+    "dotenv": "^16.4.5",
+    "express": "^4.18.3",
     "express-route-parser": "^1.0.5",
     "helmet": "^7.1.0",
     "jsonwebtoken": "^9.0.2",
-    "meow": "^12.1.1",
-    "nodemailer": "^6.9.7",
+    "meow": "^13.2.0",
+    "nodemailer": "^6.9.11",
     "pg": "^8.11.3",
-    "redis": "^4.6.10",
+    "redis": "^4.6.13",
     "sql-template-strings": "^2.2.2",
-    "uuid": "^9.0.1"
+    "uuid": "^9.0.1",
+    "vitest-fail-on-console": "^0.7.0"
   },
   "prettier": {
     "singleQuote": true
@@ -100,5 +91,17 @@
   },
   "peerDependencies": {
     "faktory-worker": "^4.5.1"
+  },
+  "engines": {
+    "node": ">=20.3.0 <22"
+  },
+  "scripts": {
+    "start": "ts-node --esm example/index.ts",
+    "start:worker": "ts-node --esm example/worker.ts",
+    "clean": "rm -rf dist",
+    "lint": "eslint src",
+    "test": "./test.sh src",
+    "build": "pnpm run clean && tsc --project tsconfig.build.json",
+    "format": "prettier --write '**/*.{js,css,md,ts,tsx}'"
   }
-}
+}