diff --git a/assets/bin/osx/komodo-cli b/assets/bin/osx/komodo-cli index 1e9abec..2f8261d 100755 Binary files a/assets/bin/osx/komodo-cli and b/assets/bin/osx/komodo-cli differ diff --git a/assets/bin/osx/komodod b/assets/bin/osx/komodod index c81c257..8e0354e 100755 Binary files a/assets/bin/osx/komodod and b/assets/bin/osx/komodod differ diff --git a/assets/bin/osx/libgcc_s.1.dylib b/assets/bin/osx/libgcc_s.1.dylib old mode 100644 new mode 100755 diff --git a/assets/bin/osx/libgomp.1.dylib b/assets/bin/osx/libgomp.1.dylib old mode 100644 new mode 100755 diff --git a/assets/bin/osx/libstdc++.6.dylib b/assets/bin/osx/libstdc++.6.dylib old mode 100644 new mode 100755 diff --git a/main.js b/main.js index ef3113e..77ba748 100644 --- a/main.js +++ b/main.js @@ -21,7 +21,7 @@ var express = require('express'), pm2 = require('pm2'), cluster = require('cluster'), numCPUs = require('os').cpus().length, - kmdcli = require('./private/kmdcli.js'), + coincli = require('./private/coincli.js'), ipc = require('electron').ipcMain; Promise = require('bluebird'); @@ -240,14 +240,35 @@ function createLoadingWindow() { } }); -ipc.on('invokeAction', function(event, data){ - //console.log(data); - kmdcli.command(data, function(err, command) { - //console.log(command); - var result = command; - event.sender.send('kmdcliReply', result); + /* + * var ipc = require('electron').ipcRenderer; + * ipc.once('coincliReply', function(event, response){ + * console.log(response); + * }); + * ipc.send('InvokeAction', '{"cli":"kmd","command":"getinfo"}'); + */ + + ipc.on('InvokeAction', function(event, data){ + console.log(JSON.stringify(data)); + console.log(data.cli) + console.log(data.command) + + if (data.cli == 'kmd') { + coincli.kmdcommand(data.command, function(err, command) { + //console.log(command); + var result = command; + event.sender.send('coincliReply', result); + }); + } + if (data.cli == 'zec') { + coincli.zeccommand(data.command, function(err, command) { + //console.log(command); + var result = command; + event.sender.send('coincliReply', result); + }); + } }); -}); + //ca333 todo - add os detector to use correct binary - so we can use the same bundle on ALL OS platforms /*if (os.platform() === 'win32') { process.chdir(iguanaDir); diff --git a/private/kmdcli.js b/private/coincli.js similarity index 86% rename from private/kmdcli.js rename to private/coincli.js index ffc9572..327a06f 100644 --- a/private/kmdcli.js +++ b/private/coincli.js @@ -50,12 +50,13 @@ console.log(komodocliBin) * The **komodo-cli** command is used to get komodo api calls answer. * * @private - * @category kmdcli + * @category coincli * */ -var kmdcli = module.exports = { +var coincli = module.exports = { exec: child_process.exec, - command: command + kmdcommand: kmdcommand, + zeccommand: zeccommand }; /** @@ -63,11 +64,11 @@ var kmdcli = module.exports = { * * @private * @static - * @category kmdcli + * @category coincli * @param {function} callback The callback function. * */ -function parse_kmdcli_commands(callback) { +function parse_coincli_commands(callback) { return function(error, stdout, stderr) { if (error) callback(error, stderr); else callback(error, stdout); @@ -80,13 +81,13 @@ function parse_kmdcli_commands(callback) { * * @private * @static - * @category kmdcli + * @category coincli * @param {function} callback The callback function. * @example * - * var kmdcli = require('./kmdcli'); + * var coincli = require('./coincli'); * - * kmdcli.command('getinfo', function(err, command) { + * coincli.kmdcommand('getinfo', function(err, command) { * console.log(command); * }); * @@ -118,9 +119,18 @@ function parse_kmdcli_commands(callback) { * } * */ -function command(kmd_command, callback) { + + +function kmdcommand(kmd_command, callback) { if (callback) { return this.exec(komodocliBin + " " + kmd_command, - parse_kmdcli_commands(callback)); + parse_coincli_commands(callback)); + } +} + +function zeccommand(zec_command, callback) { + if (callback) { + return this.exec(zcashcliBin + " " + zec_command, + parse_coincli_commands(callback)); } } diff --git a/routes/shepherd.js b/routes/shepherd.js index f494ca9..eeef9cf 100644 --- a/routes/shepherd.js +++ b/routes/shepherd.js @@ -23,7 +23,7 @@ Promise = require('bluebird'); const fixPath = require('fix-path'); var ps = require('ps-node'), setconf = require('../private/setconf.js'), - kmdcli = require('../private/kmdcli.js'), + coincli = require('../private/coincli.js'), assetChainPorts = require('./ports.js') shepherd = express.Router(), iguanaInstanceRegistry = {};