@cloudbase/manager-node 4.6.6-beta.0 → 4.6.7-beta.0

package/lib/context.js

@@ -1,14 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CloudBaseContext = void 0;
+const constant_1 = require("./constant");
 class CloudBaseContext {
-    constructor({ secretId = '', secretKey = '', token = '', proxy = '', region = '', envType = '' }) {
+    constructor({ secretId = '', secretKey = '', token = '', proxy = '', region = '', envType = '', useInternalEndpoint = undefined }) {
         this.secretId = secretId;
         this.secretKey = secretKey;
         this.token = token;
         this.proxy = proxy;
         this.region = region;
         this.envType = envType;
+        this.useInternalEndpoint = useInternalEndpoint;
+    }
+    isInternalEndpoint() {
+        return this.useInternalEndpoint !== undefined ? this.useInternalEndpoint : constant_1.USE_INTERNAL_ENDPOINT;
     }
 }
 exports.CloudBaseContext = CloudBaseContext;

package/lib/env/index.js

@@ -280,19 +280,20 @@ class EnvService {
         });
     }
     getCos() {
+        const internalEndpoint = this.environment.cloudBaseContext.isInternalEndpoint();
         const { secretId, secretKey, token } = this.environment.getAuthConfig();
         const cosConfig = {
             SecretId: secretId,
             SecretKey: secretKey,
             SecurityToken: token,
-            Domain: constant_1.USE_INTERNAL_ENDPOINT ? "{Bucket}.cos-internal.{Region}.tencentcos.cn" /* COS_ENDPOINT.INTERNAL */ : "{Bucket}.cos.{Region}.tencentcos.cn" /* COS_ENDPOINT.PUBLIC */,
+            Domain: internalEndpoint ? "{Bucket}.cos-internal.{Region}.tencentcos.cn" /* COS_ENDPOINT.INTERNAL */ : "{Bucket}.cos.{Region}.tencentcos.cn" /* COS_ENDPOINT.PUBLIC */,
         };
         if (constant_1.COS_SDK_PROTOCOL) {
             cosConfig.Protocol = (constant_1.COS_SDK_PROTOCOL.endsWith(':')
                 ? constant_1.COS_SDK_PROTOCOL.toLowerCase()
                 : constant_1.COS_SDK_PROTOCOL.toLowerCase() + ':');
         }
-        if (constant_1.USE_INTERNAL_ENDPOINT) {
+        if (internalEndpoint) {
             cosConfig.Protocol = 'http:';
         }
         return new cos_nodejs_sdk_v5_1.default(cosConfig);

package/lib/index.js

@@ -18,7 +18,7 @@ class CloudBase {
     }
     constructor(config = {}) {
         this.cloudBaseConfig = {};
-        let { secretId, secretKey, token, envId, proxy, region, envType } = config;
+        let { secretId, secretKey, token, envId, proxy, region, envType, useInternalEndpoint } = config;
         // config 中传入的 secretId secretkey 必须同时存在
         if ((secretId && !secretKey) || (!secretId && secretKey)) {
             throw new Error('secretId and secretKey must be a pair');
@@ -30,7 +30,8 @@ class CloudBase {
             envId,
             envType,
             proxy,
-            region
+            region,
+            useInternalEndpoint
         };
         // 初始化 context
         this.context = new context_1.CloudBaseContext(this.cloudBaseConfig);
@@ -85,5 +86,8 @@ class CloudBase {
     getManagerConfig() {
         return this.cloudBaseConfig;
     }
+    get isInternalEndpoint() {
+        return this.context.isInternalEndpoint();
+    }
 }
 module.exports = CloudBase;

package/lib/storage/index.js

@@ -838,6 +838,7 @@ class StorageService {
      * 获取 COS 配置
      */
     getCos(parallel = 20) {
+        const internalEndpoint = this.environment.cloudBaseContext.isInternalEndpoint();
         const { secretId, secretKey, token, proxy } = this.environment.getAuthConfig();
         const cosProxy = process.env.TCB_COS_PROXY;
         const cosConfig = {
@@ -846,14 +847,14 @@ class StorageService {
             SecretKey: secretKey,
             Proxy: cosProxy || proxy,
             SecurityToken: token,
-            Domain: constant_1.USE_INTERNAL_ENDPOINT ? "{Bucket}.cos-internal.{Region}.tencentcos.cn" /* COS_ENDPOINT.INTERNAL */ : "{Bucket}.cos.{Region}.tencentcos.cn" /* COS_ENDPOINT.PUBLIC */,
+            Domain: internalEndpoint ? "{Bucket}.cos-internal.{Region}.tencentcos.cn" /* COS_ENDPOINT.INTERNAL */ : "{Bucket}.cos.{Region}.tencentcos.cn" /* COS_ENDPOINT.PUBLIC */,
         };
         if (constant_1.COS_SDK_PROTOCOL) {
             cosConfig.Protocol = (constant_1.COS_SDK_PROTOCOL.endsWith(':')
                 ? constant_1.COS_SDK_PROTOCOL.toLowerCase()
                 : constant_1.COS_SDK_PROTOCOL.toLowerCase() + ':');
         }
-        if (constant_1.USE_INTERNAL_ENDPOINT) {
+        if (internalEndpoint) {
             cosConfig.Protocol = 'http:';
         }
         // COSSDK 默认开启 KeepAlive，这里提供关闭的方式

package/lib/utils/cloud-api-request.js

@@ -61,6 +61,7 @@ class CloudService {
         this.cloudBaseContext = context;
     }
     get baseUrl() {
+        const internalEndpoint = this.cloudBaseContext.isInternalEndpoint();
         const tcb = process.env.TCB_BASE_URL || 'https://tcb.tencentcloudapi.com';
         const urlMap = {
             tcb,
@@ -74,7 +75,7 @@ class CloudService {
         const intranetUrlMap = Object.keys(urlMap).map((service) => ({
             [service]: `https://${service}.internal.tencentcloudapi.com`,
         })).reduce((acc, cur) => (Object.assign(Object.assign({}, acc), cur)), {});
-        if (constant_1.USE_INTERNAL_ENDPOINT) {
+        if (internalEndpoint) {
             return intranetUrlMap[this.service];
         }
         if (urlMap[this.service]) {

package/package.json

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

package/types/context.d.ts

@@ -6,12 +6,15 @@ export declare class CloudBaseContext {
     readonly envId: string;
     readonly region: string;
     readonly envType: string;
-    constructor({ secretId, secretKey, token, proxy, region, envType }: {
+    readonly useInternalEndpoint?: boolean;
+    constructor({ secretId, secretKey, token, proxy, region, envType, useInternalEndpoint }: {
         secretId?: string;
         secretKey?: string;
         token?: string;
         proxy?: string;
         region?: string;
         envType?: string;
+        useInternalEndpoint?: any;
     });
+    isInternalEndpoint(): boolean;
 }

package/types/index.d.ts

@@ -20,6 +20,7 @@ interface CloudBaseConfig {
     proxy?: string;
     region?: string;
     envType?: string;
+    useInternalEndpoint?: boolean;
 }
 declare class CloudBase {
     private static cloudBase;
@@ -52,5 +53,6 @@ declare class CloudBase {
     get user(): UserService;
     getEnvironmentManager(): EnvironmentManager;
     getManagerConfig(): CloudBaseConfig;
+    get isInternalEndpoint(): Boolean;
 }
 export = CloudBase;