bcup-cli 1.3.0 → 1.3.1

package/package.json

@@ -1,13 +1,15 @@
 {
   "name": "bcup-cli",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Lightweight Buttercup password manager cli",
-    "type": "module",
+  "type": "module",
   "bin": {
     "bcup-cli": "bin/cli.mjs"
   },
   "main": "index.js",
   "scripts": {
+    "build": "tsc",
+    "prepare": "npm run build",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "files": [
@@ -38,6 +40,10 @@
     "prompt-sync-history": "^1.0.1"
   },
   "devDependencies": {
-    "tsx": "^4.21.0"
+    "@types/lodash": "^4.17.21",
+    "@types/prompt-sync": "^4.2.3",
+    "@types/prompt-sync-history": "^1.0.4",
+    "tsx": "^4.21.0",
+    "typescript": "^5.9.3"
   }
 }

package/src/cli.js

@@ -0,0 +1,119 @@
+#!/usr/bin/env node
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cli = cli;
+const arg_1 = __importDefault(require("arg"));
+const flatten_1 = __importDefault(require("lodash/flatten"));
+const uniqBy_1 = __importDefault(require("lodash/uniqBy"));
+const package_json_1 = require("../package.json");
+const buttercup_1 = require("buttercup");
+const os_1 = require("os");
+const clipboardy_1 = __importDefault(require("clipboardy"));
+const chalk_1 = __importDefault(require("chalk"));
+const prompt_sync_1 = __importDefault(require("prompt-sync"));
+const prompt_sync_history_1 = __importDefault(require("prompt-sync-history"));
+function cli(args) {
+    const options = parseArgumentsIntoOptions(args);
+    const debug = options.debug || false;
+    if (debug)
+        console.log(args);
+    const bcupFile = options.bcupPath || `${(0, os_1.homedir)()}/.bcup-cli/vault.bcup`;
+    const prompt = (0, prompt_sync_1.default)({
+        history: (0, prompt_sync_history_1.default)() //open history file
+    });
+    console.log(`= ${package_json_1.name} v${package_json_1.version} (${package_json_1.description}) =`);
+    console.log(`author: ${package_json_1.author}`);
+    console.log(`license: ${package_json_1.license}`);
+    console.log(`repository: ${package_json_1.repository}\n`);
+    const password = prompt('Vault password: ', { echo: '*' });
+    if (password == undefined || password.length == 0)
+        return;
+    (0, buttercup_1.init)();
+    const datasourceCredentials = buttercup_1.Credentials.fromDatasource({
+        path: bcupFile
+    }, password);
+    const fileDatasource = new buttercup_1.FileDatasource(datasourceCredentials);
+    const credentials = buttercup_1.Credentials.fromPassword(password);
+    let num;
+    let entries;
+    let titleSearch;
+    let promptText;
+    try {
+        fileDatasource
+            .load(credentials)
+            .then(({ format, history }) => buttercup_1.Vault.createFromHistory(history, format))
+            .then(vault => {
+            do {
+                console.log("\n");
+                promptText = `Search text in folder or title. You can use RegExp (${titleSearch}): `;
+                titleSearch = prompt(promptText, titleSearch);
+                prompt.history.save();
+                const re = new RegExp(titleSearch, 'i');
+                entries = vault.findEntriesByProperty('title', re);
+                const groups = vault.findGroupsByTitle(re);
+                const groupEntries = groups.map(group => group.getEntries());
+                entries = (0, flatten_1.default)(groupEntries).concat(entries);
+                if (debug)
+                    console.log(entries);
+                entries = (0, uniqBy_1.default)(entries, entry => entry.id);
+                console.log('0 exit');
+                entries.forEach((entry, idx) => {
+                    const title = emphSearch(entry.getProperty('title'), titleSearch);
+                    const username = entry.getProperty('username');
+                    const url = entry.getProperty('URL');
+                    const group = emphSearch(entry.getGroup().getTitle(), titleSearch);
+                    const sep = ` ${chalk_1.default.bold('|')} `;
+                    console.log(`${idx + 1} ${group}${chalk_1.default.bold('->')}${title}${sep}url: ${url}${sep}username: ${username}`);
+                });
+                console.log("\n");
+                do {
+                    num = prompt('Select entry to copy or press enter to search again: ');
+                    if (debug)
+                        console.log('num: "' + num + '"');
+                    if (invalidSelection(num, entries.length)) {
+                        console.log(`wrong selection (0-${entries.length})`);
+                    }
+                    if (num === '0')
+                        return;
+                } while (invalidSelection(num, entries.length));
+                if (num === '')
+                    continue;
+                const pass = entries[num - 1].getProperty('password');
+                clipboardy_1.default.writeSync(pass);
+            } while (true);
+        });
+    }
+    catch (error) {
+        console.error(error);
+    }
+}
+function invalidSelection(num, max) {
+    return num == undefined || (num.length > 0 && (!num.match(/\d+/) || num > max || num < 0));
+}
+function emphSearch(string, titleSearch) {
+    const re = new RegExp(titleSearch, 'ig');
+    let res;
+    let newString = string;
+    while ((res = re.exec(string)) !== null) {
+        newString = newString.slice(0, res.index) + chalk_1.default.red(res[0]) + newString.slice(res.index + res[0].length);
+    }
+    return newString;
+}
+function parseArgumentsIntoOptions(rawArgs) {
+    const args = (0, arg_1.default)({
+        '--debug': Boolean,
+        '--bcup-path': String,
+        '-d': '--debug',
+        '-b': '--bcup-path',
+    }, {
+        argv: rawArgs.slice(2),
+    });
+    return {
+        debug: args['--debug'] || false,
+        bcupPath: args['--bcup-path'],
+    };
+}
+cli(process.argv);

package/src/cli.ts

@@ -4,14 +4,14 @@ import arg from 'arg';
 import flatten from 'lodash/flatten';
 import uniqBy from 'lodash/uniqBy';
 import { name, version, description, author, license, repository } from '../package.json';
-import { Vault, FileDatasource, Credentials, init } from 'buttercup';
+import { Vault, FileDatasource, Credentials, init, DatasourceLoadedData } from 'buttercup';
 import { homedir } from 'os';
 import clipboardy from 'clipboardy'
 import chalk from 'chalk'
 import promptSync from 'prompt-sync';
 import history from 'prompt-sync-history';
 
-export function cli(args) {
+export function cli(args: string[]): void {
   const options = parseArgumentsIntoOptions(args);
   const debug = options.debug || false;
   if (debug) console.log(args);
@@ -31,6 +31,7 @@ export function cli(args) {
 
   init();
   const datasourceCredentials = Credentials.fromDatasource({
+    type: 'file',
     path: bcupFile
   }, password)
   const fileDatasource = new FileDatasource(datasourceCredentials);
@@ -39,18 +40,17 @@ export function cli(args) {
 
   let num;
   let entries;
-  let titleSearch;
+  let titleSearch: string;
   let promptText;
   try {
     fileDatasource
       .load(credentials)
-      .then(({ format, history }) => Vault.createFromHistory(history, format))
+      .then(({ history }: DatasourceLoadedData) => Vault.createFromHistory(history))
       .then(vault => {
         do {
           console.log("\n");
           promptText = `Search text in folder or title. You can use RegExp (${titleSearch}): `
           titleSearch = prompt(promptText, titleSearch);
-          prompt.history.save();
           const re = new RegExp(titleSearch, 'i');
           entries = vault.findEntriesByProperty('title', re);
           const groups = vault.findGroupsByTitle(re);
@@ -60,7 +60,7 @@ export function cli(args) {
           entries = uniqBy(entries, entry => entry.id);
           console.log('0 exit');
           entries.forEach((entry, idx) => {
-              const title = emphSearch(entry.getProperty('title'), titleSearch);
+              const title = emphSearch(String(entry.getProperty('title')), titleSearch);
               const username = entry.getProperty('username');
               const url = entry.getProperty('URL');
               const group = emphSearch(entry.getGroup().getTitle(), titleSearch);
@@ -78,8 +78,8 @@ export function cli(args) {
             if (num === '0') return;
           } while (invalidSelection(num, entries.length))
           if (num === '') continue;
-          const pass = entries[num - 1].getProperty('password');
-          clipboardy.writeSync(pass);
+          const pass = entries[Number(num) - 1].getProperty('password');
+          clipboardy.writeSync(String(pass));
         } while (true)
       });
     }
@@ -88,11 +88,11 @@ export function cli(args) {
     }
 }
 
-function invalidSelection(num, max) {
-  return num == undefined || (num.length > 0 && (!num.match(/\d+/) || num > max || num < 0))
+function invalidSelection(num: string, max: number) {
+  return num == undefined || (num.length > 0 && (!num.match(/\d+/) || Number(num) > max || Number(num) < 0))
 }
 
-function emphSearch(string, titleSearch) {
+function emphSearch(string: string, titleSearch: string) {
   const re = new RegExp(titleSearch, 'ig');
 
   let res;
@@ -103,7 +103,7 @@ function emphSearch(string, titleSearch) {
   return newString;
 }
 
-function parseArgumentsIntoOptions(rawArgs) {
+function parseArgumentsIntoOptions(rawArgs: any) {
  const args = arg(
    {
      '--debug': Boolean,