Browse Source

Merge pull request #173 from SuperNETorg/bin-exec-fix

Bin exec fix
all-modes
pbca26 7 years ago
committed by GitHub
parent
commit
cc243b2ab7
  1. BIN
      assets/icons/agama_app_icon.icns
  2. BIN
      assets/icons/agama_app_icon.ico
  3. BIN
      assets/icons/agama_icons/128x128.png
  4. BIN
      assets/icons/agama_icons/16x16.png
  5. BIN
      assets/icons/agama_icons/24x24.png
  6. BIN
      assets/icons/agama_icons/256x256.png
  7. BIN
      assets/icons/agama_icons/32x32.png
  8. BIN
      assets/icons/agama_icons/48x48.png
  9. BIN
      assets/icons/agama_icons/64x64.png
  10. BIN
      assets/icons/agama_icons/96x96.png
  11. BIN
      assets/icons/agama_icons/agama_app_icon.icns
  12. BIN
      assets/icons/agama_icons/agama_app_icon.ico
  13. BIN
      assets/icons/iguana_app_icon.icns
  14. BIN
      assets/icons/iguana_app_icon.ico
  15. BIN
      assets/icons/iguana_app_icon_png/128x128.png
  16. BIN
      assets/icons/iguana_app_icon_png/16x16.png
  17. BIN
      assets/icons/iguana_app_icon_png/24x24.png
  18. BIN
      assets/icons/iguana_app_icon_png/256x256.png
  19. BIN
      assets/icons/iguana_app_icon_png/32x32.png
  20. BIN
      assets/icons/iguana_app_icon_png/48x48.png
  21. BIN
      assets/icons/iguana_app_icon_png/512x512.png
  22. BIN
      assets/icons/iguana_app_icon_png/64x64.png
  23. BIN
      assets/icons/iguana_app_icon_png/96x96.png
  24. BIN
      assets/icons/komodo.icns
  25. BIN
      assets/icons/komodo.ico
  26. BIN
      assets/icons/komodo_png/128x128.png
  27. BIN
      assets/icons/komodo_png/16x16.png
  28. BIN
      assets/icons/komodo_png/24x24.png
  29. BIN
      assets/icons/komodo_png/256x256.png
  30. BIN
      assets/icons/komodo_png/32x32.png
  31. BIN
      assets/icons/komodo_png/48x48.png
  32. BIN
      assets/icons/komodo_png/512x512.png
  33. BIN
      assets/icons/komodo_png/64x64.png
  34. BIN
      assets/icons/komodo_png/96x96.png
  35. 5
      gui/startup/index.html
  36. 4
      main.js
  37. 129
      routes/shepherd.js

BIN
assets/icons/agama_app_icon.icns

Binary file not shown.

BIN
assets/icons/agama_app_icon.ico

Binary file not shown.

After

Width:  |  Height:  |  Size: 103 KiB

BIN
assets/icons/agama_icons/128x128.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

BIN
assets/icons/agama_icons/16x16.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 693 B

After

Width:  |  Height:  |  Size: 741 B

BIN
assets/icons/agama_icons/24x24.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
assets/icons/agama_icons/256x256.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
assets/icons/agama_icons/32x32.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
assets/icons/agama_icons/48x48.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
assets/icons/agama_icons/64x64.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
assets/icons/agama_icons/96x96.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

BIN
assets/icons/agama_icons/agama_app_icon.icns

Binary file not shown.

BIN
assets/icons/agama_icons/agama_app_icon.ico

Binary file not shown.

Before

Width:  |  Height:  |  Size: 361 KiB

After

Width:  |  Height:  |  Size: 103 KiB

BIN
assets/icons/iguana_app_icon.icns

Binary file not shown.

BIN
assets/icons/iguana_app_icon.ico

Binary file not shown.

Before

Width:  |  Height:  |  Size: 361 KiB

BIN
assets/icons/iguana_app_icon_png/128x128.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

BIN
assets/icons/iguana_app_icon_png/16x16.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 389 B

BIN
assets/icons/iguana_app_icon_png/24x24.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 579 B

BIN
assets/icons/iguana_app_icon_png/256x256.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.6 KiB

BIN
assets/icons/iguana_app_icon_png/32x32.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 803 B

