secrez 1.1.0 → 1.1.2

package/src/commands/chat/Show.js

@@ -1,103 +1,112 @@
-const {UglyDate} = require('@secrez/utils')
-
-class Show extends require('../../Command') {
+const { UglyDate } = require("@secrez/utils");
 
+class Show extends require("../../Command") {
   setHelpAndCompletion() {
     this.cliConfig.chatCompletion.show = {
       _func: this.selfCompletion(this),
-      _self: this
-    }
-    this.cliConfig.chatCompletion.help.show = true
+      _self: this,
+    };
+    this.cliConfig.chatCompletion.help.show = true;
     this.optionDefinitions = [
       {
-        name: 'help',
-        alias: 'h',
-        type: Boolean
+        name: "help",
+        alias: "h",
+        type: Boolean,
       },
       {
-        name: 'from',
-        alias: 'f',
+        name: "from",
+        alias: "f",
         type: String,
-        multiple: true
+        multiple: true,
       },
       {
-        name: 'to',
-        alias: 't',
+        name: "to",
+        alias: "t",
         type: String,
-        multiple: true
+        multiple: true,
       },
       {
-        name: 'verbose',
-        type: Boolean
-      }
-    ]
+        name: "verbose",
+        type: Boolean,
+      },
+    ];
   }
 
   help() {
     return {
-      description: ['Show chat history in a room'],
+      description: ["Show chat history in a room"],
       examples: [
-        ['show -f 2 days -t an hour', 'after joining someone, shows all the messages from 2 days ago to 1 hour ago'],
-        ['show', 'in the joined context, shows all the messages'],
-        ['show -f 1596129722352', 'shows all the messages since the timestamp'],
-        ['show -f 2020-07-06 -t 1 hour ago', 'shows all the messages since the 6th of July to an hour ago'],
-        ['show -f 3d -t 1h', 'shows all the messages since 3 days ago to an hour ago'],
-        ['show -f 1M', 'shows all the messages since a month ago (30 days)'],
-        ['show -f 2h --verbose', 'shows the messages with exact dates and times']
-      ]
-    }
+        [
+          "show -f 2 days -t an hour",
+          "after joining someone, shows all the messages from 2 days ago to 1 hour ago",
+        ],
+        ["show", "in the joined context, shows all the messages"],
+        ["show -f 1596129722352", "shows all the messages since the timestamp"],
+        [
+          "show -f 2020-07-06 -t 1 hour ago",
+          "shows all the messages since the 6th of July to an hour ago",
+        ],
+        [
+          "show -f 3d -t 1h",
+          "shows all the messages since 3 days ago to an hour ago",
+        ],
+        ["show -f 1M", "shows all the messages since a month ago (30 days)"],
+        [
+          "show -f 2h --verbose",
+          "shows the messages with exact dates and times",
+        ],
+      ],
+    };
   }
 
   getTimestamp(date, param) {
     if (!this.uglyDate) {
-      this.uglyDate = new UglyDate()
+      this.uglyDate = new UglyDate();
     }
-    let timestamp
+    let timestamp;
     try {
-      timestamp = this.uglyDate.uglify(date)
-    } catch(e) {
+      timestamp = this.uglyDate.uglify(date);
+    } catch (e) {
       if (/^[0-9]+$/.test(date)) {
-        timestamp = parseInt(date)
+        timestamp = parseInt(date);
       }
       if (!timestamp || isNaN(timestamp)) {
         try {
-          let d = new Date(date)
-          timestamp = d.getUTCDate().getTime()
-        } catch(e) {
-          throw new Error(`Bad or unsupported date format for "--${param}"`)
+          let d = new Date(date);
+          timestamp = d.getUTCDate().getTime();
+        } catch (e) {
+          throw new Error(`Bad or unsupported date format for "--${param}"`);
         }
       }
     }
-    return timestamp
+    return timestamp;
   }
 
   async show(options) {
     if (!this.prompt.environment.room) {
-      throw new Error('You must join a conversation to use "show"')
+      throw new Error('You must join a conversation to use "show"');
     }
     if (options.from) {
-      options.minTimestamp = this.getTimestamp(options.from.join(' '), 'from')
+      options.minTimestamp = this.getTimestamp(options.from.join(" "), "from");
     }
     if (options.to) {
-      options.maxTimestamp = this.getTimestamp(options.to.join(' '), 'to')
+      options.maxTimestamp = this.getTimestamp(options.to.join(" "), "to");
     }
-    return this.prompt.environment.readHistoryMessages(options)
+    return this.prompt.environment.readHistoryMessages(options);
   }
 
   async exec(options = {}) {
     if (options.help) {
-      return this.showHelp()
+      return this.showHelp();
     }
     try {
-      this.validate(options)
-      await this.show(options)
+      this.validate(options);
+      await this.show(options);
     } catch (e) {
-      this.Logger.red(e.message)
+      this.Logger.red(e.message);
     }
-    await this.prompt.run()
+    await this.prompt.run();
   }
 }
 
