RanchiMall/node-stratum-pool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #59 from LucasJones/master

Browse Source 
Fixed p2p system
This commit is contained in:
Matthew Little 2014-04-16 08:06:31 -06:00
commit c72d5e01ae
2 changed files with 79 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
lib/peer.js
View File

@ -8,13 +8,17 @@ var util = require('./util.js');
//Example of p2p in node from TheSeven: http://paste.pm/e54.js
var commandStringBuffer = function(s){
var buff = new Buffer(12);
var fixedLenStringBuffer = function(s, len) {
var buff = new Buffer(len);
buff.fill(0);
buff.write(s);
return buff;
};
var commandStringBuffer = function (s) {
return fixedLenStringBuffer(s, 12);
};
/* Reads a set amount of bytes from a flowing stream, argument descriptions:
- stream to read from, must have data emitter
- amount of bytes to read
@ -25,7 +29,7 @@ var readFlowingBytes = function(stream, amount, preRead, callback){
var buff = preRead ? preRead : new Buffer([]);
var readData = function (data) {
buff = Buffer.concat([buff, data], 2);
buff = Buffer.concat([buff, data]);
if (buff.length >= amount) {
var returnData = buff.slice(0, amount);
var lopped = buff.length > amount ? buff.slice(amount) : null;
@ -35,7 +39,7 @@ var readFlowingBytes = function(stream, amount, preRead, callback){
stream.once('data', readData);
};
readData(buff);
readData(new Buffer([]));
};
var Peer = module.exports = function (options) {
@ -44,9 +48,14 @@ var Peer = module.exports = function(options){
var client;
var magic = new Buffer(options.magic, 'hex');
var magicInt = magic.readUInt32LE(0);
var verack = false;
//https://en.bitcoin.it/wiki/Protocol_specification#Inventory_Vectors
var invVectMsgBlock = 2; //Hash from inventory message is related to a data block
var invCodes = {
error: 0,
tx: 1,
block: 2
};
var networkServices = new Buffer('0100000000000000', 'hex'); //NODE_NETWORK services (value 1 packed as uint64)
var emptyNetAddress = new Buffer('010000000000000000000000000000000000ffff000000000000', 'hex');
@ -59,7 +68,10 @@ var Peer = module.exports = function(options){
var commands = {
version: commandStringBuffer('version'),
inv: commandStringBuffer('inv')
inv: commandStringBuffer('inv'),
verack: commandStringBuffer('verack'),
addr: commandStringBuffer('addr'),
getblocks: commandStringBuffer('getblocks')
};
@ -70,16 +82,20 @@ var Peer = module.exports = function(options){
function Connect() {
client = net.connect(options.host, options.port, function(){
client = net.connect({
host: options.host,
port: options.port
}, function () {
_this.emit('connected');
SendVersion();
});
client.on('end', function () {
_this.emit('disconnected');
verack = false;
Connect();
});
client.on('error', function(){
_this.emit('connectionFailed');
client.on('error', function (e) {
_this.emit('connectionFailed', e);
});
@ -95,7 +111,14 @@ var Peer = module.exports = function(options){
var msgMagic = header.readUInt32LE(0);
if (msgMagic !== magicInt) {
_this.emit('error', 'bad magic number from peer');
beginReadingMessage(null);
while (header.readUInt32LE(0) !== magicInt && header.length >= 4) {
header = header.slice(1);
}
if (header.readUInt32LE(0) === magicInt) {
beginReadingMessage(header);
} else {
beginReadingMessage(new Buffer([]));
}
return;
}
var msgCommand = header.slice(4, 16).toString();
@ -127,23 +150,36 @@ var Peer = module.exports = function(options){
count = payload.readUInt16LE(0);
payload = payload.slice(2);
}
while (count--)
{
if (payload.readUInt32LE(0) === invVectMsgBlock){
while (count--) {
switch(payload.readUInt32LE(0)) {
case invCodes.error:
break;
case invCodes.tx:
var tx = payload.slice(4, 36).toString('hex');
break;
case invCodes.block:
var block = payload.slice(4, 36).toString('hex');
console.log('block found ' + block);
_this.emit('blockFound', block);
break;
}
payload = payload.slice(36);
}
}
function HandleMessage(command, payload) {
_this.emit('peerMessage', {command: command, payload: payload});
switch (command) {
case commands.inv.toString():
HandleInv(payload);
break;
case commands.verack.toString():
if(!verack) {
verack = true;
_this.emit('verack');
}
break;
default:
break;
}
}
@ -158,13 +194,14 @@ var Peer = module.exports = function(options){
payload
]);
client.write(message);
_this.emit('sentMessage', message);
}
function SendVersion() {
var payload = Buffer.concat([
util.packUInt32LE(options.protocolVersion),
networkServices,
util.packUInt32LE(Date.now() / 1000 | 0),
util.packInt64LE(Date.now() / 1000 | 0),
emptyNetAddress, //addr_recv, can be empty
emptyNetAddress, //addr_from, can be empty
crypto.pseudoRandomBytes(8), //nonce, random unique ID

7
lib/stratum.js
View File

@ -212,10 +212,11 @@ var StratumClient = function(options){
socket.destroy();
return;
}
if (dataBuffer.slice(-1) === '\n'){
if (dataBuffer.indexOf('\n') !== -1){
var messages = dataBuffer.split('\n');
var incomplete = dataBuffer.slice(-1) === '\n' ? '' : messages.pop();
messages.forEach(function(message){
if (message.trim() === '') return;
if (message === '') return;
var messageJson;
try {
messageJson = JSON.parse(message);
@ -231,7 +232,7 @@ var StratumClient = function(options){
handleMessage(messageJson);
}
});
dataBuffer = '';
dataBuffer = incomplete;
}
});
socket.on('close', function() {