Merge pull request #12 from kb2abot/sync-cli-main

Sync cli main

Author: khoakomlem

main/bootloader/checkInternet.js

@@ -11,7 +11,7 @@ module.exports = {
 		try {
 			await checkInternetConnected(config);
 		} catch (e) {
-			throw `Vui long kiem tra lai ket noi internet!\nmessage:${e.message}`;
+			throw `Vui long kiem tra lai ket noi internet! (${e.message})`;
 		}
 	}
 };

main/bootloader/index.js

@@ -1,8 +1,9 @@
 module.exports = {
-	cli: require("./cli"),
+	// cli: require("./cli"),
 	checkInternet: require("./checkInternet"),
 	checkNode: require("./checkNode"),
 	foolHeroku: require("./foolHeroku"),
 	preload: require("./preload"),
 	update: require("./update"),
+	updateCli: require("./updateCli"),
 };

main/bootloader/updateCli.js

@@ -0,0 +1,20 @@
+const {execShellCommand} = require("../utils/COMMON");
+const axios = require("axios");
+
+module.exports = {
+	des: "Kiem tra va cap nhat kb2abot-cli",
+	fn: async () => {
+		const {data} = await axios.get("https://raw.githubusercontent.com/kb2abot/kb2abot-cli/main/package.json");
+		const {version} = data;
+		let currentVersion;
+		try {
+			currentVersion = await execShellCommand("kb2abot-cli -v");
+		}
+		catch (e) {
+			currentVersion = e.message;
+		}
+		if (currentVersion != version) {
+			await execShellCommand("npm i kb2abot-cli@latest -g");
+		}
+	}
+};

main/helpers/PluginManager.js

@@ -1,5 +1,4 @@
 const Manager = require("./Manager");
-const logger = require("node-color-log");
 
 module.exports = class CommandManager extends Manager {
 	constructor(plugins = {}) {
@@ -12,7 +11,7 @@ module.exports = class CommandManager extends Manager {
 		for (const name in plugins) {
 			for (const keyword of plugins[name].keywords) {
 				if (checkKeyword[keyword]) {
-					logger.warn(
+					console.newLogger.warn(
 						`Vui long kiem tra lai keyword cua plugin: ${name}.js va ${checkKeyword[keyword]}.js, bi trung keyword: ${keyword}`
 					);
 				}

main/index.js

@@ -27,18 +27,27 @@ globalThis.kb2abot = Object.assign(k2babotGlobalModel, {
 /////////////////////////////////////////////////////
 
 
-const {cli, checkInternet, checkNode, foolHeroku, preload, update} = require("./bootloader");
+const {
+	// cli,
+	checkInternet,
+	checkNode,
+	foolHeroku,
+	preload,
+	update,
+	updateCli
+} = require("./bootloader");
 const botsDir = path.join(__dirname, "../bots");
 const deployPath = path.join(__dirname, "./deploy/index.js");
 
 const tasks = [];
 const isDev = process.argv.slice(2)[0] == "dev";
 tasks.push(checkInternet);
 !isDev && tasks.push(update);
+tasks.push(updateCli);
 tasks.push(foolHeroku);
 tasks.push(checkNode);
 tasks.push(preload);
-tasks.push(cli);
+// tasks.push(cli);
 
 cluster.on("exit", (worker, code, signal) => {
 	if (signal) {
@@ -56,7 +65,9 @@ const bootloader = async () => {
 			await task.fn();
 		}
 		catch(e) {
-			console.newLogger.error(e.message);
+			console.log();
+			console.newLogger.error(e);
+			spinner.stop();
 			process.exit();
 		}
 		spinner.succeed();