-module.exports = Show
-
-
+module.exports = Show;

package/src/commands/chat/Whoami.js

@@ -1,47 +1,43 @@
-
-class Whoami extends require('../../Command') {
-
+class Whoami extends require("../../Command") {
   setHelpAndCompletion() {
     this.cliConfig.chatCompletion.whoami = {
       _func: this.selfCompletion(this),
-      _self: this
-    }
-    this.cliConfig.chatCompletion.help.whoami = true
+      _self: this,
+    };
+    this.cliConfig.chatCompletion.help.whoami = true;
     this.optionDefinitions = [
       {
-        name: 'help',
-        alias: 'h',
-        type: Boolean
-      }
-    ]
+        name: "help",
+        alias: "h",
+        type: Boolean,
+      },
+    ];
   }
 
   help() {
-    return this.prompt.environment.prompt.commands.whoami.help()
+    return this.prompt.environment.prompt.commands.whoami.help();
   }
 
   async customCompletion(options, originalLine, defaultOption) {
-    return []
+    return [];
   }
 
   async whoami(options) {
-    return await this.prompt.environment.prompt.commands.whoami.whoami(options)
+    return await this.prompt.environment.prompt.commands.whoami.whoami(options);
   }
 
   async exec(options = {}) {
     if (options.help) {
-      return this.showHelp()
+      return this.showHelp();
     }
     try {
-      this.validate(options)
-      await this.whoami(options)
+      this.validate(options);
+      await this.whoami(options);
     } catch (e) {
-      this.Logger.red(e.message)
+      this.Logger.red(e.message);
     }
-    await this.prompt.run()
+    await this.prompt.run();
   }
 }
 
-module.exports = Whoami
-
-
+module.exports = Whoami;

package/src/commands/index.js

@@ -1,44 +1,42 @@
-const fs = require('fs-extra')
-const _ = require('lodash')
+const fs = require("fs-extra");
+const _ = require("lodash");
 
 class Commands {
-
   constructor(prompt, config, subfolder) {
-    this.prompt = prompt
-    this.config = config
-    this.subfolder = subfolder
+    this.prompt = prompt;
+    this.config = config;
+    this.subfolder = subfolder;
   }
 
   getCommands(exceptions = [], refresh) {
     if (!this.list || refresh) {
-      let folder = __dirname
+      let folder = __dirname;
       if (this.subfolder) {
-        folder += '/' + this.subfolder
+        folder += "/" + this.subfolder;
       }
-      this.list = _.filter(fs.readdirSync(folder), e => e !== 'index.js')
-      this.commands = {}
+      this.list = _.filter(fs.readdirSync(folder), (e) => e !== "index.js");
+      this.commands = {};
       for (let file of this.list) {
-        let command = file.split('.')[0]
+        let command = file.split(".")[0];
         if (exceptions.includes(command)) {
-          continue
+          continue;
         }
         try {
-          const klass = require(`${folder}/${command}`)
-          const instance = new klass(this.prompt, this.config)
-          instance.setHelpAndCompletion()
-          this.commands[command.toLowerCase()] = instance
+          const klass = require(`${folder}/${command}`);
+          const instance = new klass(this.prompt, this.config);
+          instance.setHelpAndCompletion();
+          this.commands[command.toLowerCase()] = instance;
         } catch (e) {
           /* istanbul ignore if  */
-          if (process.env.NODE_ENV === 'dev') {
-            console.error(e)
-            console.debug(`${file} is not a command`)
+          if (process.env.NODE_ENV === "dev") {
+            console.error(e);
+            console.debug(`${file} is not a command`);
           }
         }
       }
     }
-    return this.commands
+    return this.commands;
   }
-
 }
 
-module.exports = Commands
+module.exports = Commands;

package/src/index.js

@@ -1,4 +1,4 @@
 module.exports = {
-  version: require('../package').version,
-  Prompt: require('./prompts/MainPromptMock')
-}
+  version: require("../package").version,
+  Prompt: require("./prompts/MainPromptMock"),
+};

package/src/prompts/ChatPrompt.js

