update needRetry

Author: lihsai0

qiniu/httpc/responseWrapper.js

@@ -17,41 +17,18 @@ ResponseWrapper.prototype.ok = function () {
  * @return {boolean}
  */
 ResponseWrapper.prototype.needRetry = function () {
-    if (this.ok()) {
+    if (this.resp.statusCode > 0 && this.resp.statusCode < 500) {
         return false;
     }
 
-    if (!this.resp || !this.resp.statusCode || this.resp.statusCode < 0) {
-        return true;
-    }
-
-    const statusCode = this.resp.statusCode;
-
-    // 需要重试的特例
-    if ([996].includes(statusCode)) {
-        return true;
-    }
-
-    // 不需要重试的特例
-    // 579 上传成功，回调失败
-    // 612 app/AK 不存在
-    // 631 bucket 不存在
-    if ([579, 612, 631].includes(statusCode)) {
-        return false;
-    }
-
-    // 需要重试的状态码
-    const statusFirstDigit = Math.floor(statusCode / 100);
-    if ([5, 6].includes(statusFirstDigit)) {
-        return true;
-    }
-
-    // 不需要重试的状态码
-    if ([4].includes(statusFirstDigit)) {
+    // https://developer.qiniu.com/fusion/kb/1352/the-http-request-return-a-status-code
+    if ([
+        501, 509, 573, 579, 608, 612, 614, 616, 618, 630, 631, 632, 640, 701
+    ].includes(this.resp.statusCode)) {
         return false;
     }
 
-    return false;
+    return true;
 };
 
 exports.ResponseWrapper = ResponseWrapper;

test/httpc.test.js

@@ -12,37 +12,32 @@ describe('test http module', function () {
         const { ResponseWrapper } = qiniu.httpc;
 
         it('needRetry', function () {
-            const rule = [
-                ['-1', true],
-                ['100,499', false],
-                ['500,578', true],
-                ['579', false],
-                ['580,599', true],
-                ['600,611', true],
-                ['612', false],
-                ['613,630', true],
-                ['631', false],
-                ['632,699', true]
-            ];
-            const cases = [];
-            for (const [codeRange, shouldRetry] of rule) {
-                let [start, end] = codeRange.split(',');
-                start = parseInt(start);
-                end = parseInt(end);
-                if (!end) {
-                    cases.push({
-                        code: start,
-                        shouldRetry
-                    });
-                } else {
-                    for (let i = start; i <= end; i++) {
-                        cases.push({
-                            code: i,
-                            shouldRetry
-                        });
-                    }
+            const cases = Array.from({
+                length: 800
+            }, (_, i) => {
+                if (i > 0 && i < 500) {
+                    return {
+                        code: i,
+                        shouldRetry: false
+                    };
                 }
-            }
+                if ([
+                    501, 509, 573, 579, 608, 612, 614, 616, 618, 630, 631, 632, 640, 701
+                ].includes(i)) {
+                    return {
+                        code: i,
+                        shouldRetry: false
+                    };
+                }
+                return {
+                    code: i,
+                    shouldRetry: true
+                };
+            });
+            cases.unshift({
+                code: -1,
+                shouldRetry: true
+            });
 
             const mockedResponseWrapper = new ResponseWrapper({
                 data: [],