@axinom/mosaic-service-common 0.69.0 → 0.70.0-rc.4

package/dist/common/index.d.ts

@@ -2,6 +2,7 @@ export * from './config';
 export * from './errors';
 export * from './helpers';
 export * from './logging';
+export * from './request-context';
 export * from './signing';
 export * from './types';
 //# sourceMappingURL=index.d.ts.map

package/dist/common/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,mBAAmB,CAAC;AAClC,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC"}

package/dist/common/index.js

@@ -18,6 +18,7 @@ __exportStar(require("./config"), exports);
 __exportStar(require("./errors"), exports);
 __exportStar(require("./helpers"), exports);
 __exportStar(require("./logging"), exports);
+__exportStar(require("./request-context"), exports);
 __exportStar(require("./signing"), exports);
 __exportStar(require("./types"), exports);
 //# sourceMappingURL=index.js.map

package/dist/common/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,2CAAyB;AACzB,4CAA0B;AAC1B,4CAA0B;AAC1B,4CAA0B;AAC1B,0CAAwB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,2CAAyB;AACzB,4CAA0B;AAC1B,4CAA0B;AAC1B,oDAAkC;AAClC,4CAA0B;AAC1B,0CAAwB"}

package/dist/common/logging/index.d.ts

@@ -6,6 +6,7 @@ export * from './log-message';
 export * from './log-retention';
 export * from './logger';
 export * from './mask-middleware';
+export * from './request-id-log-middleware';
 export * from './setup-global-console-override';
 export * from './skip-mask-middleware';
 export * from './tenant-environment-ids-log-middleware';

package/dist/common/logging/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/common/logging/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,OAAO,CAAC;AACtB,cAAc,iBAAiB,CAAC;AAChC,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,UAAU,CAAC;AACzB,cAAc,mBAAmB,CAAC;AAClC,cAAc,iCAAiC,CAAC;AAChD,cAAc,wBAAwB,CAAC;AACvC,cAAc,yCAAyC,CAAC;AACxD,cAAc,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/common/logging/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,OAAO,CAAC;AACtB,cAAc,iBAAiB,CAAC;AAChC,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,UAAU,CAAC;AACzB,cAAc,mBAAmB,CAAC;AAClC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,iCAAiC,CAAC;AAChD,cAAc,wBAAwB,CAAC;AACvC,cAAc,yCAAyC,CAAC;AACxD,cAAc,mBAAmB,CAAC"}

package/dist/common/logging/index.js

@@ -22,6 +22,7 @@ __exportStar(require("./log-message"), exports);
 __exportStar(require("./log-retention"), exports);
 __exportStar(require("./logger"), exports);
 __exportStar(require("./mask-middleware"), exports);
+__exportStar(require("./request-id-log-middleware"), exports);
 __exportStar(require("./setup-global-console-override"), exports);
 __exportStar(require("./skip-mask-middleware"), exports);
 __exportStar(require("./tenant-environment-ids-log-middleware"), exports);

package/dist/common/logging/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/logging/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iDAA+B;AAC/B,wCAAsB;AACtB,kDAAgC;AAChC,8CAA4B;AAC5B,gDAA8B;AAC9B,kDAAgC;AAChC,2CAAyB;AACzB,oDAAkC;AAClC,kEAAgD;AAChD,yDAAuC;AACvC,0EAAwD;AACxD,oDAAkC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/logging/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iDAA+B;AAC/B,wCAAsB;AACtB,kDAAgC;AAChC,8CAA4B;AAC5B,gDAA8B;AAC9B,kDAAgC;AAChC,2CAAyB;AACzB,oDAAkC;AAClC,8DAA4C;AAC5C,kEAAgD;AAChD,yDAAuC;AACvC,0EAAwD;AACxD,oDAAkC"}

package/dist/common/logging/request-id-log-middleware.d.ts

@@ -0,0 +1,3 @@
+import { LogMiddleware } from './generate-log';
+export declare const mosaicContextLogMiddleware: LogMiddleware;
+//# sourceMappingURL=request-id-log-middleware.d.ts.map

package/dist/common/logging/request-id-log-middleware.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"request-id-log-middleware.d.ts","sourceRoot":"","sources":["../../../src/common/logging/request-id-log-middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,eAAO,MAAM,0BAA0B,EAAE,aAMxC,CAAC"}

