@cloudbase/manager-node 3.12.1-beta → 4.0.1

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 4.0.0
+- 升级 https-proxy-agent 3->5 修复 https://github.com/TencentCloud/tencentcloud-sdk-nodejs/issues/47
+
+
 # v3.9.2-beta
 -   扩展禁用用户接口为变更用户状态接口
 -   增加修改用户信息接口

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

@@ -70,6 +70,14 @@ class CloudService {
             cam: 'https://cam.tencentcloudapi.com',
             cdn: 'https://cdn.tencentcloudapi.com'
         };
+        // 检测环境变量，云梯账号走内网域名
+        const USE_INTERNAL_ENDPOINT = "USE_INTERNAL_ENDPOINT";
+        const intranetUrlMap = Object.keys(urlMap).map((service) => ({
+            [service]: `https://${service}.internal.tencentcloudapi.com`,
+        })).reduce((acc, cur) => (Object.assign(Object.assign({}, acc), cur)), {});
+        if (USE_INTERNAL_ENDPOINT in process.env) {
+            return intranetUrlMap[this.service];
+        }
         if (urlMap[this.service]) {
             return urlMap[this.service];
         }

package/lib/utils/http-request.js

@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchStream = exports.fetch = void 0;
 const url_1 = require("url");
 const node_fetch_1 = __importDefault(require("node-fetch"));
-const https_proxy_agent_1 = __importDefault(require("https-proxy-agent"));
+const https_proxy_agent_1 = require("https-proxy-agent");
 const error_1 = require("../error");
 // 使用 fetch + 代理
 async function fetch(url, config = {}, proxy) {
     if (proxy || process.env.http_proxy) {
-        config.agent = new https_proxy_agent_1.default(proxy || process.env.http_proxy);
+        config.agent = new https_proxy_agent_1.HttpsProxyAgent(proxy || process.env.http_proxy);
     }
     // 解决中文编码问题
     const escapeUrl = new url_1.URL(url).toString();
@@ -35,7 +35,7 @@ async function fetch(url, config = {}, proxy) {
 exports.fetch = fetch;
 async function fetchStream(url, config = {}, proxy) {
     if (proxy || process.env.http_proxy) {
-        config.agent = new https_proxy_agent_1.default(proxy || process.env.http_proxy);
+        config.agent = new https_proxy_agent_1.HttpsProxyAgent(proxy || process.env.http_proxy);
     }
     // 解决中文编码问题
     const escapeUrl = new url_1.URL(url).toString();

package/package.json

@@ -1,13 +1,14 @@
 {
     "name": "@cloudbase/manager-node",
-    "version": "3.12.1-beta",
+    "version": "4.0.1",
     "description": "The node manage service api for cloudbase.",
     "main": "lib/index.js",
     "scripts": {
         "build": "rimraf lib types && npx tsc",
         "test": "jest --runInBand --detectOpenHandles --coverage --testTimeout=50000",
         "lint": "eslint \"./**/*.ts\"",
-        "lint:fix": "eslint --fix \"./**/*.ts\""
+        "lint:fix": "eslint --fix \"./**/*.ts\"",
+        "prepublishOnly": "npm run build"
     },
     "repository": {
         "type": "git",
@@ -36,7 +37,7 @@
         "archiver": "^3.1.1",
         "cos-nodejs-sdk-v5": "2.9.0",
         "del": "^5.1.0",
-        "https-proxy-agent": "^2.2.4",
+        "https-proxy-agent": "^5.0.1",
         "make-dir": "^3.0.0",
         "micromatch": "^4.0.2",
         "node-fetch": "^2.6.0",

package/src/utils/cloud-api-request.ts

@@ -91,6 +91,18 @@ export class CloudService {
             cam: 'https://cam.tencentcloudapi.com',
             cdn: 'https://cdn.tencentcloudapi.com'
         }
+
+        // 检测环境变量，云梯账号走内网域名
+        const USE_INTERNAL_ENDPOINT = "USE_INTERNAL_ENDPOINT"
+
+        const intranetUrlMap = Object.keys(urlMap).map((service) => ({
+            [service]: `https://${service}.internal.tencentcloudapi.com`,
+        })).reduce((acc, cur) => ({ ...acc, ...cur }), {})
+
+        if(USE_INTERNAL_ENDPOINT in process.env) {
+            return intranetUrlMap[this.service]
+        }
+
         if (urlMap[this.service]) {
             return urlMap[this.service]
         } else {

package/src/utils/http-request.ts

@@ -1,6 +1,6 @@
 import { URL } from 'url'
 import _fetch from 'node-fetch'
-import HttpsProxyAgent from 'https-proxy-agent'
+import { HttpsProxyAgent } from 'https-proxy-agent'
 import { CloudBaseError } from '../error'
 
 // 使用 fetch + 代理