Clean up & refine

Author: scrwdrv

assets/icon.ico

@@ -1,13 +1,12 @@
-const { compile } = require('nexe'),
+const nexe = require('nexe'),
     fs = require('fs'),
     version = JSON.parse(fs.readFileSync('./package.json', 'utf8')).version;
 
-compile({
+nexe.compile({
     input: './index.js',
-    target: 'win32-x86-10.13.0',
     name: 'safe-backup',
     build: true,
-    ico: './icon.ico',
+    ico: './assets/icon.ico',
     rc: {
         CompanyName: 'scrwdrv.tech',
         ProductName: 'Safe Backup',
@@ -16,8 +15,6 @@ compile({
         FileVersion: version,
         OriginalFilename: 'safe-backup.exe',
         InternalName: 'safe-backup',
-        LegalCopyright: 'Copyright scrwdrv contributors. MIT license.'
+        LegalCopyright: 'Copyright scrwdrv and contributors. MIT license.'
     }
-}).then(() => {
-    console.log('success');
 });

build.js

@@ -1,6 +1,5 @@
+#!/usr/bin/env node
 "use strict";
-if (process.env.isWorker)
-    Promise.resolve().then(() => require('./worker'));
-else
-    Promise.resolve().then(() => require('./master'));
-process.on('SIGINT', () => { });
+if (process.env.isWorker) require('./lib/worker');
+else require('./lib/master');
+process.on('SIGINT', () => { });

icon.ico

@@ -4,42 +4,13 @@ const cluster_ipc_logger_1 = require("cluster-ipc-logger");
 const physical_cores_1 = require("physical-cores");
 const worker_communication_1 = require("worker-communication");
 const cli_params_1 = require("cli-params");
-const readline = require("readline");
+const prompt_1 = require("./prompt");
 const cluster = require("cluster");
 const crypto = require("crypto");
 const dir = require("recurdir");
 const PATH = require("path");
 const fs = require("fs");
-class Prompt {
-    constructor() {
-        this.asking = false;
-    }
-    getRl() {
-        this.rl = readline.createInterface({
-            input: process.stdin,
-            output: process.stdout,
-            terminal: false
-        }).on('SIGINT', () => {
-            if (this.asking)
-                process.exit();
-        });
-    }
-    ask(question) {
-        return new Promise(resolve => {
-            if (!this.rl)
-                this.getRl();
-            this.asking = true;
-            this.rl.question(question, resolve);
-        });
-    }
-    end() {
-        this.rl.removeAllListeners();
-        this.rl.close();
-        this.rl = null;
-        this.asking = false;
-    }
-}
-const cpc = new worker_communication_1.default(), prompt = new Prompt(), logServer = new cluster_ipc_logger_1.loggerServer({
+const cpc = new worker_communication_1.default(), prompt = new prompt_1.default(), logServer = new cluster_ipc_logger_1.loggerServer({
     debug: false,
     directory: PATH.join(__dirname, 'logs'),
     saveInterval: 60000
@@ -154,7 +125,7 @@ process.on('SIGINT', () => exit());
             if (process.argv.length === 2)
                 log.info('No parameters were found, restoring configurations...');
             else
-                return log.error(err), exit();
+                return log.error(err), console.log(helpText), exit();
         else
             switch (id) {
                 case 'regular':
@@ -163,32 +134,10 @@ process.on('SIGINT', () => exit());
                     config.watch = args.watch;
                     if (args['save-password'] === false)
                         nosave = true;
-                    if (args.password)
-                        config.passwordHash = hashPassword(args.password);
-                    else
-                        await (function setPassword() {
-                            return new Promise(resolve => {
-                                prompt.ask('Set your password for encryption: ').then(password => prompt.ask(`Please confirm your password is \x1b[33m\x1b[1m${password}\x1b[0m [Y/N]? `).then(confirm => {
-                                    if (confirm.toLowerCase() === 'y') {
-                                        config.passwordHash = hashPassword(password);
-                                        prompt.end();
-                                        resolve();
-                                    }
-                                    else
-                                        setPassword().then(resolve);
-                                }));
-                            });
-                        })();
+                    config.passwordHash = hashPassword(args.password ? args.password : await prompt.questions.getPassword());
                     break;
                 case 'decrypt':
-                    if (args.password)
-                        config.passwordHash = hashPassword(args.password);
-                    else
-                        await new Promise(resolve => prompt.ask('Enter your password: ').then(password => {
-                            config.passwordHash = hashPassword(password);
-                            prompt.end();
-                            resolve();
-                        }));
+                    config.passwordHash = hashPassword(args.password ? args.password : await prompt.questions.getPassword());
                     if (!PATH.isAbsolute(args.decrypt))
                         return log.error(`Path must be absolute [${formatPath(args.decrypt)}]`), exit();
                     const t = Date.now();
@@ -233,7 +182,7 @@ process.on('SIGINT', () => exit());
     }
     catch (err) {
         log.debug(err);
-        log.error(`Failed to initialize, see the log file for details`);
+        log.error(`Failed to initialize, see log file for details`);
         return exit();
     }
     for (let i = physical_cores_1.default < 1 ? 1 : physical_cores_1.default; i--;)
@@ -296,7 +245,7 @@ process.on('SIGINT', () => exit());
         log.info(`Forking worker[${id}]`);
         const worker = cpc.tunnel(cluster.fork({ workerId: id, isWorker: true }));
         worker.on('exit', () => {
-            worker.removeAllListeners();
+            worker.removeAllListeners('message');
             const index = workers.indexOf(worker);
             if (index > -1)
                 workers.splice(index, 1);
@@ -317,7 +266,7 @@ process.on('SIGINT', () => exit());
         }).on('error', (err) => {
             log.debug(err);
             log.error(`Error occurred while monitoring [${formatPath(path)}], retry in 10 secs...`);
-            watcher.removeAllListeners();
+            watcher.removeAllListeners('close');
             watcher.close();
             clearTimeout(timeout);
             setTimeout(watchMod, 10000, path, isFile, retry + 1);
@@ -364,7 +313,7 @@ async function exit(retry = 0) {
     }
     for (let i = workers.length; i--;)
         workers.pop()
-            .removeAllListeners()
+            .removeAllListeners('exit')
             .kill();
     paused = null;
     if (config.watch)
@@ -390,121 +339,33 @@ function handleConfig(c) {
         else
             fs.readFile(PATH.join(__dirname, 'config.json'), 'utf8', async (err, data) => {
                 if (err)
-                    return resolve(await askQuestions().catch(reject)); //return reject(err);
+                    return resolve(await askQuestions().catch(reject));
                 config = JSON.parse(data);
                 if (c === undefined)
                     return resolve();
                 if (!config.passwordHash)
-                    await (function setPassword() {
-                        return new Promise(resolve => {
-                            prompt.ask('Enter your password for encryption: ').then(password => prompt.ask(`Please confirm your password is \x1b[33m\x1b[1m${password}\x1b[0m [Y/N]? `).then(confirm => {
-                                if (confirm.toLowerCase() === 'y') {
-                                    config.passwordHash = hashPassword(password);
-                                    prompt.end();
-                                    resolve();
-                                }
-                                else
-                                    setPassword().then(resolve);
-                            }));
-                        });
-                    })();
+                    config.passwordHash = hashPassword(await prompt.questions.getPassword());
                 resolve();
             });
     });
 }
 function askQuestions() {
     return new Promise(async (resolve, reject) => {
         log.info(`Start building configurations...`);
-        let ans = {
-            input: [],
-            output: [],
-            watch: null,
-            passwordHash: null
-        };
         try {
             await halt(500);
-            await getInput();
-            await getOutput();
-            await getPassword();
-            await getWatch();
-            await getSavePassword();
-            config = ans;
+            config.input = await prompt.questions.getInput();
+            config.output = await prompt.questions.getOutput();
+            config.watch = await prompt.questions.getWatch();
+            config.passwordHash = hashPassword(await prompt.questions.getPassword());
+            if (!await prompt.questions.getSavePassword())
+                nosave = true;
             await handleConfig(config);
             resolve();
         }
         catch (err) {
             reject(err);
         }
-        function getInput() {
-            return new Promise(resolve => {
-                prompt.ask(`Enter absolute path of folder/file to backup: `).then((path) => {
-                    ans.input.push(path);
-                    (function yn() {
-                        prompt.ask(`More file/folder to backup [Y/N]? `).then(confirm => {
-                            if (confirm.toLowerCase() === 'y')
-                                return getInput().then(resolve).catch(reject);
-                            else if (confirm.toLowerCase() === 'n')
-                                return resolve();
-                            yn();
-                        });
-                    })();
-                });
-            });
-        }
-        function getOutput() {
-            return new Promise(resolve => {
-                prompt.ask(`Enter absolute path of folder to store encrypted file: `).then((path) => {
-                    ans.output.push(path);
-                    (function yn() {
-                        prompt.ask(`More output destination [Y/N]? `).then(confirm => {
-                            if (confirm.toLowerCase() === 'y')
-                                return getOutput().then(resolve).catch(reject);
-                            else if (confirm.toLowerCase() === 'n')
-                                return resolve();
-                            yn();
-                        });
-                    })();
-                });
-            });
-        }
-        function getWatch() {
-            return new Promise(resolve => {
-                (function yn() {
-                    prompt.ask(`Enable watch mode [Y/N]? `).then(confirm => {
-                        if (confirm.toLowerCase() === 'y')
-                            return ans.watch = 60, resolve();
-                        else if (confirm.toLowerCase() === 'n')
-                            return resolve();
-                        yn();
-                    });
-                })();
-            });
-        }
-        function getPassword() {
-            return new Promise(resolve => {
-                prompt.ask('Enter your password for encryption: ').then(password => prompt.ask(`Please confirm your password is \x1b[33m\x1b[1m${password}\x1b[0m [Y/N]? `).then(confirm => {
-                    if (confirm.toLowerCase() === 'y') {
-                        ans.passwordHash = hashPassword(password);
-                        resolve();
-                    }
-                    else
-                        getPassword().then(resolve);
-                }));
-            });
-        }
-        function getSavePassword() {
-            return new Promise(resolve => {
-                (function yn() {
-                    prompt.ask(`Save your password [Y/N]? `).then(confirm => {
-                        if (confirm.toLowerCase() === 'y')
-                            return resolve();
-                        else if (confirm.toLowerCase() === 'n')
-                            return nosave = true, resolve();
-                        yn();
-                    });
-                })();
-            });
-        }
     });
 }
 function halt(ms) {

index.js

@@ -0,0 +1,94 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const readline = require("readline");
+class Prompt {
+    constructor() {
+        this.asking = false;
+        this.questions = {
+            getInput: (inputs = []) => {
+                return new Promise(resolve => this.ask(`Enter absolute path of folder/file to backup: `).then(path => {
+                    inputs.push(path);
+                    this.questions.getYn(`More file/folder to backup [Y/N]? `).then(boo => {
+                        if (boo)
+                            this.questions.getInput(inputs).then(resolve);
+                        else
+                            resolve(inputs);
+                    });
+                }));
+            },
+            getOutput: (outputs = []) => {
+                return new Promise(resolve => this.ask(`Enter absolute path of folder to store encrypted file: `).then(path => {
+                    outputs.push(path);
+                    this.questions.getYn(`More output destination [Y/N]? `).then(boo => {
+                        if (boo)
+                            this.questions.getOutput(outputs).then(resolve);
+                        else
+                            resolve(outputs);
+                    });
+                }));
+            },
+            getWatch: () => {
+                return new Promise(resolve => this.questions.getYn(`Enable watch mode [Y/N]? `).then(boo => {
+                    if (boo)
+                        resolve(60);
+                    else
+                        resolve(null);
+                }));
+            },
+            getPassword: () => {
+                return new Promise(resolve => this.ask('Enter your password for encryption: ').then(password => this.questions.getYn(`Please confirm your password is \x1b[33m\x1b[1m${password}\x1b[0m [Y/N]? `).then(boo => {
+                    if (boo)
+                        resolve(password);
+                    else
+                        this.questions.getPassword().then(resolve);
+                })));
+            },
+            getSavePassword: () => {
+                return new Promise(resolve => this.questions.getYn(`Save your password (DO NOT use it on public computers!) [Y/N]? `).then(boo => {
+                    if (boo)
+                        resolve(true);
+                    else
+                        resolve(false);
+                }));
+            },
+            getYn: (question) => {
+                return new Promise(resolve => this.ask(question).then(confirm => {
+                    if (confirm.toLowerCase() === 'y')
+                        resolve(true);
+                    else if (confirm.toLowerCase() === 'n')
+                        resolve(false);
+                    else
+                        this.questions.getYn(question).then(resolve);
+                }));
+            }
+        };
+    }
+    getRl() {
+        this.rl = readline.createInterface({
+            input: process.stdin,
+            output: process.stdout,
+            terminal: false
+        }).on('SIGINT', () => {
+            if (this.asking)
+                process.exit();
+        });
+    }
+    ask(question) {
+        return new Promise(resolve => {
+            if (!this.rl)
+                this.getRl();
+            this.asking = true;
+            this.rl.question('\n' + question + '\n \x1b[36m\x1b[1m>\x1b[0m ', (val) => {
+                this.end();
+                resolve(val);
+            });
+        });
+    }
+    end() {
+        this.rl.removeAllListeners('SIGINT');
+        this.rl.close();
+        this.rl = null;
+        this.asking = false;
+    }
+}
+exports.default = Prompt;