From 81699ede37da2768d3ca2d9dd0462a7aad4f382b Mon Sep 17 00:00:00 2001 From: ShahanaFarooqui Date: Sun, 28 Jul 2019 14:00:15 -0400 Subject: [PATCH] default backup path fix default backup path fix --- connect.js | 17 +++++++++-------- controllers/RTLConf.js | 4 +++- controllers/channelsBackup.js | 8 ++++---- package.json | 2 +- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/connect.js b/connect.js index 3f243fd8..08a4ba7f 100644 --- a/connect.js +++ b/connect.js @@ -12,6 +12,7 @@ var logger = require('./controllers/logger'); var connect = {}; var errMsg = ''; var request = require('request'); +common.path_separator = (platform === 'win32') ? '\\' : '/'; connect.setDefaultConfig = () => { var homeDir = os.userInfo().homedir; @@ -49,7 +50,7 @@ connect.setDefaultConfig = () => { menuType: 'Regular', theme: 'dark-blue', satsToBTC: false, - channelBackupPath: homeDir + '/backup/node-0', + channelBackupPath: homeDir + common.path_separator + 'backup' + common.path_separator + 'node-0', lndServerUrl: 'https://localhost:8080/v1', enableLogging: false, port: 3000 @@ -179,14 +180,14 @@ connect.validateSingleNodeConfig = (config) => { if(config.Settings.channelBackupPath !== '' && undefined !== config.Settings.channelBackupPath) { common.nodes[0].channel_backup_path = config.Settings.channelBackupPath; } else { - common.nodes[0].channel_backup_path = common.rtl_conf_file_path + '/backup'; + common.nodes[0].channel_backup_path = common.rtl_conf_file_path + common.path_separator + 'backup'; } try { connect.createDirectory(common.nodes[0].channel_backup_path); - let exists = fs.existsSync(common.nodes[0].channel_backup_path + '/channel-all.bak'); + let exists = fs.existsSync(common.nodes[0].channel_backup_path + common.path_separator + 'channel-all.bak'); if (!exists) { try { - var createStream = fs.createWriteStream(common.nodes[0].channel_backup_path + '/channel-all.bak'); + var createStream = fs.createWriteStream(common.nodes[0].channel_backup_path + common.path_separator + 'channel-all.bak'); createStream.end(); } catch (err) { console.error('Something went wrong while creating backup file: \n' + err); @@ -279,13 +280,13 @@ connect.validateMultiNodeConfig = (config) => { common.nodes[idx].lnd_config_path = (undefined !== node.Authentication.lndConfigPath) ? node.Authentication.lndConfigPath : ''; common.nodes[idx].bitcoind_config_path = (undefined !== node.Settings.bitcoindConfigPath) ? node.Settings.bitcoindConfigPath : ''; common.nodes[idx].enable_logging = (undefined !== node.Settings.enableLogging) ? node.Settings.enableLogging : false; - common.nodes[idx].channel_backup_path = (undefined !== node.Settings.channelBackupPath) ? node.Settings.channelBackupPath : common.rtl_conf_file_path + '/backup/node-' + node.index; + common.nodes[idx].channel_backup_path = (undefined !== node.Settings.channelBackupPath) ? node.Settings.channelBackupPath : common.rtl_conf_file_path + common.path_separator + 'backup' + common.path_separator + 'node-' + node.index; try { connect.createDirectory(common.nodes[idx].channel_backup_path); - let exists = fs.existsSync(common.nodes[idx].channel_backup_path + '/channel-all.bak'); + let exists = fs.existsSync(common.nodes[idx].channel_backup_path + common.path_separator + 'channel-all.bak'); if (!exists) { try { - var createStream = fs.createWriteStream(common.nodes[idx].channel_backup_path + '/channel-all.bak'); + var createStream = fs.createWriteStream(common.nodes[idx].channel_backup_path + common.path_separator + 'channel-all.bak'); createStream.end(); } catch (err) { console.error('Something went wrong while creating backup file: \n' + err); @@ -431,7 +432,7 @@ connect.logEnvVariables = () => { } connect.getAllNodeAllChannelBackup = (node) => { - let channel_backup_file = node.channel_backup_path + '/channel-all.bak'; + let channel_backup_file = node.channel_backup_path + common.path_separator + 'channel-all.bak'; let options = { url: node.lnd_server_url + '/channels/backup', rejectUnauthorized: false, diff --git a/controllers/RTLConf.js b/controllers/RTLConf.js index b1f1c4e9..d0673021 100644 --- a/controllers/RTLConf.js +++ b/controllers/RTLConf.js @@ -29,6 +29,7 @@ exports.getRTLConfig = (req, res, next) => { lndConfigPath: common.nodes[0].lnd_config_path, bitcoindConfigPath: common.nodes[0].bitcoind_config_path }; + jsonConfig.Settings.channelBackupPath = (undefined !== jsonConfig.Settings.channelBackupPath) ? jsonConfig.Settings.channelBackupPath : common.nodes[0].channel_backup_path; res.status(200).json({ selectedNodeIndex: common.selectedNode.index, sso: sso, nodes: [{ index: common.nodes[0].index, lnNode: 'SingleNode', @@ -56,7 +57,7 @@ exports.getRTLConfig = (req, res, next) => { const multiNodeConfig = JSON.parse(data); const sso = { rtlSSO: common.rtl_sso, logoutRedirectLink: common.logout_redirect_link }; var nodesArr = []; - multiNodeConfig.nodes.forEach(node => { + multiNodeConfig.nodes.forEach((node, i) => { const authentication = {}; authentication.nodeAuthType = 'CUSTOM'; if(node.Authentication.lndConfigPath) { @@ -65,6 +66,7 @@ exports.getRTLConfig = (req, res, next) => { if(node.Settings.bitcoindConfigPath) { authentication.bitcoindConfigPath = node.Settings.bitcoindConfigPath; } + node.Settings.channelBackupPath = (undefined !== node.Settings.channelBackupPath) ? node.Settings.channelBackupPath : common.nodes[i].channel_backup_path; nodesArr.push({ index: node.index, lnNode: node.lnNode, diff --git a/controllers/channelsBackup.js b/controllers/channelsBackup.js index 14f8d2ff..4cef16d6 100644 --- a/controllers/channelsBackup.js +++ b/controllers/channelsBackup.js @@ -9,11 +9,11 @@ exports.getBackup = (req, res, next) => { let channel_backup_file = ''; let message = ''; if (req.params.channelPoint === 'ALL') { - channel_backup_file = common.selectedNode.channel_backup_path + '\\channel-all.bak'; + channel_backup_file = common.selectedNode.channel_backup_path + common.path_separator + 'channel-all.bak'; message = 'All Channels Backup Successful at: ' + channel_backup_file + ' !'; options.url = common.getSelLNDServerUrl() + '/channels/backup'; } else { - channel_backup_file = common.selectedNode.channel_backup_path + '\\channel-' + req.params.channelPoint.replace(':', '-') + '.bak'; + channel_backup_file = common.selectedNode.channel_backup_path + common.path_separator + 'channel-' + req.params.channelPoint.replace(':', '-') + '.bak'; message = 'Channel Backup Successful at: ' + channel_backup_file + ' !'; let channelpoint = req.params.channelPoint.replace(':', '/'); options.url = common.getSelLNDServerUrl() + '/channels/backup/' + channelpoint; @@ -57,7 +57,7 @@ exports.postBackupVerify = (req, res, next) => { let verify_backup = ''; if (req.params.channelPoint === 'ALL') { message = 'All Channels Verify Successful!'; - channel_verify_file = common.selectedNode.channel_backup_path + '/channel-all.bak'; + channel_verify_file = common.selectedNode.channel_backup_path + common.path_separator + 'channel-all.bak'; let exists = fs.existsSync(channel_verify_file); if (exists) { verify_backup = fs.readFileSync(channel_verify_file, 'utf-8'); @@ -74,7 +74,7 @@ exports.postBackupVerify = (req, res, next) => { } } else { message = 'Channel ' + req.params.channelPoint + ' Verify Successful!'; - channel_verify_file = common.selectedNode.channel_backup_path + '/channel-' + req.params.channelPoint.replace(':', '-') + '.bak'; + channel_verify_file = common.selectedNode.channel_backup_path + common.path_separator + 'channel-' + req.params.channelPoint.replace(':', '-') + '.bak'; let exists = fs.existsSync(channel_verify_file); if (exists) { verify_backup = fs.readFileSync(channel_verify_file, 'utf-8'); diff --git a/package.json b/package.json index 1c77dc12..212c034a 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "scripts": { "ng": "ng", "start": "ng serve --base-href /rtl/ --open --aot", - "build": "ng build --prod --base-href /rtl/ --aot", + "build": "ng analytics off && ng build --prod --base-href /rtl/ --aot", "serve": "ng serve", "prebuild": "node ./prebuild", "test": "ng test",