nodejs: Add support for deferring the upload length (#140)

* npm audit * make defer length supported for nodejs * detect file size from stream "end" * remove 'copyBuf'
tus · Mar 30, 2019 · e6bdb48 · e6bdb48
1 parent 686cb6c
commit e6bdb48
Show file tree

Hide file tree

Showing 7 changed files with 8,503 additions and 16,233 deletions.
diff --git a/lib/browser/source.js b/lib/browser/source.js
@@ -50,7 +50,7 @@ class StreamSource {
     const hasEnoughData = end <= this._bufferOffset + len(this._buffer);
     if (this._done || hasEnoughData) {
       var value = this._getDataFromBuffer(start, end);
-      callback(null, value);
+      callback(null, value, value == null ? this._done : false);
       return;
     }
     this._reader.read().then(({ value, done }) => {

diff --git a/lib/node/source.js b/lib/node/source.js
@@ -58,6 +58,8 @@ class StreamSource {
     this.size = null;
 
     stream.pause();
+    this._done = false;
+    stream.on("end", () => this._done = true);
 
     this._buf = new Buffer(chunkSize);
     this._bufPos = null;
@@ -84,24 +86,26 @@ class StreamSource {
       return;
     }
 
-    this._bufPos = start;
-    this._bufLen = 0;
+    if (this._done) {
+      callback(null, null, this._done);
+      return;
+    }
 
-    let bytesToSkip = start - this._bufPos;
+    let bytesToSkip = start - (this._bufPos + this._bufLen);
+    this._bufLen = 0;
+    this._bufPos = start;
     let bytesToRead = end - start;
     let slicingStream = new SlicingStream(bytesToSkip, bytesToRead, this);
     this._stream.pipe(slicingStream);
-    slicingStream.size = bytesToRead;
 
     callback(null, slicingStream);
   }
 
   close() {
-    //this._stream.
+    // not implemented
   }
 }
 
-
 class SlicingStream extends Transform {
   constructor(bytesToSkip, bytesToRead, source) {
     super();

diff --git a/lib/upload.js b/lib/upload.js
@@ -516,33 +516,26 @@ class Upload {
       end = this._size;
     }
 
-    // A source's slice may return a value to send or a promise.
-    // When we have the value we start to send it and emit progress.
-    // TODO: merge these two branches
-    if (this.options.uploadLengthDeferred) {
-      this._source.slice(start, end, (error, value) => {
-        if (error) {
-          this._emitError(error);
-        } else if (value === null) {
-          this._size = this._offset;
-          xhr.setRequestHeader("Upload-Length", this._offset);
-          xhr.send();
-        } else {
-          xhr.send(value);
-          this._emitProgress(this._offset, this._size);
-        }
-      });
-    } else {
-      this._source.slice(start, end, (error, chunk) => {
-        if (error) {
-          this._emitError(new DetailedError(`tus: could not slice file or stream (from ${start} to ${end})`, error));
-          return;
+    this._source.slice(start, end, (err, value, complete) => {
+      if (err) {
+        this._emitError(err);
+        return;
+      }
+
+      if (this.options.uploadLengthDeferred) {
+        if (complete) {
+          this._size = this._offset + (value && value.size ? value.size : 0);
+          xhr.setRequestHeader("Upload-Length", this._size);
         }
+      }
 
-        xhr.send(chunk);
-      });
-      this._emitProgress(this._offset, this._size);
-    }
+      if (value === null) {
+        xhr.send();
+      } else {
+        xhr.send(value);
+        this._emitProgress(this._offset, this._size);
+      }
+    });
   }
 }