@lark-apaas/fullstack-nestjs-core 1.1.48-alpha.12 → 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]+$/;
@@ -34437,7 +34437,6 @@ var import_axios2 = require("@nestjs/axios");
 var import_nestjs_logger2 = 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_http_forwarder = require("@lark-apaas/nestjs-http-forwarder");
 var import_nestjs_trigger = require("@lark-apaas/nestjs-trigger");
 var import_nestjs_common7 = require("@lark-apaas/nestjs-common");
 var import_nestjs_capability = require("@lark-apaas/nestjs-capability");
@@ -34652,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__ = {
@@ -34666,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 ?? {},
@@ -34700,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");
@@ -34947,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 ?? "/"
   };
 });
 
@@ -36339,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") {
@@ -36360,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"
               };
@@ -36372,9 +36379,6 @@ var PlatformModule = class _PlatformModule {
           ...options.authz || {}
         }),
         import_nestjs_trigger.AutomationModule.forRoot(),
-        // 通用内网转发：自动注册 ALL /api/sdk_innerapi/anycross/forward?targetUrl=...
-        // 业务方接入 PlatformModule 后零改动获得内网代理路由
-        import_nestjs_http_forwarder.HttpForwarderModule.forRoot(options.httpForwarder),
         import_nestjs_capability.CapabilityModule.forRoot({
           capabilitiesDir: options.capabilitiesDir,
           enableWatching: process.env.NODE_ENV === "development"

package/dist/index.d.cts

@@ -2,7 +2,6 @@ import { NestModule, DynamicModule, MiddlewareConsumer, OnModuleInit, NestMiddle
 import { HttpClientConfig, PlatformPluginOptions, HttpClient } from '@lark-apaas/http-client';
 import { AuthZPaasModuleOptions } from '@lark-apaas/nestjs-authzpaas';
 export { AddMembersParams, AuthZPaasModule, AuthorizationSDK, Can, CanRole, ChatSimpleDTO, CommonParam, CreateRoleParams, CreateRoleResponse, DepartmentDTO, DepartmentEntity, DepartmentSimpleDTO, FilterParams, ForceRoleDTO, I18nText, IPermissionResolver, ListMembersParams, ListMembersResponse, ListRolesParams, MemberMutationData, MemberType, PERMISSION_RESOLVER_TOKEN, PermissionPoint, PermissionRequirement, PresetGroupDTO, RemoveMembersParams, RoleMemberDTO, SearchChatEntity, SearchParams, SearchResponse, SearchResult, SearchUserEntity, UpdateRoleParams, UserSimpleDTO } from '@lark-apaas/nestjs-authzpaas';
-import { HttpForwarderModuleOptions } from '@lark-apaas/nestjs-http-forwarder';
 import { NestExpressApplication } from '@nestjs/platform-express';
 import { PlatformHttpClient, RequestContextService, ObservableService } from '@lark-apaas/nestjs-common';
 export { AutoTrace } from '@lark-apaas/nestjs-common';
@@ -24,6 +23,8 @@ declare global {
         userId?: string;
         tenantId?: number;
         csrfToken?: string;
+        /** React Router basename，由 ViewContextMiddleware 注入；自定义域名场景下 = / 或 /<alias>，默认域名 = /app/<appId> */
+        basename?: string;
         [key: string]: unknown;
       };
       userContext: {
@@ -79,12 +80,6 @@ interface PlatformModuleOptions {
      * 可传入 permissionResolver 等选项，透传给 AuthZPaasModule.forRoot()
      */
     authz?: AuthZPaasModuleOptions;
-    /**
-     * HttpForwarder 模块配置（默认自动启用，注册 ALL /api/sdk_innerapi/anycross/forward 路由）
-     * 透传给 HttpForwarderModule.forRoot()；不传则使用模块默认值
-     * （requestTimeoutMs=30s, maxResponseBytes=10MB）。
-     */
-    httpForwarder?: HttpForwarderModuleOptions;
 }
 
 declare class PlatformModule implements NestModule {

package/dist/index.d.ts

@@ -2,7 +2,6 @@ import { NestModule, DynamicModule, MiddlewareConsumer, OnModuleInit, NestMiddle
 import { HttpClientConfig, PlatformPluginOptions, HttpClient } from '@lark-apaas/http-client';
 import { AuthZPaasModuleOptions } from '@lark-apaas/nestjs-authzpaas';
 export { AddMembersParams, AuthZPaasModule, AuthorizationSDK, Can, CanRole, ChatSimpleDTO, CommonParam, CreateRoleParams, CreateRoleResponse, DepartmentDTO, DepartmentEntity, DepartmentSimpleDTO, FilterParams, ForceRoleDTO, I18nText, IPermissionResolver, ListMembersParams, ListMembersResponse, ListRolesParams, MemberMutationData, MemberType, PERMISSION_RESOLVER_TOKEN, PermissionPoint, PermissionRequirement, PresetGroupDTO, RemoveMembersParams, RoleMemberDTO, SearchChatEntity, SearchParams, SearchResponse, SearchResult, SearchUserEntity, UpdateRoleParams, UserSimpleDTO } from '@lark-apaas/nestjs-authzpaas';
-import { HttpForwarderModuleOptions } from '@lark-apaas/nestjs-http-forwarder';
 import { NestExpressApplication } from '@nestjs/platform-express';
 import { PlatformHttpClient, RequestContextService, ObservableService } from '@lark-apaas/nestjs-common';
 export { AutoTrace } from '@lark-apaas/nestjs-common';
@@ -24,6 +23,8 @@ declare global {
         userId?: string;
         tenantId?: number;
         csrfToken?: string;
+        /** React Router basename，由 ViewContextMiddleware 注入；自定义域名场景下 = / 或 /<alias>，默认域名 = /app/<appId> */
+        basename?: string;
         [key: string]: unknown;
       };
       userContext: {
@@ -79,12 +80,6 @@ interface PlatformModuleOptions {
      * 可传入 permissionResolver 等选项，透传给 AuthZPaasModule.forRoot()
      */
     authz?: AuthZPaasModuleOptions;
-    /**
-     * HttpForwarder 模块配置（默认自动启用，注册 ALL /api/sdk_innerapi/anycross/forward 路由）
-     * 透传给 HttpForwarderModule.forRoot()；不传则使用模块默认值
-     * （requestTimeoutMs=30s, maxResponseBytes=10MB）。
-     */
-    httpForwarder?: HttpForwarderModuleOptions;
 }
 
 declare class PlatformModule implements NestModule {

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,13 +34404,12 @@ 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";
 import { DataPaasModule, SqlExecutionContextMiddleware } from "@lark-apaas/nestjs-datapaas";
 import { AuthNPaasModule } from "@lark-apaas/nestjs-authnpaas";
-import { HttpForwarderModule } from "@lark-apaas/nestjs-http-forwarder";
 import { AutomationModule } from "@lark-apaas/nestjs-trigger";
 import { PLATFORM_HTTP_CLIENT as PLATFORM_HTTP_CLIENT4 } from "@lark-apaas/nestjs-common";
 import { CapabilityModule } from "@lark-apaas/nestjs-capability";
@@ -34625,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__ = {
@@ -34639,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 ?? {},
@@ -34673,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";
@@ -34920,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 ?? "/"
   };
 });
 
@@ -36312,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") {
@@ -36333,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"
               };
@@ -36345,9 +36352,6 @@ var PlatformModule = class _PlatformModule {
           ...options.authz || {}
         }),
         AutomationModule.forRoot(),
-        // 通用内网转发：自动注册 ALL /api/sdk_innerapi/anycross/forward?targetUrl=...
-        // 业务方接入 PlatformModule 后零改动获得内网代理路由
-        HttpForwarderModule.forRoot(options.httpForwarder),
         CapabilityModule.forRoot({
           capabilitiesDir: options.capabilitiesDir,
           enableWatching: process.env.NODE_ENV === "development"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-nestjs-core",
-  "version": "1.1.48-alpha.12",
+  "version": "1.1.48-alpha.13",
   "description": "FullStack Nestjs Core",
   "type": "module",
   "main": "./dist/index.js",
@@ -46,7 +46,6 @@
     "@lark-apaas/nestjs-capability": "^0.1.13",
     "@lark-apaas/nestjs-common": "^0.1.8",
     "@lark-apaas/nestjs-datapaas": "^1.0.19",
-    "@lark-apaas/nestjs-http-forwarder": "0.1.3-alpha.3",
     "@lark-apaas/nestjs-logger": "^1.0.16",
     "@lark-apaas/nestjs-observable": "^0.0.11",
     "@lark-apaas/nestjs-openapi-devtools": "^1.0.10",