@lark-apaas/fullstack-nestjs-core 1.1.1-alpha.14 → 1.1.1-alpha.16

package/dist/index.cjs

@@ -44,9 +44,9 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/modules/platform/module.ts
-var import_common5 = require("@nestjs/common");
+var import_common6 = require("@nestjs/common");
 var import_core = require("@nestjs/core");
-var import_nestjs_common = require("@lark-apaas/nestjs-common");
+var import_nestjs_common2 = require("@lark-apaas/nestjs-common");
 var import_config2 = require("@nestjs/config");
 var import_nestjs_observable = require("@lark-apaas/nestjs-observable");
 var import_nestjs_logger = require("@lark-apaas/nestjs-logger");
@@ -296,6 +296,48 @@ function apiResponseInterceptor(req, res, next) {
 }
 __name(apiResponseInterceptor, "apiResponseInterceptor");
 
+// src/middlewares/request-context/index.ts
+var import_common5 = require("@nestjs/common");
+var import_nestjs_common = require("@lark-apaas/nestjs-common");
+function _ts_decorate5(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;
+}
+__name(_ts_decorate5, "_ts_decorate");
+function _ts_metadata(k, v) {
+  if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+}
+__name(_ts_metadata, "_ts_metadata");
+var RequestContextMiddleware = class {
+  static {
+    __name(this, "RequestContextMiddleware");
+  }
+  requestContext;
+  constructor(requestContext) {
+    this.requestContext = requestContext;
+  }
+  use(req, _res, next) {
+    const path = req.originalUrl ?? req.url;
+    const userContext = req.userContext ?? {};
+    this.requestContext.run({
+      path,
+      method: req.method,
+      userId: userContext.userId,
+      tenantId: userContext.tenantId,
+      appId: userContext.appId
+    }, () => next());
+  }
+};
+RequestContextMiddleware = _ts_decorate5([
+  (0, import_common5.Injectable)(),
+  _ts_metadata("design:type", Function),
+  _ts_metadata("design:paramtypes", [
+    typeof import_nestjs_common.RequestContextService === "undefined" ? Object : import_nestjs_common.RequestContextService
+  ])
+], RequestContextMiddleware);
+
 // src/modules/platform/config/app.config.ts
 var import_config = require("@nestjs/config");
 var NAMESPACE = "app";
@@ -309,13 +351,13 @@ var app_config_default = (0, import_config.registerAs)(NAMESPACE, () => {
 });
 
 // src/modules/platform/module.ts
