@devmoods/express-extras 0.18.0 → 0.19.0

package/dist/auth.d.ts

@@ -13,7 +13,7 @@ export interface AuthOptions<UserModel extends Record<string, any>> {
     onResetRequested?(user: UserModel, temporaryToken: string): void | Promise<void>;
     onPasswordChanged?(user: UserModel, newPassword: string): Promise<void>;
 }
-interface CreateAuth<UserModel extends Record<string, any>> {
+export interface CreateAuth<UserModel extends Record<string, any>> {
     createRouter: () => Router;
     useCurrentUser: () => UserModel | undefined;
     middleware: (authorize?: boolean) => RequestHandler;
@@ -27,4 +27,3 @@ export declare function parseAuthorizationHeader(req: Request): string | null;
 export declare function setAccessTokenCookie(res: Response, token: string | null): void;
 export declare function checkIfPasswordsMatch(realPassword: string, attemptedPassword: string): Promise<boolean>;
 export declare function hashPassword(password: string): Promise<string>;
-export {};

package/dist/middleware.js

@@ -5,14 +5,18 @@ import cookieParser from 'cookie-parser';
 import helmet from 'helmet';
 import { withRequestContext } from './context.js';
 import { NotFound } from './errors.js';
+import { getLogger } from './logger.js';
 export const urlencodedParser = bodyParser.urlencoded;
 export const jsonParser = bodyParser.json;
+const logger = getLogger('core');
 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, } = {}) {
     return compose([
+        withRequestContext(),
+        logRequestDuration(),
         Sentry.Handlers.requestHandler(),
         Sentry.Handlers.tracingHandler(),
         useHelmet &&
@@ -39,9 +43,34 @@ export function before({ cookies = false, helmet: useHelmet = true, json: useJso
             }),
         useJson && jsonParser(),
         cookies && cookieParser(),
-        withRequestContext(),
     ].filter(Boolean));
 }
+function logRequestDuration() {
+    const getDurationInMilliseconds = (start) => {
+        const NS_PER_SEC = 1e9;
+        const NS_TO_MS = 1e6;
+        const diff = process.hrtime(start);
+        return (diff[0] * NS_PER_SEC + diff[1]) / NS_TO_MS;
+    };
+    return (req, res, next) => {
+        const start = process.hrtime();
+        logger.info('http request', {
+            method: req.method,
+            url: req.originalUrl,
+            path: req.path,
+        });
+        res.on('finish', () => {
+            const duration = getDurationInMilliseconds(start);
+            logger.info('http response', {
+                method: req.method,
+                url: req.originalUrl,
+                path: req.path,
+                duration,
+            });
+        });
+        next();
+    };
+}
 /**
  * Middleware that sends a 404
  *

package/dist/redis.d.ts

@@ -1,7 +1,7 @@
 import { createClient } from 'redis';
-export type RedisClient = ReturnType<typeof createClient>;
 export interface RedisOptions {
     url?: string;
     onError: (error: Error) => void;
 }
+export type RedisClient = ReturnType<typeof createClient>;
 export declare function createRedis({ url, onError, }: RedisOptions): RedisClient;

package/dist/sentry.d.ts

@@ -20,21 +20,21 @@ export declare function createSentryOptions(app: Application | null, options?: S
     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;
-    environment?: string | undefined;
     debug?: boolean | undefined;
-    instrumenter?: import("@sentry/types").Instrumenter | undefined;
-    sampleRate?: number | undefined;
-    dsn: string | 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;

package/dist/sentry.js

@@ -1,5 +1,4 @@
 import * as Sentry from '@sentry/node';
-import * as Tracing from '@sentry/tracing';
 /**
  * Create a pre-configured Sentry client
  */
@@ -19,7 +18,7 @@ export function createSentryOptions(app, options = {}) {
         dsn: process.env.SENTRY_DSN,
         integrations: [
             new Sentry.Integrations.Http({ tracing: true }),
-            app && new Tracing.Integrations.Express({ app }),
+            app && new Sentry.Integrations.Express({ app }),
         ].filter(Boolean),
         tracesSampleRate: 1.0,
         ...options,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devmoods/express-extras",
-  "version": "0.18.0",
+  "version": "0.19.0",
   "description": "Kubernetes-ready utilities for rapid Node.js application development",
   "type": "module",
   "main": "./dist/index.js",
@@ -23,31 +23,32 @@
   ],
   "license": "ISC",
   "devDependencies": {
-    "@devmoods/eslint-config": "^1.1.0",
-    "@types/node": "20.3.2",
+    "@devmoods/eslint-config": "^1.2.0",
+    "@sentry/types": "^7.60.1",
+    "@types/express-serve-static-core": "^4.17.35",
+    "@types/node": "20.4.5",
     "@types/supertest": "2.0.12",
-    "@typescript-eslint/eslint-plugin": "^5.60.1",
-    "@typescript-eslint/parser": "^5.60.1",
+    "@typescript-eslint/eslint-plugin": "^6.2.0",
+    "@typescript-eslint/parser": "^6.2.0",
     "chalk": "^5.3.0",
-    "eslint": "^8.43.0",
+    "eslint": "^8.46.0",
     "eslint-plugin-jsx-a11y": "^6.7.1",
-    "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-react": "^7.32.2",
+    "eslint-plugin-prettier": "^5.0.0",
+    "eslint-plugin-react": "^7.33.1",
     "eslint-plugin-react-hooks": "^4.6.0",
     "import-sort-cli": "6.0.0",
     "import-sort-style-module": "6.0.0",
     "isomorphic-fetch": "3.0.0",
-    "prettier": "2.8.8",
+    "prettier": "3.0.0",
     "supertest": "6.3.3",
     "ts-node": "10.9.1",
     "typescript": "5.1.6",
-    "vitest": "^0.32.2"
+    "vitest": "^0.33.0"
   },
   "dependencies": {
     "@devmoods/fetch": "^3.3.0",
     "@godaddy/terminus": "^4.12.1",
-    "@sentry/node": "^7.57.0",
-    "@sentry/tracing": "^7.57.0",
+    "@sentry/node": "^7.60.1",
     "@types/bcrypt": "^5.0.0",
     "@types/body-parser": "^1.19.2",
     "@types/bunyan": "^1.8.8",
@@ -55,7 +56,7 @@
     "@types/cookie-parser": "^1.4.3",
     "@types/express": "^4.17.17",
     "@types/jsonwebtoken": "^9.0.2",
-    "@types/nodemailer": "^6.4.8",
+    "@types/nodemailer": "^6.4.9",
     "@types/pg": "^8.10.2",
     "@types/uuid": "^9.0.2",
     "ajv": "^8.12.0",
@@ -68,9 +69,9 @@
     "dotenv": "^16.3.1",
     "express": "^4.18.2",
     "helmet": "^7.0.0",
-    "jsonwebtoken": "^9.0.0",
+    "jsonwebtoken": "^9.0.1",
     "meow": "^12.0.1",
-    "nodemailer": "^6.9.3",
+    "nodemailer": "^6.9.4",
     "pg": "^8.11.1",
     "redis": "^4.6.7",
     "sql-template-strings": "^2.2.2",