diff --git a/lib/contracts/blockchain.js b/lib/contracts/blockchain.js index 6f6e4e15e..6ae0c9c76 100644 --- a/lib/contracts/blockchain.js +++ b/lib/contracts/blockchain.js @@ -256,45 +256,8 @@ class Blockchain { if (!self.contractsConfig || !self.contractsConfig.deployment || !self.contractsConfig.deployment.host) { return next(); } - const origin = self.blockchainConfig.wsOrigins.split(',')[0]; - const options = { - protocolVersion: 13, - perMessageDeflate: true, - origin: origin, - host: self.contractsConfig.deployment.host, - port: self.contractsConfig.deployment.port - }; - if (self.contractsConfig.deployment.type === 'ws') { - options.headers = { - 'Sec-WebSocket-Version': 13, - Connection: 'Upgrade', - Upgrade: 'websocket', - 'Sec-WebSocket-Extensions': 'permessage-deflate; client_max_window_bits', - Origin: origin - }; - } - let req; - // remove trailing api key from infura, ie rinkeby.infura.io/nmY8WtT4QfEwz2S7wTbl - if(options.host.indexOf('/') > -1){ - options.host = options.host.split('/')[0]; - } - if((self.contractsConfig.deployment.protocol || 'http') === 'https'){ - req = require('https').get(options); - }else{ - req = require('http').get(options); - } - - req.on('error', (err) => { - next(err); - }); - - req.on('response', (_response) => { - next(); - }); - - req.on('upgrade', (_res, _socket, _head) => { - next(); - }); + const {host, port, type, protocol} = self.contractsConfig.deployment; + utils.pingEndpoint(host, port, type, protocol, self.blockchainConfig.wsOrigins.split(',')[0], next); } ], function (err) { if (!noLogs && err === NO_NODE_ERROR) { diff --git a/lib/utils/utils.js b/lib/utils/utils.js index c09dfa767..67de52126 100644 --- a/lib/utils/utils.js +++ b/lib/utils/utils.js @@ -73,6 +73,48 @@ function httpsGetJson(url, callback) { }); } +function pingEndpoint(host, port, type, protocol, wsOrigins, callback) { + const origin = wsOrigins.split(',')[0]; + const options = { + protocolVersion: 13, + perMessageDeflate: true, + origin: origin, + host: host, + port: port + }; + if (type === 'ws') { + options.headers = { + 'Sec-WebSocket-Version': 13, + Connection: 'Upgrade', + Upgrade: 'websocket', + 'Sec-WebSocket-Extensions': 'permessage-deflate; client_max_window_bits', + Origin: origin + }; + } + let req; + // remove trailing api key from infura, ie rinkeby.infura.io/nmY8WtT4QfEwz2S7wTbl + if(options.host.indexOf('/') > -1){ + options.host = options.host.split('/')[0]; + } + if(protocol === 'https') { + req = require('https').get(options); + } else { + req = require('http').get(options); + } + + req.on('error', (err) => { + callback(err); + }); + + req.on('response', (_response) => { + callback(); + }); + + req.on('upgrade', (_res, _socket, _head) => { + callback(); + }); +} + function runCmd(cmd, options) { const shelljs = require('shelljs'); let result = shelljs.exec(cmd, options || {silent: true}); @@ -267,6 +309,7 @@ module.exports = { httpGetJson: httpGetJson, httpsGetJson: httpsGetJson, hexToNumber: hexToNumber, + pingEndpoint, decodeParams: decodeParams, runCmd: runCmd, cd: cd,