@lark-apaas/fullstack-nestjs-core 1.1.4-alpha.3 → 1.1.4-alpha.5

package/dist/index.cjs

@@ -44,15 +44,12 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/modules/platform/module.ts
-var import_common5 = require("@nestjs/common");
-var import_core = require("@nestjs/core");
-var import_nestjs_common = require("@lark-apaas/nestjs-common");
+var import_common6 = require("@nestjs/common");
+var import_core2 = require("@nestjs/core");
 var import_config2 = require("@nestjs/config");
-var import_nestjs_observable = require("@lark-apaas/nestjs-observable");
 var import_nestjs_logger = require("@lark-apaas/nestjs-logger");
 var import_nestjs_datapaas = require("@lark-apaas/nestjs-datapaas");
 var import_nestjs_authnpaas = require("@lark-apaas/nestjs-authnpaas");
-var import_nestjs_trigger = require("@lark-apaas/nestjs-trigger");
 
 // src/middlewares/user-context/index.ts
 var import_common = require("@nestjs/common");
@@ -99,8 +96,7 @@ var UserContextMiddleware = class {
       env: webUser?.env ?? "runtime",
       userName: webUser?.user_name?.zh_cn ?? "",
       userNameEn: webUser?.user_name?.en_us ?? "",
-      userNameI18n: webUser?.user_name ?? {},
-      isSystemAccount: webUser?.is_system_account ?? false
+      userNameI18n: webUser?.user_name ?? {}
     };
     next();
   }
@@ -310,7 +306,9 @@ var app_config_default = (0, import_config.registerAs)(NAMESPACE, () => {
   };
 });
 
-// src/modules/platform/module.ts
+// src/middlewares/debug/index.ts
+var import_common5 = require("@nestjs/common");
+var import_core = require("@nestjs/core");
 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);
@@ -318,6 +316,73 @@ function _ts_decorate5(decorators, target, key, desc) {
   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 processStartTimestamp = Date.now();
+var FrameworkDebugMiddleware = class {
+  static {
+    __name(this, "FrameworkDebugMiddleware");
+  }
+  httpAdapterHost;
+  constructor(httpAdapterHost) {
+    this.httpAdapterHost = httpAdapterHost;
+  }
+  use(_req, res) {
+    res.json(this.getDebugInfo());
+  }
+  getDebugInfo() {
+    const routes = this.getRoutes();
+    const uptimeSeconds = Math.floor(process.uptime());
+    return {
+      ["\u8DEF\u7531\u914D\u7F6E"]: routes,
+      ["\u8FDB\u7A0B\u5B58\u6D3B\u65F6\u95F4\uFF08\u79D2\uFF09"]: uptimeSeconds,
+      ["\u8FDB\u7A0B\u542F\u52A8\u65F6\u95F4\uFF08\u79D2\uFF09"]: new Date(processStartTimestamp).toISOString(),
+      ["\u8FD0\u884C\u65F6\u7248\u672C"]: process.versions
+    };
+  }
+  getRoutes() {
+    const server = this.httpAdapterHost.httpAdapter;
+    const router = server.getInstance()._router;
+    if (!router) {
+      return {
+        error: "Router \u4E0D\u53EF\u7528"
+      };
+    }
+    const routes = [];
+    router.stack.forEach((middleware, index) => {
+      if (middleware.route) {
+        routes.push({
+          order: String(index),
+          path: middleware.route.path,
+          method: middleware.method,
+          regexp: middleware.regexp?.toString()
+        });
+      }
+    });
+    return {
+      total: routes.length,
+      routes
+    };
+  }
+};
+FrameworkDebugMiddleware = _ts_decorate5([
+  (0, import_common5.Injectable)(),
+  _ts_metadata("design:type", Function),
+  _ts_metadata("design:paramtypes", [
+    typeof import_core.HttpAdapterHost === "undefined" ? Object : import_core.HttpAdapterHost
+  ])
+], FrameworkDebugMiddleware);
+
+// src/modules/platform/module.ts
+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_decorate6, "_ts_decorate");
 var PLATFORM_MODULE_OPTIONS = "PLATFORM_MODULE_OPTIONS";
 var PlatformModule = class _PlatformModule {
   static {
@@ -339,9 +404,7 @@ var PlatformModule = class _PlatformModule {
             app_config_default
           ]
         }),
-        import_nestjs_common.CommonModule,
         import_nestjs_logger.LoggerModule,
-        import_nestjs_observable.NestjsObservableModule.forRoot(),
         import_nestjs_datapaas.DataPaasModule.forRootAsync({
           imports: [
             import_config2.ConfigModule,
@@ -356,10 +419,10 @@ var PlatformModule = class _PlatformModule {
             const appLogger = args[1];
             const drizzleLogger = {
               logQuery(query, params) {
-                appLogger.log?.("SQL Query " + JSON.stringify({
+                appLogger.log?.("SQL Query", {
                   query,
                   params
-                }), "Database");
+                }, "Database");
               }
             };
             return {
@@ -368,12 +431,7 @@ var PlatformModule = class _PlatformModule {
             };
           }, "useFactory")
         }),
-        import_nestjs_authnpaas.AuthNPaasModule.forRoot(),
-        import_nestjs_trigger.AutomationModule.forRoot({
-          imports: [
-            import_nestjs_logger.LoggerModule
-          ]
-        })
+        import_nestjs_authnpaas.AuthNPaasModule.forRoot()
       ],
       providers: [
         {
@@ -381,8 +439,8 @@ var PlatformModule = class _PlatformModule {
           useValue: options
         },
         {
-          provide: import_core.APP_PIPE,
-          useValue: new import_common5.ValidationPipe({
+          provide: import_core2.APP_PIPE,
+          useValue: new import_common6.ValidationPipe({
             transform: true,
             transformOptions: {
               enableImplicitConversion: true
@@ -402,6 +460,9 @@ var PlatformModule = class _PlatformModule {
   configure(consumer) {
     const options = _PlatformModule.moduleOptions;
     consumer.apply(apiResponseInterceptor).forRoutes("/api/*");
+    if (process.env.NODE_ENV === "development") {
+      consumer.apply(FrameworkDebugMiddleware).forRoutes("/api/__framework__/debug");
+    }
     consumer.apply(UserContextMiddleware, import_nestjs_logger.LoggerContextMiddleware, import_nestjs_datapaas.SqlExecutionContextMiddleware).forRoutes("/*");
     consumer.apply(CsrfTokenMiddleware, ViewContextMiddleware).exclude("/api/(.*)").forRoutes("*");
     if (options.enableCsrf !== false) {
@@ -416,9 +477,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
@@ -451,7 +512,6 @@ __name(configureApp, "configureApp");
 var import_nestjs_openapi_devtools2 = require("@lark-apaas/nestjs-openapi-devtools");
 __reExport(index_exports, require("@lark-apaas/nestjs-authnpaas"), module.exports);
 __reExport(index_exports, require("@lark-apaas/nestjs-datapaas"), module.exports);
-__reExport(index_exports, require("@lark-apaas/nestjs-trigger"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   CsrfMiddleware,
@@ -463,6 +523,5 @@ __reExport(index_exports, require("@lark-apaas/nestjs-trigger"), module.exports)
   ViewContextMiddleware,
   configureApp,
   ...require("@lark-apaas/nestjs-authnpaas"),
-  ...require("@lark-apaas/nestjs-datapaas"),
-  ...require("@lark-apaas/nestjs-trigger")
+  ...require("@lark-apaas/nestjs-datapaas")
 });

package/dist/index.d.cts

@@ -4,7 +4,6 @@ export { DevToolsModule, DevToolsOptions, DevToolsV2Module, DevToolsV2Options }
 import { Request, Response, NextFunction } from 'express';
 export * from '@lark-apaas/nestjs-authnpaas';
 export * from '@lark-apaas/nestjs-datapaas';
-export * from '@lark-apaas/nestjs-trigger';
 
 declare global {
   namespace Express {
@@ -25,7 +24,6 @@ declare global {
         userName?: string; // 默认中文名
         userNameEn?: string; // 冗余一份英文名
         userNameI18n?: Record<string, string>; // 带多语的用户名
-        isSystemAccount?: boolean; // trigger 场景写入值为 true，user 访问场景不写入
       },
       csrfToken?: string;
     }

package/dist/index.d.ts

@@ -4,7 +4,6 @@ export { DevToolsModule, DevToolsOptions, DevToolsV2Module, DevToolsV2Options }
 import { Request, Response, NextFunction } from 'express';
 export * from '@lark-apaas/nestjs-authnpaas';
 export * from '@lark-apaas/nestjs-datapaas';
-export * from '@lark-apaas/nestjs-trigger';
 
 declare global {
   namespace Express {
@@ -25,7 +24,6 @@ declare global {
         userName?: string; // 默认中文名
         userNameEn?: string; // 冗余一份英文名
         userNameI18n?: Record<string, string>; // 带多语的用户名
-        isSystemAccount?: boolean; // trigger 场景写入值为 true，user 访问场景不写入
       },
       csrfToken?: string;
     }

package/dist/index.js

@@ -4,13 +4,10 @@ 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 { ConfigModule, ConfigService } from "@nestjs/config";
-import { NestjsObservableModule as ObservableModule } 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";
-import { AutomationModule } from "@lark-apaas/nestjs-trigger";
 
 // src/middlewares/user-context/index.ts
 import { Injectable } from "@nestjs/common";
@@ -57,8 +54,7 @@ var UserContextMiddleware = class {
       env: webUser?.env ?? "runtime",
       userName: webUser?.user_name?.zh_cn ?? "",
       userNameEn: webUser?.user_name?.en_us ?? "",
-      userNameI18n: webUser?.user_name ?? {},
-      isSystemAccount: webUser?.is_system_account ?? false
+      userNameI18n: webUser?.user_name ?? {}
     };
     next();
   }
@@ -268,7 +264,9 @@ var app_config_default = registerAs(NAMESPACE, () => {
   };
 });
 
-// src/modules/platform/module.ts
+// src/middlewares/debug/index.ts
+import { Injectable as Injectable5 } from "@nestjs/common";
+import { HttpAdapterHost } from "@nestjs/core";
 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);
@@ -276,6 +274,73 @@ function _ts_decorate5(decorators, target, key, desc) {
   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 processStartTimestamp = Date.now();
+var FrameworkDebugMiddleware = class {
+  static {
+    __name(this, "FrameworkDebugMiddleware");
+  }
+  httpAdapterHost;
+  constructor(httpAdapterHost) {
+    this.httpAdapterHost = httpAdapterHost;
+  }
+  use(_req, res) {
+    res.json(this.getDebugInfo());
+  }
+  getDebugInfo() {
+    const routes = this.getRoutes();
+    const uptimeSeconds = Math.floor(process.uptime());
+    return {
+      ["\u8DEF\u7531\u914D\u7F6E"]: routes,
+      ["\u8FDB\u7A0B\u5B58\u6D3B\u65F6\u95F4\uFF08\u79D2\uFF09"]: uptimeSeconds,
+      ["\u8FDB\u7A0B\u542F\u52A8\u65F6\u95F4\uFF08\u79D2\uFF09"]: new Date(processStartTimestamp).toISOString(),
+      ["\u8FD0\u884C\u65F6\u7248\u672C"]: process.versions
+    };
+  }
+  getRoutes() {
+    const server = this.httpAdapterHost.httpAdapter;
+    const router = server.getInstance()._router;
+    if (!router) {
+      return {
+        error: "Router \u4E0D\u53EF\u7528"
+      };
+    }
+    const routes = [];
+    router.stack.forEach((middleware, index) => {
+      if (middleware.route) {
+        routes.push({
+          order: String(index),
+          path: middleware.route.path,
+          method: middleware.method,
+          regexp: middleware.regexp?.toString()
+        });
+      }
+    });
+    return {
+      total: routes.length,
+      routes
+    };
+  }
+};
+FrameworkDebugMiddleware = _ts_decorate5([
+  Injectable5(),
+  _ts_metadata("design:type", Function),
+  _ts_metadata("design:paramtypes", [
+    typeof HttpAdapterHost === "undefined" ? Object : HttpAdapterHost
+  ])
+], FrameworkDebugMiddleware);
+
+// src/modules/platform/module.ts
+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_decorate6, "_ts_decorate");
 var PLATFORM_MODULE_OPTIONS = "PLATFORM_MODULE_OPTIONS";
 var PlatformModule = class _PlatformModule {
   static {
@@ -297,9 +362,7 @@ var PlatformModule = class _PlatformModule {
             app_config_default
           ]
         }),
-        CommonModule,
         LoggerModule,
-        ObservableModule.forRoot(),
         DataPaasModule.forRootAsync({
           imports: [
             ConfigModule,
@@ -314,10 +377,10 @@ var PlatformModule = class _PlatformModule {
             const appLogger = args[1];
             const drizzleLogger = {
               logQuery(query, params) {
-                appLogger.log?.("SQL Query " + JSON.stringify({
+                appLogger.log?.("SQL Query", {
                   query,
                   params
-                }), "Database");
+                }, "Database");
               }
             };
             return {
@@ -326,12 +389,7 @@ var PlatformModule = class _PlatformModule {
             };
           }, "useFactory")
         }),
-        AuthNPaasModule.forRoot(),
-        AutomationModule.forRoot({
-          imports: [
-            LoggerModule
-          ]
-        })
+        AuthNPaasModule.forRoot()
       ],
       providers: [
         {
@@ -360,6 +418,9 @@ var PlatformModule = class _PlatformModule {
   configure(consumer) {
     const options = _PlatformModule.moduleOptions;
     consumer.apply(apiResponseInterceptor).forRoutes("/api/*");
+    if (process.env.NODE_ENV === "development") {
+      consumer.apply(FrameworkDebugMiddleware).forRoutes("/api/__framework__/debug");
+    }
     consumer.apply(UserContextMiddleware, LoggerContextMiddleware, SqlExecutionContextMiddleware).forRoutes("/*");
     consumer.apply(CsrfTokenMiddleware, ViewContextMiddleware).exclude("/api/(.*)").forRoutes("*");
     if (options.enableCsrf !== false) {
@@ -374,7 +435,7 @@ var PlatformModule = class _PlatformModule {
     }
   }
 };
-PlatformModule = _ts_decorate5([
+PlatformModule = _ts_decorate6([
   Global(),
   Module({})
 ], PlatformModule);
@@ -409,7 +470,6 @@ __name(configureApp, "configureApp");
 import { DevToolsModule, DevToolsV2Module as DevToolsV2Module2 } from "@lark-apaas/nestjs-openapi-devtools";
 export * from "@lark-apaas/nestjs-authnpaas";
 export * from "@lark-apaas/nestjs-datapaas";
-export * from "@lark-apaas/nestjs-trigger";
 export {
   CsrfMiddleware,
   CsrfTokenMiddleware,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-nestjs-core",
-  "version": "1.1.4-alpha.3",
+  "version": "1.1.4-alpha.5",
   "description": "FullStack Nestjs Core",
   "type": "module",
   "main": "./dist/index.js",
@@ -39,13 +39,10 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@lark-apaas/nestjs-authnpaas": "^1.0.1",
-    "@lark-apaas/nestjs-common": "0.0.1-alpha.1",
-    "@lark-apaas/nestjs-datapaas": "^1.0.6-alpha.5",
-    "@lark-apaas/nestjs-logger": "1.0.2-alpha.14",
-    "@lark-apaas/nestjs-observable": "0.0.1-alpha.9",
+    "@lark-apaas/nestjs-authnpaas": "1.0.2-alpha.2",
+    "@lark-apaas/nestjs-datapaas": "^1.0.5",
+    "@lark-apaas/nestjs-logger": "^1.0.2",
     "@lark-apaas/nestjs-openapi-devtools": "^1.0.9",
-    "@lark-apaas/nestjs-trigger": "0.0.1-alpha.1",
     "cookie-parser": "^1.4.7"
   },
   "devDependencies": {
@@ -62,6 +59,7 @@
   },
   "peerDependencies": {
     "@nestjs/common": "^10.4.20",
+    "@nestjs/core": "^10.4.20",
     "@nestjs/platform-express": "^10.4.20",
     "@nestjs/swagger": "^7.4.2",
     "class-transformer": "^0.5.1",