@alanszp/express 5.0.0 → 6.0.4

package/dist/index.d.ts

@@ -3,7 +3,7 @@ export * from "./types/AuthMethod";
 export * from "./middlewares/auditLog";
 export * from "./middlewares/accessLogger";
 export * from "./middlewares/authedForOrg";
-export * from "./middlewares/extraContext";
+export * from "./middlewares/createContext";
 export * from "./middlewares/authWithJWT";
 export * from "./middlewares/returnInternalServerError";
 export * from "./middlewares/returnNotFound";

package/dist/index.js

@@ -15,7 +15,7 @@ __exportStar(require("./types/AuthMethod"), exports);
 __exportStar(require("./middlewares/auditLog"), exports);
 __exportStar(require("./middlewares/accessLogger"), exports);
 __exportStar(require("./middlewares/authedForOrg"), exports);
-__exportStar(require("./middlewares/extraContext"), exports);
+__exportStar(require("./middlewares/createContext"), exports);
 __exportStar(require("./middlewares/authWithJWT"), exports);
 __exportStar(require("./middlewares/returnInternalServerError"), exports);
 __exportStar(require("./middlewares/returnNotFound"), exports);

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oDAAkC;AAClC,qDAAmC;AACnC,yDAAuC;AACvC,6DAA2C;AAC3C,6DAA2C;AAC3C,6DAA2C;AAC3C,4DAA0C;AAC1C,0EAAwD;AACxD,+DAA6C;AAC7C,+DAA6C;AAC7C,yDAAuC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oDAAkC;AAClC,qDAAmC;AACnC,yDAAuC;AACvC,6DAA2C;AAC3C,6DAA2C;AAC3C,8DAA4C;AAC5C,4DAA0C;AAC1C,0EAAwD;AACxD,+DAA6C;AAC7C,+DAA6C;AAC7C,yDAAuC"}

package/dist/middlewares/createContext.d.ts

@@ -0,0 +1,6 @@
+import { NextFunction, Response } from "express";
+import { ILogger } from "@alanszp/logger";
+import { Audit } from "@alanszp/audit";
+import { GenericRequest } from "../types/GenericRequest";
+import { SharedContext } from "@alanszp/shared-context";
+export declare function createContext(sharedContext: SharedContext, baseLogger: ILogger, audit: Audit): (req: GenericRequest, _res: Response, next: NextFunction) => void;

package/dist/middlewares/createContext.js

@@ -0,0 +1,36 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createContext = void 0;
+const cuid_1 = __importDefault(require("cuid"));
+const appIdentifier_1 = require("../helpers/appIdentifier");
+const lodash_1 = require("lodash");
+function createContext(sharedContext, baseLogger, audit) {
+    return (req, _res, next) => {
+        var _a;
+        req.context = req.context || {};
+        const receivedChain = req.header("x-lifecycle-chain");
+        const lifecycleChain = (0, lodash_1.compact)([receivedChain, (0, appIdentifier_1.appIdentifier)()]).join(",");
+        const lifecycleId = ((_a = req.headers["x-lifecycle-id"]) === null || _a === void 0 ? void 0 : _a.toString()) || (0, cuid_1.default)();
+        const contextId = (0, cuid_1.default)();
+        sharedContext.run((context) => {
+            req.context.authenticated = [];
+            req.context.lifecycleId = context.lifecycleId;
+            req.context.lifecycleChain = context.lifecycleChain;
+            req.context.contextId = context.contextId;
+            req.context.log = context.logger;
+            req.context.audit = context.audit;
+            next();
+        }, {
+            logger: baseLogger,
+            audit: audit.withState(),
+            lifecycleId,
+            lifecycleChain,
+            contextId,
+        });
+    };
+}
+exports.createContext = createContext;
+//# sourceMappingURL=createContext.js.map

