@reactoo/watchtogether-sdk-js 2.4.32 → 2.4.36

package/example/index.html

@@ -25,7 +25,7 @@
 
     <script>
 
-        let roomId = '76e9381d-1bde-4da5-81e0-b2863e8ed661'; //It will create room automatically if not set
+        let roomId = 'fc2d34f2-de58-42a0-9312-5cd40f2d754e'; //It will create room automatically if not set
         let pinHash = undefined;//'967ca05f-7fab-a205-5913-39393bbbe923';
 
 
@@ -123,7 +123,7 @@
             console.log('Iot message:', r);
         });
 
-        Instance.auth.login('dusan1', 'abc123ABC') // login as browser
+        Instance.auth.deviceLogin() // login as browser
             .then(r => Instance.iot.iotLogin()) // login to mqtt
             .then(r => {
 
@@ -154,11 +154,7 @@
             .then(r => Instance.room.createSession({roomId:r.roomId, pinHash: r.pinHash})) // pin hash is not needed if you're owner of the room
             .then(session => {
 	            Instance.user.getUserSelf().then(r => {
-		            Instance.user.getIntegrationPublic('sportBuff',{
-			            "operation": "auth",
-			            uuid: r.data._id,
-			            username: r.data.displayname
-                    })
+		            Instance.room.getRoomChatList({roomId})
 			            .then(r => console.log('wooo',r))
 
 				})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reactoo/watchtogether-sdk-js",
-  "version": "2.4.32",
+  "version": "2.4.36",
   "description": "Javascript SDK for Reactoo",
   "main": "src/index.js",
   "unpkg": "dist/watchtogether-sdk.min.js",
@@ -25,14 +25,14 @@
   },
   "homepage": "https://github.com/picitujeromanov/WR-SDK",
   "devDependencies": {
-    "@babel/core": "^7.15.8",
-    "@babel/plugin-proposal-class-properties": "^7.14.5",
-    "@babel/plugin-proposal-optional-chaining": "^7.14.5",
-    "@babel/plugin-proposal-private-property-in-object": "^7.15.4",
-    "@babel/preset-env": "^7.15.8",
+    "@babel/core": "^7.16.0",
+    "@babel/plugin-proposal-class-properties": "^7.16.0",
+    "@babel/plugin-proposal-optional-chaining": "^7.16.0",
+    "@babel/plugin-proposal-private-property-in-object": "^7.16.0",
+    "@babel/preset-env": "^7.16.4",
     "acorn": "^6.4.2",
     "babel-core": "^6.26.3",
-    "babel-loader": "^8.2.2",
+    "babel-loader": "^8.2.3",
     "babel-plugin-add-module-exports": "^1.0.4",
     "babel-preset-env": "^1.7.0",
     "babel-preset-minify": "^0.5.1",

package/src/index.js

@@ -39,9 +39,9 @@ function WatchTogether(modules = {}, instanceType, debug, playerFactory, provide
     this.utils = utils;
 }
 
-let watchTogether = function ({debug = true, isProduction = true, language = 'en-GB', storagePrefix = ""} = {}) {
+let watchTogether = function ({debug = true, isProduction = true, language = 'en-GB', storagePrefix = "", apiUrl = null} = {}) {
     let room = new Room(debug);
-    let auth = new Auth(debug, isProduction, language, storagePrefix);
+    let auth = new Auth(debug, isProduction, language, storagePrefix, apiUrl);
     // let iot = new Iot(debug);
     let iot = new Iot2(debug);
 

package/src/models/room-session.js

@@ -280,26 +280,6 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 		},
 		
 		publishLocal: function (stream = null, {
-			keepAudio = false,
-			keepVideo = false,
-			getStreamIfEmpty = true,
-			askVideo = true,
-			unpublishFirst = false
-		} = {}) {
-			if (room.isLegacy) {
-				return this.publishLocalLegacy(stream, {
-					keepAudio,
-					keepVideo,
-					getStreamIfEmpty,
-					askVideo,
-					unpublishFirst
-				})
-			} else {
-				return this.publishLocalNew(stream, {keepAudio, keepVideo, getStreamIfEmpty, askVideo, unpublishFirst})
-			}
-		},
-		
-		publishLocalNew: function (stream = null, {
 			keepAudio = false,
 			keepVideo = false,
 			getStreamIfEmpty = true,
@@ -310,46 +290,6 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 				: wt.utils.getUserStream(askVideo).then(stream => room.publishLocal(stream)))
 		},
 		
-		publishLocalLegacy: function (stream = null, {
-			keepAudio = false,
-			keepVideo = false,
-			getStreamIfEmpty = true,
-			askVideo = true,
-			unpublishFirst = false
-		} = {}) {
-			return (unpublishFirst
-				? new Promise((resolve, reject) => {
-					emitter.emit('reconnecting', true);
-					room.isRestarting = true;
-					this.unpublishLocal()
-						.then(() => wait(500)) //TODO: remove 500ms wait by waiting for proper events from janus
-						.finally(() => {
-							emitter.emit('reconnecting', false);
-							room.isRestarting = false;
-							resolve()
-						})
-				})
-				: Promise.resolve())
-				.then(() => (
-					stream || !getStreamIfEmpty
-						? room.publishLocal(stream, {keepAudio, keepVideo})
-						: wt.utils.getUserStream(askVideo).then(stream => room.publishLocal(stream))))
-				.then(r => {
-					publishRetry = 0;
-					return r;
-				})
-				.catch(e => {
-					room._log(e);
-					if (e && e.id === 27 && publishRetry < maxPublishRetry) {
-						publishRetry++;
-						return this.restart('firefox', true);
-					} else {
-						publishRetry = 0;
-						return Promise.reject(e);
-					}
-				})
-		},
-		
 		unpublishLocal: () => {
 			return room.unpublishLocal();
 		},

package/src/models/room.js

@@ -159,6 +159,16 @@ let room = function () {
 				}))
 		},
 		
+		getRoomChatList: ({roomId, type = "normal", size = 50, startKey = null} = {}) => {
+			let apiParams = {
+				roomId, type,
+				size,
+				...(startKey && {startKey})
+			};
+			return this.__privates.auth.__client
+				.then(client => client.apis.wt.getRoomChatList(apiParams))
+		},
+		
 		getRoomsList: ({
 			               type = 'participant',
 			               activeOnly = null,
@@ -186,10 +196,10 @@ let room = function () {
 			
 		},
 		
-		setUser: ({userId, roomId, flag, timestamp, option}) => {
+		setUser: ({messageId, userId, roomId, flag, timestamp, option}) => {
 			//leave, kick, ban, unban, approve, report
 			return this.__privates.auth.__client
-				.then(client => client.apis.wt.setUser({userId, roomId, flag, timestamp, option}));
+				.then(client => client.apis.wt.setUser({messageId, userId, roomId, flag, timestamp, option}));
 		},
 		
 		getRoomById: (id, pinHash = undefined, showPublic = undefined, demo = false) => {

package/src/modules/wt-auth.js

@@ -4,7 +4,7 @@ import emitter from './wt-emitter';
 
 class Auth {
 	
-	constructor(enableDebugFlag, isProduction = true, language = 'en-GB', storagePrefix = "") {
+	constructor(enableDebugFlag, isProduction = true, language = 'en-GB', storagePrefix = "", apiUrl = null) {
 		
 		this.ID_TOKEN = `${storagePrefix !== "" ? storagePrefix+'_':''}rwt_idToken`;
 		this.ACCESS_TOKEN = `${storagePrefix !== "" ? storagePrefix+'_':''}rwt_accessToken`;
@@ -22,7 +22,7 @@ class Auth {
 		this.__isRefreshing = false;
 		this.__isLogged = null;
 		this.__parsedJwt = null;
-		this.__specUrl = isProduction === true ? config.apiUrl : config.devApiUrl;
+		this.__specUrl = apiUrl ? apiUrl : (isProduction === true ? config.apiUrl : config.devApiUrl);
 		this.__client = this.initialize(true);
 	}
 	

package/src/modules/wt-room.js

@@ -166,7 +166,8 @@ class RoomSession {
 	
 	constructor(enableDebugFlag, type = 'reactooroom', options = {
 		classroomObserverSubscribeToInstructor: false,
-		classroomInstructorSubscribeToParticipants: false
+		classroomInstructorSubscribeToParticipants: false,
+		safariBugHotfixEnabled: true
 	}) {
 		
 		this.server = null;
@@ -177,7 +178,6 @@ class RoomSession {
 		this.pin = null;
 		this.userId = null;
 		this.sessiontype = type;
-		this.isLegacy = false;
 		this.initialBitrate = 0;
 		this.isMonitor = false; // currently used just for classroom context so monitor user only subscribes to participants and not trainer (for other monitor this flag is not necessary)
 		this.recordingFilename = null;
@@ -532,32 +532,16 @@ class RoomSession {
 							this._log('Creating user: ', userId);
 							this._createParticipant(userId, id)
 								.then(handle => {
-									if (this.isLegacy) {
-										return this.sendMessage(handle.handleId, {
-											body: {
-												"request": "join",
-												"room": this.roomId,
-												"ptype": "subscriber",
-												streams: streams.length ? streams.map(s => ({
-													feed: s.id,
-													mid: s.mid
-												})) : undefined,
-												"private_id": this.privateId,
-												pin: this.pin
-											}
-										})
-									} else {
-										return this.sendMessage(handle.handleId, {
-											body: {
-												"request": "join",
-												"room": this.roomId,
-												"ptype": "subscriber",
-												"feed": id,
-												"private_id": this.privateId,
-												pin: this.pin
-											}
-										})
-									}
+									return this.sendMessage(handle.handleId, {
+										body: {
+											"request": "join",
+											"room": this.roomId,
+											"ptype": "subscriber",
+											"feed": id,
+											"private_id": this.privateId,
+											pin: this.pin
+										}
+									})
 								})
 								.catch(err => {
 									this.emit('error', err);
@@ -642,32 +626,16 @@ class RoomSession {
 							this._log('Creating user: ', userId);
 							this._createParticipant(userId, id)
 								.then(handle => {
-									if (this.isLegacy) {
-										return this.sendMessage(handle.handleId, {
-											body: {
-												"request": "join",
-												"room": this.roomId,
-												"ptype": "subscriber",
-												streams: streams.length ? streams.map(s => ({
-													feed: s.id,
-													mid: s.mid
-												})) : undefined,
-												"private_id": this.privateId,
-												pin: this.pin
-											}
-										})
-									} else {
-										return this.sendMessage(handle.handleId, {
-											body: {
-												"request": "join",
-												"room": this.roomId,
-												"ptype": "subscriber",
-												"feed": id,
-												"private_id": this.privateId,
-												pin: this.pin
-											}
-										})
-									}
+									return this.sendMessage(handle.handleId, {
+										body: {
+											"request": "join",
+											"room": this.roomId,
+											"ptype": "subscriber",
+											"feed": id,
+											"private_id": this.privateId,
+											pin: this.pin
+										}
+									})
 								})
 								.catch(err => {
 									this.emit('error', err);
@@ -1047,7 +1015,6 @@ class RoomSession {
 			this._wipeListeners();
 		}
 		this._stopKeepAlive();
-		this.isLegacy = webrtcVersion < 104;
 		this.disconnectingPromise = null;
 		this.sessionId = null;
 		this.server = server;
@@ -1452,7 +1419,7 @@ class RoomSession {
 				this._handleDataEvents(handleId, 'error', error);
 			};
 			// Until we implement the proxying of open requests within the Janus core, we open a channel ourselves whatever the case
-			config.dataChannel = config.pc.createDataChannel(defaultDataChannelLabel, {ordered: !this.isLegacy});
+			config.dataChannel = config.pc.createDataChannel(defaultDataChannelLabel, {ordered: true});
 			config.dataChannel.onmessage = onDataChannelMessage;
 			config.dataChannel.onopen = onDataChannelStateChange;
 			config.dataChannel.onclose = onDataChannelStateChange;
@@ -2033,14 +2000,19 @@ class RoomSession {
 			return Promise.reject({type: 'error', id: 21, message: 'no local id, connect first', data: null})
 		}
 		let config = handle.webrtcStuff;
-		if (this.isUnifiedPlan) {
+		
+		if(this.options.safariBugHotfixEnabled && adapter.browserDetails.browser === 'safari') {
+			this.isVideoMuted = !this.isVideoMuted;
+		}
+		else if (this.isUnifiedPlan) {
 			let transceiver = config.pc.getTransceivers()
 				.find(t => t.sender && t.sender.track && t.receiver.track.kind === "video" && t.stopped === false);
 			if (transceiver) {
 				transceiver.sender.track.enabled = !transceiver.sender.track.enabled;
 			}
 			this.isVideoMuted = !transceiver || !transceiver.sender.track.enabled;
-		} else {
+		}
+		else {
 			if (config.stream && config.stream.getVideoTracks().length) {
 				config.stream.getVideoTracks()[0].enabled = !config.stream.getVideoTracks()[0].enabled;
 			}