Request Params Cleanup

Ride-The-Lightning · Mar 14, 2024 · 86cef68 · 86cef68
1 parent 8d7f6e0
commit 86cef68
Show file tree

Hide file tree

Showing 40 changed files with 396 additions and 346 deletions.
diff --git a/backend/controllers/cln/channels.js b/backend/controllers/cln/channels.js
@@ -80,6 +80,7 @@ export const closeChannel = (req, res, next) => {
     });
 };
 export const listForwards = (req, res, next) => {
+    const { status } = req.body;
     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Channels', msg: 'Getting Channel List Forwards..' });
     options = common.getOptions(req);
     if (options.error) {
@@ -88,8 +89,8 @@ export const listForwards = (req, res, next) => {
     options.url = req.session.selectedNode.ln_server_url + '/v1/listforwards';
     options.body = req.body;
     request.post(options).then((body) => {
-        logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Channels', msg: 'Forwarding History Received For Status ' + req.body.status, data: body });
-        body.forwards = !body.forwards ? [] : (req.body.status === 'failed' || req.body.status === 'local_failed') ? body.forwards.slice(Math.max(0, body.forwards.length - 1000), Math.max(1000, body.forwards.length)).reverse() : body.forwards.reverse();
+        logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Channels', msg: 'Forwarding History Received For Status ' + status, data: body });
+        body.forwards = !body.forwards ? [] : (status === 'failed' || status === 'local_failed') ? body.forwards.slice(Math.max(0, body.forwards.length - 1000), Math.max(1000, body.forwards.length)).reverse() : body.forwards.reverse();
         res.status(200).json(body.forwards);
     }).catch((errRes) => {
         const err = common.handleError(errRes, 'Channels', 'Forwarding History Error', req.session.selectedNode);

diff --git a/backend/controllers/cln/network.js b/backend/controllers/cln/network.js
@@ -40,6 +40,7 @@ export const listChannels = (req, res, next) => {
     });
 };
 export const feeRates = (req, res, next) => {
+    const { style } = req.body;
     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Network', msg: 'Getting Network Fee Rates..' });
     options = common.getOptions(req);
     if (options.error) {
@@ -48,22 +49,22 @@ export const feeRates = (req, res, next) => {
     options.url = req.session.selectedNode.ln_server_url + '/v1/feerates';
     options.body = req.body;
     request.post(options).then((body) => {
-        logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Network', msg: 'Network Fee Rates Received for ' + req.body.style, data: body });
+        logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Network', msg: 'Network Fee Rates Received for ' + style, data: body });
         res.status(200).json(body);
     }).catch((errRes) => {
         const err = common.handleError(errRes, 'Network', 'Fee Rates Error', req.session.selectedNode);
         return res.status(err.statusCode).json({ message: err.message, error: err.error });
     });
 };
 export const listNodes = (req, res, next) => {
+    const filter_liquidity_ads = !!req.body.liquidity_ads;
+    delete req.body.liquidity_ads;
     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Network', msg: 'List Nodes..' });
     options = common.getOptions(req);
     if (options.error) {
         return res.status(options.statusCode).json({ message: options.message, error: options.error });
     }
     options.url = req.session.selectedNode.ln_server_url + '/v1/listnodes';
-    const filter_liquidity_ads = !!req.body.liquidity_ads;
-    delete req.body.liquidity_ads;
     options.body = req.body;
     logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Network', msg: 'List Nodes URL' + options.url });
     request.post(options).then((body) => {

diff --git a/backend/controllers/cln/offers.js b/backend/controllers/cln/offers.js
@@ -18,10 +18,11 @@ export const listOfferBookmarks = (req, res, next) => {
     });
 };
 export const deleteOfferBookmark = (req, res, next) => {
+    const { offer_str } = req.body;
     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Offers', msg: 'Deleting Offer Bookmark..' });
-    databaseService.remove(req.session.selectedNode, CollectionsEnum.OFFERS, CollectionFieldsEnum.BOLT12, req.body.offer_str).then((deleteRes) => {
+    databaseService.remove(req.session.selectedNode, CollectionsEnum.OFFERS, CollectionFieldsEnum.BOLT12, offer_str).then((deleteRes) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Offers', msg: 'Offer Bookmark Deleted', data: deleteRes });
-        res.status(204).json(req.body.offer_str);
+        res.status(204).json(offer_str);
     }).catch((errRes) => {
         const err = common.handleError(errRes, 'Offers', 'Offer Bookmark Delete Error', req.session.selectedNode);
         return res.status(err.statusCode).json({ message: err.message, error: err.error });

diff --git a/backend/controllers/cln/payments.js b/backend/controllers/cln/payments.js
@@ -95,12 +95,13 @@ export const listPayments = (req, res, next) => {
     });
 };
 export const postPayment = (req, res, next) => {
+    const { paymentType, saveToDB, bolt12, zeroAmtOffer, amount_msat, title, issuer, description } = req.body;
     options = common.getOptions(req);
     if (options.error) {
         return res.status(options.statusCode).json({ message: options.message, error: options.error });
     }
     const options_body = JSON.parse(JSON.stringify(req.body));
-    if (req.body.paymentType === 'KEYSEND') {
+    if (paymentType === 'KEYSEND') {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Payments', msg: 'Keysend Payment..' });
         options.url = req.session.selectedNode.ln_server_url + '/v1/keysend';
         delete options_body.uiMessage;
@@ -121,13 +122,13 @@ export const postPayment = (req, res, next) => {
         options.body = options_body;
     }
     else {
-        if (req.body.paymentType === 'OFFER') {
+        if (paymentType === 'OFFER') {
             logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Payments', msg: 'Sending Offer Payment..' });
         }
         else {
             logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Payments', msg: 'Sending Invoice Payment..' });
         }
-        if (req.body.paymentType === 'OFFER') {
+        if (paymentType === 'OFFER') {
             // delete amount for zero amt offer also as fetchinvoice already has amount information
             delete options_body.amount_msat;
         }
@@ -147,18 +148,18 @@ export const postPayment = (req, res, next) => {
     }
     request.post(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Payments', msg: 'Payment Sent', data: body });
-        if (req.body.paymentType === 'OFFER') {
-            if (req.body.saveToDB && req.body.bolt12) {
-                const offerToUpdate = { bolt12: req.body.bolt12, amountMSat: (req.body.zeroAmtOffer ? 0 : req.body.amount_msat), title: req.body.title, lastUpdatedAt: new Date(Date.now()).getTime() };
-                if (req.body.issuer) {
-                    offerToUpdate['issuer'] = req.body.issuer;
+        if (paymentType === 'OFFER') {
+            if (saveToDB && bolt12) {
+                const offerToUpdate = { bolt12: bolt12, amountMSat: (zeroAmtOffer ? 0 : amount_msat), title: title, lastUpdatedAt: new Date(Date.now()).getTime() };
+                if (issuer) {
+                    offerToUpdate['issuer'] = issuer;
                 }
-                if (req.body.description) {
-                    offerToUpdate['description'] = req.body.description;
+                if (description) {
+                    offerToUpdate['description'] = description;
                 }
                 // eslint-disable-next-line arrow-body-style
                 return databaseService.validateDocument(CollectionsEnum.OFFERS, offerToUpdate).then((validated) => {
-                    return databaseService.update(req.session.selectedNode, CollectionsEnum.OFFERS, offerToUpdate, CollectionFieldsEnum.BOLT12, req.body.bolt12).then((updatedOffer) => {
+                    return databaseService.update(req.session.selectedNode, CollectionsEnum.OFFERS, offerToUpdate, CollectionFieldsEnum.BOLT12, bolt12).then((updatedOffer) => {
                         logger.log({ level: 'DEBUG', fileName: 'Payments', msg: 'Offer Updated', data: updatedOffer });
                         return res.status(201).json({ paymentResponse: body, saveToDBResponse: updatedOffer });
                     }).catch((errDB) => {
@@ -174,10 +175,10 @@ export const postPayment = (req, res, next) => {
                 return res.status(201).json({ paymentResponse: body, saveToDBResponse: 'NA' });
             }
         }
-        if (req.body.paymentType === 'INVOICE') {
+        if (paymentType === 'INVOICE') {
             return res.status(201).json({ paymentResponse: body, saveToDBResponse: 'NA' });
         }
-        if (req.body.paymentType === 'KEYSEND') {
+        if (paymentType === 'KEYSEND') {
             return res.status(201).json(body);
         }
     }).catch((errRes) => {

diff --git a/backend/controllers/eclair/channels.js b/backend/controllers/eclair/channels.js
@@ -158,7 +158,8 @@ export const closeChannel = (req, res, next) => {
     });
 };
 export const circularRebalance = (req, res, next) => {
-    const crInvDescription = 'Circular rebalancing invoice for ' + (req.body.amountMsat / 1000) + ' Sats';
+    const { amountMsat, sourceNodeId, targetNodeId, ignoreNodeIds, format, sourceShortChannelId, targetShortChannelId } = req.body;
+    const crInvDescription = 'Circular rebalancing invoice for ' + (amountMsat / 1000) + ' Sats';
     options = common.getOptions(req);
     if (options.error) {
         return res.status(options.statusCode).json({ message: options.message, error: options.error });
@@ -168,22 +169,22 @@ export const circularRebalance = (req, res, next) => {
     const tillToday = (Math.round(new Date(Date.now()).getTime() / 1000)).toString();
     // Check if unpaid Invoice exists already
     listPendingInvoicesRequestCall(req.session.selectedNode).then((callRes) => {
-        const foundExistingInvoice = callRes.find((inv) => inv.description.includes(crInvDescription) && inv.amount === req.body.amountMsat && inv.expiry && inv.timestamp && ((inv.expiry + inv.timestamp) >= tillToday));
+        const foundExistingInvoice = callRes.find((inv) => inv.description.includes(crInvDescription) && inv.amount === amountMsat && inv.expiry && inv.timestamp && ((inv.expiry + inv.timestamp) >= tillToday));
         // Create new invoice if doesn't exist already
         const requestCalls = foundExistingInvoice && foundExistingInvoice.serialized ?
-            [findRouteBetweenNodesRequestCall(req.session.selectedNode, req.body.amountMsat, req.body.sourceNodeId, req.body.targetNodeId, req.body.ignoreNodeIds, req.body.format)] :
-            [findRouteBetweenNodesRequestCall(req.session.selectedNode, req.body.amountMsat, req.body.sourceNodeId, req.body.targetNodeId, req.body.ignoreNodeIds, req.body.format), createInvoiceRequestCall(req.session.selectedNode, crInvDescription, req.body.amountMsat)];
+            [findRouteBetweenNodesRequestCall(req.session.selectedNode, amountMsat, sourceNodeId, targetNodeId, ignoreNodeIds, format)] :
+            [findRouteBetweenNodesRequestCall(req.session.selectedNode, amountMsat, sourceNodeId, targetNodeId, ignoreNodeIds, format), createInvoiceRequestCall(req.session.selectedNode, crInvDescription, amountMsat)];
         Promise.all(requestCalls).then((values) => {
             // eslint-disable-next-line arrow-body-style
             const routes = values[0]?.routes?.filter((route) => {
-                return !((route.shortChannelIds[0] === req.body.sourceShortChannelId && route.shortChannelIds[1] === req.body.targetShortChannelId) ||
-                    (route.shortChannelIds[1] === req.body.sourceShortChannelId && route.shortChannelIds[0] === req.body.targetShortChannelId));
+                return !((route.shortChannelIds[0] === sourceShortChannelId && route.shortChannelIds[1] === targetShortChannelId) ||
+                    (route.shortChannelIds[1] === sourceShortChannelId && route.shortChannelIds[0] === targetShortChannelId));
             });
             const firstRoute = routes[0].shortChannelIds.join() || '';
-            const shortChannelIds = req.body.sourceShortChannelId + ',' + firstRoute + ',' + req.body.targetShortChannelId;
+            const shortChannelIds = sourceShortChannelId + ',' + firstRoute + ',' + targetShortChannelId;
             const invoice = (foundExistingInvoice && foundExistingInvoice.serialized ? foundExistingInvoice.serialized : (values[1] ? values[1].serialized : '')) || '';
             const paymentHash = (foundExistingInvoice && foundExistingInvoice.paymentHash ? foundExistingInvoice.paymentHash : (values[1] ? values[1].paymentHash : '') || '');
-            return sendPaymentToRouteRequestCall(req.session.selectedNode, shortChannelIds, invoice, req.body.amountMsat).then((payToRouteCallRes) => {
+            return sendPaymentToRouteRequestCall(req.session.selectedNode, shortChannelIds, invoice, amountMsat).then((payToRouteCallRes) => {
                 // eslint-disable-next-line arrow-body-style
                 setTimeout(() => {
                     return getSentInfoFromPaymentRequest(req.session.selectedNode, paymentHash).then((sentInfoCallRes) => {

diff --git a/backend/controllers/eclair/invoices.js b/backend/controllers/eclair/invoices.js
@@ -135,12 +135,13 @@ export const createInvoiceRequestCall = (selectedNode, description, amount) => {
     });
 };
 export const createInvoice = (req, res, next) => {
+    const { description, amountMsat } = req.body;
     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Invoices', msg: 'Creating Invoice..' });
     options = common.getOptions(req);
     if (options.error) {
         return res.status(options.statusCode).json({ message: options.message, error: options.error });
     }
-    createInvoiceRequestCall(req.session.selectedNode, req.body.description, req.body.amountMsat).then((invRes) => {
+    createInvoiceRequestCall(req.session.selectedNode, description, amountMsat).then((invRes) => {
         res.status(201).json(invRes);
     }).catch((err) => res.status(err.statusCode).json({ message: err.message, error: err.error }));
 };
diff --git a/backend/controllers/eclair/network.js b/backend/controllers/eclair/network.js
@@ -35,11 +35,12 @@ export const findRouteBetweenNodesRequestCall = (selectedNode, amountMsat, sourc
     });
 };
 export const findRouteBetweenNodes = (req, res, next) => {
+    const { amountMsat, sourceNodeId, targetNodeId, ignoreNodeIds, format } = req.body;
     options = common.getOptions(req);
     if (options.error) {
         return res.status(options.statusCode).json({ message: options.message, error: options.error });
     }
-    findRouteBetweenNodesRequestCall(req.session.selectedNode, req.body.amountMsat, req.body.sourceNodeId, req.body.targetNodeId, req.body.ignoreNodeIds, req.body.format).then((callRes) => {
+    findRouteBetweenNodesRequestCall(req.session.selectedNode, amountMsat, sourceNodeId, targetNodeId, ignoreNodeIds, format).then((callRes) => {
         res.status(200).json(callRes);
     }).catch((err) => res.status(err.statusCode).json({ message: err.message, error: err.error }));
 };
diff --git a/backend/controllers/eclair/onchain.js b/backend/controllers/eclair/onchain.js
@@ -74,17 +74,14 @@ export const getTransactions = (req, res, next) => {
     });
 };
 export const sendFunds = (req, res, next) => {
+    const { address, amount, blocks } = req.body;
     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'OnChain', msg: 'Sending On Chain Funds..' });
     options = common.getOptions(req);
     if (options.error) {
         return res.status(options.statusCode).json({ message: options.message, error: options.error });
     }
     options.url = req.session.selectedNode.ln_server_url + '/sendonchain';
-    options.form = {
-        address: req.body.address,
-        amountSatoshis: req.body.amount,
-        confirmationTarget: req.body.blocks
-    };
+    options.form = { address: address, amountSatoshis: amount, confirmationTarget: blocks };
     logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Onchain', msg: 'Send Funds Options', data: options.form });
     request.post(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Onchain', msg: 'On Chain Funds Sent', data: body });

diff --git a/backend/controllers/eclair/payments.js b/backend/controllers/eclair/payments.js
@@ -104,13 +104,14 @@ export const queryPaymentRoute = (req, res, next) => {
     });
 };
 export const getSentPaymentsInformation = (req, res, next) => {
+    const { payments } = req.body;
     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Payments', msg: 'Getting Sent Payment Information..' });
     options = common.getOptions(req);
     if (options.error) {
         return res.status(options.statusCode).json({ message: options.message, error: options.error });
     }
-    if (req.body.payments) {
-        const paymentsArr = req.body.payments.split(',');
+    if (payments) {
+        const paymentsArr = payments.split(',');
         return Promise.all(paymentsArr?.map((payment) => getSentInfoFromPaymentRequest(req.session.selectedNode, payment))).
             then((values) => {
             logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Payments', msg: 'Payment Sent Information Received', data: values });
@@ -142,12 +143,13 @@ export const sendPaymentToRouteRequestCall = (selectedNode, shortChannelIds, inv
     });
 };
 export const sendPaymentToRoute = (req, res, next) => {
+    const { shortChannelIds, invoice, amountMsat } = req.body;
     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Payments', msg: 'Send Payment To Route..' });
     options = common.getOptions(req);
     if (options.error) {
         return res.status(options.statusCode).json({ message: options.message, error: options.error });
     }
-    sendPaymentToRouteRequestCall(req.session.selectedNode, req.body.shortChannelIds, req.body.invoice, req.body.amountMsat).then((callRes) => {
+    sendPaymentToRouteRequestCall(req.session.selectedNode, shortChannelIds, invoice, amountMsat).then((callRes) => {
         res.status(200).json(callRes);
     }).catch((err) => res.status(err.statusCode).json({ message: err.message, error: err.error }));
 };