Skip to content

Transactions collector #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Arucard89 wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Transactions collector #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
383f2de
add package.json
Arucard89 Sep 13, 2018
3240307
added export for node
Arucard89 Sep 13, 2018
844de0c
replace wrong package
Arucard89 Sep 13, 2018
4287e84
lock too
Arucard89 Sep 13, 2018
ffd1eb9
added some modules
Arucard89 Sep 13, 2018
05d4431
try to unify
Arucard89 Sep 14, 2018
67ccd8d
include modules inside the objects
Arucard89 Sep 16, 2018
1e57561
make changing to ws from websocket
Arucard89 Sep 17, 2018
70e311e
first commit
Arucard89 Sep 25, 2018
4cf2ef2
added return
Arucard89 Sep 26, 2018
ff5ec8e
add type
Arucard89 Sep 26, 2018
dcbedf4
gitigmore
Arucard89 Sep 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

demo — копия.html
demo — копия — копия.html
node_modules
6 changes: 6 additions & 0 deletions NodeMetaInfo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,9 @@ class NodeMetaInfo {
}

}


//unify browser and node
if (this.window === undefined){
module.exports = NodeMetaInfo;
}
138 changes: 85 additions & 53 deletions candy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
*/

'use strict';
//unify browser and node
if (typeof _this ==='undefined') {
var _this = this;
}

