fix: linter was destroying the server because of early declaration
This commit is contained in:
parent
f52e91520b
commit
21c3f44826
1 changed files with 19 additions and 30 deletions
49
server.js
49
server.js
|
@ -1,15 +1,25 @@
|
||||||
// vim:set noexpandtab:
|
|
||||||
/** ************
|
|
||||||
SYSTEM INCLUDES
|
|
||||||
************* */
|
|
||||||
const http = require('http')
|
const http = require('http')
|
||||||
const reload = require('reload')
|
|
||||||
const sanitizer = require('sanitizer')
|
|
||||||
const compression = require('compression')
|
|
||||||
const express = require('express')
|
const express = require('express')
|
||||||
|
const compression = require('compression')
|
||||||
|
const sanitizer = require('sanitizer')
|
||||||
|
const socketIO = require('socket.io')
|
||||||
|
const reload = require('reload')
|
||||||
const conf = require('./config.js').server
|
const conf = require('./config.js').server
|
||||||
const { headerBarUrl } = require('./config.js')
|
const { headerBarUrl, logoUrl } = require('./config.js')
|
||||||
const { logoUrl } = require('./config.js')
|
|
||||||
|
const app = express()
|
||||||
|
const router = express.Router()
|
||||||
|
|
||||||
|
app.use(compression())
|
||||||
|
app.use(conf.baseurl, router)
|
||||||
|
router.use(express.static(`${__dirname}/node_modules`))
|
||||||
|
router.use(express.static(`${__dirname}/client`))
|
||||||
|
|
||||||
|
const server = http.createServer(app)
|
||||||
|
const io = socketIO(server, { // Use the renamed socketIO require
|
||||||
|
path: conf.baseurl === '/' ? '' : `${conf.baseurl}/socket.io`,
|
||||||
|
cookie: false
|
||||||
|
})
|
||||||
|
|
||||||
/** ************
|
/** ************
|
||||||
LOCAL INCLUDES
|
LOCAL INCLUDES
|
||||||
|
@ -23,22 +33,6 @@ let data = require('./lib/data.js').db
|
||||||
// Map of sids to user_names
|
// Map of sids to user_names
|
||||||
const sids_to_user_names = []
|
const sids_to_user_names = []
|
||||||
|
|
||||||
/** ************
|
|
||||||
SETUP EXPRESS
|
|
||||||
************* */
|
|
||||||
const app = express()
|
|
||||||
const router = express.Router()
|
|
||||||
|
|
||||||
app.use(compression())
|
|
||||||
app.use(conf.baseurl, router)
|
|
||||||
|
|
||||||
router.use(express.static(`${__dirname}/node_modules`))
|
|
||||||
router.use(express.static(`${__dirname}/client`))
|
|
||||||
|
|
||||||
const server = http.createServer(app)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Reload code here
|
// Reload code here
|
||||||
reload(app)
|
reload(app)
|
||||||
.then((reloadReturned) => {
|
.then((reloadReturned) => {
|
||||||
|
@ -60,11 +54,6 @@ reload(app)
|
||||||
SETUP Socket.IO
|
SETUP Socket.IO
|
||||||
************* */
|
************* */
|
||||||
|
|
||||||
const io = require('socket.io')(server, {
|
|
||||||
path: conf.baseurl == '/' ? '' : `${conf.baseurl}/socket.io`,
|
|
||||||
cookie: false
|
|
||||||
})
|
|
||||||
|
|
||||||
/** ************
|
/** ************
|
||||||
ROUTES
|
ROUTES
|
||||||
************* */
|
************* */
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue