favacli 0.0.15 → 0.0.16

package/build/commands/vault/create.mjs

@@ -1,11 +1,10 @@
 import fs from 'node:fs/promises';
 import keytar from 'keytar';
 import BaseCommand from '../../BaseCommand.mjs';
-import { getTwoFaLibVaultCreationUtils, TwoFaLibEvent, } from 'favalib';
+import { getTwoFaLibVaultCreationUtils } from 'favalib';
 import NodeCryptoProvider from 'favalib/cryptoProviders/node';
 import { password } from '@inquirer/prompts';
 const cryptoLib = new NodeCryptoProvider();
-const twoFaLibVaultCreationUtils = getTwoFaLibVaultCreationUtils(cryptoLib, 'cli', ['cli']);
 class VaultCreateCommand extends BaseCommand {
     constructor() {
         super(...arguments);
@@ -24,16 +23,21 @@ class VaultCreateCommand extends BaseCommand {
         examples: [['Create a new vault', 'vault create']],
     }); }
     async exec() {
+        const twoFaLibVaultCreationUtils = getTwoFaLibVaultCreationUtils(cryptoLib, 'cli', ['cli'], (newLockedRepresentationString) => fs.writeFile(this.settings.vaultLocation, newLockedRepresentationString));
         const passphrase = (await password({
             message: 'Enter your vault passphrase:',
             mask: '*',
         }));
+        const repeatPassphrase = (await password({
+            message: 'Repeat your vault passphrase:',
+            mask: '*',
+        }));
+        if (passphrase != repeatPassphrase) {
+            throw new Error("Passphrases don't match");
+        }
         const { twoFaLib } = await twoFaLibVaultCreationUtils.createNewTwoFaLibVault(passphrase);
-        twoFaLib.addEventListener(TwoFaLibEvent.Changed, (ev) => {
-            return fs.writeFile(this.settings.vaultLocation, ev.detail.newLockedRepresentationString);
-        });
         await Promise.all([
-            twoFaLib.forceSave(),
+            twoFaLib.storage.forceSave(),
             keytar.setPassword('favacli', 'vault-passphrase', passphrase),
         ]);
         return { success: true };

package/build/main.mjs

@@ -18,7 +18,7 @@ const [, , ...args] = process.argv;
 const cli = new Cli({
     binaryLabel: 'FavaCli',
     binaryName: `favacli`,
-    binaryVersion: '0.0.15',
+    binaryVersion: '0.0.16',
 });
 cli.register(VaultCreateCommand);
 cli.register(VaultDeleteCommand);

package/build/utils/loadVault.mjs

@@ -3,16 +3,13 @@ import keytar from 'keytar';
 import { getTwoFaLibVaultCreationUtils, TwoFaLibEvent, } from 'favalib';
 import NodeCryptoProvider from 'favalib/cryptoProviders/node';
 const cryptoLib = new NodeCryptoProvider();
-const twoFaLibVaultCreationUtils = getTwoFaLibVaultCreationUtils(cryptoLib, 'cli', ['cli']);
 const loadVault = async (vaultData, settings, verbose = false) => {
-    const passphrase = (await keytar.getPassword('favacli', 'vault-passphrase'));
-    const twoFaLib = await twoFaLibVaultCreationUtils.loadTwoFaLibFromLockedRepesentation(vaultData, passphrase);
-    twoFaLib.addEventListener(TwoFaLibEvent.Changed, async (ev) => {
+    const saveFunction = async (newLockedRepresentationString) => {
         const tempFile = `${settings.vaultLocation}.tmp`;
         const backupFile = `${settings.vaultLocation}.backup`;
         try {
             // Write to temporary file first, so we don't have to worry about partial writes
-            await fs.writeFile(tempFile, ev.detail.newLockedRepresentationString);
+            await fs.writeFile(tempFile, newLockedRepresentationString);
             // Create backup of existing vault if it exists
             try {
                 await fs.copyFile(settings.vaultLocation, backupFile);
@@ -32,7 +29,10 @@ const loadVault = async (vaultData, settings, verbose = false) => {
             });
             throw error;
         }
-    });
+    };
+    const twoFaLibVaultCreationUtils = getTwoFaLibVaultCreationUtils(cryptoLib, 'cli', ['cli'], saveFunction);
+    const passphrase = (await keytar.getPassword('favacli', 'vault-passphrase'));
+    const twoFaLib = await twoFaLibVaultCreationUtils.loadTwoFaLibFromLockedRepesentation(vaultData, passphrase);
     twoFaLib.addEventListener(TwoFaLibEvent.Log, (ev) => {
         if (ev.detail.severity !== 'info' || verbose) {
             console.log(ev.detail);

package/package.json

@@ -1,25 +1,22 @@
 {
   "name": "favacli",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "description": "",
   "type": "module",
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@inquirer/prompts": "^7.0.1",
-    "bufferutil": "^4.0.8",
+    "@inquirer/prompts": "^7.5.3",
+    "bufferutil": "^4.0.9",
     "clipanion": "^4.0.0-rc.4",
     "env-paths": "^3.0.0",
-    "favalib": "^0.0.5",
+    "favalib": "^0.0.8",
     "keytar": "^7.9.0",
-    "node-loader": "^2.0.0",
-    "ts-loader": "^9.5.1",
     "tty-table": "^4.2.3",
     "typanion": "^3.14.0"
   },
   "devDependencies": {
-    "type-fest": "^4.26.1",
-    "webpack-cli": "^5.1.4"
+    "type-fest": "^4.26.1"
   },
   "bin": {
     "favacli": "build/main.mjs"