From 1df239ed3d50363967f16174d2b37a0fbfb372a7 Mon Sep 17 00:00:00 2001 From: Davide Grilli Date: Sat, 21 Feb 2026 18:36:58 +0100 Subject: [PATCH] feat: salva partite su SQLite e aggiunge storico in dev MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Aggiunge src/db.js con better-sqlite3: tabella partite con nomi, modalità, set, formazione di partenza per set, punteggi e vincitore - Salvataggio automatico al termine della partita (websocket-handler.js) - Aggiunge formInizioSet in gameState per tracciare la formazione iniziale di ogni set - Aggiunge storico.html: pagina vanilla dark-theme con lista partite espandibili (set, punteggio, formazioni) - Aggiunge server storico su porta 3002 in dev (vite-plugin-websocket.js) - Aggiunge endpoint /api/partite su displayApp (server.js) - Migliora banner di avvio con URL storico locale e da rete - Migliora log WebSocket: connessione aperta, ruolo unregistered, client rimanenti - Aggiorna .gitignore: ignora tutta la cartella data/ --- .gitignore | 3 + package-lock.json | 377 ++++++++++++++++++++++++++++++++++++++- package.json | 1 + server.js | 15 ++ src/db.js | 62 +++++++ src/gameState.js | 19 ++ src/server-utils.js | 7 +- src/websocket-handler.js | 17 +- storico.html | 293 ++++++++++++++++++++++++++++++ vite-plugin-websocket.js | 69 ++++++- 10 files changed, 856 insertions(+), 7 deletions(-) create mode 100644 src/db.js create mode 100644 storico.html diff --git a/.gitignore b/.gitignore index c1a432e..e8ed797 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,6 @@ dist-ssr # Vitest coverage/ + +# Database SQLite +data/ diff --git a/package-lock.json b/package-lock.json index 8930661..5d40bef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,7 @@ "name": "segnapuntianto", "version": "0.0.0", "dependencies": { + "better-sqlite3": "^12.6.2", "express": "^5.2.1", "vue": "^3.2.47", "vue-router": "^4.6.4", @@ -3483,6 +3484,38 @@ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", "dev": true }, + "node_modules/base64-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/better-sqlite3": { + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-12.6.2.tgz", + "integrity": "sha512-8VYKM3MjCa9WcaSAI3hzwhmyHVlH8tiGFwf0RlTsZPWJ1I5MkzjiudCo4KC4DxOaL/53A5B1sI/IbldNFDbsKA==", + "hasInstallScript": true, + "dependencies": { + "bindings": "^1.5.0", + "prebuild-install": "^7.1.1" + }, + "engines": { + "node": "20.x || 22.x || 23.x || 24.x || 25.x" + } + }, "node_modules/bidi-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/bidi-js/-/bidi-js-1.0.3.tgz", @@ -3492,6 +3525,24 @@ "require-from-string": "^2.0.2" } }, + "node_modules/bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "dependencies": { + "file-uri-to-path": "1.0.0" + } + }, + "node_modules/bl": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", + "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", + "dependencies": { + "buffer": "^5.5.0", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + } + }, "node_modules/body-parser": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.2.tgz", @@ -3568,6 +3619,29 @@ "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" } }, + "node_modules/buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" + } + }, "node_modules/buffer-from": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", @@ -3678,6 +3752,11 @@ "node": ">=4" } }, + "node_modules/chownr": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" + }, "node_modules/cliui": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", @@ -4037,6 +4116,28 @@ "integrity": "sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==", "dev": true }, + "node_modules/decompress-response": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", + "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", + "dependencies": { + "mimic-response": "^3.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/deep-extend": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", + "engines": { + "node": ">=4.0.0" + } + }, "node_modules/deepmerge": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", @@ -4070,6 +4171,14 @@ "node": ">= 0.8" } }, + "node_modules/detect-libc": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz", + "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==", + "engines": { + "node": ">=8" + } + }, "node_modules/dunder-proto": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", @@ -4183,6 +4292,14 @@ "node": ">= 0.8" } }, + "node_modules/end-of-stream": { + "version": "1.4.5", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz", + "integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==", + "dependencies": { + "once": "^1.4.0" + } + }, "node_modules/entities": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/entities/-/entities-7.0.1.tgz", @@ -4388,6 +4505,14 @@ "node": ">= 0.6" } }, + "node_modules/expand-template": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", + "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==", + "engines": { + "node": ">=6" + } + }, "node_modules/expect-type": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.3.0.tgz", @@ -4482,6 +4607,11 @@ "integrity": "sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==", "dev": true }, + "node_modules/file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==" + }, "node_modules/filelist": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", @@ -4582,6 +4712,11 @@ "node": ">= 0.8" } }, + "node_modules/fs-constants": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" + }, "node_modules/fs-extra": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", @@ -4727,6 +4862,11 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/github-from-package": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", + "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==" + }, "node_modules/glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -5007,6 +5147,25 @@ "integrity": "sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ==", "dev": true }, + "node_modules/ieee754": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, "node_modules/inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -5025,8 +5184,7 @@ "node_modules/ini": { "version": "1.3.8", "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", - "dev": true + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" }, "node_modules/internal-slot": { "version": "1.0.5", @@ -5808,6 +5966,17 @@ "url": "https://opencollective.com/express" } }, + "node_modules/mimic-response": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", + "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -5830,6 +5999,14 @@ "concat-map": "0.0.1" } }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/minipass": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", @@ -5839,6 +6016,11 @@ "node": ">=16 || 14 >=14.17" } }, + "node_modules/mkdirp-classic": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", + "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" + }, "node_modules/mrmime": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.1.tgz", @@ -5870,6 +6052,11 @@ "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" } }, + "node_modules/napi-build-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-2.0.0.tgz", + "integrity": "sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==" + }, "node_modules/negotiator": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz", @@ -5878,6 +6065,28 @@ "node": ">= 0.6" } }, + "node_modules/node-abi": { + "version": "3.87.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.87.0.tgz", + "integrity": "sha512-+CGM1L1CgmtheLcBuleyYOn7NWPVu0s0EJH2C4puxgEZb9h8QpR9G2dBfZJOAUhi7VQxuBPMd0hiISWcTyiYyQ==", + "dependencies": { + "semver": "^7.3.5" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/node-abi/node_modules/semver": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz", + "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/node-releases": { "version": "2.0.12", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.12.tgz", @@ -6153,6 +6362,32 @@ "node": "^10 || ^12 || >=14" } }, + "node_modules/prebuild-install": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz", + "integrity": "sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==", + "deprecated": "No longer maintained. Please contact the author of the relevant native addon; alternatives are available.", + "dependencies": { + "detect-libc": "^2.0.0", + "expand-template": "^2.0.3", + "github-from-package": "0.0.0", + "minimist": "^1.2.3", + "mkdirp-classic": "^0.5.3", + "napi-build-utils": "^2.0.0", + "node-abi": "^3.3.0", + "pump": "^3.0.0", + "rc": "^1.2.7", + "simple-get": "^4.0.0", + "tar-fs": "^2.0.0", + "tunnel-agent": "^0.6.0" + }, + "bin": { + "prebuild-install": "bin.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/pretty-bytes": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-6.1.0.tgz", @@ -6183,6 +6418,15 @@ "node": ">= 0.10" } }, + "node_modules/pump": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.3.tgz", + "integrity": "sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==", + "dependencies": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, "node_modules/punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", @@ -6257,6 +6501,33 @@ "node": ">= 0.10" } }, + "node_modules/rc": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", + "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", + "dependencies": { + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" + }, + "bin": { + "rc": "cli.js" + } + }, + "node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/regenerate": { "version": "1.4.2", "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz", @@ -6472,7 +6743,6 @@ "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true, "funding": [ { "type": "github", @@ -6704,6 +6974,49 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/simple-concat": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz", + "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/simple-get": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz", + "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "decompress-response": "^6.0.0", + "once": "^1.3.1", + "simple-concat": "^1.0.0" + } + }, "node_modules/sirv": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/sirv/-/sirv-3.0.2.tgz", @@ -6784,6 +7097,14 @@ "integrity": "sha512-5GS12FdOZNliM5mAOxFRg7Ir0pWz8MdpYm6AY6VPkGpbA7ZzmbzNcBJQ0GPvvyWgcY7QAhCgf9Uy89I03faLkg==", "dev": true }, + "node_modules/string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "dependencies": { + "safe-buffer": "~5.2.0" + } + }, "node_modules/string-width": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", @@ -6925,6 +7246,14 @@ "node": ">=10" } }, + "node_modules/strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", @@ -6955,6 +7284,32 @@ "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", "dev": true }, + "node_modules/tar-fs": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.4.tgz", + "integrity": "sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==", + "dependencies": { + "chownr": "^1.1.1", + "mkdirp-classic": "^0.5.2", + "pump": "^3.0.0", + "tar-stream": "^2.1.4" + } + }, + "node_modules/tar-stream": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", + "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", + "dependencies": { + "bl": "^4.0.3", + "end-of-stream": "^1.4.1", + "fs-constants": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/temp-dir": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz", @@ -7152,6 +7507,17 @@ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", "dev": true }, + "node_modules/tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", + "dependencies": { + "safe-buffer": "^5.0.1" + }, + "engines": { + "node": "*" + } + }, "node_modules/type-fest": { "version": "0.16.0", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.16.0.tgz", @@ -7339,6 +7705,11 @@ "punycode": "^2.1.0" } }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" + }, "node_modules/vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", diff --git a/package.json b/package.json index abe3f42..630f502 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "test:e2e:codegen": "playwright codegen --config=playwright.config.cjs" }, "dependencies": { + "better-sqlite3": "^12.6.2", "express": "^5.2.1", "vue": "^3.2.47", "vue-router": "^4.6.4", diff --git a/server.js b/server.js index c3a8285..d9b23be 100644 --- a/server.js +++ b/server.js @@ -5,6 +5,7 @@ import { fileURLToPath } from 'url' import { dirname, join } from 'path' import { setupWebSocketHandler } from './src/websocket-handler.js' import { printServerInfo } from './src/server-utils.js' +import { getPartite, getPartita } from './src/db.js' const __filename = fileURLToPath(import.meta.url) const __dirname = dirname(__filename) @@ -23,6 +24,20 @@ const displayApp = express() // Espone i file generati dalla build di Vite. displayApp.use(express.static(join(__dirname, 'dist'))) +// API REST per le partite salvate. +displayApp.get('/api/partite', (_req, res) => { + try { res.json(getPartite()) } + catch (err) { res.status(500).json({ error: err.message }) } +}) + +displayApp.get('/api/partite/:id', (req, res) => { + try { + const p = getPartita(Number(req.params.id)) + if (!p) return res.status(404).json({ error: 'Not found' }) + res.json(p) + } catch (err) { res.status(500).json({ error: err.message }) } +}) + // Fallback per SPA: restituisce `index.html` per tutte le route. displayApp.get(/.*/, (_req, res) => { res.sendFile(join(__dirname, 'dist', 'index.html')) diff --git a/src/db.js b/src/db.js new file mode 100644 index 0000000..9dd17df --- /dev/null +++ b/src/db.js @@ -0,0 +1,62 @@ +import Database from 'better-sqlite3' +import { mkdirSync } from 'fs' +import { join, dirname } from 'path' +import { fileURLToPath } from 'url' + +const __dirname = dirname(fileURLToPath(import.meta.url)) +const DATA_DIR = join(__dirname, '..', 'data') +const DB_PATH = process.env.DB_PATH || join(DATA_DIR, 'partite.db') + +mkdirSync(DATA_DIR, { recursive: true }) + +const db = new Database(DB_PATH) +db.pragma('journal_mode = WAL') + +db.exec(` + CREATE TABLE IF NOT EXISTS partite ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + data TEXT NOT NULL, + modalita TEXT NOT NULL, + nome_home TEXT NOT NULL, + nome_guest TEXT NOT NULL, + set_home INTEGER NOT NULL, + set_guest INTEGER NOT NULL, + vincitore TEXT, + json TEXT NOT NULL + ) +`) + +const stmtInsert = db.prepare(` + INSERT INTO partite (data, modalita, nome_home, nome_guest, set_home, set_guest, vincitore, json) + VALUES (?, ?, ?, ?, ?, ?, ?, ?) +`) + +export function salvaPartita(state) { + const payload = { + data: new Date().toISOString(), + modalita: state.modalitaPartita, + nomi: state.sp.nomi, + set: state.sp.set, + vincitore: state.sp.partitaFinita?.vincitore ?? null, + strisce: state.sp.strisce, + } + const { lastInsertRowid } = stmtInsert.run( + payload.data, + payload.modalita, + payload.nomi.home, + payload.nomi.guest, + payload.set.home, + payload.set.guest, + payload.vincitore, + JSON.stringify(payload) + ) + return lastInsertRowid +} + +export function getPartite() { + return db.prepare('SELECT * FROM partite ORDER BY id DESC').all() +} + +export function getPartita(id) { + return db.prepare('SELECT * FROM partite WHERE id = ?').get(id) +} diff --git a/src/gameState.js b/src/gameState.js index f47e3cb..c9c6d86 100644 --- a/src/gameState.js +++ b/src/gameState.js @@ -13,6 +13,10 @@ export function createInitialState() { strisce: [], setFinito: null, partitaFinita: null, + formInizioSet: { + home: ["1", "2", "3", "4", "5", "6"], + guest: ["1", "2", "3", "4", "5", "6"], + }, striscia: { home: [0], guest: [" "] }, servHome: true, punt: { home: 0, guest: 0 }, @@ -127,12 +131,22 @@ export function applyAction(state, action) { const vincitore = s.sp.setFinito.vincitore s.sp.strisce.push({ + set: s.sp.strisce.length + 1, + formInizio: { + home: [...s.sp.formInizioSet.home], + guest: [...s.sp.formInizioSet.guest], + }, home: [...s.sp.striscia.home], guest: [...s.sp.striscia.guest], vincitore, punt: { ...s.sp.punt }, }) + s.sp.formInizioSet = { + home: [...s.sp.form.home], + guest: [...s.sp.form.guest], + } + s.sp.set[vincitore]++ s.sp.punt.home = 0 @@ -188,6 +202,10 @@ export function applyAction(state, action) { s.sp.strisce = [] s.sp.setFinito = null s.sp.partitaFinita = null + s.sp.formInizioSet = { + home: ["1", "2", "3", "4", "5", "6"], + guest: ["1", "2", "3", "4", "5", "6"], + } break } @@ -220,6 +238,7 @@ export function applyAction(state, action) { case "setFormazione": { if (action.team && action.form) { s.sp.form[action.team] = [...action.form] + s.sp.formInizioSet[action.team] = [...action.form] } break } diff --git a/src/server-utils.js b/src/server-utils.js index 70b346a..d3ee6e2 100644 --- a/src/server-utils.js +++ b/src/server-utils.js @@ -28,18 +28,23 @@ export function getNetworkIPs() { * @param {number} displayPort - Porta del display. * @param {number} controllerPort - Porta del controller. */ -export function printServerInfo(displayPort = 5173, controllerPort = 3001) { +export function printServerInfo(displayPort = 5173, controllerPort = 3001, storicoPort = 3002) { const networkIPs = getNetworkIPs() console.log(`\nSegnapunti Server`) console.log(` Display: http://127.0.0.1:${displayPort}/`) console.log(` Controller: http://127.0.0.1:${controllerPort}/`) + console.log(` Storico: http://127.0.0.1:${storicoPort}/`) if (networkIPs.length > 0) { console.log(`\n Controller da dispositivi remoti:`) networkIPs.forEach(ip => { console.log(` http://${ip}:${controllerPort}/`) }) + console.log(`\n Storico da dispositivi remoti:`) + networkIPs.forEach(ip => { + console.log(` http://${ip}:${storicoPort}/`) + }) } console.log() diff --git a/src/websocket-handler.js b/src/websocket-handler.js index ea2474f..10202c1 100644 --- a/src/websocket-handler.js +++ b/src/websocket-handler.js @@ -1,4 +1,5 @@ import { createInitialState, applyAction } from './gameState.js' +import { salvaPartita } from './db.js' /** * Crea e configura il server WebSocket per la gestione dello stato di gioco. @@ -98,6 +99,16 @@ export function setupWebSocketHandler(wss) { return } + // Salva su DB quando la partita appena finisce. + if (!previousState.sp.partitaFinita && gameState.sp.partitaFinita) { + try { + const id = salvaPartita(gameState) + console.log(`[DB] Partita salvata (id: ${id})`) + } catch (err) { + console.error('[DB] Errore salvataggio partita:', err) + } + } + // Propaga il nuovo stato a tutti i client connessi. broadcastState() } @@ -156,9 +167,9 @@ export function setupWebSocketHandler(wss) { */ function handleClose(ws) { const client = clients.get(ws) - const role = client?.role || 'unknown' - console.log(`[WebSocket] Client disconnected (role: ${role})`) + const role = client?.role || 'unregistered' clients.delete(ws) + console.log(`[WebSocket] Client disconnected (role: ${role}, remaining: ${wss.clients.size})`) } /** @@ -184,6 +195,8 @@ export function setupWebSocketHandler(wss) { // Imposta il tipo binario per ridurre i problemi di codifica. ws.binaryType = 'arraybuffer' + console.log(`[WebSocket] New connection (total: ${wss.clients.size})`) + ws.on('message', (data) => handleMessage(ws, data)) ws.on('close', () => handleClose(ws)) ws.on('error', (err) => handleError(err, ws)) diff --git a/storico.html b/storico.html new file mode 100644 index 0000000..1e6aa5f --- /dev/null +++ b/storico.html @@ -0,0 +1,293 @@ + + + + + + Storico Partite + + + +