const MessageType = {
QUERY_LATEST: 0,
Expand All @@ -17,7 +21,8 @@ const MessageType = {
MY_PEERS: 3,
BROADCAST: 4,
META: 5,
SW_BROADCAST: 6
SW_BROADCAST: 6,
TRANS_COLL:7,
};

const BlockchainRequestors = {
Expand All @@ -27,8 +32,30 @@ const BlockchainRequestors = {
}
};


function Candy(nodeList) {
'use strict';

//modules list(for compability with node)
try {
if (_this.window === undefined) {
this.WebSocket = require('ws');
this.starwaveProtocol = require('./starwaveProtocol.js');
this.NodeMetaInfo = require('./NodeMetaInfo.js');
this.DigitalSignature = require('./digitalSignature.js');
this.StarwaveCrypto = require('./starwaveCrypto.js');
this.URL = require('url').Url;
} else { //if browser
this.WebSocket = typeof WebSocket !== 'undefined' ? WebSocket : undefined;
this.starwaveProtocol = typeof starwaveProtocol !== 'undefined' ? starwaveProtocol : undefined;
this.NodeMetaInfo = typeof NodeMetaInfo !== 'undefined' ? NodeMetaInfo : undefined;
this.DigitalSignature = typeof DigitalSignature !== 'undefined' ? DigitalSignature : undefined;
this.StarwaveCrypto = typeof StarwaveCrypto !== 'undefined' ? StarwaveCrypto : undefined;
this.URL = URL;
}
} catch (e) {
console.log('Error trying to include libraries: ' + e);
}

let that = this;
this.maxConnections = 30;
this.nodeList = nodeList;
Expand All @@ -47,13 +74,11 @@ function Candy(nodeList) {

this.secretKeys = {}; //consist of secret keys of different busAddresses of peers


if(typeof starwaveProtocol === 'function') {
this.starwave = new starwaveProtocol(this, MessageType);
if (typeof this.starwaveProtocol === 'function') {
this.starwave = new this.starwaveProtocol(this, MessageType);
} else {
console.log("Error: Can't find starwaveProtocol module");
}
;

/**
* Current reciever address. Override allowed
Expand Down Expand Up @@ -91,35 +116,34 @@ function Candy(nodeList) {
* @param {Object} data
*/
this._dataRecieved = function (source, data) {

//prevent multiple sockets on one busaddress
if(!this.allowMultiplySocketsOnBus && (this.starwave)) {
if(this.starwave.preventMultipleSockets(source) === 0) {
if (!this.allowMultiplySocketsOnBus && (this.starwave)) {
if (this.starwave.preventMultipleSockets(source) === 0) {
data = null;
return;
}
}

if(typeof that.ondata === 'function') {
if(that.ondata(data)) {
if (typeof that.ondata === 'function') {
if (that.ondata(data)) {
return;
}
}

//Data block recived
if(data.type === MessageType.RESPONSE_BLOCKCHAIN) {
if (data.type === MessageType.RESPONSE_BLOCKCHAIN) {
try {
/**
* @var {Block} block
*/
let blocks = JSON.parse(data.data);
for (let a in blocks) {
let block = blocks[a];
if(that.blockHeight < block.index) {
if (that.blockHeight < block.index) {
that.blockHeight = block.index
}
//Loading requested resource
if(typeof that._resourceQueue[block.index] !== 'undefined') {
if (typeof that._resourceQueue[block.index] !== 'undefined') {
that._resourceQueue[block.index](block.data, block);
that._resourceQueue[block.index] = undefined;
}
Expand All @@ -130,12 +154,12 @@ function Candy(nodeList) {
}

//New peers recived
if(data.type === MessageType.MY_PEERS) {
if (data.type === MessageType.MY_PEERS) {
for (let a in data.data) {
if(data.data.hasOwnProperty(a)) {
if(that.nodeList.indexOf(data.data[a]) == -1) {
if (data.data.hasOwnProperty(a)) {
if (that.nodeList.indexOf(data.data[a]) == -1) {
that.nodeList.push(data.data[a]);
if(that.getActiveConnections().length < that.maxConnections - 1) {
if (that.getActiveConnections().length < that.maxConnections - 1) {
that.connectPeer(data.data[a]);
}
}
Expand All @@ -144,21 +168,21 @@ function Candy(nodeList) {
that.nodeList = Array.from(new Set(that.nodeList));
}

if(data.type === MessageType.BROADCAST) {
if (data.type === MessageType.BROADCAST) {
/*if(that._lastMsgIndex < data.index) {*/
if(data.reciver === that.recieverAddress) {
if (data.reciver === that.recieverAddress) {

if(data.id === 'CANDY_APP_RESPONSE') {
if(typeof that._candyAppResponse === 'function') {
if (data.id === 'CANDY_APP_RESPONSE') {
if (typeof that._candyAppResponse === 'function') {
that._candyAppResponse(data);
}
} else {
if(typeof that.onmessage === 'function') {
if (typeof that.onmessage === 'function') {
that.onmessage(data);
}
}
} else {
if(data.recepient !== that.recieverAddress) {
if (data.recepient !== that.recieverAddress) {
data.TTL++;
that.broadcast(data);
}
Expand All @@ -169,11 +193,11 @@ function Candy(nodeList) {
}

//add meta info handling //required NodeMetaInfo.js included
if(data.type === MessageType.META) {
if(typeof NodeMetaInfo === 'function') {
if (data.type === MessageType.META) {
if (typeof this.NodeMetaInfo === 'function') {
let ind = that.sockets.indexOf(source);
if(ind > -1) {
that.sockets[ind].nodeMetaInfo = (new NodeMetaInfo()).parse(data.data);
if (ind > -1) {
that.sockets[ind].nodeMetaInfo = (new this.NodeMetaInfo()).parse(data.data);
} else {
console.log('Error: Unexpected error occurred when trying to add validators');
}
Expand All @@ -182,8 +206,8 @@ function Candy(nodeList) {
}
}

if(data.type === MessageType.SW_BROADCAST) {
if(this.starwave) {
if (data.type === MessageType.SW_BROADCAST) {
if (this.starwave) {
this._lastMsgIndex = this.starwave.handleMessage(data, this.messagesHandlers, source);
}
}
Expand All @@ -198,8 +222,8 @@ function Candy(nodeList) {
that.getActiveConnections = function () {
let activeSockets = [];
for (let a in that.sockets) {
if(that.sockets[a]) {
if(that.sockets[a].readyState === WebSocket.OPEN) {
if (that.sockets[a]) {
if (that.sockets[a].readyState === this.WebSocket.OPEN) {
activeSockets.push(that.sockets[a]);
}
}
Expand All @@ -215,14 +239,15 @@ function Candy(nodeList) {
this.connectPeer = function (peer) {
let socket = null;
try {
socket = new WebSocket(peer);
socket = new this.WebSocket(peer);
} catch (e) {
return;
}

socket.onopen = function () {
setTimeout(function () {
if(typeof that.onready !== 'undefined') {
if(typeof that._autoloader !== 'undefined') {
if (typeof that.onready !== 'undefined') {
if (typeof that._autoloader !== 'undefined') {
that._autoloader.onready();
}
that.onready();
Expand All @@ -248,6 +273,12 @@ function Candy(nodeList) {
socket.onerror = function (error) {
//console.log("Ошибка " + error.message);
};
if (_this.window === undefined){
socket.on('open', ()=> socket.onopen());
socket.on('close', ()=> socket.onclose());
socket.on('message', ()=> socket.onmessage());
socket.on('error', ()=> socket.onerror());
}
that.sockets.push(socket);
};

Expand All @@ -258,11 +289,11 @@ function Candy(nodeList) {
*/
this.broadcast = function (message) {
let sended = false;
if(typeof message !== 'string') {
if (typeof message !== 'string') {
message = JSON.stringify(message);
}
for (let a in that.sockets) {
if(that.sockets.hasOwnProperty(a) && that.sockets[a] !== null) {
if (that.sockets.hasOwnProperty(a) && that.sockets[a] !== null) {
try {
that.sockets[a].send(message);
sended = true;
Expand Down Expand Up @@ -295,7 +326,7 @@ function Candy(nodeList) {
index: that._lastMsgIndex,
mutex: this.getid() + this.getid() + this.getid()
};
if(!that.broadcast(message)) {
if (!that.broadcast(message)) {
that.autoconnect(true);
return false;
}
Expand All @@ -308,10 +339,10 @@ function Candy(nodeList) {
* @param {boolean} force reconnection
*/
this.autoconnect = function (force) {
if(that.getActiveConnections().length < 1 || force) {
if (that.getActiveConnections().length < 1 || force) {
for (let a in that.nodeList) {
if(that.nodeList.hasOwnProperty(a)) {
if(that.getActiveConnections().length < that.maxConnections - 1) {
if (that.nodeList.hasOwnProperty(a)) {
if (that.getActiveConnections().length < that.maxConnections - 1) {
that.connectPeer(that.nodeList[a]);
}
}
Expand All @@ -327,8 +358,8 @@ function Candy(nodeList) {
*/
this.start = function () {
for (let a in that.nodeList) {
if(that.nodeList.hasOwnProperty(a)) {
if(that.getActiveConnections().length < that.maxConnections - 1) {
if (that.nodeList.hasOwnProperty(a)) {
if (that.getActiveConnections().length < that.maxConnections - 1) {
that.connectPeer(that.nodeList[a]);
}
}
Expand All @@ -349,8 +380,7 @@ function Candy(nodeList) {
* @param {int} timeout
*/
this._candyAppRequest = function (uri, requestData, backId, timeout) {
let url = document.createElement('a');
url.href = uri.replace('candy:', 'http:');
let url = new this.URL(uri.replace('candy:', 'http:'));
let data = {
uri: uri,
data: requestData,
Expand All @@ -365,7 +395,7 @@ function Candy(nodeList) {
* @param message
*/
this._candyAppResponse = function (message) {
if(typeof that._requestQueue[message.data.backId] !== 'undefined') {
if (typeof that._requestQueue[message.data.backId] !== 'undefined') {
let request = that._requestQueue[message.data.backId];
clearTimeout(request.timer);
request.callback(message.err, typeof message.data.data.body !== 'undefined' ? message.data.data.body : message.data.data, message);
Expand All @@ -383,7 +413,7 @@ function Candy(nodeList) {
* @param {int} timeout
*/
this.requestApp = function (uri, data, callback, timeout) {
if(typeof timeout === 'undefined') {
if (typeof timeout === 'undefined') {
timeout = 10000;
}
let requestId = that.getid();
Expand Down Expand Up @@ -418,9 +448,8 @@ function Candy(nodeList) {
* @param {int} timeout
*/
this.request = function (uri, data, callback, timeout) {
let url = document.createElement('a');
url.href = uri.replace('candy:', 'http:');
if(url.hostname === 'block') {
let url = new this.URL(uri.replace('candy:', 'http:'));
if (url.hostname === 'block') {
that.loadResource(url.pathname.replace('/', ''), function (err, data) {
callback(err, data.candyData, data);
});
Expand All @@ -436,7 +465,7 @@ function Candy(nodeList) {
* @param {Function} callback
*/
this.loadResource = function (blockId, callback) {
if(blockId > that.blockHeigth && blockId < 1) {
if (blockId > that.blockHeigth && blockId < 1) {
callback(404);
}
that._resourceQueue[blockId] = function (data, rawBlock) {
Expand All @@ -457,6 +486,9 @@ function Candy(nodeList) {
this.messagesHandlers.sort((a, b) => a.id > b.id);
};


return this;
}
}

if (this.window === undefined) {
module.exports = Candy;
}
Loading