embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix transaction logger

This commit is contained in:
Anthony Laibe 2018-08-14 14:20:31 +01:00 committed by Iuri Matias
parent eb874f32ac
commit 926ed7c258
1 changed files with 102 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

202
lib/modules/blockchain_process/proxy.js
View File

@ -8,119 +8,121 @@ let receipts = {};
const {canonicalHost, defaultHost} = require('../../utils/host'); const {canonicalHost, defaultHost} = require('../../utils/host');
const parseRequest = function(reqBody){ const parseRequest = function (reqBody) {
let jsonO; let jsonO;
try { try {
jsonO = JSON.parse(reqBody); jsonO = JSON.parse(reqBody);
} catch(e){ } catch (e) {
return; // Request is not a json. Do nothing return; // Request is not a json. Do nothing
} }
if(jsonO.method === "eth_sendTransaction"){ if (jsonO.method === "eth_sendTransaction") {
commList[jsonO.id] = { commList[jsonO.id] = {
type: 'contract-log', type: 'contract-log',
address: jsonO.params[0].to, address: jsonO.params[0].to,
data: jsonO.params[0].data data: jsonO.params[0].data
}; };
} else if(jsonO.method === "eth_getTransactionReceipt"){ } else if (jsonO.method === "eth_getTransactionReceipt") {
if(transactions[jsonO.params[0]]){ if (transactions[jsonO.params[0]]) {
transactions[jsonO.params[0]].receiptId = jsonO.id; transactions[jsonO.params[0]].receiptId = jsonO.id;
receipts[jsonO.id] = transactions[jsonO.params[0]].commListId; receipts[jsonO.id] = transactions[jsonO.params[0]].commListId;
}
} }
}
}; };
const parseResponse = function(ipc, resBody){ const parseResponse = function (ipc, resBody) {
let jsonO; let jsonO;
try { try {
jsonO = JSON.parse(resBody); jsonO = JSON.parse(resBody);
} catch(e) { } catch (e) {
return; // Response is not a json. Do nothing return; // Response is not a json. Do nothing
} }
if(commList[jsonO.id]){ if (commList[jsonO.id]) {
commList[jsonO.id].transactionHash = jsonO.result; commList[jsonO.id].transactionHash = jsonO.result;
transactions[jsonO.result] = {commListId: jsonO.id}; transactions[jsonO.result] = {commListId: jsonO.id};
} else if(receipts[jsonO.id] && jsonO.result && jsonO.result.blockNumber){ } else if (receipts[jsonO.id] && jsonO.result && jsonO.result.blockNumber) {
commList[receipts[jsonO.id]].blockNumber = jsonO.result.blockNumber; commList[receipts[jsonO.id]].blockNumber = jsonO.result.blockNumber;
commList[receipts[jsonO.id]].gasUsed = jsonO.result.gasUsed; commList[receipts[jsonO.id]].gasUsed = jsonO.result.gasUsed;
commList[receipts[jsonO.id]].status = jsonO.result.status; commList[receipts[jsonO.id]].status = jsonO.result.status;
if(ipc.connected && !ipc.connecting){ if (ipc.connected && !ipc.connecting) {
ipc.request('log', commList[receipts[jsonO.id]]); ipc.request('log', commList[receipts[jsonO.id]]);
} else { } else {
ipc.connecting = true; ipc.connecting = true;
ipc.connect(() => { ipc.connect(() => {
ipc.connecting = false; ipc.connecting = false;
}); });
}
delete transactions[commList[receipts[jsonO.id]].transactionHash];
delete receipts[jsonO.id];
delete commList[jsonO.id];
} }
delete transactions[commList[receipts[jsonO.id]].transactionHash];
delete commList[receipts[jsonO.id]];
delete receipts[jsonO.id];
}
}; };
exports.serve = function(ipc, host, port, ws){ exports.serve = function (ipc, host, port, ws) {
let proxy = httpProxy.createProxyServer({ let proxy = httpProxy.createProxyServer({
target: { target: {
host: canonicalHost(host), host: canonicalHost(host),
port: port + constants.blockchain.servicePortOnProxy port: port + constants.blockchain.servicePortOnProxy
}, },
ws: ws ws: ws
});
proxy.on('error', function (e) {
console.error(__("Error forwarding requests to blockchain/simulator"), e.message);
});
proxy.on('proxyRes', (proxyRes) => {
let resBody = [];
proxyRes.on('data', (b) => resBody.push(b));
proxyRes.on('end', function () {
resBody = Buffer.concat(resBody).toString();
if (resBody) {
parseResponse(ipc, resBody);
}
}); });
});
proxy.on('error', function (e) { let server = http.createServer((req, res) => {
console.error(__("Error forwarding requests to blockchain/simulator"), e.message); let reqBody = [];
}); req.on('data', (b) => {
reqBody.push(b);
proxy.on('proxyRes', (proxyRes) => { })
let resBody = []; .on('end', () => {
proxyRes.on('data', (b) => resBody.push(b)); reqBody = Buffer.concat(reqBody).toString();
proxyRes.on('end', function () { if (reqBody) {
resBody = Buffer.concat(resBody).toString(); parseRequest(reqBody);
if(resBody){
parseResponse(ipc, resBody);
}
});
});
let server = http.createServer((req, res) => {
let reqBody = [];
req.on('data', (b) => { reqBody.push(b); })
.on('end', () => {
reqBody = Buffer.concat(reqBody).toString();
if(reqBody){
parseRequest(reqBody);
}
});
if(!ws){
proxy.web(req, res);
} }
});
if (!ws) {
proxy.web(req, res);
}
});
if (ws) {
const WsParser = require('simples/lib/parsers/ws'); // npm install simples
server.on('upgrade', function (req, socket, head) {
proxy.ws(req, socket, head);
}); });
if(ws){ proxy.on('open', (proxySocket) => {
const WsParser = require('simples/lib/parsers/ws'); // npm install simples proxySocket.on('data', (data) => {
parseResponse(ipc, data.toString().substr(data.indexOf("{")));
});
});
server.on('upgrade', function (req, socket, head) { proxy.on('proxyReqWs', (proxyReq, req, socket) => {
proxy.ws(req, socket, head); var parser = new WsParser(0, false);
}); socket.pipe(parser);
parser.on('frame', function (frame) {
parseRequest(frame.data);
});
proxy.on('open', (proxySocket) => { });
proxySocket.on('data', (data) => { }
parseResponse(ipc, data.toString().substr(data.indexOf("{")));
});
});
proxy.on('proxyReqWs', (proxyReq, req, socket) => { server.listen(port, defaultHost);
var parser = new WsParser(0, false); return server;
socket.pipe(parser);
parser.on('frame', function (frame) {
parseRequest(frame.data);
});
});
}
server.listen(port, defaultHost);
return server;
}; };