From 228f75de0b8c781811c2721dcacf126b6dd01e45 Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Fri, 15 May 2020 14:35:19 -0700
Subject: [PATCH] better error messages

---
 src/backups.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/backups.js b/src/backups.js
index 35088c940..66e551a5e 100644
--- a/src/backups.js
+++ b/src/backups.js
@@ -300,7 +300,7 @@ class EncryptStream extends TransformStream {
             const crypt = this._cipher.final();
             this.push(crypt);
             this._hmac.update(crypt);
-            callback(null, this._hmac.digest());
+            callback(null, this._hmac.digest()); // +32 bytes
         } catch (error) {
             callback(error);
         }
@@ -364,16 +364,16 @@ function createReadStream(sourceFile, encryption) {
     var ps = progressStream({ time: 10000 }); // display a progress every 10 seconds
 
     stream.on('error', function (error) {
-        debug('createReadStream: read stream error.', error);
-        ps.emit('error', new BoxError(BoxError.FS_ERROR, error.message));
+        debug(`createReadStream: read stream error at ${sourceFile}`, error);
+        ps.emit('error', new BoxError(BoxError.FS_ERROR, `Error reading ${sourceFile}: ${error.message}`));
     });
 
     if (encryption) {
         let encryptStream = new EncryptStream(encryption);
 
         encryptStream.on('error', function (error) {
-            debug('createReadStream: encrypt stream error.', error);
-            ps.emit('error', new BoxError(BoxError.CRYPTO_ERROR, error.message));
+            debug(`createReadStream: encrypt stream error ${sourceFile}`, error);
+            ps.emit('error', new BoxError(BoxError.CRYPTO_ERROR, `Encryption error at ${sourceFile}: ${error.message}`));
         });
 
         return stream.pipe(encryptStream).pipe(ps);
@@ -390,15 +390,15 @@ function createWriteStream(destFile, encryption) {
     var ps = progressStream({ time: 10000 }); // display a progress every 10 seconds
 
     stream.on('error', function (error) {
-        debug('createWriteStream: write stream error.', error);
-        ps.emit('error', new BoxError(BoxError.FS_ERROR, error.message));
+        debug(`createWriteStream: write stream error ${destFile}`, error);
+        ps.emit('error', new BoxError(BoxError.FS_ERROR, `Write error ${destFile}: ${error.message}`));
     });
 
     if (encryption) {
         let decrypt = new DecryptStream(encryption);
         decrypt.on('error', function (error) {
-            debug('createWriteStream: decrypt stream error.', error);
-            ps.emit('error', new BoxError(BoxError.CRYPTO_ERROR, error.message));
+            debug(`createWriteStream: decrypt stream error ${destFile}`, error);
+            ps.emit('error', new BoxError(BoxError.CRYPTO_ERROR, `Decryption error at ${destFile}: ${error.message}`));
         });
 
         ps.pipe(decrypt).pipe(stream);