@devmoods/express-extras 0.18.1 → 0.20.0

package/README.md

@@ -77,7 +77,7 @@ app.get(
   route(async () => {
     const posts = await postgres.query('SELECT * FROM posts LIMIT 10');
     return posts;
-  })
+  }),
 );
 
 app.post(
@@ -100,13 +100,13 @@ app.post(
     const post = { title, content };
 
     await postgres.insert(
-      sql`INSERT INTO posts (title, content) VALUES (${title}, ${content})`
+      sql`INSERT INTO posts (title, content) VALUES (${title}, ${content})`,
     );
 
     slack.postMessage(`New post created with title ${title}`);
 
     return [201, post];
-  })
+  }),
 );
 
 app.use((req, res, next) => {
@@ -118,7 +118,7 @@ app.use(
     shouldHandleError(error) {
       return true;
     },
-  })
+  }),
 );
 
 app.use(
@@ -130,7 +130,7 @@ app.use(
         logger.error(error);
       }
     },
-  })
+  }),
 );
 
 listen(server, {

package/dist/auth.js

@@ -118,6 +118,7 @@ export function createAuth({ getUserByToken, methods: { emailAndPassword }, filt
         }));
         router.get('/token/refresh', middleware(false), route(async (req, res) => {
             const user = useCurrentUser();
+            logger.info('refreshed token', { user });
             if (!user) {
                 throw Unauthorized();
             }

package/dist/context.d.ts

@@ -10,16 +10,8 @@ export declare function withRequestContext({ getRequestId, }?: RequestContextOpt
  * Return a value from the request context
  */
 export declare function useContext<T>(key: string): T | undefined;
-/**
- * @deprecated
- */
-export declare const getContext: typeof useContext;
 /**
  * Set a value on the request context
  */
-export declare function setContext<T>(key: string, value: T): any;
+export declare function setContext<T>(key: string, value: T): Map<string, any> | undefined;
 export declare function useRequestId(): string | undefined;
-/**
- * @deprecated
- */
-export declare const getRequestId: typeof useRequestId;

package/dist/context.js

@@ -1,14 +1,18 @@
-import { createNamespace } from 'cls-hooked';
+import { AsyncLocalStorage } from 'node:async_hooks';
 import { v4 as uuid } from 'uuid';
-const requestContext = createNamespace('@requestContext');
+const requestContext = new AsyncLocalStorage();
+const REQUEST_ID = 'requestId';
 /**
  * Middleware for setting a `requestId` on the request context.
  */
 export function withRequestContext({ getRequestId = (req) => req.headers['X-Request-ID'], } = {}) {
     return (req, res, next) => {
         const requestId = getRequestId(req) || uuid();
-        requestContext.run(() => {
-            requestContext.set('requestId', requestId);
+        requestContext.run(new Map(), () => {
+            const store = requestContext.getStore();
+            if (store) {
+                store.set(REQUEST_ID, requestId);
+            }
             next();
         });
     };
@@ -17,26 +21,20 @@ export function withRequestContext({ getRequestId = (req) => req.headers['X-Requ
  * Return a value from the request context
  */
 export function useContext(key) {
-    if (requestContext && requestContext.active) {
-        return requestContext.get(key);
+    const store = requestContext.getStore();
+    if (store) {
+        return store.get(key);
     }
 }
-/**
- * @deprecated
- */
-export const getContext = useContext;
 /**
  * Set a value on the request context
  */
 export function setContext(key, value) {
-    if (requestContext && requestContext.active) {
-        return requestContext.set(key, value);
+    const store = requestContext.getStore();
+    if (store) {
+        return store.set(key, value);
     }
 }
 export function useRequestId() {
-    return useContext('requestId');
+    return useContext(REQUEST_ID);
 }
-/**
- * @deprecated
- */
-export const getRequestId = useRequestId;

package/dist/errors.js

@@ -44,8 +44,7 @@ function convertToAPIError(error) {
     return error;
 }
 function _errorHandler({ onError }) {
-    return (err, req, res, next // eslint-disable-line
-    ) => {
+    return (err, req, res, next) => {
         if (!err) {
             err = makeError(500);
         }

package/dist/listen.js

@@ -1,6 +1,6 @@
 import { createTerminus } from '@godaddy/terminus';
 import { getLogger } from './logger.js';
-const logger = getLogger();
+const logger = getLogger('core');
 const READINESS_PERIOD_MS = parseInt(process.env.DM_READINESS_PERIOD_MS || '', 10) || 0;
 const FORCE_EXIT_TIMEOUT = parseInt(process.env.DM_FORCE_EXIT_TIMEOUT || '', 10) || 1000;
 /**

package/dist/logger.js

@@ -27,41 +27,40 @@ export function createLogger({ name, getContext, silent = () => process.env.NODE
     if (silent()) {
         logger.level(bunyan.FATAL + 1);
     }
-    function getFinalContext() {
+    function getFinalContext(context) {
         return {
             ...defaultGetContext(),
             ...getContext?.(),
+            ...context,
         };
     }
     return {
         debug(message, context = {}) {
-            return logger.child(getFinalContext(), true).debug(context, message);
+            return logger.debug(getFinalContext(context), message);
         },
         info(message, context = {}) {
-            return logger.child(getFinalContext(), true).info(context, message);
+            return logger.info(getFinalContext(context), message);
         },
         warn(message, context = {}) {
-            return logger.child(getFinalContext(), true).warn(context, message);
+            return logger.warn(getFinalContext(context), message);
         },
         error(error, message) {
-            const context = getFinalContext();
+            const context = getFinalContext({ err: error });
             if (_sentryClient != null) {
                 _sentryClient.captureException(error, {
                     tags: context,
                 });
             }
-            return logger
-                .child(context, true)
-                .error(error, message || error?.message);
+            return logger.error(context, message || error?.message);
         },
         fatal(error, message) {
-            const context = getFinalContext();
+            const context = getFinalContext({ err: error });
             if (_sentryClient != null) {
                 _sentryClient.captureException(error, {
                     tags: context,
                 });
             }
-            return logger.child(context, true).fatal(error, message);
+            return logger.fatal(context, message);
         },
     };
 }

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,36 @@ 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_S = 1e9;
+        const diff = process.hrtime(start);
+        return (diff[0] * NS_PER_SEC + diff[1]) / NS_TO_S;
+    };
+    return (req, res, next) => {
+        const start = process.hrtime();
+        logger.info('http request', {
+            method: req.method,
+            url: req.originalUrl,
+            path: req.path,
+            ip: req.ip,
+        });
+        res.on('finish', () => {
+            const duration = getDurationInMilliseconds(start);
+            logger.info('http response', {
+                method: req.method,
+                url: req.originalUrl,
+                path: req.path,
+                duration,
+                status: res.statusCode,
+            });
+        });
+        next();
+    };
+}
 /**
  * Middleware that sends a 404
  *

package/dist/slack.js

@@ -1,6 +1,6 @@
 import { createFetch } from '@devmoods/fetch';
 import { getLogger } from './logger.js';
-const logger = getLogger();
+const logger = getLogger('slack');
 /**
  * Send messages to Slack using Incoming Webhooks
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devmoods/express-extras",
-  "version": "0.18.1",
+  "version": "0.20.0",
   "description": "Kubernetes-ready utilities for rapid Node.js application development",
   "type": "module",
   "main": "./dist/index.js",
@@ -23,55 +23,53 @@
   ],
   "license": "ISC",
   "devDependencies": {
-    "@devmoods/eslint-config": "^1.1.0",
-    "@sentry/types": "^7.57.0",
+    "@devmoods/eslint-config": "^1.2.0",
+    "@sentry/types": "^7.60.1",
     "@types/express-serve-static-core": "^4.17.35",
-    "@types/node": "20.3.2",
+    "@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/node": "^7.60.1",
     "@types/bcrypt": "^5.0.0",
     "@types/body-parser": "^1.19.2",
     "@types/bunyan": "^1.8.8",
-    "@types/cls-hooked": "^4.3.4",
     "@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",
     "bcrypt": "^5.1.0",
     "body-parser": "^1.20.2",
     "bunyan": "^1.8.15",
-    "cls-hooked": "^4.2.2",
     "compose-middleware": "^5.0.1",
     "cookie-parser": "^1.4.6",
     "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",