Support for native files on Apache Cordova

lib/browser/isCordova.js

@@ -1,6 +1,6 @@
-const isCordova = typeof window != "undefined" && (
-  typeof window.PhoneGap != "undefined" ||
-  typeof window.Cordova != "undefined" ||
-  typeof window.cordova != "undefined");
+const isCordova = () => typeof window != "undefined" && (
+    typeof window.PhoneGap != "undefined" ||
+    typeof window.Cordova != "undefined" ||
+    typeof window.cordova != "undefined");
 
 export default isCordova;

lib/browser/readAsByteArray.js

@@ -0,0 +1,13 @@
+/* In cordova FileReader is used to read a slice of the file */
+function readAsByteArray(chunk, done) {
+    let reader = new FileReader();
+    reader.onload = () => {
+      done(null, new Uint8Array(reader.result));
+    };
+    reader.onerror = (err) => {
+      done(err);
+    };
+    reader.readAsArrayBuffer(chunk);
+  }
+
+  export default readAsByteArray;

lib/browser/source.js

@@ -1,5 +1,4 @@
 import isReactNative from "./isReactNative";
-import isCordova from "./isCordova";
 import uriToBlob from "./uriToBlob";
 
 class FileSource {
@@ -15,26 +14,6 @@ class FileSource {
   close() {}
 }
 
-class CordovaFileSource {
-  constructor(file) {
-    this._file = file;
-    this.size = file.size;
-  }   
-
-  slice(start, end, callback) {
-    let reader = new FileReader();
-    reader.onload = () => {
-      callback(null, new Uint8Array(reader.result));
-    };
-    reader.onerror = (err) => {
-      callback(err);
-    };
-    reader.readAsArrayBuffer(this._file.slice(start, end));
-  }
-
-  close() {}   
-}
-
 export function getSource(input, chunkSize, callback) {
   // In React Native, when user selects a file, instead of a File or Blob, 
   // you usually get a file object {} with a uri property that contains
@@ -54,14 +33,6 @@ export function getSource(input, chunkSize, callback) {
     return;
   }
 
-  // In Apache Cordova applications, a FileEntry must be resolved using
-  // FileReader instances, see
-  // https://cordova.apache.org/docs/en/8.x/reference/cordova-plugin-file/index.html#read-a-file
-  if (isCordova) {
-    callback(null, new CordovaFileSource(input));
-    return;
-  }
-
   // Since we emulate the Blob type in our tests (not all target browsers
   // support it), we cannot use `instanceof` for testing whether the input value
   // can be handled. Instead, we simply check is the slice() function and the

lib/upload.js

@@ -10,6 +10,9 @@ import {newRequest, resolveUrl} from "./node/request";
 import {getSource} from "./node/source";
 import * as Storage from "./node/storage";
 
+import isCordova from "./browser/isCordova";
+import readAsByteArray from "./browser/readAsByteArray"
+
 const defaultOptions = {
   endpoint: null,
   fingerprint,
@@ -510,14 +513,27 @@ class Upload {
     if (end === Infinity || end > this._size) {
       end = this._size;
     }
-
+    
     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;
       }
 
-      xhr.send(chunk);
+      // In Apache Cordova applications, a FileEntry must be resolved using
+      // FileReader instances, see
+      // https://cordova.apache.org/docs/en/8.x/reference/cordova-plugin-file/index.html#read-a-file
+      if (isCordova()) {
+        readAsByteArray(chunk, (error, byteArray) => {
+          if (error) {
+              this._emitError(new DetailedError(`tus: could not read file (from ${start} to ${end})`, error));
+          }
+          xhr.send(byteArray);
+        });
+      } else {      
+        xhr.send(chunk);
+      }
+
     });
 
     // Emit an progress event when a new chunk begins being uploaded.