teleportxr 1.0.69 → 1.0.71

package/client/client.js

@@ -289,6 +289,11 @@ class Client {
 			this.webRtcConnectionManager.destroyConnection(this.clientID);
 		this.webRtcConnection=null;
 		this.webRtcConnectionManager=null;
+		// Clear connected state so UpdateStreaming stops iterating and the
+		// timeout reaper can handle removal if the client is still in the map.
+		this.webRtcConnected=false;
+		this.webRtcConnectedAtMs=0;
+		this.webRtcConnectionInitiatedAtMs=0;
 	}
 	// Generic message acknowledgement. Certain kinds of message are expected to be ack'ed.
 	ReceiveAcknowledgement(data)
@@ -529,7 +534,7 @@ class Client {
 		const view2 = new DataView(buffer, 0, nodeSize);
 		if(!this.webRtcConnection)
 		{
-			console.error("this.webRtcConnection is null");
+			console.error("Client "+this.clientID+", SendNode "+uid+": this.webRtcConnection is null");
 			return;
 		}
 		if(!this.webRtcConnection.isGeometryOpen())
@@ -539,7 +544,7 @@ class Client {
 			return;
 		}
 		const sendSuccess = this.webRtcConnection.sendGeometry(view2);
-		console.log("Sending node "+uid+" "+node.name+" to Client "+this.clientID+", size: "+nodeSize+" bytes — "+
+		console.log("[T+"+this.elapsedMsSinceStart()+"ms, conn+"+this.elapsedMsSinceConnected()+"ms] Sending node "+uid+" "+node.name+" to Client "+this.clientID+", size: "+nodeSize+" bytes — "+
 			(sendSuccess ? "OK" : "FAILED"));
 		if(sendSuccess)
 			this.geometryService.EncodedResource(uid);
@@ -568,7 +573,7 @@ class Client {
 			return;
 		}
 		const sendSuccess = this.webRtcConnection.sendGeometry(view2);
-		console.log("Sending resource "+uid+" "+resource.url+" to Client "+this.clientID+", size: "+resourceSize+" bytes — "+
+		console.log("[T+"+this.elapsedMsSinceStart()+"ms, conn+"+this.elapsedMsSinceConnected()+"ms] Sending resource "+uid+" "+resource.url+" to Client "+this.clientID+", size: "+resourceSize+" bytes — "+
 			(sendSuccess ? "OK" : "FAILED"));
 		if(sendSuccess)
 			this.geometryService.EncodedResource(uid);

package/client/client_manager.js

@@ -116,11 +116,11 @@ class ClientManager
 		return c;
 	}
 	disconnectClient(clientID) {
-		// then we tell the client manager to start this client.
 		var c=this.GetClient(clientID);
 		if(!c)
 			return;
 		c.StopStreaming();
+		this.RemoveClient(clientID);
 	}
 	writeState() {
 		var content="<table><tr><th>Client Id</th><th>IP Address</th><th>Signalling State</th></tr>";

package/package.json

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

package/test/test_webrtc_connection_timeout.js

@@ -58,6 +58,43 @@ test('hasWebRtcConnectionTimedOut returns true when over timeout', async () => {
 	assert.strictEqual(c.hasWebRtcConnectionTimedOut(), true);
 });
 
+test('Client.StopStreaming clears webRtcConnected flags', () => {
+	// Simulate a connected client whose underlying connection is being torn down.
+	const c = makeStubClient({ clientID: 99 });
+	c.webRtcConnected = true;
+	c.webRtcConnectedAtMs = Date.now() - 5000;
+	c.webRtcConnectionInitiatedAtMs = Date.now() - 6000;
+	c.webRtcConnection = {};
+	c.webRtcConnectionManager = { destroyConnection: () => {} };
+
+	// Call the real StopStreaming from the prototype.
+	Client.prototype.StopStreaming.call(c);
+
+	assert.strictEqual(c.webRtcConnected, false, 'webRtcConnected must be false after StopStreaming');
+	assert.strictEqual(c.webRtcConnectedAtMs, 0, 'webRtcConnectedAtMs must be reset');
+	assert.strictEqual(c.webRtcConnectionInitiatedAtMs, 0, 'webRtcConnectionInitiatedAtMs must be reset');
+	assert.strictEqual(c.webRtcConnection, null, 'webRtcConnection must be null');
+});
+
+test('ClientManager.disconnectClient removes client from map', () => {
+	const cm = new ClientManager();
+	const stopStreamingCalled = [];
+
+	const c = makeStubClient({ clientID: 42 });
+	// Replace StopStreaming so we can track it and exercise the real path.
+	c.webRtcConnectionManager = null;
+	// Bind real StopStreaming but track the call.
+	const realStop = Client.prototype.StopStreaming.bind(c);
+	c.StopStreaming = () => { stopStreamingCalled.push(42); realStop(); };
+
+	cm.clients.set(42, c);
+
+	cm.disconnectClient(42);
+
+	assert.deepStrictEqual(stopStreamingCalled, [42], 'StopStreaming must be called');
+	assert.strictEqual(cm.clients.has(42), false, 'client must be removed from the map');
+});
+
 test('ClientManager.UpdateStreaming removes timed-out clients', async () => {
 	const cm = new ClientManager();
 	const clientsRemoved = [];