@cloudbase/manager-node 3.12.0 → 4.0.0

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/storage/index.js

@@ -894,26 +894,40 @@ class StorageService {
     async uploadFilesWithRetry({ uploadFiles, options, times, interval, failedFiles }) {
         const { files, onFileFinish } = options;
         const tempFailedFiles = [];
+        let curError = null;
         const res = await uploadFiles(Object.assign(Object.assign({}, options), { files: failedFiles.length
                 ? files.filter(file => failedFiles.includes(file.Key))
                 : files, onFileFinish: (...args) => {
                 const error = args[0];
                 const fileInfo = args[2];
                 if (error) {
+                    curError = error;
                     tempFailedFiles.push(fileInfo.Key);
                 }
                 onFileFinish === null || onFileFinish === void 0 ? void 0 : onFileFinish.apply(null, args);
             } }));
-        if (!(tempFailedFiles === null || tempFailedFiles === void 0 ? void 0 : tempFailedFiles.length) || times <= 0)
+        // if (!tempFailedFiles?.length || times <= 0) return res
+        if (!(tempFailedFiles === null || tempFailedFiles === void 0 ? void 0 : tempFailedFiles.length)) {
             return res;
-        if (times > 0) {
-            setTimeout(() => this.uploadFilesWithRetry({
-                uploadFiles,
-                options,
-                times: times - 1,
-                interval,
-                failedFiles: tempFailedFiles
-            }), interval);
+        }
+        else {
+            if (times > 0) {
+                return await new Promise((resolve, reject) => {
+                    setTimeout(() => this.uploadFilesWithRetry({
+                        uploadFiles,
+                        options,
+                        times: times - 1,
+                        interval,
+                        failedFiles: tempFailedFiles
+                    }).then(res => resolve(res))
+                        .catch(err => reject(err)), interval);
+                });
+            }
+            else {
+                if (curError) {
+                    throw curError;
+                }
+            }
         }
     }
     /**

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.0",
+    "version": "4.0.0",
     "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/storage/index.ts

@@ -1198,6 +1198,7 @@ export class StorageService {
     private async uploadFilesWithRetry({ uploadFiles, options, times, interval, failedFiles }) {
         const { files, onFileFinish } = options
         const tempFailedFiles = []
+        let curError: any = null
         const res = await uploadFiles({
             ...options,
             files: failedFiles.length
@@ -1207,24 +1208,37 @@ export class StorageService {
                 const error = args[0]
                 const fileInfo = (args as any)[2]
                 if (error) {
+                    curError = error
                     tempFailedFiles.push(fileInfo.Key)
                 }
                 onFileFinish?.apply(null, args)
             }
         })
-        if (!tempFailedFiles?.length || times <= 0) return res
-        if (times > 0) {
-            setTimeout(
-                () =>
-                    this.uploadFilesWithRetry({
-                        uploadFiles,
-                        options,
-                        times: times - 1,
-                        interval,
-                        failedFiles: tempFailedFiles
-                    }),
-                interval
-            )
+        // if (!tempFailedFiles?.length || times <= 0) return res
+
+        if (!tempFailedFiles?.length) {
+            return res
+        } else {
+            if (times > 0) {
+                return await new Promise((resolve, reject) => {
+                    setTimeout(
+                        () =>
+                            this.uploadFilesWithRetry({
+                                uploadFiles,
+                                options,
+                                times: times - 1,
+                                interval,
+                                failedFiles: tempFailedFiles
+                            }).then(res => resolve(res))
+                                .catch(err => reject(err)),
+                        interval
+                    )
+                })
+            } else {
+                if (curError) {
+                    throw curError
+                }
+            }
         }
     }
 

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 + 代理