teleportxr 1.0.26 → 1.0.28

package/client/client.js

@@ -221,7 +221,7 @@ class Client {
 	}
 	ProcessNodePoses(headPose,numPoses,nodePoses)
 	{
-		console.log("Client: ProcessNodePoses ", numPoses, " poses.");
+		//console.log("Client: ProcessNodePoses ", numPoses, " poses.");
 	}
 	UpdateStreaming()
 	{

package/connections/webrtcconnection.js

@@ -21,9 +21,22 @@ class WebRtcConnection extends EventEmitter
 		const defaultIceServers = [
 			{ urls: "stun:stun.l.google.com:19302" }
 		];
-		this.iceServers = (options && Array.isArray(options.iceServers) && options.iceServers.length)
+		const requestedIceServers = (options && Array.isArray(options.iceServers) && options.iceServers.length)
 			? options.iceServers
 			: defaultIceServers;
+		// @roamhq/wrtc rejects the entire iceServers array if any TURN entry lacks
+		// credentials, and TURN can't function without auth, so drop those with a warning.
+		this.iceServers = requestedIceServers.filter((s) =>
+		{
+			const urls = Array.isArray(s.urls) ? s.urls : [s.urls];
+			const isTurn = urls.some((u) => u && (u.startsWith('turn:') || u.startsWith('turns:')));
+			if (isTurn && (!s.username || !s.credential))
+			{
+				console.warn("WebRtcConnection: skipping TURN entry without credentials: "+JSON.stringify(s));
+				return false;
+			}
+			return true;
+		});
 		this.iceTransportPolicy = (options && (options.iceTransportPolicy === 'all' || options.iceTransportPolicy === 'relay'))
 			? options.iceTransportPolicy
 			: 'all';
@@ -113,9 +126,8 @@ class WebRtcConnection extends EventEmitter
         {
             if (!candidate)
             {
-                this.options.clearTimeout(this.timeout);
-                //this.peerConnection.removeEventListener('icecandidate', this.onIceCandidate);
-                this.deferred.resolve();
+                if (this.iceGatheringSettle)
+                    this.iceGatheringSettle();
                 return;
             }
             // send the candidate
@@ -130,24 +142,42 @@ class WebRtcConnection extends EventEmitter
             {
                 return;
             }
-        
+
             const { timeToHostCandidates } = options;
-        
+
             this.deferred = {};
             this.deferred.promise = new Promise((resolve, reject) =>
             {
                 this.deferred.resolve = resolve;
                 this.deferred.reject = reject;
             });
-        
-            this.timeout = options.setTimeout(() =>
+
+            const onGatheringStateChange = () =>
             {
-                peerConnection.removeEventListener('icecandidate', this.onIceCandidate);
-                this.deferred.reject(new Error('Timed out waiting for host candidates'));
-            }, timeToHostCandidates);
+                if (peerConnection.iceGatheringState === 'complete')
+                    this.iceGatheringSettle();
+            };
 
+            let settled = false;
+            this.iceGatheringSettle = () =>
+            {
+                if (settled) return;
+                settled = true;
+                this.options.clearTimeout(this.timeout);
+                peerConnection.removeEventListener('icegatheringstatechange', onGatheringStateChange);
+                this.deferred.resolve();
+            };
+
+            // Trickle ICE is in use; the offer and any already-gathered candidates
+            // have been sent. If gathering is slow (e.g. a TURN allocation is
+            // timing out), resolve rather than reject so doOffer does not tear
+            // down the connection. Remaining candidates will still be sent by
+            // the persistent 'icecandidate' listener.
+            this.timeout = options.setTimeout(() => this.iceGatheringSettle(), timeToHostCandidates);
+
+            peerConnection.addEventListener('icegatheringstatechange', onGatheringStateChange);
             peerConnection.addEventListener('icecandidate', this.onIceCandidate);
-        
+
             await this.deferred.promise;
         }
         

package/package.json

@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "@lightningjs/msdf-generator": "^1.1.1",
-    "@roamhq/wrtc": "^0.8.0",
+    "@roamhq/wrtc": "^0.10.0",
     "bitset": "^5.2.3",
     "get-current-line": "^7.4.0",
     "microtime": "^3.1.1",
@@ -15,7 +15,7 @@
   },
   "name": "teleportxr",
   "description": "Teleport Spatial Server on node.js",
-  "version": "1.0.26",
+  "version": "1.0.28",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/simul/teleport-nodejs.git"