secrez 1.1.1 → 1.1.2

package/src/prompts/MainPrompt.js

@@ -1,131 +1,138 @@
-const chalk = require('chalk')
-const _ = require('lodash')
-const path = require('path')
-const {InternalFs, ExternalFs, DataCache} = require('@secrez/fs')
-const Logger = require('../utils/Logger')
-const cliConfig = require('../cliConfig')
-const Commands = require('../commands')
-const welcome = require('../Welcome')
-const AliasManager = require('../utils/AliasManager')
-const ContactManager = require('../utils/ContactManager')
-
-class MainPrompt extends require('./CommandPrompt') {
+const chalk = require("chalk");
+const _ = require("lodash");
+const path = require("path");
+const { InternalFs, ExternalFs, DataCache } = require("@secrez/fs");
+const Logger = require("../utils/Logger");
+const cliConfig = require("../cliConfig");
+const Commands = require("../commands");
+const welcome = require("../Welcome");
+const AliasManager = require("../utils/AliasManager");
+const ContactManager = require("../utils/ContactManager");
 
+class MainPrompt extends require("./CommandPrompt") {
   async init(options) {
-    this.secrez = new (require('@secrez/core').Secrez())
-    await this.secrez.init(options.container, options.localDir)
-    this.secrez.cache = new DataCache(path.join(this.secrez.config.container, 'cache'), this.secrez)
-    this.secrez.cache.initEncryption('alias', 'contact')
-    await this.secrez.cache.load('id')
-    this.internalFs = new InternalFs(this.secrez)
-    this.externalFs = new ExternalFs(this.secrez)
+    this.secrez = new (require("@secrez/core").Secrez())();
+    await this.secrez.init(options.container, options.localDir);
+    this.secrez.cache = new DataCache(
+      path.join(this.secrez.config.container, "cache"),
+      this.secrez
+    );
+    this.secrez.cache.initEncryption("alias", "contact");
+    await this.secrez.cache.load("id");
+    this.internalFs = new InternalFs(this.secrez);
+    this.externalFs = new ExternalFs(this.secrez);
     this.getReady({
       historyPath: this.secrez.config.historyPath,
-      completion: 'completion',
-      commands: (new Commands(this, cliConfig)).getCommands()
-    })
-    this.cache = {}
+      completion: "completion",
+      commands: new Commands(this, cliConfig).getCommands(),
+    });
+    this.cache = {};
   }
 
   async preRun(options = {}) {
     if (!this.loggedIn) {
-      await welcome.start(this.secrez, options)
-      this.startSigintManager()
-      this.internalFs.init().then(() => delete this.showLoading)
-      this.loadingMessage = 'Initializing'
-      await this.loading()
-      await this.loadSavedHistory()
-      this.loggedIn = true
-      let alerts = this.internalFs.tree.alerts
+      await welcome.start(this.secrez, options);
+      this.startSigintManager();
+      this.internalFs.init().then(() => delete this.showLoading);
+      this.loadingMessage = "Initializing";
+      await this.loading();
+      await this.loadSavedHistory();
+      this.loggedIn = true;
+      let alerts = this.internalFs.tree.alerts;
       if (alerts.length) {
-        Logger.red(alerts[0])
-        Logger.cyan(alerts.slice(1).join('\n'))
+        Logger.red(alerts[0]);
+        Logger.cyan(alerts.slice(1).join("\n"));
       }
-      await this.secrez.cache.load('alias')
-      await this.secrez.cache.load('contact')
-      this.aliasManager = new AliasManager(this.secrez.cache)
-      this.contactManager = new ContactManager(this.secrez.cache)
+      await this.secrez.cache.load("alias");
+      await this.secrez.cache.load("contact");
+      this.aliasManager = new AliasManager(this.secrez.cache);
+      this.contactManager = new ContactManager(this.secrez.cache);
     }
   }
 
   setCache(name, index, content) {
     if (!this.cache[name]) {
-      this.resetCache(name)
+      this.resetCache(name);
     }
-    this.cache[name][index] = content
+    this.cache[name][index] = content;
   }
 
   resetCache(name) {
-    this.cache[name] = {}
+    this.cache[name] = {};
   }
 
   getCache(name, index) {
     if (!this.cache[name]) {
-      return null
+      return null;
     }
-    if (typeof index !== 'undefined') {
-      return this.cache[name][index]
+    if (typeof index !== "undefined") {
+      return this.cache[name][index];
     } else {
-      return this.cache[name]
+      return this.cache[name];
     }
   }
 
   prePromptMessage(options = {}) {
-    return chalk.reset(`Secrez ${this.internalFs.tree.name}:${this.internalFs.tree.workingNode.getPath()}`)
+    return chalk.reset(
+      `Secrez ${
+        this.internalFs.tree.name
+      }:${this.internalFs.tree.workingNode.getPath()}`
+    );
   }
 
   async postRun(options = {}) {
-    let cmd = options.cmd
-    let components = cmd.split(' ')
-    let command = components[0]
+    let cmd = options.cmd;
+    let components = cmd.split(" ");
+    let command = components[0];
     /* istanbul ignore if  */
     if (!this.basicCommands.includes(command)) {
-      command = command.replace(/^\//, '')
-      let data = this.aliasManager.get(command)
+      command = command.replace(/^\//, "");
+      let data = this.aliasManager.get(command);
       if (data) {
-        let cmds = data.content.split('&&').map(e => _.trim(e))
-        let max = 0
-        let missing = false
+        let cmds = data.content.split("&&").map((e) => _.trim(e));
+        let max = 0;
+        let missing = false;
         for (let i = 0; i < cmds.length; i++) {
-          let c = cmds[i]
-          let params = c.match(/\$\w{1}/g)
+          let c = cmds[i];
+          let params = c.match(/\$\w{1}/g);
           if (params) {
             for (let p of params) {
-              let num = parseInt(p.substring(1))
-              max = Math.max(max, num)
-              let option = components[num]
+              let num = parseInt(p.substring(1));
+              max = Math.max(max, num);
+              let option = components[num];
               if (!option) {
-                missing = true
+                missing = true;
               }
-              c = c.replace(RegExp('\\$' + num), option)
+              c = c.replace(RegExp("\\$" + num), option);
             }
           }
           if (!missing) {
-            Logger.green('>>  ' + chalk.bold.grey(c))
-            this.disableRun = i !== cmds.length - 1
-            await this.exec([c])
+            Logger.green(">>  " + chalk.bold.grey(c));
+            this.disableRun = i !== cmds.length - 1;
+            await this.exec([c]);
             if (i === cmds.length - 1) {
-              return
+              return;
             }
           }
         }
         if (missing) {
-          Logger.red(`The alias "${command}" requires ${max} parameter${max > 1 ? 's' : ''}`)
-          this.disableRun = false
+          Logger.red(
+            `The alias "${command}" requires ${max} parameter${
+              max > 1 ? "s" : ""
+            }`
+          );
+          this.disableRun = false;
         }
-        this.run()
-        return
+        this.run();
+        return;
       }
-      Logger.red('Command not found')
-      this.run()
-      return
+      Logger.red("Command not found");
+      this.run();
+      return;
     }
-    await this.exec([cmd])
-    this.previousCommandLine = cmd
-
+    await this.exec([cmd]);
+    this.previousCommandLine = cmd;
   }
-
 }
 
-module.exports = MainPrompt
-
+module.exports = MainPrompt;

package/src/prompts/MainPromptMock.js

@@ -1,43 +1,32 @@
-const path = require('path')
+const path = require("path");
 
-const {InternalFs, ExternalFs, DataCache} = require('@secrez/fs')
-const inquirerCommandPrompt = require('inquirer-command-prompt')
-
-const cliConfig = require('../cliConfig')
-const Commands = require('../commands')
+const { InternalFs, ExternalFs, DataCache } = require("@secrez/fs");
+const inquirerCommandPrompt = require("inquirer-command-prompt");
 
+const cliConfig = require("../cliConfig");
+const Commands = require("../commands");
 
 class MainPromptMock {
-
   async init(options) {
-    this.secrez = new (require('@secrez/core').Secrez())
-    await this.secrez.init(options.container, options.localDir)
-    this.secrez.cache = new DataCache(path.join(options.container, 'cache'))
-    this.internalFs = new InternalFs(this.secrez)
-    this.externalFs = new ExternalFs(this.secrez)
-    this.commands = (new Commands(this, cliConfig)).getCommands()
-    this.commandPrompt = inquirerCommandPrompt
-    this.cache = {}
+    this.secrez = new (require("@secrez/core").Secrez())();
+    await this.secrez.init(options.container, options.localDir);
+    this.secrez.cache = new DataCache(path.join(options.container, "cache"));
+    this.internalFs = new InternalFs(this.secrez);
+    this.externalFs = new ExternalFs(this.secrez);
+    this.commands = new Commands(this, cliConfig).getCommands();
+    this.commandPrompt = inquirerCommandPrompt;
+    this.cache = {};
   }
 
-  setCache() {
-  }
+  setCache() {}
 
-  getCache() {
-  }
+  getCache() {}
 
-  async run(options) {
-  }
+  async run(options) {}
 
-  async exec(cmds, noRun) {
-  }
-
-  async loading() {
-  }
+  async exec(cmds, noRun) {}
 
+  async loading() {}
 }
 
-
-
-module.exports = MainPromptMock
-
+module.exports = MainPromptMock;

package/src/prompts/MultiEditorPrompt.js

@@ -1,42 +1,41 @@
-const editAsync = require('external-editor').editAsync
-const EditorPrompt = require('inquirer/lib/prompts/editor')
-const chalk = require('chalk')
+const editAsync = require("external-editor").editAsync;
+const EditorPrompt = require("inquirer/lib/prompts/editor");
+const chalk = require("chalk");
 
 class MultiEditorPrompt extends EditorPrompt {
-
   render(error) {
-    var bottomContent = ''
-    var message = this.getQuestion()
+    var bottomContent = "";
+    var message = this.getQuestion();
 
-    if (this.status === 'answered') {
-      message += chalk.dim('Received')
+    if (this.status === "answered") {
+      message += chalk.dim("Received");
     } else {
-      message += this.opt.extraMessage || ''
+      message += this.opt.extraMessage || "";
     }
     if (error) {
-      bottomContent = chalk.red('>> ') + error
+      bottomContent = chalk.red(">> ") + error;
     }
-    this.screen.render(message, bottomContent)
+    this.screen.render(message, bottomContent);
   }
 
   async startExternalEditor() {
-    this.rl.pause()
+    this.rl.pause();
     editAsync(
-        this.currentText,
-        this.endExternalEditor.bind(this),
-        this.opt.tempDir ? {
-          dir: this.opt.tempDir
-        } : undefined
-    )
+      this.currentText,
+      this.endExternalEditor.bind(this),
+      this.opt.tempDir
+        ? {
+            dir: this.opt.tempDir,
+          }
+        : undefined
+    );
   }
 
   close() {
     if (this.opt.onClose) {
-      this.opt.onClose()
+      this.opt.onClose();
     }
   }
-
 }
 
-module.exports = MultiEditorPrompt
-
+module.exports = MultiEditorPrompt;

package/src/prompts/SigintManager.js

@@ -1,46 +1,43 @@
 class SigintManager {
-
   constructor() {
-    this.prompts = []
-    this.siginted = false
-    this.lastCalled = Date.now()
-    this.started = false
+    this.prompts = [];
+    this.siginted = false;
+    this.lastCalled = Date.now();
+    this.started = false;
   }
 
   start() {
-    if (!this.started && process.env.NODE_ENV !== 'test') {
-      process.on('SIGINT', async () => {
-        await this.onSigint()
-      })
-      this.started = true
+    if (!this.started && process.env.NODE_ENV !== "test") {
+      process.on("SIGINT", async () => {
+        await this.onSigint();
+      });
+      this.started = true;
     }
   }
 
   async onSigint() {
-    this.siginted = true
+    this.siginted = true;
     if (Date.now() - this.lastCalled < 500) {
       // eslint-disable-next-line no-process-exit
-      process.exit(0)
+      process.exit(0);
     }
-    console.info('To exit, type quit or press ^C two times')
-    this.lastCalled = Date.now()
-    return this.prompts[this.prompts.length - 1].run()
+    console.info("To exit, type quit or press ^C two times");
+    this.lastCalled = Date.now();
+    return this.prompts[this.prompts.length - 1].run();
   }
 
   async setPosition(prompt) {
-    this.prompts.push(prompt)
-    let runNow
+    this.prompts.push(prompt);
+    let runNow;
     if (this.siginted && prompt.context === 0) {
-      this.siginted = false
-      runNow = true
+      this.siginted = false;
+      runNow = true;
     }
     return {
       position: this.prompts.length - 1,
-      runNow
-    }
+      runNow,
+    };
   }
-
 }
 
-module.exports = new SigintManager
-
+module.exports = new SigintManager();

package/src/utils/AliasManager.js

@@ -1,58 +1,56 @@
 class AliasManager {
-
   constructor(cache) {
-    this.cache = cache
+    this.cache = cache;
   }
 
   get(alias) {
-    return this.cache.get('alias', alias)
+    return this.cache.get("alias", alias);
   }
 
   validateCommand(line, regularCmds) {
     /* istanbul ignore if  */
     if (!line) {
-      return 'No previous command'
+      return "No previous command";
     }
-    let cmd = line.split(' ')[0]
+    let cmd = line.split(" ")[0];
     if (this.get(cmd)) {
-      return 'Can not make an alias of an alias'
+      return "Can not make an alias of an alias";
     }
     if (regularCmds && !regularCmds[cmd]) {
-      return `"${cmd}" is not a valid command`
+      return `"${cmd}" is not a valid command`;
     }
   }
 
   validateName(name) {
     if (!/^(\w|-)+$/g.test(name)) {
-      return `The name "${name}" is invalid. Aliases' names can be any combination of upper and lower letters, numerals, underscores and hiphens`
+      return `The name "${name}" is invalid. Aliases' names can be any combination of upper and lower letters, numerals, underscores and hiphens`;
     }
   }
 
   async create(options) {
     /* istanbul ignore if  */
     if (this.get(options.name)) {
-      throw new Error(`An alias named "${options.name}" already exists`)
+      throw new Error(`An alias named "${options.name}" already exists`);
     }
-    return await this.cache.puts('alias', {
+    return await this.cache.puts("alias", {
       value: options.name,
-      content: options.commandLine
-    })
+      content: options.commandLine,
+    });
   }
 
   async remove(alias) {
-    return await this.cache.remove('alias', alias)
+    return await this.cache.remove("alias", alias);
   }
 
   async rename(existentName, alias) {
-    let old = this.get(existentName)
+    let old = this.get(existentName);
     if (await this.remove(existentName)) {
       return await this.create({
         name: alias,
-        commandLine: old.content
-      })
+        commandLine: old.content,
+      });
     }
   }
-
 }
 
