Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rpc Messenger: dedupe message bus across requests #278

Merged
merged 1 commit into from
Apr 9, 2019
Merged

Rpc Messenger: dedupe message bus across requests #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions packages/aragon-rpc-messenger/src/providers/MessagePortMessage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Provider from './Provider'
import { fromEvent } from 'rxjs'
import { filter, pluck } from 'rxjs/operators'
import { filter, pluck, publish } from 'rxjs/operators'

/**
* A provider that communicates through the [MessageChannel PostMessage API](https://developer.mozilla.org/en-US/docs/Web/API/MessagePort/postMessage).
Expand All @@ -20,6 +20,14 @@ export default class MessagePortMessage extends Provider {
constructor (target = self) {
super()
this.target = target
this.messages$ = fromEvent(this.target, 'message', false).pipe(
// We can't use event.source in WebWorker messages as it seems to be null
// However, the fallback to check the target should always be true
filter((event) => (event.source || event.target) === this.target),
pluck('data'),
publish()
)
this.messages$.connect()
}

/**
Expand All @@ -28,12 +36,7 @@ export default class MessagePortMessage extends Provider {
* @returns {Observable} An [RxJS observable](http://reactivex.io/rxjs/class/es6/Observable.js~Observable.html)
*/
messages () {
return fromEvent(this.target, 'message', false).pipe(
// We can't use event.source in WebWorker messages as it seems to be null
// However, the fallback to check the target should always be true
filter((event) => (event.source || event.target) === this.target),
pluck('data')
)
return this.messages$
}

/**
Expand Down
13 changes: 8 additions & 5 deletions packages/aragon-rpc-messenger/src/providers/WindowMessage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Provider from './Provider'
import { fromEvent } from 'rxjs'
import { filter, pluck } from 'rxjs/operators'
import { filter, pluck, publish } from 'rxjs/operators'

/**
* A provider that uses the Window postMessage API to pass messages between windows (e.g. iframes).
Expand All @@ -17,6 +17,12 @@ export default class WindowMessage extends Provider {
constructor (target = window.parent) {
super()
this.target = target
this.messages$ = fromEvent(window, 'message', false).pipe(
filter((event) => event.source === this.target),
pluck('data'),
publish()
)
this.messages$.connect()
}

/**
Expand All @@ -25,10 +31,7 @@ export default class WindowMessage extends Provider {
* @returns {Observable} An [RxJS observable](http://reactivex.io/rxjs/class/es6/Observable.js~Observable.html)
*/
messages () {
return fromEvent(window, 'message', false).pipe(
filter((event) => event.source === this.target),
pluck('data')
)
return this.messages$
}

/**
Expand Down