Browse Source

komodo osx binaries updated, testing coincli ipc

all-modes
Satinder Grewal 8 years ago
parent
commit
6f58502f41
  1. BIN
      assets/bin/osx/komodo-cli
  2. BIN
      assets/bin/osx/komodod
  3. 0
      assets/bin/osx/libgcc_s.1.dylib
  4. 0
      assets/bin/osx/libgomp.1.dylib
  5. 0
      assets/bin/osx/libstdc++.6.dylib
  6. 37
      main.js
  7. 30
      private/coincli.js
  8. 2
      routes/shepherd.js

BIN
assets/bin/osx/komodo-cli

Binary file not shown.

BIN
assets/bin/osx/komodod

Binary file not shown.

0
assets/bin/osx/libgcc_s.1.dylib

0
assets/bin/osx/libgomp.1.dylib

0
assets/bin/osx/libstdc++.6.dylib

37
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);

30
private/kmdcli.js → 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));
}
}

2
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 = {};

Loading…
Cancel
Save