Release 0.15.3

.eslintrc.json

@@ -116,7 +116,6 @@
         "no-label-var": "error",
         "no-restricted-globals": "error",
         "no-undef-init": "error",
-        "no-undefined": "error",
         "block-spacing": "error",
         "brace-style": ["error", "1tbs", { "allowSingleLine": true }],
         "comma-style": "error",

.github/workflows/ci.yml

@@ -2,31 +2,29 @@ name: Artifact
 
 on:
   push:
-    branches: [ master, 'Release-*' ]
     tags: [ 'v*' ]
   release:
     types: [released]
-  # Triggers the workflow only when merging pull request to the branches.
-  pull_request:
-    types: [closed]
-    branches: [ master, 'Release-*' ]
-  # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
-
+    inputs:
+      version:
+        description: 'Release version'
+        required: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout source code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup Node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: 18.x
 
       - name: Cache node_modules
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         id: cache-npm-packages
         with:
           path: node_modules
@@ -37,7 +35,7 @@ jobs:
         run: npm ci --legacy-peer-deps
 
       - name: Cache build frontend
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         id: cache-build-frontend
         with:
           path: frontend
@@ -47,7 +45,7 @@ jobs:
         run: npm run buildfrontend
 
       - name: Cache build backend
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         id: cache-build-backend
         with:
           path: backend
@@ -61,26 +59,32 @@ jobs:
     needs: build
     steps:
       - name: Checkout source code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Cache build frontend
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         id: cache-build-frontend
         with:
           path: frontend
           key: ${{ runner.os }}-frontend-${{ github.sha }}
 
       - name: Cache build backend
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         id: cache-build-backend
         with:
           path: backend
           key: ${{ runner.os }}-backend-${{ github.sha }}
 
       - name: Compress files
-        run: tar -czf /tmp/rtlbuild.tar.gz frontend backend rtl.js package.json package-lock.json
-
-      - uses: actions/upload-artifact@v2
+        env:
+          VERSION: "${{ github.event.release.tag_name || github.event.inputs.version || '' }}"
+        run: |
+          tar -czf /tmp/rtl-build-$VERSION.tar.gz frontend backend rtl.js package.json package-lock.json
+          zip -r /tmp/rtl-build-$VERSION.zip frontend backend rtl.js package.json package-lock.json
+
+      - uses: actions/upload-artifact@v3
         with:
-          name: rtl-build-${{ github.event.release.tag_name }}
-          path: /tmp/rtlbuild.tar.gz
+          name: rtl-build-${{ github.event.release.tag_name || github.event.inputs.version || '' }}
+          path: |
+            /tmp/rtl-build-${{ github.event.release.tag_name || github.event.inputs.version || '' }}.tar.gz
+            /tmp/rtl-build-${{ github.event.release.tag_name || github.event.inputs.version || '' }}.zip

backend/controllers/cln/invoices.js

