teleportxr 1.0.9 → 1.0.11

package/client/client.js

@@ -111,6 +111,7 @@ class Client {
     Start()
     {
         this.setupCommand=new command.SetupCommand();
+		this.setupCommand.float32_draw_distance=10.0;
 		if(this.scene)
 		{
 			if(this.scene.backgroundTexturePath&&this.scene.backgroundTexturePath!="")

package/client/client_manager.js

@@ -47,7 +47,7 @@ class ClientManager
 				error("Failed to create a root node for client "+clientID);
 				return null;
 			}
-			var sigCli=signaling.signalingClients[clientID];
+			var sigCli=signaling.signalingClients.get(clientID);
 			var sigSend=sigCli.sendToClient.bind(sigCli);
 			var c=new client.Client(clientID,sigSend);
 			c.setOrigin(origin_uid);
@@ -97,7 +97,7 @@ class ClientManager
 	writeState() {
 		var content="<table><tr><th>Client Id</th><th>IP Address</th><th>Signalling State</th></tr>";
 		for (let [cl_id,cl] of this.clients) {
-			var sigCli=signaling.signalingClients[cl_id];
+			var sigCli=signaling.signalingClients.get(cl_id);
 			content+="\n<tr><td>"+cl_id+"</td> <td>" + sigCli.ip + "</td> <td>" + sigCli.signalingState + "</td></tr>";
 		};
 		content+="\n</table>";

package/client/geometry_service.js

@@ -27,30 +27,30 @@ class TrackedResource
         this.acknowledged=new bit.BitSet();	        // Whether the client acknowledged receiving the resource.		
     }
 	IsNeededByClient(clientID) {
-		return this.clientNeeds.get[clientIDToIndex[clientID]];
+		return this.clientNeeds.get(clientIDToIndex.get(clientID));
 	}
 	WasSentToClient(clientID) {
-		return this.sent.get[clientIDToIndex[clientID]];
+		return this.sent.get(clientIDToIndex.get(clientID));
 	}
 	WasAcknowledgedByClient(clientID) {
-		return this.acknowledged.get(clientIDToIndex[clientID]);
+		return this.acknowledged.get(clientIDToIndex.get(clientID));
 	}
 	GetTimeSent(clientID) {
-		return this.sent_server_time_us[clientID];
+		return this.sent_server_time_us.get(clientID);
 	}
 	Sent(clientID,timestamp) {
-		this.sent.set(clientIDToIndex[clientID],true);
-		this.acknowledged.set(clientIDToIndex[clientID],false);
+		this.sent.set(clientIDToIndex.get(clientID),true);
+		this.acknowledged.set(clientIDToIndex.get(clientID),false);
 		this.sent_server_time_us.set(clientID,timestamp);
 	}
 	AcknowledgeBy(clientID) {
-		this.acknowledged.set(clientIDToIndex[clientID],true);
+		this.acknowledged.set(clientIDToIndex.get(clientID),true);
 		// erase timestamp?
 		this.sent_server_time_us.delete(clientID);
 	}
 	Timeout(clientID) {
-		this.sent.set(clientIDToIndex[clientID],false);
-		this.acknowledged.set(clientIDToIndex[clientID],false);
+		this.sent.set(clientIDToIndex.get(clientID),false);
+		this.acknowledged.set(clientIDToIndex.get(clientID),false);
 		this.sent_server_time_us.clear(clientID);
 	}
 };
@@ -92,6 +92,8 @@ class GeometryService
 		this.streamedFontAtlases=new Map();
 
 		this.backgroundTextureUid=0;
+		// ten seconds for timeout. Tweak this.
+		this.timeout_us=10000000;
     }
 	SetScene(sc) {
 		this.scene=sc;
@@ -299,8 +301,6 @@ class GeometryService
 
 	UpdateNodesToStream()
 	{
-		// ten seconds for timeout. Tweak this.
-		const timeout_us=10000000;
 		//  The set of ALL the nodes of sufficient priority that the client NEEDS is streamedNodes.
 		for(let uid of this.nodesToStreamEventually)
 		{
@@ -343,7 +343,7 @@ class GeometryService
 			{
 				var timeSentUs=res.GetTimeSent(this.clientID);
 				// If we sent it too long ago with no acknowledgement, we can send it again.
-				if(time_now_us-timeSentUs>timeout_us)
+				if(time_now_us-timeSentUs>this.timeout_us)
 				{
 					res.Timeout(this.clientID);
 				}
@@ -382,12 +382,11 @@ class GeometryService
 			// If it was already received we don't send it:
 			if(res.WasAcknowledgedByClient(this.clientID))
 				continue;
-			res.Sent(this.clientID,time_now_us);
 			if(res.WasSentToClient(this.clientID))
 			{
 				var timeSentUs=res.GetTimeSent(this.clientID);
 				// If we sent it too long ago with no acknowledgement, we can send it again.
-				if(time_now_us-timeSentUs>timeout_us)
+				if(time_now_us-timeSentUs>this.timeout_us)
 				{
 					res.Timeout(this.clientID);
 				}
@@ -396,6 +395,7 @@ class GeometryService
 			{
 				// if it hasn't been sent at all to our client, we add its resources.
 				resource_uids.push(uid);
+				res.Sent(this.clientID,time_now_us);
 			}
 		};
 		return resource_uids;

package/connections/webrtcconnection.js

@@ -127,7 +127,10 @@ class WebRtcConnection extends EventEmitter
 
 		this.peerConnection.addEventListener('iceconnectionstatechange', onIceConnectionStateChange);
 		this.peerConnection.addEventListener('icegatheringstatechange', onIceGatheringStateChange);
+		this.peerConnection.addEventListener("icecandidateerror", (event) => {
 
+            console.log("ICE candidate error: "+str(event.errorCode)+" "+event.errorText+" "+event.port+" "+event.url);
+		});
         
 		const onConnectionStateChange = () =>
         {

package/package.json

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

package/scene/scene.js

@@ -60,6 +60,7 @@ class Scene {
 				if (pose) {
 					n.pose.position = { x: pose.position[0], y: pose.position[1], z: pose.position[2] };
 					n.pose.orientation = { x: pose.orientation[0], y: pose.orientation[1], z: pose.orientation[2], w: pose.orientation[3] };
+					n.pose.scale = { x: pose.scale[0], y: pose.scale[1], z: pose.scale[2] };
 				}
 				const components = sub_obj["components"];
 				if (components) {

package/signaling.js

@@ -60,7 +60,7 @@ function sendResponseToClient(clientID) {
 	if (!signalingClients.has(clientID)) {
         console.log("No client "+clientID+" found.");
 	} else {
-        var signalingClient=signalingClients[clientID];
+        var signalingClient=signalingClients.get(clientID);
 		// First, we send the WebSockets signaling response.
 		var txt =
 			'{"teleport-signal-type":"request-response","content":{"clientID": ' +
@@ -96,7 +96,7 @@ function processInitialRequest(clientID, signalingClient, content) {
 		}
 		// identifies as a previous client. Discard the new client ID.
 		//TODO: we're taking the client's word for it that it is clientID. Some kind of token/hash?
-		signalingClients[clientID] = signalingClient;
+		signalingClients.set(clientID,signalingClient);
 		if (j_clientID != clientID) {
 			console.log(
 				"info: Remapped from " + clientID + " to " + j_clientID
@@ -106,36 +106,39 @@ function processInitialRequest(clientID, signalingClient, content) {
 			);
 
 			if (signalingClients.has(clientID)) {
-				signalingClients[clientID] = null;
+				signalingClients.delete(clientID);
 				clientUids.erase(clientID);
 			}
 			clientID = j_clientID;
 		}
 	}
 	var ipAddr = signalingClient.ip_addr_port;
+	if (desiredIP.length != 0 && !ipAddr.contains(desiredIP))
+		return;
 	// Skip clients we have already added.
 	if (signalingClient.signalingState == SignalingState.START)
 		signalingClient.ChangeSignalingState(SignalingState.REQUESTED);
+	//Ignore connections from clients with the wrong IP, if a desired IP has been set.
 	// if signalingState is START, we should not have a client...
-	if (signalingClient.client != null) {
+	if (signalingClient.signalingState==SignalingState.ACCEPTED||signalingClient.signalingState==SignalingState.STREAMING)
+	{
 		// ok, we've received a connection request from a client that WE think we already have.
 		// 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);
+		//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);
+		//sendResponseToClient(clientID);
+		startStreaming(signalingClient);
 		return;
 	}
-	if (signalingClient.signalingState != SignalingState.REQUESTED)
-        return;
-	//Ignore connections from clients with the wrong IP, if a desired IP has been set.
-	if (desiredIP.length == 0 || ipAddr.contains(desiredIP)) {
+	if (signalingClient.signalingState==SignalingState.REQUESTED)
+	{
 		startStreaming(signalingClient);
 	}
 }
@@ -252,7 +255,7 @@ exports.sendConfigMessage = function (clientID, msg) {
 
 	if (signalingClients.has(clientID)) {
 		console.log("sendConfigMessage to "+clientID+": "+msg);
-		signalingClients[clientID].ws.send(escapedStr);
+		signalingClients.get(clientID).ws.send(escapedStr);
 	} else {
 		console.log(
 			"sendConfigMessage with clientID " +