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

package/dist/index.cjs

@@ -35073,9 +35073,6 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
   client;
   protectedClient;
   logger = new import_common8.Logger(_PlatformHttpClientService.name);
-  defaultPlatformConfig = {
-    enabled: true
-  };
   constructor(requestContext) {
     this.requestContext = requestContext;
     const baseConfig = {
@@ -35083,11 +35080,15 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
     };
     this.client = new import_http_client.HttpClient({
       ...baseConfig,
-      baseURL: (0, import_http_client.resolvePlatformBaseURL)(this.defaultPlatformConfig)
+      platform: {
+        enabled: true
+      },
+      preInterceptors: {
+        request: this.createClaimsPreInterceptors()
+      }
     });
     this.protectedClient = new ProtectedHttpClient(this.client);
     this.registerGlobalInterceptors();
-    this.registerPlatformPluginForClient(this.client, this.defaultPlatformConfig);
   }
   /**
   * 获取受保护的 HttpClient 实例（推荐）
@@ -35153,10 +35154,16 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
       ...options?.config
     };
     const mergedPlatform = {
-      ...this.defaultPlatformConfig,
+      enabled: true,
       ...options?.platform
     };
-    return this.createClientWithPlatform(mergedConfig, mergedPlatform);
+    return new import_http_client.HttpClient({
+      ...mergedConfig,
+      platform: mergedPlatform,
+      preInterceptors: {
+        request: this.createClaimsPreInterceptors()
+      }
+    });
   }
   /**
   * 创建一个带全局拦截器的独立 HttpClient 实例
@@ -35183,23 +35190,42 @@ 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")
+      }
+    ];
+  }
   /**
   * 注册全局拦截器（用于单例实例）
   */
   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 实例注册标准拦截器
   *
@@ -35219,30 +35245,6 @@ 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");

package/dist/index.d.cts

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

package/dist/index.d.ts

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

package/dist/index.js

@@ -34998,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, registerPlatformPlugin, resolvePlatformBaseURL } from "@lark-apaas/http-client";
+import { HttpClient } 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;
@@ -35046,9 +35046,6 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
   client;
   protectedClient;
   logger = new Logger2(_PlatformHttpClientService.name);
-  defaultPlatformConfig = {
-    enabled: true
-  };
   constructor(requestContext) {
     this.requestContext = requestContext;
     const baseConfig = {
@@ -35056,11 +35053,15 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
     };
     this.client = new HttpClient({
       ...baseConfig,
-      baseURL: resolvePlatformBaseURL(this.defaultPlatformConfig)
+      platform: {
+        enabled: true
+      },
+      preInterceptors: {
+        request: this.createClaimsPreInterceptors()
+      }
     });
     this.protectedClient = new ProtectedHttpClient(this.client);
     this.registerGlobalInterceptors();
-    this.registerPlatformPluginForClient(this.client, this.defaultPlatformConfig);
   }
   /**
   * 获取受保护的 HttpClient 实例（推荐）
@@ -35126,10 +35127,16 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
       ...options?.config
     };
     const mergedPlatform = {
-      ...this.defaultPlatformConfig,
+      enabled: true,
       ...options?.platform
     };
-    return this.createClientWithPlatform(mergedConfig, mergedPlatform);
+    return new HttpClient({
+      ...mergedConfig,
+      platform: mergedPlatform,
+      preInterceptors: {
+        request: this.createClaimsPreInterceptors()
+      }
+    });
   }
   /**
   * 创建一个带全局拦截器的独立 HttpClient 实例
@@ -35156,23 +35163,42 @@ 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")
+      }
+    ];
+  }
   /**
   * 注册全局拦截器（用于单例实例）
   */
   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 实例注册标准拦截器
   *
@@ -35192,30 +35218,6 @@ 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");

package/package.json

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