@@ -1,162 +1,167 @@
-const chalk = require('chalk')
-const cliConfig = require('../cliConfig')
-const Commands = require('../commands')
-const {sleep, UglyDate, decolorize, getCols} = require('@secrez/utils')
-
-class ChatPrompt extends require('./CommandPrompt') {
+const chalk = require("chalk");
+const cliConfig = require("../cliConfig");
+const Commands = require("../commands");
+const { sleep, UglyDate, decolorize, getCols } = require("@secrez/utils");
 
+class ChatPrompt extends require("./CommandPrompt") {
   async init(options) {
-    this.secrez = options.secrez
+    this.secrez = options.secrez;
     this.getReady({
       historyPath: options.historyPath,
-      completion: 'chatCompletion',
-      commands: (new Commands(this, cliConfig, 'chat')).getCommands(),
+      completion: "chatCompletion",
+      commands: new Commands(this, cliConfig, "chat").getCommands(),
       environment: options.environment,
-      context: 'chat'
-    })
-    await this.loadSavedHistory()
-    this.uglyDate = new UglyDate
+      context: "chat",
+    });
+    await this.loadSavedHistory();
+    this.uglyDate = new UglyDate();
   }
 
   async start() {
-    this.stop = false
-    for (; ;) {
-      await sleep(1000)
+    this.stop = false;
+    for (;;) {
+      await sleep(1000);
       if (this.stop) {
-        break
+        break;
       }
       if (!this.environment.room || this.skip) {
-        continue
+        continue;
       }
       try {
-        let newMessages = await this.environment.courier.getRecentMessages({direction: 1})
+        let newMessages = await this.environment.courier.getRecentMessages({
+          direction: 1,
+        });
         if (newMessages.length) {
-          this.onMessages(newMessages)
+          this.onMessages(newMessages);
         }
       } catch (e) {
         // console.log(e)
-        break
+        break;
       }
     }
   }
 
   prePromptMessage(options = {}) {
     if (this.environment.room) {
-      let nicks = this.nicks(this.environment.room[0].contact)
+      let nicks = this.nicks(this.environment.room[0].contact);
       return [
-        chalk.grey(' ' + nicks[0]),
+        chalk.grey(" " + nicks[0]),
         // chalk.bold(this.environment.room[0].contact)
-      ].join('')
+      ].join("");
     } else {
-      return chalk.reset('Secrez/chat')
+      return chalk.reset("Secrez/chat");
     }
   }
 
   promptMessage() {
     if (this.environment.room) {
-      return '>'
+      return ">";
     } else {
-      return '$'
+      return "$";
     }
   }
 
-  nicks(name = '') {
-    let max = Math.max(2, name.length)
+  nicks(name = "") {
+    let max = Math.max(2, name.length);
     let result = [
-      'me' + ' '.repeat(max - 2),
-      name + ' '.repeat(max - name.length)
-    ]
-    return result
+      "me" + " ".repeat(max - 2),
+      name + " ".repeat(max - name.length),
+    ];
+    return result;
   }
 
   async onMessages(messages, options = {}) {
-    delete this.prefixLength
-    let rl = this.getRl()
-    let position = rl.cursor
-    let presetLine = rl.line
-    let diff = (presetLine.length - position)
-    process.stdout.clearLine()
-    process.stdout.cursorTo(0)
+    delete this.prefixLength;
+    let rl = this.getRl();
+    let position = rl.cursor;
+    let presetLine = rl.line;
+    let diff = presetLine.length - position;
+    process.stdout.clearLine();
+    process.stdout.cursorTo(0);
     for (let message of messages) {
-      process.stdout.write(this.formatResults(message, options) + '\n')
+      process.stdout.write(this.formatResults(message, options) + "\n");
     }
     if (options.lastLine) {
-      process.stdout.write(options.lastLine + '\n')
+      process.stdout.write(options.lastLine + "\n");
     }
     if (!options.fromHistory) {
-      process.stdout.write(this.lastPrefix + ' ' + chalk.bold('>') + ' ')
+      process.stdout.write(this.lastPrefix + " " + chalk.bold(">") + " ");
     }
-    process.stdout.write(presetLine)
-    process.stdout.moveCursor(-diff)
-    rl.line = presetLine.substring(0, presetLine.length - diff)
-    rl.write(null, {ctrl: true, name: 'e'})
-    rl.line = presetLine
+    process.stdout.write(presetLine);
+    process.stdout.moveCursor(-diff);
+    rl.line = presetLine.substring(0, presetLine.length - diff);
+    rl.write(null, { ctrl: true, name: "e" });
+    rl.line = presetLine;
   }
 
   formatSpaces(message, prefix) {
     if (!this.prefixLength) {
-      this.prefixLength = decolorize(prefix, true).length
-      this.cols = getCols()
+      this.prefixLength = decolorize(prefix, true).length;
+      this.cols = getCols();
     }
-    let cols = this.cols - this.prefixLength
-    let rows = []
+    let cols = this.cols - this.prefixLength;
+    let rows = [];
 
     for (;;) {
-      let partial = message.substring(0, cols + 1)
-      let lastIndex = partial.lastIndexOf(' ')
+      let partial = message.substring(0, cols + 1);
+      let lastIndex = partial.lastIndexOf(" ");
       rows.push(
-          (rows.length ? ' '.repeat(this.prefixLength - 1) : '') +
+        (rows.length ? " ".repeat(this.prefixLength - 1) : "") +
           (message.length < cols ? message : message.substring(0, lastIndex))
-      )
+      );
       if (message.length < cols) {
-        break
+        break;
       } else {
-        message = message.substring(lastIndex)
+        message = message.substring(lastIndex);
       }
     }