package/dist/common/logging/request-id-log-middleware.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mosaicContextLogMiddleware = void 0;
+const request_context_1 = require("../request-context");
+const mosaicContextLogMiddleware = (log) => {
+    var _a;
+    const mosaicRequestId = (_a = request_context_1.requestContext.getStore()) === null || _a === void 0 ? void 0 : _a.mosaicRequestId;
+    if (mosaicRequestId) {
+        log.details = Object.assign(Object.assign({}, log.details), { mosaicRequestId });
+    }
+    return log;
+};
+exports.mosaicContextLogMiddleware = mosaicContextLogMiddleware;
+//# sourceMappingURL=request-id-log-middleware.js.map

package/dist/common/logging/request-id-log-middleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"request-id-log-middleware.js","sourceRoot":"","sources":["../../../src/common/logging/request-id-log-middleware.ts"],"names":[],"mappings":";;;AAAA,wDAAoD;AAG7C,MAAM,0BAA0B,GAAkB,CAAC,GAAG,EAAE,EAAE;;IAC/D,MAAM,eAAe,GAAG,MAAA,gCAAc,CAAC,QAAQ,EAAE,0CAAE,eAAe,CAAC;IACnE,IAAI,eAAe,EAAE,CAAC;QACpB,GAAG,CAAC,OAAO,mCAAQ,GAAG,CAAC,OAAO,KAAE,eAAe,GAAE,CAAC;IACpD,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AANW,QAAA,0BAA0B,8BAMrC"}

package/dist/common/request-context/index.d.ts

@@ -0,0 +1,2 @@
+export * from './request-context';
+//# sourceMappingURL=index.d.ts.map

package/dist/common/request-context/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/common/request-context/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC"}

package/dist/common/request-context/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./request-context"), exports);
+//# sourceMappingURL=index.js.map

package/dist/common/request-context/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/request-context/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oDAAkC"}

package/dist/common/request-context/request-context.d.ts

@@ -0,0 +1,9 @@
+import { AsyncLocalStorage } from 'async_hooks';
+export declare const REQUEST_ID_HEADER = "x-mosaic-request-id";
+interface RequestContext {
+    mosaicRequestId: string;
+}
+export declare const requestContext: AsyncLocalStorage<RequestContext>;
+export declare const getRequestContextHeaders: () => Record<string, string>;
+export {};
+//# sourceMappingURL=request-context.d.ts.map

package/dist/common/request-context/request-context.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"request-context.d.ts","sourceRoot":"","sources":["../../../src/common/request-context/request-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEhD,eAAO,MAAM,iBAAiB,wBAAwB,CAAC;AAEvD,UAAU,cAAc;IACtB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,eAAO,MAAM,cAAc,mCAA0C,CAAC;AAEtE,eAAO,MAAM,wBAAwB,QAAO,MAAM,CAAC,MAAM,EAAE,MAAM,CAGhE,CAAC"}

package/dist/common/request-context/request-context.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRequestContextHeaders = exports.requestContext = exports.REQUEST_ID_HEADER = void 0;
+const async_hooks_1 = require("async_hooks");
+exports.REQUEST_ID_HEADER = 'x-mosaic-request-id';
+exports.requestContext = new async_hooks_1.AsyncLocalStorage();
+const getRequestContextHeaders = () => {
+    var _a;
+    const mosaicRequestId = (_a = exports.requestContext.getStore()) === null || _a === void 0 ? void 0 : _a.mosaicRequestId;
+    return mosaicRequestId ? { [exports.REQUEST_ID_HEADER]: mosaicRequestId } : {};
+};
+exports.getRequestContextHeaders = getRequestContextHeaders;
+//# sourceMappingURL=request-context.js.map

package/dist/common/request-context/request-context.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"request-context.js","sourceRoot":"","sources":["../../../src/common/request-context/request-context.ts"],"names":[],"mappings":";;;AAAA,6CAAgD;AAEnC,QAAA,iBAAiB,GAAG,qBAAqB,CAAC;AAM1C,QAAA,cAAc,GAAG,IAAI,+BAAiB,EAAkB,CAAC;AAE/D,MAAM,wBAAwB,GAAG,GAA2B,EAAE;;IACnE,MAAM,eAAe,GAAG,MAAA,sBAAc,CAAC,QAAQ,EAAE,0CAAE,eAAe,CAAC;IACnE,OAAO,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,yBAAiB,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;AACzE,CAAC,CAAC;AAHW,QAAA,wBAAwB,4BAGnC"}

