feat: 动态分配分块大小保证分块不超过阈值

shsgear · shsgear · commit 0c0aa3283468 · 2021-01-18T14:52:02.000+08:00
diff --git a/bin/index.js b/bin/index.js
@@ -10,7 +10,7 @@ const ProgressBar = require('progress');
 const BlueBirdPromise = require("bluebird");
 
 const logger = require('../lib/log');
-const { CHUNK_SIZE } = require('../lib/constants');
+const { DEFAULT_CHUNK_SIZE, MAX_CHUNK } = require('../lib/constants');
 const { generateAuthorization, getRegistryInfo } = require('../lib/utils');
 
 const { getExistChunks: _getExistChunks, uploadChunk: _uploadChunk, mergeAllChunks: _mergeAllChunks } = require('../lib/request');
@@ -25,14 +25,15 @@ let md5 = '';
 let uploadId = '';
 let fileSize = 0;
 
+let chunkSize = DEFAULT_CHUNK_SIZE;
+let totalChunk = 0;
+
 process.on('uncaughtException', error => {
     console.log(chalk.red('\n程序发生了一些异常，请稍后重试\n'));
     logger.error(error.stack);
 })
 
 const upload = async (filePath, parts = []) => {
-    const totalChunk = Math.ceil(fileSize / CHUNK_SIZE);
-
     const bar = new ProgressBar(':bar [:current/:total] :percent ', { total: totalChunk });
     const uploadChunk = async (currentChunk, currentChunkIndex, parts, isRetry) => {
         if (parts.some(({ partNumber, size }) => partNumber === currentChunkIndex && size === currentChunk.length)) {
@@ -82,8 +83,8 @@ const upload = async (filePath, parts = []) => {
         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 start = (currentChunkIndex - 1) * chunkSize;
+            const end = ((start + chunkSize) >= fileSize) ? fileSize : start + chunkSize - 1;
             const stream = fs.createReadStream(filePath, { start, end })
             let buf = [];
             return new Promise((resolve) => {
@@ -114,7 +115,7 @@ const upload = async (filePath, parts = []) => {
 
     
 
-    const merge =  async () => 
+    const merge =  async () =>
         await _mergeAllChunks(requestUrl, {
             version,
             uploadId,
@@ -171,15 +172,19 @@ const getFileMD5Success = async (filePath) => {
 }
 
 const getFileMD5 = async (filePath) => {
-    const totalChunk = Math.ceil(fileSize / CHUNK_SIZE);
+    totalChunk = Math.ceil(fileSize / DEFAULT_CHUNK_SIZE);
+    if (totalChunk > MAX_CHUNK) {
+        chunkSize = Math.ceil(fileSize / MAX_CHUNK);
+        totalChunk = Math.ceil(fileSize / chunkSize);
+    }
     const spark = new SparkMD5.ArrayBuffer();
     try {
         console.log(`\n开始计算 MD5\n`)
         logger.info('开始计算 MD5')
 
         const bar = new ProgressBar(':bar [:current/:total] :percent ', { total: totalChunk });
         await new Promise(resolve => {
-            stream = fs.createReadStream(filePath, { highWaterMark: CHUNK_SIZE })
+            stream = fs.createReadStream(filePath, { highWaterMark: chunkSize })
             stream.on('data', chunk => {
                 bar.tick();
                 spark.append(chunk)
diff --git a/lib/constants.js b/lib/constants.js
@@ -1,3 +1,4 @@
 module.exports = {
-    CHUNK_SIZE: 1024 * 1024 * 5
+    DEFAULT_CHUNK_SIZE: 5 * 1024 * 1024,
+    MAX_CHUNK: 10000,
 }
diff --git a/lib/request.js b/lib/request.js
@@ -42,6 +42,8 @@ const uploadChunk = (requestUrl, {
     Authorization
 }) => {
     return axios({
+        maxContentLength: Infinity,
+        maxBodyLength: Infinity,
         method: 'post',
         url: `${requestUrl}?version=${version}&uploadId=${uploadId}&partNumber=${partNumber}&size=${size}&action=part-upload`,
         data: currentChunk,
diff --git a/lib/withRetry.js b/lib/withRetry.js
@@ -15,6 +15,7 @@ const withRetry = (fn, retryCount, retryDelay) => new Promise((resolve, reject)
     .then(resolve)
     .catch((err) => {
       if (retryCount > 0) {
+        logger.error(err);
         console.log(chalk.cyan('遇到了一个小问题，重试中...'))
         return delay(retryDelay)
           .then(withRetry.bind(null, fn, retryCount - 1, retryDelay))

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`module.exports = {`
`2`		`- CHUNK_SIZE: 1024 * 1024 * 5`
	`2`	`+ DEFAULT_CHUNK_SIZE: 5 * 1024 * 1024,`
	`3`	`+ MAX_CHUNK: 10000,`
`3`	`4`	`}`