Merge pull request #400 from winddies/sdk-12

修复 sdk 最近的一些 issue

Author: lzfee0227

package.json

@@ -1,7 +1,7 @@
 {
   "name": "qiniu-js",
   "jsName": "qiniu",
-  "version": "2.5.3",
+  "version": "2.5.4",
   "private": false,
   "description": "Javascript SDK for Qiniu Resource (Cloud) Storage AP",
   "main": "dist/qiniu.min.js",

src/statisticsLog.js

@@ -5,24 +5,23 @@ export class StatisticsLogger{
   log(info, token) {
     let logString = "";
     Object.keys(info).forEach(k => logString += info[k] + ",");
-    this.send(logString, token);
+    this.send(logString, token, 0);
   }
 
-  send(logString, token){
+  send(logString, token, retryCount) {
     let xhr = createXHR();
-    let count = 0;
+    let self = this;
     xhr.open("POST", "https://uplog.qbox.me/log/3");
     xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
     xhr.setRequestHeader("Authorization", "UpToken " + token);
     xhr.onreadystatechange = function () {
       if (xhr.readyState === 4) {
         if (xhr.status !== 200) {
-            count++;
-            count <= 3 ? xhr.send(logString) : "";
-        } 
+          ++retryCount <= 3 && self.send(logString, token, retryCount);
+        }
       }
     };
     xhr.send(logString);
   }
 
-}
+}

src/upload.js

@@ -188,7 +188,6 @@ export class UploadManager {
           removeLocalFileInfo(this.file);
           return;
         }
-         setLocalFileInfo(this.file, this.ctxList);
       }
     );
     return result;
@@ -231,12 +230,16 @@ export class UploadManager {
         onProgress,
         onCreate
       }).then(response => {
+        // 在某些浏览器环境下，xhr 的 progress 事件无法被触发，progress 为 null，这里在每次分片上传完成后都手动更新下 progress
+        onProgress({ loaded: chunk.size });
+
         this.ctxList[index] = {
           time: new Date().getTime(),
           ctx: response.data.ctx,
           size: chunk.size,
           md5: md5
         };
+        setLocalFileInfo(this.file, this.ctxList);
       });
     });
   }
@@ -272,9 +275,16 @@ export class UploadManager {
     this.onData(this.progress);
   }
 
-  finishDirectProgress(){
+  finishDirectProgress() {
+    // 在某些浏览器环境下，xhr 的 progress 事件无法被触发，progress 为 null， 这里 fake 下
+    if (!this.progress) {
+      this.progress = { total: this.getProgressInfoItem(this.file.size, this.file.size) };
+      this.onData(this.progress);
+      return;
+    }
+
     let total = this.progress.total;
-    this.progress.total = this.getProgressInfoItem(total.loaded + 1, total.size);
+    this.progress = { total: this.getProgressInfoItem(total.loaded + 1, total.size) };
     this.onData(this.progress);
   }
 

test/demo2/package.json

@@ -15,9 +15,9 @@
     "babel-polyfill": "^6.26.0",
     "babel-preset-env": "^1.6.0",
     "babel-runtime": "^6.26.0",
-    "qiniu-js":"^2.0.2",
     "es3ify-loader": "^0.2.0",
     "open-browser-webpack-plugin": "0.0.5",
+    "qiniu-js": "^2.5.4",
     "uglifyjs-webpack-plugin": "^1.1.6",
     "webpack": "^3.6.0",
     "webpack-dev-server": "^2.9.1"