plac-micro-common 1.0.27 → 1.0.29

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

@@ -1,3 +1,4 @@
 export * from "./exceptions.filter";
 export * from "./response.interceptor";
 export * from "./request_context.interceptor";
+export * from "./request_context.store";

package/dist/http/common/index.js

@@ -17,3 +17,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./exceptions.filter"), exports);
 __exportStar(require("./response.interceptor"), exports);
 __exportStar(require("./request_context.interceptor"), exports);
+__exportStar(require("./request_context.store"), exports);

package/dist/http/common/request_context.interceptor.d.ts

@@ -1,8 +1,5 @@
 import { NestInterceptor, ExecutionContext, CallHandler } from "@nestjs/common";
 import { Observable } from "rxjs";
-import { RequestContextService } from "../services/request_context.service";
-export declare class RequestContextInterceptor implements NestInterceptor {
-    private readonly rctx;
-    constructor(rctx: RequestContextService);
+export declare class RequestContextAlsInterceptor implements NestInterceptor {
     intercept(context: ExecutionContext, next: CallHandler): Observable<any>;
 }

package/dist/http/common/request_context.interceptor.js

@@ -5,49 +5,32 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-var __param = (this && this.__param) || function (paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RequestContextInterceptor = void 0;
+exports.RequestContextAlsInterceptor = void 0;
 const common_1 = require("@nestjs/common");
-const request_context_service_1 = require("../services/request_context.service");
-const tokens_1 = require("../tokens");
-let RequestContextInterceptor = class RequestContextInterceptor {
-    constructor(rctx) {
-        this.rctx = rctx;
-    }
+const request_context_store_1 = require("./request_context.store");
+let RequestContextAlsInterceptor = class RequestContextAlsInterceptor {
     intercept(context, next) {
-        console.log("RequestContextInterceptor executed");
-        if (!this.rctx) {
-            throw new Error("RequestContextService was not injected (rctx is undefined).");
-        }
         const req = context.switchToHttp().getRequest();
         const xff = req.headers["x-forwarded-for"];
         const ipAddress = (Array.isArray(xff) ? xff[0] : xff?.split(",")[0]) ||
             req.socket?.remoteAddress ||
             req.ip;
-        const clientContext = {
-            ip_address: ipAddress,
-            user_agent: req.headers["user-agent"],
-            request_id: req.headers["x-request-id"],
-            origin: req.headers["origin"],
-            referer: req.headers["referer"],
-        };
-        this.rctx.set({
+        const initial = {
             app: req.current_app,
             app_client: req.current_app_client,
-            client_context: clientContext,
-        });
-        return next.handle();
+            client_context: {
+                ip_address: ipAddress,
+                user_agent: req.headers["user-agent"],
+                request_id: req.headers["x-request-id"],
+                origin: req.headers["origin"],
+                referer: req.headers["referer"],
+            },
+        };
+        return request_context_store_1.RequestContext.run(initial, () => next.handle());
     }
 };
-exports.RequestContextInterceptor = RequestContextInterceptor;
-exports.RequestContextInterceptor = RequestContextInterceptor = __decorate([
-    (0, common_1.Injectable)(),
-    __param(0, (0, common_1.Inject)(tokens_1.REQUEST_CONTEXT_SERVICE)),
-    __metadata("design:paramtypes", [request_context_service_1.RequestContextService])
-], RequestContextInterceptor);
+exports.RequestContextAlsInterceptor = RequestContextAlsInterceptor;
+exports.RequestContextAlsInterceptor = RequestContextAlsInterceptor = __decorate([
+    (0, common_1.Injectable)()
+], RequestContextAlsInterceptor);

package/dist/http/{services/request_context.service.d.ts → common/request_context.store.d.ts}

@@ -1,6 +1,6 @@
 import { RequestContextData } from "../types";
-export declare class RequestContextService {
-    private data;
-    set(partial: Partial<RequestContextData>): void;
+export declare const RequestContext: {
+    run<T>(initial: RequestContextData, fn: () => T): T;
     get(): RequestContextData;
-}
+    set(partial: Partial<RequestContextData>): void;
+};

package/dist/http/common/request_context.store.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RequestContext = void 0;
+const node_async_hooks_1 = require("node:async_hooks");
+const als = new node_async_hooks_1.AsyncLocalStorage();
+exports.RequestContext = {
+    run(initial, fn) {
+        return als.run(initial, fn);
+    },
+    get() {
+        return als.getStore() ?? {};
+    },
+    set(partial) {
+        const store = als.getStore();
+        if (store)
+            Object.assign(store, partial);
+    },
+};

package/dist/http/index.d.ts

@@ -1,6 +1,4 @@
 export * from "./common";
 export * from "./decorators";
 export * from "./modules";
-export * from "./services";
 export * from "./types";
-export * from "./tokens";

package/dist/http/index.js

@@ -17,6 +17,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./common"), exports);
 __exportStar(require("./decorators"), exports);
 __exportStar(require("./modules"), exports);
-__exportStar(require("./services"), exports);
 __exportStar(require("./types"), exports);
-__exportStar(require("./tokens"), exports);

package/dist/http/modules/request_context.module.d.ts

@@ -1,2 +1,2 @@
-export declare class RequestContextModule {
+export declare class RequestContextAlsModule {
 }

package/dist/http/modules/request_context.module.js

@@ -6,28 +6,17 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RequestContextModule = void 0;
+exports.RequestContextAlsModule = void 0;
 const common_1 = require("@nestjs/common");
 const core_1 = require("@nestjs/core");
-const request_context_service_1 = require("../services/request_context.service");
-const request_context_interceptor_1 = require("../common/request_context.interceptor");
-const tokens_1 = require("../tokens");
-let RequestContextModule = class RequestContextModule {
+const common_2 = require("../common");
+let RequestContextAlsModule = class RequestContextAlsModule {
 };
-exports.RequestContextModule = RequestContextModule;
-exports.RequestContextModule = RequestContextModule = __decorate([
+exports.RequestContextAlsModule = RequestContextAlsModule;
+exports.RequestContextAlsModule = RequestContextAlsModule = __decorate([
     (0, common_1.Module)({
         providers: [
-            {
-                provide: tokens_1.REQUEST_CONTEXT_SERVICE,
-                useClass: request_context_service_1.RequestContextService,
-                scope: common_1.Scope.REQUEST,
-            },
-            {
-                provide: core_1.APP_INTERCEPTOR,
-                useClass: request_context_interceptor_1.RequestContextInterceptor,
-            },
+            { provide: core_1.APP_INTERCEPTOR, useClass: common_2.RequestContextAlsInterceptor },
         ],
-        exports: [tokens_1.REQUEST_CONTEXT_SERVICE],
     })
-], RequestContextModule);
+], RequestContextAlsModule);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "plac-micro-common",
-  "version": "1.0.27",
+  "version": "1.0.29",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "scripts": {

package/dist/http/services/index.d.ts

@@ -1 +0,0 @@
-export * from "./request_context.service";

package/dist/http/services/index.js

@@ -1,17 +0,0 @@
-"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.service"), exports);

package/dist/http/services/request_context.service.js

@@ -1,25 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RequestContextService = void 0;
-const common_1 = require("@nestjs/common");
-let RequestContextService = class RequestContextService {
-    constructor() {
-        this.data = {};
-    }
-    set(partial) {
-        this.data = { ...this.data, ...partial };
-    }
-    get() {
-        return this.data;
-    }
-};
-exports.RequestContextService = RequestContextService;
-exports.RequestContextService = RequestContextService = __decorate([
-    (0, common_1.Injectable)({ scope: common_1.Scope.REQUEST })
-], RequestContextService);

package/dist/http/tokens/index.d.ts

@@ -1 +0,0 @@
-export * from "./request_context.token";

package/dist/http/tokens/index.js

@@ -1,17 +0,0 @@
-"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.token"), exports);

package/dist/http/tokens/request_context.token.d.ts

@@ -1 +0,0 @@
-export declare const REQUEST_CONTEXT_SERVICE: unique symbol;

package/dist/http/tokens/request_context.token.js

@@ -1,4 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.REQUEST_CONTEXT_SERVICE = void 0;
-exports.REQUEST_CONTEXT_SERVICE = Symbol.for("PLAC_REQUEST_CONTEXT_SERVICE");