First and raw api support + mposcompatibility fixes/codereadability improvements
This commit is contained in:
parent
c7e61d681b
commit
1c6f7c4f50
|
@ -0,0 +1,18 @@
|
||||||
|
var express = require('express');
|
||||||
|
var os = require('os');
|
||||||
|
var app = express();
|
||||||
|
|
||||||
|
app.get('/getstatus', function (req, res) {
|
||||||
|
res.send({
|
||||||
|
'loadavg': os.loadavg(),
|
||||||
|
'freemem': os.freemem(),
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
module.exports = {
|
||||||
|
start: function () {
|
||||||
|
app.listen(9000);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -63,9 +63,9 @@ module.exports = function(logger, poolConfigs){
|
||||||
|
|
||||||
var sendResult = function(authorized){
|
var sendResult = function(authorized){
|
||||||
cluster.workers[data.workerId].send({
|
cluster.workers[data.workerId].send({
|
||||||
type: 'mposAuth',
|
type : 'mposAuth',
|
||||||
callbackId: data.callbackId,
|
callbackId : data.callbackId,
|
||||||
authorized: authorized
|
authorized : authorized
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -74,16 +74,17 @@ module.exports = function(logger){
|
||||||
clearTimeout(authTimeout);
|
clearTimeout(authTimeout);
|
||||||
};
|
};
|
||||||
process.send({
|
process.send({
|
||||||
type: 'mposAuth',
|
type : 'mposAuth',
|
||||||
coin: poolOptions.coin.name,
|
coin : poolOptions.coin.name,
|
||||||
callbackId: callbackId,
|
callbackId : callbackId,
|
||||||
workerId: cluster.worker.id,
|
workerId : cluster.worker.id,
|
||||||
workerName: workerName,
|
workerName : workerName,
|
||||||
password: password,
|
password : password,
|
||||||
authLevel: mposAuthLevel
|
authLevel : mposAuthLevel
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
|
// if we're here than it means we're on stratumAuth: "none" or something unrecognized by the system!
|
||||||
callback({
|
callback({
|
||||||
error: null,
|
error: null,
|
||||||
authorized: true,
|
authorized: true,
|
||||||
|
@ -107,30 +108,30 @@ module.exports = function(logger){
|
||||||
|
|
||||||
logDebug(logIdentify, 'client', 'Valid share submitted, share data: ' + shareData);
|
logDebug(logIdentify, 'client', 'Valid share submitted, share data: ' + shareData);
|
||||||
process.send({
|
process.send({
|
||||||
type: 'share',
|
type : 'share',
|
||||||
share: data,
|
share : data,
|
||||||
coin: poolOptions.coin.name,
|
coin : poolOptions.coin.name,
|
||||||
isValidShare: isValidShare,
|
isValidShare : isValidShare,
|
||||||
isValidBlock: isValidBlock,
|
isValidBlock : isValidBlock,
|
||||||
solution: blockHex
|
solution : blockHex // blockHex is undefined is this was not a valid block.
|
||||||
});
|
});
|
||||||
|
|
||||||
if (isValidBlock){
|
if (isValidBlock){
|
||||||
logDebug(logIdentify, 'client', 'Block found, solution: ' + shareData.solution);
|
logDebug(logIdentify, 'client', 'Block found, solution: ' + shareData.solution);
|
||||||
process.send({
|
process.send({
|
||||||
type: 'block',
|
type : 'block',
|
||||||
share: data,
|
share : data,
|
||||||
coin: poolOptions.coin.name
|
coin : poolOptions.coin.name
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
}).on('difficultyUpdate', function(workerName, diff){
|
}).on('difficultyUpdate', function(workerName, diff){
|
||||||
if (poolOptions.shareProcessing.mpos.enabled){
|
if (poolOptions.shareProcessing.mpos.enabled){
|
||||||
process.send({
|
process.send({
|
||||||
type: 'difficultyUpdate',
|
type : 'difficultyUpdate',
|
||||||
workerName: workerName,
|
workerName : workerName,
|
||||||
diff: diff,
|
diff : diff,
|
||||||
coin: poolOptions.coin.name
|
coin : poolOptions.coin.name
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}).on('log', function(severity, logKey, logText) {
|
}).on('log', function(severity, logKey, logText) {
|
||||||
|
|
|
@ -0,0 +1,56 @@
|
||||||
|
var express = require('express');
|
||||||
|
var os = require('os');
|
||||||
|
|
||||||
|
|
||||||
|
function workerapi(listen) {
|
||||||
|
var _this = this;
|
||||||
|
var app = express();
|
||||||
|
var counters = {
|
||||||
|
validShares : 0,
|
||||||
|
validBlocks : 0,
|
||||||
|
invalidShares : 0
|
||||||
|
};
|
||||||
|
|
||||||
|
var lastEvents = {
|
||||||
|
lastValidShare : 0 ,
|
||||||
|
lastValidBlock : 0,
|
||||||
|
lastInvalidShare : 0
|
||||||
|
};
|
||||||
|
|
||||||
|
app.get('/stats', function (req, res) {
|
||||||
|
res.send({
|
||||||
|
"clients" : Object.keys(_this.poolObj.stratumServer.getStratumClients()).length,
|
||||||
|
"counters" : counters,
|
||||||
|
"lastEvents" : lastEvents
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
this.start = function (poolObj) {
|
||||||
|
this.poolObj = poolObj;
|
||||||
|
this.poolObj.once('started', function () {
|
||||||
|
app.listen(listen, function (lol) {
|
||||||
|
console.log("LISTENING ");
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.on('share', function(isValidShare, isValidBlock, shareData) {
|
||||||
|
var now = Date.now();
|
||||||
|
if (isValidShare) {
|
||||||
|
counters.validShares ++;
|
||||||
|
lastEvents.lastValidShare = now;
|
||||||
|
if (isValidBlock) {
|
||||||
|
counters.validBlocks ++;
|
||||||
|
lastEvents.lastValidBlock = now;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
counters.invalidShares ++;
|
||||||
|
lastEvents.lastInvalidShare = now;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
module.exports = workerapi;
|
||||||
|
|
Loading…
Reference in New Issue