-    return rows.join('\n')
+    return rows.join("\n");
   }
 
   formatResults(message, options) {
-    let from = message.direction === 1
-    let contact = this.environment.contactsByPublicKey[message.publickey]
-    let nicks = this.nicks(contact)
-    let time = ''
+    let from = message.direction === 1;
+    let contact = this.environment.contactsByPublicKey[message.publickey];
+    let nicks = this.nicks(contact);
+    let time = "";
     if (options.fromHistory) {
       if (options.verbose) {
-        time = new Date(message.timestamp).toISOString()
+        time = new Date(message.timestamp).toISOString();
       } else {
-        time = this.uglyDate.shortify(message.timestamp)
+        time = this.uglyDate.shortify(message.timestamp);
         if (time.length < 3) {
-          time = ' ' + time
+          time = " " + time;
         }
       }
     }
     let prefix = [
-      chalk.grey(from ? '@' : ' ' + nicks[0]),
-      chalk.bold(from ? nicks[1] : ''),
-      chalk.grey(time ? ' ' + time : ''),
-      chalk.bold(' > '),
-    ].join('')
-    return prefix + chalk[from ? 'reset' : 'grey'](this.formatSpaces(message.decrypted, prefix))
+      chalk.grey(from ? "@" : " " + nicks[0]),
+      chalk.bold(from ? nicks[1] : ""),
+      chalk.grey(time ? " " + time : ""),
+      chalk.bold(" > "),
+    ].join("");
+    return (
+      prefix +
+      chalk[from ? "reset" : "grey"](
+        this.formatSpaces(message.decrypted, prefix)
+      )
+    );
   }
 
   onBeforeClose() {
-    delete this.environment.room
-    this.stop = true
+    delete this.environment.room;
+    this.stop = true;
   }
 
   async postRun(options = {}) {
-    let cmd = options.cmd.split(' ')
-    let command = cmd[0]
+    let cmd = options.cmd.split(" ");
+    let command = cmd[0];
     if (/^\//.test(command) || !this.basicCommands.includes(command)) {
-      options.cmd = `send -m "${options.cmd.replace(/^\//, '').replace(/"/g, '\\"')}"`
+      options.cmd = `send -m "${options.cmd
+        .replace(/^\//, "")
+        .replace(/"/g, '\\"')}"`;
     }
-    await this.exec([options.cmd])
+    await this.exec([options.cmd]);
   }
-
 }
 
-module.exports = ChatPrompt
-
-
+module.exports = ChatPrompt;

package/src/prompts/ChatPromptMock.js

@@ -1,30 +1,24 @@
-const cliConfig = require('../cliConfig')
-const Commands = require('../commands')
+const cliConfig = require("../cliConfig");
+const Commands = require("../commands");
 
 class ChatPromptMock {
-
   async init(options) {
-    this.secrez = options.secrez
-    this.commands = (new Commands(this, cliConfig, 'chat')).getCommands()
-    this.environment = options.environment
+    this.secrez = options.secrez;
+    this.commands = new Commands(this, cliConfig, "chat").getCommands();
+    this.environment = options.environment;
   }
 
-  async run(options) {
-  }
+  async run(options) {}
 
   onBeforeClose() {
-    delete this.environment.room
+    delete this.environment.room;
   }
 
-  async start() {
-  }
+  async start() {}
 
-  async exec(cmds, noRun) {
-  }
+  async exec(cmds, noRun) {}
 
-  async loading() {
-  }
+  async loading() {}
 }
 
-module.exports = ChatPromptMock
-
+module.exports = ChatPromptMock;