Nodejs update for CI & Docker and updated documentation

c-lightning-REST to clnrest migration.

.browserslistrc

@@ -1,17 +0,0 @@
-# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
-# For additional information regarding the format and rule options, please see:
-# https://github.com/browserslist/browserslist#queries
-
-# For the full list of supported browsers by the Angular framework, please see:
-# https://angular.io/guide/browser-support
-
-# You can see what browsers were selected by your queries by running:
-#   npx browserslist
-
-last 1 Chrome version
-last 1 Firefox version
-last 2 Edge major versions
-last 2 Safari major versions
-last 2 iOS major versions
-Firefox ESR
-not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.

.eslintrc.json

@@ -1,10 +1,7 @@
 {
   "root": true,
   "ignorePatterns": [
-    "projects/**/*",
-    "rtl.js",
-    "/backend/**/*.js",
-    "/src/prebuild.js"
+    "backend/**/*.js"
   ],
   "overrides": [
     {
@@ -13,30 +10,28 @@
       ],
       "parser": "@typescript-eslint/parser",
       "parserOptions": {
-        "ecmaVersion": 2020,
+        "ecmaVersion": 2022,
         "sourceType": "module",
         "project": "./tsconfig.json",
         "createDefaultProgram": true
       },
+      "env": { "es2022": true },
       "plugins": ["deprecation"],
       "extends": [
         "plugin:@angular-eslint/all",
         "plugin:@angular-eslint/recommended",
-        "plugin:@angular-eslint/recommended--extra",
         "plugin:@angular-eslint/template/process-inline-templates"
       ],
       "rules": {
         "deprecation/deprecation": "error",
-        "@angular-eslint/use-injectable-provided-in": "off",
         "@angular-eslint/prefer-on-push-component-change-detection": "off",
-        "@angular-eslint/use-component-view-encapsulation": "off",
+        "@angular-eslint/prefer-standalone-component": "off",
         "@angular-eslint/sort-ngmodule-metadata-arrays": "off",
-        "@angular-eslint/arrow-body-style": "off",
-        "@angular-eslint/component-selector": ["error", { "prefix": "rtl", "style": "kebab-case", "type": "element" }],
-        "@angular-eslint/directive-selector": ["error", { "style": "camelCase", "type": "attribute" }],
-        "@typescript-eslint/member-delimiter-style": ["error", { "multiline": { "delimiter": "semi", "requireLast": true}, "singleline": { "delimiter": "comma", "requireLast": false }}],
+        "@angular-eslint/use-component-view-encapsulation": "off",
+        "@angular-eslint/use-injectable-provided-in": "off",
+                "@typescript-eslint/member-delimiter-style": "off",
         "@typescript-eslint/no-non-null-assertion": "off",        
-        "@typescript-eslint/type-annotation-spacing": "error",
+        "@typescript-eslint/type-annotation-spacing": 0,
         "quotes": ["error", "single"],
         "comma-dangle": ["error", "never"],
         "comma-spacing": ["error", { "before": false, "after": true }],
@@ -130,7 +125,7 @@
         "indent": ["error", 2, { "SwitchCase": 1, "MemberExpression": 1, "ArrayExpression": "off" }],
         "keyword-spacing": ["error", { "before": true, "after": true, "overrides": { "this": { "before": false }}}],
         "lines-around-comment": "error",
-        "max-depth": ["error", { "max": 6 }],
+        "max-depth": ["error", { "max": 7 }],
         "max-nested-callbacks": "error",
         "max-statements-per-line": ["error", { "max": 3 }],
         "no-array-constructor": "error",
@@ -186,22 +181,33 @@
       "files": [
         "*.html"
       ],
+"parser": "@angular-eslint/template-parser",
       "extends": [
         "plugin:@angular-eslint/template/all",
-        "plugin:@angular-eslint/template/recommended"
+        "plugin:@angular-eslint/template/recommended",
+        "plugin:@angular-eslint/template/process-inline-templates"
       ],
       "rules": {
+        "@angular-eslint/arrow-body-style": "off",
+        "@angular-eslint/component-selector": ["error", { "prefix": "rtl", "style": "kebab-case", "type": "element" }],
+        "@angular-eslint/directive-selector": ["error", { "style": "camelCase", "type": "attribute" }],
         "@angular-eslint/template/accessibility-elements-content": "off",
+        "@angular-eslint/template/accessibility-interactive-supports-focus": "off",
+        "@angular-eslint/template/button-has-type": "off",
         "@angular-eslint/template/click-events-have-key-events": "off",
         "@angular-eslint/template/conditional-complexity": "off",
         "@angular-eslint/template/cyclomatic-complexity": "off",
+        "@angular-eslint/template/elements-content": "off",
         "@angular-eslint/template/i18n": "off",
         "@angular-eslint/template/no-autofocus": "off",
         "@angular-eslint/template/no-call-expression": "off",
+        "@angular-eslint/template/no-inline-styles": "off",
+        "@angular-eslint/template/no-interpolation-in-attributes": "off",
         "@angular-eslint/template/no-positive-tabindex": "off",
+        "@angular-eslint/template/prefer-ngsrc": "off",
+        "@angular-eslint/template/prefer-control-flow": "off",
         "@angular-eslint/template/use-track-by-function": "off"
       }
     }
   ]
 }
-// https://eslint.org/docs/rules/

.github/README.md