-function _ts_decorate5(decorators, target, key, desc) {
+function _ts_decorate6(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;
 }
-__name(_ts_decorate5, "_ts_decorate");
+__name(_ts_decorate6, "_ts_decorate");
 var PLATFORM_MODULE_OPTIONS = "PLATFORM_MODULE_OPTIONS";
 var PlatformModule = class _PlatformModule {
   static {
@@ -337,9 +379,9 @@ var PlatformModule = class _PlatformModule {
             app_config_default
           ]
         }),
-        import_nestjs_common.CommonModule,
-        import_nestjs_logger.LoggerModule,
+        import_nestjs_common2.CommonModule,
         import_nestjs_observable.NestjsObservableModule.forRoot(),
+        import_nestjs_logger.LoggerModule,
         import_nestjs_datapaas.DataPaasModule.forRootAsync({
           imports: [
             import_config2.ConfigModule,
@@ -375,12 +417,16 @@ var PlatformModule = class _PlatformModule {
         },
         {
           provide: import_core.APP_PIPE,
-          useValue: new import_common5.ValidationPipe({
+          useValue: new import_common6.ValidationPipe({
             transform: true,
             transformOptions: {
               enableImplicitConversion: true
             }
           })
+        },
+        {
+          provide: import_nestjs_common2.OBSERVABLE_SERVICE_TOKEN,
+          useClass: import_nestjs_observable.ObservableService
         }
       ],
       exports: [
@@ -395,7 +441,7 @@ var PlatformModule = class _PlatformModule {
   configure(consumer) {
     const options = _PlatformModule.moduleOptions;
     consumer.apply(apiResponseInterceptor).forRoutes("/api/*");
-    consumer.apply(UserContextMiddleware, import_nestjs_logger.LoggerContextMiddleware, import_nestjs_observable.ObservableTraceMiddleware, import_nestjs_datapaas.SqlExecutionContextMiddleware).forRoutes("/*");
+    consumer.apply(UserContextMiddleware, RequestContextMiddleware, import_nestjs_logger.LoggerContextMiddleware, import_nestjs_datapaas.SqlExecutionContextMiddleware).forRoutes("/*");
     consumer.apply(CsrfTokenMiddleware, ViewContextMiddleware).exclude("/api/(.*)").forRoutes("*");
     if (options.enableCsrf !== false) {
       const csrfRoutes = options.csrfRoutes || "/api/*";
@@ -409,9 +455,9 @@ var PlatformModule = class _PlatformModule {
     }
   }
 };
-PlatformModule = _ts_decorate5([
-  (0, import_common5.Global)(),
-  (0, import_common5.Module)({})
+PlatformModule = _ts_decorate6([
+  (0, import_common6.Global)(),
+  (0, import_common6.Module)({})
 ], PlatformModule);
 
 // src/setup.ts

package/dist/index.js

@@ -4,9 +4,9 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
 // src/modules/platform/module.ts
 import { Global, Module, ValidationPipe } from "@nestjs/common";
 import { APP_PIPE } from "@nestjs/core";
-import { CommonModule } from "@lark-apaas/nestjs-common";
+import { CommonModule, OBSERVABLE_SERVICE_TOKEN } from "@lark-apaas/nestjs-common";
 import { ConfigModule, ConfigService } from "@nestjs/config";
-import { NestjsObservableModule as ObservableModule, ObservableTraceMiddleware } from "@lark-apaas/nestjs-observable";
+import { NestjsObservableModule as ObservableModule, ObservableService } from "@lark-apaas/nestjs-observable";
 import { LoggerModule, AppLogger, LoggerContextMiddleware } from "@lark-apaas/nestjs-logger";
 import { DataPaasModule, SqlExecutionContextMiddleware } from "@lark-apaas/nestjs-datapaas";
 import { AuthNPaasModule } from "@lark-apaas/nestjs-authnpaas";
@@ -254,6 +254,48 @@ function apiResponseInterceptor(req, res, next) {
 }
 __name(apiResponseInterceptor, "apiResponseInterceptor");
 
+// src/middlewares/request-context/index.ts
+import { Injectable as Injectable5 } from "@nestjs/common";
+import { RequestContextService } from "@lark-apaas/nestjs-common";
+function _ts_decorate5(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;
+}
+__name(_ts_decorate5, "_ts_decorate");
+function _ts_metadata(k, v) {
+  if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+}
+__name(_ts_metadata, "_ts_metadata");
+var RequestContextMiddleware = class {
+  static {
+    __name(this, "RequestContextMiddleware");
+  }
+  requestContext;
+  constructor(requestContext) {
+    this.requestContext = requestContext;
+  }
+  use(req, _res, next) {
+    const path = req.originalUrl ?? req.url;
+    const userContext = req.userContext ?? {};
+    this.requestContext.run({
+      path,
+      method: req.method,
+      userId: userContext.userId,
+      tenantId: userContext.tenantId,
+      appId: userContext.appId
+    }, () => next());
+  }
+};
+RequestContextMiddleware = _ts_decorate5([
+  Injectable5(),
+  _ts_metadata("design:type", Function),
+  _ts_metadata("design:paramtypes", [
+    typeof RequestContextService === "undefined" ? Object : RequestContextService
+  ])
+], RequestContextMiddleware);
+
 // src/modules/platform/config/app.config.ts
 import { registerAs } from "@nestjs/config";
 var NAMESPACE = "app";
@@ -267,13 +309,13 @@ var app_config_default = registerAs(NAMESPACE, () => {
 });
 
 // src/modules/platform/module.ts
-function _ts_decorate5(decorators, target, key, desc) {
+function _ts_decorate6(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;
 }
-__name(_ts_decorate5, "_ts_decorate");
+__name(_ts_decorate6, "_ts_decorate");
 var PLATFORM_MODULE_OPTIONS = "PLATFORM_MODULE_OPTIONS";
 var PlatformModule = class _PlatformModule {
   static {
@@ -296,8 +338,8 @@ var PlatformModule = class _PlatformModule {
           ]
         }),
         CommonModule,
-        LoggerModule,
         ObservableModule.forRoot(),
+        LoggerModule,
         DataPaasModule.forRootAsync({
           imports: [
             ConfigModule,
@@ -339,6 +381,10 @@ var PlatformModule = class _PlatformModule {
               enableImplicitConversion: true
             }
           })
+        },
+        {
+          provide: OBSERVABLE_SERVICE_TOKEN,
+          useClass: ObservableService
         }
       ],
       exports: [
@@ -353,7 +399,7 @@ var PlatformModule = class _PlatformModule {
   configure(consumer) {
     const options = _PlatformModule.moduleOptions;
     consumer.apply(apiResponseInterceptor).forRoutes("/api/*");
-    consumer.apply(UserContextMiddleware, LoggerContextMiddleware, ObservableTraceMiddleware, SqlExecutionContextMiddleware).forRoutes("/*");
+    consumer.apply(UserContextMiddleware, RequestContextMiddleware, LoggerContextMiddleware, SqlExecutionContextMiddleware).forRoutes("/*");
     consumer.apply(CsrfTokenMiddleware, ViewContextMiddleware).exclude("/api/(.*)").forRoutes("*");
     if (options.enableCsrf !== false) {
       const csrfRoutes = options.csrfRoutes || "/api/*";
@@ -367,7 +413,7 @@ var PlatformModule = class _PlatformModule {
     }
   }
 };
-PlatformModule = _ts_decorate5([
+PlatformModule = _ts_decorate6([
   Global(),
   Module({})
 ], PlatformModule);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-nestjs-core",
-  "version": "1.1.1-alpha.14",
+  "version": "1.1.1-alpha.16",
   "description": "FullStack Nestjs Core",
   "type": "module",
   "main": "./dist/index.js",
@@ -40,10 +40,10 @@
   },
   "dependencies": {
     "@lark-apaas/nestjs-authnpaas": "^1.0.1",
-    "@lark-apaas/nestjs-common": "0.0.1-alpha.1",
+    "@lark-apaas/nestjs-common": "0.0.1-alpha.3",
     "@lark-apaas/nestjs-datapaas": "^1.0.5",
-    "@lark-apaas/nestjs-logger": "1.0.2-alpha.15",
-    "@lark-apaas/nestjs-observable": "0.0.1-alpha.10",
+    "@lark-apaas/nestjs-logger": "1.0.2-alpha.17",
+    "@lark-apaas/nestjs-observable": "0.0.1-alpha.12",
     "@lark-apaas/nestjs-openapi-devtools": "^1.0.9",
     "cookie-parser": "^1.4.7"
   },