@@ -10,11 +10,11 @@ export const deleteExpiredInvoice = (req, res, next) => {
     if (options.error) {
         return res.status(options.statusCode).json({ message: options.message, error: options.error });
     }
-    options.url = req.session.selectedNode.settings.lnServerUrl + '/v1/delexpiredinvoice';
+    options.url = req.session.selectedNode.settings.lnServerUrl + '/v1/autoclean-once';
     options.body = req.body;
     request.post(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Invoice', msg: 'Invoices Deleted', data: body });
-        res.status(204).json({ status: 'Invoice Deleted Successfully' });
+        res.status(201).json({ status: 'Cleaned Invoices: ' + body.autoclean.expiredinvoices.cleaned + ', Uncleaned Invoices: ' + body.autoclean.expiredinvoices.uncleaned });
     }).catch((errRes) => {
         const err = common.handleError(errRes, 'Invoice', 'Delete Invoice Error', req.session.selectedNode);
         return res.status(err.statusCode).json({ message: err.message, error: err.error });

backend/controllers/cln/offers.js

@@ -83,7 +83,7 @@ export const disableOffer = (req, res, next) => {
     if (options.error) {
         return res.status(options.statusCode).json({ message: options.message, error: options.error });
     }
-    options.url = req.session.selectedNode.settings.lnServerUrl + '/v1/disableOffer';
+    options.url = req.session.selectedNode.settings.lnServerUrl + '/v1/disableoffer';
     options.body = req.body;
     request.post(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Offers', msg: 'Offer Disabled', data: body });

backend/controllers/eclair/channels.js

@@ -28,7 +28,7 @@ export const simplifyAllChannels = (selNode, channels) => {
     });
     channelNodeIds = channelNodeIds.substring(1);
     options.url = selNode.settings.lnServerUrl + '/nodes';
-    options.form = { nodeIds: channelNodeIds };
+    options.form = channelNodeIds;
     logger.log({ selectedNode: selNode, level: 'DEBUG', fileName: 'Channels', msg: 'Node Ids to find alias', data: channelNodeIds });
     return request.post(options).then((nodes) => {
         logger.log({ selectedNode: selNode, level: 'DEBUG', fileName: 'Channels', msg: 'Filtered Nodes Received', data: nodes });

backend/controllers/lnd/channels.js

@@ -155,47 +155,6 @@ export const postChannel = (req, res, next) => {
         return res.status(err.statusCode).json({ message: err.message, error: err.error });
     });
 };
-export const postTransactions = (req, res, next) => {
-    const { paymentReq, paymentAmount, feeLimit, outgoingChannel, allowSelfPayment, lastHopPubkey } = req.body;
-    logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Channels', msg: 'Sending Payment..' });
-    options = common.getOptions(req);
-    if (options.error) {
-        return res.status(options.statusCode).json({ message: options.message, error: options.error });
-    }
-    options.url = req.session.selectedNode.settings.lnServerUrl + '/v1/channels/transaction-stream';
-    options.form = { payment_request: paymentReq };
-    if (paymentAmount) {
-        options.form.amt = paymentAmount;
-    }
-    if (feeLimit) {
-        options.form.fee_limit = feeLimit;
-    }
-    if (outgoingChannel) {
-        options.form.outgoing_chan_id = outgoingChannel;
-    }
-    if (allowSelfPayment) {
-        options.form.allow_self_payment = allowSelfPayment;
-    }
-    if (lastHopPubkey) {
-        options.form.last_hop_pubkey = Buffer.from(lastHopPubkey, 'hex').toString('base64');
-    }
-    options.form = JSON.stringify(options.form);
-    logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Channels', msg: 'Send Payment Options', data: options.form });
-    request.post(options).then((body) => {
-        body = body.result ? body.result : body;
-        if (body.payment_error) {
-            const err = common.handleError(body.payment_error, 'Channels', 'Send Payment Error', req.session.selectedNode);
-            return res.status(err.statusCode).json({ message: err.message, error: err.error });
-        }
-        else {
-            logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Channels', msg: 'Payment Sent', data: body });
-            res.status(201).json(body);
-        }
-    }).catch((errRes) => {
-        const err = common.handleError(errRes, 'Channels', 'Send Payment Error', req.session.selectedNode);
-        return res.status(err.statusCode).json({ message: err.message, error: err.error });
-    });
-};
 export const closeChannel = (req, res, next) => {
     try {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Channels', msg: 'Closing Channel..' });

backend/controllers/lnd/payments.js

@@ -97,3 +97,33 @@ export const paymentLookup = (req, res, next) => {
         return res.status(err.statusCode).json({ message: err.message, error: err.error });
     });
 };
+export const sendPayment = (req, res, next) => {
+    logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Payments', msg: 'Sending Payment..' });
+    options = common.getOptions(req);
+    if (options.error) {
+        return res.status(options.statusCode).json({ message: options.message, error: options.error });
+    }
+    options.url = req.session.selectedNode.settings.lnServerUrl + '/v2/router/send';
+    if (req.body.last_hop_pubkey) {
+        req.body.last_hop_pubkey = Buffer.from(req.body.last_hop_pubkey, 'hex').toString('base64');
+    }
+    req.body.amp = req.body.amp ?? false;
+    req.body.timeout_seconds = req.body.timeout_seconds || 600;
+    options.form = JSON.stringify(req.body);
+    logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Payments', msg: 'Send Payment Options', data: options.form });
+    request.post(options).then((body) => {
+        const results = body.split('\n').filter(Boolean).map((jsonString) => JSON.parse(jsonString));
+        body = results.length > 0 ? results[results.length - 1] : { result: { status: 'UNKNOWN' } };
+        if (body.result.status === 'FAILED') {
+            const err = common.handleError(common.titleCase(body.result.failure_reason.replace(/_/g, ' ').replace('FAILURE REASON ', '')), 'Payments', 'Send Payment Error', req.session.selectedNode);
+            return res.status(err.statusCode).json({ message: err.message, error: err.error });
+        }
+        if (body.result.status === 'SUCCEEDED') {
+            logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Payments', msg: 'Payment Sent', data: body.result });
+            res.status(201).json(body.result);
+        }
+    }).catch((errRes) => {
+        const err = common.handleError(errRes, 'Payments', 'Send Payment Error', req.session.selectedNode);
+        return res.status(err.statusCode).json({ message: err.message, error: err.error });
+    });
+};

backend/routes/lnd/channels.js

@@ -1,13 +1,12 @@
 import exprs from 'express';
 const { Router } = exprs;
 import { isAuthenticated } from '../../utils/authCheck.js';
-import { getAllChannels, getPendingChannels, getClosedChannels, postChannel, postTransactions, closeChannel, postChanPolicy } from '../../controllers/lnd/channels.js';
+import { getAllChannels, getPendingChannels, getClosedChannels, postChannel, closeChannel, postChanPolicy } from '../../controllers/lnd/channels.js';
 const router = Router();
 router.get('/', isAuthenticated, getAllChannels);
 router.get('/pending', isAuthenticated, getPendingChannels);
 router.get('/closed', isAuthenticated, getClosedChannels);
 router.post('/', isAuthenticated, postChannel);
-router.post('/transactions', isAuthenticated, postTransactions);
 router.delete('/:channelPoint', isAuthenticated, closeChannel);
 router.post('/chanPolicy', isAuthenticated, postChanPolicy);
 export default router;

backend/routes/lnd/payments.js

@@ -1,11 +1,12 @@
 import exprs from 'express';
 const { Router } = exprs;
 import { isAuthenticated } from '../../utils/authCheck.js';
-import { decodePayment, decodePayments, getPayments, getAllLightningTransactions, paymentLookup } from '../../controllers/lnd/payments.js';
+import { decodePayment, decodePayments, getPayments, getAllLightningTransactions, paymentLookup, sendPayment } from '../../controllers/lnd/payments.js';
 const router = Router();
 router.get('/', isAuthenticated, getPayments);
 router.get('/alltransactions', isAuthenticated, getAllLightningTransactions);
 router.get('/decode/:payRequest', isAuthenticated, decodePayment);
 router.get('/lookup/:paymentHash', isAuthenticated, paymentLookup);
 router.post('/', isAuthenticated, decodePayments);
+router.post('/send', isAuthenticated, sendPayment);
 export default router;

backend/utils/common.js

@@ -395,7 +395,8 @@ export class CommonService {
                 }
             });
         };
