Merge branch 'dev' of http://gitlab.sugrsugr.com/skye/jensen into dev

src/jensen.js

@@ -315,17 +315,38 @@ function Jensen(log) {
         // 做一个回调，怎么样找到它呢？
         blocks.push(result.data);
         tryReceive();
-        if (self.decodeTimeout) clearTimeout(self.decodeTimeout);
-        self.decodeTimeout = setTimeout(function () {
-            tryDecode();
-        }, self.timewait);
-        if (self.onreceive)
+        tryDecode();
+        if (self.onreceive) {
             try {
-                self.onreceive(totalBytes, result.data);
+                self.onreceive(totalBytes);
             } catch (e) {
             }
+        } else {
+            // if (self.decodeTimeout) clearTimeout(self.decodeTimeout);
+            // self.decodeTimeout = setTimeout(function () {
+            //     tryDecode();
+            // }, self.timewait);
+        }
     };
 
+    // 持续解码
+    const continueDecode = (block) => {
+        const buff = new ArrayBuffer(RECV_BUFF_SIZE * 2);
+        let bview = new Uint8Array(buff);
+        for (let k = 0; k < block.byteLength; k++) {
+            bview[k] = block.getInt8(k);
+        }
+        let result = null;
+        try {
+            result = decodeMessage(bview, 0, block.byteLength);
+        } catch (err) {
+            console.error('ci decode', err);
+        }
+        sendNext();
+        const msg = result.message;
+        return result && msg.id === TRANSFER_FILE ? msg.body : null;
+    }
+
     const tryDecode = function () {
         // 一个容器，比单独任意一个小包要大一点儿，好像还差一点儿
         let stime = new Date();
@@ -769,7 +790,7 @@ Jensen.prototype.getFile = async function (filename, length, ondata, onprogress)
         }
     };
     this.onreceive = onprogress;
-    Jensen.registerHandler(TRANSFER_FILE, handler);
+    Jensen.registerHandler(TRANSFER_FILE, handler); 
     this.send(new Command(TRANSFER_FILE).body(fname));
 };