-module.exports = AliasManager
+module.exports = AliasManager;

package/src/utils/ContactManager.js

@@ -1,54 +1,52 @@
 class ContactManager {
-
   constructor(cache) {
-    this.cache = cache
+    this.cache = cache;
   }
 
   get(contact) {
-    return this.cache.get('contact', contact)
+    return this.cache.get("contact", contact);
   }
 
   validateName(name) {
     if (!/^(\w|-)+$/g.test(name)) {
-      return `The name "${name}" is invalid. Aliases' names can be any combination of upper and lower letters, numerals, underscores and hiphens`
+      return `The name "${name}" is invalid. Aliases' names can be any combination of upper and lower letters, numerals, underscores and hiphens`;
     }
   }
 
   async create(options) {
     /* istanbul ignore if  */
     if (this.get(options.name)) {
-      throw new Error(`A contact named "${options.name}" already exists`)
+      throw new Error(`A contact named "${options.name}" already exists`);
     }
-    return await this.cache.puts('contact', {
+    return await this.cache.puts("contact", {
       value: options.name,
       content: JSON.stringify({
         publicKey: options.publicKey,
-        url: options.url
-      })
-    })
+        url: options.url,
+      }),
+    });
   }
 
   async remove(contact) {
-    return await this.cache.remove('contact', contact)
+    return await this.cache.remove("contact", contact);
   }
 
   async empty() {
-    let allContacts = Object.keys(this.get())
+    let allContacts = Object.keys(this.get());
     for (let contact of allContacts) {
-      await this.cache.remove('contact', contact)
+      await this.cache.remove("contact", contact);
     }
   }
 
   async rename(existentName, contact) {
-    let old = this.get(existentName)
+    let old = this.get(existentName);
     if (await this.remove(existentName)) {
       return await this.create({
         name: contact,
-        content: old.content
-      })
+        content: old.content,
+      });
     }
   }
-
 }
 
-module.exports = ContactManager
+module.exports = ContactManager;