@reactoo/watchtogether-sdk-js 2.5.85 → 2.5.87

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reactoo/watchtogether-sdk-js",
-  "version": "2.5.85",
+  "version": "2.5.87",
   "description": "Javascript SDK for Reactoo",
   "main": "src/index.js",
   "unpkg": "dist/watchtogether-sdk.min.js",

package/src/modules/wt-room.js

@@ -1966,9 +1966,73 @@ class RoomSession {
 
 		this._setupTransceivers(this.handleId, [hasAudio, false, hasVideo, false]);
 
+		const emitEvents = () => {
+			this.isPublished = true;
+			if(config.stream) {
+				let tracks = config.stream.getTracks();
+				tracks.forEach(track => {
+					// used as a flag to not emit tracks that been already emitted
+					if(!track.onended) {
+						this.emit('addLocalParticipant', {
+							tid: generateUUID(),
+							id: handle.handleId,
+							userId: decodeJanusDisplay(handle.userId)?.userId,
+							role: decodeJanusDisplay(this.display)?.role,
+							track,
+							stream: config.stream,
+							adding: true,
+							constructId: this.constructId,
+							metaData: this.options.metaData,
+							hasAudioTrack: hasAudio,
+							hasVideoTrack: hasVideo
+						});
+						track.onended = (ev) => {
+							this.emit('addLocalParticipant', {
+								tid:generateUUID(),
+								id: handle.handleId,
+								userId: decodeJanusDisplay(handle.userId)?.userId,
+								role: decodeJanusDisplay(this.display)?.role,
+								track: ev.target,
+								stream: config.stream,
+								adding: false,
+								removing: true,
+								constructId: this.constructId,
+								metaData: this.options.metaData,
+								hasAudioTrack: hasAudio,
+								hasVideoTrack: hasVideo
+							});
+						}
+					}
+				})
+			}
+			else {
+				this.emit('addLocalParticipant', {
+					tid: generateUUID(),
+					id: handle.handleId,
+					userId: decodeJanusDisplay(handle.userId)?.userId,
+					role: decodeJanusDisplay(this.display)?.role,
+					stream: null,
+					adding: false,
+					constructId: this.constructId,
+					metaData: this.options.metaData,
+					hasAudioTrack: hasAudio,
+					hasVideoTrack: hasVideo
+				});
+			}
+			this.emit('published', {status: true, hasStream: !!config.stream});
+			this.emit('publishing', false);
+			this.emit('localHasVideo', hasVideo);
+			this.emit('localHasAudio', hasAudio);
+			this.emit('localMuted', {type: 'video', value: isVideoMuted});
+			this.emit('localMuted', {type: 'audio', value: isAudioMuted});
+			return this;
+		};
+
 		// this should be enough
 		if(this.isPublished) {
-			return Promise.resolve();
+			return Promise
+				.all([audioTrackReplacePromise, videoTrackReplacePromise])
+				.then(() => emitEvents())
 		}
 
 		return Promise
@@ -2024,67 +2088,7 @@ class RoomSession {
 					});
 				}
 			})
-			.then(r => {
-				this.isPublished = true;
-				if(config.stream) {
-					let tracks = config.stream.getTracks();
-					tracks.forEach(track => {
-						// used as a flag to not emit tracks that been already emitted
-						if(!track.onended) {
-							this.emit('addLocalParticipant', {
-								tid: generateUUID(),
-								id: handle.handleId,
-								userId: decodeJanusDisplay(handle.userId)?.userId,
-								role: decodeJanusDisplay(this.display)?.role,
-								track,
-								stream: config.stream,
-								adding: true,
-								constructId: this.constructId,
-								metaData: this.options.metaData,
-								hasAudioTrack: hasAudio,
-								hasVideoTrack: hasVideo
-							});
-							track.onended = (ev) => {
-								this.emit('addLocalParticipant', {
-									tid:generateUUID(),
-									id: handle.handleId,
-									userId: decodeJanusDisplay(handle.userId)?.userId,
-									role: decodeJanusDisplay(this.display)?.role,
-									track: ev.target,
-									stream: config.stream,
-									adding: false,
-									removing: true,
-									constructId: this.constructId,
-									metaData: this.options.metaData,
-									hasAudioTrack: hasAudio,
-									hasVideoTrack: hasVideo
-								});
-							}
-						}
-					})
-				} else {
-					this.emit('addLocalParticipant', {
-						tid: generateUUID(),
-						id: handle.handleId,
-						userId: decodeJanusDisplay(handle.userId)?.userId,
-						role: decodeJanusDisplay(this.display)?.role,
-						stream: null,
-						adding: false,
-						constructId: this.constructId,
-						metaData: this.options.metaData,
-						hasAudioTrack: hasAudio,
-						hasVideoTrack: hasVideo
-					});
-				}
-
-				this.emit('published', {status: true, hasStream: !!config.stream});
-				this.emit('publishing', false);
-				this.emit('localHasVideo', hasVideo);
-				this.emit('localHasAudio', hasAudio);
-				this.emit('localMuted', {type: 'video', value: isVideoMuted});
-				this.emit('localMuted', {type: 'audio', value: isAudioMuted});
-				return r;
-			})
+			.then(() => emitEvents())
 			.catch(e => {
 				this.emit('publishing', false);
 				return Promise.reject(e);