@lark-apaas/fullstack-nestjs-core 1.1.12-alpha.0 → 1.1.12-alpha.2

package/dist/index.cjs

@@ -36,17 +36,15 @@ __export(index_exports, {
   CsrfTokenMiddleware: () => CsrfTokenMiddleware,
   DevToolsModule: () => import_nestjs_openapi_devtools2.DevToolsModule,
   DevToolsV2Module: () => import_nestjs_openapi_devtools2.DevToolsV2Module,
-  ForwardedHostMiddleware: () => ForwardedHostMiddleware,
   PlatformModule: () => PlatformModule,
   UserContextMiddleware: () => UserContextMiddleware,
   ViewContextMiddleware: () => ViewContextMiddleware,
-  configureApp: () => configureApp,
-  forwardedHostExpressMiddleware: () => forwardedHostExpressMiddleware
+  configureApp: () => configureApp
 });
 module.exports = __toCommonJS(index_exports);
 
 // src/modules/platform/module.ts
-var import_common10 = require("@nestjs/common");
+var import_common9 = require("@nestjs/common");
 var import_core2 = require("@nestjs/core");
 var import_nestjs_common3 = require("@lark-apaas/nestjs-common");
 var import_config2 = require("@nestjs/config");
@@ -172,6 +170,7 @@ CsrfMiddleware = _ts_decorate2([
 // src/middlewares/view-context/index.ts
 var import_common3 = require("@nestjs/common");
 var import_nestjs_common = require("@lark-apaas/nestjs-common");
+var import_serialize_javascript = __toESM(require("serialize-javascript"), 1);
 function _ts_decorate3(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);
@@ -227,9 +226,9 @@ var ViewContextMiddleware = class _ViewContextMiddleware {
       csrfToken: csrfToken ?? "",
       userId: userId ?? "",
       appId: appId ?? "",
-      appName: appInfo?.app_name ?? "",
+      appName: (0, import_serialize_javascript.default)(appInfo?.app_name ?? ""),
       appAvatar: appInfo?.app_avatar ?? "",
-      appDescription: appInfo?.app_description ?? "",
+      appDescription: (0, import_serialize_javascript.default)(appInfo?.app_description ?? ""),
       tenantId
     };
     res.locals = {
@@ -238,9 +237,9 @@ var ViewContextMiddleware = class _ViewContextMiddleware {
       userId: userId ?? "",
       tenantId: tenantId ?? "",
       appId: appId ?? "",
-      appName: appInfo?.app_name ?? "\u5999\u642D\u5E94\u7528",
+      appName: (0, import_serialize_javascript.default)(appInfo?.app_name ?? "\u5999\u642D\u5E94\u7528"),
       appAvatar: appInfo?.app_avatar ?? "",
-      appDescription: appInfo?.app_description ?? ""
+      appDescription: (0, import_serialize_javascript.default)(appInfo?.app_description ?? "")
     };
     next();
   }
@@ -718,50 +717,17 @@ PlatformHttpClientService = _ts_decorate8([
   _ts_metadata5("design:paramtypes", [])
 ], PlatformHttpClientService);
 
-// src/middlewares/forwarded-host/index.ts
-var import_common9 = require("@nestjs/common");
-function _ts_decorate9(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_decorate9, "_ts_decorate");
-function normalizeForwardedHost(raw) {
-  if (!raw) return void 0;
-  const combined = Array.isArray(raw) ? raw.join(",") : raw;
-  const first = combined.split(",")[0]?.trim();
-  return first || void 0;
-}
-__name(normalizeForwardedHost, "normalizeForwardedHost");
-function forwardedHostExpressMiddleware(req, _res, next) {
-  const forwardedHost = normalizeForwardedHost(req.headers["x-forwarded-host"]);
-  if (forwardedHost) {
-    req.headers.host = forwardedHost;
-  }
-  next();
-}
-__name(forwardedHostExpressMiddleware, "forwardedHostExpressMiddleware");
-var ForwardedHostMiddleware = class {
-  static {
-    __name(this, "ForwardedHostMiddleware");
-  }
-  use(req, res, next) {
-    forwardedHostExpressMiddleware(req, res, next);
-  }
-};
-ForwardedHostMiddleware = _ts_decorate9([
-  (0, import_common9.Injectable)()
-], ForwardedHostMiddleware);
+// src/modules/platform/config/feature-switch.ts
+var DISABLE_DATAPASS = process.env.DISABLE_DATAPASS === "true";
 
 // src/modules/platform/module.ts
-function _ts_decorate10(decorators, target, key, desc) {
+function _ts_decorate9(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_decorate10, "_ts_decorate");
+__name(_ts_decorate9, "_ts_decorate");
 var PLATFORM_MODULE_OPTIONS = /* @__PURE__ */ Symbol("PLATFORM_MODULE_OPTIONS");
 var PlatformModule = class _PlatformModule {
   static {
@@ -790,32 +756,35 @@ var PlatformModule = class _PlatformModule {
           timeout: 5e3,
           maxRedirects: 5
         }),
-        import_nestjs_datapaas.DataPaasModule.forRootAsync({
-          imports: [
-            import_config2.ConfigModule,
-            import_nestjs_logger2.LoggerModule
-          ],
-          inject: [
-            import_config2.ConfigService,
-            import_nestjs_logger2.AppLogger
-          ],
-          useFactory: /* @__PURE__ */ __name(async (...args) => {
-            const configService = args[0];
-            const appLogger = args[1];
-            const drizzleLogger = {
-              logQuery(query, params) {
-                appLogger.log?.("SQL Query " + JSON.stringify({
-                  query,
-                  params
-                }), "Database");
-              }
-            };
-            return {
-              connectionString: configService.get("app.databaseUrl") ?? "",
-              logger: drizzleLogger
-            };
-          }, "useFactory")
-        }),
+        // 读取环境变量判断是否启用 DataPaasModule
+        ...DISABLE_DATAPASS ? [] : [
+          import_nestjs_datapaas.DataPaasModule.forRootAsync({
+            imports: [
+              import_config2.ConfigModule,
+              import_nestjs_logger2.LoggerModule
+            ],
+            inject: [
+              import_config2.ConfigService,
+              import_nestjs_logger2.AppLogger
+            ],
+            useFactory: /* @__PURE__ */ __name(async (...args) => {
+              const configService = args[0];
+              const appLogger = args[1];
+              const drizzleLogger = {
+                logQuery(query, params) {
+                  appLogger.log?.("SQL Query " + JSON.stringify({
+                    query,
+                    params
+                  }), "Database");
+                }
+              };
+              return {
+                connectionString: configService.get("app.databaseUrl") ?? "",
+                logger: drizzleLogger
+              };
+            }, "useFactory")
+          })
+        ],
         import_nestjs_authnpaas.AuthNPaasModule.forRoot(),
         import_nestjs_trigger.AutomationModule.forRoot()
       ],
@@ -826,7 +795,7 @@ var PlatformModule = class _PlatformModule {
         },
         {
           provide: import_core2.APP_PIPE,
-          useValue: new import_common10.ValidationPipe({
+          useValue: new import_common9.ValidationPipe({
             transform: true,
             transformOptions: {
               enableImplicitConversion: true
@@ -865,7 +834,7 @@ var PlatformModule = class _PlatformModule {
     if (process.env.NODE_ENV === "development") {
       consumer.apply(FrameworkDebugMiddleware).forRoutes("/api/__framework__/debug");
     }
-    consumer.apply(ForwardedHostMiddleware, UserContextMiddleware, RequestContextMiddleware, import_nestjs_logger2.LoggerContextMiddleware, import_nestjs_datapaas.SqlExecutionContextMiddleware).forRoutes("/*");
+    consumer.apply(UserContextMiddleware, RequestContextMiddleware, import_nestjs_logger2.LoggerContextMiddleware, import_nestjs_datapaas.SqlExecutionContextMiddleware).forRoutes("/*");
     consumer.apply(CsrfTokenMiddleware, ViewContextMiddleware).exclude("/api/(.*)").forRoutes("*");
     if (options.enableCsrf !== false) {
       const csrfRoutes = options.csrfRoutes || "/api/*";
@@ -879,9 +848,9 @@ var PlatformModule = class _PlatformModule {
     }
   }
 };
-PlatformModule = _ts_decorate10([
-  (0, import_common10.Global)(),
-  (0, import_common10.Module)({})
+PlatformModule = _ts_decorate9([
+  (0, import_common9.Global)(),
+  (0, import_common9.Module)({})
 ], PlatformModule);
 
 // src/setup.ts
@@ -895,9 +864,9 @@ async function configureApp(app, perms = defaultPerms) {
   app.useLogger(app.get(import_nestjs_logger3.AppLogger));
   app.flushLogs();
   app.use((0, import_cookie_parser.default)());
-  app.use(forwardedHostExpressMiddleware);
   const globalPrefix = process.env.CLIENT_BASE_PATH ?? "";
   app.setGlobalPrefix(globalPrefix);
+  app.set("trust proxy", true);
   if (process.env.NODE_ENV !== "production" && perms.disableSwagger !== true) {
     try {
       await import_nestjs_openapi_devtools.DevToolsV2Module.mount(app, {
@@ -924,12 +893,10 @@ __reExport(index_exports, require("@lark-apaas/nestjs-trigger"), module.exports)
   CsrfTokenMiddleware,
   DevToolsModule,
   DevToolsV2Module,
-  ForwardedHostMiddleware,
   PlatformModule,
   UserContextMiddleware,
   ViewContextMiddleware,
   configureApp,
-  forwardedHostExpressMiddleware,
   ...require("@lark-apaas/nestjs-authnpaas"),
   ...require("@lark-apaas/nestjs-datapaas"),
   ...require("@lark-apaas/nestjs-observable"),

package/dist/index.d.cts

@@ -117,11 +117,6 @@ declare class ViewContextMiddleware implements NestMiddleware {
     use(req: Request, res: Response, next: NextFunction): Promise<void>;
 }
 
-declare function forwardedHostExpressMiddleware(req: Request, _res: Response, next: NextFunction): void;
-declare class ForwardedHostMiddleware implements NestMiddleware {
-    use(req: Request, res: Response, next: NextFunction): void;
-}
-
 /**
  * API 404 响应格式
  */
@@ -133,4 +128,4 @@ interface ApiNotFoundResponse {
     timestamp: string;
 }
 
-export { type ApiNotFoundResponse, CsrfMiddleware, CsrfTokenMiddleware, ForwardedHostMiddleware, type PlatformHttpClientOptions, PlatformModule, type PlatformModuleOptions, UserContextMiddleware, ViewContextMiddleware, configureApp, forwardedHostExpressMiddleware };
+export { type ApiNotFoundResponse, CsrfMiddleware, CsrfTokenMiddleware, type PlatformHttpClientOptions, PlatformModule, type PlatformModuleOptions, UserContextMiddleware, ViewContextMiddleware, configureApp };

package/dist/index.d.ts

@@ -117,11 +117,6 @@ declare class ViewContextMiddleware implements NestMiddleware {
     use(req: Request, res: Response, next: NextFunction): Promise<void>;
 }
 
-declare function forwardedHostExpressMiddleware(req: Request, _res: Response, next: NextFunction): void;
-declare class ForwardedHostMiddleware implements NestMiddleware {
-    use(req: Request, res: Response, next: NextFunction): void;
-}
-
 /**
  * API 404 响应格式
  */
@@ -133,4 +128,4 @@ interface ApiNotFoundResponse {
     timestamp: string;
 }
 
-export { type ApiNotFoundResponse, CsrfMiddleware, CsrfTokenMiddleware, ForwardedHostMiddleware, type PlatformHttpClientOptions, PlatformModule, type PlatformModuleOptions, UserContextMiddleware, ViewContextMiddleware, configureApp, forwardedHostExpressMiddleware };
+export { type ApiNotFoundResponse, CsrfMiddleware, CsrfTokenMiddleware, type PlatformHttpClientOptions, PlatformModule, type PlatformModuleOptions, UserContextMiddleware, ViewContextMiddleware, configureApp };

package/dist/index.js

@@ -128,6 +128,7 @@ CsrfMiddleware = _ts_decorate2([
 // src/middlewares/view-context/index.ts
 import { Inject, Injectable as Injectable3, Logger } from "@nestjs/common";
 import { PLATFORM_HTTP_CLIENT } from "@lark-apaas/nestjs-common";
+import serialize from "serialize-javascript";
 function _ts_decorate3(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);
@@ -183,9 +184,9 @@ var ViewContextMiddleware = class _ViewContextMiddleware {
       csrfToken: csrfToken ?? "",
       userId: userId ?? "",
       appId: appId ?? "",
-      appName: appInfo?.app_name ?? "",
+      appName: serialize(appInfo?.app_name ?? ""),
       appAvatar: appInfo?.app_avatar ?? "",
-      appDescription: appInfo?.app_description ?? "",
+      appDescription: serialize(appInfo?.app_description ?? ""),
       tenantId
     };
     res.locals = {
@@ -194,9 +195,9 @@ var ViewContextMiddleware = class _ViewContextMiddleware {
       userId: userId ?? "",
       tenantId: tenantId ?? "",
       appId: appId ?? "",
-      appName: appInfo?.app_name ?? "\u5999\u642D\u5E94\u7528",
+      appName: serialize(appInfo?.app_name ?? "\u5999\u642D\u5E94\u7528"),
       appAvatar: appInfo?.app_avatar ?? "",
-      appDescription: appInfo?.app_description ?? ""
+      appDescription: serialize(appInfo?.app_description ?? "")
     };
     next();
   }
@@ -674,50 +675,17 @@ PlatformHttpClientService = _ts_decorate8([
   _ts_metadata5("design:paramtypes", [])
 ], PlatformHttpClientService);
 
-// src/middlewares/forwarded-host/index.ts
-import { Injectable as Injectable9 } from "@nestjs/common";
-function _ts_decorate9(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_decorate9, "_ts_decorate");
-function normalizeForwardedHost(raw) {
-  if (!raw) return void 0;
-  const combined = Array.isArray(raw) ? raw.join(",") : raw;
-  const first = combined.split(",")[0]?.trim();
-  return first || void 0;
-}
-__name(normalizeForwardedHost, "normalizeForwardedHost");
-function forwardedHostExpressMiddleware(req, _res, next) {
-  const forwardedHost = normalizeForwardedHost(req.headers["x-forwarded-host"]);
-  if (forwardedHost) {
-    req.headers.host = forwardedHost;
-  }
-  next();
-}
-__name(forwardedHostExpressMiddleware, "forwardedHostExpressMiddleware");
-var ForwardedHostMiddleware = class {
-  static {
-    __name(this, "ForwardedHostMiddleware");
-  }
-  use(req, res, next) {
-    forwardedHostExpressMiddleware(req, res, next);
-  }
-};
-ForwardedHostMiddleware = _ts_decorate9([
-  Injectable9()
-], ForwardedHostMiddleware);
+// src/modules/platform/config/feature-switch.ts
+var DISABLE_DATAPASS = process.env.DISABLE_DATAPASS === "true";
 
 // src/modules/platform/module.ts
-function _ts_decorate10(decorators, target, key, desc) {
+function _ts_decorate9(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_decorate10, "_ts_decorate");
+__name(_ts_decorate9, "_ts_decorate");
 var PLATFORM_MODULE_OPTIONS = /* @__PURE__ */ Symbol("PLATFORM_MODULE_OPTIONS");
 var PlatformModule = class _PlatformModule {
   static {
@@ -746,32 +714,35 @@ var PlatformModule = class _PlatformModule {
           timeout: 5e3,
           maxRedirects: 5
         }),
-        DataPaasModule.forRootAsync({
-          imports: [
-            ConfigModule,
-            LoggerModule
-          ],
-          inject: [
-            ConfigService,
-            AppLogger2
-          ],
-          useFactory: /* @__PURE__ */ __name(async (...args) => {
-            const configService = args[0];
-            const appLogger = args[1];
-            const drizzleLogger = {
-              logQuery(query, params) {
-                appLogger.log?.("SQL Query " + JSON.stringify({
-                  query,
-                  params
-                }), "Database");
-              }
-            };
-            return {
-              connectionString: configService.get("app.databaseUrl") ?? "",
-              logger: drizzleLogger
-            };
-          }, "useFactory")
-        }),
+        // 读取环境变量判断是否启用 DataPaasModule
+        ...DISABLE_DATAPASS ? [] : [
+          DataPaasModule.forRootAsync({
+            imports: [
+              ConfigModule,
+              LoggerModule
+            ],
+            inject: [
+              ConfigService,
+              AppLogger2
+            ],
+            useFactory: /* @__PURE__ */ __name(async (...args) => {
+              const configService = args[0];
+              const appLogger = args[1];
+              const drizzleLogger = {
+                logQuery(query, params) {
+                  appLogger.log?.("SQL Query " + JSON.stringify({
+                    query,
+                    params
+                  }), "Database");
+                }
+              };
+              return {
+                connectionString: configService.get("app.databaseUrl") ?? "",
+                logger: drizzleLogger
+              };
+            }, "useFactory")
+          })
+        ],
         AuthNPaasModule.forRoot(),
         AutomationModule.forRoot()
       ],
@@ -821,7 +792,7 @@ var PlatformModule = class _PlatformModule {
     if (process.env.NODE_ENV === "development") {
       consumer.apply(FrameworkDebugMiddleware).forRoutes("/api/__framework__/debug");
     }
-    consumer.apply(ForwardedHostMiddleware, UserContextMiddleware, RequestContextMiddleware, LoggerContextMiddleware, 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/*";
@@ -835,7 +806,7 @@ var PlatformModule = class _PlatformModule {
     }
   }
 };
-PlatformModule = _ts_decorate10([
+PlatformModule = _ts_decorate9([
   Global(),
   Module({})
 ], PlatformModule);
@@ -851,9 +822,9 @@ async function configureApp(app, perms = defaultPerms) {
   app.useLogger(app.get(AppLogger3));
   app.flushLogs();
   app.use(cookieParser());
-  app.use(forwardedHostExpressMiddleware);
   const globalPrefix = process.env.CLIENT_BASE_PATH ?? "";
   app.setGlobalPrefix(globalPrefix);
+  app.set("trust proxy", true);
   if (process.env.NODE_ENV !== "production" && perms.disableSwagger !== true) {
     try {
       await DevToolsV2Module.mount(app, {
@@ -879,10 +850,8 @@ export {
   CsrfTokenMiddleware,
   DevToolsModule,
   DevToolsV2Module2 as DevToolsV2Module,
-  ForwardedHostMiddleware,
   PlatformModule,
   UserContextMiddleware,
   ViewContextMiddleware,
-  configureApp,
-  forwardedHostExpressMiddleware
+  configureApp
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-nestjs-core",
-  "version": "1.1.12-alpha.0",
+  "version": "1.1.12-alpha.2",
   "description": "FullStack Nestjs Core",
   "type": "module",
   "main": "./dist/index.js",
@@ -42,14 +42,15 @@
     "@lark-apaas/http-client": "0.1.2",
     "@lark-apaas/nestjs-authnpaas": "^1.0.2",
     "@lark-apaas/nestjs-common": "^0.1.0",
-    "@lark-apaas/nestjs-datapaas": "^1.0.6",
+    "@lark-apaas/nestjs-datapaas": "^1.0.7",
     "@lark-apaas/nestjs-logger": "^1.0.4",
     "@lark-apaas/nestjs-observable": "^0.0.1",
     "@lark-apaas/nestjs-openapi-devtools": "^1.0.9",
     "@lark-apaas/nestjs-trigger": "^0.0.1",
     "@nestjs/axios": "^4.0.1",
     "axios": "^1.13.2",
-    "cookie-parser": "^1.4.7"
+    "cookie-parser": "^1.4.7",
+    "serialize-javascript": "^7.0.2"
   },
   "devDependencies": {
     "@nestjs/common": "^10.4.20",
@@ -57,6 +58,7 @@
     "@nestjs/swagger": "^7.4.2",
     "@types/cookie-parser": "^1.4.9",
     "@types/express": "^5.0.3",
+    "@types/serialize-javascript": "^5.0.4",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.2",
     "drizzle-orm": "0.44.6",