teleportxr 1.0.40 → 1.0.42

package/client/client.js

@@ -125,6 +125,10 @@ class Client {
     {
         this.setupCommand=new command.SetupCommand();
         this.clientDynamicLighting=new core.ClientDynamicLighting();
+		// Session is (re)starting; the client has zero state, so retract any
+		// outstanding ack tracking from a previous session and force a resend.
+		this.currentOriginState   = new OriginState();
+		this.currentLightingState = new LightingState();
 		this.setupCommand.float32_draw_distance=10.0;
 		if(this.scene)
 		{
@@ -348,7 +352,25 @@ class Client {
 		var setl					=new command.SetLightingCommand();
 		setl.uint64_ackId			=this.next_ack_id++;
 		setl.ClientDynamicLighting_clientDynamicLighting = this.clientDynamicLighting;
-		
+
+		// Log in declaration order matching ClientDynamicLighting / SetLightingCommand structs.
+		const cdl = setl.ClientDynamicLighting_clientDynamicLighting;
+		console.log("\n===== NODE SERVER SENDING SETLIGHTINGCOMMAND =====");
+		console.log(JSON.stringify({
+			ack_id: setl.uint64_ackId.toString(),
+			specularPos:                  cdl.int2_specularPos,
+			specularCubemapSize:          cdl.int32_specularCubemapSize,
+			specularMips:                 cdl.int32_specularMips,
+			diffusePos:                   cdl.int2_diffusePos,
+			diffuseCubemapSize:           cdl.int32_diffuseCubemapSize,
+			lightPos:                     cdl.int2_lightPos,
+			lightCubemapSize:             cdl.int32_lightCubemapSize,
+			specular_cubemap_texture_uid: cdl.uid_specular_cubemap_texture_uid.toString(),
+			diffuse_cubemap_texture_uid:  cdl.uid_diffuse_cubemap_texture_uid.toString(),
+			lightingMode:                 cdl.LightingMode_lightingMode,
+		}, null, 2));
+		console.log("===== END SETLIGHTINGCOMMAND =====\n");
+
 		// This is now the valid origin.
 		this.currentLightingState.ackId=setl.uint64_ackId;
 		this.currentLightingState.acknowledged=false;

package/connections/webrtcconnection.js

@@ -103,6 +103,21 @@ class WebRtcConnection extends EventEmitter
 	}
 	reconnect()
 	{
+		// Close and clean up the previous PeerConnection before creating a new one.
+		// Failing to do so leaves the old ICE agent (and its UDP socket) alive, which
+		// causes it to keep sending/receiving STUN messages with stale credentials and
+		// confuses the peer's new ICE agent (ufrag mismatch).
+		if (this.peerConnection)
+		{
+			this.peerConnection.removeEventListener('iceconnectionstatechange', this._onIceConnectionStateChange);
+			this.peerConnection.removeEventListener('icegatheringstatechange', this._onIceGatheringStateChange);
+			this.peerConnection.removeEventListener("icecandidateerror", this._onIceCandidateError);
+			this.peerConnection.removeEventListener("connectionstatechange", this._onConnectionStateChange);
+			if (this.onIceCandidate)
+				this.peerConnection.removeEventListener('icecandidate', this.onIceCandidate);
+			try { this.peerConnection.close(); } catch (e) {}
+			this.peerConnection = null;
+		}
 		this.peerConnection		=new DefaultRTCPeerConnection({ sdpSemantics: 'unified-plan', iceServers: this.iceServers, iceTransportPolicy: this.iceTransportPolicy});
 		this.beforeOffer();
 		this.connectionTimer = this.options.setTimeout(() =>
@@ -267,8 +282,9 @@ class WebRtcConnection extends EventEmitter
 		} else if (this.peerConnection.iceConnectionState === 'disconnected'
 			|| this.peerConnection.iceConnectionState === 'failed')
 		{
-			this.peerConnection.restartIce();
-			console.log("restartIce()");
+			// Do not call restartIce() here: reconnect() below creates a brand-new
+			// PeerConnection, so any ICE restart on the old PC is immediately
+			// abandoned and produces a third set of dangling ICE credentials.
 			if (!this.connectionTimer && !this.reconnectionTimer)
 			{
 				const self = this;
@@ -312,21 +328,13 @@ class WebRtcConnection extends EventEmitter
 			this.reconnectionTimer = null;
 		}
 
-		// Check the connection state
-		if(this.peerConnection)
-		if (this.peerConnection.connectionState == "connected" ||
-			this.peerConnection.connectionState == "failed")
+		// Always close the PeerConnection regardless of connectionState.
+		// Previously it was only closed when state was "connected" or "failed",
+		// which left the ICE agent alive (and its socket bound) when state was
+		// "disconnected", causing stale STUN traffic toward the peer on reconnect.
+		if (this.peerConnection)
 		{
-			// Close each track
-		/*	this.peerConnection.cl.forEach(mediaStream => { {
-						mediaStream.videoTracks.forEach( it => {it.setEnabled(false); });
-						mediaStream.audioTracks.forEach( it => {it.setEnabled(false); });
-
-					};
-				});;6'7*/
-
-			// Close the connection
-			this.peerConnection.close();
+			try { this.peerConnection.close(); } catch (e) {}
 		}
 
 		// Nullify the reference

package/package.json

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