diff options
| -rw-r--r-- | library/controller.js | 5 | ||||
| -rw-r--r-- | library/popup.js | 5 | ||||
| -rw-r--r-- | library/sw-core.js | 6 | ||||
| -rw-r--r-- | package.json | 2 |
4 files changed, 12 insertions, 6 deletions
diff --git a/library/controller.js b/library/controller.js index 126e972c8..d4a76d316 100644 --- a/library/controller.js +++ b/library/controller.js @@ -9,7 +9,10 @@ const background = new SWcontroller({ const pageStream = new ParentStream() background.on('ready', (_) => { // var inpageProvider = new MetamaskInpageProvider(SwStream(background.controller)) - let swStream = SwStream(background.controller) + let swStream = SwStream({ + serviceWorker: background.controller, + context: 'dapp', + }) pageStream.pipe(swStream).pipe(pageStream) console.log('********************WOOP*********************') }) diff --git a/library/popup.js b/library/popup.js index bb7051055..a9d934c43 100644 --- a/library/popup.js +++ b/library/popup.js @@ -21,7 +21,10 @@ const background = new SWcontroller({ background.on('ready', (readSw) => { // var inpageProvider = new MetamaskInpageProvider(SwStream(background.controller)) // startPopup(inpageProvider) - startPopup(SwStream(background.controller)) + swStream = SwStream({ + serviceWorker: background.controller, + }) + startPopup() }) background.on('message', (messageEvent) => {debugger}) background.startWorker() diff --git a/library/sw-core.js b/library/sw-core.js index 4d95898d9..9f399cccf 100644 --- a/library/sw-core.js +++ b/library/sw-core.js @@ -117,11 +117,11 @@ function setupController (initState, client) { */ connectionListener.on('remote', (portStream, messageEvent) => { console.log('REMOTE CONECTION FOUND***********') - connectRemote(portStream, messageEvent.origin) + connectRemote(portStream, messageEvent.data.context) }) - function connectRemote (connectionStream, originDomain) { - var isMetaMaskInternalProcess = (originDomain === 'http://localhost:9001') + function connectRemote (connectionStream, context) { + var isMetaMaskInternalProcess = (context !== 'dapp') if (isMetaMaskInternalProcess) { // communication with popup controller.setupTrustedCommunication(connectionStream, 'MetaMask') diff --git a/package.json b/package.json index cc51ef032..d6c80496a 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "request-promise": "^4.1.1", "sandwich-expando": "^1.0.5", "semaphore": "^1.0.5", - "sw-stream": "^1.0.2", + "sw-stream": "^2.0.0", "textarea-caret": "^3.0.1", "three.js": "^0.73.2", "through2": "^2.0.1", |