teleportxr 1.0.39 → 1.0.41

package/client/client.js

@@ -131,15 +131,15 @@ class Client {
 			if(this.scene.backgroundTexturePath&&this.scene.backgroundTexturePath!="")
 			{
 				this.setupCommand.BackgroundMode_backgroundMode=BackgroundMode.TEXTURE;
-				this.setupCommand.uid_backgroundTexture=resources.AddTexture(this.scene.backgroundTexturePath);
+				this.setupCommand.uid_backgroundTexture=resources.GetOrAddTexture(this.scene.backgroundTexturePath);
 			}
 			if(this.scene.diffuseCubemapPath&&this.scene.diffuseCubemapPath!="")
 			{
-				this.clientDynamicLighting.uid_diffuse_cubemap_texture_uid=resources.AddTexture(this.scene.diffuseCubemapPath);
+				this.clientDynamicLighting.uid_diffuse_cubemap_texture_uid=resources.GetOrAddTexture(this.scene.diffuseCubemapPath);
 			}
 			if(this.scene.specularCubemapPath&&this.scene.specularCubemapPath!="")
 			{
-				this.clientDynamicLighting.uid_specular_cubemap_texture_uid=resources.AddTexture(this.scene.specularCubemapPath);
+				this.clientDynamicLighting.uid_specular_cubemap_texture_uid=resources.GetOrAddTexture(this.scene.specularCubemapPath);
 			}
 		}
 

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.39",
+  "version": "1.0.41",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/simul/teleport-nodejs.git"

package/scene/node.js

@@ -247,7 +247,7 @@ class Node {
 		return Node.sizeof();
 	}
 	setMeshComponent(mesh_url) {
-		resources.AddMesh(mesh_url);
+		resources.GetOrAddMesh(mesh_url);
 		this.components.forEach((component) => {
 			if (component.getType() == NodeDataType.Mesh) {
 				component.meshUrl = mesh_url;

package/scene/resources.js

@@ -150,7 +150,10 @@ function AddTypedResource(typename, path) {
 	return uid;
 }
 
-function AddResourceFromUrl(type, url) {
+function GetOrAddResourceFromUrl(type, url) {
+	if (Resource.pathToUid.has(url)) {
+		return Resource.pathToUid.get(url);
+	}
 	var uid = core.generateUid();
 	var res = null;
 	switch (type) {
@@ -159,7 +162,7 @@ function AddResourceFromUrl(type, url) {
 			throw new Error(
 				"Type ",
 				type,
-				" can't be instantiated with AddResourceFromUrl()."
+				" can't be instantiated with GetOrAddResourceFromUrl()."
 			);
 			break;
 		default:
@@ -186,7 +189,7 @@ function GetOrAddResourceUidFromUrl(type, url){
 		return uid;
 	if(!url)
 		return 0;
-	return AddResourceFromUrl(type, url);
+	return GetOrAddResourceFromUrl(type, url);
 }
 
 function GetResourceFromUrl(url) {
@@ -202,14 +205,14 @@ function GetResourceFromUid(uid) {
 	return res;
 }
 
-//! Add the texture url as a resource.
-function AddTexture(url) {
-	return AddResourceFromUrl(core.GeometryPayloadType.TexturePointer, url);
+//! Get or add the texture url as a resource.
+function GetOrAddTexture(url) {
+	return GetOrAddResourceFromUrl(core.GeometryPayloadType.TexturePointer, url);
 }
 
-//! Add the texture url as a resource.
-function AddMesh(url) {
-	return AddResourceFromUrl(core.GeometryPayloadType.MeshPointer, url);
+//! Get or add the mesh url as a resource.
+function GetOrAddMesh(url) {
+	return GetOrAddResourceFromUrl(core.GeometryPayloadType.MeshPointer, url);
 }
 
 function AddFontAtlas(path) {
@@ -233,8 +236,8 @@ module.exports = {
 	GetResourceUidFromUrl,
 	GetOrAddResourceUidFromUrl,
 	GetResourceFromUid,
-	AddTexture,
-	AddMesh,
+	GetOrAddTexture,
+	GetOrAddMesh,
 	AddFontAtlas,
 	AddTextCanvas,
 	AddTypedResource,

package/scene/scene.js

@@ -176,17 +176,17 @@ class Scene {
 			if(j.environment.background_texture)
 			{
 				this.backgroundTexturePath=j.environment.background_texture;
-				resources.AddTexture(this.backgroundTexturePath);
+				resources.GetOrAddTexture(this.backgroundTexturePath);
 			}
 			if(j.environment.diffuse_cubemap)
 			{
 				this.diffuseCubemapPath=j.environment.diffuse_cubemap;
-				resources.AddTexture(this.diffuseCubemapPath);
+				resources.GetOrAddTexture(this.diffuseCubemapPath);
 			}
 			if(j.environment.specular_cubemap)
 			{
 				this.specularCubemapPath=j.environment.specular_cubemap;
-				resources.AddTexture(this.specularCubemapPath);
+				resources.GetOrAddTexture(this.specularCubemapPath);
 			}
 		}
 		if(j.font_atlases)