-        this.readCookie = () => {
+        this.readCookie = (config) => {
+            this.appConfig.SSO = config.SSO;
             const exists = fs.existsSync(this.appConfig.SSO.rtlCookiePath);
             if (exists) {
                 try {

backend/utils/config.js

@@ -146,7 +146,7 @@ export class ConfigService {
                     this.common.nodes[idx] = { settings: { blockExplorerUrl: '' }, authentication: {} };
                     this.common.nodes[idx].index = node.index;
                     this.common.nodes[idx].lnNode = node.lnNode;
-                    this.common.nodes[idx].lnImplementation = (process?.env?.lnImplementation) ? process?.env?.lnImplementation : node.lnImplementation ? node.lnImplementation : 'LND';
+                    this.common.nodes[idx].lnImplementation = (process?.env?.LN_IMPLEMENTATION) ? process?.env?.LN_IMPLEMENTATION : node.lnImplementation ? node.lnImplementation : 'LND';
                     if (this.common.nodes[idx].lnImplementation === 'CLT') {
                         this.common.nodes[idx].lnImplementation = 'CLN';
                     }
@@ -343,7 +343,7 @@ export class ConfigService {
                     this.errMsg = 'Please set rtlCookiePath value for single sign on option!';
                 }
                 else {
-                    this.common.readCookie();
+                    this.common.readCookie(config);
                 }
             }
         };

docker/README.md

@@ -74,6 +74,7 @@ docker build -t rtl:${RTL_VERSION} -f dockerfiles/Dockerfile .
 Create an environment file with your required configurations. Sample .env:
 ```
 RTL_CONFIG_PATH=/RTLConfig
+LN_IMPLEMENTATION=LND
 MACAROON_PATH=/LNDMacaroon
 LN_SERVER_URL=https://host.docker.internal:8080