diff --git a/gui/init.js b/gui/init.js index 84932e4..7008fa7 100644 --- a/gui/init.js +++ b/gui/init.js @@ -20,7 +20,7 @@ $(document).ready(function() { function startcheck() { portcheck = setInterval(function(){ - Iguana_activehandle().then(function(result){ + Iguana_activehandle(appConf).then(function(result){ console.log(result); if (result !== 'error') { @@ -31,7 +31,7 @@ $(document).ready(function() { } $('#loading_status_text').text('Connecting to Basilisk Network...'); - EDEX_DEXgetinfoAll(appConf.skipBasiliskNetworkCheck, appConf.minNotaries); + EDEX_DEXgetinfoAll(appConf.skipBasiliskNetworkCheck, appConf.minNotaries, appConf); } }) //var check = Iguana_activehandle(); diff --git a/gui/loading.js b/gui/loading.js index 96c571b..b30fc51 100644 --- a/gui/loading.js +++ b/gui/loading.js @@ -12,13 +12,13 @@ function IguanaAJAX(url, ajax_data, timeout) { }); } -function Iguana_activehandle(callback) { +function Iguana_activehandle(appConf) { return new Promise((resolve) => { var ajax_data = { 'agent': 'SuperNET', 'method': 'activehandle' }, - AjaxOutputData = IguanaAJAX('http://127.0.0.1:' + config.iguanaPort, ajax_data).done(function(data) { + AjaxOutputData = IguanaAJAX('http://127.0.0.1:' + appConf.iguanaCorePort, ajax_data).done(function(data) { //$('#loading_status_text').text('Retrieving active handle...'); //console.log(AjaxOutputData.responseText); AjaxOutputData = JSON.parse(AjaxOutputData.responseText) @@ -111,30 +111,7 @@ function GetAppConf(cb) { // get iguana app conf return data; } -function EDEX_DEXnotarychains() { - return new Promise((resolve) => { - var ajax_data = { - 'agent': 'dpow', - 'method': 'notarychains' - }, - AjaxOutputData = IguanaAJAX('http://127.0.0.1:' + config.iguanaPort, ajax_data).done(function(data) { - //console.log(AjaxOutputData.responseText); - AjaxOutputData = JSON.parse(AjaxOutputData.responseText); - //console.log(AjaxOutputData); - resolve(AjaxOutputData); - }) - .fail(function(xhr, textStatus, error) { - // handle request failures - console.log(xhr.statusText); - if ( xhr.readyState == 0 ) { - } - console.log(textStatus); - console.log(error); - }); - }); -} - -function EDEX_DEXgetinfoAll(skip, minNotaries) { +function EDEX_DEXgetinfoAll(skip, minNotaries, appConf) { const remote = require('electron').remote; var window = remote.getCurrentWindow(); @@ -146,7 +123,7 @@ function EDEX_DEXgetinfoAll(skip, minNotaries) { 'method': 'notarychains' }, tmp_index = 0, - get_dex_notarychains = IguanaAJAX('http://127.0.0.1:' + config.iguanaPort, ajax_data, 10000).done(function(data) { + get_dex_notarychains = IguanaAJAX('http://127.0.0.1:' + appConf.iguanaCorePort, ajax_data, 10000).done(function(data) { get_dex_notarychains = JSON.parse(get_dex_notarychains.responseText); if (minNotaries > get_dex_notarychains.length) { // if config value exceeds total num of notaries minNotaries = get_dex_notarychains.length; @@ -166,7 +143,7 @@ function EDEX_DEXgetinfoAll(skip, minNotaries) { console.log(ajax_data); if (coin_value !== 'MESH' || coin_value !== 'CEAL') { - var getinfo_each_chain = IguanaAJAX('http://127.0.0.1:' + config.iguanaPort, ajax_data).done(function(data) { + var getinfo_each_chain = IguanaAJAX('http://127.0.0.1:' + appConf.iguanaCorePort, ajax_data).done(function(data) { getinfo_each_chain = JSON.parse(getinfo_each_chain.responseText); console.log(getinfo_each_chain); diff --git a/main.js b/main.js index 84db492..e1d4560 100644 --- a/main.js +++ b/main.js @@ -357,7 +357,8 @@ function createWindow (status) { if (appConfig.edexGuiOnly) { if (appConfig.v2) { shepherd.writeLog('show edex gui'); - mainWindow.loadURL('http://' + appConfig.host + ':' + appConfig.iguanaAppPort + '/gui/EasyDEX-GUI/react/build'); + mainWindow.loadURL('http://127.0.0.1:3000'); + //mainWindow.loadURL('http://' + appConfig.host + ':' + appConfig.iguanaAppPort + '/gui/EasyDEX-GUI/react/build'); } else { shepherd.writeLog('show edex gui'); mainWindow.loadURL('http://' + appConfig.host + ':' + appConfig.iguanaAppPort + '/gui/EasyDEX-GUI/'); diff --git a/routes/cache.js b/routes/cache.js index e14ec22..406414c 100644 --- a/routes/cache.js +++ b/routes/cache.js @@ -290,11 +290,13 @@ cache.one = function(req, res, next) { if (!cacheCallInProgress) { cache.dumpCacheBeforeExit(); - let _data = fs.readFileSync(cache.iguanaDir + '/shepherd/cache-' + req.query.pubkey + '.json', 'utf8'); - if (_data) { - inMemCache = JSON.parse(_data); - _data = _data.replace('waiting', 'failed'); - cache.dumpCacheBeforeExit(); + if (fs.existsSync(cache.iguanaDir + '/shepherd/cache-' + req.query.pubkey + '.json')) { + let _data = fs.readFileSync(cache.iguanaDir + '/shepherd/cache-' + req.query.pubkey + '.json', 'utf8'); + if (_data) { + inMemCache = JSON.parse(_data); + _data = _data.replace('waiting', 'failed'); + cache.dumpCacheBeforeExit(); + } } // TODO: add check to allow only one cache call/sequence in progress diff --git a/routes/shepherd.js b/routes/shepherd.js index 5d77f25..aba6146 100644 --- a/routes/shepherd.js +++ b/routes/shepherd.js @@ -103,13 +103,13 @@ shepherd.writeLog = function(data) { const timeFormatted = new Date(Date.now()).toLocaleString().replace('AM', '').replace('PM', ''); if (fs.existsSync(logLocation + '/agamalog.txt')) { - fs.appendFile(logLocation + '/agamalog.txt', new Date(Date.now()).toLocaleString() + ' ' + data + '\r\n', function (err) { + fs.appendFile(logLocation + '/agamalog.txt', timeFormatted + ' ' + data + '\r\n', function (err) { if (err) { console.log('error writing log file'); } }); } else { - fs.writeFile(logLocation + '/agamalog.txt', new Date(Date.now()).toLocaleString() + ' ' + data + '\r\n', function (err) { + fs.writeFile(logLocation + '/agamalog.txt', timeFormatted + ' ' + data + '\r\n', function (err) { if (err) { console.log('error writing log file'); } @@ -203,7 +203,7 @@ shepherd.post('/appconf', function(req, res, next) { res.end(JSON.stringify(errorObj)); } else { - shepherd.saveLocalAppConf(JSON.parse(req.body.payload)); + shepherd.saveLocalAppConf(req.body.payload); const errorObj = { 'msg': 'success', @@ -537,7 +537,7 @@ shepherd.post('/forks', function(req, res, next) { iguanaInstanceRegistry[_port] = { 'mode': mode, 'coin': coin, - 'pid': apps[0].process.pid, + 'pid': apps[0].process && apps[0].process.pid, 'pmid': apps[0].pm2_env.pm_id }; cache.setVar('iguanaInstances', iguanaInstanceRegistry);