@reactoo/watchtogether-sdk-js 2.4.33 → 2.4.40

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 => {
 
@@ -153,37 +153,6 @@
             })
             .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
-                    })
-			            .then(r => console.log('wooo',r))
-
-				})
-
-	          ;
-
-            	Instance.user.getVideos({type:'room', roomId, includeUserModels: true});
-
-	            // Instance.user.getUserSelf().then(r => {
-	            // 	console.log(r.data._id);
-	            // 	return Instance.room.queue({roomId, operation:'join', userId:r.data._id});
-                // }).then(r => {
-                // 	console.log(r.data);
-		        //     return Instance.room.queue({roomId, operation:'status'});
-                // })
-                // .then(r => {
-                // 	console.log(r.data);
-	            //     return Instance.room.queue({roomId,userId:'eu-west-1:f3532bdd-cc3a-4c62-a77e-4f1f544d8fa9', operation:'approve'});
-                // })
-                // .then(r => {
-                //     console.log(r.data);
-                // })
-
-	           //
-
 
 
                 sessionHandler = session;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reactoo/watchtogether-sdk-js",
-  "version": "2.4.33",
+  "version": "2.4.40",
   "description": "Javascript SDK for Reactoo",
   "main": "src/index.js",
   "unpkg": "dist/watchtogether-sdk.min.js",
@@ -29,7 +29,7 @@
     "@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.0",
+    "@babel/preset-env": "^7.16.4",
     "acorn": "^6.4.2",
     "babel-core": "^6.26.3",
     "babel-loader": "^8.2.3",

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

@@ -29,11 +29,7 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 	};
 	
 	const emitter = _emitter_();
-	
 	let alpTimeoutId = null;
-	let publishRetry = 0;
-	const maxPublishRetry = 3;
-	
 	let ___; // return object
 	
 	room.on('addLocalParticipant', () => {

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);
 	}