@sendsafely/sendsafely 1.1.2 → 1.1.4

package/{FileUtil.js → lib/FileUtil.js}

@@ -29,6 +29,7 @@ function FileUtil(param) {
     this.eof = false;
     this.data = [];
     this.tempSize = 0;
+    this.part = 1;
 
     this.init = function() {
         return new Promise(function(resolve) {
@@ -40,7 +41,7 @@ function FileUtil(param) {
                     myself.file.name =  path.basename(myself.filePath);
 
                     if(myself.file.size > (myself.SEGMENT_SIZE/4)) {
-                        myself.file.totalParts = Math.ceil((myself.file.size-(myself.SEGMENT_SIZE/4))/myself.SEGMENT_SIZE);
+                        myself.file.totalParts = 1 + Math.ceil((myself.file.size-(myself.SEGMENT_SIZE/4))/myself.SEGMENT_SIZE);
                     } else {
                         myself.file.totalParts = 1;
                     }
@@ -56,9 +57,14 @@ function FileUtil(param) {
 
                     myself.readableStream.on('end', function() {
                         // done reading file
-                        if(!myself.eof) {
-                            myself.eof = true;
+                        myself.eof = true;
+                        if(myself.part === myself.file.totalParts) {
                             callback(true);
+                        } else {
+                            // increment extra part if file size is less than segment/4
+                            // so that we callback with an empty array
+                            myself.part++;
+                            callback(false);
                         }
                     });
                 }
@@ -71,11 +77,15 @@ function FileUtil(param) {
         if(!myself.reading && !myself.eof) {
             myself.reading = true;
             processChunk();
+        } else if(myself.part === myself.file.totalParts) {
+            //extra part padding with empty array if file size is less than segment/4
+            callback(true);
         }
     }
 
     function processChunk() {
         if(myself.tempSize === myself.SEGMENT_SIZE) {
+            myself.part++;
             // callback when data size reaches SEGMENT_SIZE
             callback(false);
         } else {

package/{SendSafely.js → lib/SendSafely.js}

@@ -2495,7 +2495,7 @@ function DownloadAndDecryptFile (eventHandler, request, serverWorkerURI) {
             myself.eventHandler.raise(progressEvent, response.size);
             return response.arrayBuffer();
         } else {
-            return response.json();
+            return response;
         }
     }).then(function(data){
         if(isValidResponse(res)) {
@@ -2504,6 +2504,9 @@ function DownloadAndDecryptFile (eventHandler, request, serverWorkerURI) {
         } else {
             raiseDownloadError(data);
         }
+    }).catch(function(error) {
+      console.error(error);
+      myself.eventHandler.raiseError("FAIL", error);
     });
     
     function isValidResponse(res) {
@@ -2511,9 +2514,9 @@ function DownloadAndDecryptFile (eventHandler, request, serverWorkerURI) {
     }
     
     function raiseDownloadError(res) {
-    	let debugStr = 'Response Code: ' + res.statusCode + ', Response Text: ' + res.statusMessage + ', Error: ' + (res.message);
-        console.log(debugStr);
-    	myself.eventHandler.raiseError("FAIL", "Server returned an error: " + debugStr);
+      console.error(res)
+      let response = 'Response Code: ' + res.status + ', Response Text: ' + res.statusText;
+    	myself.eventHandler.raiseError("FAIL", "Server returned an error: " + response);
     }
   };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sendsafely/sendsafely",
-  "version": "1.1.2",
-  "main": "SendSafely.js",
+  "version": "1.1.4",
+  "main": "./lib/SendSafely.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
@@ -29,6 +29,5 @@
   "bugs": {
     "url": "https://github.com/SendSafely/JavaScript-Node-Client-API/issues"
   },
-  "homepage": "https://github.com/SendSafely/JavaScript-Node-Client-API#readme",
-  "devDependencies": {}
+  "homepage": "https://github.com/SendSafely/JavaScript-Node-Client-API#readme"
 }