feat: retry after chunks merge failed (#1)

* feat: retry after merge chunks failed

Co-authored-by: shsgear <sunhao@coding.net>

Author: Shsgear

bin/index.js

@@ -6,14 +6,18 @@ const chalk = require('chalk');
 const prompts = require('prompts');
 const path = require('path');
 require('winston-daily-rotate-file');
-const logger = require('../lib/log');
 const ProgressBar = require('progress');
+const BlueBirdPromise = require("bluebird");
+
+const logger = require('../lib/log');
 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 { getExistChunks: _getExistChunks, uploadChunk: _uploadChunk, mergeAllChunks: _mergeAllChunks } = require('../lib/request');
+
+const { withRetry } = require('../lib/withRetry');
 const argv = require('../lib/argv');
+
 const { requestUrl, version } = getRegistryInfo(argv.registry);
 
 let Authorization = '';
@@ -106,15 +110,23 @@ const upload = async (filePath, parts = []) => {
         return;
     }
 
-    try {
-        const res = await _uploadSuccess(requestUrl, {
+
+
+    
+
+    const merge =  async () => 
+        await _mergeAllChunks(requestUrl, {
             version,
             uploadId,
             fileSize,
             fileTag: md5
         }, {
             Authorization
         });
+    
+
+    try {
+        const res = await withRetry(merge, 3, 500);
         if (res.code) {
             throw (res.message);
         }

lib/request.js

@@ -50,15 +50,15 @@ const uploadChunk = (requestUrl, {
 }
 
 /**
- * 完成分片上传
+ * 分片上传完成后通知合并所有 chunk
  * @param {string} requestUrl 
  * @param {string} version
  * @param {string} uploadId
  * @param {string} fileTag
  * @param {number} fileSize
  * @param {string} Authorization
  */
-const uploadSuccess = (requestUrl, {
+const mergeAllChunks = (requestUrl, {
     version,
     uploadId,
     fileTag,
@@ -74,5 +74,5 @@ const uploadSuccess = (requestUrl, {
 module.exports = {
     getExistChunks,
     uploadChunk,
-    uploadSuccess
+    mergeAllChunks
 }

lib/withRetry.js

@@ -0,0 +1,30 @@
+const chalk = require('chalk')
+
+
+const delay = (wait) => new Promise((r) => setTimeout(() => r(), wait))
+
+
+/**
+ * 
+ * @param {fucntion} fn the function need to retry after rejected
+ * @param {Number} retryCount number of retries
+ * @param {Number} retryDelay delay time between each retries
+ */
+const withRetry = (fn, retryCount, retryDelay) => new Promise((resolve, reject) => 
+  fn()
+    .then(resolve)
+    .catch((err) => {
+      if (retryCount > 0) {
+        console.log(chalk.cyan('遇到了一个小问题，重试中...'))
+        return delay(retryDelay)
+          .then(withRetry.bind(null, fn, retryCount - 1, retryDelay))
+          .then(resolve)
+          .catch(reject)
+      }
+      return reject(err)
+    })
+)
+
+module.exports = {
+  withRetry
+}