disable localhost interception

This commit is contained in:
kumavis 2016-02-15 11:03:50 -08:00
parent 519d4b1192
commit dbd3b8f76f
1 changed files with 58 additions and 58 deletions

View File

@ -1,6 +1,6 @@
const XHR = window.XMLHttpRequest
const fauxJax = require('faux-jax')
fauxJax.install()
// const fauxJax = require('faux-jax')
// fauxJax.install()
const Web3 = require('web3')
const createPayload = require('web3-provider-engine/util/create-payload')
const StreamProvider = require('./lib/stream-provider.js')
@ -96,64 +96,64 @@ console.log('MetaMask - injected web3')
//
console.log('MetaMask - intercepting localhost:8545 requests')
// console.log('MetaMask - intercepting localhost:8545 requests')
fauxJax.on('request', function(req){
// check if local node request
if (req.requestURL.indexOf('localhost:8545') !== -1) {
var rpcReq = JSON.parse(req.requestBody)
if (req.async) {
remoteProvider.sendAsync(rpcReq, function(err, result){
// console.log('intercepted request (async):', rpcReq, result)
handleResult(result)
})
} else {
var result = remoteProvider.send(rpcReq)
// console.log('intercepted request (sync):', rpcReq, result)
handleResult(result)
}
} else {
// console.log('request continuing normally:', req.requestURL)
continueRequestNormally(req)
}
// fauxJax.on('request', function(req){
// // check if local node request
// if (req.requestURL.indexOf('localhost:8545') !== -1) {
// var rpcReq = JSON.parse(req.requestBody)
// if (req.async) {
// remoteProvider.sendAsync(rpcReq, function(err, result){
// // console.log('intercepted request (async):', rpcReq, result)
// handleResult(result)
// })
// } else {
// var result = remoteProvider.send(rpcReq)
// // console.log('intercepted request (sync):', rpcReq, result)
// handleResult(result)
// }
// } else {
// // console.log('request continuing normally:', req.requestURL)
// continueRequestNormally(req)
// }
function handleResult(result){
var serializedResult = JSON.stringify(result)
req.respond(200, {
'content-type': 'application/json',
}, serializedResult)
}
})
// function handleResult(result){
// var serializedResult = JSON.stringify(result)
// req.respond(200, {
// 'content-type': 'application/json',
// }, serializedResult)
// }
// })
function continueRequestNormally(req){
var xhr = new XHR()
// set target url and method
xhr.open(req.requestMethod, req.requestURL, req.async)
// set headers
Object.keys(req.requestHeaders || {}).forEach(function(headerKey){
xhr.setRequestHeader(headerKey, req.requestHeaders[headerKey])
})
// send and call completion handler
if (req.async) {
xhr.onload = copyResult
xhr.send(req.requestBody)
} else {
xhr.send(req.requestBody)
copyResult()
}
// function continueRequestNormally(req){
// var xhr = new XHR()
// // set target url and method
// xhr.open(req.requestMethod, req.requestURL, req.async)
// // set headers
// Object.keys(req.requestHeaders || {}).forEach(function(headerKey){
// xhr.setRequestHeader(headerKey, req.requestHeaders[headerKey])
// })
// // send and call completion handler
// if (req.async) {
// xhr.onload = copyResult
// xhr.send(req.requestBody)
// } else {
// xhr.send(req.requestBody)
// copyResult()
// }
function copyResult() {
var headers = extractResponseHeaders(xhr.getAllResponseHeaders())
req.respond(xhr.status, headers, xhr.response)
}
}
// function copyResult() {
// var headers = extractResponseHeaders(xhr.getAllResponseHeaders())
// req.respond(xhr.status, headers, xhr.response)
// }
// }
function extractResponseHeaders(rawHeaders){
var headers = {}
var headerKeyValues = rawHeaders.split('\r\n').filter(Boolean)
headerKeyValues.forEach(function(keyValue){
var data = keyValue.split(': ')
headers[data[0]] = data[1]
})
return headers
}
// function extractResponseHeaders(rawHeaders){
// var headers = {}
// var headerKeyValues = rawHeaders.split('\r\n').filter(Boolean)
// headerKeyValues.forEach(function(keyValue){
// var data = keyValue.split(': ')
// headers[data[0]] = data[1]
// })
// return headers
// }