@sendsafely/sendsafely 1.1.3 → 1.1.5

package/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/lib/SendSafely.js

@@ -2077,6 +2077,9 @@ function DecryptKeycode (eventHandler) {
           randomness = sjcl.codec.utf8String.fromBits(sjcl.random.randomWords(data.bytes,6));
           window.postMessage({'cmd': 'randBuff', 'randomness': randomness},'*');
           break;
+        case 'error':
+            myself.eventHandler.raiseError(data.stacktrace, data.message, myself.customErrorEvent);
+            break;
       }		
 	}
 

package/lib/keyGeneratorWorker.js

@@ -78,30 +78,29 @@ self.addEventListener('message', async function(e) {
       }
       break;
     case 'decrypt_keycode':
-      self.randomCounter = 0;
-      self.randomness = data.randomness;
-      var privKeys = await openpgp.key.readArmored(data.privateKey);
-      privKey = privKeys.keys[0];
-      var message = await openpgp.message.readArmored(data.keyCode);
-      
-      options = 
-      {
-        message: message,   // parse armored message
-        privateKeys: [privKey]                                 // for decryption
-      };
-      
-      openpgp.decrypt(options).then(function(plaintext) {
-        self.send({'cmd': 'keycode_decrypted', 'decryptedKeycode': plaintext.data});
-        try {
-          throw new Error("Hello");
-        } catch(err) {
+      try {
+        self.randomCounter = 0;
+        self.randomness = data.randomness;
+        var privKeys = await openpgp.key.readArmored(data.privateKey);
+        privKey = privKeys.keys[0];
+        var message = await openpgp.message.readArmored(data.keyCode);
+
+        options =
+            {
+              message: message,   // parse armored message
+              privateKeys: [privKey]                                 // for decryption
+            };
+
+        openpgp.decrypt(options).then(function(plaintext) {
+          self.send({'cmd': 'keycode_decrypted', 'decryptedKeycode': plaintext.data});
+        }, function(err) {
+          debug('ERROR');
+          debug(err);
           sendError(err);
-        }
-      }, function(err) {
-        debug('ERROR');
-        debug(err);
+        });
+      } catch (err) {
         sendError(err);
-      });
+      }
       break;
     case 'randBuff':
       self.randomness += data.randomness;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sendsafely/sendsafely",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "main": "./lib/SendSafely.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"