removed logs, https to http, server proxied

.gitignore

@@ -3,3 +3,4 @@
 *.js.map
 node_modules
 .env
+logs

public/data/scripts/ts/online.ts

@@ -18,14 +18,14 @@ class OnlineManager{
 
     connectToServer(project: Settings.Project, name: string, cb): void{
         let urlQueries = '?game=' + project.name + '&name=' + name;
-        $.get('data/settings/get_port.php', port => {
-            let url = 'https://' + location.hostname + ':' + port + urlQueries
-            this.socket = io.connect(url)
+		let url = 'https://' + location.hostname + urlQueries
+		this.socket = io.connect(url, {
+			path: "/pong/"
+		})
 
 		this.socket.on('connect', () =>
 			console.log('Connected to ', url));
 		cb();
-        });
     }
 
     connectToPeers(project: Settings.Project){

public/data/settings/get_port.php

@@ -1,2 +0,0 @@
-<?php
-echo parse_ini_file("../../../server/.env")["HTTPS_PORT"];

server/logs/1679930782741.log

@@ -1,12 +0,0 @@
-[Mon Mar 27 2023 17:26:22][undefined] ---> {Server is listening on port 3103}
-[Mon Mar 27 2023 17:31:06][pong] ---> {"beb(6Ya9ADw...)" connected}
-[Mon Mar 27 2023 17:31:17][pong] ---> {"beb2(4XZozzj...)" connected}
-[Mon Mar 27 2023 17:31:20][pong] ---> {"beb2(4XZozzj...)" created new lobby: "2DVLL2WEXI"}
-[Mon Mar 27 2023 17:31:25][undefined] ---> {"beb(6Ya9ADw...)" tried to join non-existent lobby " 2DVLL2WEXI "}
-[Mon Mar 27 2023 17:31:31][pong] ---> {"beb(6Ya9ADw...)" joined the lobby "2DVLL2WEXI"}
-[Mon Mar 27 2023 17:31:36][pong] ---> {"beb2(4XZozzj...)" started the game: "2DVLL2WEXI"}
-[Mon Mar 27 2023 17:33:13][pong] ---> {"beb(6Ya9ADw...)" left the lobby "2DVLL2WEXI"}
-[Mon Mar 27 2023 17:33:13][pong] ---> {"beb(6Ya9ADw...)" disconnected}
-[Mon Mar 27 2023 17:33:18][pong] ---> {"beb2(4XZozzj...)" left the lobby "2DVLL2WEXI"}
-[Mon Mar 27 2023 17:33:18][pong] ---> {Lobby "2DVLL2WEXI" was deleted}
-[Mon Mar 27 2023 17:33:18][pong] ---> {"beb2(4XZozzj...)" disconnected}

server/package-lock.json

@@ -9,7 +9,6 @@
 			"version": "2.0",
 			"dependencies": {
 				"dotenv": "^16.0.3",
-				"https": "^1.0.0",
 				"socket.io": "^4.4.1",
 				"socket.io-p2p-server": "^1.2.0",
 				"typescript": "^5.0.2"
@@ -335,11 +334,6 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"node_modules/https": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/https/-/https-1.0.0.tgz",
-			"integrity": "sha512-4EC57ddXrkaF0x83Oj8sM6SLQHAWXw90Skqu2M4AEWENZ3F02dFJE/GARA8igO79tcgYqGrD7ae4f5L3um2lgg=="
-		},
 		"node_modules/inherits": {
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
@@ -953,11 +947,6 @@
 				"has-symbols": "^1.0.2"
 			}
 		},
-		"https": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/https/-/https-1.0.0.tgz",
-			"integrity": "sha512-4EC57ddXrkaF0x83Oj8sM6SLQHAWXw90Skqu2M4AEWENZ3F02dFJE/GARA8igO79tcgYqGrD7ae4f5L3um2lgg=="
-		},
 		"inherits": {
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",

server/package.json

@@ -3,11 +3,11 @@
 	"version": "2.0",
 	"private": true,
 	"scripts": {
-		"start": "node out/index.js"
+		"start": "node out/index.js",
+		"tsc": "npx tsc"
 	},
 	"dependencies": {
 		"dotenv": "^16.0.3",
-		"https": "^1.0.0",
 		"socket.io": "^4.4.1",
 		"socket.io-p2p-server": "^1.2.0",
 		"typescript": "^5.0.2"

server/src/index.ts

@@ -3,5 +3,7 @@ import {StartServer} from "./start";
 
 StartServer({
     useP2P: true,
-    gameClass: Pong
+    gameClass: Pong,
+	subPath: "/pong/",
+	port: 3103
 });

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);
 }