From 0a2a1993f943b87237e4a7853e782e9660b4f73f Mon Sep 17 00:00:00 2001
From: Pashkinz92 <pasha92@ukr.net>
Date: Thu, 8 Jan 2015 11:53:16 +0200
Subject: [PATCH] Update server.js

---
 lib/js/server/server.js | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/lib/js/server/server.js b/lib/js/server/server.js
index 2466196ad9..6a9ba7e211 100644
--- a/lib/js/server/server.js
+++ b/lib/js/server/server.js
@@ -1,9 +1,20 @@
+var serverConfiguration = require('./server.config.js');
 var express = require('express');
 var app = express();
-var server = require('http').createServer(app)
+
+if (serverConfiguration.ssl) {
+    var fs = require('fs');
+    var server = require('https').createServer({
+        key: fs.readFileSync(serverConfiguration.sslKey).toString(),
+        cert: fs.readFileSync(serverConfiguration.sslCert).toString()
+    }, app);
+} else {
+    var server = require('http').createServer(app);
+}
+
 var io = require('socket.io').listen(server);
+io.enable('browser client gzip');
 var cookie = require('cookie');
-var serverConfiguration = require('./server.config.js');
 var storeProvider = express.session.MemoryStore;
 var sessionStorage = new storeProvider();
 
@@ -21,7 +32,7 @@ componentManager.set('io', io);
 componentManager.set('eventManager', eventManager);
 componentManager.set('sessionStorage', sessionStorage);
 
-server.listen(serverConfiguration.port);//, serverConfiguration.host);
+server.listen(serverConfiguration.port, serverConfiguration.host);
 console.log('Listening ' + serverConfiguration.host + ':' + serverConfiguration.port);
 
 //  accept all connections from local server
@@ -106,6 +117,7 @@ io.of('/client').authorization(function (handshakeData,accept) {
 
 }).on('connection', function (socket) {
 
+    //socket.emit('news', 'message');
 	//  add socket to pull
 	socketPull.add(socket);
 
@@ -196,4 +208,4 @@ io.of('/server').authorization(function (data, accept) {
 	eventManager.server.bind(socket);
 });
 
-componentManager.initCompleted();
\ No newline at end of file
+componentManager.initCompleted();