deps - use web3-stream-provider module

1 files changed, 12 insertions, 22 deletions

diff --git a/app/scripts/background.js b/app/scripts/background.js
index f79047db4..8c6adff04 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -1,11 +1,12 @@
 const Dnode = require('dnode')
-const ObjectMultiplex = require('./lib/obj-multiplex')
 const eos = require('end-of-stream')
 const combineStreams = require('pumpify')
 const extend = require('xtend')
 const EthStore = require('eth-store')
-const PortStream = require('./lib/port-stream.js')
 const MetaMaskProvider = require('web3-provider-engine/zero.js')
+const handleRequestsFromStream = require('web3-stream-provider/handler')
+const ObjectMultiplex = require('./lib/obj-multiplex')
+const PortStream = require('./lib/port-stream.js')
 const IdentityStore = require('./lib/idStore')
 const createTxNotification = require('./lib/notifications.js').createTxNotification
 const createMsgNotification = require('./lib/notifications.js').createMsgNotification
@@ -132,25 +133,6 @@ function storeSetFromObj(store, obj){
 }
 
 
-
-// handle rpc requests
-function onRpcRequest(remoteStream, payload){
-  // console.log('MetaMaskPlugin - incoming payload:', payload)
-  provider.sendAsync(payload, function onPayloadHandled(err, response){
-    // provider engine errors are included in response objects
-    if (!payload.isMetamaskInternal) {
-      console.log('MetaMaskPlugin - RPC complete:', payload, '->', response)
-      if (response.error) console.error('Error in RPC response:\n'+response.error.message)
-    }
-    try {
-      remoteStream.write(response)
-    } catch (err) {
-      console.error(err)
-    }
-  })
-}
-
-
 //
 // remote features
 //
@@ -161,7 +143,15 @@ function setupPublicConfig(stream){
 }
 
 function setupProviderConnection(stream){
-  stream.on('data', onRpcRequest.bind(null, stream))
+  handleRequestsFromStream(stream, provider, logger)
+
+  function logger(err, request, response){
+    if (err) return console.error(err.stack)
+    if (!request.isMetamaskInternal) {
+      console.log('MetaMaskPlugin - RPC complete:', request, '->', response)
+      if (response.error) console.error('Error in RPC response:\n'+response.error.message)
+    }
+  }
 }
 
 function setupControllerConnection(stream){