@reactoo/watchtogether-sdk-js 2.8.1 → 2.8.4

package/example/index.html

@@ -580,6 +580,9 @@
             Instance.room.getSessionByConstructId(constructId).restart()
         }
 
+        window.testData = function() {
+            Instance.room.getSessionByConstructId(constructId).sendMessageViaDataChannel(null, {cicina:true})
+        }
 
     </script>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reactoo/watchtogether-sdk-js",
-  "version": "2.8.1",
+  "version": "2.8.4",
   "description": "Javascript SDK for Reactoo",
   "main": "dist/watchtogether-sdk.min.js",
   "module": "dist/watchtogether-sdk.min.js",

package/src/models/room-session.js

@@ -57,6 +57,9 @@ let roomSession = function ({roomId, pinHash, role, options = {}}, room, wt) {
 	room.on('data', (data) => {
 		___.__parseDataEvents(data);
 	});
+	room.on('dataMessage', (data) => {
+		___.__parseDataMessageEvents(data);
+	})
 
 	return (___ = {
 
@@ -189,8 +192,12 @@ let roomSession = function ({roomId, pinHash, role, options = {}}, room, wt) {
 
 		},
 
+		__parseDataMessageEvents: function(msg = {}) {
+			emitter.emit('dataMessage', msg);
+		},
 
 		__parseDataEvents: function (msg = {}) {
+
 			if (msg.videoroom === 'message') {
 				if (msg.action === 'pending_shutdown' || msg.action === 'shutting_down') {
 					emitter.emit('scaling');
@@ -422,6 +429,10 @@ let roomSession = function ({roomId, pinHash, role, options = {}}, room, wt) {
 			});
 		},
 
+		sendMessageViaDataChannel: (label, data) => {
+			room.sendMessageViaDataChannel(label, data);
+		},
+
 		__requestMuteStatus: function () {
 			this.sendSystemMessage('remote_muted_request');
 		},

package/src/modules/wt-room-sfu.js

@@ -313,6 +313,7 @@ class RoomSession {
 			this.#enableDebug();
 		}
 
+
 	}
 
 	#httpAPICall = function(url, options) {
@@ -882,6 +883,23 @@ class RoomSession {
 		}
 	}
 
+	sendMessageViaDataChannel(label = this.defaultDataChannelLabel, data) {
+		if(this.#publisherHandle) {
+			if(label === null) {
+				Object.keys(this.#publisherHandle.webrtcStuff.dataChannel).forEach((key) => {
+					const channel = this.#publisherHandle.webrtcStuff.dataChannel[key];
+					channel.send(JSON.stringify(data));
+				})
+			}
+			else {
+				const channel = this.#publisherHandle.webrtcStuff.dataChannel[label];
+				if(channel) {
+					channel.send(JSON.stringify(data));
+				}
+			}
+		}
+	}
+
 	async sendMessage(handleId, message = {body: 'Example Body'}, dontWait = false, dontResolveOnAck = false, retry = 0) {
 		return this.#send({
 			"janus": "message",
@@ -1041,7 +1059,7 @@ class RoomSession {
 		this.#reconnect()
 			.catch(e => {
 				if(e.type !== 'warning') {
-					this.disconnect();
+					this.disconnect().catch(() => {});
 				}
 				this.emit('error', e)
 			});
@@ -1380,8 +1398,6 @@ class RoomSession {
 				config.dataChannelOpen = this.defaultDataChannelLabel === data?.label && data?.state === 'open';
 			}
 
-
-
 			if (handleId === this.handleId && this.defaultDataChannelLabel === data?.label) {
 				this._isDataChannelOpen = data?.state === 'open';
 				this.emit('dataChannel', data?.state === 'open');
@@ -1394,19 +1410,8 @@ class RoomSession {
 				type: 'warning',
 				id: 12,
 				message: 'data event warning',
-				data: [handleId, data]
+				data: [handleId, data, data.error?.message, data.error?.errorDetail]
 			});
-
-			if (handle) {
-				let config = handle.webrtcStuff;
-				if(this.defaultDataChannelLabel === data.label) {
-					config.dataChannelOpen = false;
-				}
-			}
-			if (handleId === this.handleId && this.defaultDataChannelLabel === data.label) {
-				this._isDataChannelOpen = false;
-				this.emit('dataChannel', false);
-			}
 		}
 
 		if (handleId === this.handleId && type === 'message') {
@@ -1422,6 +1427,18 @@ class RoomSession {
 			this.emit('data', d);
 		}
 
+		if(handleId !== this.handleId && type === 'message') {
+			let d = null;
+
+			try {
+				d = JSON.parse(data)
+			} catch (e) {
+				this.emit('error', {type: 'warning', id: 45, message: 'data message parse error', data: [handleId, e]});
+				return;
+			}
+			this.emit('dataMessage', d);
+		}
+
 	}
 
 	async #createHandle() {
@@ -1977,7 +1994,10 @@ class RoomSession {
 		this.#wipeListeners();
 
 		if(!this.useWebsockets) {
-			await this.#send({"janus": "destroy"}, true);
+
+			if(this.token) {
+				await this.#send({"janus": "destroy"}, true);
+			}
 		}
 
 		else if (this.ws && this.ws.readyState === 1) {
@@ -1986,7 +2006,18 @@ class RoomSession {
 		}
 
 		this.#subscriberJoinPromise = null;
+
 		this.sessionId = null;
+		this.server = null;
+		this.protocol = null;
+		this.iceServers = null;
+		this.token = null;
+		this.roomId = null;
+		this.pin = null;
+		this.id = null;
+		this.display = null;
+		this.userId = null;
+
 		this.isPublished = false;
 		this.isConnected = false;
 		this.isDisconnecting = false;