Merge pull request #2 from jojoLockLock/master

feat:concurrency args support

Author: jojoLockLock

bin/index.js

@@ -11,6 +11,7 @@ const ProgressBar = require('progress');
 const { CHUNK_SIZE } = require('../lib/constants');
 const { generateAuthorization, getRegistryInfo } = require('../lib/utils');
 const { getExistChunks: _getExistChunks, uploadChunk: _uploadChunk, uploadSuccess: _uploadSuccess } = require('../lib/request');
+const BlueBirdPromise = require("bluebird");
 
 const argv = require('../lib/argv');
 const { requestUrl, version } = getRegistryInfo(argv.registry);
@@ -73,12 +74,15 @@ const upload = async (filePath, parts = []) => {
     logger.info('开始上传')
 
     try {
-        for (let currentChunkIndex = 1; currentChunkIndex <= totalChunk; currentChunkIndex++) {
+
+        const chunkIndexs = new Array(totalChunk).fill("").map((_,index) => index+1)
+
+        await BlueBirdPromise.map(chunkIndexs,(currentChunkIndex)=>{
             const start = (currentChunkIndex - 1) * CHUNK_SIZE;
             const end = ((start + CHUNK_SIZE) >= fileSize) ? fileSize : start + CHUNK_SIZE - 1;
             const stream = fs.createReadStream(filePath, { start, end })
             let buf = [];
-            await new Promise((resolve) => {
+            return new Promise((resolve) => {
                 stream.on('data', data => {
                     buf.push(data)
                 })
@@ -93,7 +97,8 @@ const upload = async (filePath, parts = []) => {
             }).catch(error => {
                 throw Error(error)
             })
-        }
+        }, { concurrency: argv.concurrency })
+
     } catch (error) {
         logger.error(error.message);
         logger.error(error.stack);

lib/argv.js

@@ -15,6 +15,12 @@ const argv = require('yargs')
             alias: 'r',
             describe: '仓库路径',
             demandOption: true
+        },
+        concurrency: {
+            alias: 'c',
+            describe: '上传分块并行数',
+            demandOption: true,
+            default: 5,
         }
     })
     .alias('version', 'v')

package.json

@@ -11,6 +11,7 @@
     "license": "ISC",
     "dependencies": {
         "axios": "^0.20.0",
+        "bluebird": "^3.7.2",
         "chalk": "^4.1.0",
         "cos-nodejs-sdk-v5": "^2.8.2",
         "form-data": "^3.0.0",

yarn.lock

@@ -84,6 +84,11 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
+bluebird@^3.7.2:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
+  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
+
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.npm.taobao.org/caseless/download/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"