package/dist/middlewares/createContext.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createContext.js","sourceRoot":"","sources":["../../src/middlewares/createContext.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAIxB,4DAAyD;AAGzD,mCAAiC;AAEjC,SAAgB,aAAa,CAC3B,aAA4B,EAC5B,UAAmB,EACnB,KAAY;IAEZ,OAAO,CAAC,GAAmB,EAAE,IAAc,EAAE,IAAkB,EAAQ,EAAE;;QACvE,GAAG,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;QAEhC,MAAM,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;QACtD,MAAM,cAAc,GAAG,IAAA,gBAAO,EAAC,CAAC,aAAa,EAAE,IAAA,6BAAa,GAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE3E,MAAM,WAAW,GAAG,CAAA,MAAA,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,0CAAE,QAAQ,EAAE,KAAI,IAAA,cAAI,GAAE,CAAC;QAExE,MAAM,SAAS,GAAG,IAAA,cAAI,GAAE,CAAC;QAEzB,aAAa,CAAC,GAAG,CACf,CAAC,OAAO,EAAE,EAAE;YACV,GAAG,CAAC,OAAO,CAAC,aAAa,GAAG,EAAE,CAAC;YAC/B,GAAG,CAAC,OAAO,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;YAC9C,GAAG,CAAC,OAAO,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;YACpD,GAAG,CAAC,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;YAC1C,GAAG,CAAC,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;YACjC,GAAG,CAAC,OAAO,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;YAClC,IAAI,EAAE,CAAC;QACT,CAAC,EACD;YACE,MAAM,EAAE,UAAU;YAClB,KAAK,EAAE,KAAK,CAAC,SAAS,EAAE;YACxB,WAAW;YACX,cAAc;YACd,SAAS;SACV,CACF,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAlCD,sCAkCC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alanszp/express",
-  "version": "5.0.0",
+  "version": "6.0.4",
   "description": "Alan's express utils and middlewares.",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -31,13 +31,14 @@
     "typescript": "^4.3.4"
   },
   "dependencies": {
-    "@alanszp/audit": "^5.0.0",
-    "@alanszp/errors": "^5.0.0",
-    "@alanszp/jwt": "^5.0.0",
-    "@alanszp/logger": "^5.0.0",
+    "@alanszp/audit": "^6.0.0",
+    "@alanszp/errors": "^6.0.0",
+    "@alanszp/jwt": "^6.0.0",
+    "@alanszp/logger": "^6.0.0",
+    "@alanszp/shared-context": "^6.0.4",
     "body-parser": "^1.19.0",
     "cuid": "^2.1.8",
     "lodash": "^4.17.21"
   },
-  "gitHead": "c5afc8bd74e5dcf26c9260ec2a8da8ab3a3570a9"
+  "gitHead": "f11faa4b3583d683efc45e30d0817e4d3a9786a2"
 }

package/src/index.ts

@@ -3,7 +3,7 @@ export * from "./types/AuthMethod";
 export * from "./middlewares/auditLog";
 export * from "./middlewares/accessLogger";
 export * from "./middlewares/authedForOrg";
-export * from "./middlewares/extraContext";
+export * from "./middlewares/createContext";
 export * from "./middlewares/authWithJWT";
 export * from "./middlewares/returnInternalServerError";
 export * from "./middlewares/returnNotFound";

package/src/middlewares/createContext.ts

