balanceofsatoshis 18.2.8 → 19.0.0

package/CHANGELOG.md

@@ -1,6 +1,17 @@
 # Versions
 
-## 18.2.8
+## 19.0.0
+
+- `install-completion`: Add command to install shell tab autocompletion
+- `uninstall-completion`: Add command to remove shell tab autocompletion
+
+### Breaking Changes
+
+The previous autocompletion mode that required editing shell profile is no
+longer supported. To enable or disable autocompletion, run the new install or
+uninstall completion commands.
+
+## 18.2.9
 
 - `graph`: represent inbound fees in policy display
 - `rebalance`: fix support for 0.18.0 inbound fees

package/README.md

@@ -54,12 +54,13 @@ bos help commandName
 If you want autocomplete on commands and options you can do:
 
 ```
-## Autocomplete on MacOS/ZSH shells (on startup: you can add this to ~/.zshrc)
-autoload -Uz compinit && compinit
-source <(bos completion zsh)
+bos install-completion
+```
+
+Or to remove autocomplete
 
-## Autocomplete on bash (on startup: add to ~/.profile or ~/.bash_profile)
-source <(bos completion bash)
+```shell
+bos uninstall-completion
 ```
 
 ## Community

package/bos

@@ -18,7 +18,9 @@ const lnService = importLazy('ln-service');
 const lnSync = importLazy('ln-sync');
 const paidServices = importLazy('paid-services');
 const prog = require('@alexbosworth/caporal');
+const tabtab = importLazy('tabtab');
 
+const autocomplete = require('./commands/autocomplete');
 const commandConstants = require('./commands/constants');
 
 const {accountingCategories} = commandConstants;
@@ -62,6 +64,7 @@ const months = [...Array(12).keys()].map(n => ++n);
 const {REPEATABLE} = prog;
 const {STRING} = prog;
 const yearMatch = /^\d{4}$/;
+
 prog
   .version(version)
 
@@ -1074,6 +1077,21 @@ prog
     });
   })
 
+  // Add tab completions
+  .command('install-completion')
+  .help('Add tab autocompletion to your shell profile')
+  .visible(false)
+  .action(async (args, options, logger) => {
+    try {
+      await tabtab.install({
+        completer: commandConstants.process,
+        name: commandConstants.process,
+      });
+    } catch (err) {
+      return logger.error({err}) && reject();
+    }
+  })
+
   // Create an invoice
   .command('invoice', 'Create an invoice and get a BOLT 11 payment request')
   .help('Amount can take m/k variables: 5*m for 5 million, 250*k = 0.0025')
@@ -2128,6 +2146,18 @@ prog
     });
   })
 
+  // Remove tab completions
+  .command('uninstall-completion')
+  .help('Remove tab autocompletion from your shell profile')
+  .visible(false)
+  .action(async (args, options, logger) => {
+    try {
+      await tabtab.uninstall({name: commandConstants.process});
+    } catch (err) {
+      return logger.error({err}) && reject();
+    }
+  })
+
   // Unlock wallet
   .command('unlock', 'Unlock wallet if locked')
   .help('Check if the wallet is locked, if so use a password file to unlock')
@@ -2197,4 +2227,6 @@ prog
     });
   });
 
+autocomplete({prog});
+
 prog.parse(process.argv);

package/commands/autocomplete.js

@@ -0,0 +1,59 @@
+const minimist = require('minimist');
+const tabtab = require('tabtab');
+
+const arguments = () => process.argv.slice(2);
+
+/** Initialize autocomplete
+
+  {
+    prog: <Caporal Program Object>
+  }
+*/
+module.exports = ({prog}) => {
+  const opts = minimist(arguments());
+
+  const args = opts._;
+
+  const completion = env => {
+    // Exit early when not completing a tab
+    if (!env.complete) {
+      return;
+    }
+
+    // Find the referenced command to see if it exists and has options
+    const command = prog.getCommands().find(n => n.name() === env.prev);
+
+    // Exit early when looking at the options for a command
+    if (!!command) {
+      return tabtab.log(command._options.map(option => ({
+        description: option._description,
+        name: option.getLongName(),
+      })));
+    }
+
+    // Filter out invisible commands
+    const visible = prog.getCommands().filter(n => n._visible);
+
+    // List all the relevant commands
+    return tabtab.log(visible.map(command => ({
+      description: command._description,
+      name: command.name(),
+    })));
+  };
+
+  // Look for completion help
+  const init = async () => {
+    const [cmd] = args;
+
+    // Exit early when not helping with completion
+    if (cmd !== 'completion') {
+      return;
+    }
+
+    const env = tabtab.parseEnv(process.env);
+
+    return completion(env);
+  };
+
+  return init();
+};