BIN
assets/icons/iguana_app_icon_png/48x48.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
assets/icons/iguana_app_icon_png/512x512.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

BIN
assets/icons/iguana_app_icon_png/64x64.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

BIN
assets/icons/iguana_app_icon_png/96x96.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

BIN
assets/icons/komodo.icns

Binary file not shown.

BIN
assets/icons/komodo.ico

Binary file not shown.

Before

Width:  |  Height:  |  Size: 361 KiB

BIN
assets/icons/komodo_png/128x128.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.9 KiB

BIN
assets/icons/komodo_png/16x16.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 724 B

BIN
assets/icons/komodo_png/24x24.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
assets/icons/komodo_png/256x256.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
assets/icons/komodo_png/32x32.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

BIN
assets/icons/komodo_png/48x48.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

BIN
assets/icons/komodo_png/512x512.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 KiB

BIN
assets/icons/komodo_png/64x64.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

BIN
assets/icons/komodo_png/96x96.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

5
gui/startup/index.html

@ -13,7 +13,7 @@
<script type="text/javascript" src="../EasyDEX-GUI/assets/mainWindow/js/jRoll.min.js"></script> <script type="text/javascript" src="../EasyDEX-GUI/assets/mainWindow/js/jRoll.min.js"></script>
<script>if (window.module) module = window.module;</script> <script>if (window.module) module = window.module;</script>
</head> </head>
<body class="agamaMode"> <body class="agamaMode loading-window">
<div class="text-center"> <div class="text-center">
<div id="agamaMode"> <div id="agamaMode">
<div <div
@ -47,6 +47,9 @@
<li onClick="closeMainWindow(null, true)"> <li onClick="closeMainWindow(null, true)">
<a>Custom</a> <a>Custom</a>
</li> </li>
<li onClick="startKMDPassive()">
<a>KMD (passive)</a>
</li>
</ul> </ul>
<button <button
id="normalStartBtn" id="normalStartBtn"

4
main.js

