Code cleanup

* Added engine module
* Moved tools into utility module

bot/bot.js

@@ -1,5 +1,3 @@
-let fs = require('fs');
-let sdk = require('matrix-js-sdk');
 let message = require('./message');
 let utility = require('./utility');
 let { logger } = require('./logging');
@@ -54,18 +52,6 @@ class Bot {
     }
 }
 
-function getBuildInfo(buildInfoPath) {
-    try {
-        return fs.readFileSync(buildInfoPath, "utf8");
-    } catch (err) {
-        if (err.code === 'ENOENT') {
-            return "UNKNOWN_" + utility.toISODateString(new Date());
-        } else {
-            logger.error("Unexpected Error!", err);
-        }
-    }
-}
-
 function sanitizeConfig(config) {
     let clonedConfig = { ...config };
     clonedConfig.accessToken = "******"
@@ -76,67 +62,9 @@ function create(configFile) {
     let config = require(configFile);
     logger.info("Running with config:");
     logger.debug("%o", sanitizeConfig(config));
-    let buildInfo = getBuildInfo("../build.info")
+    let buildInfo = utility.getBuildInfo("../build.info")
     logger.info("Running version: %s", buildInfo);
     return new Bot(config, buildInfo, modules);
 }
 
-function init(bot) {
-    logger.info("Initializing modules");
-    bot.initModules();
-
-    logger.info("Creating Matrix Client")
-    bot.client = sdk.createClient({
-        baseUrl: bot.config.baseUrl,
-        accessToken: bot.config.accessToken,
-        userId: bot.config.userId
-    });
-
-    bot.client.on("sync", (state, previousState, data) => {
-        switch (state) {
-            case "PREPARED":
-                bot.connected = true;
-                bot.sendStatusStartup();
-                break;
-        }
-    });
-
-    bot.client.on("RoomMember.membership", (event, member) => {
-        if (member.membership === "invite"
-            && bot.config.admin.indexOf(ember.userId) >= 0) {
-            bot.client.joinRoom(member.roomId).done(() => {
-                logger.info("Auto-joined %s", member.roomId);
-            });
-        }
-    });
-
-    /* Capture Exit Conditions */
-
-    ["SIGINT", "SIGTERM"].forEach((signature) => {
-        process.on(signature, async () => {
-            await bot.sendStatusShutdown()
-                .then(() => {
-                    logger.info("Gracefully stopping Matrix SDK Client")
-                    bot.client.stopClient();
-                });
-            process.exit(0);
-        });
-    });
-
-    process.on('exit', () => {
-        logger.info("Shutting Down");
-    });
-
-    return bot;
-}
-
-function run(bot) {
-    // logger.info("Initializing Crypto");
-    // await bot.client.initCrypto();
-    logger.info("Starting Matrix SDK Client");
-    bot.client.startClient();
-}
-
 exports.create = create;
-exports.init = init;
-exports.run = run;

bot/engine.js

@@ -0,0 +1,61 @@
+let sdk = require('matrix-js-sdk');
+let { logger } = require('./logging');
+
+function init(bot) {
+    logger.info("Initializing modules");
+    bot.initModules();
+
+    logger.info("Creating Matrix Client")
+    bot.client = sdk.createClient({
+        baseUrl: bot.config.baseUrl,
+        accessToken: bot.config.accessToken,
+        userId: bot.config.userId
+    });
+
+    bot.client.on("sync", (state, previousState, data) => {
+        switch (state) {
+            case "PREPARED":
+                bot.connected = true;
+                bot.sendStatusStartup();
+                break;
+        }
+    });
+
+    bot.client.on("RoomMember.membership", (event, member) => {
+        if (member.membership === "invite"
+            && bot.config.admin.indexOf(ember.userId) >= 0) {
+            bot.client.joinRoom(member.roomId).done(() => {
+                logger.info("Auto-joined %s", member.roomId);
+            });
+        }
+    });
+
+    /* Capture Exit Conditions */
+
+    ["SIGINT", "SIGTERM"].forEach((signature) => {
+        process.on(signature, async () => {
+            await bot.sendStatusShutdown()
+                .then(() => {
+                    logger.info("Gracefully stopping Matrix SDK Client")
+                    bot.client.stopClient();
+                });
+            process.exit(0);
+        });
+    });
+
+    process.on('exit', () => {
+        logger.info("Shutting Down");
+    });
+
+    return bot;
+}
+
+function run(bot) {
+    // logger.info("Initializing Crypto");
+    // await bot.client.initCrypto();
+    logger.info("Starting Matrix SDK Client");
+    bot.client.startClient();
+}
+
+exports.init = init;
+exports.run = run;

bot/utility.js

@@ -1,3 +1,6 @@
+let fs = require('fs');
+let { logger } = require('./logging');
+
 function toISODateString(d) {
     function pad(n) { return n < 10 ? '0' + n : n }
     return d.getUTCFullYear() + '-'
@@ -8,11 +11,24 @@ function toISODateString(d) {
         + pad(d.getUTCSeconds()) + 'Z'
 }
 
-function sleep(ms){
-    return new Promise(resolve=>{
-        setTimeout(resolve,ms)
+function getBuildInfo(buildInfoPath) {
+    try {
+        return fs.readFileSync(buildInfoPath, "utf8");
+    } catch (err) {
+        if (err.code === 'ENOENT') {
+            return "UNKNOWN_" + toISODateString(new Date());
+        } else {
+            logger.error("Unexpected Error!", err);
+        }
+    }
+}
+
+function sleep(ms) {
+    return new Promise(resolve => {
+        setTimeout(resolve, ms)
     })
 }
 
 exports.toISODateString = toISODateString;
+exports.getBuildInfo = getBuildInfo;
 exports.sleep = sleep;

index.js

@@ -1,6 +1,7 @@
-let bot = require('./bot/bot.js');
-bot.run(
-    bot.init(
+let bot = require('./bot/bot');
+let engine = require('./bot/engine')
+engine.run(
+    engine.init(
         bot.create("../data/config.json")
     )
 );