From 7b40f420e327fae8045fed9c06f7223e225bf922 Mon Sep 17 00:00:00 2001 From: Todd Treece Date: Thu, 10 Nov 2016 14:05:39 +0000 Subject: [PATCH] add abilities to index --- index.js | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/index.js b/index.js index 6d56b0b..af9f8b7 100755 --- a/index.js +++ b/index.js @@ -1,21 +1,32 @@ -// this file is a modified version of the v0.2.1 easel local OS X +// this file is a modified version of the v0.2.7 easel local OS X // install. you can find out more about easel and the x-carve at // inventables.com & easel.inventables.com - var io = require('socket.io') , http = require('http') , WebsocketController = require('./lib/websocket_controller') , fs = require('fs') - , path = require('path'); + , path = require('path') + , Debugger = require('./lib/debugger'); -var WEBSOCKET_PORT = 1338; +var WEBSOCKET_PORT = process.argv[2] || 1338; + +var logger = Debugger.logger('xcarve-server'); + +var json = JSON.parse(fs.readFileSync(path.join(__dirname, 'package.json'), 'utf8')); +var version = '0.2.7'; +var iris = json.iris; + +logger.log("Starting Easel Local " + version); var app = http.createServer() io = io.listen(app); -var origins = "easel.inventables.com:80 easel.inventables.com:443" +// TODO: Remove port 80 after SSL is enforced in production +var origins = process.argv[3] || "easel.inventables.com:80 easel.inventables.com:443 easelstaging.inventables.com:80 easelstaging.inventables.com:443" io.origins(origins); -app.listen(WEBSOCKET_PORT, '0.0.0.0'); +logger.log("Listening on port " + WEBSOCKET_PORT + " for connections from " + origins); -var websocketController = new WebsocketController(io.sockets, '0.2.1'); +app.listen(WEBSOCKET_PORT, "0.0.0.0"); + +var websocketController = new WebsocketController(io.sockets, version, iris.abilities);