@reactoo/watchtogether-sdk-js 2.6.67 → 2.6.69

package/example/index.html

@@ -14,8 +14,9 @@
         <button onclick="startRoom()">Connect and publish</button>
         <button onclick="startRoom2()">Connect and publish with screen share</button>
         <button onclick="disconnectRoom()">Disconnect</button>
-        <button onclick="publish()">publish</button>
-        <button onclick="publishBlank()">publish blank</button>
+        <button onclick="publish()">publish cam</button>
+        <button onclick="publishBlankCam()">publish blank cam</button>
+        <button onclick="publishBlank()">publish blank screen</button>
         <button onclick="publishScreen()">publish screen</button>
         <button onclick="unpublish()">unpublish</button>
         <button onclick="toggleVideo()">toggle video</button>
@@ -33,7 +34,6 @@
         let roomId = "c22ada04-6c95-4524-91d8-e915bcef2e61"; //It will create room automatically if not set
         let pinHash = "OayoOVzK-XmWr-BTID-fVwH-eH44Tn3xSWeR";//'967ca05f-7fab-a205-5913-39393bbbe923';
 
-
         let participants = document.querySelector('.participants');
         var video = document.querySelector('.contentVideo');
         let constructId = 'test';
@@ -47,8 +47,8 @@
         //     });
         // }
 
-        function selectSubStream(handleId, substream) {
-            Instance.room.getSessionByConstructId(constructId).selectSubStream(handleId, substream);
+        function selectSubStream(handleId, substream, source) {
+            return Instance.room.getSessionByConstructId(constructId).selectSubStream(handleId, substream, source);
         }
 
         function hento() {
@@ -107,7 +107,7 @@
         function startRoom() {
             let sess = Instance.room.getSessionByConstructId(constructId);
             sess.connect()
-                    .then(() => Instance.utils.getUserStream({hasVideo:true, hasAudio: true}))
+                    .then(() => Instance.utils.getUserStream({hasVideo:true, hasAudio: true, isHd: true}))
                     .then((stream) => sess.publishLocal(stream))
         }
 
@@ -124,6 +124,11 @@
             Instance.room.getSessionByConstructId(constructId).unpublishLocal()
         }
 
+        function publishBlankCam() {
+            let sess = Instance.room.getSessionByConstructId(constructId);
+            sess.publishLocal(null, 'camera0')
+        }
+
         function publishBlank() {
             let sess = Instance.room.getSessionByConstructId(constructId);
             sess.publishLocal(null, 'screen')
@@ -157,7 +162,7 @@
             Instance.room.getSessionByConstructId(constructId).setTalkIntercomChannels(groups)
         }
 
-        let Instance = WatchTogetherSDK({debug:true, apiUrl: 'https://api.reactoo.com/stefan/swagger.json'})({instanceType:'reactooDemo'});
+        let Instance = WatchTogetherSDK({debug:true})({instanceType:'reactooDemo'});
 
         Instance.auth.$on('login', () => {
             console.log('We are in');
@@ -201,19 +206,26 @@
                         console.log('roomId:', r.data.roomId);
                         console.log('pinHash:', r.data.pinHash);
                         console.log('-----------------------------------------------------');
-
                         return r.data;
                     })
-
             })
             .then(r => Instance.room.createSession({constructId, roomId:r.roomId, pinHash: r.pinHash, role:'participant', options: {
-                //subscriptionRules: {participant: {videoWall: [], watchTogether: []}}
-                //restrictSources: ['camera0']
-            }})) // pin hash is not needed if you're owner of the room
+                    simulcast: true,
+                    simulcastMode: {default: 'controlled', screen: 'manual'},
+                    simulcastDefaultManualSubstream: {default:2, screen: 0},
+                    simulcastBitrates: [
+                        { rid: 'l', active: true, maxBitrate: 180000, maxFramerate: 2, scaleResolutionDownBy: 3.3333333333333335, priority: "low" },
+                        { rid: 'm', active: true, maxBitrate: 800000, maxFramerate: 25, scaleResolutionDownBy: 1.3333333333333333, priority: "low" },
+                        { rid: 'h', active: true, maxBitrate: 1700000, maxFramerate: 30, priority: "low" }
+                    ],
+                    // simulcastMode: 'manual',
+                    // simulcastDefaultManualSubstream: 2 // lowest quality
+                    //subscriptionRules: {participant: {videoWall: [], watchTogether: []}}
+            }}))
             .then(session => {
 
-                session.setTalkIntercomChannels([]);
-                session.setListenIntercomChannels([]);
+                // session.setTalkIntercomChannels([]);
+                // session.setListenIntercomChannels([]);
 
                 session.$on('connecting', (status) => {
                     console.log('connecting', status);

package/package.json

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

package/src/models/room-session.js

@@ -18,9 +18,10 @@ import syncDaznDash from "../modules/sync-modules/sync-dazn-dash";
 import syncDazn from "../modules/sync-modules/sync-dazn";
 import syncModule from "../modules/sync-modules/sync-module";
 
-let roomSession = function ({roomId, pinHash, role}, room, wt) {
+let roomSession = function ({roomId, pinHash, role, options = {}}, room, wt) {
 
 	let primaryRoomId = roomId;
+	let {simulcast, simulcastBitrates, simulcastMode, simulcastDefaultManualSubstream} = options;
 	let publicCustomEvents = ['changePlayerSource', 'chatMessage', 'userUpdate', 'reconnecting', 'connecting', 'remoteMuted', 'scaling'];
 
 	const addEvents = (events) => {
@@ -117,8 +118,10 @@ let roomSession = function ({roomId, pinHash, role}, room, wt) {
 						roomData.data.webrtcVersion,
 						(roomData.data.bitrate ? parseInt(roomData.data.bitrate) : 0),
 						roomData.data.recordingFilename,
-						roomData.data.simulcast,
-						roomData.data.simulcastBitrates || {}
+						simulcast !== null ? simulcast : roomData.data.simulcast,
+						simulcastBitrates !== null ? simulcastBitrates : roomData.data.simulcastBitrates,
+						simulcastMode !== null ? simulcastMode : roomData.data.simulcastMode,
+						simulcastDefaultManualSubstream !== null ? simulcastDefaultManualSubstream : roomData.data.simulcastDefaultManualSubstream,
 					)
 				})
 				.finally(() => {
@@ -356,8 +359,12 @@ let roomSession = function ({roomId, pinHash, role}, room, wt) {
 			return room._listenIntercomChannels;
 		},
 
-		selectSubStream: (handleId, substream) => {
-			return room.selectSubStream(handleId, substream);
+		requestKeyFrame: (handleId, mid) => {
+			return room.requestKeyFrame(handleId, mid);
+		},
+
+		selectSubStream: (handleId, substream, source, mid) => {
+			return room.selectSubStream(handleId, substream, source, mid);
 		},
 
 		setBitrateCap: (bitrate) => {

package/src/models/room.js

@@ -274,6 +274,7 @@ let room = function () {
 					roomId,
 					pinHash,
 					role,
+					options
 				}, lib.createSession(constructId, 'reactooroom', options), this))
 				.then(newSession => {
 					let existingSessionIndex = roomSessions.findIndex(session => session.constructId === newSession.constructId);