Set Upload-Length when appropriate

lib/upload.js

@@ -109,6 +109,9 @@ class BaseUpload {
     // An array of upload URLs which are used for uploading the different
     // parts, if the parallelUploads option is used.
     this._parallelUploadUrls = null
+
+    // The remote upload resource's length is deferred
+    this._uploadLengthDeferred = this.options.uploadLengthDeferred
   }
 
   /**
@@ -704,9 +707,13 @@ class BaseUpload {
           return
         }
 
+        const deferLength = Number.parseInt(res.getHeader('Upload-Defer-Length'), 10)
+        this._uploadLengthDeferred = deferLength === 1
+
         const length = Number.parseInt(res.getHeader('Upload-Length'), 10)
         if (
           Number.isNaN(length) &&
+          !this._uploadLengthDeferred &&
           !this.options.uploadLengthDeferred &&
           this.options.protocol === PROTOCOL_TUS_V1
         ) {
@@ -821,9 +828,10 @@ class BaseUpload {
       // If the upload length is deferred, the upload size was not specified during
       // upload creation. So, if the file reader is done reading, we know the total
       // upload size and can tell the tus server.
-      if (this.options.uploadLengthDeferred && done) {
-        this._size = this._offset + valueSize
+      if (this._uploadLengthDeferred && (!this.options.uploadLengthDeferred || done)) {
+        this._size = done ? this._offset + valueSize : this._source.size
         req.setHeader('Upload-Length', `${this._size}`)
+        this._uploadLengthDeferred = false
       }
 
       // The specified uploadSize might not match the actual amount of data that a source

test/spec/test-common.js

@@ -1322,5 +1322,112 @@ describe('tus', () => {
       expect(options.onError).not.toHaveBeenCalled()
       expect(options.onSuccess).toHaveBeenCalled()
     })
+
+    it('should send upload length on the next request when server length is deferred and we know the total size', async () => {
+      const testStack = new TestHttpStack()
+      const file = getBlob('hello world')
+      const options = {
+        httpStack: testStack,
+        endpoint: 'http://tus.io/uploads',
+        uploadUrl: 'http://tus.io/uploads/resuming',
+        chunkSize: 4,
+      }
+
+      const upload = new tus.Upload(file, options)
+      upload.start()
+
+      let req = await testStack.nextRequest()
+      expect(req.url).toBe('http://tus.io/uploads/resuming')
+      expect(req.method).toBe('HEAD')
+
+      req.respondWith({
+        status: 204,
+        responseHeaders: {
+          'Upload-Defer-Length': 1,
+          'Upload-Offset': 5,
+        },
+      })
+
+      req = await testStack.nextRequest()
+      expect(req.url).toBe('http://tus.io/uploads/resuming')
+      expect(req.method).toBe('PATCH')
+      expect(req.requestHeaders['Upload-Offset']).toBe('5')
+      expect(req.requestHeaders['Upload-Length']).toBe('11')
+      expect(req.body.size).toBe(4)
+
+      req.respondWith({
+        status: 204,
+        responseHeaders: {
+          'Upload-Offset': 9,
+        },
+      })
+
+      req = await testStack.nextRequest()
+      expect(req.url).toBe('http://tus.io/uploads/resuming')
+      expect(req.method).toBe('PATCH')
+      expect(req.requestHeaders['Upload-Offset']).toBe('9')
+      expect(req.requestHeaders['Upload-Length']).toBe(undefined)
+
+      req.respondWith({
+        status: 204,
+        responseHeaders: {
+          'Upload-Offset': 11,
+        },
+      })
+    })
+
+    it('should send upload length at the end when server length is deferred and the file is a stream', async () => {
+      const testStack = new TestHttpStack()
+      const file = getBlob('hello world')
+      const options = {
+        httpStack: testStack,
+        uploadLengthDeferred: true,
+        endpoint: 'http://tus.io/uploads',
+        uploadUrl: 'http://tus.io/uploads/resuming',
+        chunkSize: 4,
+      }
+
+      const upload = new tus.Upload(file, options)
+      upload.start()
+
+      let req = await testStack.nextRequest()
+      expect(req.url).toBe('http://tus.io/uploads/resuming')
+      expect(req.method).toBe('HEAD')
+
+      req.respondWith({
+        status: 204,
+        responseHeaders: {
+          'Upload-Defer-Length': 1,
+          'Upload-Offset': 5,
+        },
+      })
+
+      req = await testStack.nextRequest()
+      expect(req.url).toBe('http://tus.io/uploads/resuming')
+      expect(req.method).toBe('PATCH')
+      expect(req.requestHeaders['Upload-Offset']).toBe('5')
+      expect(req.requestHeaders['Upload-Length']).toBe(undefined)
+      expect(req.body.size).toBe(4)
+
+      req.respondWith({
+        status: 204,
+        responseHeaders: {
+          'Upload-Offset': 9,
+        },
+      })
+
+      req = await testStack.nextRequest()
+      expect(req.url).toBe('http://tus.io/uploads/resuming')
+      expect(req.method).toBe('PATCH')
+      expect(req.requestHeaders['Upload-Offset']).toBe('9')
+      expect(req.requestHeaders['Upload-Length']).toBe('11')
+
+      req.respondWith({
+        status: 204,
+        responseHeaders: {
+          'Upload-Offset': 11,
+        },
+      })
+    })
   })
 })