Updated channels response columns and migrated pagesettings

Ride-The-Lightning · Sep 29, 2023 · 36e1d39 · 36e1d39
1 parent 168aa3b
commit 36e1d39
Show file tree

Hide file tree

Showing 21 changed files with 195 additions and 80 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -124,7 +124,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",

diff --git a/backend/controllers/eclair/channels.js b/backend/controllers/eclair/channels.js
@@ -16,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: ''
         });
@@ -159,7 +157,6 @@ export const closeChannel = (req, res, next) => {
         return res.status(err.statusCode).json({ message: err.message, error: err.error });
     });
 };
-// options.form = { sourceNodeId: req.params.source, targetNodeId: req.params.target, amountMsat: req.params.amount, ignoreNodeIds: req.params.ignore };
 export const circularRebalance = (req, res, next) => {
     const crInvDescription = 'Circular rebalancing invoice for ' + (req.body.amountMsat / 1000) + ' Sats';
     options = common.getOptions(req);

diff --git a/backend/models/database.model.js b/backend/models/database.model.js
@@ -137,3 +137,25 @@ export const CollectionFieldsEnum = { ...OfferFieldsEnum, ...PageSettingsFieldsE
 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']
+            }
+        ]
+    }
+];
diff --git a/backend/utils/app.js b/backend/utils/app.js
@@ -10,6 +10,7 @@ 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 { CLWSClient } from '../controllers/cln/webSocketClient.js';
@@ -24,6 +25,7 @@ export class ExpressApplication {
         this.eclWsClient = ECLWSClient;
         this.clWsClient = CLWSClient;
         this.lndWsClient = LNDWSClient;
+        this.databaseService = Database;
         this.directoryName = dirname(fileURLToPath(import.meta.url));
         this.getApp = () => this.app;
         this.setCORS = () => { CORS.mount(this.app); };
@@ -79,6 +81,7 @@ export class ExpressApplication {
         this.setCORS();
         this.setCSRF();
         this.setApplicationRoutes();
+        this.databaseService.migrateDatabase();
     }
 }
 export default ExpressApplication;
diff --git a/backend/utils/database.js b/backend/utils/database.js
@@ -2,14 +2,66 @@ import * as fs from 'fs';
 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(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 {

diff --git a/frontend/167.28293ff5a3323208.js b/frontend/167.28293ff5a3323208.js
diff --git a/frontend/167.dd2d5e68e84841c0.js b/frontend/167.dd2d5e68e84841c0.js
diff --git a/frontend/index.html b/frontend/index.html
@@ -13,6 +13,6 @@
   <style>html{width:100%;height:99%;line-height:1.5;overflow-x:hidden;font-family:Roboto,sans-serif!important;font-size:95%}@media only screen and (max-width: 56.25em){html{font-size:90%}}@media only screen and (max-width: 37.5em){html{font-size:80%}}body{box-sizing:border-box;height:100%;margin:0;overflow:hidden}*{margin:0;padding:0}@font-face{font-family:Roboto;src:url(Roboto-Thin.f7a95c9c5999532c.woff2) format("woff2"),url(Roboto-Thin.c13c157cb81e8ebb.woff) format("woff");font-weight:100;font-style:normal}@font-face{font-family:Roboto;src:url(Roboto-ThinItalic.b0e084abf689f393.woff2) format("woff2"),url(Roboto-ThinItalic.1111028df6cea564.woff) format("woff");font-weight:100;font-style:italic}@font-face{font-family:Roboto;src:url(Roboto-Light.0e01b6cd13b3857f.woff2) format("woff2"),url(Roboto-Light.603ca9a537b88428.woff) format("woff");font-weight:300;font-style:normal}@font-face{font-family:Roboto;src:url(Roboto-LightItalic.232ef4b20215f720.woff2) format("woff2"),url(Roboto-LightItalic.1b5e142f787151c8.woff) format("woff");font-weight:300;font-style:italic}@font-face{font-family:Roboto;src:url(Roboto-Regular.475ba9e4e2d63456.woff2) format("woff2"),url(Roboto-Regular.bcefbfee882bc1cb.woff) format("woff");font-weight:400;font-style:normal}@font-face{font-family:Roboto;src:url(Roboto-RegularItalic.e3a9ebdaac06bbc4.woff2) format("woff2"),url(Roboto-RegularItalic.0668fae6af0cf8c2.woff) format("woff");font-weight:400;font-style:italic}@font-face{font-family:Roboto;src:url(Roboto-Medium.457532032ceb0168.woff2) format("woff2"),url(Roboto-Medium.6e1ae5f0b324a0aa.woff) format("woff");font-weight:500;font-style:normal}@font-face{font-family:Roboto;src:url(Roboto-MediumItalic.872f7060602d55d2.woff2) format("woff2"),url(Roboto-MediumItalic.e06fb533801cbb08.woff) format("woff");font-weight:500;font-style:italic}@font-face{font-family:Roboto;src:url(Roboto-Bold.447291a88c067396.woff2) format("woff2"),url(Roboto-Bold.fc482e6133cf5e26.woff) format("woff");font-weight:700;font-style:normal}@font-face{font-family:Roboto;src:url(Roboto-BoldItalic.1b15168ef6fa4e16.woff2) format("woff2"),url(Roboto-BoldItalic.e26ba339b06f09f7.woff) format("woff");font-weight:700;font-style:italic}@font-face{font-family:Roboto;src:url(Roboto-Black.2eaa390d458c877d.woff2) format("woff2"),url(Roboto-Black.b25f67ad8583da68.woff) format("woff");font-weight:900;font-style:normal}@font-face{font-family:Roboto;src:url(Roboto-BlackItalic.7dc03ee444552bc5.woff2) format("woff2"),url(Roboto-BlackItalic.c8dc642467cb3099.woff) format("woff");font-weight:900;font-style:italic}</style><link rel="stylesheet" href="styles.a04c018645a5044a.css" media="print" onload="this.media='all'"><noscript><link rel="stylesheet" href="styles.a04c018645a5044a.css"></noscript></head>
   <body>
     <rtl-app></rtl-app>
-  <script src="runtime.3a45b77bd75b000d.js" type="module"></script><script src="polyfills.aa01d8f6b94657cb.js" type="module"></script><script src="main.fb42cd8eec8f581b.js" type="module"></script>
+  <script src="runtime.c2bb514ce598134b.js" type="module"></script><script src="polyfills.aa01d8f6b94657cb.js" type="module"></script><script src="main.8ef8f2009574bb18.js" type="module"></script>
 
 </body></html>
diff --git a/frontend/main.8ef8f2009574bb18.js b/frontend/main.8ef8f2009574bb18.js
diff --git a/frontend/main.fb42cd8eec8f581b.js b/frontend/main.fb42cd8eec8f581b.js
diff --git a/frontend/runtime.3a45b77bd75b000d.js → frontend/runtime.c2bb514ce598134b.js b/frontend/runtime.3a45b77bd75b000d.js → frontend/runtime.c2bb514ce598134b.js