teleportxr 1.0.22 → 1.0.24

package/connections/webrtcconnection.js

@@ -18,15 +18,15 @@ class WebRtcConnection extends EventEmitter
 	constructor(id, options = {})
 	{
 		super();
-		const iceServers=[
-			"stun:stun.l.google.com:19302"
-			];
-		this.iceServers = [] ;
-		for(const s in iceServers)
-		{
-			this.iceServers.push({ 'urls': iceServers[s] });
-		}
-		//this.iceServers=[{'urls': 'stun:stun.l.google.com:19302'}];
+		const defaultIceServers = [
+			{ urls: "stun:stun.l.google.com:19302" }
+		];
+		this.iceServers = (options && Array.isArray(options.iceServers) && options.iceServers.length)
+			? options.iceServers
+			: defaultIceServers;
+		this.iceTransportPolicy = (options && (options.iceTransportPolicy === 'all' || options.iceTransportPolicy === 'relay'))
+			? options.iceTransportPolicy
+			: 'all';
 		this.id = id;
 		this.state = 'open';
 
@@ -40,17 +40,19 @@ class WebRtcConnection extends EventEmitter
 			...options
 		};
 
-		const {
-			RTCPeerConnection,
-			timeToConnected,
-			timeToReconnected
-		} = options;
-
 		this.messageReceivedReliableCb		=options.messageReceivedReliable;
 		this.messageReceivedUnreliableCb	=options.messageReceivedUnreliable;
 		this.connectionStateChangedCb=options.connectionStateChanged;
 		this.sendConfigMessage		=options.sendConfigMessage;
 
+		this._onIceConnectionStateChange = this.onIceConnectionStateChange.bind(this);
+		this._onIceGatheringStateChange  = this.onIceGatheringStateChange.bind(this);
+		this._onConnectionStateChange    = this.connectionStateChanged.bind(this);
+		this._onIceCandidateError = (event) =>
+		{
+			console.log("ICE candidate error: "+event.errorCode+" "+event.errorText+" "+event.port+" "+event.url);
+		};
+
 
 		Object.defineProperties(this, {
 			iceConnectionState: {
@@ -88,7 +90,7 @@ class WebRtcConnection extends EventEmitter
 	}
 	reconnect()
 	{
-		this.peerConnection		=new DefaultRTCPeerConnection({ sdpSemantics: 'unified-plan', 'iceServers': this.iceServers});
+		this.peerConnection		=new DefaultRTCPeerConnection({ sdpSemantics: 'unified-plan', iceServers: this.iceServers, iceTransportPolicy: this.iceTransportPolicy});
 		this.beforeOffer();
 		this.connectionTimer = this.options.setTimeout(() =>
 		{
@@ -102,14 +104,10 @@ class WebRtcConnection extends EventEmitter
 
 		this.reconnectionTimer = null;
 
-		this.peerConnection.addEventListener('iceconnectionstatechange', this.onIceConnectionStateChange.bind(this));
-		this.peerConnection.addEventListener('icegatheringstatechange', this.onIceGatheringStateChange.bind(this));
-		this.peerConnection.addEventListener("icecandidateerror", (event) => {
-
-            console.log("ICE candidate error: "+event.errorCode+" "+event.errorText+" "+event.port+" "+event.url);
-		});
-        
-        this.peerConnection.addEventListener("connectionstatechange", this.connectionStateChanged.bind(this));
+		this.peerConnection.addEventListener('iceconnectionstatechange', this._onIceConnectionStateChange);
+		this.peerConnection.addEventListener('icegatheringstatechange', this._onIceGatheringStateChange);
+		this.peerConnection.addEventListener("icecandidateerror", this._onIceCandidateError);
+		this.peerConnection.addEventListener("connectionstatechange", this._onConnectionStateChange);
 
         this.onIceCandidate= ({ candidate })=>
         {
@@ -144,11 +142,11 @@ class WebRtcConnection extends EventEmitter
         
             this.timeout = options.setTimeout(() =>
             {
-                peerConnection.removeEventListener('icecandidate', this.onIceCandidate.bind(this));
+                peerConnection.removeEventListener('icecandidate', this.onIceCandidate);
                 this.deferred.reject(new Error('Timed out waiting for host candidates'));
             }, timeToHostCandidates);
-        
-            peerConnection.addEventListener('icecandidate', this.onIceCandidate.bind(this));
+
+            peerConnection.addEventListener('icecandidate', this.onIceCandidate);
         
             await this.deferred.promise;
         }
@@ -256,13 +254,14 @@ class WebRtcConnection extends EventEmitter
 		console.log("WebRtcConnection.close()");
 		if(this.peerConnection)
 		{
-			this.peerConnection.removeEventListener('iceconnectionstatechange', this.onIceConnectionStateChange.bind(this));
-
-			this.peerConnection.eve
-			this.peerConnection.removeEventListener('iceconnectionstatechange', this.onIceConnectionStateChange.bind(this));
-			this.peerConnection.removeEventListener('icegatheringstatechange', this.onIceGatheringStateChange.bind(this));
-		//this.peerConnection.removeEventListener("icecandidateerror", (event) => {
-			this.peerConnection.removeEventListener("connectionstatechange", this.connectionStateChanged.bind(this));
+			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);
+			}
 		}
 		if (this.connectionTimer)
 		{

package/connections/webrtcconnectionmanager.js

@@ -39,9 +39,16 @@ class WebRtcConnectionManager
 
 	createConnection(clientID,connectionStateChangedCb,messageReceivedReliableCb,messageReceivedUnreliableCb)
 	{
+		const existing = this.connections.get(clientID);
+		if (existing)
+		{
+			console.log("createConnection: replacing existing connection for "+clientID);
+			existing.close();
+			this.connections.delete(clientID);
+		}
 		var options=this.options;
 		options.sendConfigMessage	=this.sendConfigMessage;
-        
+
 		options.messageReceivedReliable		=messageReceivedReliableCb;
 		options.messageReceivedUnreliable	=messageReceivedUnreliableCb;
 		options.connectionStateChanged		=connectionStateChangedCb;
@@ -73,6 +80,16 @@ class WebRtcConnectionManager
 	{
 		this.sendConfigMessage=cfm;
 	}
+	SetIceServers(iceServers)
+	{
+		if (Array.isArray(iceServers))
+			this.options.iceServers=iceServers;
+	}
+	SetIceTransportPolicy(policy)
+	{
+		if (policy === 'all' || policy === 'relay')
+			this.options.iceTransportPolicy=policy;
+	}
 }
 
 WebRtcConnectionManager.create = function create (options)

package/index.js

@@ -21,10 +21,14 @@ function generateRandomBigInt() {
 
 const serverID = generateRandomBigInt();
 
-function initServer(signaling_port) {
+function initServer(signaling_port, options) {
 	var cm=client_manager.getInstance();
 	const webRtcConnectionManager = WebRtcConnectionManager.getInstance();
 	webRtcConnectionManager.SetSendConfigMessage(signaling.sendConfigMessage);
+	if (options && Array.isArray(options.iceServers))
+		webRtcConnectionManager.SetIceServers(options.iceServers);
+	if (options && options.iceTransportPolicy)
+		webRtcConnectionManager.SetIceTransportPolicy(options.iceTransportPolicy);
 	return signaling.init(serverID, webRtcConnectionManager,cm.newClient.bind(cm),cm.disconnectClient.bind(cm),signaling_port);
   }
   

package/package.json

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