Skip to content

Update server.js #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Pashkinz92 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update server.js #43

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions lib/js/server/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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();

Expand All @@ -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
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -196,4 +208,4 @@ io.of('/server').authorization(function (data, accept) {
eventManager.server.bind(socket);
});

componentManager.initCompleted();
componentManager.initCompleted();