m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 01:39:44 +01:00
Code

Merge pull request #935 from MetaMask/kumavis-patch-1

Browse Source 
inpage - temporarily disable ping stream
This commit is contained in:
Dan Finlay 2016-12-19 13:30:54 -08:00 committed by GitHub
commit 6ce0bc4b11
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -2,6 +2,8 @@
## Current Master ## Current Master
- Temporarily disable extension reload detection causing infinite reload bug.
## 2.14.0 2016-12-16 ## 2.14.0 2016-12-16
- Removed Morden testnet provider from provider menu. - Removed Morden testnet provider from provider menu.

17
app/scripts/inpage.js
View File

@ -2,8 +2,8 @@
cleanContextForImports() cleanContextForImports()
require('web3/dist/web3.min.js') require('web3/dist/web3.min.js')
const LocalMessageDuplexStream = require('post-message-stream') const LocalMessageDuplexStream = require('post-message-stream')
const PingStream = require('ping-pong-stream/ping') // const PingStream = require('ping-pong-stream/ping')
const endOfStream = require('end-of-stream') // const endOfStream = require('end-of-stream')
const setupDappAutoReload = require('./lib/auto-reload.js') const setupDappAutoReload = require('./lib/auto-reload.js')
const MetamaskInpageProvider = require('./lib/inpage-provider.js') const MetamaskInpageProvider = require('./lib/inpage-provider.js')
restoreContextAfterImports() restoreContextAfterImports()
@ -40,13 +40,14 @@ reloadStream.once('data', triggerReload)
// setup ping timeout autoreload // setup ping timeout autoreload
// LocalMessageDuplexStream does not self-close, so reload if pingStream fails // LocalMessageDuplexStream does not self-close, so reload if pingStream fails
var pingChannel = inpageProvider.multiStream.createStream('pingpong') // var pingChannel = inpageProvider.multiStream.createStream('pingpong')
var pingStream = new PingStream({ objectMode: true }) // var pingStream = new PingStream({ objectMode: true })
// wait for first successful reponse // wait for first successful reponse
metamaskStream.once('data', function(){ // disable pingStream until https://github.com/MetaMask/metamask-plugin/issues/746 is resolved more gracefully
pingStream.pipe(pingChannel).pipe(pingStream) // metamaskStream.once('data', function(){
}) // pingStream.pipe(pingChannel).pipe(pingStream)
endOfStream(pingStream, triggerReload) // })
// endOfStream(pingStream, triggerReload)
// set web3 defaultAcount // set web3 defaultAcount
inpageProvider.publicConfigStore.subscribe(function (state) { inpageProvider.publicConfigStore.subscribe(function (state) {