package/commands/constants.json

@@ -24,6 +24,7 @@
     "public_key"
   ],
   "priceProviders": ["coinbase", "coindesk", "coingecko"],
+  "process": "bos",
   "rateProviders": ["coindesk", "coingecko"],
   "swapTypes": ["inbound", "outbound"]
 }

package/commands/index.js

@@ -1,4 +1,5 @@
 const {accountingCategories} = require('./constants');
+const autocomplete = require('./autocomplete');
 const callRawApi = require('./call_raw_api');
 const fetchRequest = require('./fetch_request');
 const interrogate = require('./interrogate');
@@ -10,6 +11,7 @@ const {swapTypes} = require('./constants');
 
 module.exports = {
   accountingCategories,
+  autocomplete,
   callRawApi,
   fetchRequest,
   interrogate,

package/lsp/process_order.js

@@ -443,7 +443,7 @@ module.exports = (args, cbk) => {
           result: {
             announce_channel: !!message.params.announce_channel,
             channel: null,
-            channel_expiry_blocks: defaultLifetimeBlocks,
+            channel_expiry_blocks: message.params.channel_expiry_blocks,
             client_balance_sat: Number().toString(),
             funding_confirms_within_blocks: confTarget,
             created_at: new Date().toISOString(),

package/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@alexbosworth/blockchain": "2.0.0",
-    "@alexbosworth/caporal": "1.4.4",
+    "@alexbosworth/caporal": "2.0.0",
     "@alexbosworth/fiat": "2.0.0",
     "@alexbosworth/html2unicode": "1.1.5",
     "@alexbosworth/node-fetch": "2.6.2",
@@ -20,7 +20,7 @@
     "async": "3.2.5",
     "asyncjs-util": "1.2.12",
     "bech32": "2.0.0",
-    "bip66": "1.1.5",
+    "bip66": "2.0.0",
     "bitcoinjs-lib": "6.1.6",
     "bolt01": "2.0.0",
     "bolt03": "1.3.2",
@@ -31,23 +31,25 @@
     "csv-parse": "5.5.6",
     "ecpair": "2.1.0",
     "goldengate": "14.0.7",
-    "grammy": "1.25.0",
+    "grammy": "1.26.0",
     "hot-formula-parser": "4.0.0",
     "import-lazy": "4.0.0",
     "ini": "4.1.3",
-    "inquirer": "9.2.23",
+    "inquirer": "9.3.2",
     "ln-accounting": "8.0.3",
     "ln-service": "57.14.3",
     "ln-sync": "6.0.4",
     "ln-telegram": "6.1.6",
+    "minimist": "1.2.8",
     "moment": "2.30.1",
     "paid-services": "6.1.4",
     "probing": "5.0.2",
     "psbt": "3.0.0",
     "qrcode-terminal": "0.12.0",
     "sanitize-filename": "1.6.3",
-    "socks-proxy-agent": "8.0.3",
+    "socks-proxy-agent": "8.0.4",
     "table": "6.8.2",
+    "tabtab": "3.0.2",
     "tiny-secp256k1": "2.2.3",
     "window-size": "1.1.1"
   },
@@ -82,5 +84,5 @@
     "postpublish": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t alexbosworth/balanceofsatoshis -t alexbosworth/balanceofsatoshis:$npm_package_version --push .",
     "test": "npx nyc@15.1.0 node --experimental-test-coverage --test test/arrays/*.js test/balances/*.js test/chain/*.js test/display/*.js test/encryption/*.js test/lnd/*.js test/network/*.js test/nodes/*.js test/peers/*.js test/responses/*.js test/routing/*.js test/services/*.js test/swaps/*.js test/tags/*.js test/telegram/*.js test/wallets/*.js"
   },
-  "version": "18.2.8"
+  "version": "19.0.0"
 }

package/test/wallets/test_report_overview.js

@@ -22,7 +22,7 @@ const report = [
   },
   {},
   {
-    subtitle: '54 years ago',
+    subtitle: '55 years ago',
     title: 'Last Block:',
   },
   {