Skip to content

Commit

Permalink
fix(MeetingsSdkAdapter): make getMeeting observable also emit message…
Browse files Browse the repository at this point in the history
…s emitted by createMeeting
  • Loading branch information
CernaianuMihai authored and cipak committed Jul 19, 2021
1 parent f2f5016 commit 4e9dc62
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions src/MeetingsSDKAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ const EVENT_REMOTE_SHARE_START = 'meeting:startedSharingRemote';
const EVENT_REMOTE_SHARE_STOP = 'meeting:stoppedSharingRemote';

// Adapter Events
const EVENT_MEETING_UPDATED = 'adapter:meeting:updated';
const EVENT_MEDIA_LOCAL_UPDATE = 'adapter:media:local:update';
const EVENT_ROSTER_TOGGLE = 'adapter:roster:toggle';
const EVENT_SETTINGS_TOGGLE = 'adapter:settings:toggle';
Expand Down Expand Up @@ -482,9 +483,6 @@ export default class MeetingsSDKAdapter extends MeetingsAdapter {
microphoneID: null,
speakerID: null,
})),
tap((meeting) => {
this.meetings[meeting.ID] = meeting;
}),
);

const meeting$ = newMeeting$.pipe(
Expand All @@ -494,12 +492,15 @@ export default class MeetingsSDKAdapter extends MeetingsAdapter {
...localMedia,
})),
)),
tap((meeting) => {
this.meetings[meeting.ID] = meeting;
}),
);

return concat(newMeeting$, meeting$).pipe(
tap((meeting) => {
const sdkMeeting = this.fetchMeeting(meeting.ID);

this.meetings[meeting.ID] = meeting;
sdkMeeting.emit(EVENT_MEETING_UPDATED);
}),
catchError((err) => {
// eslint-disable-next-line no-console
console.error(`Unable to create a meeting with "${destination}"`, err);
Expand Down Expand Up @@ -1391,6 +1392,8 @@ export default class MeetingsSDKAdapter extends MeetingsAdapter {
observer.complete();
});

const meetingUpdateEvent$ = fromEvent(sdkMeeting, EVENT_MEETING_UPDATED);

const meetingWithMediaReadyEvent$ = fromEvent(sdkMeeting, EVENT_MEDIA_READY).pipe(
filter((event) => MEDIA_EVENT_TYPES.includes(event.type)),
map((event) => this.attachMedia(ID, event)),
Expand Down Expand Up @@ -1441,6 +1444,7 @@ export default class MeetingsSDKAdapter extends MeetingsAdapter {
);

const meetingsWithEvents$ = merge(
meetingUpdateEvent$,
meetingWithMediaReadyEvent$,
meetingWithMediaStoppedEvent$,
meetingWithLocalUpdateEvent$,
Expand Down

0 comments on commit 4e9dc62

Please sign in to comment.