balanceofsatoshis 22.0.2 → 22.1.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Versions
 
+## 22.1.1
+
+- Improve support for SOCKS proxy on old node versions
+
+## 22.1.0
+
+- Add support for LND 0.21.0
+
 ## 22.0.2
 
 ### Breaking Changes

package/README.md

@@ -7,6 +7,7 @@ Commands for working with LND balances.
 
 Supported LND versions:
 
+- v0.21.0-beta
 - v0.20.0-beta to v0.20.1-beta
 
 ## Install

package/offchain/sign_payment_request.js

@@ -104,7 +104,7 @@ module.exports = (args, cbk) => {
       },
 
       // Create a key pair for a virtual channel invoice
-      getKeyPair: ['validate', async ({}, cbk) => {
+      getKeyPair: ['validate', async ({}) => {
         // Exit early when not using a virtual channel
         if (!args.is_virtual) {
           return;

package/package.json

@@ -35,9 +35,9 @@
     "hot-formula-parser": "4.0.0",
     "import-lazy": "4.0.0",
     "ini": "7.0.0",
-    "inquirer": "13.4.3",
+    "inquirer": "14.0.2",
     "ln-accounting": "10.0.2",
-    "ln-service": "59.0.3",
+    "ln-service": "59.1.0",
     "ln-sync": "8.0.2",
     "ln-telegram": "8.0.2",
     "minimist": "1.2.8",
@@ -46,7 +46,7 @@
     "probing": "6.0.0",
     "qrcode-terminal": "0.12.0",
     "sanitize-filename": "1.6.4",
-    "socks-proxy-agent": "8.0.5",
+    "socks-proxy-agent": "10.0.0",
     "table": "6.9.0",
     "tiny-secp256k1": "2.2.4",
     "window-size": "1.1.1"
@@ -54,7 +54,7 @@
   "description": "Lightning balance CLI",
   "devDependencies": {
     "invoices": "5.0.2",
-    "ln-docker-daemons": "8.0.0"
+    "ln-docker-daemons": "8.0.1"
   },
   "engines": {
     "node": ">=22"
@@ -81,5 +81,5 @@
     "postpublish": "docker buildx build --platform linux/amd64,linux/arm64 -t alexbosworth/balanceofsatoshis -t alexbosworth/balanceofsatoshis:$npm_package_version --push .",
     "test": "npx nyc@17.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": "22.0.2"
+  "version": "22.1.1"
 }

package/telegram/get_socks_proxy.js

@@ -1,11 +1,9 @@
 const asyncAuto = require('async/auto');
 const {returnResult} = require('asyncjs-util');
-const {SocksProxyAgent} = require('socks-proxy-agent');
 
 const {parse} = JSON;
 
 /** Get a SOCKS proxy given a JSON configuration file path
-
   {
     fs: {
       getFile: <Get File From Filesystem Function>
@@ -34,6 +32,17 @@ module.exports = ({fs, path}, cbk) => {
         return cbk();
       },
 
+      // Import socks-proxy-agent as ESM
+      getSocksAgent: ['validate', async ({}) => {
+        try {
+          const {SocksProxyAgent} = await import('socks-proxy-agent');
+
+          return SocksProxyAgent;
+        } catch (err) {
+          throw([503, 'FailedToImportSocksProxyAgent', {err}]);
+        }
+      }],
+
       // Get the configuration file
       getFile: ['validate', ({}, cbk) => {
         return fs.getFile(path, (err, res) => {
@@ -50,7 +59,7 @@ module.exports = ({fs, path}, cbk) => {
       }],
 
       // Construct the SOCKS proxy agent
-      agent: ['getFile', ({getFile}, cbk) => {
+      agent: ['getFile', 'getSocksAgent', ({getFile, getSocksAgent}, cbk) => {
         try {
           parse(getFile);
         } catch (err) {
@@ -78,7 +87,7 @@ module.exports = ({fs, path}, cbk) => {
             url.username = userId;
           }
 
-          const agent = new SocksProxyAgent(url.toString());
+          const agent = new getSocksAgent(url.toString());
 
           return cbk(null, {agent});
         } catch (err) {