diff --git a/public/data/scripts/Online.js b/public/data/scripts/Online.js index da89f86..9e3e4b2 100644 --- a/public/data/scripts/Online.js +++ b/public/data/scripts/Online.js @@ -82,10 +82,10 @@ function continueForm(){ $(".setup:eq(1), .setup:eq(2), #join-lobby").show(); $("#player-name").hide(); let queries = "?game=memory&name=" + playerNameEntered(); - $.get('data/settings/get_port.php', port => { - socket = io('https://' + location.hostname + ':' + port + queries); - addSocketEvents(); - }); + socket = io('https://' + location.hostname + queries, { + path: "/memory/" + }); + addSocketEvents(); } } diff --git a/public/data/settings/get_port.php b/public/data/settings/get_port.php deleted file mode 100644 index a2dd41f..0000000 --- a/public/data/settings/get_port.php +++ /dev/null @@ -1,2 +0,0 @@ -=10.0.0" } }, - "node_modules/https": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/https/-/https-1.0.0.tgz", - "integrity": "sha512-4EC57ddXrkaF0x83Oj8sM6SLQHAWXw90Skqu2M4AEWENZ3F02dFJE/GARA8igO79tcgYqGrD7ae4f5L3um2lgg==" - }, "node_modules/mime-db": { "version": "1.52.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", @@ -356,11 +350,6 @@ "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.6.tgz", "integrity": "sha512-tjuoZDMAdEhVnSFleYPCtdL2GXwVTGtNjoeJd9IhIG3C1xs9uwxqRNEu5WpnDZCaozwVlK/nuQhpodhXSIMaxw==" }, - "https": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/https/-/https-1.0.0.tgz", - "integrity": "sha512-4EC57ddXrkaF0x83Oj8sM6SLQHAWXw90Skqu2M4AEWENZ3F02dFJE/GARA8igO79tcgYqGrD7ae4f5L3um2lgg==" - }, "mime-db": { "version": "1.52.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", diff --git a/server/package.json b/server/package.json index e4f5b4a..c2841ab 100644 --- a/server/package.json +++ b/server/package.json @@ -4,11 +4,10 @@ "private": true, "scripts": { "start": "node out/index.js", - "tsc": "npx tsc" + "tsc": "npx tsc" }, "dependencies": { "dotenv": "^16.0.3", - "https": "^1.0.0", "socket.io": "^4.4.1", "typescript": "^5.0.2" }, diff --git a/server/src/index.ts b/server/src/index.ts index 478ef86..288ac15 100644 --- a/server/src/index.ts +++ b/server/src/index.ts @@ -3,5 +3,7 @@ import {StartServer} from "./start"; StartServer({ useP2P: false, - gameClass: Memory + gameClass: Memory, + subPath: "/memory/", + port: 3102 }); \ No newline at end of file diff --git a/server/src/start.ts b/server/src/start.ts index 82293ed..eaff242 100644 --- a/server/src/start.ts +++ b/server/src/start.ts @@ -3,30 +3,26 @@ import {log} from "./logger.js"; import {Server} from 'socket.io'; import {Room} from "./room.js"; -import * as https from "https"; -import * as fs from "fs"; +import * as http from "http"; export function StartServer(settings: any){ require("dotenv").config(); - const httpsPort = parseInt(process.env.HTTPS_PORT); - let cert = fs.readFileSync(`${process.env.SSL_PATH}/cert.pem`); - let key = fs.readFileSync(`${process.env.SSL_PATH}/key.pem`); + let httpServer = http.createServer(); - let httpsServer = https.createServer({key: key, cert: cert}); - - let sIO = new Server(httpsServer, { + let sIO = new Server(httpServer, { cors: { origin: ["https://play.benjamin-kraft.local", "https://play.benjamin-kraft.eu"] - } + }, + path: settings.subPath }); if (settings.useP2P){ const p2p = require('socket.io-p2p-server').Server; sIO.use(p2p); } - httpsServer.listen(httpsPort); + httpServer.listen(settings.port); Room.GameClass = settings.gameClass; @@ -35,5 +31,5 @@ export function StartServer(settings: any){ // On new connection sIO.on('connection', socket => connectionManager.newSocket(socket)); - log('startup', null, null, 'Server is listening on port ' + httpsPort); + log('startup', null, null, 'Server is listening on port ' + settings.port); } \ No newline at end of file