package/dist/middleware/index.d.ts

@@ -4,6 +4,7 @@ export * from './liveness-readiness-middleware';
 export * from './maintenance-middleware';
 export * from './monitoring-middleware';
 export * from './mosaic-favicon';
+export * from './request-id-middleware';
 export * from './service-health-check-middleware';
 export * from './shutdown-actions-middleware';
 //# sourceMappingURL=index.d.ts.map

package/dist/middleware/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/middleware/index.ts"],"names":[],"mappings":"AAAA,cAAc,uCAAuC,CAAC;AACtD,cAAc,0CAA0C,CAAC;AACzD,cAAc,iCAAiC,CAAC;AAChD,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mCAAmC,CAAC;AAClD,cAAc,+BAA+B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/middleware/index.ts"],"names":[],"mappings":"AAAA,cAAc,uCAAuC,CAAC;AACtD,cAAc,0CAA0C,CAAC;AACzD,cAAc,iCAAiC,CAAC;AAChD,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,kBAAkB,CAAC;AACjC,cAAc,yBAAyB,CAAC;AACxC,cAAc,mCAAmC,CAAC;AAClD,cAAc,+BAA+B,CAAC"}

package/dist/middleware/index.js

@@ -20,6 +20,7 @@ __exportStar(require("./liveness-readiness-middleware"), exports);
 __exportStar(require("./maintenance-middleware"), exports);
 __exportStar(require("./monitoring-middleware"), exports);
 __exportStar(require("./mosaic-favicon"), exports);
+__exportStar(require("./request-id-middleware"), exports);
 __exportStar(require("./service-health-check-middleware"), exports);
 __exportStar(require("./shutdown-actions-middleware"), exports);
 //# sourceMappingURL=index.js.map

package/dist/middleware/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/middleware/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wEAAsD;AACtD,2EAAyD;AACzD,kEAAgD;AAChD,2DAAyC;AACzC,0DAAwC;AACxC,mDAAiC;AACjC,oEAAkD;AAClD,gEAA8C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/middleware/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wEAAsD;AACtD,2EAAyD;AACzD,kEAAgD;AAChD,2DAAyC;AACzC,0DAAwC;AACxC,mDAAiC;AACjC,0DAAwC;AACxC,oEAAkD;AAClD,gEAA8C"}

package/dist/middleware/request-id-middleware.d.ts

@@ -0,0 +1,3 @@
+import { RequestHandler } from 'express';
+export declare const mosaicContextMiddleware: () => RequestHandler;
+//# sourceMappingURL=request-id-middleware.d.ts.map

package/dist/middleware/request-id-middleware.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"request-id-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/request-id-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAIzC,eAAO,MAAM,uBAAuB,QAC9B,cAKH,CAAC"}

package/dist/middleware/request-id-middleware.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mosaicContextMiddleware = void 0;
+const uuid_1 = require("uuid");
+const request_context_1 = require("../common/request-context");
+const mosaicContextMiddleware = () => (req, res, next) => {
+    var _a;
+    const mosaicRequestId = (_a = req.headers[request_context_1.REQUEST_ID_HEADER]) !== null && _a !== void 0 ? _a : (0, uuid_1.v4)();
+    res.setHeader(request_context_1.REQUEST_ID_HEADER, mosaicRequestId);
+    request_context_1.requestContext.run({ mosaicRequestId }, next);
+};
+exports.mosaicContextMiddleware = mosaicContextMiddleware;
+//# sourceMappingURL=request-id-middleware.js.map

