teleportxr 1.0.6 → 1.0.8

package/index.js

@@ -3,11 +3,11 @@ const WebRtcConnectionManager	= require('./connections/webrtcconnectionmanager.j
 const signaling					=require("./signaling.js");
 const client_manager 			= require('./client/client_manager.js');
 
-function initServer() {
+function initServer(signaling_port) {
 	var cm=client_manager.getInstance();
 	const webRtcConnectionManager = WebRtcConnectionManager.getInstance();
 	webRtcConnectionManager.SetSendConfigMessage(signaling.sendConfigMessage);
-	signaling.init(webRtcConnectionManager,cm.newClient.bind(cm));
+	return signaling.init(webRtcConnectionManager,cm.newClient.bind(cm),signaling_port);
   }
   
-  module.exports = {initServer}
+  module.exports = {initServer}

package/package.json

@@ -12,8 +12,8 @@
     "start": "node server.js"
   },
   "name": "teleportxr",
-  "description": "A minimal Teleport server on node.js",
-  "version": "1.0.6",
+  "description": "Teleport Spatial Server on node.js",
+  "version": "1.0.8",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/simul/teleport-nodejs.git"
@@ -29,7 +29,8 @@
 	"./signaling": "./signaling.js",
 	"./client/client_manager": "./client/client_manager.js",
     "./connections/webrtcconnectionmanager": "./connections/webrtcconnectionmanager.js",
-	"./scene/scene":"./scene/scene.js"
+	"./scene/scene":"./scene/scene.js",
+	"./scene/resources":"./scene/resources.js"
   },
   "publishConfig": {
   }

package/scene/resources.js

@@ -9,6 +9,11 @@ class Resource
 	//! One trackedResources shared acrosss all clients.
 	static resourcesByUid=new Map();
 	static pathToUid=new Map();
+	static defaultPathRoot="http://localhost";
+	static SetDefaultPathRoot(str)
+	{
+		Resource.defaultPathRoot=str;
+	}
     constructor(type,uid,url)
     {
 		this.uid=uid;
@@ -18,7 +23,10 @@ class Resource
 	encodeIntoDataView(dataView,byteOffset) {
 		byteOffset=core.put_uint8(dataView,byteOffset,this.type);
 		byteOffset=core.put_uint64(dataView,byteOffset,this.uid);
-		byteOffset=core.put_string(dataView,byteOffset,this.url);
+		var url=this.url;
+		if(this.url.search("://")==-1)
+			url=Resource.defaultPathRoot+this.url;
+		byteOffset=core.put_string(dataView,byteOffset,url);
 		return byteOffset;
 	}
 }

package/signaling.js

@@ -214,17 +214,26 @@ function OnWebSocket(ws, req) {
 		console.log("Some Error occurred");
 	};
 }
-exports.init = function (webRtcCM,newClientFn) {
+exports.init = function (webRtcCM, newClientFn, signaling_port) {
 	// Creating a new websocket server
-	const signaling_port = process.env.PORT || 8081;
-	const wss = new WebSocketServer.Server({ port: signaling_port });
+	// const signaling_port = process.env.PORT || 8081;
+	var wss;
+	if(signaling_port)
+	{
+		wss= new WebSocketServer.Server({ port: signaling_port});
+	}
+	else
+	{
+		wss= new WebSocketServer.Server({ noServer: true });
+	}
 	webRtcConnectionManager = webRtcCM;
 	newClient=newClientFn;
 	// Creating connection using websocket
 	wss.on("connection", (ws, req) => {
 		OnWebSocket(ws, req);
 	});
-	console.log("The WebSockets Signaling Server is running on port " + wss.options.port);
+	console.log("The WebSockets Signaling Server is running: " + JSON.stringify(wss.options));
+	return wss;
 };
 exports.sendConfigMessage = function (clientID, msg) {
     // Test: is this message valid json?