Added Docker

Hotfix
Added dynamic ws wss
2025-09-29 16:33:39 +02:00 · 2025-09-29 16:25:29 +02:00 · 2025-09-29 16:22:12 +02:00 · 2025-09-29 15:45:48 +02:00 · 2025-09-12 14:48:42 +02:00 · 2025-09-12 14:43:07 +02:00
8 changed files with 333 additions and 26 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -0,0 +1,17 @@
+Dockerfile
+.dockerignore
+.git
+.gitignore
+.gitattributes
+README.md
+.npmrc
+.prettierrc
+.eslintrc.cjs
+.graphqlrc
+.editorconfig
+.vscode
+node_modules
+build
+package
+**/.env
+.env*
--- a/17
+++ b/17
@@ -0,0 +1,17 @@
+FROM node:24-alpine AS builder
+WORKDIR /app
+COPY package*.json ./
+RUN npm ci
+COPY . .
+RUN npm run build
+RUN npm prune --production
+
+FROM node:24-alpine
+WORKDIR /app
+COPY --from=builder /app/build build/
+COPY --from=builder /app/node_modules node_modules/
+COPY package.json .
+EXPOSE 3000
+ENV NODE_ENV=production
+ENV PUBLIC_JEOPARDY_SERVER=127.0.0.1:12345
+CMD [ "node", "build" ]
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -0,0 +1,14 @@
+services:
+  jeopardy:
+    image: jeopardy:latest
+    container_name: jeopardy
+    environment:
+      # domain:port or only domain, eg jeopardyserver.akolata.de
+      - PUBLIC_JEOPARDY_SERVER=127.0.0.1:11001
+    ports:
+      - "11000:3000"
+  jeopardyserver:
+    image: jeopardyserver:latest
+    container_name: jeopardyserver
+    ports:
+      - "11001:12345"
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,16 +1,16 @@
 {
    "name": "jeopardy",
-    "version": "1.0.1",
+    "version": "1.0.2",
    "lockfileVersion": 3,
    "requires": true,
    "packages": {
        "": {
            "name": "jeopardy",
-            "version": "1.0.1",
+            "version": "1.0.2",
            "devDependencies": {
                "@eslint/compat": "^1.2.5",
                "@eslint/js": "^9.18.0",
-                "@sveltejs/adapter-auto": "^6.0.0",
+                "@sveltejs/adapter-node": "^5.3.2",
                "@sveltejs/kit": "^2.22.0",
                "@sveltejs/vite-plugin-svelte": "^6.0.0",
                "@tailwindcss/vite": "^4.0.0",
@@ -817,6 +817,112 @@
            "dev": true,
            "license": "MIT"
        },
+        "node_modules/@rollup/plugin-commonjs": {
+            "version": "28.0.6",
+            "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-28.0.6.tgz",
+            "integrity": "sha512-XSQB1K7FUU5QP+3lOQmVCE3I0FcbbNvmNT4VJSj93iUjayaARrTQeoRdiYQoftAJBLrR9t2agwAd3ekaTgHNlw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@rollup/pluginutils": "^5.0.1",
+                "commondir": "^1.0.1",
+                "estree-walker": "^2.0.2",
+                "fdir": "^6.2.0",
+                "is-reference": "1.2.1",
+                "magic-string": "^0.30.3",
+                "picomatch": "^4.0.2"
+            },
+            "engines": {
+                "node": ">=16.0.0 || 14 >= 14.17"
+            },
+            "peerDependencies": {
+                "rollup": "^2.68.0||^3.0.0||^4.0.0"
+            },
+            "peerDependenciesMeta": {
+                "rollup": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@rollup/plugin-commonjs/node_modules/is-reference": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz",
+            "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/estree": "*"
+            }
+        },
+        "node_modules/@rollup/plugin-json": {
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-6.1.0.tgz",
+            "integrity": "sha512-EGI2te5ENk1coGeADSIwZ7G2Q8CJS2sF120T7jLw4xFw9n7wIOXHo+kIYRAoVpJAN+kmqZSoO3Fp4JtoNF4ReA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@rollup/pluginutils": "^5.1.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            },
+            "peerDependencies": {
+                "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
+            },
+            "peerDependenciesMeta": {
+                "rollup": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@rollup/plugin-node-resolve": {
+            "version": "16.0.1",
+            "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-16.0.1.tgz",
+            "integrity": "sha512-tk5YCxJWIG81umIvNkSod2qK5KyQW19qcBF/B78n1bjtOON6gzKoVeSzAE8yHCZEDmqkHKkxplExA8KzdJLJpA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@rollup/pluginutils": "^5.0.1",
+                "@types/resolve": "1.20.2",
+                "deepmerge": "^4.2.2",
+                "is-module": "^1.0.0",
+                "resolve": "^1.22.1"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            },
+            "peerDependencies": {
+                "rollup": "^2.78.0||^3.0.0||^4.0.0"
+            },
+            "peerDependenciesMeta": {
+                "rollup": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@rollup/pluginutils": {
+            "version": "5.3.0",
+            "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.3.0.tgz",
+            "integrity": "sha512-5EdhGZtnu3V88ces7s53hhfK5KSASnJZv8Lulpc04cWO3REESroJXg73DFsOmgbU2BhwV0E20bu2IDZb3VKW4Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/estree": "^1.0.0",
+                "estree-walker": "^2.0.2",
+                "picomatch": "^4.0.2"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            },
+            "peerDependencies": {
+                "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
+            },
+            "peerDependenciesMeta": {
+                "rollup": {
+                    "optional": true
+                }
+            }
+        },
        "node_modules/@rollup/rollup-android-arm-eabi": {
            "version": "4.47.1",
            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.47.1.tgz",
@@ -1114,14 +1220,20 @@
                "acorn": "^8.9.0"
            }
        },
-        "node_modules/@sveltejs/adapter-auto": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/@sveltejs/adapter-auto/-/adapter-auto-6.1.0.tgz",
-            "integrity": "sha512-shOuLI5D2s+0zTv2ab5M5PqfknXqWbKi+0UwB9yLTRIdzsK1R93JOO8jNhIYSHdW+IYXIYnLniu+JZqXs7h9Wg==",
+        "node_modules/@sveltejs/adapter-node": {
+            "version": "5.3.2",
+            "resolved": "https://registry.npmjs.org/@sveltejs/adapter-node/-/adapter-node-5.3.2.tgz",
+            "integrity": "sha512-nBJSipMb1KLjnAM7uzb+YpnA1VWKb+WdR+0mXEnXI6K1A3XYWbjkcjnW20ubg07sicK8XaGY/FAX3PItw39qBQ==",
            "dev": true,
            "license": "MIT",
+            "dependencies": {
+                "@rollup/plugin-commonjs": "^28.0.1",
+                "@rollup/plugin-json": "^6.1.0",
+                "@rollup/plugin-node-resolve": "^16.0.0",
+                "rollup": "^4.9.5"
+            },
            "peerDependencies": {
-                "@sveltejs/kit": "^2.0.0"
+                "@sveltejs/kit": "^2.4.0"
            }
        },
        "node_modules/@sveltejs/kit": {
@@ -1561,6 +1673,13 @@
            "dev": true,
            "license": "MIT"
        },
+        "node_modules/@types/resolve": {
+            "version": "1.20.2",
+            "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz",
+            "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==",
+            "dev": true,
+            "license": "MIT"
+        },
        "node_modules/@typescript-eslint/eslint-plugin": {
            "version": "8.40.0",
            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.40.0.tgz",
@@ -2016,6 +2135,13 @@
            "dev": true,
            "license": "MIT"
        },
+        "node_modules/commondir": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+            "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
+            "dev": true,
+            "license": "MIT"
+        },
        "node_modules/concat-map": {
            "version": "0.0.1",
            "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -2394,6 +2520,13 @@
                "node": ">=4.0"
            }
        },
