From 933e69e9ac676fb14d5ed06baaca243a5a12c55a Mon Sep 17 00:00:00 2001 From: satindergrewal Date: Sat, 25 Nov 2017 03:11:02 +1300 Subject: [PATCH] IPC zeroconf deposit/claims log file creator and reader --- gui/js/simpledexactions.js | 4 +- ipc/shepherd-ipc.js | 128 +++++++++++++++++++++++++++++++++++++ 2 files changed, 129 insertions(+), 3 deletions(-) diff --git a/gui/js/simpledexactions.js b/gui/js/simpledexactions.js index 86184a3..5073a23 100644 --- a/gui/js/simpledexactions.js +++ b/gui/js/simpledexactions.js @@ -1077,9 +1077,7 @@ function enable_disable_coin(enable_disable_coin_data) { if (!enable_native_coin_output_data.error === false) { //console.log(enable_native_coin_output_data.error); - if (enable_native_coin_output_data.error == 'coin cant be activated till synced') { //{error: "couldnt find coin locally installed", coin: "BTC"} - toastr.info("Coin can't be acviated till synced.
Try in a moment.",'Coin Status'); - } + toastr.info(enable_native_coin_output_data.error,'Coin Status'); if (enable_native_coin_output_data.error == 'couldnt find coin locally installed') { //{error: "couldnt find coin locally installed", coin: "BTC"} bootbox.alert({ onEscape: true, diff --git a/ipc/shepherd-ipc.js b/ipc/shepherd-ipc.js index 8ae7f20..6404d88 100644 --- a/ipc/shepherd-ipc.js +++ b/ipc/shepherd-ipc.js @@ -48,6 +48,45 @@ if (os.platform() === 'win32') { defaultCoinsListFile = path.join(__dirname, '../assets/coins.json'); +//Make empty zeroconf log files if not there +fs.ensureFile(`${BarterDEXDir}/ZeroConf_Deposit_logFile.log`) + .then(() => { + console.log('success!') + fs.readJson(`${BarterDEXDir}/ZeroConf_Deposit_logFile.log`, (err, zconf_deposit_log) => { + if (err) console.error(err) + var isitjson = typeof zconf_deposit_log == 'object'; + if (isitjson == false){ + fs.appendFile(`${BarterDEXDir}/ZeroConf_Deposit_logFile.log`, `[]`, function (err) { + if (err) throw err; + console.log('ZeroConf deposit log updated!'); + }); + } + }) + }) + .catch(err => { + console.error(err); + }) + +fs.ensureFile(`${BarterDEXDir}/ZeroConf_Claim_logFile.log`) +.then(() => { + console.log('success!') + fs.readJson(`${BarterDEXDir}/ZeroConf_Claim_logFile.log`, (err, zconf_claim_log) => { + if (err) console.error(err) + var isitjson = typeof zconf_claim_log == 'object'; + if (isitjson == false){ + fs.appendFile(`${BarterDEXDir}/ZeroConf_Claim_logFile.log`, `[]`, function (err) { + if (err) throw err; + console.log('ZeroConf claim log updated!'); + }); + } + }) +}) +.catch(err => { + console.error(err); +}) + + + const {ipcMain} = require('electron'); /*ipcMain.on('shepherd-commandSync', (event, arg) => { console.log(arg.command) // prints "ping" @@ -80,6 +119,32 @@ ipcMain.on('shepherd-command', (event, arg) => { event.returnValue = status; }) break; + case 'update_zeroconf_log': + //console.log(arg.data); + UpdateZeroConfLogs(arg.data); + event.returnValue = 'Zeroconf log updated'; + break; + case 'read_zeroconf_log': + //console.log(arg.data); + if (arg.type == 'deposit') { + fs.readJson(`${BarterDEXDir}/ZeroConf_Deposit_logFile.log`) + .then(zconf_deposit_log_file => { + event.returnValue = zconf_deposit_log_file; + }) + .catch(err => { + console.error(err) + }) + } + if (arg.type == 'claim') { + fs.readJson(`${BarterDEXDir}/ZeroConf_Claim_logFile.log`) + .then(zconf_claim_log_file => { + event.returnValue = zconf_claim_log_file; + }) + .catch(err => { + console.error(err) + }) + } + break; } }) @@ -217,3 +282,66 @@ ExecMarketMaker = function(data) { console.error(`child stderr:\n${data}`); }).pipe(logStream); } + +UpdateZeroConfLogs = function(zeroconf_log_data) { + //console.log(zeroconf_log_data); + if (zeroconf_log_data.type == 'deposit') { + fs.ensureFile(`${BarterDEXDir}/ZeroConf_Deposit_logFile.log`) + .then(() => { + console.log('success!') + fs.readJson(`${BarterDEXDir}/ZeroConf_Deposit_logFile.log`, (err, zconf_deposit_log) => { + if (err) console.error(err) + var isitjson = typeof zconf_deposit_log == 'object'; + if (isitjson == false){ + fs.appendFile(`${BarterDEXDir}/ZeroConf_Deposit_logFile.log`, `[`+zeroconf_log_data.logdata+`]`, function (err) { + if (err) throw err; + console.log('ZeroConf deposit log updated!'); + }); + } else { + console.log(zconf_deposit_log); + + zconf_deposit_log.push(JSON.parse(zeroconf_log_data.logdata)); + console.log('===============') + console.log(zconf_deposit_log); + fs.writeJson(`${BarterDEXDir}/ZeroConf_Deposit_logFile.log`, zconf_deposit_log, function (err) { + if (err) throw err; + console.log('ZeroConf deposit log updated!'); + }); + } + }) + }) + .catch(err => { + console.error(err); + }) + } + + if (zeroconf_log_data.type == 'claim') { + fs.ensureFile(`${BarterDEXDir}/ZeroConf_Claim_logFile.log`) + .then(() => { + console.log('success!') + fs.readJson(`${BarterDEXDir}/ZeroConf_Claim_logFile.log`, (err, zconf_claim_log) => { + if (err) console.error(err) + var isitjson = typeof zconf_claim_log == 'object'; + if (isitjson == false){ + fs.appendFile(`${BarterDEXDir}/ZeroConf_Claim_logFile.log`, `[`+zeroconf_log_data.logdata+`]`, function (err) { + if (err) throw err; + console.log('ZeroConf claim log updated!'); + }); + } else { + console.log(zconf_claim_log); + + zconf_claim_log.push(JSON.parse(zeroconf_log_data.logdata)); + console.log('===============') + console.log(zconf_claim_log); + fs.writeJson(`${BarterDEXDir}/ZeroConf_Claim_logFile.log`, zconf_claim_log, function (err) { + if (err) throw err; + console.log('ZeroConf claim log updated!'); + }); + } + }) + }) + .catch(err => { + console.error(err); + }) + } +}