@@ -0,0 +1,44 @@
+import cuid from "cuid";
+import { NextFunction, Response } from "express";
+import { ILogger } from "@alanszp/logger";
+import { Audit } from "@alanszp/audit";
+import { appIdentifier } from "../helpers/appIdentifier";
+import { GenericRequest } from "../types/GenericRequest";
+import { SharedContext } from "@alanszp/shared-context";
+import { compact } from "lodash";
+
+export function createContext(
+  sharedContext: SharedContext,
+  baseLogger: ILogger,
+  audit: Audit
+) {
+  return (req: GenericRequest, _res: Response, next: NextFunction): void => {
+    req.context = req.context || {};
+
+    const receivedChain = req.header("x-lifecycle-chain");
+    const lifecycleChain = compact([receivedChain, appIdentifier()]).join(",");
+
+    const lifecycleId = req.headers["x-lifecycle-id"]?.toString() || cuid();
+
+    const contextId = cuid();
+
+    sharedContext.run(
+      (context) => {
+        req.context.authenticated = [];
+        req.context.lifecycleId = context.lifecycleId;
+        req.context.lifecycleChain = context.lifecycleChain;
+        req.context.contextId = context.contextId;
+        req.context.log = context.logger;
+        req.context.audit = context.audit;
+        next();
+      },
+      {
+        logger: baseLogger,
+        audit: audit.withState(),
+        lifecycleId,
+        lifecycleChain,
+        contextId,
+      }
+    );
+  };
+}

package/src/types/custom.d.ts

