@lark-apaas/fullstack-nestjs-core 1.1.48-alpha.11 → 1.1.48-alpha.13

package/dist/index.cjs

@@ -5492,9 +5492,9 @@ var require_read = __commonJS({
   }
 });
 
-// ../../../node_modules/type-is/node_modules/media-typer/index.js
+// ../../../node_modules/media-typer/index.js
 var require_media_typer = __commonJS({
-  "../../../node_modules/type-is/node_modules/media-typer/index.js"(exports2) {
+  "../../../node_modules/media-typer/index.js"(exports2) {
     "use strict";
     var paramRegExp = /; *([!#$%&'\*\+\-\.0-9A-Z\^_`a-z\|~]+) *= *("(?:[ !\u0023-\u005b\u005d-\u007e\u0080-\u00ff]|\\[\u0020-\u007e])*"|[!#$%&'\*\+\-\.0-9A-Z\^_`a-z\|~]+) */g;
     var textRegExp = /^[\u0020-\u007e\u0080-\u00ff]+$/;
@@ -34651,6 +34651,7 @@ var ViewContextMiddleware = class _ViewContextMiddleware {
     const { userId, tenantId, appId, loginUrl, userType } = req.userContext;
     const csrfToken = req.csrfToken;
     const environment = mapToWindowEnvironment(process.env.FORCE_FRAMEWORK_ENVIRONMENT);
+    const basename = resolveBasename(req, appId);
     const appPublishedData = await this.getAppPublished(appId);
     const appInfo = appPublishedData?.app_info ?? null;
     req.__platform_data__ = {
@@ -34665,7 +34666,8 @@ var ViewContextMiddleware = class _ViewContextMiddleware {
       tenantId,
       environment,
       showBadge: appInfo?.show_badge !== false,
-      appPublished: appPublishedData ?? null
+      appPublished: appPublishedData ?? null,
+      basename
     };
     res.locals = {
       ...res.locals ?? {},
@@ -34699,6 +34701,16 @@ function mapToWindowEnvironment(input) {
   return "online";
 }
 __name(mapToWindowEnvironment, "mapToWindowEnvironment");
+var CUSTOM_DOMAINS = new Set((process.env.CUSTOM_DOMAINS || "").split(",").map((d) => d.trim()).filter(Boolean));
+function resolveBasename(req, appId) {
+  const headerValue = req.headers["x-app-basename"];
+  if (typeof headerValue === "string" && headerValue) return headerValue;
+  if (CUSTOM_DOMAINS.size > 0 && CUSTOM_DOMAINS.has(req.hostname)) {
+    return "/";
+  }
+  return appId ? `/app/${appId}` : "/";
+}
+__name(resolveBasename, "resolveBasename");
 
 // src/middlewares/csrf_token/index.ts
 var import_common4 = require("@nestjs/common");
@@ -34946,8 +34958,7 @@ var app_config_default = (0, import_config.registerAs)(NAMESPACE, () => {
   return {
     host: process.env.SERVER_HOST ?? "localhost",
     port: Number(process.env.SERVER_PORT ?? 3e3),
-    clientBasePath: process.env.CLIENT_BASE_PATH ?? "/",
-    databaseUrl: process.env.SUDA_DATABASE_URL ?? ""
+    clientBasePath: process.env.CLIENT_BASE_PATH ?? "/"
   };
 });
 
@@ -35082,9 +35093,6 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
       ...baseConfig,
       platform: {
         enabled: true
-      },
-      preInterceptors: {
-        request: this.createClaimsPreInterceptors()
       }
     });
     this.protectedClient = new ProtectedHttpClient(this.client);
@@ -35159,10 +35167,7 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
     };
     return new import_http_client.HttpClient({
       ...mergedConfig,
-      platform: mergedPlatform,
-      preInterceptors: {
-        request: this.createClaimsPreInterceptors()
-      }
+      platform: mergedPlatform
     });
   }
   /**
@@ -35190,36 +35195,6 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
     this.registerInterceptorsForClient(client);
     return client;
   }
-  createClaimsPreInterceptors() {
-    return [
-      {
-        onFulfilled: /* @__PURE__ */ __name((config) => {
-          const userId = this.requestContext.get("userId");
-          const tenantId = this.requestContext.get("tenantId");
-          const contextClaims = {};
-          if (userId) {
-            contextClaims.user_id = userId;
-          }
-          if (tenantId) {
-            contextClaims.tenant_id = tenantId;
-          }
-          if (contextClaims.user_id === void 0 && contextClaims.tenant_id === void 0) {
-            return config;
-          }
-          return {
-            ...config,
-            platformAuth: {
-              ...config.platformAuth,
-              customClaims: {
-                ...contextClaims,
-                ...config.platformAuth?.customClaims || {}
-              }
-            }
-          };
-        }, "onFulfilled")
-      }
-    ];
-  }
   /**
   * 注册全局拦截器（用于单例实例）
   */
@@ -36374,16 +36349,13 @@ var PlatformModule = class _PlatformModule {
         ...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 appLogger = args[0];
               const drizzleLogger = {
                 logQuery(query, params) {
                   if (process.env.NODE_ENV === "development") {
@@ -36395,7 +36367,7 @@ var PlatformModule = class _PlatformModule {
                 }
               };
               return {
-                connectionString: configService.get("app.databaseUrl") ?? "",
+                connectionString: process.env.SUDA_DATABASE_URL ?? "",
                 logger: drizzleLogger,
                 connectionTokenFilePath: "/var/run/secrets/zti/credential"
               };

package/dist/index.d.cts

@@ -23,6 +23,8 @@ declare global {
         userId?: string;
         tenantId?: number;
         csrfToken?: string;
+        /** React Router basename，由 ViewContextMiddleware 注入；自定义域名场景下 = / 或 /<alias>，默认域名 = /app/<appId> */
+        basename?: string;
         [key: string]: unknown;
       };
       userContext: {
@@ -385,7 +387,6 @@ declare class PlatformHttpClientService {
      * ```
      */
     createWithGlobalInterceptors(options?: PlatformHttpClientOptions): HttpClient;
-    private createClaimsPreInterceptors;
     /**
      * 注册全局拦截器（用于单例实例）
      */

package/dist/index.d.ts

@@ -23,6 +23,8 @@ declare global {
         userId?: string;
         tenantId?: number;
         csrfToken?: string;
+        /** React Router basename，由 ViewContextMiddleware 注入；自定义域名场景下 = / 或 /<alias>，默认域名 = /app/<appId> */
+        basename?: string;
         [key: string]: unknown;
       };
       userContext: {
@@ -385,7 +387,6 @@ declare class PlatformHttpClientService {
      * ```
      */
     createWithGlobalInterceptors(options?: PlatformHttpClientOptions): HttpClient;
-    private createClaimsPreInterceptors;
     /**
      * 注册全局拦截器（用于单例实例）
      */

package/dist/index.js

@@ -5491,9 +5491,9 @@ var require_read = __commonJS({
   }
 });
 
-// ../../../node_modules/type-is/node_modules/media-typer/index.js
+// ../../../node_modules/media-typer/index.js
 var require_media_typer = __commonJS({
-  "../../../node_modules/type-is/node_modules/media-typer/index.js"(exports) {
+  "../../../node_modules/media-typer/index.js"(exports) {
     "use strict";
     var paramRegExp = /; *([!#$%&'\*\+\-\.0-9A-Z\^_`a-z\|~]+) *= *("(?:[ !\u0023-\u005b\u005d-\u007e\u0080-\u00ff]|\\[\u0020-\u007e])*"|[!#$%&'\*\+\-\.0-9A-Z\^_`a-z\|~]+) */g;
     var textRegExp = /^[\u0020-\u007e\u0080-\u00ff]+$/;
@@ -34404,7 +34404,7 @@ var require_express2 = __commonJS({
 import { Global, Module as Module3, ValidationPipe } from "@nestjs/common";
 import { APP_INTERCEPTOR, APP_PIPE } from "@nestjs/core";
 import { CommonModule, OBSERVABLE_SERVICE as OBSERVABLE_SERVICE2, HTTP_CLIENT_FACTORY } from "@lark-apaas/nestjs-common";
-import { ConfigModule, ConfigService } from "@nestjs/config";
+import { ConfigModule } from "@nestjs/config";
 import { NestjsObservableModule as ObservableModule, Observable, ObservableTraceMiddleware, TraceInterceptor } from "@lark-apaas/nestjs-observable";
 import { HttpModule } from "@nestjs/axios";
 import { LoggerModule, AppLogger as AppLogger2, LoggerContextMiddleware } from "@lark-apaas/nestjs-logger";
@@ -34624,6 +34624,7 @@ var ViewContextMiddleware = class _ViewContextMiddleware {
     const { userId, tenantId, appId, loginUrl, userType } = req.userContext;
     const csrfToken = req.csrfToken;
     const environment = mapToWindowEnvironment(process.env.FORCE_FRAMEWORK_ENVIRONMENT);
+    const basename = resolveBasename(req, appId);
     const appPublishedData = await this.getAppPublished(appId);
     const appInfo = appPublishedData?.app_info ?? null;
     req.__platform_data__ = {
@@ -34638,7 +34639,8 @@ var ViewContextMiddleware = class _ViewContextMiddleware {
       tenantId,
       environment,
       showBadge: appInfo?.show_badge !== false,
-      appPublished: appPublishedData ?? null
+      appPublished: appPublishedData ?? null,
+      basename
     };
     res.locals = {
       ...res.locals ?? {},
@@ -34672,6 +34674,16 @@ function mapToWindowEnvironment(input) {
   return "online";
 }
 __name(mapToWindowEnvironment, "mapToWindowEnvironment");
+var CUSTOM_DOMAINS = new Set((process.env.CUSTOM_DOMAINS || "").split(",").map((d) => d.trim()).filter(Boolean));
+function resolveBasename(req, appId) {
+  const headerValue = req.headers["x-app-basename"];
+  if (typeof headerValue === "string" && headerValue) return headerValue;
+  if (CUSTOM_DOMAINS.size > 0 && CUSTOM_DOMAINS.has(req.hostname)) {
+    return "/";
+  }
+  return appId ? `/app/${appId}` : "/";
+}
+__name(resolveBasename, "resolveBasename");
 
 // src/middlewares/csrf_token/index.ts
 import { Injectable as Injectable4 } from "@nestjs/common";
@@ -34919,8 +34931,7 @@ var app_config_default = registerAs(NAMESPACE, () => {
   return {
     host: process.env.SERVER_HOST ?? "localhost",
     port: Number(process.env.SERVER_PORT ?? 3e3),
-    clientBasePath: process.env.CLIENT_BASE_PATH ?? "/",
-    databaseUrl: process.env.SUDA_DATABASE_URL ?? ""
+    clientBasePath: process.env.CLIENT_BASE_PATH ?? "/"
   };
 });
 
@@ -35055,9 +35066,6 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
       ...baseConfig,
       platform: {
         enabled: true
-      },
-      preInterceptors: {
-        request: this.createClaimsPreInterceptors()
       }
     });
     this.protectedClient = new ProtectedHttpClient(this.client);
@@ -35132,10 +35140,7 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
     };
     return new HttpClient({
       ...mergedConfig,
-      platform: mergedPlatform,
-      preInterceptors: {
-        request: this.createClaimsPreInterceptors()
-      }
+      platform: mergedPlatform
     });
   }
   /**
@@ -35163,36 +35168,6 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
     this.registerInterceptorsForClient(client);
     return client;
   }
-  createClaimsPreInterceptors() {
-    return [
-      {
-        onFulfilled: /* @__PURE__ */ __name((config) => {
-          const userId = this.requestContext.get("userId");
-          const tenantId = this.requestContext.get("tenantId");
-          const contextClaims = {};
-          if (userId) {
-            contextClaims.user_id = userId;
-          }
-          if (tenantId) {
-            contextClaims.tenant_id = tenantId;
-          }
-          if (contextClaims.user_id === void 0 && contextClaims.tenant_id === void 0) {
-            return config;
-          }
-          return {
-            ...config,
-            platformAuth: {
-              ...config.platformAuth,
-              customClaims: {
-                ...contextClaims,
-                ...config.platformAuth?.customClaims || {}
-              }
-            }
-          };
-        }, "onFulfilled")
-      }
-    ];
-  }
   /**
   * 注册全局拦截器（用于单例实例）
   */
@@ -36347,16 +36322,13 @@ var PlatformModule = class _PlatformModule {
         ...DISABLE_DATAPASS ? [] : [
           DataPaasModule.forRootAsync({
             imports: [
-              ConfigModule,
               LoggerModule
             ],
             inject: [
-              ConfigService,
               AppLogger2
             ],
             useFactory: /* @__PURE__ */ __name(async (...args) => {
-              const configService = args[0];
-              const appLogger = args[1];
+              const appLogger = args[0];
               const drizzleLogger = {
                 logQuery(query, params) {
                   if (process.env.NODE_ENV === "development") {
@@ -36368,7 +36340,7 @@ var PlatformModule = class _PlatformModule {
                 }
               };
               return {
-                connectionString: configService.get("app.databaseUrl") ?? "",
+                connectionString: process.env.SUDA_DATABASE_URL ?? "",
                 logger: drizzleLogger,
                 connectionTokenFilePath: "/var/run/secrets/zti/credential"
               };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-nestjs-core",
-  "version": "1.1.48-alpha.11",
+  "version": "1.1.48-alpha.13",
   "description": "FullStack Nestjs Core",
   "type": "module",
   "main": "./dist/index.js",
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@lark-apaas/file-service": "^0.1.2",
-    "@lark-apaas/http-client": "0.1.6-alpha.1",
+    "@lark-apaas/http-client": "^0.1.5",
     "@lark-apaas/nestjs-authnpaas": "^1.0.3",
     "@lark-apaas/nestjs-authzpaas": "^0.1.8",
     "@lark-apaas/nestjs-capability": "^0.1.13",