package/dist/middleware/request-id-middleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"request-id-middleware.js","sourceRoot":"","sources":["../../src/middleware/request-id-middleware.ts"],"names":[],"mappings":";;;AACA,+BAAkC;AAClC,+DAA8E;AAEvE,MAAM,uBAAuB,GAClC,GAAmB,EAAE,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;;IACvC,MAAM,eAAe,GACnB,MAAC,GAAG,CAAC,OAAO,CAAC,mCAAiB,CAAY,mCAAI,IAAA,SAAI,GAAE,CAAC;IACvD,GAAG,CAAC,SAAS,CAAC,mCAAiB,EAAE,eAAe,CAAC,CAAC;IAClD,gCAAc,CAAC,GAAG,CAAC,EAAE,eAAe,EAAE,EAAE,IAAI,CAAC,CAAC;AAChD,CAAC,CAAC;AANS,QAAA,uBAAuB,2BAMhC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@axinom/mosaic-service-common",
-  "version": "0.69.0",
+  "version": "0.70.0-rc.4",
   "description": "Common helpers and PostgreSQL-related functionality",
   "author": "Axinom",
   "license": "PROPRIETARY",
@@ -53,7 +53,7 @@
     "verror": "^1.10.1"
   },
   "devDependencies": {
-    "@axinom/mosaic-dev-be-common": "^0.18.0",
+    "@axinom/mosaic-dev-be-common": "^0.19.0-rc.4",
     "@types/express": "^4.17.17",
     "@types/inflection": "^1.5.28",
     "@types/node": "^22.0.0",
@@ -70,5 +70,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "75dcfd9bf92de1ef72a28f073e43a7dfaa7b430b"
+  "gitHead": "1286a116f2e06be15726a9094b19987c56d3bc49"
 }

package/src/common/index.ts

@@ -2,5 +2,6 @@ export * from './config';
 export * from './errors';
 export * from './helpers';
 export * from './logging';
+export * from './request-context';
 export * from './signing';
 export * from './types';

package/src/common/logging/index.ts

@@ -6,6 +6,7 @@ export * from './log-message';
 export * from './log-retention';
 export * from './logger';
 export * from './mask-middleware';
+export * from './request-id-log-middleware';
 export * from './setup-global-console-override';
 export * from './skip-mask-middleware';
 export * from './tenant-environment-ids-log-middleware';

package/src/common/logging/request-id-log-middleware.ts

@@ -0,0 +1,10 @@
+import { requestContext } from '../request-context';
+import { LogMiddleware } from './generate-log';
+
+export const mosaicContextLogMiddleware: LogMiddleware = (log) => {
+  const mosaicRequestId = requestContext.getStore()?.mosaicRequestId;
+  if (mosaicRequestId) {
+    log.details = { ...log.details, mosaicRequestId };
+  }
+  return log;
+};

package/src/common/request-context/index.ts

@@ -0,0 +1 @@
+export * from './request-context';

package/src/common/request-context/request-context.ts

@@ -0,0 +1,14 @@
+import { AsyncLocalStorage } from 'async_hooks';
+
+export const REQUEST_ID_HEADER = 'x-mosaic-request-id';
+
+interface RequestContext {
+  mosaicRequestId: string;
+}
+
+export const requestContext = new AsyncLocalStorage<RequestContext>();
+
+export const getRequestContextHeaders = (): Record<string, string> => {
+  const mosaicRequestId = requestContext.getStore()?.mosaicRequestId;
+  return mosaicRequestId ? { [REQUEST_ID_HEADER]: mosaicRequestId } : {};
+};

package/src/middleware/index.ts

@@ -4,5 +4,6 @@ export * from './liveness-readiness-middleware';
 export * from './maintenance-middleware';
 export * from './monitoring-middleware';
 export * from './mosaic-favicon';
+export * from './request-id-middleware';
 export * from './service-health-check-middleware';
 export * from './shutdown-actions-middleware';

package/src/middleware/request-id-middleware.ts

@@ -0,0 +1,11 @@
+import { RequestHandler } from 'express';
+import { v4 as uuid } from 'uuid';
+import { REQUEST_ID_HEADER, requestContext } from '../common/request-context';
+
+export const mosaicContextMiddleware =
+  (): RequestHandler => (req, res, next) => {
+    const mosaicRequestId =
+      (req.headers[REQUEST_ID_HEADER] as string) ?? uuid();
+    res.setHeader(REQUEST_ID_HEADER, mosaicRequestId);
+    requestContext.run({ mosaicRequestId }, next);
+  };