From f91baf73bce49952fb0cf257f2b859c33d87074c Mon Sep 17 00:00:00 2001 From: "Michael Bradley, Jr" Date: Sun, 15 Jul 2018 19:34:33 -0500 Subject: [PATCH] proxy -- canonicalHost, defaultHost --- lib/core/proxy.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/core/proxy.js b/lib/core/proxy.js index 4a2a6bd4f..49a600b21 100644 --- a/lib/core/proxy.js +++ b/lib/core/proxy.js @@ -3,9 +3,11 @@ const http = require('http'); const constants = require('../constants.json'); let commList = {}; -let transactions = {}; +let transactions = {}; let receipts = {}; +const {canonicalHost, defaultHost} = require('../utils/host'); + const parseRequest = function(reqBody){ let jsonO; try { @@ -42,7 +44,7 @@ const parseResponse = function(ipc, resBody){ commList[receipts[jsonO.id]].blockNumber = jsonO.result.blockNumber; commList[receipts[jsonO.id]].gasUsed = jsonO.result.gasUsed; commList[receipts[jsonO.id]].status = jsonO.result.status; - + if(ipc.connected && !ipc.connecting){ ipc.request('log', commList[receipts[jsonO.id]]); } else { @@ -61,7 +63,7 @@ const parseResponse = function(ipc, resBody){ exports.serve = function(ipc, host, port, ws){ let proxy = httpProxy.createProxyServer({ target: { - host, + host: canonicalHost(host), port: port + constants.blockchain.servicePortOnProxy }, ws: ws @@ -80,7 +82,7 @@ exports.serve = function(ipc, host, port, ws){ if(resBody){ parseResponse(ipc, resBody); } - }); + }); }); let server = http.createServer((req, res) => { @@ -110,16 +112,16 @@ exports.serve = function(ipc, host, port, ws){ parseResponse(ipc, data.toString().substr(data.indexOf("{"))); }); }); - + proxy.on('proxyReqWs', (proxyReq, req, socket) => { var parser = new WsParser(0, false); socket.pipe(parser); parser.on('frame', function (frame) { parseRequest(frame.data); }); - + }); } - server.listen(port); + server.listen(port, defaultHost); };