@cloudbase/manager-node 4.1.2 → 4.2.0

package/lib/constant.js

@@ -4,7 +4,7 @@
 //     static credentail = 'credential'
 // }
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.COS_SDK_PROTOCOL = exports.USE_INTERNAL_ENDPOINT = exports.SCF_STATUS = exports.ROLE_NAME = exports.PUBLIC_RSA_KEY = exports.ERROR = exports.SERVICE_TYPE = exports.ENDPOINT = exports.RUN_ENV = exports.SDK_VERSION = exports.ENV_NAME = void 0;
+exports.COS_SDK_KEEPALIVE = exports.COS_SDK_PROTOCOL = exports.USE_INTERNAL_ENDPOINT = exports.SCF_STATUS = exports.ROLE_NAME = exports.PUBLIC_RSA_KEY = exports.ERROR = exports.SERVICE_TYPE = exports.ENDPOINT = exports.RUN_ENV = exports.SDK_VERSION = exports.ENV_NAME = void 0;
 exports.ENV_NAME = {
     ENV_SECRETID: 'TENCENTCLOUD_SECRETID',
     ENV_SECRETKEY: 'TENCENTCLOUD_SECRETKEY',
@@ -51,5 +51,5 @@ exports.SCF_STATUS = {
 };
 // 是否使用内网域名
 exports.USE_INTERNAL_ENDPOINT = "USE_INTERNAL_ENDPOINT" in process.env;
-// 允许通过环境变量指定 COS SDK 的协议为 HTTPS 或 HTTP
-exports.COS_SDK_PROTOCOL = "COS_SDK_PROTOCOL";
+exports.COS_SDK_PROTOCOL = process.env.COS_SDK_PROTOCOL;
+exports.COS_SDK_KEEPALIVE = process.env.COS_SDK_KEEPALIVE;

package/lib/env/index.js

@@ -261,8 +261,10 @@ class EnvService {
             SecurityToken: token,
             Domain: constant_1.USE_INTERNAL_ENDPOINT ? "{Bucket}.cos-internal.{Region}.tencentcos.cn" /* INTERNAL */ : "{Bucket}.cos.{Region}.tencentcos.cn" /* PUBLIC */
         };
-        if (constant_1.COS_SDK_PROTOCOL in process.env && process.env.COS_SDK_PROTOCOL.toLowerCase().startsWith('http')) {
-            cosConfig.Protocol = process.env.COS_SDK_PROTOCOL.toLowerCase() + ":";
+        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() + ':';
         }
         return new cos_nodejs_sdk_v5_1.default(cosConfig);
     }

package/lib/storage/index.js

@@ -20,6 +20,7 @@ const cos_nodejs_sdk_v5_1 = __importDefault(require("cos-nodejs-sdk-v5"));
 const utils_1 = require("../utils");
 const error_1 = require("../error");
 const parallel_1 = require("../utils/parallel");
+const runenv_1 = require("../utils/runenv");
 const constant_1 = require("../constant");
 const BIG_FILE_SIZE = 5242880; // 5MB 1024*1024*5
 class StorageService {
@@ -848,8 +849,17 @@ class StorageService {
             SecurityToken: token,
             Domain: constant_1.USE_INTERNAL_ENDPOINT ? "{Bucket}.cos-internal.{Region}.tencentcos.cn" /* INTERNAL */ : "{Bucket}.cos.{Region}.tencentcos.cn" /* PUBLIC */
         };
-        if (constant_1.COS_SDK_PROTOCOL in process.env && process.env.COS_SDK_PROTOCOL.toLowerCase().startsWith('http')) {
-            cosConfig.Protocol = process.env.COS_SDK_PROTOCOL.toLowerCase() + ":";
+        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() + ':';
+        }
+        // COSSDK 默认开启 KeepAlive，这里提供关闭的方式
+        if (constant_1.COS_SDK_KEEPALIVE) {
+            cosConfig.KeepAlive = { true: true, false: false }[constant_1.COS_SDK_KEEPALIVE];
+        }
+        else if (runenv_1.checkIsInScf()) {
+            cosConfig.KeepAlive = false;
         }
         return new cos_nodejs_sdk_v5_1.default(cosConfig);
     }

package/lib/utils/runenv.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkIsInScf = void 0;
+function checkIsInScf() {
+    // TENCENTCLOUD_RUNENV
+    return process.env.TENCENTCLOUD_RUNENV === 'SCF';
+}
+exports.checkIsInScf = checkIsInScf;

package/package.json

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

package/types/constant.d.ts

@@ -40,4 +40,5 @@ export declare const enum COS_ENDPOINT {
     INTERNAL = "{Bucket}.cos-internal.{Region}.tencentcos.cn",
     PUBLIC = "{Bucket}.cos.{Region}.tencentcos.cn"
 }
-export declare const COS_SDK_PROTOCOL = "COS_SDK_PROTOCOL";
+export declare const COS_SDK_PROTOCOL: string;
+export declare const COS_SDK_KEEPALIVE: string;

package/types/utils/runenv.d.ts

@@ -0,0 +1 @@
+export declare function checkIsInScf(): boolean;

package/.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-    "typescript.tsdk": "node_modules\\typescript\\lib"
-}