Alamantus/little-library
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Change how socketio connects so it can run on both http and https

Browse source
This commit is contained in:
Robbie Antenesse 2019-01-07 13:17:37 -07:00
parent 48712dca8d
commit 3d3f9742f7
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
server.js
View file

@ -3,7 +3,7 @@ const fs = require('fs');
const express = require('express'); const express = require('express');
const http = require('http'); const http = require('http');
const https = require('https'); const https = require('https');
const socketio = require('socket.io'); const SocketIoServer = require('socket.io');
const helmet = require('helmet'); const helmet = require('helmet');
const bodyParser = require('body-parser'); const bodyParser = require('body-parser');
const fileUpload = require('express-fileupload'); const fileUpload = require('express-fileupload');
@ -22,7 +22,13 @@ function Server () {
this.server = express(); this.server = express();
this.http = http.Server(this.server); this.http = http.Server(this.server);
this.https = privateKey && certificate ? https.createServer({ key: privateKey, cert: certificate, ca }, this.server) : null; this.https = privateKey && certificate ? https.createServer({ key: privateKey, cert: certificate, ca }, this.server) : null;
this.io = socketio(this.http); this.io = new SocketIoServer();
if (!settings.forceHTTPS) {
this.io.attach(this.http);
}
if (this.https) {
this.io.attach(this.https);
}
this.fileLocation = path.resolve(settings.fileLocation); this.fileLocation = path.resolve(settings.fileLocation);
this.historyLocation = path.resolve(settings.historyLocation); this.historyLocation = path.resolve(settings.historyLocation);
@ -61,7 +67,7 @@ function Server () {
if (!req.secure) { if (!req.secure) {
return res.redirect(['https://', req.get('Host'), req.baseUrl].join('')); return res.redirect(['https://', req.get('Host'), req.baseUrl].join(''));
} }
next(); next();0
}); });
} }