Storico Partite

+
+ + + + diff --git a/vite-plugin-websocket.js b/vite-plugin-websocket.js index 9ba79aa..d39c11d 100644 --- a/vite-plugin-websocket.js +++ b/vite-plugin-websocket.js @@ -1,9 +1,15 @@ import { WebSocketServer } from 'ws' import { createServer as createHttpServer, request as httpRequest } from 'http' +import { readFile } from 'fs' +import { join, dirname } from 'path' +import { fileURLToPath } from 'url' import { setupWebSocketHandler } from './src/websocket-handler.js' import { printServerInfo } from './src/server-utils.js' +import { getPartite, getPartita } from './src/db.js' +const __dirname = dirname(fileURLToPath(import.meta.url)) const CONTROLLER_PORT = 3001 +const STORICO_PORT = process.env.STORICO_PORT || 3002 const DEV_PROXY_HOST = process.env.DEV_PROXY_HOST || '127.0.0.1' /** @@ -38,8 +44,9 @@ export default function websocketPlugin() { const vitePort = viteAddr.port startControllerDevServer(vitePort, wss) + startStoricoDevServer() - setTimeout(() => printServerInfo(vitePort, CONTROLLER_PORT), 100) + setTimeout(() => printServerInfo(vitePort, CONTROLLER_PORT, STORICO_PORT), 100) }) } } @@ -129,3 +136,63 @@ function startControllerDevServer(vitePort, wss) { console.log(`[Controller] Dev server running on port ${CONTROLLER_PORT}`) }) } + +/** + * Avvia il server di sviluppo per lo storico sulla porta 3002. + * Serve storico.html e gli endpoint /api/partite. + */ +function startStoricoDevServer() { + const storicoServer = createHttpServer((req, res) => { + const url = new URL(req.url, `http://${req.headers.host}`) + const pathname = url.pathname + + if (pathname === '/api/partite') { + try { + res.writeHead(200, { 'Content-Type': 'application/json' }) + res.end(JSON.stringify(getPartite())) + } catch (err) { + res.writeHead(500, { 'Content-Type': 'application/json' }) + res.end(JSON.stringify({ error: err.message })) + } + return + } + + const matchId = pathname.match(/^\/api\/partite\/(\d+)$/) + if (matchId) { + try { + const p = getPartita(Number(matchId[1])) + if (!p) { + res.writeHead(404, { 'Content-Type': 'application/json' }) + res.end(JSON.stringify({ error: 'Not found' })) + } else { + res.writeHead(200, { 'Content-Type': 'application/json' }) + res.end(JSON.stringify(p)) + } + } catch (err) { + res.writeHead(500, { 'Content-Type': 'application/json' }) + res.end(JSON.stringify({ error: err.message })) + } + return + } + + if (pathname === '/' || pathname === '') { + readFile(join(__dirname, 'storico.html'), (err, data) => { + if (err) { + res.writeHead(500) + res.end('Error loading storico.html') + } else { + res.writeHead(200, { 'Content-Type': 'text/html' }) + res.end(data) + } + }) + return + } + + res.writeHead(404) + res.end('Not found') + }) + + storicoServer.listen(STORICO_PORT, '0.0.0.0', () => { + console.log(`[Storico] http://localhost:${STORICO_PORT}`) + }) +}