Adjusted orders and improved formatting

Author: 64ZooLane

index.js

@@ -31,45 +31,50 @@ new class {
     get_repo_name(url = this.config.repo) {
         const match = url.match(/(https?:\/{2}github\.com\/.+?\/([^\/]+))\/?/);
         if (match) return match[1];
-        else throw "Repository not provided or does not match expected format.";
+        else throw "[@] Repository not provided or does not match expected format.";
     }
 
     async get_version(cwd = this.repo_dir, remote = false) {
-        return this.execute(`git describe --abbrev=7 --always  --long --match v* ${remote ? "origin/" : ""}${this.config.branch}`, { cwd }).catch(console.warn);
+        return this.execute(`git rev-parse --short --verify ${remote ? "origin/" : ""}${this.config.branch}`, { cwd }).catch(console.warn);
     }
 
     async validate_config() {
         const repo = this.config.repo.match(/(https?:\/{2}github\.com\/.+?\/([^\/]+))\/?/);
-        if (!this.config.repo) throw "Github repository not provided!";
+        if (!this.config.repo) throw "[@] Github repository not provided!";
         else this.config.repo = repo[1];
 
-        if (!this.config.branch) throw "Github branch not provided!";
-        if (!this.config.start) throw "Start command not provided!";
+        if (!this.config.branch) throw "[@] Github branch not provided!";
+        if (!this.config.start) throw "[@] Start command not provided!";
+        if (!this.config.setup) console.warn("[!] Setup command not provided.");
+
+        if (this.config.frequency > 1000) console.warn("[!] The scan frequency should be in seconds. The value provided is VERY HIGH!")
     }
 
     match_version(cwd = this.repo_dir) {
         return new Promise(async (resolve, reject) => {
-            await this.execute("git remote update", { cwd }).catch(console.error)
+            await this.execute("git remote update", { cwd }).catch((res) => console.log("[-] " + res.split("\n")[1].trim()))
             const remote = await this.get_version(cwd, true)
             const local = await this.get_version(cwd, false)
-            if (remote === local) resolve("Remote version matches local repository.")
-            else reject("Remote does not match local repository.")
+            if (remote === local) resolve("[-] Local repository matches origin.")
+            else reject("[!] Local repository does not match origin.")
         })
     }
 
     match_origin(cwd = this.repo_dir) {
         return new Promise((resolve, reject) => {
             this.execute("git remote get-url origin", { cwd }).catch(console.error)
             .then((origin) => {
-                if (origin !== this.config.repo) reject("Origin does not match local repository.")
-                else resolve("Origin matches local repository.")
+                if (origin === this.config.repo) resolve("[-] Local repository matches origin.")
+                else reject("[!] Local repository does not match origin.")
             })
         })
     }
 
     async fork_app(cwd = this.repo_dir) {
-        if (this.app && !this.app?.killed) throw "App already alive!"
+        if (this.app && !this.app?.killed) throw "[-] App already alive!"
+        console.log("[.] Preparing environment.")
         await this.execute("npm install", { cwd }).catch(console.warn);
+        console.log("[.] Initialising fork.")
         return this.app = fork(cwd, this.config.start.split(/ +/g));
     }
 
@@ -79,7 +84,7 @@ new class {
 
     async execute(command, options = {}) {
         return new Promise((resolve, reject) => {
-            console.log(`Executing '${command}'...`);
+            // console.log(`Executing '${command}'...`);
             exec(command, options, (err, stdout, stderr) => {
                 if (err) reject(err)
                 else if (stderr) reject(stderr);
@@ -93,10 +98,10 @@ new class {
             if (this.repo_exists(this.repo_dir)) {
                 rm(dir, { recursive: true, force: true }, (err) => {
                     if (err) reject(err);
-                    else resolve("Successfully removed existing repository.")
+                    else resolve("[+] Successfully removed existing repository.")
                 });
             }
-            else resolve("Repository not found.")
+            else resolve("[!] Repository folder not found.")
         })
     }
 
@@ -106,25 +111,31 @@ new class {
 
     async reset_app() {
         if (this.app && !this.app.killed) {
-            if (this.app.kill()) console.log("App terminated successfully.")
-            else console.warn("Something went wrong while terminating app.")
+            if (this.app.kill()) console.log("[+] App terminated successfully.")
+            else console.warn("[!] Something went wrong while terminating app.")
         }
         await this.remove_dir().then(console.log).catch(console.error)
-        console.log("Cloning up-to-date repository...")
-        await this.clone(this.config.repo).then(() => console.log("Repository cloned successfully.")).catch(() => {});
+        console.log("[.] Cloning up-to-date repository.")
+        await this.clone(this.config.repo).then(() => console.log("[+] Repository cloned successfully.")).catch(() => {});
     }
 
     async scan() {
         if (!this.repo_exists()) await this.reset_app();
         else {
             await this.match_origin(this.repo_dir)
-            .catch(async () => await this.reset_app())
-            .then(async () => await this.match_version().catch(async () => await this.reset_app()))
+            .catch(async (res) => {
+                console.log(res);
+                await this.reset_app();
+            })
+            .then(async () => await this.match_version().catch(async (res) => {
+                console.warn(res);
+                await this.reset_app();
+            }))
         }
 
         await this.fork_app().catch(() => {})
 
-        return this.sleep(this.config.frequency).then(() => this.scan())
+        return this.sleep(this.config.frequency * 1000).then(() => this.scan())
     }
 
 }()