@devmoods/express-extras 0.30.0 → 0.32.0

package/dist/cache.js

@@ -18,8 +18,8 @@ export function createRedisCacheAdapter(redis, options = {}) {
                 await redis.del(createKey(key));
             }
             const keys = await redis.keys(`${keyPrefix}*`);
-            for (const key of keys) {
-                await redis.del(key);
+            for (const existingKey of keys) {
+                await redis.del(existingKey);
             }
         },
     };

package/dist/errors.js

@@ -64,7 +64,7 @@ function _errorHandler({ onError }) {
  */
 export function errorHandler({ onError }) {
     return errors([
-        Sentry.Handlers.errorHandler({
+        Sentry.expressErrorHandler({
             shouldHandleError(error) {
                 if (error instanceof ApiError && error.status < 500) {
                     return false;

package/dist/logger.d.ts

@@ -1,6 +1,5 @@
 /// <reference types="node" resolution-mode="require"/>
 import { type Duplex } from 'node:stream';
-import { type CreateSentry } from './sentry.js';
 export type LoggerContext = Record<string, any>;
 export interface LoggerOptions {
     /**
@@ -14,7 +13,6 @@ export interface LoggerOptions {
     level?: string;
     output?: Duplex;
 }
-export declare function attachSentryClientToLoggers(sentryClient: CreateSentry['client']): void;
 export declare function setGlobalLoggerContext(getContext: () => LoggerContext): void;
 export type Logger = ReturnType<typeof createLogger>;
 export declare function createLogger({ name, getContext, level, output, }: LoggerOptions): {

package/dist/logger.js

@@ -1,7 +1,7 @@
 import * as os from 'node:os';
 import {} from 'node:stream';
+import * as Sentry from '@sentry/node';
 import { useRequestId } from './context.js';
-import {} from './sentry.js';
 import { readEnv } from './utils.js';
 const LEVELS = {
     TRACE: 10,
@@ -13,10 +13,6 @@ const LEVELS = {
 };
 const LEVELS_TO_NAME = Object.fromEntries(Object.entries(LEVELS).map(([name, level]) => [level, name.toLowerCase()]));
 const _loggers = new Map();
-let _sentryClient;
-export function attachSentryClientToLoggers(sentryClient) {
-    _sentryClient = sentryClient;
-}
 let _globalGetContext;
 export function setGlobalLoggerContext(getContext) {
     _globalGetContext = getContext;
@@ -45,6 +41,7 @@ export function createLogger({ name, getContext, level = readEnv('LOG_LEVEL', 'I
             ...context,
         };
     }
+    // eslint-disable-next-line @typescript-eslint/no-shadow
     function log(level, message, context) {
         const payload = JSON.stringify({
             level: LEVELS_TO_NAME[level],
@@ -73,8 +70,8 @@ export function createLogger({ name, getContext, level = readEnv('LOG_LEVEL', 'I
         },
         error(error, message, context = {}) {
             const finalContext = getFinalContext(context);
-            if (_sentryClient != null) {
-                _sentryClient.captureException(error, {
+            if (Sentry.isInitialized()) {
+                Sentry.captureException(error, {
                     tags: finalContext,
                 });
             }
@@ -85,8 +82,8 @@ export function createLogger({ name, getContext, level = readEnv('LOG_LEVEL', 'I
         },
         fatal(error, message, context = {}) {
             const finalContext = getFinalContext(context);
-            if (_sentryClient != null) {
-                _sentryClient.captureException(error, {
+            if (Sentry.isInitialized()) {
+                Sentry.captureException(error, {
                     tags: finalContext,
                 });
             }

package/dist/middleware.js

@@ -1,4 +1,3 @@
-import * as Sentry from '@sentry/node';
 import bodyParser from 'body-parser';
 import { compose } from 'compose-middleware';
 import cookieParser from 'cookie-parser';
@@ -19,8 +18,6 @@ export function before({ cookies = false, helmet: useHelmet = true, json: useJso
     return compose([
         withRequestContext(),
         logRequestDuration(),
-        Sentry.Handlers.requestHandler(),
-        Sentry.Handlers.tracingHandler(),
         useHelmet &&
             helmet({
                 contentSecurityPolicy: {

package/dist/migrate.js

@@ -4,7 +4,7 @@ import chalk from 'chalk';
 import meow from 'meow';
 import { createPostgres } from './postgres.js';
 export async function cli() {
-    const cli = meow(`
+    const app = meow(`
 Usage
   $ migrate init
   $ migrate up
@@ -16,9 +16,9 @@ Usage
     });
     let exitCode = 0;
     try {
-        exitCode = await runCli(cli.input, cli.flags, 
+        exitCode = await runCli(app.input, app.flags, 
         /* c8 ignore next 2 */
-        () => cli.showHelp());
+        () => app.showHelp());
     }
     catch (error) {
         if (error instanceof CliError) {
@@ -36,13 +36,12 @@ class CliError extends Error {
         this.code = code;
     }
 }
+function isValidAction(action) {
+    return action != null && ['init', 'up', 'down', 'create'].includes(action);
+}
 export async function runCli(input, flags, showHelp) {
     const verbose = !flags.silent;
-    const args = input.slice();
-    const action = args.shift();
-    function isValidAction(action) {
-        return action != null && ['init', 'up', 'down', 'create'].includes(action);
-    }
+    const [inputAction, ...inputArgs] = input.slice();
     const migrator = new Migrator({ verbose });
     async function run(action, ...args) {
         try {
@@ -78,7 +77,7 @@ export async function runCli(input, flags, showHelp) {
             throw new CliError(error.message, 1);
         }
     }
-    return run(action, ...args);
+    return run(inputAction, ...inputArgs);
 }
 export class Migrator {
     constructor({ postgres = createPostgres(), pathToMigrations = path.resolve(process.cwd(), 'db', 'migrations'), migrationTableName = 'migrations', verbose = true, } = {}) {

package/dist/sentry.d.ts

@@ -1,65 +1,5 @@
-import * as Sentry from '@sentry/node';
-import { type Application } from 'express';
+import type * as Sentry from '@sentry/node';
 export type { Sentry };
 export interface SentryOptions extends Sentry.NodeOptions {
 }
-export type CreateSentry = ReturnType<typeof createSentry>;
-/**
- * Create a pre-configured Sentry client
- */
-export declare function createSentry(options?: SentryOptions): {
-    client: typeof Sentry;
-    init(app: Application | null, getOptions?: (defaultOptions: Sentry.NodeOptions) => Sentry.NodeOptions): void;
-};
-/**
- * Construct sensible Sentry default options for an Express-based app.
- */
-export declare function createSentryOptions(app: Application | null, options?: SentryOptions): {
-    defaultIntegrations?: false | import("@sentry/types").Integration[] | undefined;
-    integrations: import("@sentry/types").Integration[] | ((integrations: import("@sentry/types").Integration[]) => import("@sentry/types").Integration[]) | undefined;
-    transport?: ((transportOptions: import("@sentry/node/types/transports/http.js").NodeTransportOptions) => import("@sentry/types").Transport) | undefined;
-    stackParser?: import("@sentry/types").StackParser | import("@sentry/types").StackLineParser[] | undefined;
-    release?: string | undefined;
-    debug?: boolean | undefined;
-    enabled?: boolean | undefined;
-    attachStacktrace?: boolean | undefined;
-    autoSessionTracking?: boolean | undefined;
-    sendClientReports?: boolean | undefined;
-    dsn: string | undefined;
-    environment?: string | undefined;
-    dist?: string | undefined;
-    instrumenter?: import("@sentry/types").Instrumenter | undefined;
-    transportOptions?: Partial<import("@sentry/node/types/transports/http.js").NodeTransportOptions> | undefined;
-    tracesSampleRate: number;
-    enableTracing?: boolean | undefined;
-    initialScope?: import("@sentry/types").CaptureContext | undefined;
-    maxBreadcrumbs?: number | undefined;
-    sampleRate?: number | undefined;
-    maxValueLength?: number | undefined;
-    normalizeDepth?: number | undefined;
-    normalizeMaxBreadth?: number | undefined;
-    shutdownTimeout?: number | undefined;
-    ignoreErrors?: (string | RegExp)[] | undefined;
-    ignoreTransactions?: (string | RegExp)[] | undefined;
-    tunnel?: string | undefined;
-    sendDefaultPii?: boolean | undefined;
-    _metadata?: import("@sentry/types").SdkMetadata | undefined;
-    _experiments?: {
-        [key: string]: any;
-    } | undefined;
-    allowUrls?: (string | RegExp)[] | undefined;
-    denyUrls?: (string | RegExp)[] | undefined;
-    tracePropagationTargets?: import("@sentry/types").TracePropagationTargets | undefined;
-    tracesSampler?: ((samplingContext: import("@sentry/types").SamplingContext) => number | boolean) | undefined;
-    beforeSend?: ((event: import("@sentry/types").ErrorEvent, hint: Sentry.EventHint) => Sentry.Event | PromiseLike<Sentry.Event | null> | null) | undefined;
-    beforeSendTransaction?: ((event: import("@sentry/types").TransactionEvent, hint: Sentry.EventHint) => Sentry.Event | PromiseLike<Sentry.Event | null> | null) | undefined;
-    beforeBreadcrumb?: ((breadcrumb: Sentry.Breadcrumb, hint?: Sentry.BreadcrumbHint | undefined) => Sentry.Breadcrumb | null) | undefined;
-    profilesSampleRate?: number | undefined;
-    profilesSampler?: ((samplingContext: import("@sentry/types").SamplingContext) => number | boolean) | undefined;
-    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;
-};
+export declare function sentryOptions(options?: SentryOptions): SentryOptions;

package/dist/sentry.js

@@ -1,31 +1,10 @@
-import * as Sentry from '@sentry/node';
-import {} from 'express';
-import { attachSentryClientToLoggers } from './logger.js';
+import { nodeProfilingIntegration } from '@sentry/profiling-node';
 import { readEnv } from './utils.js';
-/**
- * Create a pre-configured Sentry client
- */
-export function createSentry(options = {}) {
-    const client = Sentry;
-    return {
-        client,
-        init(app, getOptions = (defaultOptions) => defaultOptions) {
-            attachSentryClientToLoggers(client);
-            Sentry.init(getOptions(createSentryOptions(app, options)));
-        },
-    };
-}
-/**
- * Construct sensible Sentry default options for an Express-based app.
- */
-export function createSentryOptions(app, options = {}) {
+export function sentryOptions(options = {}) {
     return {
         dsn: readEnv('SENTRY_DSN'),
-        integrations: [
-            new Sentry.Integrations.Http({ tracing: true }),
-            app && new Sentry.Integrations.Express({ app }),
-        ].filter(Boolean),
         tracesSampleRate: 1.0,
+        integrations: [nodeProfilingIntegration()],
         ...options,
     };
 }

package/dist/validate.js

@@ -32,11 +32,18 @@ export function validateParams(schema) {
         next();
     };
 }
-export function compileValidateSchema(schema, options = {}) {
+function createAjv(options) {
     const ajv = new Ajv({
         allErrors: true,
+        validateFormats: false,
         ...options,
     });
+    ajv.addKeyword('$enumNames');
+    ajv.addKeyword('$bitiforms');
+    return ajv;
+}
+export function compileValidateSchema(schema, options = {}) {
+    const ajv = createAjv(options);
     const validate = ajv.compile(schema);
     return (data) => {
         const valid = validate(data);
@@ -55,10 +62,7 @@ export function compileValidateSchema(schema, options = {}) {
     };
 }
 export function validateSchema(data, schema, options = {}) {
-    const ajv = new Ajv({
-        allErrors: true,
-        ...options,
-    });
+    const ajv = createAjv(options);
     const valid = ajv.validate(schema, data);
     if (valid) {
         return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devmoods/express-extras",
-  "version": "0.30.0",
+  "version": "0.32.0",
   "description": "Kubernetes-ready utilities for rapid Node.js application development",
   "type": "module",
   "main": "./dist/index.js",
@@ -23,54 +23,55 @@
   ],
   "license": "ISC",
   "devDependencies": {
-    "@devmoods/eslint-config": "^1.12.0",
+    "@devmoods/eslint-config": "^1.13.1",
     "@types/koa-compose": "^3.2.8",
-    "@types/node": "20.12.12",
+    "@types/node": "20.14.2",
     "@types/supertest": "^6.0.2",
-    "@typescript-eslint/eslint-plugin": "^7.1.0",
-    "@typescript-eslint/parser": "^7.1.0",
-    "@vitest/coverage-v8": "^1.3.1",
+    "@typescript-eslint/eslint-plugin": "^7.12.0",
+    "@typescript-eslint/parser": "^7.12.0",
+    "@vitest/coverage-v8": "^1.6.0",
     "chalk": "^5.3.0",
     "eslint": "^8.57.0",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-jsx-a11y": "^6.8.0",
     "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-react": "^7.33.2",
-    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-react": "^7.34.2",
+    "eslint-plugin-react-hooks": "^4.6.2",
     "faktory-worker": "^4.5.1",
-    "prettier": "3.2.5",
+    "prettier": "3.3.1",
     "supertest": "7.0.0",
     "ts-node": "10.9.2",
     "typescript": "5.4.5",
-    "vitest": "^1.3.1"
+    "vitest": "^1.6.0"
   },
   "dependencies": {
     "@devmoods/fetch": "^4.0.1",
-    "@sentry/node": "^7.116.0",
+    "@sentry/node": "^8.8.0",
+    "@sentry/profiling-node": "^8.8.0",
     "@types/bcrypt": "^5.0.2",
     "@types/body-parser": "^1.19.5",
     "@types/cookie-parser": "^1.4.7",
     "@types/express": "^4.17.21",
     "@types/jsonwebtoken": "^9.0.6",
-    "@types/nodemailer": "^6.4.14",
-    "@types/pg": "^8.11.2",
-    "@types/superagent": "^8.1.4",
+    "@types/nodemailer": "^6.4.15",
+    "@types/pg": "^8.11.6",
+    "@types/superagent": "^8.1.7",
     "@types/uuid": "^9.0.8",
-    "ajv": "^8.12.0",
+    "ajv": "^8.16.0",
     "bcrypt": "^5.1.1",
     "body-parser": "^1.20.2",
-    "commander": "^12.0.0",
+    "commander": "^12.1.0",
     "compose-middleware": "^5.0.1",
     "cookie-parser": "^1.4.6",
     "dotenv": "^16.4.5",
-    "express": "^4.18.3",
+    "express": "^4.19.2",
     "express-route-parser": "^1.0.5",
     "helmet": "^7.1.0",
     "jsonwebtoken": "^9.0.2",
     "meow": "^13.2.0",
-    "nodemailer": "^6.9.11",
-    "pg": "^8.11.3",
-    "redis": "^4.6.13",
+    "nodemailer": "^6.9.13",
+    "pg": "^8.12.0",
+    "redis": "^4.6.14",
     "sql-template-strings": "^2.2.2",
     "uuid": "^9.0.1",
     "vitest-fail-on-console": "^0.7.0"
@@ -79,27 +80,19 @@
     "singleQuote": true
   },
   "eslintConfig": {
-    "extends": "@devmoods/eslint-config",
-    "parserOptions": {
-      "project": "./tsconfig.json"
-    },
-    "rules": {
-      "@typescript-eslint/consistent-type-imports": "warn",
-      "@typescript-eslint/no-shadow": "off",
-      "react-hooks/rules-of-hooks": "off"
-    }
+    "extends": "@devmoods/eslint-config"
   },
   "peerDependencies": {
     "faktory-worker": "^4.5.1"
   },
   "engines": {
-    "node": ">=20.3.0 <22"
+    "node": ">=20.3.0 <23"
   },
   "scripts": {
-    "start": "ts-node --esm example/index.ts",
-    "start:worker": "ts-node --esm example/worker.ts",
+    "start": "node --no-warnings --enable-source-maps --loader ts-node/esm example/index.ts",
+    "start:worker": "node --no-warnings --enable-source-maps --loader ts-node/esm example/worker.ts",
     "clean": "rm -rf dist",
-    "lint": "eslint src",
+    "lint": "eslint src example",
     "test": "./test.sh src",
     "build": "pnpm run clean && tsc --project tsconfig.build.json",
     "format": "prettier --write '**/*.{js,css,md,ts,tsx}'"