summaryrefslogtreecommitdiff
path: root/src/api/traffic.js
diff options
context:
space:
mode:
authorHaishan <[email protected]>2019-04-19 00:16:01 +0800
committerHaishan <[email protected]>2019-04-19 00:17:06 +0800
commite68f4ce9664f8164fd6aab284feb9ebed9f2ecdb (patch)
tree3e94f49e44daebfb35089152b89cc2f02f3cfdcb /src/api/traffic.js
parent54646e8fe650334aaccb5d0a0efeca21c203e54d (diff)
fix(streaming): split and join JSON string chunks correctly
for #13 Sometimes in Safari, in one "pump" you can get the content below(decoded text string): '{"up":0,"down":38589}\n{"up":0,"down":59928}' and then JSON.parse will throw
Diffstat (limited to 'src/api/traffic.js')
-rw-r--r--src/api/traffic.js29
1 files changed, 22 insertions, 7 deletions
diff --git a/src/api/traffic.js b/src/api/traffic.js
index 68a7ff9..63252aa 100644
--- a/src/api/traffic.js
+++ b/src/api/traffic.js
@@ -1,6 +1,6 @@
import { getURLAndInit } from 'm/request-helper';
const endpoint = '/traffic';
-const textDecoder = new TextDecoder('utf-8', { stream: true });
+const textDecoder = new TextDecoder('utf-8');
const Size = 150;
@@ -36,21 +36,36 @@ const traffic = {
};
let fetched = false;
+let decoded = '';
+
+function parseAndAppend(x) {
+ traffic.appendData(JSON.parse(x));
+}
function pump(reader) {
return reader.read().then(({ done, value }) => {
+ const str = textDecoder.decode(value, { stream: !done });
+ decoded += str;
+
+ const splits = decoded.split('\n');
+
+ const lastSplit = splits[splits.length - 1];
+
+ for (let i = 0; i < splits.length - 1; i++) {
+ parseAndAppend(splits[i]);
+ }
+
if (done) {
+ parseAndAppend(lastSplit);
+ decoded = '';
+
// eslint-disable-next-line no-console
console.log('GET /traffic streaming done');
fetched = false;
return;
+ } else {
+ decoded = lastSplit;
}
- const t = textDecoder.decode(value);
- // console.log('response', t);
- const o = JSON.parse(t);
-
- traffic.appendData(o);
-
return pump(reader);
});
}