Merge branch 'master' of https://github.com/Navy-gif/New-GBot

Intercom.js

@@ -0,0 +1,22 @@
+class Intercom {
+
+    constructor(manager, shardManager) {
+
+        this.manager = manager;
+        this.shardManager = shardManager;
+
+        // this.shardManager.on('message', this.receive.bind(this));
+
+    }
+
+    send(shard, message) {
+        shard.send(message);
+    }
+
+    receive(...args) {
+        console.log(args);
+    }
+
+}
+
+module.exports = Intercom;

Logger.js

@@ -1,8 +1,12 @@
-const Winston = require('winstonjs');
+const Winston = require('winston');
 
-class Logger extends Winston {
+class Logger {
 
-    
+    constructor(manager) {
+        
+        this.manager = manager;
+
+    }
 
 }
 

Manager.js

@@ -3,6 +3,8 @@ const { EventEmitter } = require('events');
 const ShardManager = require('./middleware/ShardManager.js');
 const StorageManager = require('./storage/StorageManager.js');
 const Registry = require('./Registry.js');
+const Intercom = require('./Intercom.js');
+const Logger = require('./Logger.js');
 
 const { Command, Setting, Inhibitor } = require('./structure/interfaces/');
 
@@ -10,11 +12,14 @@ class Manager extends EventEmitter {
 
     constructor(options) {
 
+        super();
+
         this.registry = new Registry(this);
-        this.shardManager = new ShardManager(this, './middleware/client/DiscordClient.js', options.shard)
+        this.shardManager = new ShardManager('./middleware/client/DiscordClient.js', options);
-            .spawn();
         this.storageManager = new StorageManager(this, options.storage)
             .initialize();
+
+        this.intercom = new Intercom(this, this.shardManager);
     
         this.logger = new Logger(this);
 
@@ -23,9 +28,14 @@ class Manager extends EventEmitter {
     }
     
     async build() {
-
+        try {
+            await this.shardManager.spawn();
+        }catch(e) {
+            console.log(e);
+        }
         await this.registry.loadComponents('components/commands/', Command);
 
+
         this._built = true;
 
     }

Registry.js

@@ -1,3 +1,5 @@
+const path = require('path');
+
 const { EventEmitter } = require('events'); 
 const { Collection, Util } = require('./util/');
 
@@ -5,11 +7,13 @@ class Registry extends EventEmitter {
 
     constructor(manager) {
 
+        super();
+
         this.components = new Collection();
 
     }
 
-    async loadComponents() {
+    async loadComponents(dir) {
 
         const directory = path.join(process.cwd(), 'structure/', dir); //Finds directory of component folder relative to current working directory.
         const files = Util.readdirRecursive(directory); //Loops through all folders in the directory and returns the files.

index.js

@@ -2,7 +2,7 @@ const Manager = require('./Manager.js');
 const options = require('./options.json');
 
 new Manager(options)
-    .initialize();
+    .build();
 
 process.on("unhandledRejection", (error) => {
     console.error("Unhandled promise rejection:", error); //eslint-disable-line no-console

middleware/Shard.js

@@ -3,31 +3,29 @@
 const path = require('path');
 const EventEmitter = require('events');
 
-const Util = require('../../util/Util.js');
+const { Util } = require('../util/');
 
 let childProcess = null;
 let Worker = null;
 
 class Shard extends EventEmitter {
 
-    constructor(shardManager, id) {
+    constructor(manager, id) {
 
         super();
 
-        this.manager = shardManager.manager;
+        if(manager.mode === 'process') childProcess = require('child_process');
+        else if(manager.mode === 'worker') Worker = require('worker_threads').Worker;
 
-        if(shardManager.mode === 'process') childProcess = require('child_process');
+        this.manager = manager;
-        else if(shardManager.mode === 'worker') Worker = require('worker_threads').Worker;
-
-        this.shardManager = shardManager;
         this.id = id;
-        this.args = shardManager.shardArgs || [];
+        this.args = manager.shardArgs || [];
-        this.execArgv = shardManager.execArgv;
+        this.execArgv = manager.execArgv;
         this.env = Object.assign({}, process.env, {
-            SHARDING_shardManager: true,
+            SHARDING_MANAGER: true,
             SHARDS: this.id,
-            TOTAL_SHARD_COUNT: this.shardManager.totalShards,
+            TOTAL_SHARD_COUNT: this.manager.totalShards,
-            DISCORD_TOKEN: this.shardManager.token
+            DISCORD_TOKEN: this.manager.token
         });
 
         this.ready = false;
@@ -45,15 +43,15 @@ class Shard extends EventEmitter {
         if(this.process) throw new Error(`[shard${this.id}] Sharding process already exists.`);
         if(this.worker) throw new Error(`[shard${this.id}] Sharding worker already exists.`);
 
-        if(this.shardManager.mode === 'process') {
+        if(this.manager.mode === 'process') {
-            this.process = childProcess.fork(path.resolve(this.shardManager.file), this.args, {
+            this.process = childProcess.fork(path.resolve(this.manager.file), this.args, {
                 env: this.env, 
                 execArgv: this.execArgv
             })
                 .on('message', this._handleMessage.bind(this))
                 .on('exit', this._exitListener);
-        } else if(this.shardManager.mode === 'worker') {
+        } else if(this.manager.mode === 'worker') {
-            this.worker = new Worker(path.resolve(this.shardManager.file), { workerData: this.env })
+            this.worker = new Worker(path.resolve(this.manager.file), { workerData: this.env })
                 .on('message', this._handleMessage.bind(this))
                 .on('exit', this._exitListener);
         }
@@ -65,7 +63,7 @@ class Shard extends EventEmitter {
             this.once('ready', resolve);
             this.once('disconnect', () => reject(new Error(`[shard${this.id}] Shard disconnected while readying.`)));
             this.once('death', () => reject(new Error(`[shard${this.id}] Shard died while readying.`)));
-            setTimeout(() => reject(new Error(`[shard${this.id}] Shard timed out while readying.`)), 30000);
+            setTimeout(() => reject(new Error(`[shard${this.id}] Shard timed out while readying.`)), 10000);
         });
 
         return this.process || this.worker;
@@ -176,14 +174,14 @@ class Shard extends EventEmitter {
                 return;
             }
             if(message._sFetchProp) { //Shard requesting property fetch
-                this.shardManager.fetchClientValues(message._sFetchProp).then(
+                this.manager.fetchClientValues(message._sFetchProp).then(
                     results => this.send({ _sFetchProp: message._sFetchProp, _result: results }),
                     err => this.send({ _sFetchProp: message._sFetchProp, _error: Util.makePlainError(err) })
                 );
                 return;
             }
             if(message._sEval) { //Shard requesting eval broadcast
-                this.shardManager.broadcastEval(message._sEval).then(
+                this.manager.broadcastEval(message._sEval).then(
                     results => this.send({ _sEval: message._sEval, _result: results }),
                     err => this.send({ _sEval: message._sEval, _error: Util.makePlainError(err) })
                 );
@@ -191,17 +189,17 @@ class Shard extends EventEmitter {
             }
             if(message._sRespawnAll) { //Shard requesting to respawn all shards.
                 const { shardDelay, respawnDelay, waitForReady } = message._sRespawnAll;
-                this.shardManager.respawnAll(shardDelay, respawnDelay, waitForReady).catch(() => {
+                this.manager.respawnAll(shardDelay, respawnDelay, waitForReady).catch(() => {
                 });
                 return;
             }
         }
 
-        this.shardManager.emit('message', this, message);
+        this.manager.emit('message', this, message);
 
     }
 
-    _handleExit(respawn = this.shardManager.respawn) {
+    _handleExit(respawn = this.manager.respawn) {
         this.emit('death', this.process || this.worker);
     
         this.ready = false;

middleware/ShardManager.js

@@ -5,12 +5,11 @@ const fs = require('fs');
 const EventEmitter = require('events');
 
 const Shard = require('./Shard.js');
-const Collection = require('../../util/interfaces/Collection.js');
+const { Util, Collection } = require('../util/');
-const Util = require('../../util/Util.js');
 
 class ShardManager extends EventEmitter {
 
-    constructor(manager, file, options = {}) {
+    constructor(file, options = {}) {
 
         super();
 
@@ -23,8 +22,6 @@ class ShardManager extends EventEmitter {
             token: options.bot.token
         }, options.shard);
 
-        this.manager = manager;
-
         this.file = file;
         if(!file) throw new Error("[shardmanager] File must be specified.");
         if(!path.isAbsolute(file)) this.file = path.resolve(process.cwd(), file);

middleware/client/DiscordClient.js

@@ -1,31 +1,49 @@
 const { Client } = require('discord.js');
 
+const options = require('../../options.json');
+
 const EventHooker = require('./EventHooker.js');
 const Dispatcher = require('./Dispatcher.js')
 const Resolver = require('./Resolver.js');
+const Transporter = require('./Transporter.js');
 
 const { Guild, User, Message } = require('../../structure/extensions/');
 
 class DiscordClient extends Client {
 
-    constructor(manager, options) {
+    constructor(options) {
-
-        this.manager = manager;
-        this.registry = this.manager.registry;
 
+        super(options.bot.clientOptions);
+    
         this.eventHooker = new EventHooker(this);
         this.dispatcher = new Dispatcher(this);
         this.resolver = new Resolver(this);
-
+        this.transporter = new Transporter(this);
 
         this._options = options;
         this._built = false;
 
+        process.send({
+
+        });
+
+        process.on('message', (message) => {
+
+        });
+
     }
 
     async build() {
 
-        
+        await super.login(this._options.bot.token);
+
+
+        this.on('message', (message) => {
+            console.log(message);
+            if(message.content === "kms") {
+                message.reply("ok");
+            }
+        });
 
         this._built = true;
 
@@ -37,5 +55,5 @@ class DiscordClient extends Client {
 
 module.exports = DiscordClient;
 
-const client = new DiscordClient();
+const client = new DiscordClient(options);
 client.build();

middleware/client/Resolver.js

@@ -157,6 +157,8 @@ class Resolver {
     
 }
 
+module.exports = Resolver;
+
 const filterExact = (search) => {
     return comp => comp.id.toLowerCase() === search ||
         comp.resolveable.toLowerCase() === search ||

middleware/client/Transporter.js

@@ -0,0 +1,23 @@
+class Transporter {
+
+    constructor(client, opts) {
+
+        this.client = client;
+
+        // process.on('message', this.receive.bind(this));
+
+    }
+
+    async send() {
+
+        process.send();
+
+    }
+
+    async receive(message) {
+
+    }
+
+}
+
+module.exports = Transporter;

package.json

@@ -23,6 +23,8 @@
     "escape-string-regexp": "^3.0.0",
     "eslint": "^6.8.0",
     "mongodb": "^3.5.5",
-    "mysql": "^2.18.1"
+    "mysql": "^2.18.1",
+    "node-fetch": "^2.6.0",
+    "winston": "^3.2.1"
   }
 }

storage/StorageManager.js

@@ -8,6 +8,10 @@ class StorageManager {
 
     }
 
+    async initialize() {
+
+    }
+
 }
 
 module.exports = StorageManager;

structure/extensions/Guild.js

@@ -8,7 +8,6 @@ const Guild = Structures.extend('Guild', (Guild) => {
 
             super(...args);
 
-            this.storageManager = this.manager.storageManager;
             this._settings = null; //internal cache of current guild's settings; should ALWAYS stay the same as database.
 
         }

structure/extensions/User.js

@@ -8,7 +8,6 @@ const User = Structures.extend('User', (User) => {
 
             super(...args);
 
-            this.storageManager = this.manager.storageManager;
             this._settings = null; //internal cache of current users' settings; should ALWAYS stay the same as database.
 
         }

util/Util.js

@@ -1,5 +1,8 @@
 const path = require('path');
 const fs = require('fs');
+const fetch = require('node-fetch');
+
+const has = (o, k) => Object.prototype.hasOwnProperty.call(o, k);
 
 class Util {
 
@@ -28,6 +31,36 @@ class Util {
 
     }
 
+    static delayFor(ms) {
+        return new Promise(resolve => {
+            setTimeout(resolve, ms);
+        });
+    }
+    
+    static mergeDefault(def, given) {
+        if (!given) return def;
+        for (const key in def) {
+            if (!has(given, key) || given[key] === undefined) {
+                given[key] = def[key];
+            } else if (given[key] === Object(given[key])) {
+                given[key] = Util.mergeDefault(def[key], given[key]);
+            }
+        }
+        return given;
+    }
+
+    static fetchRecommendedShards(token, guildsPerShard = 1000) {
+        if(!token) throw new Error("[util] Token missing.");
+        return fetch("https://discordapp.com/api/v7/gateway/bot", {
+            method: 'GET',
+            headers: { Authorization: `Bot ${token.replace(/^Bot\s*/i, '')}` },
+        }).then(res => {
+            if (res.ok) return res.json();
+            throw res;
+        }).then(data => data.shards * (1000 / guildsPerShard));
+    }
+
+
 }
 
 module.exports = Util;

yarn.lock

@@ -104,6 +104,13 @@ astral-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
   integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
 
+async@^2.6.1:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
+  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
+  dependencies:
+    lodash "^4.17.14"
+
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -179,7 +186,7 @@ cli-width@^2.0.0:
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
   integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
 
-color-convert@^1.9.0:
+color-convert@^1.9.0, color-convert@^1.9.1:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
   integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
@@ -198,11 +205,45 @@ color-name@1.1.3:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
-color-name@~1.1.4:
+color-name@^1.0.0, color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
+color-string@^1.5.2:
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz#c9bbc5f01b58b5492f3d6857459cb6590ce204cc"
+  integrity sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==
+  dependencies:
+    color-name "^1.0.0"
+    simple-swizzle "^0.2.2"
+
+color@3.0.x:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/color/-/color-3.0.0.tgz#d920b4328d534a3ac8295d68f7bd4ba6c427be9a"
+  integrity sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w==
+  dependencies:
+    color-convert "^1.9.1"
+    color-string "^1.5.2"
+
+colornames@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/colornames/-/colornames-1.1.1.tgz#f8889030685c7c4ff9e2a559f5077eb76a816f96"
+  integrity sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y=
+
+colors@^1.2.1:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
+  integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
+
+colorspace@1.1.x:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.2.tgz#e0128950d082b86a2168580796a0aa5d6c68d8c5"
+  integrity sha512-vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ==
+  dependencies:
+    color "3.0.x"
+    text-hex "1.0.x"
+
 combined-stream@^1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -258,6 +299,15 @@ denque@^1.4.1:
   resolved "https://registry.yarnpkg.com/denque/-/denque-1.4.1.tgz#6744ff7641c148c3f8a69c307e51235c1f4a37cf"
   integrity sha512-OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ==
 
+diagnostics@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/diagnostics/-/diagnostics-1.1.1.tgz#cab6ac33df70c9d9a727490ae43ac995a769b22a"
+  integrity sha512-8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ==
+  dependencies:
+    colorspace "1.1.x"
+    enabled "1.0.x"
+    kuler "1.0.x"
+
 discord.js@discordjs/discord.js:
   version "12.1.1"
   resolved "https://codeload.github.com/discordjs/discord.js/tar.gz/828640ca263db2c95ed21e7353a2746fe6ac9fb8"
@@ -288,6 +338,18 @@ emoji-regex@^8.0.0:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
+enabled@1.0.x:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/enabled/-/enabled-1.0.2.tgz#965f6513d2c2d1c5f4652b64a2e3396467fc2f93"
+  integrity sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M=
+  dependencies:
+    env-variable "0.0.x"
+
+env-variable@0.0.x:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/env-variable/-/env-variable-0.0.6.tgz#74ab20b3786c545b62b4a4813ab8cf22726c9808"
+  integrity sha512-bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg==
+
 escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
@@ -433,6 +495,16 @@ fast-levenshtein@~2.0.6:
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
+fast-safe-stringify@^2.0.4:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz#124aa885899261f68aedb42a7c080de9da608743"
+  integrity sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==
+
+fecha@^2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/fecha/-/fecha-2.3.3.tgz#948e74157df1a32fd1b12c3a3c3cdcb6ec9d96cd"
+  integrity sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg==
+
 figures@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
@@ -549,7 +621,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@~2.0.3:
+inherits@2, inherits@^2.0.3, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -573,6 +645,11 @@ inquirer@^7.0.0:
     strip-ansi "^6.0.0"
     through "^2.3.6"
 
+is-arrayish@^0.3.1:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
+  integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
+
 is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
@@ -600,6 +677,11 @@ is-promise@^2.1.0:
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
   integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
 
+is-stream@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
+
 isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -633,6 +715,13 @@ json-stable-stringify-without-jsonify@^1.0.1:
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
   integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
 
+kuler@1.0.x:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/kuler/-/kuler-1.0.1.tgz#ef7c784f36c9fb6e16dd3150d152677b2b0228a6"
+  integrity sha512-J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ==
+  dependencies:
+    colornames "^1.1.1"
+
 levn@^0.3.0, levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
@@ -646,6 +735,17 @@ lodash@^4.17.14, lodash@^4.17.15:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
 
+logform@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/logform/-/logform-2.1.2.tgz#957155ebeb67a13164069825ce67ddb5bb2dd360"
+  integrity sha512-+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ==
+  dependencies:
+    colors "^1.2.1"
+    fast-safe-stringify "^2.0.4"
+    fecha "^2.3.3"
+    ms "^2.1.1"
+    triple-beam "^1.3.0"
+
 memory-pager@^1.0.2:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/memory-pager/-/memory-pager-1.5.0.tgz#d8751655d22d384682741c972f2c3d6dfa3e66b5"
@@ -742,6 +842,11 @@ once@^1.3.0:
   dependencies:
     wrappy "1"
 
+one-time@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/one-time/-/one-time-0.0.4.tgz#f8cdf77884826fe4dff93e3a9cc37b1e4480742e"
+  integrity sha1-+M33eISCb+Tf+T46nMN7HkSAdC4=
+
 onetime@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5"
@@ -808,7 +913,7 @@ punycode@^2.1.0:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-readable-stream@2.3.7, readable-stream@^2.3.5:
+readable-stream@2.3.7, readable-stream@^2.3.5, readable-stream@^2.3.6:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -821,6 +926,15 @@ readable-stream@2.3.7, readable-stream@^2.3.5:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
+readable-stream@^3.1.1:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
 regexpp@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
@@ -878,7 +992,7 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@^5.1.1, safe-buffer@^5.1.2:
+safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
   integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
@@ -927,6 +1041,13 @@ signal-exit@^3.0.2:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
   integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
 
+simple-swizzle@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
+  integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=
+  dependencies:
+    is-arrayish "^0.3.1"
+
 slice-ansi@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
@@ -953,6 +1074,11 @@ sqlstring@2.3.1:
   resolved "https://registry.yarnpkg.com/sqlstring/-/sqlstring-2.3.1.tgz#475393ff9e91479aea62dcaf0ca3d14983a7fb40"
   integrity sha1-R1OT/56RR5rqYtyvDKPRSYOn+0A=
 
+stack-trace@0.0.x:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
+  integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=
+
 string-width@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
@@ -971,6 +1097,13 @@ string-width@^4.1.0:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.0"
 
+string_decoder@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+  dependencies:
+    safe-buffer "~5.2.0"
+
 string_decoder@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
@@ -1021,6 +1154,11 @@ table@^5.2.3:
     slice-ansi "^2.1.0"
     string-width "^3.0.0"
 
+text-hex@1.0.x:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5"
+  integrity sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==
+
 text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -1038,6 +1176,11 @@ tmp@^0.0.33:
   dependencies:
     os-tmpdir "~1.0.2"
 
+triple-beam@^1.2.0, triple-beam@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9"
+  integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==
+
 tslib@^1.9.0:
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35"
@@ -1072,7 +1215,7 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
-util-deprecate@~1.0.1:
+util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
@@ -1089,6 +1232,29 @@ which@^1.2.9:
   dependencies:
     isexe "^2.0.0"
 
+winston-transport@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.3.0.tgz#df68c0c202482c448d9b47313c07304c2d7c2c66"
+  integrity sha512-B2wPuwUi3vhzn/51Uukcao4dIduEiPOcOt9HJ3QeaXgkJ5Z7UwpBzxS4ZGNHtrxrUvTwemsQiSys0ihOf8Mp1A==
+  dependencies:
+    readable-stream "^2.3.6"
+    triple-beam "^1.2.0"
+
+winston@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/winston/-/winston-3.2.1.tgz#63061377976c73584028be2490a1846055f77f07"
+  integrity sha512-zU6vgnS9dAWCEKg/QYigd6cgMVVNwyTzKs81XZtTFuRwJOcDdBg7AU0mXVyNbs7O5RH2zdv+BdNZUlx7mXPuOw==
+  dependencies:
+    async "^2.6.1"
+    diagnostics "^1.1.1"
+    is-stream "^1.1.0"
+    logform "^2.1.1"
+    one-time "0.0.4"
+    readable-stream "^3.1.1"
+    stack-trace "0.0.x"
+    triple-beam "^1.3.0"
+    winston-transport "^4.3.0"
+
 word-wrap@~1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"