balanceofsatoshis 12.26.4 → 12.26.5

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Versions
 
+## 12.26.5
+
+- `telegram`: Optimize /command speed by reducing duplicate wallet info calls
+
 ## 12.26.4
 
 - `telegram`: Fix button push handling and responding to button push queries

package/package.json

@@ -36,7 +36,7 @@
     "ini": "3.0.1",
     "inquirer": "9.1.0",
     "ln-accounting": "5.0.7",
-    "ln-service": "53.20.0",
+    "ln-service": "53.21.0",
     "ln-sync": "3.13.1",
     "ln-telegram": "3.22.3",
     "moment": "2.29.4",
@@ -83,5 +83,5 @@
     "postpublish": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t alexbosworth/balanceofsatoshis --push .",
     "test": "tap --branches=1 --functions=1 --lines=1 --statements=1 -t 60 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": "12.26.4"
+  "version": "12.26.5"
 }

package/telegram/get_node_details.js

@@ -1,18 +1,19 @@
 const asyncAuto = require('async/auto');
-const asyncMap = require('async/map');
 const {returnResult} = require('asyncjs-util');
-const {getWalletInfo} = require('ln-service');
 
 const {getLnds} = require('./../lnd');
 
-const fromName = node => `${node.alias} ${node.public_key.substring(0, 8)}`;
 const {isArray} = Array;
-const sanitize = n => (n || '').replace(/_/g, '\\_').replace(/[*~`]/g, '');
 
 /** Get node details for telegram commands
 
   {
     logger: <Winston Logger Object>
+    names: [{
+      alias: <Node Alias String>
+      from: <Node Name String>
+      public_key: <Node Identity Public Key Hex String>
+    }]
     nodes: [<Saved Node Name String>]
   }
 
@@ -26,7 +27,7 @@ const sanitize = n => (n || '').replace(/_/g, '\\_').replace(/[*~`]/g, '');
     }]
   }
 */
