@lark-apaas/fullstack-nestjs-core 1.1.47 → 1.1.48-alpha.1

package/dist/index.cjs

@@ -34946,7 +34946,8 @@ 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 ?? "/"
+    clientBasePath: process.env.CLIENT_BASE_PATH ?? "/",
+    databaseUrl: process.env.SUDA_DATABASE_URL ?? ""
   };
 });
 
@@ -35072,6 +35073,9 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
   client;
   protectedClient;
   logger = new import_common8.Logger(_PlatformHttpClientService.name);
+  defaultPlatformConfig = {
+    enabled: true
+  };
   constructor(requestContext) {
     this.requestContext = requestContext;
     const baseConfig = {
@@ -35079,12 +35083,11 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
     };
     this.client = new import_http_client.HttpClient({
       ...baseConfig,
-      platform: {
-        enabled: true
-      }
+      baseURL: (0, import_http_client.resolvePlatformBaseURL)(this.defaultPlatformConfig)
     });
     this.protectedClient = new ProtectedHttpClient(this.client);
     this.registerGlobalInterceptors();
+    this.registerPlatformPluginForClient(this.client, this.defaultPlatformConfig);
   }
   /**
   * 获取受保护的 HttpClient 实例（推荐）
@@ -35150,13 +35153,10 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
       ...options?.config
     };
     const mergedPlatform = {
-      enabled: true,
+      ...this.defaultPlatformConfig,
       ...options?.platform
     };
-    return new import_http_client.HttpClient({
-      ...mergedConfig,
-      platform: mergedPlatform
-    });
+    return this.createClientWithPlatform(mergedConfig, mergedPlatform);
   }
   /**
   * 创建一个带全局拦截器的独立 HttpClient 实例
@@ -35189,6 +35189,17 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
   registerGlobalInterceptors() {
     this.registerInterceptorsForClient(this.client);
   }
+  createClientWithPlatform(config, platform) {
+    const client = new import_http_client.HttpClient({
+      ...config,
+      baseURL: (0, import_http_client.resolvePlatformBaseURL)(platform)
+    });
+    this.registerPlatformPluginForClient(client, platform);
+    return client;
+  }
+  registerPlatformPluginForClient(client, platform) {
+    (0, import_http_client.registerPlatformPlugin)(client.interceptors, platform);
+  }
   /**
   * 为指定的 HttpClient 实例注册标准拦截器
   *
@@ -35208,6 +35219,30 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
           "x-tt-env": ttEnv
         };
       }
+      const userIdRaw = this.requestContext.get("userId");
+      const tenantIdRaw = this.requestContext.get("tenantId");
+      const contextClaims = {};
+      if (userIdRaw !== void 0 && userIdRaw !== "") {
+        const userIdNum = typeof userIdRaw === "number" ? userIdRaw : Number(userIdRaw);
+        if (Number.isFinite(userIdNum)) {
+          contextClaims.user_id = userIdNum;
+        }
+      }
+      if (tenantIdRaw !== void 0 && tenantIdRaw !== "") {
+        const tenantIdNum = typeof tenantIdRaw === "number" ? tenantIdRaw : Number(tenantIdRaw);
+        if (Number.isFinite(tenantIdNum)) {
+          contextClaims.tenant_id = tenantIdNum;
+        }
+      }
+      if (contextClaims.user_id !== void 0 || contextClaims.tenant_id !== void 0) {
+        config.platformAuth = {
+          ...config.platformAuth,
+          customClaims: {
+            ...contextClaims,
+            ...config.platformAuth?.customClaims || {}
+          }
+        };
+      }
       return config;
     }, (error) => {
       this.logger.error("Server SDK HTTP Request Error", error, "HttpService");
@@ -36337,13 +36372,16 @@ 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 appLogger = args[0];
+              const configService = args[0];
+              const appLogger = args[1];
               const drizzleLogger = {
                 logQuery(query, params) {
                   if (process.env.NODE_ENV === "development") {
@@ -36355,7 +36393,7 @@ var PlatformModule = class _PlatformModule {
                 }
               };
               return {
-                connectionString: process.env.SUDA_DATABASE_URL ?? "",
+                connectionString: configService.get("app.databaseUrl") ?? "",
                 logger: drizzleLogger,
                 connectionTokenFilePath: "/var/run/secrets/zti/credential"
               };

package/dist/index.d.cts

@@ -308,6 +308,7 @@ declare class PlatformHttpClientService {
     private readonly client;
     private readonly protectedClient;
     private readonly logger;
+    private readonly defaultPlatformConfig;
     constructor(requestContext: RequestContextService);
     /**
      * 获取受保护的 HttpClient 实例（推荐）
@@ -389,6 +390,8 @@ declare class PlatformHttpClientService {
      * 注册全局拦截器（用于单例实例）
      */
     private registerGlobalInterceptors;
+    private createClientWithPlatform;
+    private registerPlatformPluginForClient;
     /**
      * 为指定的 HttpClient 实例注册标准拦截器
      *

package/dist/index.d.ts

@@ -308,6 +308,7 @@ declare class PlatformHttpClientService {
     private readonly client;
     private readonly protectedClient;
     private readonly logger;
+    private readonly defaultPlatformConfig;
     constructor(requestContext: RequestContextService);
     /**
      * 获取受保护的 HttpClient 实例（推荐）
@@ -389,6 +390,8 @@ declare class PlatformHttpClientService {
      * 注册全局拦截器（用于单例实例）
      */
     private registerGlobalInterceptors;
