@cloudbase/manager-node 4.2.1 → 4.2.3

package/lib/function/index.js

@@ -146,6 +146,9 @@ class FunctionService {
             functionPath,
             functionRootPath
         }, params.InstallDependency);
+        const { TopicId, LogsetId } = this.getClsServiceConfig();
+        params.ClsTopicId = TopicId;
+        params.ClsLogsetId = LogsetId;
         try {
             // 创建云函数
             const res = await this.scfService.request('CreateFunction', params);
@@ -854,6 +857,19 @@ class FunctionService {
             env: envConfig.EnvId
         };
     }
+    /**
+     * 获取日志cls配置信息
+     */
+    getClsServiceConfig() {
+        var _a, _b;
+        const currentEnv = this.environment.lazyEnvironmentConfig;
+        const customLogServices = (_a = currentEnv === null || currentEnv === void 0 ? void 0 : currentEnv.CustomLogServices) === null || _a === void 0 ? void 0 : _a[0];
+        const logServices = (_b = currentEnv === null || currentEnv === void 0 ? void 0 : currentEnv.LogServices) === null || _b === void 0 ? void 0 : _b[0];
+        return {
+            TopicId: (customLogServices === null || customLogServices === void 0 ? void 0 : customLogServices.ClsTopicId) || (logServices === null || logServices === void 0 ? void 0 : logServices.TopicId),
+            LogsetId: (customLogServices === null || customLogServices === void 0 ? void 0 : customLogServices.ClsLogsetId) || (logServices === null || logServices === void 0 ? void 0 : logServices.LogsetId)
+        };
+    }
     /**
      * 获取 vpc 信息
      * @returns

package/lib/storage/index.js

@@ -839,13 +839,14 @@ class StorageService {
     getCos(parallel = 20) {
         const { secretId, secretKey, token, proxy } = this.environment.getAuthConfig();
         const cosProxy = process.env.TCB_COS_PROXY;
-        return new cos_nodejs_sdk_v5_1.default({
-            FileParallelLimit: parallel,
-            SecretId: secretId,
-            SecretKey: secretKey,
-            Proxy: cosProxy || proxy,
-            SecurityToken: token
-        });
+        const useCosInternalDomain = !!process.env.USE_COS_INTERNAL_DOMAIN;
+        return new cos_nodejs_sdk_v5_1.default(Object.assign({ FileParallelLimit: parallel, SecretId: secretId, SecretKey: secretKey, Proxy: cosProxy || proxy, SecurityToken: token }, (useCosInternalDomain
+            ? {
+                Domain: '{Bucket}.cos-internal.{Region}.tencentcos.cn',
+                ServiceDomain: 'service.cos.tencentcos.cn',
+                Protocol: 'http:'
+            }
+            : {})));
     }
     /**
      * 将 cloudPath 转换成 cloudPath/ 形式
@@ -919,7 +920,8 @@ class StorageService {
                         times: times - 1,
                         interval,
                         failedFiles: tempFailedFiles
-                    }).then(res => resolve(res))
+                    })
+                        .then(res => resolve(res))
                         .catch(err => reject(err)), interval);
                 });
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/manager-node",
-    "version": "4.2.1",
+    "version": "4.2.3",
     "description": "The node manage service api for cloudbase.",
     "main": "lib/index.js",
     "scripts": {

package/src/function/index.ts

@@ -165,7 +165,6 @@ export interface IPublishVersionRes extends IResponseInfo {
     Namespace: string
 }
 
-
 export interface IListFunctionVersionParams {
     functionName: string
     offset?: number
@@ -398,6 +397,10 @@ export class FunctionService {
             params.InstallDependency
         )
 
+        const { TopicId, LogsetId } = this.getClsServiceConfig()
+        params.ClsTopicId = TopicId
+        params.ClsLogsetId = LogsetId
+
         try {
             // 创建云函数
             const res = await this.scfService.request<IResponseInfo | ICreateFunctionRes>(
@@ -1296,6 +1299,19 @@ export class FunctionService {
         }
     }
 
+    /**
+     * 获取日志cls配置信息
+     */
+    private getClsServiceConfig() {
+        const currentEnv = this.environment.lazyEnvironmentConfig
+        const customLogServices = currentEnv?.CustomLogServices?.[0]
+        const logServices = currentEnv?.LogServices?.[0]
+        return {
+            TopicId: customLogServices?.ClsTopicId || logServices?.TopicId,
+            LogsetId: customLogServices?.ClsLogsetId || logServices?.LogsetId
+        }
+    }
+
     /**
      * 获取 vpc 信息
      * @returns

package/src/function/types.ts

@@ -139,7 +139,6 @@ export interface IFunctionCode {
     ZipFile: string
 }
 
-
 export interface ILayerVersionItem {
     LayerName: string
     LayerVersion: number
@@ -161,4 +160,6 @@ export interface IFunctionUpdateAttribute {
         EipConfig: { EipStatus: string; EipAddress: string[] }
     }
     Layers?: ILayerVersionItem[]
+    ClsLogsetId?: string
+    ClsTopicId?: string
 }

package/src/interfaces/tcb.interface.ts

@@ -248,6 +248,12 @@ export interface EnvInfo {
     PackageName: string
     // 云日志服务列表
     LogServices: LogServiceInfo[]
+    CustomLogServices: {
+        CreateTime: string
+        ClsLogsetId: string
+        ClsTopicId: string
+        ClsRegion: string
+    }[]
 }
 export interface FunctionInfo {
     // 命名空间

package/src/storage/index.ts

@@ -1137,13 +1137,21 @@ export class StorageService {
     private getCos(parallel = 20) {
         const { secretId, secretKey, token, proxy } = this.environment.getAuthConfig()
         const cosProxy = process.env.TCB_COS_PROXY
+        const useCosInternalDomain = !!process.env.USE_COS_INTERNAL_DOMAIN
 
         return new COS({
             FileParallelLimit: parallel,
             SecretId: secretId,
             SecretKey: secretKey,
             Proxy: cosProxy || proxy,
-            SecurityToken: token
+            SecurityToken: token,
+            ...(useCosInternalDomain
+                ? {
+                    Domain: '{Bucket}.cos-internal.{Region}.tencentcos.cn',
+                    ServiceDomain: 'service.cos.tencentcos.cn',
+                    Protocol: 'http:'
+                }
+                : {})
         })
     }
 
@@ -1229,7 +1237,8 @@ export class StorageService {
                                 times: times - 1,
                                 interval,
                                 failedFiles: tempFailedFiles
-                            }).then(res => resolve(res))
+                            })
+                                .then(res => resolve(res))
                                 .catch(err => reject(err)),
                         interval
                     )

package/types/function/index.d.ts

@@ -360,6 +360,10 @@ export declare class FunctionService {
      * @memberof FunctionService
      */
     private getFunctionConfig;
+    /**
+     * 获取日志cls配置信息
+     */
+    private getClsServiceConfig;
     /**
      * 获取 vpc 信息
      * @returns

package/types/function/types.d.ts

@@ -151,4 +151,6 @@ export interface IFunctionUpdateAttribute {
         };
     };
     Layers?: ILayerVersionItem[];
+    ClsLogsetId?: string;
+    ClsTopicId?: string;
 }

package/types/interfaces/tcb.interface.d.ts

@@ -119,6 +119,12 @@ export interface EnvInfo {
     PackageId: string;
     PackageName: string;
     LogServices: LogServiceInfo[];
+    CustomLogServices: {
+        CreateTime: string;
+        ClsLogsetId: string;
+        ClsTopicId: string;
+        ClsRegion: string;
+    }[];
 }
 export interface FunctionInfo {
     Namespace?: string;