@ -148,7 +148,7 @@ if (os.platform() === 'linux') {
iguanaIcon = path.join(__dirname, '/assets/icons/agama_icons/128x128.png'); iguanaIcon = path.join(__dirname, '/assets/icons/agama_icons/128x128.png');
} }
if (os.platform() === 'win32') { if (os.platform() === 'win32') {
iguanaIcon = path.join(__dirname, '/assets/icons/agama_icons/agama_app_icon.ico'); iguanaIcon = path.join(__dirname, '/assets/icons/agama_app_icon.ico');
} }
function createLoadingWindow() { function createLoadingWindow() {
@ -158,7 +158,7 @@ function createLoadingWindow() {
try { try {
loadingWindow = new BrowserWindow({ loadingWindow = new BrowserWindow({
width: 500, width: 500,
height: 335, height: 355,
frame: false, frame: false,
icon: iguanaIcon, icon: iguanaIcon,
show: false, show: false,

129
routes/shepherd.js

@ -98,14 +98,15 @@ shepherd.defaultAppConfig = Object.assign({}, shepherd.appConfig);
shepherd.coindInstanceRegistry = coindInstanceRegistry; shepherd.coindInstanceRegistry = coindInstanceRegistry;
shepherd.startKMDNative = function(selection) { shepherd.startKMDNative = function(selection, isManual) {
if (selection === 'KMD') { if (selection === 'KMD') {
const herdData = { const herdData = {
'ac_name': 'komodod', 'ac_name': 'komodod',
'ac_options': [ 'ac_options': [
'-daemon=0', '-daemon=0',
'-addnode=78.47.196.146', '-addnode=78.47.196.146',
] ],
'manualStart': isManual,
}; };
const options = { const options = {
@ -2312,48 +2313,59 @@ shepherd.post('/herd', function(req, res) {
console.log('======= req.body ======='); console.log('======= req.body =======');
console.log(req.body); console.log(req.body);
function testCoindPort() { if (!req.body.options.manualStart) {
if (!lockDownAddCoin) { function testCoindPort() {
const _port = assetChainPorts[req.body.options.ac_name]; if (!lockDownAddCoin) {
const _port = assetChainPorts[req.body.options.ac_name];
portscanner.checkPortStatus(_port, '127.0.0.1', function(error, status) { portscanner.checkPortStatus(_port, '127.0.0.1', function(error, status) {
// Status is 'open' if currently in use or 'closed' if available // Status is 'open' if currently in use or 'closed' if available
if (status === 'open') { if (status === 'open') {
console.log(`komodod service start error at port ${_port}, reason: port is closed`); console.log(`komodod service start error at port ${_port}, reason: port is closed`);
shepherd.writeLog(`komodod service start error at port ${_port}, reason: port is closed`); shepherd.writeLog(`komodod service start error at port ${_port}, reason: port is closed`);
cache.io.emit('service', { cache.io.emit('service', {
komodod: { komodod: {
error: `error starting ${req.body.herd} ${req.body.options.ac_name} daemon. Port ${_port} is already taken!`, error: `error starting ${req.body.herd} ${req.body.options.ac_name} daemon. Port ${_port} is already taken!`,
}, },
}); });
const obj = { const obj = {
msg: 'error', msg: 'error',
result: `error starting ${req.body.herd} ${req.body.options.ac_name} daemon. Port ${_port} is already taken!`, result: `error starting ${req.body.herd} ${req.body.options.ac_name} daemon. Port ${_port} is already taken!`,
}; };
res.status(500); res.status(500);
res.end(JSON.stringify(obj)); res.end(JSON.stringify(obj));
} else { } else {
herder(req.body.herd, req.body.options); herder(req.body.herd, req.body.options);
const obj = { const obj = {
msg: 'success', msg: 'success',
result: 'result', result: 'result',
}; };
res.end(JSON.stringify(obj)); res.end(JSON.stringify(obj));
} }
}); });
}
} }
}
if (req.body.herd === 'komodod') { if (req.body.herd === 'komodod') {
// check if komodod instance is already running // check if komodod instance is already running
testCoindPort();
setTimeout(function() {
testCoindPort(); testCoindPort();
}, 10000); setTimeout(function() {
testCoindPort();
}, 10000);
} else {
herder(req.body.herd, req.body.options);
const obj = {
msg: 'success',
result: 'result',
};
res.end(JSON.stringify(obj));
}
} else { } else {
herder(req.body.herd, req.body.options); herder(req.body.herd, req.body.options);
@ -2790,28 +2802,33 @@ function herder(flock, data) {
console.log(`daemon param ${data.ac_custom_param}`); console.log(`daemon param ${data.ac_custom_param}`);
coindInstanceRegistry[data.ac_name] = true; coindInstanceRegistry[data.ac_name] = true;
let _arg = `${coindACParam}${data.ac_options.join(' ')}${_customParam}`; if (!data.manualStart) {
_arg = _arg.trim().split(' '); let _arg = `${coindACParam}${data.ac_options.join(' ')}${_customParam}`;
execFile(`${komododBin}`, _arg, { _arg = _arg.trim().split(' ');
maxBuffer: 1024 * 10000 // 10 mb execFile(`${komododBin}`, _arg, {
}, function(error, stdout, stderr) { maxBuffer: 1024 * 500000 // 500 mb
shepherd.writeLog(`stdout: ${stdout}`); }, function(error, stdout, stderr) {
shepherd.writeLog(`stderr: ${stderr}`); shepherd.writeLog(`stdout: ${stdout}`);
shepherd.writeLog(`stderr: ${stderr}`);
if (error !== null) {
console.log(`exec error: ${error}`); if (error !== null) {
shepherd.writeLog(`exec error: ${error}`); console.log(`exec error: ${error}`);
shepherd.writeLog(`exec error: ${error}`);
if (error.toString().indexOf('using -reindex') > -1) {
cache.io.emit('service', { if (error.toString().indexOf('using -reindex') > -1) {
komodod: { cache.io.emit('service', {
error: 'run -reindex', komodod: {
} error: 'run -reindex',
}); },
});
}
} }
} });
}); }
} else { } else {
if (data.manualStart) {
coindInstanceRegistry[data.ac_name] = true;
}
console.log(`port ${_port} (${data.ac_name}) is already in use`); console.log(`port ${_port} (${data.ac_name}) is already in use`);
shepherd.writeLog(`port ${_port} (${data.ac_name}) is already in use`); shepherd.writeLog(`port ${_port} (${data.ac_name}) is already in use`);
} }

Loading…
Cancel
Save