teleportxr 1.0.75 → 1.0.77

package/connections/webrtcconnection.js

@@ -121,6 +121,10 @@ class WebRtcConnection extends EventEmitter
 			this.peerConnection = null;
 		}
 		this.peerConnection		=new DefaultRTCPeerConnection({ sdpSemantics: 'unified-plan', iceServers: this.iceServers, iceTransportPolicy: this.iceTransportPolicy});
+		// New PeerConnection means new data channels — the "all channels open"
+		// callback must be allowed to fire again. Without this reset the latch from
+		// the previous PeerConnection's lifetime suppresses UpdateStreaming kick.
+		this._dataChannelsOpenFired = false;
 		this.beforeOffer();
 		this.connectionTimer = this.options.setTimeout(() =>
 		{

package/package.json

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

package/scene/node.js

@@ -267,12 +267,12 @@ class Node {
 		this.components.push(m);
 	}
 	setCanvasComponent(canvas_path) {
-		this. components.forEach((component) => {
+		this.components.forEach((component) => {
 			if (component.getType() == NodeDataType.TextCanvas) {
 				component.canvasPath = canvas_path;
 				component.data_uid = resources.GetResourceUidFromUrl(
-					core.GeometryPayloadType.FontAtlas,
-					canvas_name
+					core.GeometryPayloadType.TextCanvas,
+					canvas_path
 				);
 				return;
 			}
@@ -280,7 +280,7 @@ class Node {
 		var tc = new TextCanvasComponent();
 		tc.canvasPath = canvas_path;
 		tc.data_uid = resources.GetResourceUidFromUrl(
-			core.GeometryPayloadType.FontAtlas,
+			core.GeometryPayloadType.TextCanvas,
 			canvas_path
 		);
 		this.components.push(tc);

package/signaling.js

@@ -133,14 +133,20 @@ function processInitialRequest(clientID, signalingClient, content) {
 		// Apparently the CLIENT thinks they've disconnected.
 		// The client might, as far as we know, have lost the information it needs to continue the connection.
 		// Therefore we should resend everything required.
-		//signalingClient.ChangeSignalingState(SignalingState.STREAMING);
 		console.log(
 			"Warning: Client " +
 				clientID +
 				" reconnected, but we didn't know we'd lost them."
 		);
-		// It may be just that the connection request was already in flight when we accepted its predecessor.
-		//sendResponseToClient(clientID);
+		// Tear down any stale Client + WebRtcConnection from the previous incarnation.
+		// Without this the next handshake's StartStreaming() races against the old
+		// peer connection's still-open data channels, and the reliable channel the
+		// server publishes commands to ends up being the wrong one — Origin/Lighting
+		// acks never come back and the server eventually gives up.
+		disconnectClient(clientID);
+		if (webRtcConnectionManager)
+			webRtcConnectionManager.destroyConnection(clientID);
+		signalingClient.ChangeSignalingState(SignalingState.START);
 		startStreaming(signalingClient);
 		return;
 	}