@@ -35,6 +35,7 @@ RTL is available on the below platforms/services:
 * [BCubium](https://bgeometrics.com)
 * [Start9Labs](https://start9labs.com)
 * [Umbrel](https://github.com/getumbrel/umbrel)
+* [Sovran Systems](https://sovransystems.com)
 
 Docker Image: https://hub.docker.com/r/shahanafarooqui/rtl
 
@@ -64,6 +65,10 @@ $ git clean -f -d
 $ git pull
 $ npm install --omit=dev
 ```
+
+#### Error on npm install
+If there is an error with `upstream dependency conflict` message then replace `npm install --omit=dev` with `npm install --omit=dev --legacy-peer-deps`.
+
 ### <a name="prep"></a>Prep for Execution
 RTL requires its own config file `RTL-Config.json`, to start the server and provide user authentication on the app.
 
@@ -79,6 +84,7 @@ Example RTL-Config.json:
   "multiPass": "password",
   "port": "3000",
   "defaultNodeIndex": 1,
+  "dbDirectoryPath": "<Complete path of the folder where rtl's database file should be saved>",
   "SSO": {
     "rtlSSO": 0,
     "rtlCookiePath": "",
@@ -90,11 +96,12 @@ Example RTL-Config.json:
       "lnNode": "LND Testnet",
       "lnImplementation": "LND",
       "Authentication": {
-        "macaroonPath": "<Complete path of the folder containing LND's admin.macaroon for the node # 1>",
+        "macaroonPath": "<Complete path of the folder containing LND admin.macaroon for the node>",
+        "runePath": "<Complete path including filename for CLN rune for the node, rune format 'LIGHTNING_RUNE="your-rune"'>",
+        "lnApiPassword": "<Can be used to provide password in ECL implementation>",
         "swapMacaroonPath": "<Complete path of the folder containing Loop's loop.macaroon for the node>",
         "boltzMacaroonPath": "<Complete path of the folder containing Boltz admin.macaroon for the node>",
         "configPath": "<Optional:Path of the .conf if present locally or empty>",
-        "lnApiPassword": "<Optional:Can be used to provide password in ECL implementation>"
       },
       "Settings": {
         "userPersona": "OPERATOR",
@@ -106,8 +113,8 @@ Example RTL-Config.json:
         "fiatConversion": false,
         "unannouncedChannels": false,
         "lnServerUrl": "<url for LND REST APIs for node #1 e.g. https://192.168.0.1:8080>",
-        "swapServerUrl": "<url for swap server REST APIs for the node. e.g. https://localhost:8081>",
-        "boltzServerUrl": "<url for boltz server REST APIs for the node. e.g. https://localhost:9003>"
+        "swapServerUrl": "<url for swap server REST APIs for the node. e.g. https://127.0.0.1:8081>",
+        "boltzServerUrl": "<url for boltz server REST APIs for the node. e.g. https://127.0.0.1:9003>"
       }
     }
   ]

.github/docs/Application_configurations.md

@@ -9,36 +9,38 @@ parameters have `default` values for initial setup and can be updated after RTL
   "port": "<port number for the rtl node server, default '3000', Required>",
   "host": "<host for the rtl node server, default 'all IPs', Optional>",
   "defaultNodeIndex": <Default index to load when rtl server starts, default 1, Optional>,
+  "dbDirectoryPath": "<Complete path of the folder where rtl database file should be saved, defults to RTL root, Optional>",
   "SSO": {
-    "rtlSSO": <parameter to turn SSO off/on. Allowed values - 1 (single sign on via an external cookie), 0 (stand alone RTL authentication), default 0, Required>,
+    "rtlSSO": <parameter to turn SSO off/on. Allowed values - 1 (single sign on via an external cookie), 0 (stand alone RTL authentication), Required>,
     "rtlCookiePath": "<Full path of the cookie file including the file name. The application url needs to pass the value from this cookie file as query param 'access-key' for the SSO authentication to work, Required if SSO=1 else empty (Optional)>",
     "logoutRedirectLink": "<URL to re-direct to after logout/timeout from RTL, Required if SSO=1 else empty (Optional)>"
   },
   "nodes": [
     {
       "index": <Incremental node indices starting from 1, Required>,
-      "lnNode": "<Node name to uniquely identify the node in the UI, Default 'Node 1', Required>",
-      "lnImplementation": "<LNP implementation, Allowed values LND/CLN/ECL. Default 'LND', Required>",
+      "lnNode": "<Node name to uniquely identify the node in the UI, Required>",
+      "lnImplementation": "<LNP implementation, Allowed values LND/CLN/ECL, Required>",
       "Authentication": {
-        "macaroonPath": "<Path for the folder containing 'admin.macaroon' (LND)/'access.macaroon' (CLN) file, Required for LND & CLN>",
+        "macaroonPath": "<Path for the folder containing 'admin.macaroon' for LND node, Required for LND>",
+        "runePath": "<Complete path including filename for CLN rune for the node, Required for CLN>",
+        "lnApiPassword": "<Password to be used for ECL API authentication. Mandatory only for ECL if the configPath is missing>"
         "swapMacaroonPath": "<Path for the folder containing 'loop.macaroon' (LND), Required for LND Loop>",
         "boltzMacaroonPath": "<Path for the folder containing 'admin.macaroon' (Boltz), Required for Boltz Swaps>",
         "configPath": "<Full path of the lnd.conf/core lightning config/eclair.conf file including the file name, if present locally, Optional, only mandatory for ECL if the lnApiPassword is missing>",
-        "lnApiPassword": "<Password to be used for ECL API authentication. Mandatory only for ECL if the configPath is missing>"
       },
       "Settings": {
-        "userPersona": "<User persona to tailor the data on UI. Allowed values MERCHANT, OPERATOR. Default MERCHANT, Required>",
-        "themeMode": "<Theme modes, Allowed values DAY, NIGHT. Default DAY, Required>",
-        "themeColor": "<Theme colors, Allowed values PURPLE, TEAL, INDIGO, PINK, YELLOW. Default PURPLE, Required>",
+        "userPersona": "<User persona to tailor the data on UI. Allowed values MERCHANT/OPERATOR. Default MERCHANT, Optional>",
+        "themeMode": "<Theme modes, Allowed values DAY, NIGHT. Default DAY, Optional>",
+        "themeColor": "<Theme colors, Allowed values PURPLE, TEAL, INDIGO, PINK, YELLOW. Default PURPLE, Optional>",
         "channelBackupPath": "<Path to save channel backup file. Only for LND implementation, Default <RTL root>\backup\node-1, Optional>",
         "bitcoindConfigPath": "<Path of bitcoind.conf path if available locally>",
         "logLevel": <logging levels, will log in accordance with the logLevel value provided, Allowed values ERROR, WARN, INFO, DEBUG>,
-        "fiatConversion": <parameter to turn fiat conversion off/on. Allowed values - true, false, default false, Required>,
-        "currencyUnit": "<Optional: Fiat current Unit for currency conversion, default 'USD' If fiatConversion is true, Required if fiatConversion is true>",
+        "fiatConversion": <parameter to turn fiat conversion off/on. Allowed values - true, false, default false, Optional>,
+        "currencyUnit": "<Optional: Fiat current Unit for currency conversion, default 'USD', Optional>",
         "unannouncedChannels": <parameter to turn off/on setting for opening announced Channels, default false, Optional>
-        "lnServerUrl": "<Service url for LND/Core Lightning REST APIs for the node, e.g. https://192.168.0.1:8080 OR https://192.168.0.1:3001 OR http://192.168.0.1:8080. Default 'https://localhost:8080', Required",
-        "swapServerUrl": "<Service url for swap server REST APIs for the node, e.g. https://localhost:8081, Optional>",
-        "boltzServerUrl": "<Service url for boltz server REST APIs for the node, e.g. https://localhost:9003, Optional>"
+        "lnServerUrl": "<Service url for LND/Core Lightning REST APIs for the node, e.g. https://192.168.0.1:8080 OR https://192.168.0.1:3001 OR http://192.168.0.1:8080. Default 'https://127.0.0.1:8080', Optional>
+        "swapServerUrl": "<Service url for swap server REST APIs for the node, e.g. https://127.0.0.1:8081, Optional>",
+        "boltzServerUrl": "<Service url for boltz server REST APIs for the node, e.g. https://127.0.0.1:9003, Optional>"
       }
     }
   ]
@@ -49,15 +51,17 @@ parameters have `default` values for initial setup and can be updated after RTL
 The environment variable can also be used for all of the above configurations except the UI settings.<br />
 If the environment variables are set, it will take precedence over the parameters in the RTL-Config.json file.<br />
 <br />
-PORT (port number for the rtl node server, default 3000, Required)<br />
+PORT (port number for the rtl node server, default 3000, Optional)<br />
 HOST (host for the rtl node server, default localhost, Optional)<br />
+DB_DIRECTORY_PATH (Path for the folder where rtl database file should be saved, default RTL root directory, Optional)
 APP_PASSWORD (Plaintext password to be provided by the parent container, NOT suggested for standalone RTL applications, to be used by Umbrel) (Optional)<br />
-LN_IMPLEMENTATION (LND/CLN/ECL. Default 'LND', Required)<br />
-LN_SERVER_URL (LN server URL for LNP REST APIs, default https://localhost:8080) (Required)<br />
-SWAP_SERVER_URL (Swap server URL for REST APIs, default http://localhost:8081) (Optional)<br />
-BOLTZ_SERVER_URL (Boltz server URL for REST APIs, default http://localhost:9003) (Optional)<br />
+LN_IMPLEMENTATION (LND/CLN/ECL. Default 'LND', Optional)<br />
+LN_SERVER_URL (LN server URL for LNP REST APIs, default https://127.0.0.1:8080) (Optional)<br />
+SWAP_SERVER_URL (Swap server URL for REST APIs, default http://127.0.0.1:8081) (Optional)<br />
+BOLTZ_SERVER_URL (Boltz server URL for REST APIs, default http://127.0.0.1:9003) (Optional)<br />
 CONFIG_PATH (Full path of the LNP .conf file including the file name) (Optional for LND & CLN, Mandatory for ECL if LN_API_PASSWORD is undefined)<br />
-MACAROON_PATH (Path for the folder containing 'admin.macaroon' (LND)/'access.macaroon' (CLN) file, Required for LND & CLN)<br />
+MACAROON_PATH (Path for the folder containing 'admin.macaroon' for LND, Required for LND)<br />
+RUNE_PATH (Complete path for the file containing 'rune' for CLN where the file should define the rune in 'LIGHTNING_RUNE="your-rune"' format, Required for CLN)<br />
 SWAP_MACAROON_PATH (Path for the folder containing Loop's 'loop.macaroon', optional)<br />
 BOLTZ_MACAROON_PATH (Path for the folder containing Boltz's 'admin.macaroon', optional)<br />
 RTL_SSO (1 - single sign on via an external cookie, 0 - stand alone RTL authentication, Required)<br />

.github/docs/CLN_command_coverage.md

@@ -1,71 +0,0 @@
-### Core Lightning Commands Covered on RTL
-
-=== bitcoin ===
-- [x] feerates
-- [x] newaddr
-- [ ] txdiscard
-- [ ] txprepare
-- [ ] txsend
-- [x] withdraw
-
-=== channels ===
-- [x] close
-- [ ] fundchannel_cancel
-- [ ] fundchannel_complete
-- [ ] fundchannel_start
-- [x] getroute
-- [x] listchannels
-- [x] listforwards
-- [x] setchannelfee
-
-=== network ===
-- [x] connect
-- [x] disconnect
-- [x] listnodes
-- [x] listpeers
-- [ ] ping
-
-=== payment ===
-- [ ] createonion
-- [x] decodepay
-- [x] delexpiredinvoice
-- [ ] delinvoice
-- [x] invoice
-- [x] listinvoices
-- [x] listsendpays
-- [ ] listtransactions
-- [ ] sendonion
-- [ ] sendpay
-- [ ] waitanyinvoice
-- [ ] waitinvoice
-- [ ] waitsendpay
-
-=== plugin ===
-- [ ] autocleaninvoice
-- [ ] estimatefees
-- [x] fundchannel
-- [ ] getchaininfo
-- [ ] getrawblockbyheight
-- [ ] getutxout
-- [x] listpays
-- [x] pay
-- [ ] paystatus
-- [ ] plugin
-- [ ] sendrawtransaction
-
-=== utility ===
-- [ ] check
-- [x] checkmessage
-- [x] getinfo
-- [ ] getlog
-- [ ] getsharedsecret
-- [ ] help
-- [ ] listconfigs
-- [x] listfunds
-- [x] signmessage
-- [ ] stop
-- [ ] waitblockheight
-
-=== developer ===   
-- [ ] dev-listaddrs
-- [ ] dev-rescan-outputs

.github/docs/Contributing.md

@@ -44,6 +44,7 @@ Contributions via code is the most sought after contribution and something we en
 
 ##### Install Dependencies
 * Assuming that nodejs (v14 & above) and npm are already installed on your local machine. Go into your RTL root folder and run `npm install`. 
+* Use `npm install --legacy-peer-deps` if there is any dependency conflict.
 * Sometimes after installation, user receives a message from npm to fix dependency vulnerability by running `npm audit fix`. Please do not follow this step as it can break some of the working RTL code on your machine. We audit and fix these vulnerabilities as soon as possible at our end.
 	
 ##### Node Backend Server for Development

.github/docs/Core_lightning_setup.md

@@ -1,4 +1,4 @@
-![](../screenshots/RTL-CLN-Dashboard.png)
+![](../screenshots/RTL-CLN-Arch-3.png)
 
 ## RTL Core lightning setup
 
@@ -10,15 +10,16 @@
 * [Start the server and access the app](#start)
 
 ### <a name="intro"></a>Introduction
-RTL is now enabled to manage lightning nodes running Core Lightning.
+RTL is now enabled to manage lightning nodes running Core Lightning
 
-Follow the below steps to install and setup RTL to run on Core Lightning.
+Follow the below steps to install and setup RTL to run on Core Lightning
 
 ### <a name="prereq"></a>Pre-requisites:
 1. Functioning Core Lightning node. Follow install instructions on their [github](https://github.com/ElementsProject/lightning)
 2. NodeJS - Can be downloaded [here](https://nodejs.org/en/download)
-3. Cl-REST - Ensure that `cl-rest` API server is installed and running. Install instructions [here](https://github.com/Ride-The-Lightning/c-lightning-REST)
-4. Copy the `access.macaroon` file from `cl-rest` to the device, on which RTL will be installed
+3. CLNRest - Ensure that core lightning's `CLNRest` API server is configured. Configuration instructions [here](https://docs.corelightning.org/docs/rest#configuration)
+4. Create/reuse core-lightning's rune. Check [`createrune`](https://docs.corelightning.org/reference/lightning-createrune) and [`showrunes`](https://docs.corelightning.org/reference/lightning-showrunes) documentation for more details on how to create runes
+4. Copy the `rune` and save it in a file which must be accessible to RTL. The content of the file must be `LIGHTNING_RUNE="<your-rune>"`
 
 ### <a name="arch"></a>Architecture
 ![](../screenshots/RTL-CLN-Arch-2.png)
@@ -43,24 +44,29 @@ $ git clean -f -d
 $ git pull
 $ npm install --omit=dev
 ```
+
+#### Error on npm install
+If there is an error with `upstream dependency conflict` message then replace `npm install --omit=dev` with `npm install --omit=dev --legacy-peer-deps`.
+
 ### <a name="prep"></a>Prep for Execution
-RTL requires its own config file `RTL-Config.json`, to start the server and provide user authentication on the app. 
-* Rename the file `Sample-RTL-Config.json` to `RTL-Config.json` located at`./RTL`..
-* Locate the complete path of the readable `access.macaroon` from `cl-rest` on your node.
+RTL requires its own config file `RTL-Config.json`, to start the server and provide user authentication on the app
+* Rename the file `Sample-RTL-Config.json` to `RTL-Config.json` located at`./RTL`
+* Locate the complete path of the readable `.commando` file on your node
 * Modify the RTL conf file per the example file below
 
 Ensure that the follow values are correct per your config:
-* `lnImplementation` - This should be `CLN`, indicating that RTL is connecting to a core lightning node.
-* `macaroonPath` - Path of the folder containing `access.macaroon` file from cl-rest server.
-* `lnServerUrl` - complete url with ip address and port of the cl-rest server.
-* `multiPass` - Specify the password (in plain text) to access RTL. This password will be hashed and not stored as plain text.
-* `configPath` (optional) - File path of the core lightning config file, if RTL server is local to the core lightning server.
+* `lnImplementation` - This should be `CLN`, indicating that RTL is connecting to a core lightning node
+* `runePath` - Path of the folder including **filename** which contains the `rune` for the node. The content of the file must be `LIGHTNING_RUNE="<your-rune>"`
+* `lnServerUrl` - complete url with ip address and port of the CLNRest server
+* `multiPass` - Specify the password (in plain text) to access RTL. This password will be hashed and not stored as plain text
+* `configPath` (optional) - File path of the core lightning config file, if RTL server is local to the core lightning server
 
 ```
 {
   "multiPass": <password required for accessing RTL>,
   "port": "3000",
   "defaultNodeIndex": 1,
+  "dbDirectoryPath": "<Complete path of the folder where rtl's database file should be saved>",
   "SSO": {
     "rtlSSO": 0,
     "rtlCookiePath": "",
@@ -72,7 +78,7 @@ Ensure that the follow values are correct per your config:
       "lnNode": "Core Lightning Testnet # 1",
       "lnImplementation": "CLN",
       "Authentication": {
-        "macaroonPath": "<Modify to include the path of the folder with access.macaroon>",
+        "runePath": "<Modify to include the path of the folder including filename which contains `rune`>",
         "configPath": "<Optional - Config file path for core lightning>"
       },
       "Settings": {
@@ -83,7 +89,7 @@ Ensure that the follow values are correct per your config:
         "logLevel": "INFO",
         "fiatConversion": false,
         "unannouncedChannels": false,
-        "lnServerUrl": "https://<cl-rest api server ip address>:3001"
+        "lnServerUrl": "https://<CLNRest api server ip address>:3001"
       }
     }
   ]
@@ -96,9 +102,9 @@ Run the following command:
 
 If the server started successfully, you should get the below output on the console:
 
-`$ Server is up and running, please open the UI at http://localhost:3000 or your proxy configured url.`
+`$ Server is up and running, please open the UI at http://localhost:3000 or your proxy configured url`
 
-Open your browser at the following address: http://localhost:3000 to access the RTL app.
+Open your browser at the following address: http://localhost:3000 to access the RTL app
 
 ### Detailed config and instructions
-For detailed config and access options and other information, view the main readme page.
+For detailed config and access options and other information, view the main readme page

.github/docs/Eclair_setup.md

@@ -38,6 +38,10 @@ $ git clean -f -d
 $ git pull
 $ npm install --omit=dev
 ```
+
+#### Error on npm install
+If there is an error with `upstream dependency conflict` message then replace `npm install --omit=dev` with `npm install --omit=dev --legacy-peer-deps`.
+
 ### <a name="prep"></a>Prep for Execution
 RTL requires its own config file `RTL-Config.json`, to start the server and provide user authentication on the app. 
 * Rename the file `Sample-RTL-Config.json` to `RTL-Config.json` located at`./RTL`..
@@ -56,6 +60,7 @@ Ensure that the follow values are correct per your config:
   "multiPass": <password required for accessing RTL>,
   "port": "3000",
   "defaultNodeIndex": 1,
+  "dbDirectoryPath": "<Complete path of the folder where rtl's database file should be saved>",
   "SSO": {
     "rtlSSO": 0,
     "rtlCookiePath": "",

.github/docs/LND_API_coverage.md

@@ -1,57 +0,0 @@
-[Intro](../README.md) -- [Application Features](Application_features.md) -- [Road Map](Roadmap.md) -- **LND API Coverage** -- [Application Configurations](Application_configurations.md)
-
-- [x] GenSeed
-- [x] InitWallet
-- [x] UnlockWallet
-- [ ] ChangePassword
-- [x] WalletBalance
-- [x] ChannelBalance
-- [x] GetTransactions
-- [ ] EstimateFee
-- [x] SendCoins
-- [ ] ListUnspent
-- [ ] SubscribeTransactions
-- [ ] SendMany
-- [x] NewAddress
-- [x] SignMessage
-- [x] VerifyMessage
-- [x] ConnectPeer
-- [x] DisconnectPeer
-- [x] ListPeers
-- [x] GetInfo
-- [x] PendingChannels
-- [x] ListChannels
-- [ ] SubscribeChannelEvents
-- [x] ClosedChannels
-- [ ] OpenChannelSync
-- [x] OpenChannel
-- [x] CloseChannel
-- [ ] AbandonChannel
-- [x] SendPayment
-- [ ] SendPaymentSync
-- [ ] SendToRoute
-- [ ] SendToRouteSync
-- [x] AddInvoice
-- [x] ListInvoices
-- [ ] LookupInvoice
-- [ ] SubscribeInvoices
-- [x] DecodePayReq
-- [x] ListPayments
-- [ ] DeleteAllPayments
-- [ ] DescribeGraph
-- [x] GetChanInfo
-- [x] GetNodeInfo
-- [x] QueryRoutes
-- [x] GetNetworkInfo
-- [ ] StopDaemon
-- [ ] SubscribeChannelGraph
-- [ ] DebugLevel
-- [x] FeeReport
-- [x] UpdateChannelPolicy
-- [x] ForwardingHistory
-- [x] ExportChannelBackup
-- [x] ExportAllChannelBackups
-- [x] VerifyChanBackup
-- [x] RestoreChannelBackups
-- [ ] SubscribeChannelBackups
-- [ ] Messages

.github/docs/Multi_node_setup.md

@@ -20,16 +20,18 @@ This step is only required to configure the nodes, which will be remotely connec
 2. Set `multiPass` to the preferred password. This password will be used to authenticate the user for RTL. Once authenticated, the user will be able to access all the nodes configured in the json file
 3. Set the `port` to the preferred port number over which to run RTL
 4. Set the `defaultNodeIndex` to configure the default start up node at server restart
-5. `SSO` section can be used for single-sign-on from applications like BTCPayserver. If using RTL as a stand-alone app to connect with the nodes, keep the `rtlSSO=0` and ignore the rest of `SSO` section.
-6. `nodes` section is a json array, with each element of the array representing the specific parameters for the LND node to connect with. `index` must be a number and start with 1. This number must be unique for each node in the array. For each element, two items need to be configured for each node on the network (`macaroonPath` and `lnServerUrl`).
-7. `macaroonPath` should be set to the local path of the folder containing `admin.macaroon` file for each node. Each node must have a different folder for the `admin.macaroon` on the RTL server.
-8. `swapMacaroonPath` should be set to the local path of the folder containing `loop.macaroon` file for loop.
-9. `boltzMacaroonPath` should be set to the local path of the folder containing `admin.macaroon` file for boltz swaps.
-10. `lnServerUrl` must be set to the service url for LND/Core Lightining REST APIs for each node, with the unique ip address of the node hosting LND/Core Lightning e.g. https://192.168.0.1:8080 OR https://192.168.0.1:3001. In this case the ip address of the node hosting LND/Core Lightning is '192.168.0.1'
-11. `swapServerUrl` must be set to the swap service url. e.g. https://localhost:8081.
-12. `boltzServerUrl` must be set to the boltz service url. e.g. https://localhost:9003.
-13. `configPath` and `bitcoindConfigPath` are optional parameters which can be set only if the RTL is running locally on the same node. Else it can be set to "" or removed from the conf file all together.
-14. `lnApiPassword` is mandatory in the ln implementation is ECL and configPath is missing. It is used to provide password for API authentication. It will be ignored in other ln implementations.
+5. `dbDirectoryPath` should be set to the folder where RTL's database will be saved.
+6. `SSO` section can be used for single-sign-on from applications like BTCPayserver. If using RTL as a stand-alone app to connect with the nodes, keep the `rtlSSO=0` and ignore the rest of `SSO` section.
+7. `nodes` section is a json array, with each element of the array representing the specific parameters for the LND node to connect with. `index` must be a number and start with 1. This number must be unique for each node in the array. For each element, two items need to be configured for each node on the network (`macaroonPath` and `lnServerUrl`).
+8. `macaroonPath` should be set to the local path of the folder containing `admin.macaroon` file for each node. Each node must have a different folder for the `admin.macaroon` on the RTL server.
+9. `swapMacaroonPath` should be set to the local path of the folder containing `loop.macaroon` file for loop.
+10. `boltzMacaroonPath` should be set to the local path of the folder containing `admin.macaroon` file for boltz swaps.
+11. `lnServerUrl` must be set to the service url for LND/Core Lightining REST APIs for each node, with the unique ip address of the node hosting LND/Core Lightning e.g. https://192.168.0.1:8080 OR https://192.168.0.1:3001. In this case the ip address of the node hosting LND/Core Lightning is '192.168.0.1'
+12. `swapServerUrl` must be set to the swap service url. e.g. https://127.0.0.1:8081.
+13. `boltzServerUrl` must be set to the boltz service url. e.g. https://127.0.0.1:9003.
+14. `configPath` and `bitcoindConfigPath` are optional parameters which can be set only if the RTL is running locally on the same node. Else it can be set to "" or removed from the conf file all together.
+15. `lnApiPassword` is mandatory if the ln implementation is ECL and configPath is missing. It is used to provide password for API authentication. It will be ignored in other ln implementations.
+16. `runePath` is mandatory for CLN implementation. It should be set to the local path of the folder including filename containing rune value. This rune value in the file should be saved in  `LIGHTNING_RUNE="your-rune"` format.
 
 #### 3. Restart RTL
 

.github/docs/RTL_SSL_setup.md

@@ -3,20 +3,21 @@
 Forward the ports 80 and 3002 on the router to the device running RTL.
 Allow the ports through the firewall of the device.
 
-Install Nginx:
-https://www.nginx.com/resources/wiki/start/topics/tutorials/install/
-On Debian based distros:
-    $> sudo apt install nginx
-
-nginx default config file is at /etc/nginx/nginx.conf. You will need it.
-
 Install, if needed, openssl
 On Debian based distros:
     $> sudo apt install openssl
 
 Create a self certificate with openssl
     $> openssl req -newkey rsa:4096 -x509 -sha512 -days 365 -nodes -out /path/to/some/folder/rtl-cert.crt -keyout /path/to/some/folder/rtl-cert.key 
+    
+#### Nginx
 
+Install Nginx:
+https://www.nginx.com/resources/wiki/start/topics/tutorials/install/
+On Debian based distros:
+    $> sudo apt install nginx
+
+nginx default config file is at /etc/nginx/nginx.conf. You will need it.
 
 Sample configuration to be inserted in the nginx.conf (adjust the path and filename of your certificate and key):
 
@@ -41,3 +42,41 @@ Sample configuration to be inserted in the nginx.conf (adjust the path and filen
 Restart Nginx with the new configuration and connect to RTL over https on the port 3002.
 On Debian based distros:
     $> sudo systemctl restart nginx
+
+#### Apache2
+
+Skip to step 5 if you already have Apache2 set up with HTTPS configured.
+
+1. Install [Apache2](https://httpd.apache.org/download.cgi)
+    - On Debian-based distros: `sudo apt install apache2`
+    - On Fedora-based distros: `sudo yum install httpd`
+2. Install [Let's Encrypt](https://letsencrypt.org) to get a free TLS certificate. The easiest way to install is to use Snap: `sudo snap install certbot`.
+3. Run `certbot` to get a Let's Encrypt certificate: `sudo certbot`. Follow the instructions given to validate your domain name and install the certificate only. You may choose to redirect HTTP traffic to HTTPS instead (which attempts to secure every connection even when the client device does not request it). Let's Encrypt does not issue certificates for IP addresses. if you don't have a domain name, but you can use a service like NoIP.
+4. Locate the Let's Encrypt Apache2 configuration file. It's usually in `/etc/apache2/sites-enabled` and called "000-default-le-ssl.conf" or similar.
+5. Add the following lines to the Apache2 configuration file between the VIrtualHost 443 tags. This will redirect Apache's document root on your webserver to instead point to RTL. Change "/" to something like "/rtl" if you would instead like to redirect "/rtl" to RTL and do something else at the document root. Change "3002" to whatever port number you are using if it is not 3002.
+
+    ProxyPass "/" "http://127.0.0.1:3002/rtl"
+    ProxyPassReverse "/" "http://127.0.0.1:3002/rtl"
+
+6. Restart Apache2.
+    - Debian-based distros: `sudo systemctl restart apache2`
+    - Fedora-based distros: `sudo systemctl restart httpd`
+7. (Option) Edit ~/.rtl/rtl.js to disable insercure HTTP access to RTL entirely. Find these lines:
+
+    if (common.host) {
+      server.listen(common.port, common.host);
+    } else {
+      server.listen(common.port);
+    }
+
+...and change them to:
+
+    if (common.host) {
+      server.listen(common.port, "127.0.0.1");
+    } else {
+      server.listen(common.port, "127.0.0.1");
+    }
+
+This disables normal HTTP access to your server except if the client is on the same machine as the server. This will allow you to access http://localhost:3002 (or whatever port number you are using) on a browser that is on the same machine as RTL, but otherwise, you will have to access RTL through the Apache2 reverse proxy at https://yourdomain.tld/rtl, which will secure the connection with HTTPS.
+
+Note: Occasionally you will receive "Invalid CSRF token, form tempered" when attempting to log in to RTL. If that happens, refresh the page and try again.

.github/docs/RTL_setups.md

@@ -15,6 +15,7 @@ If your running RTL and LND on different devices on your local LAN, certain conf
   "multiPass": "<password in plain text, Default 'password'>",
   "port": "3000",
   "defaultNodeIndex": 1,
+  "dbDirectoryPath": "<Complete path of the folder where rtl's database file should be saved>",
   "SSO": {
     "rtlSSO": 0,
     "rtlCookiePath": "",

.github/workflows/checks.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v2
         with:
-          node-version: 16.x
+          node-version: 18.x
 
       - name: Cache node_modules
         uses: actions/cache@v2
@@ -46,7 +46,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v2
         with:
-          node-version: 16.x
+          node-version: 18.x
 
       - name: Cache node_modules
         uses: actions/cache@v2
@@ -78,7 +78,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v2
         with:
-          node-version: 16.x
+          node-version: 18.x
 
       - name: Cache node_modules
         uses: actions/cache@v2

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v2
         with:
-          node-version: 16.x
+          node-version: 18.x
 
       - name: Cache node_modules
         uses: actions/cache@v2

.github/workflows/stats.yml

@@ -1,23 +0,0 @@
-name: Pull Request Stats
-
-on:
-  push:
-    branches: [ master, 'Release-*' ]
-    tags: [ 'v*' ]
-  release:
-    types: [released]
-  # Triggers the workflow only when merging pull request to the branches.
-  pull_request:
-    types: [opened, closed]
-    branches: [ master, 'Release-*', '*' ]
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-jobs:
-  stats:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Run pull request stats
-        uses: flowwer-dev/pull-request-stats@master
-        with:
-          period: 365

Sample-RTL-Config.json

@@ -2,6 +2,7 @@
   "multiPass": "password",
   "port": "3000",
   "defaultNodeIndex": 1,
+  "dbDirectoryPath": "C:\\Users\\xyz\\RTL",
   "SSO": {
     "rtlSSO": 0,
     "rtlCookiePath": "",
@@ -24,9 +25,9 @@
         "themeColor": "PURPLE",
         "channelBackupPath": "C:\\Users\\xyz\\backup\\node-1",
         "logLevel": "ERROR",
-        "lnServerUrl": "https://localhost:8080",
-        "swapServerUrl": "https://localhost:8081",
-        "boltzServerUrl": "https://localhost:9003",
+        "lnServerUrl": "https://127.0.0.1:8080",
+        "swapServerUrl": "https://127.0.0.1:8081",
+        "boltzServerUrl": "https://127.0.0.1:9003",
         "fiatConversion": false,
         "unannouncedChannels": false
       }

angular.json

@@ -8,9 +8,6 @@
       "schematics": {
         "@schematics/angular:component": {
           "style": "scss"
-        },
-        "@schematics/angular:application": {
-          "strict": true
         }
       },
       "root": "",
@@ -24,89 +21,93 @@
             "outputPath": "frontend",
             "index": "src/index.html",
             "main": "src/main.ts",
-            "polyfills": "src/polyfills.ts",
-            "tsConfig": "src/tsconfig.app.json",
-            "allowedCommonJsDependencies": [
-              "sha256",
-              "qrcode",
-              "otplib",
-              "pdfmake/build/pdfmake",
-              "pdfmake/build/vfs_fonts",
-              "clone-deep"
+            "polyfills": [
+              "zone.js",
+              "src/polyfills.ts"
             ],
+            "tsConfig": "src/tsconfig.app.json",
+            "inlineStyleLanguage": "scss",
             "assets": [
               "src/assets"
             ],
             "styles": [
-              "src/app/shared/theme/styles/styles.scss"
+              "src/app/shared/theme/styles/styles.scss",
+              "node_modules/material-icons/iconfont/material-icons.css",
+              "node_modules/roboto-fontface/css/roboto/roboto-fontface.css"
             ],
             "scripts": [],
-            "vendorChunk": true,
-            "extractLicenses": false,
-            "buildOptimizer": false,
-            "sourceMap": true,
-            "optimization": false,
-            "namedChunks": true
+            "allowedCommonJsDependencies": [
+              "buffer",
+              "rfdc",
+              "sha256",
+              "qrcode",
+              "otplib",
+              "pdfmake/build/pdfmake",
+              "pdfmake/build/vfs_fonts"
+            ]
           },
           "configurations": {
             "production": {
-              "fileReplacements": [
-                {
-                  "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.prod.ts"
-                }
-              ],
-              "optimization": true,
-              "outputHashing": "all",
-              "sourceMap": false,
-              "namedChunks": false,
-              "extractLicenses": true,
-              "vendorChunk": false,
-              "buildOptimizer": true,
               "budgets": [
                 {
                   "type": "initial",
-                  "maximumWarning": "12mb",
-                  "maximumError": "12mb"
+                  "maximumWarning": "20mb",
+                  "maximumError": "50mb"
                 },
                 {
                   "type": "anyComponentStyle",
                   "maximumWarning": "20mb",
                   "maximumError": "50mb"
                 }
-              ]
+              ],
+              "outputHashing": "all"
+            },
+            "development": {
+              "buildOptimizer": false,
+              "optimization": false,
+              "vendorChunk": true,
+              "extractLicenses": false,
+              "sourceMap": true,
+              "namedChunks": true
             }
-          }
+          },
+          "defaultConfiguration": "production"
         },
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
-          "options": {
-            "browserTarget": "RTLApp:build"
-          },
           "configurations": {
             "production": {
-              "browserTarget": "RTLApp:build:production"
+              "buildTarget": "RTLApp:build:production"
+            },
+            "development": {
+              "buildTarget": "RTLApp:build:development"
             }
-          }
+          },
+          "defaultConfiguration": "development"
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "RTLApp:build"
+            "buildTarget": "RTLApp:build"
           }
         },
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "main": "src/test.ts",
-            "polyfills": "src/polyfills.ts",
+            "polyfills": [
+              "zone.js",
+              "zone.js/testing",
+              "src/polyfills.ts"
+            ],
             "tsConfig": "src/tsconfig.spec.json",
-            "karmaConfig": "src/karma.conf.cjs",
+            "inlineStyleLanguage": "scss",
             "assets": [
               "src/assets"
             ],
             "styles": [
-              "src/app/shared/theme/styles/styles.scss"
+              "src/app/shared/theme/styles/styles.scss",
+              "node_modules/material-icons/iconfont/material-icons.css",
+              "node_modules/roboto-fontface/css/roboto/roboto-fontface.css"
             ],
             "scripts": []
           }
@@ -114,6 +115,7 @@
         "lint": {
           "builder": "@angular-eslint/builder:lint",
           "options": {
+            "eslintConfig": ".eslintrc.json",
             "lintFilePatterns": [
               "src/**/*.ts",
               "src/**/*.html"
@@ -123,8 +125,7 @@
       }
     }
   },
-  "defaultProject": "RTLApp",
   "cli": {
-    "defaultCollection": "@angular-eslint/schematics"
+    "analytics": false
   }
 }

backend/controllers/cln/balance.js

@@ -1,30 +0,0 @@
-import request from 'request-promise';
-import { Logger } from '../../utils/logger.js';
-import { Common } from '../../utils/common.js';
-let options = null;
-const logger = Logger;
-const common = Common;
-export const getBalance = (req, res, next) => {
-    logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Balance', msg: 'Getting Balance..' });
-    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/getBalance';
-    request(options).then((body) => {
-        if (!body.totalBalance) {
-            body.totalBalance = 0;
-        }
-        if (!body.confBalance) {
-            body.confBalance = 0;
-        }
-        if (!body.unconfBalance) {
-            body.unconfBalance = 0;
-        }
-        logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Balance', msg: 'Balance Received', data: body });
-        res.status(200).json(body);
-    }).catch((errRes) => {
-        const err = common.handleError(errRes, 'Balance', 'Get Balance Error', req.session.selectedNode);
-        return res.status(err.statusCode).json({ message: err.message, error: err.error });
-    });
-};

backend/controllers/cln/channels.js

@@ -1,31 +1,29 @@
 import request from 'request-promise';
 import { Logger } from '../../utils/logger.js';
 import { Common } from '../../utils/common.js';
+import { getAlias } from './network.js';
 let options = null;
 const logger = Logger;
 const common = Common;
-export const listChannels = (req, res, next) => {
-    logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Channels', msg: 'Getting Channels..' });
+export const listPeerChannels = (req, res, next) => {
+    logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Channels', msg: 'Getting Peer Channels..' });
     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/channel/listChannels';
-    request(options).then((body) => {
-        body === null || body === void 0 ? void 0 : body.map((channel) => {
-            if (!channel.alias || channel.alias === '') {
-                channel.alias = channel.id.substring(0, 20);
-            }
-            const local = (channel.msatoshi_to_us) ? channel.msatoshi_to_us : 0;
-            const remote = (channel.msatoshi_to_them) ? channel.msatoshi_to_them : 0;
-            const total = channel.msatoshi_total ? channel.msatoshi_total : 0;
-            channel.balancedness = (total === 0) ? 1 : (1 - Math.abs((local - remote) / total)).toFixed(3);
-            return channel;
+    options.url = req.session.selectedNode.ln_server_url + '/v1/listpeerchannels';
+    request.post(options).then((body) => {
+        logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Channels', msg: 'Peer Channels List Received', data: body.channels });
+        return Promise.all(body.channels?.map((channel) => {
+            channel.to_them_msat = channel.total_msat - channel.to_us_msat;
+            channel.balancedness = (channel.total_msat === 0) ? 1 : (1 - Math.abs((channel.to_us_msat - (channel.total_msat - channel.to_us_msat)) / channel.total_msat)).toFixed(3);
+            return getAlias(req.session.selectedNode, channel, 'peer_id');
+        })).then((values) => {
+            logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Channels', msg: 'Peer Channels List With Aliases Received', data: body.channels });
+            return res.status(200).json(body.channels || []);
         });
-        logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Channels', msg: 'Channels List Received', data: body });
-        res.status(200).json(body);
     }).catch((errRes) => {
-        const err = common.handleError(errRes, 'Channels', 'List Channels Error', req.session.selectedNode);
+        const err = common.handleError(errRes, 'Channels', 'List Peer Channels Error', req.session.selectedNode);
         return res.status(err.statusCode).json({ message: err.message, error: err.error });
     });
 };
@@ -35,7 +33,7 @@ export const openChannel = (req, res, next) => {
     if (options.error) {
         return res.status(options.statusCode).json({ message: options.message, error: options.error });
     }
-    options.url = req.session.selectedNode.ln_server_url + '/v1/channel/openChannel';
+    options.url = req.session.selectedNode.ln_server_url + '/v1/fundchannel';
     options.body = req.body;
     logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Channels', msg: 'Open Channel Options', data: options.body });
     request.post(options).then((body) => {
@@ -52,7 +50,7 @@ export const setChannelFee = (req, res, next) => {
     if (options.error) {
         return res.status(options.statusCode).json({ message: options.message, error: options.error });
     }
-    options.url = req.session.selectedNode.ln_server_url + '/v1/channel/setChannelFee';
+    options.url = req.session.selectedNode.ln_server_url + '/v1/setchannel';
     options.body = req.body;
     logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Channels', msg: 'Update Channel Policy Options', data: options.body });
     request.post(options).then((body) => {
@@ -70,10 +68,10 @@ export const closeChannel = (req, res, next) => {
     if (options.error) {
         return res.status(options.statusCode).json({ message: options.message, error: options.error });
     }
-    const unilateralTimeoutQuery = req.query.force ? '?unilateralTimeout=1' : '';
-    options.url = req.session.selectedNode.ln_server_url + '/v1/channel/closeChannel/' + req.params.channelId + unilateralTimeoutQuery;
+    options.url = req.session.selectedNode.ln_server_url + '/v1/close';
+    options.body = req.body;
     logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Channels', msg: 'Closing Channel', data: options.url });
-    request.delete(options).then((body) => {
+    request.post(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Channels', msg: 'Channel Closed', data: body });
         res.status(204).json(body);
     }).catch((errRes) => {
@@ -81,37 +79,18 @@ export const closeChannel = (req, res, next) => {
         return res.status(err.statusCode).json({ message: err.message, error: err.error });
     });
 };
-export const getLocalRemoteBalance = (req, res, next) => {
-    logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Channels', msg: 'Getting Local & Remote Balances..' });
-    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/channel/localremotebal';
-    request(options).then((body) => {
-        if (!body.localBalance) {
-            body.localBalance = 0;
-        }
-        if (!body.remoteBalance) {
-            body.remoteBalance = 0;
-        }
-        logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Channels', msg: 'Local Remote Balance Received', data: body });
-        res.status(200).json(body);
-    }).catch((errRes) => {
-        const err = common.handleError(errRes, 'Channels', 'Local Remote Balance Error', req.session.selectedNode);
-        return res.status(err.statusCode).json({ message: err.message, error: err.error });
-    });
-};
 export const listForwards = (req, res, next) => {
     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Channels', msg: 'Getting Channel List Forwards..' });
     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/channel/listForwards?status=' + (req.query.status ? req.query.status : 'settled');
-    request.get(options).then((body) => {
-        logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Channels', msg: 'Forwarding History Received For Status ' + req.query.status, data: body });
-        res.status(200).json(body);
+    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();
+        res.status(200).json(body.forwards);
     }).catch((errRes) => {
         const err = common.handleError(errRes, 'Channels', 'Forwarding History Error', req.session.selectedNode);
         return res.status(err.statusCode).json({ message: err.message, error: err.error });
@@ -123,39 +102,14 @@ export const funderUpdatePolicy = (req, res, next) => {
     if (options.error) {
         return res.status(options.statusCode).json({ message: options.message, error: options.error });
     }
-    options.url = req.session.selectedNode.ln_server_url + '/v1/channel/funderUpdate';
-    if (req.body && req.body.policy) {
-        options.body = req.body;
-    }
+    options.url = req.session.selectedNode.ln_server_url + '/v1/funderupdate';
+    options.body = req.body;
     logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Channels', msg: 'Funder Update Body', data: options.body });
     request.post(options).then((body) => {
-        var _a, _b;
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Channels', msg: 'Funder Policy Received', data: body });
-        body.channel_fee_max_base_msat = (body.channel_fee_max_base_msat && typeof body.channel_fee_max_base_msat === 'string' && body.channel_fee_max_base_msat.includes('msat')) ? +((_a = body.channel_fee_max_base_msat) === null || _a === void 0 ? void 0 : _a.replace('msat', '')) : body.channel_fee_max_base_msat;
-        body.lease_fee_base_msat = (body.lease_fee_base_msat && typeof body.lease_fee_base_msat === 'string' && body.lease_fee_base_msat.includes('msat')) ? +((_b = body.lease_fee_base_msat) === null || _b === void 0 ? void 0 : _b.replace('msat', '')) : body.channel_fee_max_base_msat;
         res.status(200).json(body);
     }).catch((errRes) => {
         const err = common.handleError(errRes, 'Channels', 'Funder Policy Error', req.session.selectedNode);
         return res.status(err.statusCode).json({ message: err.message, error: err.error });
     });
 };
-export const listForwardsPaginated = (req, res, next) => {
-    logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Channels', msg: 'Getting Paginated List Forwards..' });
-    options = common.getOptions(req);
-    if (options.error) {
-        return res.status(options.statusCode).json({ message: options.message, error: options.error });
-    }
-    const { status, maxLen, offset } = req.query;
-    let queryStr = '?status=' + (status ? status : 'settled');
-    queryStr = queryStr + '&maxLen=' + (maxLen ? maxLen : '10');
-    queryStr = queryStr + '&offset=' + (offset ? offset : '0');
-    options.url = req.session.selectedNode.ln_server_url + '/v1/channel/listForwardsPaginated' + queryStr;
-    logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Channels', msg: 'Paginated Forwarding History url' + options.url });
-    request.get(options).then((body) => {
-        logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Channels', msg: 'Paginated Forwarding History Received For Status ' + req.query.status, data: body });
-        res.status(200).json(body);
-    }).catch((errRes) => {
-        const err = common.handleError(errRes, 'Channels', 'Paginated Forwarding History Error', req.session.selectedNode);
-        return res.status(err.statusCode).json({ message: err.message, error: err.error });
-    });
-};

backend/controllers/cln/fees.js

@@ -10,13 +10,12 @@ export const getFees = (req, res, next) => {
     if (options.error) {
         return res.status(options.statusCode).json({ message: options.message, error: options.error });
     }
-    options.url = req.session.selectedNode.ln_server_url + '/v1/getFees';
-    request(options).then((body) => {
-        if (!body.feeCollected) {
-            body.feeCollected = 0;
-        }
-        logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Fees', msg: 'Fee Received', data: body });
-        res.status(200).json(body);
+    options.url = req.session.selectedNode.ln_server_url + '/v1/getinfo';
+    request.post(options).then((body) => {
+        const versionCompatible = common.isVersionCompatible(req.session.selectedNode.ln_version, '23.02');
+        const feeData = { feeCollected: ((versionCompatible ? body.fees_collected_msat : body.msatoshi_fees_collected) || 0) };
+        logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Fees', msg: 'Fee Received', data: feeData });
+        res.status(200).json(feeData);
     }).catch((errRes) => {
         const err = common.handleError(errRes, 'Fees', 'Get Fees Error', req.session.selectedNode);
         return res.status(err.statusCode).json({ message: err.message, error: err.error });

backend/controllers/cln/getInfo.js

@@ -19,53 +19,41 @@ export const getInfo = (req, res, next) => {
     options.url = req.session.selectedNode.ln_server_url + '/v1/getinfo';
     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'GetInfo', msg: 'Selected Node ' + req.session.selectedNode.ln_node });
     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'GetInfo', msg: 'Calling Info from Core Lightning server url ' + options.url });
-    if (!options.headers || !options.headers.macaroon) {
-        const errMsg = 'Core lightning get info failed due to bad or missing macaroon!';
-        const err = common.handleError({ statusCode: 502, message: 'Bad Macaroon', error: errMsg }, 'GetInfo', errMsg, req.session.selectedNode);
+    if (!options.headers || !options.headers.rune) {
+        const errMsg = 'Core lightning get info failed due to missing rune!';
+        const err = common.handleError({ statusCode: 502, message: 'Bad rune', error: errMsg }, 'GetInfo', errMsg, req.session.selectedNode);
         return res.status(err.statusCode).json({ message: err.message, error: err.error });
     }
     else {
-        return request(options).then((body) => {
-            const body_str = (!body) ? '' : JSON.stringify(body);
-            const search_idx = (!body) ? -1 : body_str.search('Not Found');
-            if (!body || search_idx > -1 || body.error) {
-                if (body && !body.error) {
-                    body.error = 'Error From Server!';
-                }
-                const err = common.handleError(body, 'GetInfo', 'Get Info Error', req.session.selectedNode);
-                return res.status(err.statusCode).json({ message: err.message, error: err.error });
+        return request.post(options).then((body) => {
+            logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'GetInfo', msg: 'Node Information Before Update', data: body });
+            body.lnImplementation = 'Core Lightning';
+            const chainObj = { chain: '', network: '' };
+            if (body.network.includes('litecoin') || body.network.includes('feathercoin')) {
+                chainObj.chain = '';
+                chainObj.network = '';
+            }
+            else if (body.network.includes('liquid')) {
+                chainObj.chain = 'Liquid';
+                chainObj.network = common.titleCase(body.network);
             }
             else {
-                logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'GetInfo', msg: 'Node Information Before Update', data: body });
-                body.lnImplementation = 'Core Lightning';
-                const chainObj = { chain: '', network: '' };
-                if (body.network.includes('litecoin') || body.network.includes('feathercoin')) {
-                    chainObj.chain = '';
-                    chainObj.network = '';
-                }
-                else if (body.network.includes('liquid')) {
-                    chainObj.chain = 'Liquid';
-                    chainObj.network = common.titleCase(body.network);
-                }
-                else {
-                    chainObj.chain = 'Bitcoin';
-                    chainObj.network = common.titleCase(body.network);
-                }
-                body.chains = [chainObj];
-                body.uris = [];
-                if (body.address && body.address.length > 0) {
-                    body.address.forEach((addr) => {
-                        body.uris.push(body.id + '@' + addr.address + ':' + addr.port);
-                    });
-                }
-                req.session.selectedNode.api_version = body.api_version || '';
-                req.session.selectedNode.ln_version = body.version || '';
-                logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'GetInfo', msg: 'Connecting to the Core Lightning\'s Websocket Server.' });
-                clWsClient.updateSelectedNode(req.session.selectedNode);
-                databaseService.loadDatabase(req.session);
-                logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'GetInfo', msg: 'Node Information Received', data: body });
-                return res.status(200).json(body);
+                chainObj.chain = 'Bitcoin';
+                chainObj.network = common.titleCase(body.network);
+            }
+            body.chains = [chainObj];
+            body.uris = [];
+            if (body.address && body.address.length > 0) {
+                body.address.forEach((addr) => {
+                    body.uris.push(body.id + '@' + addr.address + ':' + addr.port);
+                });
             }
+            req.session.selectedNode.ln_version = body.version || '';
+            req.session.selectedNode.api_version = body.api_version || '';
+            logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'GetInfo', msg: 'Connecting to the Core Lightning\'s Websocket Server.' });
+            clWsClient.updateSelectedNode(req.session.selectedNode);
+            logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'GetInfo', msg: 'Node Information Received', data: body });
+            return res.status(200).json(body);
         }).catch((errRes) => {
             const err = common.handleError(errRes, 'GetInfo', 'Get Info Error', req.session.selectedNode);
             return res.status(err.statusCode).json({ message: err.message, error: err.error });

backend/controllers/cln/invoices.js

@@ -10,9 +10,9 @@ export const deleteExpiredInvoice = (req, res, next) => {
     if (options.error) {
         return res.status(options.statusCode).json({ message: options.message, error: options.error });
     }
-    const queryStr = req.query.maxExpiry ? '?maxexpiry=' + req.query.maxExpiry : '';
-    options.url = req.session.selectedNode.ln_server_url + '/v1/invoice/delExpiredInvoice' + queryStr;
-    request.delete(options).then((body) => {
+    options.url = req.session.selectedNode.ln_server_url + '/v1/delexpiredinvoice';
+    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' });
     }).catch((errRes) => {
@@ -26,10 +26,10 @@ export const listInvoices = (req, res, next) => {
     if (options.error) {
         return res.status(options.statusCode).json({ message: options.message, error: options.error });
     }
-    const labelQuery = req.query.label ? '?label=' + req.query.label : '';
-    options.url = req.session.selectedNode.ln_server_url + '/v1/invoice/listInvoices' + labelQuery;
+    options.url = req.session.selectedNode.ln_server_url + '/v1/listinvoices';
+    options.body = req.body;
     logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Invoice', msg: 'Invoices List URL', data: options.url });
-    request(options).then((body) => {
+    request.post(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Invoice', msg: 'Invoices List Received', data: body });
         res.status(200).json(body);
     }).catch((errRes) => {
@@ -43,7 +43,7 @@ export const addInvoice = (req, res, next) => {
     if (options.error) {
         return res.status(options.statusCode).json({ message: options.message, error: options.error });
     }
-    options.url = req.session.selectedNode.ln_server_url + '/v1/invoice/genInvoice';
+    options.url = req.session.selectedNode.ln_server_url + '/v1/invoice';
     options.body = req.body;
     request.post(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Invoice', msg: 'Invoice Created', data: body });

backend/controllers/cln/network.js

@@ -10,38 +10,28 @@ export const getRoute = (req, res, next) => {
     if (options.error) {
         return res.status(options.statusCode).json({ message: options.message, error: options.error });
     }
-    options.url = req.session.selectedNode.ln_server_url + '/v1/network/getRoute/' + req.params.destPubkey + '/' + req.params.amount;
-    request(options).then((body) => {
+    options.url = req.session.selectedNode.ln_server_url + '/v1/getroute';
+    options.body = req.body;
+    request.post(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Network', msg: 'Network Routes Received', data: body });
-        res.status(200).json({ routes: body });
+        return Promise.all(body.route?.map((rt) => getAlias(req.session.selectedNode, rt, 'id'))).then((values) => {
+            logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Peers', msg: 'Network Routes with Alias Received', data: body });
+            res.status(200).json(body || []);
+        });
     }).catch((errRes) => {
         const err = common.handleError(errRes, 'Network', 'Query Routes Error', req.session.selectedNode);
         return res.status(err.statusCode).json({ message: err.message, error: err.error });
     });
 };
-export const listNode = (req, res, next) => {
-    logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Network', msg: 'Node Lookup..' });
-    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/network/listNode/' + req.params.id;
-    request(options).then((body) => {
-        logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Network', msg: 'Node Lookup Finished', data: body });
-        res.status(200).json(body);
-    }).catch((errRes) => {
-        const err = common.handleError(errRes, 'Network', 'Node Lookup Error', req.session.selectedNode);
-        return res.status(err.statusCode).json({ message: err.message, error: err.error });
-    });
-};
-export const listChannel = (req, res, next) => {
+export const listChannels = (req, res, next) => {
     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Network', msg: 'Channel Lookup..' });
     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/network/listChannel/' + req.params.channelShortId;
-    request(options).then((body) => {
+    options.url = req.session.selectedNode.ln_server_url + '/v1/listchannels';
+    options.body = req.body;
+    request.post(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Network', msg: 'Channel Lookup Finished', data: body });
         res.status(200).json(body);
     }).catch((errRes) => {
@@ -55,9 +45,10 @@ export const feeRates = (req, res, next) => {
     if (options.error) {
         return res.status(options.statusCode).json({ message: options.message, error: options.error });
     }
-    options.url = req.session.selectedNode.ln_server_url + '/v1/network/feeRates/' + req.params.feeRateStyle;
-    request(options).then((body) => {
-        logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Network', msg: 'Network Fee Rates Received for ' + req.params.feeRateStyle, data: body });
+    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 });
         res.status(200).json(body);
     }).catch((errRes) => {
         const err = common.handleError(errRes, 'Network', 'Fee Rates Error', req.session.selectedNode);
@@ -70,24 +61,38 @@ export const listNodes = (req, res, next) => {
     if (options.error) {
         return res.status(options.statusCode).json({ message: options.message, error: options.error });
     }
-    const queryStr = req.query.liquidity_ads ? '?liquidity_ads=' + req.query.liquidity_ads : '';
-    options.url = req.session.selectedNode.ln_server_url + '/v1/network/listNodes' + queryStr;
+    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(options).then((body) => {
+    request.post(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Network', msg: 'List Nodes Finished', data: body });
-        body.forEach((node) => {
-            var _a, _b;
-            if (node.option_will_fund) {
-                node.option_will_fund.lease_fee_base_msat = (node.option_will_fund.lease_fee_base_msat && typeof node.option_will_fund.lease_fee_base_msat === 'string' &&
-                    node.option_will_fund.lease_fee_base_msat.includes('msat')) ? (_a = node.option_will_fund.lease_fee_base_msat) === null || _a === void 0 ? void 0 : _a.replace('msat', '') : node.option_will_fund.lease_fee_base_msat;
-                node.option_will_fund.channel_fee_max_base_msat = (node.option_will_fund.channel_fee_max_base_msat && typeof node.option_will_fund.channel_fee_max_base_msat === 'string' &&
-                    node.option_will_fund.channel_fee_max_base_msat.includes('msat')) ? (_b = node.option_will_fund.channel_fee_max_base_msat) === null || _b === void 0 ? void 0 : _b.replace('msat', '') : node.option_will_fund.channel_fee_max_base_msat;
-            }
-            return node;
-        });
-        res.status(200).json(body);
+        let response = body.nodes;
+        if (filter_liquidity_ads) {
+            response = body.nodes.filter((node) => ((node.option_will_fund) ? node : null));
+        }
+        res.status(200).json(response);
     }).catch((errRes) => {
         const err = common.handleError(errRes, 'Network', 'Node Lookup Error', req.session.selectedNode);
         return res.status(err.statusCode).json({ message: err.message, error: err.error });
     });
 };
+export const getAlias = (selNode, peer, id) => {
+    options.url = selNode.ln_server_url + '/v1/listnodes';
+    if (!peer[id]) {
+        logger.log({ selectedNode: selNode, level: 'ERROR', fileName: 'Network', msg: 'Empty Peer ID' });
+        peer.alias = '';
+        return peer;
+    }
+    options.body = { id: peer[id] };
+    return request.post(options).then((body) => {
+        logger.log({ selectedNode: selNode, level: 'DEBUG', fileName: 'Network', msg: 'Peer Alias Finished', data: body });
+        peer.alias = body.nodes[0] && body.nodes[0].alias ? body.nodes[0].alias : peer[id].substring(0, 20);
+        return peer;
+    }).catch((errRes) => {
+        common.handleError(errRes, 'Network', 'Peer Alias Error', selNode);
+        peer.alias = peer[id].substring(0, 20);
+        return peer;
+    });
+};

backend/controllers/cln/offers.js

@@ -19,9 +19,9 @@ export const listOfferBookmarks = (req, res, next) => {
 };
 export const deleteOfferBookmark = (req, res, next) => {
     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Offers', msg: 'Deleting Offer Bookmark..' });
-    databaseService.remove(req.session.selectedNode, CollectionsEnum.OFFERS, CollectionFieldsEnum.BOLT12, req.params.offerStr).then((deleteRes) => {
+    databaseService.remove(req.session.selectedNode, CollectionsEnum.OFFERS, CollectionFieldsEnum.BOLT12, req.body.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.params.offerStr);
+        res.status(204).json(req.body.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 });
@@ -33,15 +33,9 @@ export const listOffers = (req, res, next) => {
     if (options.error) {
         return res.status(options.statusCode).json({ message: options.message, error: options.error });
     }
-    options.url = req.session.selectedNode.ln_server_url + '/v1/offers/listoffers';
-    if (req.query.offer_id) {
-        options.url = options.url + '?offer_id=' + req.query.offer_id;
-    }
-    if (req.query.active_only) {
-        options.url = options.url + '?active_only=' + req.query.active_only;
-    }
+    options.url = req.session.selectedNode.ln_server_url + '/v1/listoffers';
     logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Offers', msg: 'Offers List URL', data: options.url });
-    request(options).then((body) => {
+    request.post(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Offers', msg: 'Offers List Received', data: body });
         res.status(200).json(body);
     }).catch((errRes) => {
@@ -55,7 +49,7 @@ export const createOffer = (req, res, next) => {
     if (options.error) {
         return res.status(options.statusCode).json({ message: options.message, error: options.error });
     }
-    options.url = req.session.selectedNode.ln_server_url + '/v1/offers/offer';
+    options.url = req.session.selectedNode.ln_server_url + '/v1/offer';
     options.body = req.body;
     request.post(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Offers', msg: 'Offer Created', data: body });
@@ -71,7 +65,7 @@ export const fetchOfferInvoice = (req, res, next) => {
     if (options.error) {
         return res.status(options.statusCode).json({ message: options.message, error: options.error });
     }
-    options.url = req.session.selectedNode.ln_server_url + '/v1/offers/fetchInvoice';
+    options.url = req.session.selectedNode.ln_server_url + '/v1/fetchinvoice';
     options.body = req.body;
     logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Offers', msg: 'Offer Invoice Body', data: options.body });
     request.post(options).then((body) => {
@@ -88,8 +82,9 @@ 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.ln_server_url + '/v1/offers/disableOffer/' + req.params.offerID;
-    request.delete(options).then((body) => {
+    options.url = req.session.selectedNode.ln_server_url + '/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 });
         res.status(202).json(body);
     }).catch((errRes) => {

backend/controllers/cln/onchain.js

@@ -10,8 +10,9 @@ export const getNewAddress = (req, res, next) => {
     if (options.error) {
         return res.status(options.statusCode).json({ message: options.message, error: options.error });
     }
-    options.url = req.session.selectedNode.ln_server_url + '/v1/newaddr?addrType=' + req.query.type;
-    request(options).then((body) => {
+    options.url = req.session.selectedNode.ln_server_url + '/v1/newaddr';
+    options.body = req.body;
+    request.post(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'OnChain', msg: 'New Address Generated', data: body });
         res.status(200).json(body);
     }).catch((errRes) => {
@@ -42,10 +43,47 @@ export const getUTXOs = (req, res, next) => {
     if (options.error) {
         return res.status(options.statusCode).json({ message: options.message, error: options.error });
     }
-    options.url = req.session.selectedNode.ln_server_url + '/v1/listFunds';
-    request(options).then((body) => {
+    options.url = req.session.selectedNode.ln_server_url + '/v1/listfunds';
+    request.post(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'OnChain', msg: 'Funds List Received', data: body });
-        res.status(200).json(body);
+        // Local Remote Balance Calculation
+        let lrBalance = { localBalance: 0, remoteBalance: 0, inactiveBalance: 0, pendingBalance: 0 };
+        body.channels.forEach((channel) => {
+            if ((channel.state === 'CHANNELD_NORMAL') && channel.connected === true) {
+                lrBalance.localBalance = lrBalance.localBalance + channel.our_amount_msat;
+                lrBalance.remoteBalance = lrBalance.remoteBalance + (channel.amount_msat - channel.our_amount_msat);
+            }
+            else if ((channel.state === 'CHANNELD_NORMAL') && channel.connected === false) {
+                lrBalance.inactiveBalance = lrBalance.inactiveBalance + channel.our_amount_msat;
+            }
+            else if (channel.state === 'CHANNELD_AWAITING_LOCKIN' || channel.state === 'DUALOPEND_AWAITING_LOCKIN') {
+                lrBalance.pendingBalance = lrBalance.pendingBalance + channel.our_amount_msat;
+            }
+        });
+        lrBalance = {
+            localBalance: lrBalance.localBalance / 1000,
+            remoteBalance: lrBalance.remoteBalance / 1000,
+            inactiveBalance: lrBalance.inactiveBalance / 1000,
+            pendingBalance: lrBalance.pendingBalance / 1000
+        };
+        logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Onchain', msg: 'Local Remote Balance', data: lrBalance });
+        // Onchain Balance Calculation
+        let onchainBalance = { totalBalance: 0, confBalance: 0, unconfBalance: 0 };
+        body.outputs.forEach((output) => {
+            if (output.status === 'confirmed') {
+                onchainBalance.confBalance = onchainBalance.confBalance + output.amount_msat;
+            }
+            else if (output.status === 'unconfirmed') {
+                onchainBalance.unconfBalance = onchainBalance.unconfBalance + output.amount_msat;
+            }
+        });
+        onchainBalance = {
+            totalBalance: onchainBalance.confBalance / 1000,
+            confBalance: (onchainBalance.confBalance - onchainBalance.unconfBalance) / 1000,
+            unconfBalance: onchainBalance.unconfBalance / 1000
+        };
+        logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Onchain', msg: 'Onchain Balance Received', data: onchainBalance });
+        res.status(200).json({ utxos: body.outputs || [], balance: onchainBalance, localRemoteBalance: lrBalance });
     }).catch((errRes) => {
         const err = common.handleError(errRes, 'OnChain', 'List Funds Error', req.session.selectedNode);
         return res.status(err.statusCode).json({ message: err.message, error: err.error });

backend/controllers/cln/payments.js

@@ -7,6 +7,18 @@ let options = null;
 const logger = Logger;
 const common = Common;
 const databaseService = Database;
+export const getMemo = (selNode, payment) => {
+    options.url = selNode.ln_server_url + '/v1/decode';
+    options.body = { string: payment.bolt11 };
+    return request.post(options).then((res) => {
+        logger.log({ selectedNode: selNode, level: 'DEBUG', fileName: 'Payments', msg: 'Payment Decode Received', data: res });
+        payment.memo = res.description || '';
+        return payment;
+    }).catch((err) => {
+        payment.memo = '';
+        return payment;
+    });
+};
 function paymentReducer(accumulator, currentPayment) {
     const currPayHash = currentPayment.payment_hash;
     if (!currentPayment.partid) {
@@ -22,8 +34,8 @@ function paymentReducer(accumulator, currentPayment) {
 }
 function summaryReducer(accumulator, mpp) {
     if (mpp.status === 'complete') {
-        accumulator.msatoshi = accumulator.msatoshi + mpp.msatoshi;
-        accumulator.msatoshi_sent = accumulator.msatoshi_sent + mpp.msatoshi_sent;
+        accumulator.amount_msat = accumulator.amount_msat + mpp.amount_msat;
+        accumulator.amount_sent_msat = accumulator.amount_sent_msat + mpp.amount_sent_msat;
         accumulator.status = mpp.status;
     }
     if (mpp.bolt11) {
@@ -35,10 +47,9 @@ function summaryReducer(accumulator, mpp) {
     return accumulator;
 }
 function groupBy(payments) {
-    var _a;
-    const paymentsInGroups = payments === null || payments === void 0 ? void 0 : payments.reduce(paymentReducer, {});
-    const paymentsGrpArray = (_a = Object.keys(paymentsInGroups)) === null || _a === void 0 ? void 0 : _a.map((key) => ((paymentsInGroups[key].length && paymentsInGroups[key].length > 1) ? common.sortDescByKey(paymentsInGroups[key], 'partid') : paymentsInGroups[key]));
-    return paymentsGrpArray === null || paymentsGrpArray === void 0 ? void 0 : paymentsGrpArray.reduce((acc, curr) => {
+    const paymentsInGroups = payments?.reduce(paymentReducer, {});
+    const paymentsGrpArray = Object.keys(paymentsInGroups)?.map((key) => ((paymentsInGroups[key].length && paymentsInGroups[key].length > 1) ? common.sortDescByKey(paymentsInGroups[key], 'partid') : paymentsInGroups[key]));
+    return paymentsGrpArray?.reduce((acc, curr) => {
         let temp = {};
         if (curr.length && curr.length === 1) {
             temp = JSON.parse(JSON.stringify(curr[0]));
@@ -48,10 +59,10 @@ function groupBy(payments) {
             delete temp.partid;
         }
         else {
-            const paySummary = curr === null || curr === void 0 ? void 0 : curr.reduce(summaryReducer, { msatoshi: 0, msatoshi_sent: 0, status: (curr[0] && curr[0].status) ? curr[0].status : 'failed' });
+            const paySummary = curr?.reduce(summaryReducer, { amount_msat: 0, amount_sent_msat: 0, status: (curr[0] && curr[0].status) ? curr[0].status : 'failed' });
             temp = {
                 is_group: true, is_expanded: false, total_parts: (curr.length ? curr.length : 0), status: paySummary.status, payment_hash: curr[0].payment_hash,
-                destination: curr[0].destination, msatoshi: paySummary.msatoshi, msatoshi_sent: paySummary.msatoshi_sent, created_at: curr[0].created_at,
+                destination: curr[0].destination, amount_msat: paySummary.amount_msat, amount_sent_msat: paySummary.amount_sent_msat, created_at: curr[0].created_at,
                 mpps: curr
             };
             if (paySummary.bolt11) {
@@ -70,10 +81,14 @@ export const listPayments = (req, res, next) => {
     if (options.error) {
         return res.status(options.statusCode).json({ message: options.message, error: options.error });
     }
-    options.url = req.session.selectedNode.ln_server_url + '/v1/pay/listPayments';
-    request(options).then((body) => {
+    options.url = req.session.selectedNode.ln_server_url + '/v1/listsendpays';
+    request.post(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Payments', msg: 'Payment List Received', data: body.payments });
-        res.status(200).json(groupBy(body.payments));
+        body.payments = body.payments && body.payments.length && body.payments.length > 0 ? groupBy(body.payments) : [];
+        return Promise.all(body.payments?.map((payment) => ((payment.bolt11) ? getMemo(req.session.selectedNode, payment) : (payment.memo = '')))).then((values) => {
+            logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Payments', msg: 'Payments List with Memo Received', data: body.payments });
+            res.status(200).json(body.payments);
+        });
     }).catch((errRes) => {
         const err = common.handleError(errRes, 'Payments', 'List Payments Error', req.session.selectedNode);
         return res.status(err.statusCode).json({ message: err.message, error: err.error });
@@ -84,29 +99,59 @@ export const postPayment = (req, res, next) => {
     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') {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Payments', msg: 'Keysend Payment..' });
-        options.url = req.session.selectedNode.ln_server_url + '/v1/pay/keysend';
-        options.body = req.body;
+        options.url = req.session.selectedNode.ln_server_url + '/v1/keysend';
+        delete options_body.uiMessage;
+        delete options_body.fromDialog;
+        delete options_body.paymentType;
+        delete options_body.title;
+        delete options_body.issuer;
+        delete options_body.bolt11;
+        delete options_body.description;
+        delete options_body.bolt12;
+        delete options_body.zeroAmtOffer;
+        delete options_body.pubkey;
+        delete options_body.riskfactor;
+        delete options_body.localinvreqid;
+        delete options_body.exclude;
+        delete options_body.maxfee;
+        delete options_body.saveToDB;
+        options.body = options_body;
     }
     else {
         if (req.body.paymentType === 'OFFER') {
             logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Payments', msg: 'Sending Offer Payment..' });
-            options.body = { invoice: req.body.invoice };
         }
         else {
             logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Payments', msg: 'Sending Invoice Payment..' });
-            options.body = req.body;
         }
+        if (req.body.paymentType === 'OFFER') {
+            // delete amount for zero amt offer also as fetchinvoice already has amount information
+            delete options_body.amount_msat;
+        }
+        delete options_body.uiMessage;
+        delete options_body.fromDialog;
+        delete options_body.paymentType;
+        delete options_body.destination;
+        delete options_body.extratlvs;
+        delete options_body.title;
+        delete options_body.issuer;
+        delete options_body.bolt12;
+        delete options_body.zeroAmtOffer;
+        delete options_body.pubkey;
+        delete options_body.saveToDB;
+        options.body = options_body;
         options.url = req.session.selectedNode.ln_server_url + '/v1/pay';
     }
     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), title: req.body.title, lastUpdatedAt: new Date(Date.now()).getTime() };
-                if (req.body.vendor) {
-                    offerToUpdate['vendor'] = req.body.vendor;
+                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 (req.body.description) {
                     offerToUpdate['description'] = req.body.description;

backend/controllers/cln/peers.js

@@ -1,6 +1,7 @@
 import request from 'request-promise';
 import { Logger } from '../../utils/logger.js';
 import { Common } from '../../utils/common.js';
+import { getAlias } from './network.js';
 let options = null;
 const logger = Logger;
 const common = Common;
@@ -10,15 +11,14 @@ export const getPeers = (req, res, next) => {
     if (options.error) {
         return res.status(options.statusCode).json({ message: options.message, error: options.error });
     }
-    options.url = req.session.selectedNode.ln_server_url + '/v1/peer/listPeers';
-    request(options).then((body) => {
-        body.forEach((peer) => {
-            if (!peer.alias || peer.alias === '') {
-                peer.alias = peer.id.substring(0, 20);
-            }
+    options.url = req.session.selectedNode.ln_server_url + '/v1/listpeers';
+    request.post(options).then((body) => {
+        logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Peers', msg: 'Peers List Received', data: body });
+        const peers = !body.peers ? [] : body.peers;
+        return Promise.all(peers?.map((peer) => getAlias(req.session.selectedNode, peer, 'id'))).then((values) => {
+            logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Peers', msg: 'Sorted Peers List Received', data: body.peers });
+            res.status(200).json(body.peers || []);
         });
-        logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Peers', msg: 'Peers with Alias Received', data: body });
-        res.status(200).json(body || []);
     }).catch((errRes) => {
         const err = common.handleError(errRes, 'Peers', 'List Peers Error', req.session.selectedNode);
         return res.status(err.statusCode).json({ message: err.message, error: err.error });
@@ -30,13 +30,14 @@ export const postPeer = (req, res, next) => {
     if (options.error) {
         return res.status(options.statusCode).json({ message: options.message, error: options.error });
     }
-    options.url = req.session.selectedNode.ln_server_url + '/v1/peer/connect';
+    options.url = req.session.selectedNode.ln_server_url + '/v1/connect';
     options.body = req.body;
     request.post(options).then((connectRes) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Peers', msg: 'Peer Connected', data: connectRes });
-        options.url = req.session.selectedNode.ln_server_url + '/v1/peer/listPeers';
-        request(options).then((listPeersRes) => {
-            const peers = listPeersRes ? common.newestOnTop(listPeersRes, 'id', req.body.id) : [];
+        const listOptions = common.getOptions(req);
+        listOptions.url = req.session.selectedNode.ln_server_url + '/v1/listpeers';
+        request.post(listOptions).then((listPeersRes) => {
+            const peers = listPeersRes && listPeersRes.peers ? common.newestOnTop(listPeersRes.peers, 'id', connectRes.id) : [];
             logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Peers', msg: 'Peers List after Connect Received', data: peers });
             res.status(201).json(peers);
         }).catch((errRes) => {
@@ -54,8 +55,9 @@ export const deletePeer = (req, res, next) => {
     if (options.error) {
         return res.status(options.statusCode).json({ message: options.message, error: options.error });
     }
-    options.url = req.session.selectedNode.ln_server_url + '/v1/peer/disconnect/' + req.params.peerId + '?force=' + req.query.force;
-    request.delete(options).then((body) => {
+    options.url = req.session.selectedNode.ln_server_url + '/v1/disconnect';
+    options.body = req.body;
+    request.post(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Peers', msg: 'Peer Disconnected', data: body });
         res.status(204).json({});
     }).catch((errRes) => {

backend/controllers/cln/utility.js

@@ -4,44 +4,15 @@ import { Common } from '../../utils/common.js';
 let options = null;
 const logger = Logger;
 const common = Common;
-export const decodePaymentFromPaymentRequest = (selNode, payment) => {
-    options.url = selNode.ln_server_url + '/v1/utility/decode/' + payment;
-    return request(options).then((res) => {
-        logger.log({ selectedNode: selNode, level: 'DEBUG', fileName: 'Payments', msg: 'Payment Decode Received', data: res });
-        return res;
-    }).catch((err) => { });
-};
-export const decodePayments = (req, res, next) => {
-    logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Payments', msg: 'Decoding Payments List..' });
-    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(',');
-        return Promise.all(paymentsArr === null || paymentsArr === void 0 ? void 0 : paymentsArr.map((payment) => decodePaymentFromPaymentRequest(req.session.selectedNode, payment))).
-            then((values) => {
-            logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Payments', msg: 'Payment List Decoded', data: values });
-            res.status(200).json(values);
-        }).
-            catch((errRes) => {
-            const err = common.handleError(errRes, 'Payments', 'Decode Payments 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: 'Payments', msg: 'Empty Payment List Decoded' });
-        return res.status(200).json([]);
-    }
-};
 export const decodePayment = (req, res, next) => {
     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Payments', msg: 'Decoding 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.ln_server_url + '/v1/utility/decode/' + req.params.payReq;
-    request(options).then((body) => {
+    options.url = req.session.selectedNode.ln_server_url + '/v1/decode';
+    options.body = req.body;
+    request.post(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Payments', msg: 'Payment Decoded', data: body });
         res.status(200).json(body);
     }).catch((errRes) => {
@@ -55,8 +26,8 @@ export const signMessage = (req, res, next) => {
     if (options.error) {
         return res.status(options.statusCode).json({ message: options.message, error: options.error });
     }
-    options.url = req.session.selectedNode.ln_server_url + '/v1/utility/signMessage';
-    options.form = { message: req.body.message };
+    options.url = req.session.selectedNode.ln_server_url + '/v1/signmessage';
+    options.body = req.body;
     request.post(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Message', msg: 'Message Signed', data: body });
         res.status(201).json(body);
@@ -71,8 +42,9 @@ export const verifyMessage = (req, res, next) => {
     if (options.error) {
         return res.status(options.statusCode).json({ message: options.message, error: options.error });
     }
-    options.url = req.session.selectedNode.ln_server_url + '/v1/utility/checkMessage/' + req.body.message + '/' + req.body.signature;
-    request.get(options, (error, response, body) => {
+    options.url = req.session.selectedNode.ln_server_url + '/v1/checkmessage';
+    options.body = req.body;
+    request.post(options, (error, response, body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Message', msg: 'Message Verified', data: body });
         res.status(201).json(body);
     }).catch((errRes) => {
@@ -86,8 +58,8 @@ export const listConfigs = (req, res, next) => {
     if (options.error) {
         return res.status(options.statusCode).json({ message: options.message, error: options.error });
     }
-    options.url = req.session.selectedNode.ln_server_url + '/v1/utility/listConfigs';
-    request(options).then((body) => {
+    options.url = req.session.selectedNode.ln_server_url + '/v1/listconfigs';
+    request.post(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Utility', msg: 'List Configs Received', data: body });
         res.status(200).json(body);
     }).catch((errRes) => {

backend/controllers/cln/webSocketClient.js

@@ -1,6 +1,4 @@
-import * as fs from 'fs';
-import { join } from 'path';
-import WebSocket from 'ws';
+import socketIOClient from 'socket.io-client';
 import { Logger } from '../../utils/logger.js';
 import { Common } from '../../utils/common.js';
 import { WSServer } from '../../utils/webSocketServer.js';
@@ -12,7 +10,7 @@ export class CLWebSocketClient {
         this.webSocketClients = [];
         this.reconnectTimeOut = null;
         this.waitTime = 0.5;
-        this.reconnet = (clWsClt) => {
+        this.reconnect = (clWsClt) => {
             if (this.reconnectTimeOut) {
                 return;
             }
@@ -36,7 +34,7 @@ export class CLWebSocketClient {
                     }
                 }
                 else {
-                    if ((!clientExists.webSocketClient || clientExists.webSocketClient.readyState !== WebSocket.OPEN) && selectedNode.ln_server_url) {
+                    if ((!clientExists.webSocketClient || !clientExists.webSocketClient.connected) && selectedNode.ln_server_url) {
                         clientExists.reConnect = true;
                         this.connectWithClient(clientExists);
                     }
@@ -47,49 +45,51 @@ export class CLWebSocketClient {
             }
         };
         this.connectWithClient = (clWsClt) => {
-            var _a;
             this.logger.log({ selectedNode: clWsClt.selectedNode, level: 'INFO', fileName: 'CLWebSocket', msg: 'Connecting to the Core Lightning\'s Websocket Server..' });
-            const WS_LINK = ((_a = (clWsClt.selectedNode.ln_server_url)) === null || _a === void 0 ? void 0 : _a.replace(/^http/, 'ws')) + '/v1/ws';
-            const mcrnHexEncoded = Buffer.from(fs.readFileSync(join(clWsClt.selectedNode.macaroon_path, 'access.macaroon'))).toString('hex');
-            clWsClt.webSocketClient = new WebSocket(WS_LINK, [mcrnHexEncoded, 'hex'], { rejectUnauthorized: false });
-            clWsClt.webSocketClient.onopen = () => {
+            try {
+                if (!clWsClt.selectedNode.rune_value) {
+                    clWsClt.selectedNode.rune_value = this.common.getRuneValue(clWsClt.selectedNode.rune_path);
+                }
+                clWsClt.webSocketClient = socketIOClient(clWsClt.selectedNode.ln_server_url, {
+                    extraHeaders: { rune: clWsClt.selectedNode.rune_value },
+                    transports: ['websocket'],
+                    secure: true,
+                    rejectUnauthorized: false
+                });
+            }
+            catch (err) {
+                throw new Error(err);
+            }
+            clWsClt.webSocketClient.on('connect', () => {
                 this.logger.log({ selectedNode: clWsClt.selectedNode, level: 'INFO', fileName: 'CLWebSocket', msg: 'Connected to the Core Lightning\'s Websocket Server..' });
                 this.waitTime = 0.5;
-            };
-            clWsClt.webSocketClient.onclose = (e) => {
+            });
+            clWsClt.webSocketClient.on('disconnect', (reason) => {
                 if (clWsClt && clWsClt.selectedNode && clWsClt.selectedNode.ln_implementation === 'CLN') {
-                    this.logger.log({ selectedNode: clWsClt.selectedNode, level: 'INFO', fileName: 'CLWebSocket', msg: 'Web socket disconnected, will reconnect again...' });
+                    this.logger.log({ selectedNode: clWsClt.selectedNode, level: 'INFO', fileName: 'CLWebSocket', msg: 'Web socket disconnected, will reconnect again...', data: reason });
                     clWsClt.webSocketClient.close();
                     if (clWsClt.reConnect) {
-                        this.reconnet(clWsClt);
+                        this.reconnect(clWsClt);
                     }
                 }
-            };
-            clWsClt.webSocketClient.onmessage = (msg) => {
+            });
+            clWsClt.webSocketClient.on('message', (msg) => {
                 this.logger.log({ selectedNode: clWsClt.selectedNode, level: 'DEBUG', fileName: 'CLWebSocket', msg: 'Received message from the server..', data: msg.data });
-                msg = (typeof msg.data === 'string') ? JSON.parse(msg.data) : msg.data;
-                msg['source'] = 'CLN';
-                const msgStr = JSON.stringify(msg);
-                this.wsServer.sendEventsToAllLNClients(msgStr, clWsClt.selectedNode);
-            };
-            clWsClt.webSocketClient.onerror = (err) => {
-                if (clWsClt.selectedNode.api_version === '' || !clWsClt.selectedNode.api_version || this.common.isVersionCompatible(clWsClt.selectedNode.api_version, '0.6.0')) {
-                    this.logger.log({ selectedNode: clWsClt.selectedNode, level: 'ERROR', fileName: 'CLWebSocket', msg: 'Web socket error', error: err });
-                    const errStr = ((typeof err === 'object' && err.message) ? JSON.stringify({ error: err.message }) : (typeof err === 'object') ? JSON.stringify({ error: err }) : ('{ "error": ' + err + ' }'));
-                    this.wsServer.sendErrorToAllLNClients(errStr, clWsClt.selectedNode);
-                    clWsClt.webSocketClient.close();
-                    if (clWsClt.reConnect) {
-                        this.reconnet(clWsClt);
-                    }
-                }
-                else {
-                    clWsClt.reConnect = false;
+                this.wsServer.sendEventsToAllLNClients(JSON.stringify({ source: 'CLN', data: msg }), clWsClt.selectedNode);
+            });
+            clWsClt.webSocketClient.on('error', (err) => {
+                this.logger.log({ selectedNode: clWsClt.selectedNode, level: 'ERROR', fileName: 'CLWebSocket', msg: 'Web socket error', error: err });
+                const errStr = ((typeof err === 'object' && err.message) ? JSON.stringify({ error: err.message }) : (typeof err === 'object') ? JSON.stringify({ error: err }) : ('{ "error": ' + err + ' }'));
+                this.wsServer.sendErrorToAllLNClients(errStr, clWsClt.selectedNode);
+                clWsClt.webSocketClient.close();
+                if (clWsClt.reConnect) {
+                    this.reconnect(clWsClt);
                 }
-            };
+            });
         };
         this.disconnect = (selectedNode) => {
             const clientExists = this.webSocketClients.find((wsc) => wsc.selectedNode.index === selectedNode.index);
-            if (clientExists && clientExists.webSocketClient && clientExists.webSocketClient.readyState === WebSocket.OPEN) {
+            if (clientExists && clientExists.webSocketClient && clientExists.webSocketClient.connected) {
                 this.logger.log({ selectedNode: clientExists.selectedNode, level: 'INFO', fileName: 'CLWebSocket', msg: 'Disconnecting from the Core Lightning\'s Websocket Server..' });
                 clientExists.reConnect = false;
                 clientExists.webSocketClient.close();

backend/controllers/eclair/channels.js

@@ -1,6 +1,9 @@
 import request from 'request-promise';
 import { Logger } from '../../utils/logger.js';
 import { Common } from '../../utils/common.js';
+import { createInvoiceRequestCall, listPendingInvoicesRequestCall } from './invoices.js';
+import { findRouteBetweenNodesRequestCall } from './network.js';
+import { getSentInfoFromPaymentRequest, sendPaymentToRouteRequestCall } from './payments.js';
 let options = null;
 const logger = Logger;
 const common = Common;
@@ -13,14 +16,12 @@ export const simplifyAllChannels = (selNode, channels) => {
             nodeId: channel.nodeId ? channel.nodeId : '',
             channelId: channel.channelId ? channel.channelId : '',
             state: channel.state ? channel.state : '',
-            announceChannel: channel.data && channel.data.commitments && channel.data.commitments.channelFlags && channel.data.commitments.channelFlags.announceChannel ? channel.data.commitments.channelFlags.announceChannel : false,
-            toLocal: (channel.data.commitments.localCommit.spec.toLocal) ? Math.round(+channel.data.commitments.localCommit.spec.toLocal / 1000) : 0,
-            toRemote: (channel.data.commitments.localCommit.spec.toRemote) ? Math.round(+channel.data.commitments.localCommit.spec.toRemote / 1000) : 0,
+            announceChannel: channel.data && channel.data.commitments && channel.data.commitments.params && channel.data.commitments.params.channelFlags && channel.data.commitments.params.channelFlags.announceChannel ? channel.data.commitments.params.channelFlags.announceChannel : false,
+            toLocal: (channel.data.commitments.active[0].localCommit.spec.toLocal) ? Math.round(+channel.data.commitments.active[0].localCommit.spec.toLocal / 1000) : 0,
+            toRemote: (channel.data.commitments.active[0].localCommit.spec.toRemote) ? Math.round(+channel.data.commitments.active[0].localCommit.spec.toRemote / 1000) : 0,
             shortChannelId: channel.data && channel.data.channelUpdate && channel.data.channelUpdate.shortChannelId ? channel.data.channelUpdate.shortChannelId : '',
-            isFunder: channel.data && channel.data.commitments && channel.data.commitments.localParams && channel.data.commitments.localParams.isFunder ? channel.data.commitments.localParams.isFunder : false,
-            buried: channel.data && channel.data.buried ? channel.data.buried : false,
+            isInitiator: channel.data && channel.data.commitments && channel.data.commitments.params && channel.data.commitments.params.localParams && channel.data.commitments.params.localParams.isInitiator ? channel.data.commitments.params.localParams.isInitiator : false,
             feeBaseMsat: channel.data && channel.data.channelUpdate && channel.data.channelUpdate.feeBaseMsat ? channel.data.channelUpdate.feeBaseMsat : 0,
-            feeRatePerKw: (channel.data.commitments.localCommit.spec.feeratePerKw) ? channel.data.commitments.localCommit.spec.feeratePerKw : 0,
             feeProportionalMillionths: channel.data && channel.data.channelUpdate && channel.data.channelUpdate.feeProportionalMillionths ? channel.data.channelUpdate.feeProportionalMillionths : 0,
             alias: ''
         });
@@ -32,7 +33,7 @@ export const simplifyAllChannels = (selNode, channels) => {
     return request.post(options).then((nodes) => {
         logger.log({ selectedNode: selNode, level: 'DEBUG', fileName: 'Channels', msg: 'Filtered Nodes Received', data: nodes });
         let foundPeer = null;
-        simplifiedChannels === null || simplifiedChannels === void 0 ? void 0 : simplifiedChannels.map((channel) => {
+        simplifiedChannels?.map((channel) => {
             foundPeer = nodes.find((channelWithAlias) => channel.nodeId === channelWithAlias.nodeId);
             channel.alias = foundPeer ? foundPeer.alias : channel.nodeId.substring(0, 20);
             return channel;
@@ -83,7 +84,13 @@ export const getChannelStats = (req, res, next) => {
         return res.status(options.statusCode).json({ message: options.message, error: options.error });
     }
     options.url = req.session.selectedNode.ln_server_url + '/channelstats';
-    options.form = {};
+    const today = new Date(Date.now());
+    const tillToday = (Math.round(today.getTime() / 1000)).toString();
+    const fromLastMonth = (Math.round(new Date(today.getFullYear(), today.getMonth() - 1, today.getDate() + 1, 0, 0, 0).getTime() / 1000)).toString();
+    options.form = {
+        from: fromLastMonth,
+        to: tillToday
+    };
     request.post(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Channels', msg: 'Channel States Received', data: body });
         res.status(201).json(body);
@@ -150,3 +157,53 @@ export const closeChannel = (req, res, next) => {
         return res.status(err.statusCode).json({ message: err.message, error: err.error });
     });
 };
+export const circularRebalance = (req, res, next) => {
+    const crInvDescription = 'Circular rebalancing invoice for ' + (req.body.amountMsat / 1000) + ' Sats';
+    options = common.getOptions(req);
+    if (options.error) {
+        return res.status(options.statusCode).json({ message: options.message, error: options.error });
+    }
+    options.form = req.body;
+    logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Channels', msg: 'Rebalance Params', data: options.form });
+    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));
+        // 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)];
+        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));
+            });
+            const firstRoute = routes[0].shortChannelIds.join() || '';
+            const shortChannelIds = req.body.sourceShortChannelId + ',' + firstRoute + ',' + req.body.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) => {
+                // eslint-disable-next-line arrow-body-style
+                setTimeout(() => {
+                    return getSentInfoFromPaymentRequest(req.session.selectedNode, paymentHash).then((sentInfoCallRes) => {
+                        const payStatus = sentInfoCallRes.length && sentInfoCallRes.length > 0 ? sentInfoCallRes[sentInfoCallRes.length - 1].status : sentInfoCallRes;
+                        return res.status(201).json({ flgReusingInvoice: !!foundExistingInvoice, invoice: invoice, paymentRoute: shortChannelIds, paymentHash: paymentHash, paymentDetails: payToRouteCallRes, paymentStatus: payStatus });
+                    }).catch((errRes) => {
+                        const err = common.handleError(errRes, 'Channels', 'Channel Rebalance From Sent Info Error', req.session.selectedNode);
+                        return res.status(err.statusCode).json({ flgReusingInvoice: !!foundExistingInvoice, invoice: invoice, paymentRoute: shortChannelIds, paymentHash: paymentHash, paymentDetails: payToRouteCallRes, paymentStatus: { error: err.error } });
+                    });
+                }, 3000);
+            }).catch((errRes) => {
+                const err = common.handleError(errRes, 'Channels', 'Channel Rebalance From Send Payment To Route Error', req.session.selectedNode);
+                return res.status(err.statusCode).json({ flgReusingInvoice: !!foundExistingInvoice, invoice: invoice, paymentRoute: shortChannelIds, paymentHash: paymentHash, paymentDetails: {}, paymentStatus: { error: err.error } });
+            });
+        }).catch((errRes) => {
+            const err = common.handleError(errRes, 'Channels', 'Channel Rebalance From Find Routes Error', req.session.selectedNode);
+            return res.status(err.statusCode).json({ flgReusingInvoice: !!foundExistingInvoice, invoice: (foundExistingInvoice.serialized || ''), paymentRoute: '', paymentHash: '', paymentDetails: {}, paymentStatus: { error: err.error } });
+        });
+    }).catch((errRes) => {
+        const err = common.handleError(errRes, 'Channels', 'Channel Rebalance From List Pending Invoices Error', req.session.selectedNode);
+        return res.status(err.statusCode).json({ flgReusingInvoice: false, invoice: '', paymentRoute: '', paymentHash: '', paymentDetails: {}, paymentStatus: { error: err.error } });
+    });
+};

backend/controllers/eclair/fees.js

@@ -126,7 +126,8 @@ export const getPayments = (req, res, next) => {
         return res.status(options.statusCode).json({ message: options.message, error: options.error });
     }
     options.url = req.session.selectedNode.ln_server_url + '/audit';
-    options.form = null;
+    const tillToday = (Math.round(new Date(Date.now()).getTime() / 1000)).toString();
+    options.form = { from: 0, to: tillToday };
     if (common.read_dummy_data) {
         common.getDummyData('Payments', req.session.selectedNode.ln_implementation).then((data) => { res.status(200).json(arrangePayments(req.session.selectedNode, data)); });
     }

backend/controllers/eclair/getInfo.js

@@ -38,7 +38,6 @@ export const getInfo = (req, res, next) => {
                 body.lnImplementation = 'Eclair';
                 req.session.selectedNode.ln_version = body.version.split('-')[0] || '';
                 eclWsClient.updateSelectedNode(req.session.selectedNode);
-                databaseService.loadDatabase(req.session);
                 logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'GetInfo', msg: 'Node Information Received', data: body });
                 return res.status(200).json(body);
             }).catch((errRes) => {

backend/controllers/eclair/invoices.js

@@ -19,7 +19,7 @@ export const getReceivedPaymentInfo = (lnServerUrl, invoice) => {
             invoice.status = response.status.type;
             if (response.status && response.status.type === 'received') {
                 invoice.amountSettled = response.status.amount ? Math.round(response.status.amount / 1000) : 0;
-                invoice.receivedAt = response.status.receivedAt ? Math.round(response.status.receivedAt / 1000) : 0;
+                invoice.receivedAt = response.status.receivedAt.unix ? response.status.receivedAt.unix : 0;
             }
             return invoice;
         }).catch((err) => {
@@ -53,24 +53,39 @@ export const getInvoice = (req, res, next) => {
         return res.status(err.statusCode).json({ message: err.message, error: err.error });
     });
 };
+export const listPendingInvoicesRequestCall = (selectedNode) => {
+    logger.log({ selectedNode: selectedNode, level: 'INFO', fileName: 'Invoices', msg: 'List Pending Invoices..' });
+    options = selectedNode.options;
+    options.url = selectedNode.ln_server_url + '/listpendinginvoices';
+    options.form = { from: 0, to: (Math.round(new Date(Date.now()).getTime() / 1000)).toString() };
+    return new Promise((resolve, reject) => {
+        request.post(options).then((pendingInvoicesResponse) => {
+            logger.log({ selectedNode: selectedNode, level: 'INFO', fileName: 'Invoices', msg: 'Pending Invoices List ', data: pendingInvoicesResponse });
+            resolve(pendingInvoicesResponse);
+        }).catch((errRes) => {
+            reject(common.handleError(errRes, 'Invoices', 'List Pending Invoices Error', selectedNode));
+        });
+    });
+};
 export const listInvoices = (req, res, next) => {
     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Invoices', msg: 'Getting List Invoices..' });
     options = common.getOptions(req);
     if (options.error) {
         return res.status(options.statusCode).json({ message: options.message, error: options.error });
     }
-    options.form = {};
+    const tillToday = (Math.round(new Date(Date.now()).getTime() / 1000)).toString();
+    options.form = { from: 0, to: tillToday };
     const options1 = JSON.parse(JSON.stringify(options));
     options1.url = req.session.selectedNode.ln_server_url + '/listinvoices';
-    options1.form = {};
+    options1.form = { from: 0, to: tillToday };
     const options2 = JSON.parse(JSON.stringify(options));
     options2.url = req.session.selectedNode.ln_server_url + '/listpendinginvoices';
-    options2.form = {};
+    options2.form = { from: 0, to: tillToday };
     if (common.read_dummy_data) {
         return common.getDummyData('Invoices', req.session.selectedNode.ln_implementation).then((body) => {
             const invoices = (!body[0] || body[0].length <= 0) ? [] : body[0];
             pendingInvoices = (!body[1] || body[1].length <= 0) ? [] : body[1];
-            return Promise.all(invoices === null || invoices === void 0 ? void 0 : invoices.map((invoice) => getReceivedPaymentInfo(req.session.selectedNode.ln_server_url, invoice))).
+            return Promise.all(invoices?.map((invoice) => getReceivedPaymentInfo(req.session.selectedNode.ln_server_url, invoice))).
                 then((values) => res.status(200).json(invoices));
         });
     }
@@ -81,7 +96,7 @@ export const listInvoices = (req, res, next) => {
             const invoices = (!body[0] || body[0].length <= 0) ? [] : body[0];
             pendingInvoices = (!body[1] || body[1].length <= 0) ? [] : body[1];
             if (invoices && invoices.length > 0) {
-                return Promise.all(invoices === null || invoices === void 0 ? void 0 : invoices.map((invoice) => getReceivedPaymentInfo(req.session.selectedNode.ln_server_url, invoice))).
+                return Promise.all(invoices?.map((invoice) => getReceivedPaymentInfo(req.session.selectedNode.ln_server_url, invoice))).
                     then((values) => {
                     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Invoices', msg: 'Sorted Invoices List Received', data: invoices });
                     return res.status(200).json(invoices);
@@ -102,22 +117,30 @@ export const listInvoices = (req, res, next) => {
         });
     }
 };
+export const createInvoiceRequestCall = (selectedNode, description, amount) => {
+    logger.log({ selectedNode: selectedNode, level: 'INFO', fileName: 'Invoices', msg: 'Creating Invoice..' });
+    options = selectedNode.options;
+    options.url = selectedNode.ln_server_url + '/createinvoice';
+    options.form = { description: description, amountMsat: amount };
+    return new Promise((resolve, reject) => {
+        request.post(options).then((invResponse) => {
+            logger.log({ selectedNode: selectedNode, level: 'INFO', fileName: 'Invoice', msg: 'Invoice Created', data: invResponse });
+            if (invResponse.amount) {
+                invResponse.amount = Math.round(invResponse.amount / 1000);
+            }
+            resolve(invResponse);
+        }).catch((errRes) => {
+            reject(common.handleError(errRes, 'Invoices', 'Create Invoice Error', selectedNode));
+        });
+    });
+};
 export const createInvoice = (req, res, next) => {
     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 });
     }
-    options.url = req.session.selectedNode.ln_server_url + '/createinvoice';
-    options.form = req.body;
-    request.post(options).then((body) => {
-        logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Invoice', msg: 'Invoice Created', data: body });
-        if (body.amount) {
-            body.amount = Math.round(body.amount / 1000);
-        }
-        res.status(201).json(body);
-    }).catch((errRes) => {
-        const err = common.handleError(errRes, 'Invoices', 'Create Invoice Error', req.session.selectedNode);
-        return res.status(err.statusCode).json({ message: err.message, error: err.error });
-    });
+    createInvoiceRequestCall(req.session.selectedNode, req.body.description, req.body.amountMsat).then((invRes) => {
+        res.status(201).json(invRes);
+    }).catch((err) => res.status(err.statusCode).json({ message: err.message, error: err.error }));
 };

backend/controllers/eclair/network.js

@@ -20,3 +20,26 @@ export const getNodes = (req, res, next) => {
         return res.status(err.statusCode).json({ message: err.message, error: err.error });
     });
 };
+export const findRouteBetweenNodesRequestCall = (selectedNode, amountMsat, sourceNodeId, targetNodeId, ignoreNodeIds = [], format = 'shortChannelId') => {
+    logger.log({ selectedNode: selectedNode, level: 'INFO', fileName: 'Network', msg: 'Find Route Between Nodes..' });
+    options = selectedNode.options;
+    options.url = selectedNode.ln_server_url + '/findroutebetweennodes';
+    options.form = { amountMsat: amountMsat, sourceNodeId: sourceNodeId, targetNodeId: targetNodeId, ignoreNodeIds: ignoreNodeIds, format: format };
+    return new Promise((resolve, reject) => {
+        request.post(options).then((body) => {
+            logger.log({ selectedNode: selectedNode, level: 'INFO', fileName: 'Network', msg: 'Route Lookup Between Nodes Finished', data: body });
+            resolve(body);
+        }).catch((errRes) => {
+            reject(common.handleError(errRes, 'Network', 'Route Lookup Between Nodes Error', selectedNode));
+        });
+    });
+};
+export const findRouteBetweenNodes = (req, res, next) => {
+    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) => {
+        res.status(200).json(callRes);
+    }).catch((err) => res.status(err.statusCode).json({ message: err.message, error: err.error }));
+};

backend/controllers/eclair/payments.js

@@ -22,7 +22,7 @@ export const getSentInfoFromPaymentRequest = (selNode, payment) => {
 };
 export const getQueryNodes = (selNode, nodeIds) => {
     options.url = selNode.ln_server_url + '/nodes';
-    options.form = { nodeIds: nodeIds === null || nodeIds === void 0 ? void 0 : nodeIds.reduce((acc, curr) => acc + ',' + curr) };
+    options.form = { nodeIds: nodeIds?.reduce((acc, curr) => acc + ',' + curr) };
     return request.post(options).then((nodes) => {
         logger.log({ selectedNode: selNode, level: 'DEBUG', fileName: 'Payments', msg: 'Query Nodes Received', data: nodes });
         return nodes;
@@ -77,16 +77,14 @@ export const queryPaymentRoute = (req, res, next) => {
     };
     logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Payments', msg: 'Query Payment Route Options', data: options.form });
     request.post(options).then((body) => {
-        var _a;
         logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Payments', msg: 'Query Payment Route Received', data: body });
         if (body && body.routes && body.routes.length) {
             let allRoutesNodeIds = [];
-            allRoutesNodeIds = (_a = body.routes) === null || _a === void 0 ? void 0 : _a.reduce((accRoutes, currRoute) => [...new Set([...accRoutes, ...currRoute.nodeIds])], []);
+            allRoutesNodeIds = body.routes?.reduce((accRoutes, currRoute) => [...new Set([...accRoutes, ...currRoute.nodeIds])], []);
             return getQueryNodes(req.session.selectedNode, allRoutesNodeIds).then((nodesWithAlias) => {
                 let foundPeer = null;
                 body.routes.forEach((route, i) => {
-                    var _a;
-                    (_a = route.nodeIds) === null || _a === void 0 ? void 0 : _a.map((node, j) => {
+                    route.nodeIds?.map((node, j) => {
                         foundPeer = nodesWithAlias.find((nodeWithAlias) => node === nodeWithAlias.nodeId);
                         body.routes[i].nodeIds[j] = { nodeId: node, alias: foundPeer ? foundPeer.alias : '' };
                         return node;
@@ -113,7 +111,7 @@ export const getSentPaymentsInformation = (req, res, next) => {
     }
     if (req.body.payments) {
         const paymentsArr = req.body.payments.split(',');
-        return Promise.all(paymentsArr === null || paymentsArr === void 0 ? void 0 : paymentsArr.map((payment) => getSentInfoFromPaymentRequest(req.session.selectedNode, payment))).
+        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 });
             return res.status(200).json(values);
@@ -128,3 +126,28 @@ export const getSentPaymentsInformation = (req, res, next) => {
         return res.status(200).json([]);
     }
 };
+export const sendPaymentToRouteRequestCall = (selectedNode, shortChannelIds, invoice, amountMsat) => {
+    logger.log({ selectedNode: selectedNode, level: 'INFO', fileName: 'Invoices', msg: 'Creating Invoice..' });
+    options = selectedNode.options;
+    options.url = selectedNode.ln_server_url + '/sendtoroute';
+    options.form = { shortChannelIds: shortChannelIds, amountMsat: amountMsat, invoice: invoice };
+    return new Promise((resolve, reject) => {
+        logger.log({ selectedNode: selectedNode, level: 'DEBUG', fileName: 'Payments', msg: 'Send Payment To Route Options', data: options.form });
+        request.post(options).then((body) => {
+            logger.log({ selectedNode: selectedNode, level: 'INFO', fileName: 'Payments', msg: 'Payment Sent To Route', data: body });
+            resolve(body);
+        }).catch((errRes) => {
+            reject(common.handleError(errRes, 'Payments', 'Send Payment To Route Error', selectedNode));
+        });
+    });
+};
+export const sendPaymentToRoute = (req, res, next) => {
+    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) => {
+        res.status(200).json(callRes);
+    }).catch((err) => res.status(err.statusCode).json({ message: err.message, error: err.error }));
+};

backend/controllers/eclair/peers.js

@@ -32,7 +32,7 @@ export const getPeers = (req, res, next) => {
                 peersNodeIds = peersNodeIds.substring(1);
                 return getFilteredNodes(req.session.selectedNode, peersNodeIds).then((peersWithAlias) => {
                     let foundPeer = null;
-                    body === null || body === void 0 ? void 0 : body.map((peer) => {
+                    body?.map((peer) => {
                         foundPeer = peersWithAlias.find((peerWithAlias) => peer.nodeId === peerWithAlias.nodeId);
                         peer.alias = foundPeer ? foundPeer.alias : peer.nodeId.substring(0, 20);
                         return peer;
@@ -84,7 +84,7 @@ export const connectPeer = (req, res, next) => {
                 peersNodeIds = peersNodeIds.substring(1);
                 return getFilteredNodes(req.session.selectedNode, peersNodeIds).then((peersWithAlias) => {
                     let foundPeer = null;
-                    body === null || body === void 0 ? void 0 : body.map((peer) => {
+                    body?.map((peer) => {
                         foundPeer = peersWithAlias.find((peerWithAlias) => peer.nodeId === peerWithAlias.nodeId);
                         peer.alias = foundPeer ? foundPeer.alias : peer.nodeId.substring(0, 20);
                         return peer;

backend/controllers/eclair/webSocketClient.js

@@ -2,6 +2,7 @@ import WebSocket from 'ws';
 import { Logger } from '../../utils/logger.js';
 import { Common } from '../../utils/common.js';
 import { WSServer } from '../../utils/webSocketServer.js';
+import { ECLWSEventsEnum } from '../../models/ecl.model.js';
 export class ECLWebSocketClient {
     constructor() {
         this.logger = Logger;
@@ -45,15 +46,15 @@ export class ECLWebSocketClient {
             }
         };
         this.connectWithClient = (eclWsClt) => {
-            var _a;
             this.logger.log({ selectedNode: eclWsClt.selectedNode, level: 'INFO', fileName: 'ECLWebSocket', msg: 'Connecting to the Eclair\'s Websocket Server..' });
-            const UpdatedLNServerURL = (_a = (eclWsClt.selectedNode.ln_server_url)) === null || _a === void 0 ? void 0 : _a.replace(/^http/, 'ws');
+            const UpdatedLNServerURL = (eclWsClt.selectedNode.ln_server_url)?.replace(/^http/, 'ws');
             const firstSubStrIndex = (UpdatedLNServerURL.indexOf('//') + 2);
             const WS_LINK = UpdatedLNServerURL.slice(0, firstSubStrIndex) + ':' + eclWsClt.selectedNode.ln_api_password + '@' + UpdatedLNServerURL.slice(firstSubStrIndex) + '/ws';
             eclWsClt.webSocketClient = new WebSocket(WS_LINK);
             eclWsClt.webSocketClient.onopen = () => {
                 this.logger.log({ selectedNode: eclWsClt.selectedNode, level: 'INFO', fileName: 'ECLWebSocket', msg: 'Connected to the Eclair\'s Websocket Server..' });
                 this.waitTime = 0.5;
+                this.heartbeat(eclWsClt);
             };
             eclWsClt.webSocketClient.onclose = (e) => {
                 if (eclWsClt && eclWsClt.selectedNode && eclWsClt.selectedNode.ln_implementation === 'ECL') {
@@ -67,9 +68,11 @@ export class ECLWebSocketClient {
             eclWsClt.webSocketClient.onmessage = (msg) => {
                 this.logger.log({ selectedNode: eclWsClt.selectedNode, level: 'DEBUG', fileName: 'ECLWebSocket', msg: 'Received message from the server..', data: msg.data });
                 msg = (typeof msg.data === 'string') ? JSON.parse(msg.data) : msg.data;
-                msg['source'] = 'ECL';
-                const msgStr = JSON.stringify(msg);
-                this.wsServer.sendEventsToAllLNClients(msgStr, eclWsClt.selectedNode);
+                if (msg.type && msg.type !== ECLWSEventsEnum.PAY_RELAYED && msg.type !== ECLWSEventsEnum.PAY_SETTLING_ONCHAIN && msg.type !== ECLWSEventsEnum.ONION_MESSAGE_RECEIVED) {
+                    msg['source'] = 'ECL';
+                    const msgStr = JSON.stringify(msg);
+                    this.wsServer.sendEventsToAllLNClients(msgStr, eclWsClt.selectedNode);
+                }
             };
             eclWsClt.webSocketClient.onerror = (err) => {
                 if (eclWsClt.selectedNode.ln_version === '' || !eclWsClt.selectedNode.ln_version || this.common.isVersionCompatible(eclWsClt.selectedNode.ln, '0.5.0')) {
@@ -105,6 +108,19 @@ export class ECLWebSocketClient {
             newClient.selectedNode = JSON.parse(JSON.stringify(newSelectedNode));
             this.webSocketClients[clientIdx] = newClient;
         };
+        this.heartbeat = (eclWsClt) => {
+            this.logger.log({ selectedNode: eclWsClt.selectedNode, level: 'DEBUG', fileName: 'ECLWebSocket', msg: 'Websocket Server Heartbeat..' });
+            if (!eclWsClt.webSocketClient) {
+                return;
+            }
+            if (eclWsClt.webSocketClient.readyState !== 1) {
+                return;
+            }
+            eclWsClt.webSocketClient.ping();
+            setTimeout(() => {
+                this.heartbeat(eclWsClt);
+            }, 59 * 1000);
+        };
         this.wsServer.eventEmitterECL.on('CONNECT', (nodeIndex) => {
             this.connect(this.common.findNode(+nodeIndex));
         });

backend/controllers/lnd/channels.js

@@ -28,10 +28,9 @@ export const getAllChannels = (req, res, next) => {
     let remote = 0;
     let total = 0;
     request(options).then((body) => {
-        var _a;
         logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Channels', msg: 'Channels List Received', data: body });
         if (body.channels) {
-            return Promise.all((_a = body.channels) === null || _a === void 0 ? void 0 : _a.map((channel) => {
+            return Promise.all(body.channels?.map((channel) => {
                 local = (channel.local_balance) ? +channel.local_balance : 0;
                 remote = (channel.remote_balance) ? +channel.remote_balance : 0;
                 total = local + remote;
@@ -64,22 +63,21 @@ export const getPendingChannels = (req, res, next) => {
     options.url = req.session.selectedNode.ln_server_url + '/v1/channels/pending';
     options.qs = req.query;
     request(options).then((body) => {
-        var _a, _b, _c, _d;
         if (!body.total_limbo_balance) {
             body.total_limbo_balance = 0;
         }
         const promises = [];
         if (body.pending_open_channels && body.pending_open_channels.length > 0) {
-            (_a = body.pending_open_channels) === null || _a === void 0 ? void 0 : _a.map((channel) => promises.push(getAliasForChannel(req.session.selectedNode, channel.channel)));
+            body.pending_open_channels?.map((channel) => promises.push(getAliasForChannel(req.session.selectedNode, channel.channel)));
         }
         if (body.pending_force_closing_channels && body.pending_force_closing_channels.length > 0) {
-            (_b = body.pending_force_closing_channels) === null || _b === void 0 ? void 0 : _b.map((channel) => promises.push(getAliasForChannel(req.session.selectedNode, channel.channel)));
+            body.pending_force_closing_channels?.map((channel) => promises.push(getAliasForChannel(req.session.selectedNode, channel.channel)));
         }
         if (body.pending_closing_channels && body.pending_closing_channels.length > 0) {
-            (_c = body.pending_closing_channels) === null || _c === void 0 ? void 0 : _c.map((channel) => promises.push(getAliasForChannel(req.session.selectedNode, channel.channel)));
+            body.pending_closing_channels?.map((channel) => promises.push(getAliasForChannel(req.session.selectedNode, channel.channel)));
         }
         if (body.waiting_close_channels && body.waiting_close_channels.length > 0) {
-            (_d = body.waiting_close_channels) === null || _d === void 0 ? void 0 : _d.map((channel) => promises.push(getAliasForChannel(req.session.selectedNode, channel.channel)));
+            body.waiting_close_channels?.map((channel) => promises.push(getAliasForChannel(req.session.selectedNode, channel.channel)));
         }
         return Promise.all(promises).then((values) => {
             logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Channels', msg: 'Pending Channels List Received', data: body });
@@ -103,9 +101,8 @@ export const getClosedChannels = (req, res, next) => {
     options.url = req.session.selectedNode.ln_server_url + '/v1/channels/closed';
     options.qs = req.query;
     request(options).then((body) => {
-        var _a;
         if (body.channels && body.channels.length > 0) {
-            return Promise.all((_a = body.channels) === null || _a === void 0 ? void 0 : _a.map((channel) => {
+            return Promise.all(body.channels?.map((channel) => {
                 channel.close_type = (!channel.close_type) ? 'COOPERATIVE_CLOSE' : channel.close_type;
                 return getAliasForChannel(req.session.selectedNode, channel);
             })).then((values) => {
@@ -144,7 +141,11 @@ export const postChannel = (req, res, next) => {
     else if (req.body.trans_type === '2') {
         options.form.sat_per_byte = req.body.trans_type_value;
     }
+    if (req.body.commitment_type) {
+        options.form.commitment_type = req.body.commitment_type;
+    }
     options.form = JSON.stringify(options.form);
+    logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Channels', msg: 'Channel Open Options', data: options.form });
     request.post(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Channels', msg: 'Channel Opened', data: body });
         res.status(201).json(body);
@@ -179,6 +180,7 @@ export const postTransactions = (req, res, next) => {
     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 });
@@ -193,7 +195,6 @@ export const postTransactions = (req, res, next) => {
     });
 };
 export const closeChannel = (req, res, next) => {
-    var _a;
     try {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Channels', msg: 'Closing Channel..' });
         if (!req.session.selectedNode) {
@@ -204,7 +205,7 @@ export const closeChannel = (req, res, next) => {
         if (options.error) {
             return res.status(options.statusCode).json({ message: options.message, error: options.error });
         }
-        const channelpoint = (_a = req.params.channelPoint) === null || _a === void 0 ? void 0 : _a.replace(':', '/');
+        const channelpoint = req.params.channelPoint?.replace(':', '/');
         options.url = req.session.selectedNode.ln_server_url + '/v1/channels/' + channelpoint + '?force=' + req.query.force;
         if (req.query.target_conf) {
             options.url = options.url + '&target_conf=' + req.query.target_conf;

backend/controllers/lnd/channelsBackup.js

@@ -16,13 +16,12 @@ function getFilesList(channelBackupPath, callback) {
         }
         if (files && files.length > 0) {
             files.forEach((file) => {
-                var _a;
                 if (!file.includes('.restored')) {
                     if (file.toLowerCase() === 'channel-all.bak' || file.toLowerCase() === 'backup-channel-all.bak') {
                         all_restore_exists = true;
                     }
                     else {
-                        files_list.push({ channel_point: (_a = file.substring(8, file.length - 4)) === null || _a === void 0 ? void 0 : _a.replace('-', ':') });
+                        files_list.push({ channel_point: file.substring(8, file.length - 4)?.replace('-', ':') });
                     }
                 }
             });
@@ -32,7 +31,6 @@ function getFilesList(channelBackupPath, callback) {
     });
 }
 export const getBackup = (req, res, next) => {
-    var _a, _b;
     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'ChannelBackup', msg: 'Getting Channel Backup..' });
     options = common.getOptions(req);
     if (options.error) {
@@ -46,9 +44,9 @@ export const getBackup = (req, res, next) => {
         options.url = req.session.selectedNode.ln_server_url + '/v1/channels/backup';
     }
     else {
-        channel_backup_file = req.session.selectedNode.channel_backup_path + sep + 'channel-' + ((_a = req.params.channelPoint) === null || _a === void 0 ? void 0 : _a.replace(':', '-')) + '.bak';
+        channel_backup_file = req.session.selectedNode.channel_backup_path + sep + 'channel-' + req.params.channelPoint?.replace(':', '-') + '.bak';
         message = 'Channel Backup Successful.';
-        const channelpoint = (_b = req.params.channelPoint) === null || _b === void 0 ? void 0 : _b.replace(':', '/');
+        const channelpoint = req.params.channelPoint?.replace(':', '/');
         options.url = req.session.selectedNode.ln_server_url + '/v1/channels/backup/' + channelpoint;
         const exists = fs.existsSync(channel_backup_file);
         if (exists) {
@@ -83,7 +81,6 @@ export const getBackup = (req, res, next) => {
     });
 };
 export const postBackupVerify = (req, res, next) => {
-    var _a;
     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'ChannelBackup', msg: 'Verifying Channel Backup..' });
     options = common.getOptions(req);
     if (options.error) {
@@ -119,7 +116,7 @@ export const postBackupVerify = (req, res, next) => {
     }
     else {
         message = 'Channel Verify Successful.';
-        channel_verify_file = req.session.selectedNode.channel_backup_path + sep + 'channel-' + ((_a = req.params.channelPoint) === null || _a === void 0 ? void 0 : _a.replace(':', '-')) + '.bak';
+        channel_verify_file = req.session.selectedNode.channel_backup_path + sep + 'channel-' + req.params.channelPoint?.replace(':', '-') + '.bak';
         const exists = fs.existsSync(channel_verify_file);
         if (exists) {
             verify_backup = fs.readFileSync(channel_verify_file, 'utf-8');
@@ -144,7 +141,6 @@ export const postBackupVerify = (req, res, next) => {
     }
 };
 export const postRestore = (req, res, next) => {
-    var _a;
     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'ChannelBackup', msg: 'Restoring Channel Backup..' });
     options = common.getOptions(req);
     if (options.error) {
@@ -192,7 +188,7 @@ export const postRestore = (req, res, next) => {
     }
     else {
         message = 'Channel Restore Successful.';
-        channel_restore_file = req.session.selectedNode.channel_backup_path + sep + 'restore' + sep + 'channel-' + ((_a = req.params.channelPoint) === null || _a === void 0 ? void 0 : _a.replace(':', '-')) + '.bak';
+        channel_restore_file = req.session.selectedNode.channel_backup_path + sep + 'restore' + sep + 'channel-' + req.params.channelPoint?.replace(':', '-') + '.bak';
         const exists = fs.existsSync(channel_restore_file);
         if (exists) {
             restore_backup = fs.readFileSync(channel_restore_file, 'utf-8');

backend/controllers/lnd/fees.js

@@ -21,11 +21,10 @@ export const getFees = (req, res, next) => {
         const week_start_time = current_time - 604800;
         const day_start_time = current_time - 86400;
         return getAllForwardingEvents(req, month_start_time, current_time, 0, 'fees', (history) => {
-            var _a, _b, _c;
             logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Fees', msg: 'Forwarding History Received', data: history });
-            const daily_sum = (_a = history.forwarding_events) === null || _a === void 0 ? void 0 : _a.reduce((acc, curr) => ((curr.timestamp >= day_start_time) ? [(acc[0] + 1), (acc[1] + +curr.fee_msat)] : acc), [0, 0]);
-            const weekly_sum = (_b = history.forwarding_events) === null || _b === void 0 ? void 0 : _b.reduce((acc, curr) => ((curr.timestamp >= week_start_time) ? [(acc[0] + 1), (acc[1] + +curr.fee_msat)] : acc), [0, 0]);
-            const monthly_sum = (_c = history.forwarding_events) === null || _c === void 0 ? void 0 : _c.reduce((acc, curr) => [(acc[0] + 1), (acc[1] + +curr.fee_msat)], [0, 0]);
+            const daily_sum = history.forwarding_events?.reduce((acc, curr) => ((curr.timestamp >= day_start_time) ? [(acc[0] + 1), (acc[1] + +curr.fee_msat)] : acc), [0, 0]);
+            const weekly_sum = history.forwarding_events?.reduce((acc, curr) => ((curr.timestamp >= week_start_time) ? [(acc[0] + 1), (acc[1] + +curr.fee_msat)] : acc), [0, 0]);
+            const monthly_sum = history.forwarding_events?.reduce((acc, curr) => [(acc[0] + 1), (acc[1] + +curr.fee_msat)], [0, 0]);
             logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Fees', msg: 'Daily Sum (Transactions, Fee)', data: daily_sum });
             logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Fees', msg: 'Weekly Sum (Transactions, Fee)', data: weekly_sum });
             logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Fees', msg: 'Monthly Sum (Transactions, Fee)', data: monthly_sum });

backend/controllers/lnd/getInfo.js

@@ -9,7 +9,6 @@ const common = Common;
 const lndWsClient = LNDWSClient;
 const databaseService = Database;
 export const getInfo = (req, res, next) => {
-    var _a;
     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'GetInfo', msg: 'Getting LND Node Information..' });
     common.logEnvVariables(req);
     common.setOptions(req);
@@ -26,7 +25,7 @@ export const getInfo = (req, res, next) => {
         return res.status(err.statusCode).json({ message: err.message, error: err.error });
     }
     else {
-        (_a = common.nodes) === null || _a === void 0 ? void 0 : _a.map((node) => {
+        common.nodes?.map((node) => {
             if (node.ln_implementation === 'LND') {
                 common.getAllNodeAllChannelBackup(node);
             }
@@ -45,7 +44,6 @@ export const getInfo = (req, res, next) => {
             else {
                 req.session.selectedNode.ln_version = body.version.split('-')[0] || '';
                 lndWsClient.updateSelectedNode(req.session.selectedNode);
-                databaseService.loadDatabase(req.session);
                 logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'GetInfo', msg: 'Node Information Received', data: body });
                 return res.status(200).json(body);
             }

backend/controllers/lnd/graph.js

@@ -84,13 +84,11 @@ export const getQueryRoutes = (req, res, next) => {
     }
     logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Graph', msg: 'Query Routes URL', data: options.url });
     request(options).then((body) => {
-        var _a;
         logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Graph', msg: 'Query Routes Received', data: body });
         if (body.routes && body.routes.length && body.routes.length > 0 && body.routes[0].hops && body.routes[0].hops.length && body.routes[0].hops.length > 0) {
-            return Promise.all((_a = body.routes[0].hops) === null || _a === void 0 ? void 0 : _a.map((hop) => getAliasFromPubkey(req.session.selectedNode, hop.pub_key))).
+            return Promise.all(body.routes[0].hops?.map((hop) => getAliasFromPubkey(req.session.selectedNode, hop.pub_key))).
                 then((values) => {
-                var _a;
-                (_a = body.routes[0].hops) === null || _a === void 0 ? void 0 : _a.map((hop, i) => {
+                body.routes[0].hops?.map((hop, i) => {
                     hop.hop_sequence = i + 1;
                     hop.pubkey_alias = values[i];
                     return hop;
@@ -150,7 +148,7 @@ export const getAliasesForPubkeys = (req, res, next) => {
     }
     if (req.query.pubkeys) {
         const pubkeyArr = req.query.pubkeys.split(',');
-        return Promise.all(pubkeyArr === null || pubkeyArr === void 0 ? void 0 : pubkeyArr.map((pubkey) => getAliasFromPubkey(req.session.selectedNode, pubkey))).
+        return Promise.all(pubkeyArr?.map((pubkey) => getAliasFromPubkey(req.session.selectedNode, pubkey))).
             then((values) => {
             logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Graph', msg: 'Node Alias', data: values });
             res.status(200).json(values);

backend/controllers/lnd/payments.js

@@ -34,7 +34,7 @@ export const decodePayments = (req, res, next) => {
     }
     if (req.body.payments) {
         const paymentsArr = req.body.payments.split(',');
-        return Promise.all(paymentsArr === null || paymentsArr === void 0 ? void 0 : paymentsArr.map((payment) => decodePaymentFromPaymentRequest(req.session.selectedNode, payment))).
+        return Promise.all(paymentsArr?.map((payment) => decodePaymentFromPaymentRequest(req.session.selectedNode, payment))).
             then((values) => {
             logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'PayRequest', msg: 'Payment List Decoded', data: values });
             res.status(200).json(values);

backend/controllers/lnd/peers.js

@@ -25,7 +25,7 @@ export const getPeers = (req, res, next) => {
     request(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Peers', msg: 'Peers List Received', data: body });
         const peers = !body.peers ? [] : body.peers;
-        return Promise.all(peers === null || peers === void 0 ? void 0 : peers.map((peer) => getAliasForPeers(req.session.selectedNode, peer))).then((values) => {
+        return Promise.all(peers?.map((peer) => getAliasForPeers(req.session.selectedNode, peer))).then((values) => {
             logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Peers', msg: 'Sorted Peers List Received', data: body.peers });
             res.status(200).json(body.peers);
         });
@@ -50,7 +50,7 @@ export const postPeer = (req, res, next) => {
         options.url = req.session.selectedNode.ln_server_url + '/v1/peers';
         request(options).then((body) => {
             const peers = (!body.peers) ? [] : body.peers;
-            return Promise.all(peers === null || peers === void 0 ? void 0 : peers.map((peer) => getAliasForPeers(req.session.selectedNode, peer))).then((values) => {
+            return Promise.all(peers?.map((peer) => getAliasForPeers(req.session.selectedNode, peer))).then((values) => {
                 if (body.peers) {
                     body.peers = common.newestOnTop(body.peers, 'pub_key', req.body.pubkey);
                     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Peers', msg: 'Peers List after Connect Received', data: body });

backend/controllers/lnd/webSocketClient.js

@@ -42,8 +42,7 @@ export class LNDWebSocketClient {
             });
         };
         this.subscribeToInvoice = (options, selectedNode, rHash) => {
-            var _a;
-            rHash = (_a = rHash === null || rHash === void 0 ? void 0 : rHash.replace(/\+/g, '-')) === null || _a === void 0 ? void 0 : _a.replace(/[/]/g, '_');
+            rHash = rHash?.replace(/\+/g, '-')?.replace(/[/]/g, '_');
             this.logger.log({ selectedNode: selectedNode, level: 'INFO', fileName: 'WebSocketClient', msg: 'Subscribing to Invoice ' + rHash + ' ..' });
             options.url = selectedNode.ln_server_url + '/v2/invoices/subscribe/' + rHash;
             request(options).then((msg) => {

backend/controllers/shared/RTLConf.js

@@ -18,9 +18,12 @@ export const updateSelectedNode = (req, res, next) => {
     req.session.selectedNode = common.findNode(selNodeIndex);
     if (req.headers && req.headers.authorization && req.headers.authorization !== '') {
         wsServer.updateLNWSClientDetails(req.session.id, +req.session.selectedNode.index, +req.params.prevNodeIndex);
-        if (req.params.prevNodeIndex !== -1) {
+        if (req.params.prevNodeIndex !== '-1') {
             databaseService.unloadDatabase(req.params.prevNodeIndex, req.session.id);
         }
+        if (req.params.currNodeIndex !== '-1') {
+            databaseService.loadDatabase(req.session);
+        }
     }
     const responseVal = !req.session.selectedNode.ln_node ? '' : req.session.selectedNode.ln_node;
     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'RTLConf', msg: 'Selected Node Updated To ' + responseVal });
@@ -231,7 +234,6 @@ export const getConfig = (req, res, next) => {
     logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'RTLConf', msg: 'Node Type', data: req.params.nodeType });
     logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'RTLConf', msg: 'File Path', data: confFile });
     fs.readFile(confFile, 'utf8', (errRes, data) => {
-        var _a;
         if (errRes) {
             const errMsg = 'Reading Config Error';
             const err = common.handleError({ statusCode: 500, message: errMsg, error: errRes }, 'RTLConf', errMsg, req.session.selectedNode);
@@ -244,7 +246,7 @@ export const getConfig = (req, res, next) => {
             }
             else {
                 fileFormat = 'INI';
-                data = data === null || data === void 0 ? void 0 : data.replace('color=#', 'color=');
+                data = data?.replace('color=#', 'color=');
                 jsonConfig = ini.parse(data);
                 if (jsonConfig['Application Options'] && jsonConfig['Application Options'].color) {
                     jsonConfig['Application Options'].color = '#' + jsonConfig['Application Options'].color;
@@ -255,16 +257,15 @@ export const getConfig = (req, res, next) => {
                 }
             }
             jsonConfig = maskPasswords(jsonConfig);
-            const responseJSON = (fileFormat === 'JSON') ? jsonConfig : (_a = ini.stringify(jsonConfig)) === null || _a === void 0 ? void 0 : _a.replace('color=\\#', 'color=#');
+            const responseJSON = (fileFormat === 'JSON') ? jsonConfig : ini.stringify(jsonConfig)?.replace('color=\\#', 'color=#');
             logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'RTLConf', msg: 'Configuration File Data Received', data: responseJSON });
             res.status(200).json({ format: fileFormat, data: responseJSON });
         }
     });
 };
 export const getFile = (req, res, next) => {
-    var _a;
     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'RTLConf', msg: 'Getting File..' });
-    const file = req.query.path ? req.query.path : (req.session.selectedNode.channel_backup_path + sep + 'channel-' + ((_a = req.query.channel) === null || _a === void 0 ? void 0 : _a.replace(':', '-')) + '.bak');
+    const file = req.query.path ? req.query.path : (req.session.selectedNode.channel_backup_path + sep + 'channel-' + req.query.channel?.replace(':', '-') + '.bak');
     logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'RTLConf', msg: 'Channel Point', data: req.query.channel });
     logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'RTLConf', msg: 'File Path', data: file });
     fs.readFile(file, 'utf8', (errRes, data) => {

backend/controllers/shared/loop.js

@@ -6,13 +6,7 @@ const logger = Logger;
 const common = Common;
 export const loopOut = (req, res, next) => {
     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Loop', msg: 'Looping Out..' });
-    options = common.getSwapServerOptions(req);
-    if (options.url === '') {
-        const errMsg = 'Loop Server URL is missing in the configuration.';
-        const err = common.handleError({ statusCode: 500, message: 'Loop Out Error', error: errMsg }, 'Loop', errMsg, req.session.selectedNode);
-        return res.status(err.statusCode).json({ message: err.message, error: err.error });
-    }
-    options.url = options.url + '/v1/loop/out';
+    options.uri = '/v1/loop/out';
     options.body = {
         amt: req.body.amount,
         sweep_conf_target: req.body.targetConf,
@@ -41,13 +35,7 @@ export const loopOut = (req, res, next) => {
 };
 export const loopOutTerms = (req, res, next) => {
     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Loop', msg: 'Getting Loop Out Terms..' });
-    options = common.getSwapServerOptions(req);
-    if (options.url === '') {
-        const errMsg = 'Loop Server URL is missing in the configuration.';
-        const err = common.handleError({ statusCode: 500, message: 'Loop Out Terms Error', error: errMsg }, 'Loop', errMsg, req.session.selectedNode);
-        return res.status(err.statusCode).json({ message: err.message, error: err.error });
-    }
-    options.url = options.url + '/v1/loop/out/terms';
+    options.uri = '/v1/loop/out/terms';
     request(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Loop', msg: 'Loop Out Terms Received', data: body });
         res.status(200).json(body);
@@ -58,13 +46,7 @@ export const loopOutTerms = (req, res, next) => {
 };
 export const loopOutQuote = (req, res, next) => {
     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Loop', msg: 'Getting Loop Out Quotes..' });
-    options = common.getSwapServerOptions(req);
-    if (options.url === '') {
-        const errMsg = 'Loop Server URL is missing in the configuration.';
-        const err = common.handleError({ statusCode: 500, message: 'Loop Out Quotes Error', error: errMsg }, 'Loop', errMsg, req.session.selectedNode);
-        return res.status(err.statusCode).json({ message: err.message, error: err.error });
-    }
-    options.url = options.url + '/v1/loop/out/quote/' + req.params.amount + '?conf_target=' + (req.query.targetConf ? req.query.targetConf : '2') + '&swap_publication_deadline=' + req.query.swapPublicationDeadline;
+    options.uri = '/v1/loop/out/quote/' + req.params.amount + '?conf_target=' + (req.query.targetConf ? req.query.targetConf : '2') + '&swap_publication_deadline=' + req.query.swapPublicationDeadline;
     logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Loop', msg: 'Loop Out Quote URL', data: options.url });
     request(options).then((quoteRes) => {
         quoteRes.amount = +req.params.amount;
@@ -78,19 +60,13 @@ export const loopOutQuote = (req, res, next) => {
 };
 export const loopOutTermsAndQuotes = (req, res, next) => {
     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Loop', msg: 'Getting Loop Out Terms & Quotes..' });
-    options = common.getSwapServerOptions(req);
-    if (options.url === '') {
-        const errMsg = 'Loop Server URL is missing in the configuration.';
-        const err = common.handleError({ statusCode: 500, message: 'Loop Out Terms & Quotes Error', error: errMsg }, 'Loop', errMsg, req.session.selectedNode);
-        return res.status(err.statusCode).json({ message: err.message, error: err.error });
-    }
-    options.url = options.url + '/v1/loop/out/terms';
+    options.uri = '/v1/loop/out/terms';
     request(options).then((terms) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Loop', msg: 'Loop Out Terms Received', data: terms });
-        const options1 = common.getSwapServerOptions(req);
-        const options2 = common.getSwapServerOptions(req);
-        options1.url = options1.url + '/v1/loop/out/quote/' + terms.min_swap_amount + '?conf_target=' + (req.query.targetConf ? req.query.targetConf : '2') + '&swap_publication_deadline=' + req.query.swapPublicationDeadline;
-        options2.url = options2.url + '/v1/loop/out/quote/' + terms.max_swap_amount + '?conf_target=' + (req.query.targetConf ? req.query.targetConf : '2') + '&swap_publication_deadline=' + req.query.swapPublicationDeadline;
+        const options1 = options;
+        const options2 = options;
+        options1.uri = '/v1/loop/out/quote/' + terms.min_swap_amount + '?conf_target=' + (req.query.targetConf ? req.query.targetConf : '2') + '&swap_publication_deadline=' + req.query.swapPublicationDeadline;
+        options2.uri = '/v1/loop/out/quote/' + terms.max_swap_amount + '?conf_target=' + (req.query.targetConf ? req.query.targetConf : '2') + '&swap_publication_deadline=' + req.query.swapPublicationDeadline;
         logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Loop', msg: 'Loop Out Min Quote Options', data: options1 });
         logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Loop', msg: 'Loop Out Max Quote Options', data: options2 });
         return Promise.all([request(options1), request(options2)]).then((values) => {
@@ -112,13 +88,7 @@ export const loopOutTermsAndQuotes = (req, res, next) => {
 };
 export const loopIn = (req, res, next) => {
     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Loop', msg: 'Looping In..' });
-    options = common.getSwapServerOptions(req);
-    if (options.url === '') {
-        const errMsg = 'Loop Server URL is missing in the configuration.';
-        const err = common.handleError({ statusCode: 500, message: 'Loop In Error', error: errMsg }, 'Loop', errMsg, req.session.selectedNode);
-        return res.status(err.statusCode).json({ message: err.message, error: err.error });
-    }
-    options.url = options.url + '/v1/loop/in';
+    options.uri = '/v1/loop/in';
     options.body = {
         amt: req.body.amount,
         max_swap_fee: req.body.swapFee,
@@ -136,13 +106,7 @@ export const loopIn = (req, res, next) => {
 };
 export const loopInTerms = (req, res, next) => {
     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Loop', msg: 'Getting Loop In Terms..' });
-    options = common.getSwapServerOptions(req);
-    if (options.url === '') {
-        const errMsg = 'Loop Server URL is missing in the configuration.';
-        const err = common.handleError({ statusCode: 500, message: 'Loop In Terms Error', error: errMsg }, 'Loop', errMsg, req.session.selectedNode);
-        return res.status(err.statusCode).json({ message: err.message, error: err.error });
-    }
-    options.url = options.url + '/v1/loop/in/terms';
+    options.uri = '/v1/loop/in/terms';
     request(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Loop', msg: 'Loop In Terms Received', data: body });
         res.status(200).json(body);
@@ -153,13 +117,7 @@ export const loopInTerms = (req, res, next) => {
 };
 export const loopInQuote = (req, res, next) => {
     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Loop', msg: 'Getting Loop In Quotes..' });
-    options = common.getSwapServerOptions(req);
-    if (options.url === '') {
-        const errMsg = 'Loop Server URL is missing in the configuration.';
-        const err = common.handleError({ statusCode: 500, message: 'Loop In Quotes Error', error: errMsg }, 'Loop', errMsg, req.session.selectedNode);
-        return res.status(err.statusCode).json({ message: err.message, error: err.error });
-    }
-    options.url = options.url + '/v1/loop/in/quote/' + req.params.amount + '?conf_target=' + (req.query.targetConf ? req.query.targetConf : '2') + '&swap_publication_deadline=' + req.query.swapPublicationDeadline;
+    options.uri = '/v1/loop/in/quote/' + req.params.amount + '?conf_target=' + (req.query.targetConf ? req.query.targetConf : '2') + '&swap_publication_deadline=' + req.query.swapPublicationDeadline;
     logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Loop', msg: 'Loop In Quote Options', data: options.url });
     request(options).then((body) => {
         body.amount = +req.params.amount;
@@ -173,19 +131,13 @@ export const loopInQuote = (req, res, next) => {
 };
 export const loopInTermsAndQuotes = (req, res, next) => {
     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Loop', msg: 'Getting Loop In Terms & Quotes..' });
-    options = common.getSwapServerOptions(req);
-    if (options.url === '') {
-        const errMsg = 'Loop Server URL is missing in the configuration.';
-        const err = common.handleError({ statusCode: 500, message: 'Loop In Terms & Quotes Error', error: errMsg }, 'Loop', errMsg, req.session.selectedNode);
-        return res.status(err.statusCode).json({ message: err.message, error: err.error });
-    }
-    options.url = options.url + '/v1/loop/in/terms';
+    options.uri = '/v1/loop/in/terms';
     request(options).then((terms) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Loop', msg: 'Loop In Terms Received', data: terms });
-        const options1 = common.getSwapServerOptions(req);
-        const options2 = common.getSwapServerOptions(req);
-        options1.url = options1.url + '/v1/loop/in/quote/' + terms.min_swap_amount + '?conf_target=' + (req.query.targetConf ? req.query.targetConf : '2') + '&swap_publication_deadline=' + req.query.swapPublicationDeadline;
-        options2.url = options2.url + '/v1/loop/in/quote/' + terms.max_swap_amount + '?conf_target=' + (req.query.targetConf ? req.query.targetConf : '2') + '&swap_publication_deadline=' + req.query.swapPublicationDeadline;
+        const options1 = options;
+        const options2 = options;
+        options1.uri = '/v1/loop/in/quote/' + terms.min_swap_amount + '?conf_target=' + (req.query.targetConf ? req.query.targetConf : '2') + '&swap_publication_deadline=' + req.query.swapPublicationDeadline;
+        options2.uri = '/v1/loop/in/quote/' + terms.max_swap_amount + '?conf_target=' + (req.query.targetConf ? req.query.targetConf : '2') + '&swap_publication_deadline=' + req.query.swapPublicationDeadline;
         logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Loop', msg: 'Loop In Min Quote Options', data: options1 });
         logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Loop', msg: 'Loop In Max Quote Options', data: options2 });
         return Promise.all([request(options1), request(options2)]).then((values) => {
@@ -207,13 +159,12 @@ export const loopInTermsAndQuotes = (req, res, next) => {
 };
 export const swaps = (req, res, next) => {
     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Loop', msg: 'Getting List Swaps..' });
-    options = common.getSwapServerOptions(req);
     if (options.url === '') {
         const errMsg = 'Loop Server URL is missing in the configuration.';
         const err = common.handleError({ statusCode: 500, message: 'List Swaps Error', error: errMsg }, 'Loop', errMsg, req.session.selectedNode);
         return res.status(err.statusCode).json({ message: err.message, error: err.error });
     }
-    options.url = options.url + '/v1/loop/swaps';
+    options.uri = '/v1/loop/swaps';
     request(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Loop', msg: 'Loop Swaps Received', data: body });
         res.status(200).json(body.swaps);
@@ -224,18 +175,29 @@ export const swaps = (req, res, next) => {
 };
 export const swap = (req, res, next) => {
     logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Loop', msg: 'Getting Swap Information..' });
-    options = common.getSwapServerOptions(req);
+    options.uri = '/v1/loop/swap/' + req.params.id;
+    request(options).then((body) => {
+        logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Loop', msg: 'Loop Swap Information Received', data: body });
+        res.status(200).json(body);
+    }).catch((errRes) => {
+        const err = common.handleError(errRes, 'Loop', 'Get Swap Error', req.session.selectedNode);
+        return res.status(err.statusCode).json({ message: err.message, error: err.error });
+    });
+};
+export const loopInfo = (req, res, next) => {
+    logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Loop', msg: 'Getting Loop Information..' });
+    options = common.setSwapServerOptions(req);
     if (options.url === '') {
         const errMsg = 'Loop Server URL is missing in the configuration.';
-        const err = common.handleError({ statusCode: 500, message: 'Get Swap Error', error: errMsg }, 'Loop', errMsg, req.session.selectedNode);
+        const err = common.handleError({ statusCode: 500, message: 'Get Loop Info Error', error: errMsg }, 'Loop', errMsg, req.session.selectedNode);
         return res.status(err.statusCode).json({ message: err.message, error: err.error });
     }
-    options.url = options.url + '/v1/loop/swap/' + req.params.id;
+    options.uri = '/v1/loop/info';
     request(options).then((body) => {
-        logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Loop', msg: 'Loop Swap Information Received', data: body });
+        logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Loop', msg: 'Loop Information Received', data: body });
         res.status(200).json(body);
     }).catch((errRes) => {
-        const err = common.handleError(errRes, 'Loop', 'Get Swap Error', req.session.selectedNode);
+        const err = common.handleError(errRes, 'Loop', 'Get Loop Info Error', req.session.selectedNode);
         return res.status(err.statusCode).json({ message: err.message, error: err.error });
     });
 };

backend/models/config.model.js

@@ -1,8 +1,11 @@
 export class CommonSelectedNode {
-    constructor(options, ln_server_url, macaroon_path, ln_api_password, swap_server_url, boltz_server_url, config_path, rtl_conf_file_path, swap_macaroon_path, boltz_macaroon_path, bitcoind_config_path, channel_backup_path, log_level, log_file, index, ln_node, ln_implementation, user_persona, theme_mode, theme_color, unannounced_channels, fiat_conversion, currency_unit, ln_version, api_version, enable_offers, enable_peerswap) {
+    constructor(options, ln_server_url, macaroon_path, macaroon_value, rune_path, rune_value, ln_api_password, swap_server_url, boltz_server_url, config_path, rtl_conf_file_path, swap_macaroon_path, boltz_macaroon_path, bitcoind_config_path, channel_backup_path, log_level, log_file, index, ln_node, ln_implementation, user_persona, theme_mode, theme_color, unannounced_channels, fiat_conversion, currency_unit, ln_version, api_version, enable_offers, enable_peerswap) {
         this.options = options;
         this.ln_server_url = ln_server_url;
         this.macaroon_path = macaroon_path;
+        this.macaroon_value = macaroon_value;
+        this.rune_path = rune_path;
+        this.rune_value = rune_value;
         this.ln_api_password = ln_api_password;
         this.swap_server_url = swap_server_url;
         this.boltz_server_url = boltz_server_url;

backend/models/database.model.js

@@ -3,15 +3,15 @@ export var OfferFieldsEnum;
     OfferFieldsEnum["BOLT12"] = "bolt12";
     OfferFieldsEnum["AMOUNTMSAT"] = "amountMSat";
     OfferFieldsEnum["TITLE"] = "title";
-    OfferFieldsEnum["VENDOR"] = "vendor";
+    OfferFieldsEnum["ISSUER"] = "issuer";
     OfferFieldsEnum["DESCRIPTION"] = "description";
 })(OfferFieldsEnum || (OfferFieldsEnum = {}));
 export class Offer {
-    constructor(bolt12, amountMSat, title, vendor, description, lastUpdatedAt) {
+    constructor(bolt12, amountMSat, title, issuer, description, lastUpdatedAt) {
         this.bolt12 = bolt12;
         this.amountMSat = amountMSat;
         this.title = title;
-        this.vendor = vendor;
+        this.issuer = issuer;
         this.description = description;
         this.lastUpdatedAt = lastUpdatedAt;
     }
@@ -133,7 +133,29 @@ export var CollectionsEnum;
     CollectionsEnum["OFFERS"] = "Offers";
     CollectionsEnum["PAGE_SETTINGS"] = "PageSettings";
 })(CollectionsEnum || (CollectionsEnum = {}));
-export const CollectionFieldsEnum = Object.assign(Object.assign(Object.assign({}, OfferFieldsEnum), PageSettingsFieldsEnum), TableSettingsFieldsEnum);
+export const CollectionFieldsEnum = { ...OfferFieldsEnum, ...PageSettingsFieldsEnum, ...TableSettingsFieldsEnum };
 export const LNDCollection = [CollectionsEnum.PAGE_SETTINGS];
 export const ECLCollection = [CollectionsEnum.PAGE_SETTINGS];
 export const CLNCollection = [CollectionsEnum.PAGE_SETTINGS, CollectionsEnum.OFFERS];
+export const ECL_UPDATED_DB = [
+    {
+        pageId: 'peers_channels',
+        tables: [
+            {
+                tableId: 'open_channels',
+                removed: ['buried', 'feeRatePerKw'],
+                renamed: ['isFunder:isInitiator']
+            },
+            {
+                tableId: 'pending_channels',
+                removed: ['buried', 'feeRatePerKw'],
+                renamed: ['isFunder:isInitiator']
+            },
+            {
+                tableId: 'inactive_channels',
+                removed: ['buried', 'feeRatePerKw'],
+                renamed: ['isFunder:isInitiator']
+            }
+        ]
+    }
+];

backend/models/ecl.model.js

@@ -0,0 +1,12 @@
+export var ECLWSEventsEnum;
+(function (ECLWSEventsEnum) {
+    ECLWSEventsEnum["PAY_RECEIVED"] = "payment-received";
+    ECLWSEventsEnum["PAY_RELAYED"] = "payment-relayed";
+    ECLWSEventsEnum["PAY_SENT"] = "payment-sent";
+    ECLWSEventsEnum["PAY_SETTLING_ONCHAIN"] = "payment-settling-onchain";
+    ECLWSEventsEnum["PAY_FAILED"] = "payment-failed";
+    ECLWSEventsEnum["CHANNEL_OPENED"] = "channel-opened";
+    ECLWSEventsEnum["CHANNEL_STATE_CHANGED"] = "channel-state-changed";
+    ECLWSEventsEnum["CHANNEL_CLOSED"] = "channel-closed";
+    ECLWSEventsEnum["ONION_MESSAGE_RECEIVED"] = "onion-message-received";
+})(ECLWSEventsEnum || (ECLWSEventsEnum = {}));

backend/routes/cln/channels.js

@@ -1,14 +1,12 @@
 import exprs from 'express';
 const { Router } = exprs;
 import { isAuthenticated } from '../../utils/authCheck.js';
-import { listChannels, openChannel, setChannelFee, closeChannel, getLocalRemoteBalance, listForwards, funderUpdatePolicy, listForwardsPaginated } from '../../controllers/cln/channels.js';
+import { listPeerChannels, openChannel, setChannelFee, closeChannel, listForwards, funderUpdatePolicy } from '../../controllers/cln/channels.js';
 const router = Router();
-router.get('/listChannels', isAuthenticated, listChannels);
+router.get('/listPeerChannels', isAuthenticated, listPeerChannels);
 router.post('/', isAuthenticated, openChannel);
 router.post('/setChannelFee', isAuthenticated, setChannelFee);
-router.delete('/:channelId', isAuthenticated, closeChannel);
-router.get('/localRemoteBalance', isAuthenticated, getLocalRemoteBalance);
-router.get('/listForwards', isAuthenticated, listForwards);
-router.get('/listForwardsPaginated', isAuthenticated, listForwardsPaginated);
+router.post('/close/', isAuthenticated, closeChannel);
+router.post('/listForwards', isAuthenticated, listForwards);
 router.post('/funderUpdate', isAuthenticated, funderUpdatePolicy);
 export default router;

backend/routes/cln/index.js

@@ -1,8 +1,6 @@
 import exprs from 'express';
 const { Router } = exprs;
 import infoCLRoutes from './getInfo.js';
-import feesCLRoutes from './fees.js';
-import balanceCLRoutes from './balance.js';
 import channelsCLRoutes from './channels.js';
 import invoicesCLRoutes from './invoices.js';
 import onChainCLRoutes from './onchain.js';
@@ -14,8 +12,6 @@ import utilityCLRoutes from './utility.js';
 const router = Router();
 const clRoutes = [
     { path: '/getinfo', route: infoCLRoutes },
-    { path: '/fees', route: feesCLRoutes },
-    { path: '/balance', route: balanceCLRoutes },
     { path: '/channels', route: channelsCLRoutes },
     { path: '/invoices', route: invoicesCLRoutes },
     { path: '/onchain', route: onChainCLRoutes },

backend/routes/cln/invoices.js

@@ -3,7 +3,7 @@ const { Router } = exprs;
 import { isAuthenticated } from '../../utils/authCheck.js';
 import { listInvoices, addInvoice, deleteExpiredInvoice } from '../../controllers/cln/invoices.js';
 const router = Router();
-router.get('/', isAuthenticated, listInvoices);
+router.post('/lookup/', isAuthenticated, listInvoices);
 router.post('/', isAuthenticated, addInvoice);
-router.delete('/', isAuthenticated, deleteExpiredInvoice);
+router.post('/delete/', isAuthenticated, deleteExpiredInvoice);
 export default router;

backend/routes/cln/network.js

@@ -1,11 +1,10 @@
 import exprs from 'express';
 const { Router } = exprs;
 import { isAuthenticated } from '../../utils/authCheck.js';
-import { getRoute, listNode, listChannel, feeRates, listNodes } from '../../controllers/cln/network.js';
+import { getRoute, listChannels, feeRates, listNodes } from '../../controllers/cln/network.js';
 const router = Router();
-router.get('/getRoute/:destPubkey/:amount', isAuthenticated, getRoute);
-router.get('/listNode/:id', isAuthenticated, listNode);
-router.get('/listChannel/:channelShortId', isAuthenticated, listChannel);
-router.get('/feeRates/:feeRateStyle', isAuthenticated, feeRates);
-router.get('/listNodes', isAuthenticated, listNodes);
+router.post('/listNodes', isAuthenticated, listNodes);
+router.post('/getRoute', isAuthenticated, getRoute);
+router.post('/feeRates', isAuthenticated, feeRates);
+router.post('/listChannels', isAuthenticated, listChannels);
 export default router;

backend/routes/cln/offers.js

@@ -4,9 +4,9 @@ import { isAuthenticated } from '../../utils/authCheck.js';
 import { listOfferBookmarks, deleteOfferBookmark, listOffers, disableOffer, createOffer, fetchOfferInvoice } from '../../controllers/cln/offers.js';
 const router = Router();
 router.get('/offerbookmarks', isAuthenticated, listOfferBookmarks);
-router.delete('/offerbookmark/:offerStr', isAuthenticated, deleteOfferBookmark);
+router.post('/offerbookmark/delete', isAuthenticated, deleteOfferBookmark);
 router.get('/', isAuthenticated, listOffers);
 router.post('/', isAuthenticated, createOffer);
 router.post('/fetchOfferInvoice', isAuthenticated, fetchOfferInvoice);
-router.delete('/:offerID', isAuthenticated, disableOffer);
+router.post('/disableOffer', isAuthenticated, disableOffer);
 export default router;

backend/routes/cln/onchain.js

@@ -3,7 +3,7 @@ const { Router } = exprs;
 import { isAuthenticated } from '../../utils/authCheck.js';
 import { getNewAddress, onChainWithdraw, getUTXOs } from '../../controllers/cln/onchain.js';
 const router = Router();
-router.get('/', isAuthenticated, getNewAddress);
 router.post('/', isAuthenticated, onChainWithdraw);
+router.post('/newaddr', isAuthenticated, getNewAddress);
 router.get('/utxos/', isAuthenticated, getUTXOs);
 export default router;

backend/routes/cln/peers.js

@@ -5,5 +5,5 @@ import { getPeers, postPeer, deletePeer } from '../../controllers/cln/peers.js';
 const router = Router();
 router.get('/', isAuthenticated, getPeers);
 router.post('/', isAuthenticated, postPeer);
-router.delete('/:peerId', isAuthenticated, deletePeer);
+router.post('/disconnect/', isAuthenticated, deletePeer);
 export default router;

backend/routes/cln/utility.js

@@ -1,10 +1,9 @@
 import exprs from 'express';
 const { Router } = exprs;
 import { isAuthenticated } from '../../utils/authCheck.js';
-import { decodePayments, decodePayment, signMessage, verifyMessage, listConfigs } from '../../controllers/cln/utility.js';
+import { decodePayment, signMessage, verifyMessage, listConfigs } from '../../controllers/cln/utility.js';
 const router = Router();
-router.get('/', isAuthenticated, decodePayments);
-router.get('/decode/:payReq', isAuthenticated, decodePayment);
+router.post('/decode', isAuthenticated, decodePayment);
 router.post('/sign', isAuthenticated, signMessage);
 router.post('/verify', isAuthenticated, verifyMessage);
 router.get('/listConfigs', isAuthenticated, listConfigs);

backend/routes/eclair/channels.js

@@ -1,11 +1,12 @@
 import exprs from 'express';
 const { Router } = exprs;
 import { isAuthenticated } from '../../utils/authCheck.js';
-import { getChannels, getChannelStats, openChannel, updateChannelRelayFee, closeChannel } from '../../controllers/eclair/channels.js';
+import { getChannels, getChannelStats, openChannel, updateChannelRelayFee, closeChannel, circularRebalance } from '../../controllers/eclair/channels.js';
 const router = Router();
 router.get('/', isAuthenticated, getChannels);
 router.get('/stats', isAuthenticated, getChannelStats);
 router.post('/', isAuthenticated, openChannel);
 router.post('/updateRelayFee', isAuthenticated, updateChannelRelayFee);
+router.post('/circularRebalance', circularRebalance);
 router.delete('/', isAuthenticated, closeChannel);
 export default router;

backend/routes/eclair/network.js

@@ -1,7 +1,8 @@
 import exprs from 'express';
 const { Router } = exprs;
 import { isAuthenticated } from '../../utils/authCheck.js';
-import { getNodes } from '../../controllers/eclair/network.js';
+import { getNodes, findRouteBetweenNodes } from '../../controllers/eclair/network.js';
 const router = Router();
 router.get('/nodes/:id', isAuthenticated, getNodes);
+router.get('/routebetweennodes', isAuthenticated, findRouteBetweenNodes);
 export default router;

backend/routes/eclair/payments.js

@@ -1,10 +1,11 @@
 import exprs from 'express';
 const { Router } = exprs;
 import { isAuthenticated } from '../../utils/authCheck.js';
-import { queryPaymentRoute, decodePayment, getSentPaymentsInformation, postPayment } from '../../controllers/eclair/payments.js';
+import { queryPaymentRoute, decodePayment, getSentPaymentsInformation, postPayment, sendPaymentToRoute } from '../../controllers/eclair/payments.js';
 const router = Router();
 router.get('/route/', isAuthenticated, queryPaymentRoute);
 router.get('/decode/:invoice', isAuthenticated, decodePayment);
 router.post('/getsentinfos', isAuthenticated, getSentPaymentsInformation);
+router.post('/sendtoroute', isAuthenticated, sendPaymentToRoute);
 router.post('/', isAuthenticated, postPayment);
 export default router;

backend/routes/shared/loop.js

@@ -1,8 +1,9 @@
 import exprs from 'express';
 const { Router } = exprs;
 import { isAuthenticated } from '../../utils/authCheck.js';
-import { loopInTerms, loopInQuote, loopInTermsAndQuotes, loopIn, loopOutTerms, loopOutQuote, loopOutTermsAndQuotes, loopOut, swaps, swap } from '../../controllers/shared/loop.js';
+import { loopInfo, loopInTerms, loopInQuote, loopInTermsAndQuotes, loopIn, loopOutTerms, loopOutQuote, loopOutTermsAndQuotes, loopOut, swaps, swap } from '../../controllers/shared/loop.js';
 const router = Router();
+router.get('/info', isAuthenticated, loopInfo);
 router.get('/in/terms', isAuthenticated, loopInTerms);
 router.get('/in/quote/:amount', isAuthenticated, loopInQuote);
 router.get('/in/termsAndQuotes', isAuthenticated, loopInTermsAndQuotes);

backend/utils/app.js

@@ -10,10 +10,9 @@ import sharedRoutes from '../routes/shared/index.js';
 import lndRoutes from '../routes/lnd/index.js';
 import clnRoutes from '../routes/cln/index.js';
 import eclRoutes from '../routes/eclair/index.js';
+import { Database } from './database.js';
 import { Common } from './common.js';
 import { Logger } from './logger.js';
-import { Config } from './config.js';
-import { CLWSClient } from '../controllers/cln/webSocketClient.js';
 import { ECLWSClient } from '../controllers/eclair/webSocketClient.js';
 import { LNDWSClient } from '../controllers/lnd/webSocketClient.js';
 const ONE_DAY = 1000 * 60 * 60 * 24;
@@ -22,15 +21,12 @@ export class ExpressApplication {
         this.app = express();
         this.logger = Logger;
         this.common = Common;
-        this.config = Config;
         this.eclWsClient = ECLWSClient;
-        this.clWsClient = CLWSClient;
+        // public clWsClient: CLWebSocketClient = CLWSClient;
         this.lndWsClient = LNDWSClient;
+        this.databaseService = Database;
         this.directoryName = dirname(fileURLToPath(import.meta.url));
         this.getApp = () => this.app;
-        this.loadConfiguration = () => {
-            this.config.setServerConfiguration();
-        };
         this.setCORS = () => { CORS.mount(this.app); };
         this.setCSRF = () => { CSRF.mount(this.app); };
         this.setApplicationRoutes = () => {
@@ -41,8 +37,8 @@ export class ExpressApplication {
             this.app.use(this.common.baseHref + '/api/ecl', eclRoutes);
             this.app.use(this.common.baseHref, express.static(join(this.directoryName, '../..', 'frontend')));
             this.app.use((req, res, next) => {
-                res.cookie('XSRF-TOKEN', req.csrfToken ? req.csrfToken() : ''); // RTL Angular Frontend
-                res.setHeader('XSRF-TOKEN', req.csrfToken ? req.csrfToken() : ''); // RTL Quickpay JQuery
+                res.cookie('XSRF-TOKEN', req.csrfToken ? req.csrfToken() : (req.cookies && req.cookies._csrf) ? req.cookies._csrf : ''); // RTL Angular Frontend
+                res.setHeader('XSRF-TOKEN', req.csrfToken ? req.csrfToken() : (req.cookies && req.cookies._csrf) ? req.cookies._csrf : ''); // RTL Quickpay JQuery
                 res.sendFile(join(this.directoryName, '../..', 'frontend', 'index.html'));
             });
             this.app.use((err, req, res, next) => {
@@ -81,10 +77,10 @@ export class ExpressApplication {
         this.app.use(cookieParser(this.common.secret_key));
         this.app.use(bodyParser.json({ limit: '25mb' }));
         this.app.use(bodyParser.urlencoded({ extended: false, limit: '25mb' }));
-        this.loadConfiguration();
         this.setCORS();
         this.setCSRF();
         this.setApplicationRoutes();
+        this.databaseService.migrateDatabase();
     }
 }
 export default ExpressApplication;

backend/utils/authCheck.js

@@ -18,16 +18,14 @@ export const isAuthenticated = (req, res, next) => {
     }
 };
 export const verifyWSUser = (info, next) => {
-    var _a;
     const headers = JSON.parse(JSON.stringify(info.req.headers));
-    const protocols = !info.req.headers['sec-websocket-protocol'] ? [] : (_a = info.req.headers['sec-websocket-protocol'].split(',')) === null || _a === void 0 ? void 0 : _a.map((s) => s.trim());
+    const protocols = !info.req.headers['sec-websocket-protocol'] ? [] : info.req.headers['sec-websocket-protocol'].split(',')?.map((s) => s.trim());
     const jwToken = (protocols && protocols.length > 0) ? protocols[0] : '';
     if (!jwToken || jwToken === '') {
         next(false, 401, 'Authentication Failed! Please Login First!');
     }
     else {
         jwt.verify(jwToken, common.secret_key, (verificationErr) => {
-            var _a, _b, _c;
             if (verificationErr) {
                 next(false, 401, 'Authentication Failed! Please Login First!');
             }
@@ -42,7 +40,7 @@ export const verifyWSUser = (info, next) => {
                     }
                     let cookies = null;
                     try {
-                        cookies = '{"' + ((_c = (_b = (_a = headers.cookie) === null || _a === void 0 ? void 0 : _a.replace(/ /g, '')) === null || _b === void 0 ? void 0 : _b.replace(/;/g, '","').trim()) === null || _c === void 0 ? void 0 : _c.replace(/[=]/g, '":"')) + '"}';
+                        cookies = '{"' + headers.cookie?.replace(/ /g, '')?.replace(/;/g, '","').trim()?.replace(/[=]/g, '":"') + '"}';
                         updatedReq['cookies'] = JSON.parse(cookies);
                     }
                     catch (err) {

backend/utils/common.js

@@ -11,7 +11,8 @@ export class CommonService {
         this.initSelectedNode = null;
         this.rtl_conf_file_path = '';
         this.port = 3000;
-        this.host = null;
+        this.host = '';
+        this.db_directory_path = join(dirname(fileURLToPath(import.meta.url)), '..', '..');
         this.rtl_pass = '';
         this.flg_allow_password_update = true;
         this.rtl_secret2fa = '';
@@ -19,6 +20,7 @@ export class CommonService {
         this.rtl_cookie_path = '';
         this.logout_redirect_link = '';
         this.cookie_value = '';
+        this.ln_version = '';
         this.api_version = '';
         this.secret_key = crypto.randomBytes(64).toString('hex');
         this.read_dummy_data = false;
@@ -28,9 +30,10 @@ export class CommonService {
             { name: 'JAN', days: 31 }, { name: 'FEB', days: 28 }, { name: 'MAR', days: 31 }, { name: 'APR', days: 30 }, { name: 'MAY', days: 31 }, { name: 'JUN', days: 30 },
             { name: 'JUL', days: 31 }, { name: 'AUG', days: 31 }, { name: 'SEP', days: 30 }, { name: 'OCT', days: 31 }, { name: 'NOV', days: 30 }, { name: 'DEC', days: 31 }
         ];
-        this.getSwapServerOptions = (req) => {
+        this.setSwapServerOptions = (req) => {
             const swapOptions = {
-                url: req.session.selectedNode.swap_server_url,
+                baseUrl: req.session.selectedNode.swap_server_url,
+                uri: '',
                 rejectUnauthorized: false,
                 json: true,
                 headers: { 'Grpc-Metadata-macaroon': '' }
@@ -66,8 +69,9 @@ export class CommonService {
         };
         this.getOptions = (req) => {
             if (req.session.selectedNode && req.session.selectedNode.options) {
-                req.session.selectedNode.options.method = (req.session.selectedNode.ln_implementation && req.session.selectedNode.ln_implementation.toUpperCase() !== 'ECL') ? 'GET' : 'POST';
+                req.session.selectedNode.options.method = (req.session.selectedNode.ln_implementation && req.session.selectedNode.ln_implementation.toUpperCase() === 'LND') ? 'GET' : 'POST';
                 delete req.session.selectedNode.options.form;
+                delete req.session.selectedNode.options.body;
                 req.session.selectedNode.options.qs = {};
                 return req.session.selectedNode.options;
             }
@@ -87,7 +91,15 @@ export class CommonService {
                 if (req.session.selectedNode && req.session.selectedNode.ln_implementation) {
                     switch (req.session.selectedNode.ln_implementation.toUpperCase()) {
                         case 'CLN':
-                            req.session.selectedNode.options.headers = { macaroon: Buffer.from(fs.readFileSync(join(req.session.selectedNode.macaroon_path, 'access.macaroon'))).toString('base64') };
+                            try {
+                                if (!req.session.selectedNode.rune_value) {
+                                    req.session.selectedNode.rune_value = this.getRuneValue(req.session.selectedNode.rune_path);
+                                }
+                                req.session.selectedNode.options.headers = { rune: req.session.selectedNode.rune_value };
+                            }
+                            catch (err) {
+                                throw new Error(err);
+                            }
                             break;
                         case 'ECL':
                             req.session.selectedNode.options.headers = { authorization: 'Basic ' + Buffer.from(':' + req.session.selectedNode.ln_api_password).toString('base64') };
@@ -113,6 +125,17 @@ export class CommonService {
                 return { status: 502, message: err };
             }
         };
+        this.getRuneValue = (rune_path) => {
+            const data = fs.readFileSync(rune_path, 'utf8');
+            const pattern = /LIGHTNING_RUNE="(?<runeValue>[^"]+)"/;
+            const match = data.match(pattern);
+            if (match.groups.runeValue) {
+                return match.groups.runeValue;
+            }
+            else {
+                throw new Error('Rune not found in the file.');
+            }
+        };
         this.setOptions = (req) => {
             if (this.nodes[0].options && this.nodes[0].options.headers) {
                 return;
@@ -129,7 +152,15 @@ export class CommonService {
                         if (node.ln_implementation) {
                             switch (node.ln_implementation.toUpperCase()) {
                                 case 'CLN':
-                                    node.options.headers = { macaroon: Buffer.from(fs.readFileSync(join(node.macaroon_path, 'access.macaroon'))).toString('base64') };
+                                    try {
+                                        if (!node.rune_value) {
+                                            node.rune_value = this.getRuneValue(node.rune_path);
+                                        }
+                                        node.options.headers = { rune: node.rune_value };
+                                    }
+                                    catch (err) {
+                                        throw new Error(err);
+                                    }
                                     break;
                                 case 'ECL':
                                     node.options.headers = { authorization: 'Basic ' + Buffer.from(':' + node.ln_api_password).toString('base64') };
@@ -201,18 +232,17 @@ export class CommonService {
         };
         this.newestOnTop = (array, key, value) => {
             const newlyAddedRecord = array.splice(array.findIndex((item) => item[key] === value), 1);
-            array === null || array === void 0 ? void 0 : array.unshift(newlyAddedRecord[0]);
+            array?.unshift(newlyAddedRecord[0]);
             return array;
         };
-        this.camelCase = (str) => { var _a, _b; return (_b = (_a = str === null || str === void 0 ? void 0 : str.replace(/(?:^\w|[A-Z]|\b\w)/g, (word, index) => (word.toUpperCase()))) === null || _a === void 0 ? void 0 : _a.replace(/\s+/g, '')) === null || _b === void 0 ? void 0 : _b.replace(/-/g, ' '); };
+        this.camelCase = (str) => str?.replace(/(?:^\w|[A-Z]|\b\w)/g, (word, index) => (word.toUpperCase()))?.replace(/\s+/g, '')?.replace(/-/g, ' ');
         this.titleCase = (str) => {
-            var _a, _b;
             if (str.indexOf('!\n') > 0 || str.indexOf('.\n') > 0) {
-                return (_a = str.split('\n')) === null || _a === void 0 ? void 0 : _a.reduce((accumulator, currentStr) => accumulator + currentStr.charAt(0).toUpperCase() + currentStr.substring(1).toLowerCase() + '\n', '');
+                return str.split('\n')?.reduce((accumulator, currentStr) => accumulator + currentStr.charAt(0).toUpperCase() + currentStr.substring(1).toLowerCase() + '\n', '');
             }
             else {
                 if (str.indexOf(' ') > 0) {
-                    return (_b = str.split(' ')) === null || _b === void 0 ? void 0 : _b.reduce((accumulator, currentStr) => accumulator + currentStr.charAt(0).toUpperCase() + currentStr.substring(1).toLowerCase() + ' ', '');
+                    return str.split(' ')?.reduce((accumulator, currentStr) => accumulator + currentStr.charAt(0).toUpperCase() + currentStr.substring(1).toLowerCase() + ' ', '');
                 }
                 else {
                     return str.charAt(0).toUpperCase() + str.substring(1).toLowerCase();
@@ -220,7 +250,15 @@ export class CommonService {
             }
         };
         this.handleError = (errRes, fileName, errMsg, selectedNode) => {
-            const err = JSON.parse(JSON.stringify(errRes));
+            let err = JSON.parse(JSON.stringify(errRes));
+            if (err && err.error && Object.keys(err.error).length === 0 && errRes.error && (errRes.error.stack || errRes.error.message)) {
+                errRes.error = errRes.error.stack || errRes.error.message;
+                err = JSON.parse(JSON.stringify(errRes));
+            }
+            else if (errRes.message || errRes.stack) {
+                errRes.error = errRes.message || errRes.stack;
+                err = JSON.parse(JSON.stringify(errRes));
+            }
             if (!selectedNode) {
                 selectedNode = this.initSelectedNode;
             }
@@ -255,7 +293,7 @@ export class CommonService {
                     }
                     break;
             }
-            this.logger.log({ selectedNode: selectedNode, level: 'ERROR', fileName: fileName, msg: errMsg, error: (typeof err === 'object' ? JSON.stringify(err) : (typeof err === 'string') ? err : 'Unknown Error') });
+            this.logger.log({ selectedNode: selectedNode, level: 'ERROR', fileName: fileName, msg: errMsg, error: (typeof err === 'object' ? JSON.stringify(err) : err) });
             let newErrorObj = { statusCode: 500, message: '', error: '' };
             if (err.code && err.code === 'ENOENT') {
                 newErrorObj = {
@@ -276,7 +314,7 @@ export class CommonService {
                                         (err.message && typeof err.message === 'string') ? err.message : (typeof err === 'string') ? err : 'Unknown Error')
                 };
             }
-            if (selectedNode.ln_implementation === 'ECL' && err.message.indexOf('Authentication Error') < 0 && err.name === 'StatusCodeError') {
+            if (selectedNode.ln_implementation === 'ECL' && err.message && err.message.indexOf('Authentication Error') < 0 && err.name && err.name === 'StatusCodeError') {
                 newErrorObj.statusCode = 500;
             }
             return newErrorObj;
@@ -317,7 +355,7 @@ export class CommonService {
                     this.cookie_value = fs.readFileSync(this.rtl_cookie_path, 'utf-8');
                 }
                 catch (err) {
-                    this.logger.log({ selectedNode: this.initSelectedNode, level: 'ERROR', fileName: 'Config', msg: 'Something went wrong while reading cookie: \n' + err });
+                    this.logger.log({ selectedNode: this.initSelectedNode, level: 'ERROR', fileName: 'Common', msg: 'Something went wrong while reading cookie: \n' + err });
                     throw new Error(err);
                 }
             }
@@ -329,7 +367,7 @@ export class CommonService {
                     this.cookie_value = fs.readFileSync(this.rtl_cookie_path, 'utf-8');
                 }
                 catch (err) {
-                    this.logger.log({ selectedNode: this.initSelectedNode, level: 'ERROR', fileName: 'Config', msg: 'Something went wrong while reading the cookie: \n' + err });
+                    this.logger.log({ selectedNode: this.initSelectedNode, level: 'ERROR', fileName: 'Common', msg: 'Something went wrong while reading the cookie: \n' + err });
                     throw new Error(err);
                 }
             }
@@ -345,9 +383,8 @@ export class CommonService {
             }
         };
         this.createDirectory = (directoryName) => {
-            var _a;
             const initDir = isAbsolute(directoryName) ? sep : '';
-            (_a = directoryName.split(sep)) === null || _a === void 0 ? void 0 : _a.reduce((parentDir, childDir) => {
+            directoryName.split(sep)?.reduce((parentDir, childDir) => {
                 const curDir = resolve(parentDir, childDir);
                 try {
                     if (!fs.existsSync(curDir)) {
@@ -416,13 +453,25 @@ export class CommonService {
             });
         };
         this.isVersionCompatible = (currentVersion, checkVersion) => {
-            var _a;
-            if (currentVersion) {
-                const versionsArr = ((_a = currentVersion.trim()) === null || _a === void 0 ? void 0 : _a.replace('v', '').split('-')[0].split('.')) || [];
-                const checkVersionsArr = checkVersion.split('.');
-                return (+versionsArr[0] > +checkVersionsArr[0]) ||
-                    (+versionsArr[0] === +checkVersionsArr[0] && +versionsArr[1] > +checkVersionsArr[1]) ||
-                    (+versionsArr[0] === +checkVersionsArr[0] && +versionsArr[1] === +checkVersionsArr[1] && +versionsArr[2] >= +checkVersionsArr[2]);
+            if (currentVersion && currentVersion !== '') {
+                // eslint-disable-next-line prefer-named-capture-group
+                const pattern = /v?(\d+(\.\d+)*)/;
+                const match = currentVersion.match(pattern);
+                if (match && match.length && match.length > 1) {
+                    this.logger.log({ selectedNode: this.initSelectedNode, level: 'INFO', fileName: 'Common', msg: 'Global Version ' + match[1] });
+                    this.logger.log({ selectedNode: this.initSelectedNode, level: 'INFO', fileName: 'Common', msg: 'Checking Compatiblility with Version ' + checkVersion });
+                    const currentVersionArr = match[1].split('.') || [];
+                    currentVersionArr[1] = currentVersionArr[1].substring(0, 2);
+                    const checkVersionsArr = checkVersion.split('.');
+                    checkVersionsArr[1] = checkVersionsArr[1].substring(0, 2);
+                    return (+currentVersionArr[0] > +checkVersionsArr[0]) ||
+                        (+currentVersionArr[0] === +checkVersionsArr[0] && +currentVersionArr[1] > +checkVersionsArr[1]) ||
+                        (+currentVersionArr[0] === +checkVersionsArr[0] && +currentVersionArr[1] === +checkVersionsArr[1] && +currentVersionArr[2] >= +checkVersionsArr[2]);
+                }
+                else {
+                    this.logger.log({ selectedNode: this.initSelectedNode, level: 'ERROR', fileName: 'Common', msg: 'Invalid Version String ' + currentVersion });
+                    return false;
+                }
             }
             return false;
         };
@@ -432,6 +481,7 @@ export class CommonService {
             if (selNode && selNode.index) {
                 this.logger.log({ selectedNode: selNode, level: 'INFO', fileName: 'Config Setup Variable', msg: 'PORT: ' + this.port });
                 this.logger.log({ selectedNode: selNode, level: 'INFO', fileName: 'Config Setup Variable', msg: 'HOST: ' + this.host });
+                this.logger.log({ selectedNode: selNode, level: 'INFO', fileName: 'Config Setup Variable', msg: 'DB_DIRECTORY_PATH: ' + this.db_directory_path });
                 this.logger.log({ selectedNode: selNode, level: 'INFO', fileName: 'Config Setup Variable', msg: 'SSO: ' + this.rtl_sso });
                 this.logger.log({ selectedNode: selNode, level: 'INFO', fileName: 'Config Setup Variable', msg: 'DEFAULT NODE INDEX: ' + selNode.index });
                 this.logger.log({ selectedNode: selNode, level: 'INFO', fileName: 'Config Setup Variable', msg: 'INDEX: ' + selNode.index });

backend/utils/config.js

@@ -20,31 +20,37 @@ export class ConfigService {
             let macaroonPath = '';
             let configPath = '';
             let channelBackupPath = '';
+            let dbPath = '';
             switch (this.platform) {
                 case 'win32':
                     macaroonPath = homeDir + '\\AppData\\Local\\Lnd\\data\\chain\\bitcoin\\mainnet';
                     configPath = homeDir + '\\AppData\\Local\\Lnd\\lnd.conf';
                     channelBackupPath = homeDir + '\\backup\\node-1';
+                    dbPath = homeDir + '\\database\\node-1';
                     break;
                 case 'darwin':
                     macaroonPath = homeDir + '/Library/Application Support/Lnd/data/chain/bitcoin/mainnet';
                     configPath = homeDir + '/Library/Application Support/Lnd/lnd.conf';
                     channelBackupPath = homeDir + '/backup/node-1';
+                    dbPath = homeDir + '/database/node-1';
                     break;
                 case 'linux':
                     macaroonPath = homeDir + '/.lnd/data/chain/bitcoin/mainnet';
                     configPath = homeDir + '/.lnd/lnd.conf';
                     channelBackupPath = homeDir + '/backup/node-1';
+                    dbPath = homeDir + '/database/node-1';
                     break;
                 default:
                     macaroonPath = '';
                     configPath = '';
                     channelBackupPath = '';
+                    dbPath = '';
                     break;
             }
             const configData = {
                 port: '3000',
                 defaultNodeIndex: 1,
+                dbDirectoryPath: dbPath,
                 SSO: {
                     rtlSSO: 0,
                     rtlCookiePath: '',
@@ -65,14 +71,14 @@ export class ConfigService {
                             themeColor: 'PURPLE',
                             channelBackupPath: channelBackupPath,
                             logLevel: 'ERROR',
-                            lnServerUrl: 'https://localhost:8080',
+                            lnServerUrl: 'https://127.0.0.1:8080',
                             fiatConversion: false,
                             unannouncedChannels: false
                         }
                     }
                 ]
             };
-            if (+process.env.RTL_SSO === 0 || configData.SSO.rtlSSO === 0) {
+            if ((process?.env?.RTL_SSO && +process?.env?.RTL_SSO === 0) || configData.SSO.rtlSSO === 0) {
                 configData['multiPass'] = 'password';
             }
             return configData;
@@ -89,7 +95,7 @@ export class ConfigService {
         };
         this.updateLogByLevel = () => {
             let updateLogFlag = false;
-            this.common.rtl_conf_file_path = process.env.RTL_CONFIG_PATH ? process.env.RTL_CONFIG_PATH : join(this.directoryName, '../..');
+            this.common.rtl_conf_file_path = process?.env?.RTL_CONFIG_PATH ? process?.env?.RTL_CONFIG_PATH : join(this.directoryName, '../..');
             try {
                 const RTLConfFile = this.common.rtl_conf_file_path + sep + 'RTL-Config.json';
                 const config = JSON.parse(fs.readFileSync(RTLConfFile, 'utf-8'));
@@ -109,9 +115,9 @@ export class ConfigService {
             }
         };
         this.validateNodeConfig = (config) => {
-            if ((+process.env.RTL_SSO === 0) || (typeof process.env.RTL_SSO === 'undefined' && +config.SSO.rtlSSO === 0)) {
-                if (process.env.APP_PASSWORD && process.env.APP_PASSWORD.trim() !== '') {
-                    this.common.rtl_pass = this.hash.update(process.env.APP_PASSWORD).digest('hex');
+            if ((process?.env?.RTL_SSO && +process?.env?.RTL_SSO === 0) || (typeof process?.env?.RTL_SSO === 'undefined' && +config.SSO.rtlSSO === 0)) {
+                if (process?.env?.APP_PASSWORD && process?.env?.APP_PASSWORD.trim() !== '') {
+                    this.common.rtl_pass = this.hash.update(process?.env?.APP_PASSWORD).digest('hex');
                     this.common.flg_allow_password_update = false;
                 }
                 else if (config.multiPassHashed && config.multiPassHashed !== '') {
@@ -126,43 +132,59 @@ export class ConfigService {
                 this.common.rtl_secret2fa = config.secret2fa;
             }
             else {
-                if (process.env.APP_PASSWORD && process.env.APP_PASSWORD.trim() !== '') {
+                if (process?.env?.APP_PASSWORD && process?.env?.APP_PASSWORD.trim() !== '') {
                     this.errMsg = this.errMsg + '\nRTL Password cannot be set with SSO. Please set SSO as 0 or remove password.';
                 }
             }
-            this.common.port = (process.env.PORT) ? this.normalizePort(process.env.PORT) : (config.port) ? this.normalizePort(config.port) : 3000;
-            this.common.host = (process.env.HOST) ? process.env.HOST : (config.host) ? config.host : null;
+            this.common.port = (process?.env?.PORT) ? this.normalizePort(process?.env?.PORT) : (config.port) ? this.normalizePort(config.port) : 3000;
+            this.common.host = (process?.env?.HOST) ? process?.env?.HOST : (config.host) ? config.host : null;
+            this.common.db_directory_path = (process?.env?.DB_DIRECTORY_PATH) ? process?.env?.DB_DIRECTORY_PATH : (config.dbDirectoryPath) ? config.dbDirectoryPath : join(dirname(fileURLToPath(import.meta.url)), '..', '..');
             if (config.nodes && config.nodes.length > 0) {
                 config.nodes.forEach((node, idx) => {
                     this.common.nodes[idx] = {};
                     this.common.nodes[idx].index = node.index;
                     this.common.nodes[idx].ln_node = node.lnNode;
-                    this.common.nodes[idx].ln_implementation = (process.env.LN_IMPLEMENTATION) ? process.env.LN_IMPLEMENTATION : node.lnImplementation ? node.lnImplementation : 'LND';
+                    this.common.nodes[idx].ln_implementation = (process?.env?.LN_IMPLEMENTATION) ? process?.env?.LN_IMPLEMENTATION : node.lnImplementation ? node.lnImplementation : 'LND';
                     if (this.common.nodes[idx].ln_implementation === 'CLT') {
                         this.common.nodes[idx].ln_implementation = 'CLN';
                     }
-                    if (this.common.nodes[idx].ln_implementation !== 'ECL' && process.env.MACAROON_PATH && process.env.MACAROON_PATH.trim() !== '') {
-                        this.common.nodes[idx].macaroon_path = process.env.MACAROON_PATH;
-                    }
-                    else if (this.common.nodes[idx].ln_implementation !== 'ECL' && node.Authentication && node.Authentication.macaroonPath && node.Authentication.macaroonPath.trim() !== '') {
-                        this.common.nodes[idx].macaroon_path = node.Authentication.macaroonPath;
-                    }
-                    else if (this.common.nodes[idx].ln_implementation !== 'ECL') {
-                        this.errMsg = 'Please set macaroon path for node index ' + node.index + ' in RTL-Config.json!';
-                    }
-                    if (this.common.nodes[idx].ln_implementation === 'ECL') {
-                        if (process.env.LN_API_PASSWORD) {
-                            this.common.nodes[idx].ln_api_password = process.env.LN_API_PASSWORD;
-                        }
-                        else if (node.Authentication && node.Authentication.lnApiPassword) {
-                            this.common.nodes[idx].ln_api_password = node.Authentication.lnApiPassword;
-                        }
-                        else {
-                            this.common.nodes[idx].ln_api_password = '';
-                        }
+                    switch (this.common.nodes[idx].ln_implementation) {
+                        case 'CLN':
+                            if (process?.env?.RUNE_PATH && process?.env?.RUNE_PATH.trim() !== '') {
+                                this.common.nodes[idx].rune_path = process?.env?.RUNE_PATH;
+                            }
+                            else if (node.Authentication && node.Authentication.runePath && node.Authentication.runePath.trim() !== '') {
+                                this.common.nodes[idx].rune_path = node.Authentication.runePath;
+                            }
+                            else {
+                                this.errMsg = 'Please set rune path for node index ' + node.index + ' in RTL-Config.json!';
+                            }
+                            break;
+                        case 'ECL':
+                            if (process?.env?.LN_API_PASSWORD) {
+                                this.common.nodes[idx].ln_api_password = process?.env?.LN_API_PASSWORD;
+                            }
+                            else if (node.Authentication && node.Authentication.lnApiPassword) {
+                                this.common.nodes[idx].ln_api_password = node.Authentication.lnApiPassword;
+                            }
+                            else {
+                                this.common.nodes[idx].ln_api_password = '';
+                            }
+                            break;
+                        default:
+                            if (process?.env?.MACAROON_PATH && process?.env?.MACAROON_PATH.trim() !== '') {
+                                this.common.nodes[idx].macaroon_path = process?.env?.MACAROON_PATH;
+                            }
+                            else if (node.Authentication && node.Authentication.macaroonPath && node.Authentication.macaroonPath.trim() !== '') {
+                                this.common.nodes[idx].macaroon_path = node.Authentication.macaroonPath;
+                            }
+                            else {
+                                this.errMsg = 'Please set macaroon path for node index ' + node.index + ' in RTL-Config.json!';
+                            }
+                            break;
                     }
-                    if (process.env.CONFIG_PATH) {
-                        this.common.nodes[idx].config_path = process.env.CONFIG_PATH;
+                    if (process?.env?.CONFIG_PATH) {
+                        this.common.nodes[idx].config_path = process?.env?.CONFIG_PATH;
                     }
                     else if (node.Authentication && node.Authentication.configPath) {
                         this.common.nodes[idx].config_path = node.Authentication.configPath;
@@ -172,10 +194,10 @@ export class ConfigService {
                     }
                     if (this.common.nodes[idx].ln_implementation === 'ECL' && this.common.nodes[idx].ln_api_password === '' && this.common.nodes[idx].config_path !== '') {
                         try {
-                            const exists = fs.existsSync(this.common.nodes[idx].config_path);
+                            const exists = fs.existsSync(this.common.nodes[idx].config_path || '');
                             if (exists) {
                                 try {
-                                    const configFile = fs.readFileSync(this.common.nodes[idx].config_path, 'utf-8');
+                                    const configFile = fs.readFileSync((this.common.nodes[idx].config_path || ''), 'utf-8');
                                     const iniParsed = ini.parse(configFile);
                                     this.common.nodes[idx].ln_api_password = iniParsed['eclair.api.password'] ? iniParsed['eclair.api.password'] : parseHocon(configFile).eclair.api.password;
                                 }
@@ -194,11 +216,11 @@ export class ConfigService {
                     if (this.common.nodes[idx].ln_implementation === 'ECL' && this.common.nodes[idx].ln_api_password === '') {
                         this.errMsg = this.errMsg + '\nPlease set config path Or api password for node index ' + node.index + ' in RTL-Config.json! It is mandatory for Eclair authentication!';
                     }
-                    if (process.env.LN_SERVER_URL && process.env.LN_SERVER_URL.trim() !== '') {
-                        this.common.nodes[idx].ln_server_url = process.env.LN_SERVER_URL.endsWith('/v1') ? process.env.LN_SERVER_URL.slice(0, -3) : process.env.LN_SERVER_URL;
+                    if (process?.env?.LN_SERVER_URL && process?.env?.LN_SERVER_URL.trim() !== '') {
+                        this.common.nodes[idx].ln_server_url = process?.env?.LN_SERVER_URL.endsWith('/v1') ? process?.env?.LN_SERVER_URL.slice(0, -3) : process?.env?.LN_SERVER_URL;
                     }
-                    else if (process.env.LND_SERVER_URL && process.env.LND_SERVER_URL.trim() !== '') {
-                        this.common.nodes[idx].ln_server_url = process.env.LND_SERVER_URL.endsWith('/v1') ? process.env.LND_SERVER_URL.slice(0, -3) : process.env.LND_SERVER_URL;
+                    else if (process?.env?.LND_SERVER_URL && process?.env?.LND_SERVER_URL.trim() !== '') {
+                        this.common.nodes[idx].ln_server_url = process?.env?.LND_SERVER_URL.endsWith('/v1') ? process?.env?.LND_SERVER_URL.slice(0, -3) : process?.env?.LND_SERVER_URL;
                     }
                     else if (node.Settings.lnServerUrl && node.Settings.lnServerUrl.trim() !== '') {
                         this.common.nodes[idx].ln_server_url = node.Settings.lnServerUrl.endsWith('/v1') ? node.Settings.lnServerUrl.slice(0, -3) : node.Settings.lnServerUrl;
@@ -218,9 +240,9 @@ export class ConfigService {
                     if (this.common.nodes[idx].fiat_conversion) {
                         this.common.nodes[idx].currency_unit = node.Settings.currencyUnit ? node.Settings.currencyUnit : 'USD';
                     }
-                    if (process.env.SWAP_SERVER_URL && process.env.SWAP_SERVER_URL.trim() !== '') {
-                        this.common.nodes[idx].swap_server_url = process.env.SWAP_SERVER_URL.endsWith('/v1') ? process.env.SWAP_SERVER_URL.slice(0, -3) : process.env.SWAP_SERVER_URL;
-                        this.common.nodes[idx].swap_macaroon_path = process.env.SWAP_MACAROON_PATH;
+                    if (process?.env?.SWAP_SERVER_URL && process?.env?.SWAP_SERVER_URL.trim() !== '') {
+                        this.common.nodes[idx].swap_server_url = process?.env?.SWAP_SERVER_URL.endsWith('/v1') ? process?.env?.SWAP_SERVER_URL.slice(0, -3) : process?.env?.SWAP_SERVER_URL;
+                        this.common.nodes[idx].swap_macaroon_path = process?.env?.SWAP_MACAROON_PATH;
                     }
                     else if (node.Settings.swapServerUrl && node.Settings.swapServerUrl.trim() !== '') {
                         this.common.nodes[idx].swap_server_url = node.Settings.swapServerUrl.endsWith('/v1') ? node.Settings.swapServerUrl.slice(0, -3) : node.Settings.swapServerUrl;
@@ -230,9 +252,9 @@ export class ConfigService {
                         this.common.nodes[idx].swap_server_url = '';
                         this.common.nodes[idx].swap_macaroon_path = '';
                     }
-                    if (process.env.BOLTZ_SERVER_URL && process.env.BOLTZ_SERVER_URL.trim() !== '') {
-                        this.common.nodes[idx].boltz_server_url = process.env.BOLTZ_SERVER_URL.endsWith('/v1') ? process.env.BOLTZ_SERVER_URL.slice(0, -3) : process.env.BOLTZ_SERVER_URL;
-                        this.common.nodes[idx].boltz_macaroon_path = process.env.BOLTZ_MACAROON_PATH;
+                    if (process?.env?.BOLTZ_SERVER_URL && process?.env?.BOLTZ_SERVER_URL.trim() !== '') {
+                        this.common.nodes[idx].boltz_server_url = process?.env?.BOLTZ_SERVER_URL.endsWith('/v1') ? process?.env?.BOLTZ_SERVER_URL.slice(0, -3) : process?.env?.BOLTZ_SERVER_URL;
+                        this.common.nodes[idx].boltz_macaroon_path = process?.env?.BOLTZ_MACAROON_PATH;
                     }
                     else if (node.Settings.boltzServerUrl && node.Settings.boltzServerUrl.trim() !== '') {
                         this.common.nodes[idx].boltz_server_url = node.Settings.boltzServerUrl.endsWith('/v1') ? node.Settings.boltzServerUrl.slice(0, -3) : node.Settings.boltzServerUrl;
@@ -242,10 +264,10 @@ export class ConfigService {
                         this.common.nodes[idx].boltz_server_url = '';
                         this.common.nodes[idx].boltz_macaroon_path = '';
                     }
-                    this.common.nodes[idx].enable_offers = process.env.ENABLE_OFFERS ? process.env.ENABLE_OFFERS : (node.Settings.enableOffers) ? node.Settings.enableOffers : false;
-                    this.common.nodes[idx].enable_peerswap = process.env.ENABLE_PEERSWAP ? process.env.ENABLE_PEERSWAP : (node.Settings.enablePeerswap) ? node.Settings.enablePeerswap : false;
-                    this.common.nodes[idx].bitcoind_config_path = process.env.BITCOIND_CONFIG_PATH ? process.env.BITCOIND_CONFIG_PATH : (node.Settings.bitcoindConfigPath) ? node.Settings.bitcoindConfigPath : '';
-                    this.common.nodes[idx].channel_backup_path = process.env.CHANNEL_BACKUP_PATH ? process.env.CHANNEL_BACKUP_PATH : (node.Settings.channelBackupPath) ? node.Settings.channelBackupPath : this.common.rtl_conf_file_path + sep + 'channels-backup' + sep + 'node-' + node.index;
+                    this.common.nodes[idx].enable_offers = process?.env?.ENABLE_OFFERS ? process?.env?.ENABLE_OFFERS : (node.Settings.enableOffers) ? node.Settings.enableOffers : false;
+                    this.common.nodes[idx].enable_peerswap = process?.env?.ENABLE_PEERSWAP ? process?.env?.ENABLE_PEERSWAP : (node.Settings.enablePeerswap) ? node.Settings.enablePeerswap : false;
+                    this.common.nodes[idx].bitcoind_config_path = process?.env?.BITCOIND_CONFIG_PATH ? process?.env?.BITCOIND_CONFIG_PATH : (node.Settings.bitcoindConfigPath) ? node.Settings.bitcoindConfigPath : '';
+                    this.common.nodes[idx].channel_backup_path = process?.env?.CHANNEL_BACKUP_PATH ? process?.env?.CHANNEL_BACKUP_PATH : (node.Settings.channelBackupPath) ? node.Settings.channelBackupPath : this.common.rtl_conf_file_path + sep + 'channels-backup' + sep + 'node-' + node.index;
                     try {
                         this.common.createDirectory(this.common.nodes[idx].channel_backup_path);
                         const exists = fs.existsSync(this.common.nodes[idx].channel_backup_path + sep + 'channel-all.bak');
@@ -270,14 +292,14 @@ export class ConfigService {
                     this.common.nodes[idx].log_file = this.common.rtl_conf_file_path + '/logs/RTL-Node-' + node.index + '.log';
                     this.logger.log({ selectedNode: this.common.initSelectedNode, level: 'INFO', fileName: 'Config', msg: 'Node Config: ' + JSON.stringify(this.common.nodes[idx]) });
                     const log_file = this.common.nodes[idx].log_file;
-                    if (fs.existsSync(log_file)) {
-                        fs.writeFile(log_file, '', () => { });
+                    if (fs.existsSync(log_file || '')) {
+                        fs.writeFile((log_file || ''), '', () => { });
                     }
                     else {
                         try {
-                            const directoryName = dirname(log_file);
+                            const directoryName = dirname(log_file || '');
                             this.common.createDirectory(directoryName);
-                            const createStream = fs.createWriteStream(log_file);
+                            const createStream = fs.createWriteStream(log_file || '');
                             createStream.end();
                         }
                         catch (err) {
@@ -292,14 +314,14 @@ export class ConfigService {
             }
         };
         this.setSSOParams = (config) => {
-            if (process.env.RTL_SSO) {
-                this.common.rtl_sso = +process.env.RTL_SSO;
+            if (process?.env?.RTL_SSO) {
+                this.common.rtl_sso = +process?.env?.RTL_SSO;
             }
             else if (config.SSO && config.SSO.rtlSSO) {
                 this.common.rtl_sso = config.SSO.rtlSSO;
             }
-            if (process.env.RTL_COOKIE_PATH) {
-                this.common.rtl_cookie_path = process.env.RTL_COOKIE_PATH;
+            if (process?.env?.RTL_COOKIE_PATH) {
+                this.common.rtl_cookie_path = process?.env?.RTL_COOKIE_PATH;
             }
             else if (config.SSO && config.SSO.rtlCookiePath) {
                 this.common.rtl_cookie_path = config.SSO.rtlCookiePath;
@@ -307,8 +329,8 @@ export class ConfigService {
             else {
                 this.common.rtl_cookie_path = '';
             }
-            if (process.env.LOGOUT_REDIRECT_LINK) {
-                this.common.logout_redirect_link = process.env.LOGOUT_REDIRECT_LINK;
+            if (process?.env?.LOGOUT_REDIRECT_LINK) {
+                this.common.logout_redirect_link = process?.env?.LOGOUT_REDIRECT_LINK;
             }
             else if (config.SSO && config.SSO.logoutRedirectLink) {
                 this.common.logout_redirect_link = config.SSO.logoutRedirectLink;
@@ -324,15 +346,15 @@ export class ConfigService {
         };
         this.setSelectedNode = (config) => {
             if (config.defaultNodeIndex) {
-                this.common.initSelectedNode = this.common.findNode(config.defaultNodeIndex);
+                this.common.initSelectedNode = this.common.findNode(config.defaultNodeIndex) || {};
             }
             else {
-                this.common.initSelectedNode = this.common.findNode(this.common.nodes[0].index);
+                this.common.initSelectedNode = this.common.findNode(this.common.nodes[0].index) || {};
             }
         };
         this.setServerConfiguration = () => {
             try {
-                this.common.rtl_conf_file_path = (process.env.RTL_CONFIG_PATH) ? process.env.RTL_CONFIG_PATH : join(this.directoryName, '../..');
+                this.common.rtl_conf_file_path = (process?.env?.RTL_CONFIG_PATH) ? process?.env?.RTL_CONFIG_PATH : join(this.directoryName, '../..');
                 const confFileFullPath = this.common.rtl_conf_file_path + sep + 'RTL-Config.json';
                 if (!fs.existsSync(confFileFullPath)) {
                     fs.writeFileSync(confFileFullPath, JSON.stringify(this.setDefaultConfig()));
@@ -347,6 +369,7 @@ export class ConfigService {
                 throw new Error(err);
             }
         };
+        this.setServerConfiguration();
     }
 }
 export const Config = new ConfigService();

backend/utils/database.js

@@ -1,16 +1,67 @@
 import * as fs from 'fs';
-import { join, dirname, sep } from 'path';
-import { fileURLToPath } from 'url';
+import { join, sep } from 'path';
 import { Common } from '../utils/common.js';
 import { Logger } from '../utils/logger.js';
-import { validateDocument, LNDCollection, ECLCollection, CLNCollection } from '../models/database.model.js';
+import { CollectionsEnum, validateDocument, LNDCollection, ECLCollection, CLNCollection, ECL_UPDATED_DB } from '../models/database.model.js';
 export class DatabaseService {
     constructor() {
         this.common = Common;
         this.logger = Logger;
-        this.dbDirectory = join(dirname(fileURLToPath(import.meta.url)), '..', '..', 'database');
+        this.dbDirectory = join(this.common.db_directory_path, 'database');
         this.nodeDatabase = {};
     }
+    migrateDatabase() {
+        this.common.nodes?.map((node) => {
+            if (node.ln_implementation === 'ECL') {
+                this.nodeDatabase[node.index] = { adapter: null, data: {} };
+                this.nodeDatabase[node.index].adapter = new DatabaseAdapter(this.dbDirectory, node);
+                this.fetchNodeData(node);
+                if (this.nodeDatabase[node.index].data.PageSettings) {
+                    try {
+                        const currPageSettings = JSON.parse(JSON.stringify(this.nodeDatabase[node.index].data.PageSettings));
+                        ECL_UPDATED_DB.forEach((updatePage) => {
+                            const foundPageDB = this.nodeDatabase[node.index].data.PageSettings.find((currPage) => currPage.pageId === updatePage.pageId);
+                            if (foundPageDB) {
+                                updatePage.tables.forEach((updateTable) => {
+                                    const foundTableDB = foundPageDB.tables.find((currTable) => currTable.tableId === updateTable.tableId);
+                                    if (foundTableDB) {
+                                        updateTable.removed.forEach((colToBeRemoved) => {
+                                            const foundIndex = foundTableDB.columnSelection.findIndex((col) => col === colToBeRemoved);
+                                            const foundIndexSM = foundTableDB.columnSelectionSM.findIndex((col) => col === colToBeRemoved);
+                                            if (foundIndex >= 0) {
+                                                foundTableDB.columnSelection?.splice(foundIndex, 1);
+                                            }
+                                            if (foundIndexSM >= 0) {
+                                                foundTableDB.columnSelectionSM?.splice(foundIndexSM, 1);
+                                            }
+                                        });
+                                        updateTable.renamed.forEach((colToBeRenamed) => {
+                                            const [oldName, newName] = colToBeRenamed.split(':');
+                                            const foundIndex = foundTableDB.columnSelection.findIndex((col) => col === oldName);
+                                            const foundIndexSM = foundTableDB.columnSelectionSM.findIndex((col) => col === oldName);
+                                            if (foundIndex >= 0) {
+                                                foundTableDB.columnSelection?.splice(foundIndex, 1, newName);
+                                            }
+                                            if (foundIndexSM >= 0) {
+                                                foundTableDB.columnSelectionSM?.splice(foundIndexSM, 1, newName);
+                                            }
+                                        });
+                                    }
+                                });
+                            }
+                        });
+                        if (currPageSettings !== this.nodeDatabase[node.index].data.PageSettings) {
+                            this.saveDatabase(node, CollectionsEnum.PAGE_SETTINGS);
+                        }
+                    }
+                    catch (err) {
+                        this.logger.log({ selectedNode: node, level: 'ERROR', fileName: 'Database', msg: 'Database Migration Error', error: err });
+                    }
+                }
+            }
+            return true;
+        });
+    }
     loadDatabase(session) {
         const { id, selectedNode } = session;
         try {
@@ -210,7 +261,7 @@ export class DatabaseAdapter {
         try {
             this.common.createDirectory(this.dbFilePath);
             const oldOffers = JSON.parse(fs.readFileSync(oldFilePath, 'utf-8'));
-            fs.writeFileSync(oldFilePath, JSON.stringify(oldOffers.Offers, null, 2));
+            fs.writeFileSync(oldFilePath, JSON.stringify(oldOffers.Offers ? oldOffers.Offers : [], null, 2));
             fs.renameSync(oldFilePath, newFilePath);
         }
         catch (err) {

backend/utils/webSocketServer.js

@@ -31,7 +31,6 @@ export class RTLWebSocketServer {
             this.logger.log({ selectedNode: this.common.initSelectedNode, level: 'INFO', fileName: 'WebSocketServer', msg: 'Connecting Websocket Server..' });
             this.webSocketServer = new WebSocketServer({ noServer: true, path: this.common.baseHref + '/api/ws', verifyClient: (process.env.NODE_ENV === 'development') ? null : verifyWSUser });
             httpServer.on('upgrade', (request, socket, head) => {
-                var _a;
                 if (request.headers['upgrade'] !== 'websocket') {
                     socket.end('HTTP/1.1 400 Bad Request');
                     return;
@@ -39,7 +38,7 @@ export class RTLWebSocketServer {
                 const acceptKey = request.headers['sec-websocket-key'];
                 const hash = this.generateAcceptValue(acceptKey);
                 const responseHeaders = ['HTTP/1.1 101 Web Socket Protocol Handshake', 'Upgrade: WebSocket', 'Connection: Upgrade', 'Sec-WebSocket-Accept: ' + hash];
-                const protocols = !request.headers['sec-websocket-protocol'] ? [] : (_a = request.headers['sec-websocket-protocol'].split(',')) === null || _a === void 0 ? void 0 : _a.map((s) => s.trim());
+                const protocols = !request.headers['sec-websocket-protocol'] ? [] : request.headers['sec-websocket-protocol'].split(',')?.map((s) => s.trim());
                 if (protocols.includes('json')) {
                     responseHeaders.push('Sec-WebSocket-Protocol: json');
                 }
@@ -53,8 +52,7 @@ export class RTLWebSocketServer {
             this.webSocketServer.emit('connection', websocket, request);
         };
         this.mountEventsOnConnection = (websocket, request) => {
-            var _a;
-            const protocols = !request.headers['sec-websocket-protocol'] ? [] : (_a = request.headers['sec-websocket-protocol'].split(',')) === null || _a === void 0 ? void 0 : _a.map((s) => s.trim());
+            const protocols = !request.headers['sec-websocket-protocol'] ? [] : request.headers['sec-websocket-protocol'].split(',')?.map((s) => s.trim());
             const cookies = request.headers.cookie ? parse(request.headers.cookie) : null;
             websocket.clientId = Date.now();
             websocket.isAlive = true;
@@ -165,7 +163,7 @@ export class RTLWebSocketServer {
             try {
                 this.webSocketServer.clients.forEach((client) => {
                     if (+client.clientNodeIndex === +selectedNode.index) {
-                        this.logger.log({ selectedNode: !selectedNode ? this.common.initSelectedNode : selectedNode, level: 'DEBUG', fileName: 'WebSocketServer', msg: 'Broadcasting message to client...: ' + client.clientId });
+                        this.logger.log({ selectedNode: !selectedNode ? this.common.initSelectedNode : selectedNode, level: 'DEBUG', fileName: 'WebSocketServer', msg: 'Broadcasting message to client...: ' + client.clientId + ', Message: ' + newMessage });
                         client.send(newMessage);
                     }
                 });

dockerfiles/Dockerfile

@@ -1,7 +1,7 @@
 # ---------------
 # Install Dependencies
 # ---------------
-FROM node:16-alpine as builder
+FROM node:18-alpine as builder
 
 WORKDIR /RTL
 
@@ -27,7 +27,7 @@ RUN npm prune --production
 # ---------------
 # Release App
 # ---------------
-FROM node:16-alpine as runner
+FROM node:18-alpine as runner
 
 WORKDIR /RTL
 

dockerfiles/Dockerfile.arm32v7

@@ -1,7 +1,7 @@
 # ---------------
 # Install Dependencies
 # ---------------
-FROM node:16-stretch-slim as builder
+FROM node:18-alpine as builder
 
 ADD https://github.com/krallin/tini/releases/download/v0.19.0/tini-static-armel /tini
 ADD https://github.com/krallin/tini/releases/download/v0.19.0/tini-static-armel.asc /tini.asc
@@ -31,7 +31,7 @@ RUN npm prune --production
 # ---------------
 # Release App
 # ---------------
-FROM arm32v7/node:16-stretch-slim as runner
+FROM arm32v7/node:18-alpine as runner
 
 WORKDIR /RTL
 

dockerfiles/Dockerfile.arm64v8

@@ -1,7 +1,7 @@
 # ---------------
 # Install Dependencies
 # ---------------
-FROM node:16-stretch-slim as builder
+FROM node:18-alpine as builder
 
 ADD https://github.com/krallin/tini/releases/download/v0.19.0/tini-static-arm64 /tini
 RUN chmod +x /tini
@@ -30,7 +30,7 @@ RUN npm prune --production
 # ---------------
 # Release App
 # ---------------
-FROM arm64v8/node:16-stretch-slim as runner
+FROM arm64v8/node:18-alpine as runner
 
 WORKDIR /RTL