+        "node_modules/estree-walker": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+            "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+            "dev": true,
+            "license": "MIT"
+        },
        "node_modules/esutils": {
            "version": "2.0.3",
            "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
@@ -2562,6 +2695,16 @@
                "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
            }
        },
+        "node_modules/function-bind": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+            "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
        "node_modules/glob-parent": {
            "version": "6.0.2",
            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
@@ -2612,6 +2755,19 @@
                "node": ">=8"
            }
        },
+        "node_modules/hasown": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+            "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "function-bind": "^1.1.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
        "node_modules/ignore": {
            "version": "5.3.2",
            "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
@@ -2649,6 +2805,22 @@
                "node": ">=0.8.19"
            }
        },
+        "node_modules/is-core-module": {
+            "version": "2.16.1",
+            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
+            "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "hasown": "^2.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
        "node_modules/is-extglob": {
            "version": "2.1.1",
            "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -2672,6 +2844,13 @@
                "node": ">=0.10.0"
            }
        },
+        "node_modules/is-module": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
+            "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==",
+            "dev": true,
+            "license": "MIT"
+        },
        "node_modules/is-number": {
            "version": "7.0.0",
            "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -3298,6 +3477,13 @@
                "node": ">=8"
            }
        },
+        "node_modules/path-parse": {
+            "version": "1.0.7",
+            "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+            "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+            "dev": true,
+            "license": "MIT"
+        },
        "node_modules/picocolors": {
            "version": "1.1.1",
            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
@@ -3624,6 +3810,27 @@
                "url": "https://paulmillr.com/funding/"
            }
        },