@@ -9,6 +9,7 @@ declare global {
       context: {
         lifecycleId: string;
         lifecycleChain: string;
+        contextId: string;
         authenticated: AuthMethod[];
         log: ILogger;
         audit: AuditWithState;

package/dist/middlewares/extraContext.d.ts

@@ -1,17 +0,0 @@
-/// <reference types="node" />
-import { NextFunction, Response } from "express";
-import { ILogger } from "@alanszp/logger";
-import { Audit } from "@alanszp/audit";
-import { AsyncLocalStorage } from "async_hooks";
-import { AuditWithState } from "@alanszp/audit/dist/auditWithState";
-import { GenericRequest } from "../types/GenericRequest";
-export interface RequestSharedContext {
-    audit: AuditWithState;
-    logger: ILogger;
-    lifecycleId: string;
-    lifecycleChain: string;
-}
-export declare function createExtraContext(baseLogger: ILogger, audit: Audit): {
-    requestSharedContext: AsyncLocalStorage<RequestSharedContext>;
-    extraContext: (req: GenericRequest, _res: Response, next: NextFunction) => void;
-};

package/dist/middlewares/extraContext.js

@@ -1,41 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createExtraContext = void 0;
-const cuid_1 = __importDefault(require("cuid"));
-const async_hooks_1 = require("async_hooks");
-const appIdentifier_1 = require("../helpers/appIdentifier");
-function createExtraContext(baseLogger, audit) {
-    const requestSharedContext = new async_hooks_1.AsyncLocalStorage();
-    return {
-        requestSharedContext,
-        extraContext: function extraContext(req, _res, next) {
-            var _a;
-            req.context = req.context || {};
-            const receivedChain = req.header("x-lifecycle-chain");
-            const separator = receivedChain ? "," : "";
-            const lifecycleChain = `${receivedChain || ""}${separator}${(0, appIdentifier_1.appIdentifier)()}`;
-            const lifecycleId = ((_a = req.headers["x-lifecycle-id"]) === null || _a === void 0 ? void 0 : _a.toString()) || (0, cuid_1.default)();
-            const logger = baseLogger.child({
-                lid: lifecycleId,
-                lch: lifecycleChain,
-            });
-            const auditWithState = audit.withState();
-            req.context.authenticated = [];
-            req.context.lifecycleId = lifecycleId;
-            req.context.lifecycleChain = lifecycleChain;
-            req.context.log = logger;
-            req.context.audit = auditWithState;
-            requestSharedContext.run({
-                audit: auditWithState,
-                logger,
-                lifecycleId,
-                lifecycleChain,
-            }, () => next());
-        },
-    };
-}
-exports.createExtraContext = createExtraContext;
-//# sourceMappingURL=extraContext.js.map

package/dist/middlewares/extraContext.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"extraContext.js","sourceRoot":"","sources":["../../src/middlewares/extraContext.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAIxB,6CAAgD;AAChD,4DAAyD;AAWzD,SAAgB,kBAAkB,CAAC,UAAmB,EAAE,KAAY;IAClE,MAAM,oBAAoB,GAAG,IAAI,+BAAiB,EAAwB,CAAC;IAC3E,OAAO;QACL,oBAAoB;QACpB,YAAY,EAAE,SAAS,YAAY,CACjC,GAAmB,EACnB,IAAc,EACd,IAAkB;;YAElB,GAAG,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;YAEhC,MAAM,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;YACtD,MAAM,SAAS,GAAG,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3C,MAAM,cAAc,GAAG,GACrB,aAAa,IAAI,EACnB,GAAG,SAAS,GAAG,IAAA,6BAAa,GAAE,EAAE,CAAC;YACjC,MAAM,WAAW,GAAG,CAAA,MAAA,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,0CAAE,QAAQ,EAAE,KAAI,IAAA,cAAI,GAAE,CAAC;YAExE,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC;gBAC9B,GAAG,EAAE,WAAW;gBAChB,GAAG,EAAE,cAAc;aACpB,CAAC,CAAC;YAEH,MAAM,cAAc,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;YAEzC,GAAG,CAAC,OAAO,CAAC,aAAa,GAAG,EAAE,CAAC;YAC/B,GAAG,CAAC,OAAO,CAAC,WAAW,GAAG,WAAW,CAAC;YACtC,GAAG,CAAC,OAAO,CAAC,cAAc,GAAG,cAAc,CAAC;YAC5C,GAAG,CAAC,OAAO,CAAC,GAAG,GAAG,MAAM,CAAC;YACzB,GAAG,CAAC,OAAO,CAAC,KAAK,GAAG,cAAc,CAAC;YAEnC,oBAAoB,CAAC,GAAG,CACtB;gBACE,KAAK,EAAE,cAAc;gBACrB,MAAM;gBACN,WAAW;gBACX,cAAc;aACf,EACD,GAAG,EAAE,CAAC,IAAI,EAAE,CACb,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC;AA1CD,gDA0CC"}

package/src/middlewares/extraContext.ts

@@ -1,59 +0,0 @@
-import cuid from "cuid";
-import { NextFunction, Response } from "express";
-import { ILogger } from "@alanszp/logger";
-import { Audit } from "@alanszp/audit";
-import { AsyncLocalStorage } from "async_hooks";
-import { appIdentifier } from "../helpers/appIdentifier";
-import { AuditWithState } from "@alanszp/audit/dist/auditWithState";
-import { GenericRequest } from "../types/GenericRequest";
-
-export interface RequestSharedContext {
-  audit: AuditWithState;
-  logger: ILogger;
-  lifecycleId: string;
-  lifecycleChain: string;
-}
-
-export function createExtraContext(baseLogger: ILogger, audit: Audit) {
-  const requestSharedContext = new AsyncLocalStorage<RequestSharedContext>();
-  return {
-    requestSharedContext,
-    extraContext: function extraContext(
-      req: GenericRequest,
-      _res: Response,
-      next: NextFunction
-    ): void {
-      req.context = req.context || {};
-
-      const receivedChain = req.header("x-lifecycle-chain");
-      const separator = receivedChain ? "," : "";
-      const lifecycleChain = `${
-        receivedChain || ""
-      }${separator}${appIdentifier()}`;
-      const lifecycleId = req.headers["x-lifecycle-id"]?.toString() || cuid();
-
-      const logger = baseLogger.child({
-        lid: lifecycleId,
-        lch: lifecycleChain,
-      });
-
-      const auditWithState = audit.withState();
-
-      req.context.authenticated = [];
-      req.context.lifecycleId = lifecycleId;
-      req.context.lifecycleChain = lifecycleChain;
-      req.context.log = logger;
-      req.context.audit = auditWithState;
-
-      requestSharedContext.run(
-        {
-          audit: auditWithState,
-          logger,
-          lifecycleId,
-          lifecycleChain,
-        },
-        () => next()
-      );
-    },
-  };
-}