-module.exports = ({logger, nodes}, cbk) => {
+module.exports = ({logger, names, nodes}, cbk) => {
   return new Promise((resolve, reject) => {
     return asyncAuto({
       // Check arguments
@@ -45,32 +46,19 @@ module.exports = ({logger, nodes}, cbk) => {
       // Get associated LNDs
       getLnds: ['validate', ({}, cbk) => getLnds({logger, nodes}, cbk)],
 
-      // Get node info for the nodes
-      getNodes: ['getLnds', ({getLnds}, cbk) => {
-        return asyncMap(getLnds.lnds, (lnd, cbk) => {
-          return getWalletInfo({lnd}, (err, res) => {
-            if (!!err) {
-              return cbk([503, 'FailedToGetNodeInfoForTelegramNode', {err}]);
-            }
-
-            const named = fromName({
-              alias: res.alias,
-              public_key: res.public_key,
-            });
+      // Merge node info for the nodes
+      nodes: ['getLnds', ({getLnds}, cbk) => {
+        const nodes = getLnds.lnds.map((lnd, i) => {
+          return {
+            lnd,
+            alias: names[i].alias,
+            from: names[i].from,
+            public_key: names[i].public_key,
+          };
+        });
 
-            return cbk(null, {
-              lnd,
-              alias: res.alias,
-              from: sanitize(named),
-              public_key: res.public_key,
-            });
-          });
-        },
-        cbk);
+        return cbk(null, {nodes});
       }],
-
-      // List of nodes with details
-      nodes: ['getNodes', ({getNodes}, cbk) => cbk(null, {nodes: getNodes})],
     },
     returnResult({reject, resolve, of: 'nodes'}, cbk));
   });

package/telegram/start_telegram_bot.js

@@ -56,7 +56,7 @@ const {version} = require('./../package');
 
 const fileAsDoc = file => new InputFile(file.source, file.filename);
 const fromName = node => `${node.alias} ${node.public_key.substring(0, 8)}`;
-const getDetails = (logger, nodes) => getNodeDetails({logger, nodes});
+const getLnds = (x, y, z) => getNodeDetails({logger: x, names: y, nodes: z});
 const {isArray} = Array;
 const isHash = n => /^[0-9A-F]{64}$/i.test(n);
 let isBotInit = false;
@@ -164,6 +164,12 @@ module.exports = (args, cbk) => {
           return cbk();
         }
 
+        const names = getNodes.map(node => ({
+          alias: node.alias,
+          from: node.from,
+          public_key: node.public_key,
+        }));
+
         args.bot.catch(err => args.logger.error({telegram_error: err}));
 
         // Catch message editing
@@ -183,7 +189,7 @@ module.exports = (args, cbk) => {
             await handleBackupCommand({
               from: ctx.message.from.id,
               id: connectedId,
-              nodes: (await getDetails(args.logger, args.nodes)).nodes,
+              nodes: (await getLnds(args.logger, names, args.nodes)).nodes,
               reply: ctx.reply,
               send: (n, opts) => ctx.replyWithDocument(fileAsDoc(n), opts),
             });
@@ -218,7 +224,7 @@ module.exports = (args, cbk) => {
             await handleCostsCommand({
               from: ctx.message.from.id,
               id: connectedId,
-              nodes: (await getDetails(args.logger, args.nodes)).nodes,
+              nodes: (await getLnds(args.logger, names, args.nodes)).nodes,
               reply: n => ctx.reply(n, markdown),
               request: args.request,
               working: () => ctx.replyWithChatAction('typing'),
@@ -234,7 +240,7 @@ module.exports = (args, cbk) => {
             await handleEarningsCommand({
               from: ctx.message.from.id,
               id: connectedId,
-              nodes: (await getDetails(args.logger, args.nodes)).nodes,
+              nodes: (await getLnds(args.logger, names, args.nodes)).nodes,
               reply: n => ctx.reply(n, markdown),
               working: () => ctx.replyWithChatAction('typing'),
             });
@@ -249,7 +255,7 @@ module.exports = (args, cbk) => {
             await handleGraphCommand({
               from: ctx.message.from.id,
               id: connectedId,
-              nodes: (await getDetails(args.logger, args.nodes)).nodes,
+              nodes: (await getLnds(args.logger, names, args.nodes)).nodes,
               remove: () => ctx.deleteMessage(),
               reply: (message, options) => ctx.reply(message, options),
               text: ctx.message.text,
@@ -266,7 +272,7 @@ module.exports = (args, cbk) => {
             await handleInfoCommand({
               from: ctx.message.from.id,
               id: connectedId,
-              nodes: (await getDetails(args.logger, args.nodes)).nodes,
+              nodes: (await getLnds(args.logger, names, args.nodes)).nodes,
               remove: () => ctx.deleteMessage(),
               reply: (message, options) => ctx.reply(message, options),
             });
@@ -281,7 +287,7 @@ module.exports = (args, cbk) => {
             await handleInvoiceCommand({
               ctx,
               id: connectedId,
-              nodes: (await getDetails(args.logger, args.nodes)).nodes,
+              nodes: (await getLnds(args.logger, names, args.nodes)).nodes,
             });
           } catch (err) {
             args.logger.error({err});
@@ -317,7 +323,7 @@ module.exports = (args, cbk) => {
               await handleLiquidityCommand({
                 from: ctx.message.from.id,
                 id: connectedId,
-                nodes: (await getDetails(args.logger, args.nodes)).nodes,
+                nodes: (await getLnds(args.logger, names, args.nodes)).nodes,
                 reply: (n, opt) => ctx.reply(n, opt),
                 text: ctx.message.text,
                 working: () => ctx.replyWithChatAction('typing'),
@@ -346,7 +352,7 @@ module.exports = (args, cbk) => {
               budget,
               from: ctx.message.from.id,
               id: connectedId,
-              nodes: (await getDetails(args.logger, args.nodes)).nodes,
+              nodes: (await getLnds(args.logger, names, args.nodes)).nodes,
               reply: message => ctx.reply(message, markdown),
               request: args.request,
               text: ctx.message.text,
@@ -365,7 +371,7 @@ module.exports = (args, cbk) => {
             await handlePendingCommand({
               from: ctx.message.from.id,
               id: connectedId,
-              nodes: (await getDetails(args.logger, args.nodes)).nodes,
+              nodes: (await getLnds(args.logger, names, args.nodes)).nodes,
               reply: (message, options) => ctx.reply(message, options),
               working: () => ctx.replyWithChatAction('typing'),
             });
@@ -444,7 +450,7 @@ module.exports = (args, cbk) => {
               ctx,
               bot: args.bot,
               id: connectedId,
-              nodes: (await getDetails(args.logger, args.nodes)).nodes,
+              nodes: (await getLnds(args.logger, names, args.nodes)).nodes,
             });
           } catch (err) {
             args.logger.error({err});
@@ -460,7 +466,7 @@ module.exports = (args, cbk) => {
                 ctx,
                 api: args.bot.api,
                 id: connectedId,
-                nodes: (await getDetails(args.logger, args.nodes)).nodes,
+                nodes: (await getLnds(args.logger, names, args.nodes)).nodes,
               });
             } catch (err) {
               args.logger.error({err});