+        "node_modules/resolve": {
+            "version": "1.22.10",
+            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
+            "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "is-core-module": "^2.16.0",
+                "path-parse": "^1.0.7",
+                "supports-preserve-symlinks-flag": "^1.0.0"
+            },
+            "bin": {
+                "resolve": "bin/resolve"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
        "node_modules/resolve-from": {
            "version": "4.0.0",
            "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
@@ -3816,6 +4023,19 @@
                "node": ">=8"
            }
        },
+        "node_modules/supports-preserve-symlinks-flag": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+            "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
        "node_modules/svelte": {
            "version": "5.38.2",
            "resolved": "https://registry.npmjs.org/svelte/-/svelte-5.38.2.tgz",
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
    "name": "jeopardy",
    "private": true,
-    "version": "1.0.1",
+    "version": "1.0.2",
    "type": "module",
    "scripts": {
        "dev": "vite dev",
@@ -11,12 +11,13 @@
        "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
        "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
        "format": "prettier --write .",
-        "lint": "prettier --check . && eslint ."
+        "lint": "prettier --check . && eslint .",
+        "docker-build": "docker build -t jeopardy ."
    },
    "devDependencies": {
        "@eslint/compat": "^1.2.5",
        "@eslint/js": "^9.18.0",
-        "@sveltejs/adapter-auto": "^6.0.0",
+        "@sveltejs/adapter-node": "^5.3.2",
        "@sveltejs/kit": "^2.22.0",
        "@sveltejs/vite-plugin-svelte": "^6.0.0",
        "@tailwindcss/vite": "^4.0.0",
--- a/src/lib/websocket.svelte.ts
+++ b/src/lib/websocket.svelte.ts
@@ -1,3 +1,5 @@
+import { env } from "$env/dynamic/public";
+
 export enum SocketConnectionType {
    NONE = "NONE",
    HOST = "HOST",
@@ -11,7 +13,9 @@ let socket: WebSocket | undefined;

 const connectAsHost = () => {
    if (socket !== undefined) return;
-    socket = new WebSocket("ws://127.0.0.1:12345");
+    socket = new WebSocket(
+        `${location.protocol === "https:" ? "wss" : "ws"}://${env.PUBLIC_JEOPARDY_SERVER ?? "127.0.0.1:12345"}`
+    );
    socket.addEventListener("open", onOpen(SocketConnectionType.HOST));
    socket.addEventListener("message", onFirstMessage);
    socket.addEventListener("close", onClose);
@@ -20,7 +24,9 @@ const connectAsHost = () => {

 const connectAsDisplay = () => {
    if (socket !== undefined) return;
-    socket = new WebSocket("ws://127.0.0.1:12345");
+    socket = new WebSocket(
+        `${location.protocol === "https:" ? "wss" : "ws"}://${env.PUBLIC_JEOPARDY_SERVER ?? "127.0.0.1:12345"}`
+    );
    socket.addEventListener("open", onOpen(SocketConnectionType.DISPLAY));
    socket.addEventListener("message", onFirstMessage);
 };
--- a/src/routes/connected/games/[game]/+page.svelte
+++ b/src/routes/connected/games/[game]/+page.svelte
@@ -25,6 +25,13 @@
    import AudioMultipleChoiceQuestionComponent from "$lib/AudioMultipleChoiceQuestionComponent.svelte";
    import ImageMultipleChoiceQuestionComponent from "$lib/ImageMultipleChoiceQuestionComponent.svelte";

+    interface SaveData {
+        players: Player[];
+        currentPlayer: number;
+        currentWall: number;
+        visitedQuestions: VisitedQuestions;
+    }
+
    let startDisabled = $state(true);

    function handleDisplayConnected() {
@@ -80,6 +87,31 @@
            this.game = game;
        }

+        save(): void {
+            const saveData = {
+                players: this.players,
+                currentPlayer: this.currentPlayer,
+                currentWall: this.currentWall,
+                visitedQuestions: this.visitedQuestions
+            };
+            localStorage.setItem(`saveGame-${this.game.name}`, JSON.stringify(saveData));
+        }
+
+        load(): void {
+            const saveDataString = localStorage.getItem(`saveGame-${this.game.name}`);
+            if (saveDataString === null) return;
+            try {
+                const saveData: SaveData = JSON.parse(saveDataString);
+                this.players = saveData.players;
+                this.currentPlayer = saveData.currentPlayer;
+                this.currentWall = saveData.currentWall;
+                this.visitedQuestions = saveData.visitedQuestions;
+                console.log(saveData);
+            } catch (e) {
+                //
+            }
+        }
+
        startGame(): void {
            this.currentPlayer = Math.floor(Math.random() * this.players.length);
            this.state = GameState.CHOOSING_QUESTION;
@@ -235,7 +267,7 @@
        }

        finishQuestion(): void {
-            if (this.visitedQuestions[this.currentCategory] === undefined) {
+            if (this.visitedQuestions[this.currentCategory] == undefined) {
                this.visitedQuestions[this.currentCategory] = [this.currentQuestion];
            } else if (
                !this.visitedQuestions[this.currentCategory].includes(this.currentQuestion)
@@ -250,12 +282,13 @@
                this.sendWall();
                this.state = GameState.CHOOSING_QUESTION;
            }
+            this.save();
        }

        wallIsDone(): boolean {
            let visitedNum = 0;
            for (const questions of this.visitedQuestions) {
-                if (questions !== undefined) {
+                if (questions != undefined) {
                    visitedNum += questions.length;
                }
            }
@@ -316,6 +349,7 @@
        <div class="p-4">
            <div class="flex items-center">
                <h2 class="grow pb-4 text-5xl">Spieler</h2>
+                <button class="btn me-4" onclick={() => gameManager.load()}>Load SaveGame</button>
                <button
                    class="btn"
                    disabled={!startDisabled}
--- a/svelte.config.js
+++ b/svelte.config.js
@@ -1,5 +1,5 @@
-import adapter from '@sveltejs/adapter-auto';
-import { vitePreprocess } from '@sveltejs/vite-plugin-svelte';
+import adapter from "@sveltejs/adapter-node";
+import { vitePreprocess } from "@sveltejs/vite-plugin-svelte";

 /** @type {import('@sveltejs/kit').Config} */
 const config = {
@@ -8,8 +8,6 @@ const config = {
    preprocess: vitePreprocess(),

    kit: {
-		// adapter-auto only supports some environments, see https://svelte.dev/docs/kit/adapter-auto for a list.
-		// If your environment is not supported, or you settled on a specific environment, switch out the adapter.
        // See https://svelte.dev/docs/kit/adapters for more information about adapters.
        adapter: adapter()
    }
Author	SHA1	Message	Date
Jonas Kappa	29b2ef1b17	Added Docker	2025-09-29 16:33:39 +02:00
Jonas Kappa	b26af58b51	Hotfix	2025-09-29 16:25:29 +02:00
Jonas Kappa	f10ccd0d16	Added dynamic ws wss	2025-09-29 16:22:12 +02:00
Jonas Kappa	f6926b2230	Added dockerization	2025-09-29 15:45:48 +02:00
Jonas Kappa	bb78d7f5af	Hotfix null	2025-09-12 14:48:42 +02:00
Jonas Kappa	e6f16ca8cd	Added Savegame	2025-09-12 14:43:07 +02:00