From 21c3f44826bc236393a50ef8b05d04f60583e711 Mon Sep 17 00:00:00 2001 From: Florian Schmitt Date: Tue, 3 Jun 2025 17:43:59 +0300 Subject: [PATCH] fix: linter was destroying the server because of early declaration --- server.js | 49 +++++++++++++++++++------------------------------ 1 file changed, 19 insertions(+), 30 deletions(-) diff --git a/server.js b/server.js index 299ed02..53bca5f 100644 --- a/server.js +++ b/server.js @@ -1,15 +1,25 @@ -// vim:set noexpandtab: -/** ************ - SYSTEM INCLUDES -************* */ const http = require('http') -const reload = require('reload') -const sanitizer = require('sanitizer') -const compression = require('compression') 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 { headerBarUrl } = require('./config.js') -const { logoUrl } = require('./config.js') +const { headerBarUrl, 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 @@ -23,22 +33,6 @@ let data = require('./lib/data.js').db // Map of 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(app) .then((reloadReturned) => { @@ -60,11 +54,6 @@ reload(app) SETUP Socket.IO ************* */ -const io = require('socket.io')(server, { - path: conf.baseurl == '/' ? '' : `${conf.baseurl}/socket.io`, - cookie: false -}) - /** ************ ROUTES ************* */