@reactoo/watchtogether-sdk-js 2.5.16 → 2.5.18

package/example/audio_controls/audio_controls.html

@@ -69,7 +69,8 @@
 			attack: 0.001,
 			release: 0.15,
 			speed: "medium"
-		}
+		},
+		delay: 0,
 	};
 
 	let roomId = "03159020-59a8-4d10-a801-8aef895141a3";
@@ -90,7 +91,6 @@
 	const streamContainerElement = document.getElementById('stream-container');
 	const streamElement = document.getElementById('stream');
 	const roomIdInputElement = document.getElementById('room-id');
-	const producerLinkElement = document.getElementById('producer-link');
 
 	document.addEventListener("DOMContentLoaded", function() {
 		audioControls = new AudioControls();

package/example/audio_controls/audiocontrols.js

@@ -14,6 +14,7 @@ class AudioControls {
 	gainNode;
 	equalizerNodes; // List of nodes
 	compressorNode;
+	delayNode;
 	streamDestination;
 
 	gainDefaultParameters = {
@@ -35,15 +36,22 @@ class AudioControls {
 		attack: 0.001,	// from 0 to 1		0 - no time required to reduce the gain by 10 dB
 		release: 0.15,	// from 0 to 1		0 - no time required to increase the gain by 10 dB
 	};
+	delayDefaultParameters = {
+		delay: 0
+	};
 
 	constructor() {
 		this.audioContext = new ac();
 
 		this.streamDestination = this.audioContext.createMediaStreamDestination();
 
+		this.delayNode = this.audioContext.createDelay(179);
+		this.setDelay(this.delayDefaultParameters.delay);
+		this.delayNode.connect(this.streamDestination);
+
 		this.compressorNode = this.audioContext.createDynamicsCompressor();
 		this.setCompressorParameters(this.compressorDefaultParameters);
-		this.compressorNode.connect(this.streamDestination);
+		this.compressorNode.connect(this.delayNode);
 
 		this.equalizerNodes = this.equalizerDefaultParameters.map( parameters => {
 			const biquadFilter = this.audioContext.createBiquadFilter();
@@ -62,9 +70,8 @@ class AudioControls {
 			}
 		});
 
-		this.gainParameters = {...this.gainDefaultParameters};
 		this.gainNode = this.audioContext.createGain();
-		this.setGain(this.gainParameters.gain);
+		this.setGain(this.gainDefaultParameters.gain);
 		this.gainNode.connect(this.equalizerNodes[0]);
 
 		this.streamSource = null;
@@ -188,17 +195,23 @@ class AudioControls {
 		});
 	}
 
+	setDelay(delay) {
+		this.delayNode.delayTime.setValueAtTime(delay, Math.floor(this.audioContext.currentTime));
+	}
+
 	setParametersFromAudioControlsObject(audioControlsObject) {
 		if (audioControlsObject.enabled) {
 			this.setGain(audioControlsObject.gain.value);
 			Object.keys(audioControlsObject.equalizer)
 				.forEach(type => this.setEqualizerParameters(audioControlsObject.equalizer[type], type));
 			this.setCompressorParameters(audioControlsObject.compressor);
+			this.setDelay(audioControlsObject.delay);
 		} else {
-			this.setGain(this.gainParameters.gain);
+			this.setGain(this.gainDefaultParameters.gain);
 			this.equalizerDefaultParameters
 				.forEach( p => this.setEqualizerParameters(p));
 			this.setCompressorParameters(this.compressorDefaultParameters);
+			this.setDelay(0);
 		}
 	}
 

package/example/index.html

@@ -17,7 +17,6 @@
         <button onclick="unpublish()">unpublish</button>
         <button onclick="toggleVideo()">toggle video</button>
         <button onclick="toggleAudio()">toggle audio</button>
-        <button onclick="setRoom()">gulugulu</button>
     </div>
 
 </div>
@@ -71,47 +70,35 @@
 
 
         function disconnectRoom() {
-            Instance.room.getSessionByConstructId(constructId)
-                    .then(session => session.disconnect());
+            Instance.room.getSessionByConstructId(constructId).disconnect()
         }
 
         function startRoom() {
-            Instance.room.getSessionByConstructId(constructId)
-                    .then(session => session.connect())
-                    .then(() => Instance.room.getSessionByConstructId(constructId))
-                    .then(session => session.publishLocal(null, {getStreamIfEmpty: true, unpublishFirst:true}))
+            let sess = Instance.room.getSessionByConstructId(constructId);
+            sess.connect()
+                    .then(() => Instance.utils.getUserStream({hasVideo:true}))
+                    .then((stream) => sess.publishLocal(stream))
         }
 
         function unpublish() {
-            Instance.room.getSessionByConstructId(constructId)
-                    .then(session => session.unpublishLocal());
+            Instance.room.getSessionByConstructId(constructId).unpublishLocal()
         }
 
         function publish() {
-            Instance.room.getSessionByConstructId(constructId)
-                    .then(session => session.publishLocal(null, {unpublishFirst:true}));
+            Instance.room.getSessionByConstructId(constructId).publishLocal(null, {unpublishFirst:true})
 
         }
 
         function toggleVideo() {
-            Instance.room.getSessionByConstructId(constructId)
-                    .then(session => session.toggleVideo());
+            Instance.room.getSessionByConstructId(constructId).toggleVideo()
         }
 
         function toggleAudio() {
-            Instance.room.getSessionByConstructId(constructId)
-                    .then(session => session.toggleAudio());
-        }
-
-        function setRoom() {
-            Instance.room.updateRoom({roomId, isPublic: false})
+            Instance.room.getSessionByConstructId(constructId).toggleAudio()
         }
 
         let Instance = WatchTogetherSDK({debug:true})({instanceType:'reactooDemo'});
 
-
-
-
         Instance.auth.$on('login', () => {
             console.log('We are in');
         });
@@ -160,7 +147,9 @@
                     })
 
             })
-            .then(r => Instance.room.createSession({constructId, roomId:r.roomId, pinHash: r.pinHash})) // pin hash is not needed if you're owner of the room
+            .then(r => Instance.room.createSession({constructId, roomId:r.roomId, pinHash: r.pinHash, options: {
+                //subscriptionRules: {participant: {videoWall: [], watchTogether: []}}
+                }})) // pin hash is not needed if you're owner of the room
             .then(session => {
 
                 session.$on('connecting', (status) => {

package/package.json

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

package/src/models/room-session.js

@@ -35,7 +35,7 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 
 	room.on('addLocalParticipant', () => {
 
-		// TODO: this doesnt seem to be fixable until we switch to differen type of messaging
+		// TODO: this doesnt seem to be fixable until we switch to different type of messaging
 		// At some random case we don't get message back if we don't wait
 
 		clearTimeout(alpTimeoutId);
@@ -189,10 +189,10 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 			}
 		},
 
-		renderPlayer: function (playerWrapper, fullscreenElement) {
+		renderPlayer: function (playerWrapper, fullscreenElement, roomId) {
 			try {
 				this.syncModule = syncUniversal({room, wt, roomSession: this, emitter});
-				this.playerInterface = wt.__privates.playerFactory(playerWrapper, fullscreenElement, this.syncModule.getHandlers(), {roomId: room.roomId});
+				this.playerInterface = wt.__privates.playerFactory(playerWrapper, fullscreenElement, this.syncModule.getHandlers(), {roomId});
 				this.syncModule.initialize({playerInterface: this.playerInterface});
 				return true;
 			} catch (e) {