RanchiMall/SuperNodeStorage
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
sairajzero 2021-07-29 16:40:55 +05:30
parent 3d3d2be6df
commit 9001b21b07
3 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/database.js
View File

@ -290,7 +290,7 @@ function Database(user, password, dbname, host = 'localhost') {
db.getData = function(snID, logtime) { db.getData = function(snID, logtime) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let statement = "SELECT * FROM _" + snID + let statement = "SELECT * FROM _" + snID +
" WHERE " + L_struct.LOG_TIME + ">=" + logtime + " WHERE " + L_struct.LOG_TIME + ">" + logtime +
" ORDER BY " + L_struct.LOG_TIME; " ORDER BY " + L_struct.LOG_TIME;
db.query(statement) db.query(statement)
.then(result => resolve(result)) .then(result => resolve(result))

23
src/intra.js
View File

@ -136,14 +136,19 @@ packet_.constuct = function(message) {
}; };
packet_.s = d => [JSON.stringify(d.message), d.time].join("|"); packet_.s = d => [JSON.stringify(d.message), d.time].join("|");
packet_.parse = function(str) { packet_.parse = function(str) {
let packet = JSON.parse(str.substring(SUPERNODE_INDICATOR.length)); try {
let curTime = Date.now(); let packet = JSON.parse(str.substring(SUPERNODE_INDICATOR.length));
if (packet.time > curTime - floGlobals.sn_config.delayDelta && let curTime = Date.now();
packet.from in floGlobals.supernodes && if (packet.time > curTime - floGlobals.sn_config.delayDelta &&
floCrypto.verifySign(this.s(packet), packet.sign, floGlobals.supernodes[packet.from].pubKey)) { packet.from in floGlobals.supernodes &&
if (!Array.isArray(packet.message)) floCrypto.verifySign(this.s(packet), packet.sign, floGlobals.supernodes[packet.from].pubKey)) {
packet.message = [packet.message]; if (!Array.isArray(packet.message))
return packet; packet.message = [packet.message];
return packet;
};
} catch (error) {
console.error(str, error);
return false;
}; };
}; };
@ -416,7 +421,7 @@ function handshakeEnd() {
//Reconnect to next available node //Reconnect to next available node
function reconnectNextNode() { function reconnectNextNode() {
if (_nextNode.ws) if (_nextNode.id)
_nextNode.close(); _nextNode.close();
connectToNextNode() connectToNextNode()
.then(result => console.log(result)) .then(result => console.log(result))

24
src/server.js
View File

@ -51,15 +51,21 @@ module.exports = function Server(port, client, intra) {
intra.processTaskFromSupernode(message, ws); intra.processTaskFromSupernode(message, ws);
else { else {
console.debug("WS: ", message); console.debug("WS: ", message);
var request = JSON.parse(message); try {
client.processRequestFromUser(request) var request = JSON.parse(message);
.then(result => { client.processRequestFromUser(request)
ws.send(JSON.stringify(result[0])); .then(result => {
ws._liveReq = request; ws.send(JSON.stringify(result[0]));
}).catch(error => { ws._liveReq = request;
if (floGlobals.sn_config.errorFeedback) }).catch(error => {
ws.send(error.toString()); if (floGlobals.sn_config.errorFeedback)
}); ws.send(error.toString());
});
} catch (error) {
console.error(error);
if (floGlobals.sn_config.errorFeedback)
ws.send("Request not in JSON format");
};
}; };
}; };
}); });