Minor optimizations to the error handling #17

Author: deepal

definitions/errors.js

@@ -1,9 +1,7 @@
 const constants = require('./constants');
-const errors = require('./errors');
 
 module.exports = class definitions {
     constructor() {
         this.constants = constants;
-        this.errors = errors;
     }
 };

definitions/index.js

@@ -0,0 +1,8 @@
+exports.PreProcessError = class PreProcessError extends Error {
+    constructor(...args) {
+        super(...args);
+        this.code = 'ERR_PREPROCESS';
+        this.name = 'PreProcessError';
+        this.stack = `${this.message}\n${new Error().stack}`;
+    }
+};

preprocessor/errors.js

@@ -4,6 +4,7 @@ const path = require('path');
 const { promisify } = require('util');
 const cson = require('cson');
 const { checksum } = require('./utils');
+const { PreProcessError } = require('./errors');
 
 const readFile = promisify(fs.readFile);
 const getStat = promisify(fs.stat);
@@ -13,9 +14,8 @@ class PreProcessor {
         this.container = container;
         this.logger = logger;
         this.platform = process.platform;
-        const { constants, errors } = this.container.module('definitions');
+        const { constants } = this.container.module('definitions');
         this.constants = constants;
-        this.errors = errors;
     }
 
     async processChangeSet(event, changedFile) {
@@ -65,10 +65,13 @@ class PreProcessor {
             };
         } catch (err) {
             // if err.code === 'ENOENT', it means that the 'changedFile' has been removed
-            return {
-                event: this.constants.events.FILE_DELETE,
-                file: changedFile
-            };
+            if (err.code === 'ENOENT') {
+                return {
+                    event: this.constants.events.FILE_DELETE,
+                    file: changedFile
+                };
+            }
+            throw new PreProcessError(`Error occurred while preprocessing event: ${err.message}`);
         }
     }
 }

preprocessor/index.js

@@ -21,9 +21,8 @@ module.exports = class Sync {
         this.lock = new Lock();
         this.preprocessor = this.container.module('preprocessor');
         this.github = this.container.module('github');
-        const { constants, errors } = this.container.module('definitions');
+        const { constants } = this.container.module('definitions');
         this.constants = constants;
-        this.errors = errors;
     }
 
     /**
@@ -65,6 +64,9 @@ module.exports = class Sync {
                 this.queue.enqueue(syncEvent);
                 this.logger.info(`[Queue] ${this.queue.length()} items in sync queue!`);
                 this.triggerSync();
+            })
+            .catch((err) => {
+                this.logger.error('Preprocess failed', err);
             });
     }