Merge pull request #36 from qiniupd/fix_499_in_another_way

Fix 499 bug

Author: SunLn

demo/js/qiniu.js

@@ -390,11 +390,16 @@ function QiniuJsSDK() {
                         var before = localFileInfo.time || 0;
                         var aDay = 24 * 60 * 60 * 1000; //  milliseconds
                         if (now - before < aDay) {
-                            file.loaded = localFileInfo.offset;
-                            file.percent = localFileInfo.percent;
-                            ctx = localFileInfo.ctx;
-                            if (localFileInfo.offset + blockSize > file.size) {
-                                blockSize = file.size - localFileInfo.offset;
+                            if (localFileInfo.percent !== 100) {
+                                file.percent = localFileInfo.percent;
+                                file.loaded = localFileInfo.offset;
+                                ctx = localFileInfo.ctx;
+                                if (localFileInfo.offset + blockSize > file.size) {
+                                    blockSize = file.size - localFileInfo.offset;
+                                }
+                            } else {
+                                // 删除localStorage，避免 499 bug
+                                localStorage.removeItem(file.name);
                             }
                         } else {
                             localStorage.removeItem(file.name);
@@ -479,7 +484,7 @@ function QiniuJsSDK() {
                                         errorObj = that.parseJSON(errorObj.error);
                                         errorText = errorObj.error || 'file exists';
                                     } catch (e) {
-                                        throw ('invalid json format');
+                                        errorText = errorObj.error || 'file exists';
                                     }
                                     break;
                                 case 631:
@@ -589,10 +594,10 @@ function QiniuJsSDK() {
                     ajax.setRequestHeader('Authorization', 'UpToken ' + that.token);
                     ajax.onreadystatechange = function() {
                         if (ajax.readyState === 4) {
+                            localStorage.removeItem(file.name);
                             if (ajax.status === 200) {
                                 var info = ajax.responseText;
                                 last_step(up, file, info);
-                                localStorage.removeItem(file.name);
                             } else {
                                 uploader.trigger('Error', {
                                     status: ajax.status,

src/qiniu.js

@@ -390,11 +390,16 @@ function QiniuJsSDK() {
                         var before = localFileInfo.time || 0;
                         var aDay = 24 * 60 * 60 * 1000; //  milliseconds
                         if (now - before < aDay) {
-                            file.loaded = localFileInfo.offset;
-                            file.percent = localFileInfo.percent;
-                            ctx = localFileInfo.ctx;
-                            if (localFileInfo.offset + blockSize > file.size) {
-                                blockSize = file.size - localFileInfo.offset;
+                            if (localFileInfo.percent !== 100) {
+                                file.percent = localFileInfo.percent;
+                                file.loaded = localFileInfo.offset;
+                                ctx = localFileInfo.ctx;
+                                if (localFileInfo.offset + blockSize > file.size) {
+                                    blockSize = file.size - localFileInfo.offset;
+                                }
+                            } else {
+                                // 进度100%时，删除对应的localStorage，避免 499 bug
+                                localStorage.removeItem(file.name);
                             }
                         } else {
                             localStorage.removeItem(file.name);
@@ -479,7 +484,7 @@ function QiniuJsSDK() {
                                         errorObj = that.parseJSON(errorObj.error);
                                         errorText = errorObj.error || 'file exists';
                                     } catch (e) {
-                                        throw ('invalid json format');
+                                        errorText = errorObj.error || 'file exists';
                                     }
                                     break;
                                 case 631:
@@ -589,10 +594,10 @@ function QiniuJsSDK() {
                     ajax.setRequestHeader('Authorization', 'UpToken ' + that.token);
                     ajax.onreadystatechange = function() {
                         if (ajax.readyState === 4) {
+                            localStorage.removeItem(file.name);
                             if (ajax.status === 200) {
                                 var info = ajax.responseText;
                                 last_step(up, file, info);
-                                localStorage.removeItem(file.name);
                             } else {
                                 uploader.trigger('Error', {
                                     status: ajax.status,