+    private createClientWithPlatform;
+    private registerPlatformPluginForClient;
     /**
      * 为指定的 HttpClient 实例注册标准拦截器
      *

package/dist/index.js

@@ -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 } from "@nestjs/config";
+import { ConfigModule, ConfigService } 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";
@@ -34919,7 +34919,8 @@ 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 ?? "/"
+    clientBasePath: process.env.CLIENT_BASE_PATH ?? "/",
+    databaseUrl: process.env.SUDA_DATABASE_URL ?? ""
   };
 });
 
@@ -34997,7 +34998,7 @@ FrameworkDebugMiddleware = _ts_decorate7([
 
 // src/services/platform-http-client.service.ts
 import { Injectable as Injectable8, Logger as Logger2 } from "@nestjs/common";
-import { HttpClient } from "@lark-apaas/http-client";
+import { HttpClient, registerPlatformPlugin, resolvePlatformBaseURL } from "@lark-apaas/http-client";
 import { RequestContextService as RequestContextService2 } from "@lark-apaas/nestjs-common";
 function _ts_decorate8(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -35045,6 +35046,9 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
   client;
   protectedClient;
   logger = new Logger2(_PlatformHttpClientService.name);
+  defaultPlatformConfig = {
+    enabled: true
+  };
   constructor(requestContext) {
     this.requestContext = requestContext;
     const baseConfig = {
@@ -35052,12 +35056,11 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
     };
     this.client = new HttpClient({
       ...baseConfig,
-      platform: {
-        enabled: true
-      }
+      baseURL: resolvePlatformBaseURL(this.defaultPlatformConfig)
     });
     this.protectedClient = new ProtectedHttpClient(this.client);
     this.registerGlobalInterceptors();
+    this.registerPlatformPluginForClient(this.client, this.defaultPlatformConfig);
   }
   /**
   * 获取受保护的 HttpClient 实例（推荐）
@@ -35123,13 +35126,10 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
       ...options?.config
     };
     const mergedPlatform = {
-      enabled: true,
+      ...this.defaultPlatformConfig,
       ...options?.platform
     };
-    return new HttpClient({
-      ...mergedConfig,
-      platform: mergedPlatform
-    });
+    return this.createClientWithPlatform(mergedConfig, mergedPlatform);
   }
   /**
   * 创建一个带全局拦截器的独立 HttpClient 实例
@@ -35162,6 +35162,17 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
   registerGlobalInterceptors() {
     this.registerInterceptorsForClient(this.client);
   }
+  createClientWithPlatform(config, platform) {
+    const client = new HttpClient({
+      ...config,
+      baseURL: resolvePlatformBaseURL(platform)
+    });
+    this.registerPlatformPluginForClient(client, platform);
+    return client;
+  }
+  registerPlatformPluginForClient(client, platform) {
+    registerPlatformPlugin(client.interceptors, platform);
+  }
   /**
   * 为指定的 HttpClient 实例注册标准拦截器
   *
@@ -35181,6 +35192,30 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
           "x-tt-env": ttEnv
         };
       }
+      const userIdRaw = this.requestContext.get("userId");
+      const tenantIdRaw = this.requestContext.get("tenantId");
+      const contextClaims = {};
+      if (userIdRaw !== void 0 && userIdRaw !== "") {
+        const userIdNum = typeof userIdRaw === "number" ? userIdRaw : Number(userIdRaw);
+        if (Number.isFinite(userIdNum)) {
+          contextClaims.user_id = userIdNum;
+        }
+      }
+      if (tenantIdRaw !== void 0 && tenantIdRaw !== "") {
+        const tenantIdNum = typeof tenantIdRaw === "number" ? tenantIdRaw : Number(tenantIdRaw);
+        if (Number.isFinite(tenantIdNum)) {
+          contextClaims.tenant_id = tenantIdNum;
+        }
+      }
+      if (contextClaims.user_id !== void 0 || contextClaims.tenant_id !== void 0) {
+        config.platformAuth = {
+          ...config.platformAuth,
+          customClaims: {
+            ...contextClaims,
+            ...config.platformAuth?.customClaims || {}
+          }
+        };
+      }
       return config;
     }, (error) => {
       this.logger.error("Server SDK HTTP Request Error", error, "HttpService");
@@ -36310,13 +36345,16 @@ var PlatformModule = class _PlatformModule {
         ...DISABLE_DATAPASS ? [] : [
           DataPaasModule.forRootAsync({
             imports: [
+              ConfigModule,
               LoggerModule
             ],
             inject: [
+              ConfigService,
               AppLogger2
             ],
             useFactory: /* @__PURE__ */ __name(async (...args) => {
-              const appLogger = args[0];
+              const configService = args[0];
+              const appLogger = args[1];
               const drizzleLogger = {
                 logQuery(query, params) {
                   if (process.env.NODE_ENV === "development") {
@@ -36328,7 +36366,7 @@ var PlatformModule = class _PlatformModule {
                 }
               };
               return {
-                connectionString: process.env.SUDA_DATABASE_URL ?? "",
+                connectionString: configService.get("app.databaseUrl") ?? "",
                 logger: drizzleLogger,
                 connectionTokenFilePath: "/var/run/secrets/zti/credential"
               };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-nestjs-core",
-  "version": "1.1.47",
+  "version": "1.1.48-alpha.1",
   "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.5",
+    "@lark-apaas/http-client": "0.1.6-alpha.0",
     "@lark-apaas/nestjs-authnpaas": "^1.0.3",
     "@lark-apaas/nestjs-authzpaas": "^0.1.8",
     "@lark-apaas/nestjs-capability": "^0.1.13",