use a Duplex stream for EOF

This commit is contained in:
Danny Coates 2018-06-25 14:01:08 -07:00
parent beccd80902
commit 126ea8c7e6
No known key found for this signature in database
GPG Key ID: 4C442633C62E00CB
3 changed files with 31 additions and 30 deletions

View File

@ -52,7 +52,7 @@ export default function(state, emitter) {
checkFiles();
});
//emitter.on('navigate', checkFiles);
emitter.on('navigate', checkFiles);
emitter.on('render', () => {
lastRender = Date.now();

View File

@ -50,10 +50,16 @@ module.exports = async function(ws, req) {
fileStream = wsStream(ws, { binary: true })
.pipe(limiter)
.pipe(parser);
storage.set(newId, fileStream, meta);
await storage.set(newId, fileStream, meta);
await parser.promise;
if (ws.readyState === 1) {
// if the socket is closed by a cancelled upload the stream
// ends without an error so we need to check the state
// before sending a reply.
// TODO: we should handle cancelled uploads differently
// in order to avoid having to check socket state and clean
// up storage, possibly with an exception that we can catch.
ws.send(
JSON.stringify({
url,
@ -62,8 +68,10 @@ module.exports = async function(ws, req) {
authentication: `send-v1 ${meta.nonce}`
})
);
}
} catch (e) {
log.error('upload', e);
if (ws.readyState === 1) {
ws.send(
JSON.stringify({
error: e === 'limit' ? 413 : 500
@ -71,5 +79,6 @@ module.exports = async function(ws, req) {
);
ws.close();
}
}
});
};

View File

@ -1,23 +1,15 @@
const { Transform } = require('stream');
const { Duplex } = require('stream');
class StreamParser extends Transform {
constructor() {
super();
let res;
this.promise = new Promise(resolve => {
res = resolve;
});
this.res = res;
}
_transform(chunk, encoding, callback) {
class StreamParser extends Duplex {
_write(chunk, encoding, callback) {
if (chunk.byteLength === 1 && chunk[0] === 0) {
this.res();
this.push(null);
} else {
this.push(chunk);
}
callback();
}
_read() {}
}
module.exports = StreamParser;