teleportxr 1.0.17 → 1.0.18

package/client/client.js

@@ -38,7 +38,7 @@ class Client {
 	tick(timestamp){
 		this.geometryService.GetNodesToSend();
 	}
-    streamingConnectionStateChanged(wrtcConn,newState)
+    streamingConnectionStateChanged(newState)
     {
         //this.webRtcConnection=wrtcConn;
 		// This should have come from our own existing webRtcConnection and nowhere else.

package/connections/webrtcconnection.js

@@ -48,7 +48,7 @@ class WebRtcConnection extends EventEmitter
 
 		this.messageReceivedReliableCb		=options.messageReceivedReliable;
 		this.messageReceivedUnreliableCb	=options.messageReceivedUnreliable;
-		
+		this.connectionStateChangedCb=options.connectionStateChanged;
 		this.sendConfigMessage		=options.sendConfigMessage;
 
 
@@ -80,7 +80,12 @@ class WebRtcConnection extends EventEmitter
 		});
 		this.reconnect();
 	}
-
+	connectionStateChanged()
+	{
+		if(!this.peerConnection)
+			return;
+		this.connectionStateChangedCb(this.peerConnection.connectionState);
+	}
 	reconnect()
 	{
 		this.peerConnection		=new DefaultRTCPeerConnection({ sdpSemantics: 'unified-plan', 'iceServers': this.iceServers});
@@ -104,7 +109,7 @@ class WebRtcConnection extends EventEmitter
             console.log("ICE candidate error: "+event.errorCode+" "+event.errorText+" "+event.port+" "+event.url);
 		});
         
-        this.peerConnection.addEventListener("connectionstatechange", this.connectionStateChanged.bind(this,this.peerConnection.connectionState));
+        this.peerConnection.addEventListener("connectionstatechange", this.connectionStateChanged.bind(this));
 
         this.onIceCandidate= ({ candidate })=>
         {
@@ -162,7 +167,6 @@ class WebRtcConnection extends EventEmitter
                 console.error("doOffer error: "+error.toString());
 				this.close();
                 console.log("doOffer close");
-				throw error;
 			}
 		};
 
@@ -180,6 +184,7 @@ class WebRtcConnection extends EventEmitter
             var sessionDescription=new wrtc.RTCSessionDescription();
             sessionDescription.sdp=answer;
             sessionDescription.type="answer";
+			if(this.peerConnection)
 			await this.peerConnection.setRemoteDescription( sessionDescription);
 		};
 		this.applyRemoteCandidate = async(candidate_txt,mid,mlineindex)=>
@@ -190,6 +195,7 @@ class WebRtcConnection extends EventEmitter
               sdpMLineIndex: mlineindex,
               sdpMid: mid
 			  });
+			if(this.peerConnection)
             this.peerConnection.addIceCandidate(ice).catch((e)=>{
 				console.log(`Failure during addIceCandidate(): ${e.name}`);
 			});
@@ -207,12 +213,6 @@ class WebRtcConnection extends EventEmitter
 			};
 		};
 	}
-	connectionStateChanged()
-	{
-		if(!this.peerConnection)
-			return;
-		console.log("Connection State changed to: "+this.peerConnection.connectionState.toString());
-	}
 	onIceConnectionStateChange()
 	{
 		if(!this.peerConnection)
@@ -262,7 +262,7 @@ class WebRtcConnection extends EventEmitter
 			this.peerConnection.removeEventListener('iceconnectionstatechange', this.onIceConnectionStateChange.bind(this));
 			this.peerConnection.removeEventListener('icegatheringstatechange', this.onIceGatheringStateChange.bind(this));
 		//this.peerConnection.removeEventListener("icecandidateerror", (event) => {
-			this.peerConnection.removeEventListener("connectionstatechange", this.connectionStateChanged.bind(this,this.peerConnection.connectionState));
+			this.peerConnection.removeEventListener("connectionstatechange", this.connectionStateChanged.bind(this));
 		}
 		if (this.connectionTimer)
 		{

package/connections/webrtcconnectionmanager.js

@@ -36,16 +36,16 @@ class WebRtcConnectionManager
 	closedListener()
 	{
 		this.deleteConnection(connection);
-		}
+	}
 	createConnection(clientID,connectionStateChangedcb,messageReceivedReliableCb,messageReceivedUnreliableCb)
-        {
+	{
 		var options=this.options;
-			options.sendConfigMessage	=this.sendConfigMessage;
-           
-			options.messageReceivedReliable		=messageReceivedReliableCb;
-			options.messageReceivedUnreliable	=messageReceivedUnreliableCb;
+		options.sendConfigMessage	=this.sendConfigMessage;
+        
+		options.messageReceivedReliable		=messageReceivedReliableCb;
+		options.messageReceivedUnreliable	=messageReceivedUnreliableCb;
+		options.connectionStateChanged		=connectionStateChangedCb;
         const connection = new WebRtcConnection(clientID,options);
-            connection.connectionStateChanged=connectionStateChangedcb;
         //  We will not add a "closed" listener, because only the client object will be permitted to close its connection.
 		//this.createConnection = (clientID) => this.closedListeners.set(connection, this.closedListener);
         //connection.once('closed', this.closedListener);

package/package.json

@@ -13,7 +13,7 @@
   },
   "name": "teleportxr",
   "description": "Teleport Spatial Server on node.js",
-  "version": "1.0.17",
+  "version": "1.0.18",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/simul/teleport-nodejs.git"