teleportxr 1.0.6 → 1.0.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/index.js +3 -3
- package/package.json +2 -2
- package/signaling.js +4 -4
package/index.js
CHANGED
|
@@ -3,11 +3,11 @@ const WebRtcConnectionManager = require('./connections/webrtcconnectionmanager.j
|
|
|
3
3
|
const signaling =require("./signaling.js");
|
|
4
4
|
const client_manager = require('./client/client_manager.js');
|
|
5
5
|
|
|
6
|
-
function initServer() {
|
|
6
|
+
function initServer(http_server) {
|
|
7
7
|
var cm=client_manager.getInstance();
|
|
8
8
|
const webRtcConnectionManager = WebRtcConnectionManager.getInstance();
|
|
9
9
|
webRtcConnectionManager.SetSendConfigMessage(signaling.sendConfigMessage);
|
|
10
|
-
signaling.init(webRtcConnectionManager,cm.newClient.bind(cm));
|
|
10
|
+
signaling.init(webRtcConnectionManager,cm.newClient.bind(cm),http_server);
|
|
11
11
|
}
|
|
12
12
|
|
|
13
|
-
module.exports = {initServer}
|
|
13
|
+
module.exports = {initServer}
|
package/package.json
CHANGED
|
@@ -12,8 +12,8 @@
|
|
|
12
12
|
"start": "node server.js"
|
|
13
13
|
},
|
|
14
14
|
"name": "teleportxr",
|
|
15
|
-
"description": "
|
|
16
|
-
"version": "1.0.
|
|
15
|
+
"description": "Teleport Spatial Server on node.js",
|
|
16
|
+
"version": "1.0.7",
|
|
17
17
|
"repository": {
|
|
18
18
|
"type": "git",
|
|
19
19
|
"url": "git+https://github.com/simul/teleport-nodejs.git"
|
package/signaling.js
CHANGED
|
@@ -214,17 +214,17 @@ function OnWebSocket(ws, req) {
|
|
|
214
214
|
console.log("Some Error occurred");
|
|
215
215
|
};
|
|
216
216
|
}
|
|
217
|
-
exports.init = function (webRtcCM,newClientFn) {
|
|
217
|
+
exports.init = function (webRtcCM, newClientFn, http_server) {
|
|
218
218
|
// Creating a new websocket server
|
|
219
|
-
const signaling_port = process.env.PORT || 8081;
|
|
220
|
-
const wss = new WebSocketServer.Server({
|
|
219
|
+
// const signaling_port = process.env.PORT || 8081;
|
|
220
|
+
const wss = new WebSocketServer.Server({ http_server });
|
|
221
221
|
webRtcConnectionManager = webRtcCM;
|
|
222
222
|
newClient=newClientFn;
|
|
223
223
|
// Creating connection using websocket
|
|
224
224
|
wss.on("connection", (ws, req) => {
|
|
225
225
|
OnWebSocket(ws, req);
|
|
226
226
|
});
|
|
227
|
-
console.log("The WebSockets Signaling Server is running on port " + wss.options
|
|
227
|
+
console.log("The WebSockets Signaling Server is running on port " + JSON.stringify(wss.options));
|
|
228
228
|
};
|
|
229
229
|
exports.sendConfigMessage = function (clientID, msg) {
|
|
230
230
|
// Test: is this message valid json?
|