From c2cf582ca41392cd3f0953fcb9733ae069fac31e Mon Sep 17 00:00:00 2001 From: Simone Tesini Date: Sat, 2 Aug 2025 00:51:02 +0200 Subject: [PATCH 01/71] fix state import --- backend/src/app.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/backend/src/app.py b/backend/src/app.py index 7014761..deebd8d 100644 --- a/backend/src/app.py +++ b/backend/src/app.py @@ -6,12 +6,11 @@ from flask_cors import CORS from flask_socketio import SocketIO, emit from .connect import get_connection -from .room import Room -from .song import Song, init_db, get_song_by_title_artist, add_song_in_db -from .song_fetch import lastfm_query_search, download_song_mp3 from .qrcode_gen import generate_qr - -from typing import Any +from .room import Room +from .song import Song, add_song_in_db, get_song_by_title_artist, init_db +from .song_fetch import download_song_mp3, lastfm_query_search +from .state import State dotenv.load_dotenv() From 59dfbbeca9df4a05c4ab813d62d8a00135f13615 Mon Sep 17 00:00:00 2001 From: Simone Tesini Date: Sat, 2 Aug 2025 01:58:29 +0200 Subject: [PATCH 02/71] figure out how socketio works --- backend/src/app.py | 29 +- frontend/package-lock.json | 356 +++++++++++++++++++- frontend/package.json | 4 + frontend/src/routes/zesty/wsio/+page.svelte | 8 + frontend/vite.config.ts | 5 + 5 files changed, 399 insertions(+), 3 deletions(-) create mode 100644 frontend/src/routes/zesty/wsio/+page.svelte diff --git a/backend/src/app.py b/backend/src/app.py index deebd8d..a309c2c 100644 --- a/backend/src/app.py +++ b/backend/src/app.py @@ -3,7 +3,7 @@ from typing import Any import dotenv from flask import Flask, Response, jsonify, request from flask_cors import CORS -from flask_socketio import SocketIO, emit +from flask_socketio import SocketIO, emit, join_room, leave_room from .connect import get_connection from .qrcode_gen import generate_qr @@ -17,9 +17,10 @@ dotenv.load_dotenv() app = Flask(__name__) app.config["SECRET_KEY"] = "your_secret_key" -socketio = SocketIO(app) +socketio = SocketIO(app, cors_allowed_origins="*", path="/ws") CORS(app) + db_conn = get_connection() state = State(app, socketio, db_conn.cursor()) init_db(state.db) @@ -54,6 +55,30 @@ def ws_broadcast(event: str, *, room_id: int | None = None, data: Any) -> None: emit(event, final, broadcast=True, namespace="/") +@socketio.on("connect") +def handle_connection(): + print("somebody connected to socket.io", flush=True) + + +@socketio.on("disconnect") +def handle_disconnection(): + print("somebody disconnected from socket.io", flush=True) + + +@socketio.on("join_room") +def on_join(data): + room = data["id"] + join_room(room) + print(f"somebody joined {room=}", flush=True) + + +@socketio.on("leave_room") +def on_leave(data): + room = data["id"] + leave_room(room) + print(f"somebody left {room=}", flush=True) + + @app.get("/api/join") def join(): room_id = request.args.get("room") diff --git a/frontend/package-lock.json b/frontend/package-lock.json index b3ecdec..fb2a61f 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -7,6 +7,10 @@ "": { "name": "frontend", "version": "0.0.1", + "dependencies": { + "socket.io": "^4.8.1", + "socket.io-client": "^4.8.1" + }, "devDependencies": { "@sveltejs/adapter-auto": "^6.0.0", "@sveltejs/kit": "^2.22.0", @@ -817,6 +821,12 @@ "win32" ] }, + "node_modules/@socket.io/component-emitter": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz", + "integrity": "sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==", + "license": "MIT" + }, "node_modules/@sveltejs/acorn-typescript": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/@sveltejs/acorn-typescript/-/acorn-typescript-1.0.5.tgz", @@ -1193,6 +1203,15 @@ "dev": true, "license": "MIT" }, + "node_modules/@types/cors": { + "version": "2.8.19", + "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.19.tgz", + "integrity": "sha512-mFNylyeyqN93lfe/9CSxOGREz8cpzAhH+E93xJ4xWQf62V8sQ/24reV2nyzUWM6H6Xji+GGHpkbLe7pVoUEskg==", + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@types/estree": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz", @@ -1200,6 +1219,28 @@ "dev": true, "license": "MIT" }, + "node_modules/@types/node": { + "version": "24.1.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-24.1.0.tgz", + "integrity": "sha512-ut5FthK5moxFKH2T1CUOC6ctR67rQRvvHdFLCD2Ql6KXmMuCrjsSsRI9UsLCm9M18BMwClv4pn327UvB7eeO1w==", + "license": "MIT", + "dependencies": { + "undici-types": "~7.8.0" + } + }, + "node_modules/accepts": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", + "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", + "license": "MIT", + "dependencies": { + "mime-types": "~2.1.34", + "negotiator": "0.6.3" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/acorn": { "version": "8.15.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", @@ -1233,6 +1274,15 @@ "node": ">= 0.4" } }, + "node_modules/base64id": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz", + "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==", + "license": "MIT", + "engines": { + "node": "^4.5.0 || >= 5.9" + } + }, "node_modules/chokidar": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", @@ -1279,6 +1329,19 @@ "node": ">= 0.6" } }, + "node_modules/cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "license": "MIT", + "dependencies": { + "object-assign": "^4", + "vary": "^1" + }, + "engines": { + "node": ">= 0.10" + } + }, "node_modules/debug": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", @@ -1324,6 +1387,91 @@ "dev": true, "license": "MIT" }, + "node_modules/engine.io": { + "version": "6.6.4", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.6.4.tgz", + "integrity": "sha512-ZCkIjSYNDyGn0R6ewHDtXgns/Zre/NT6Agvq1/WobF7JXgFff4SeDroKiCO3fNJreU9YG429Sc81o4w5ok/W5g==", + "license": "MIT", + "dependencies": { + "@types/cors": "^2.8.12", + "@types/node": ">=10.0.0", + "accepts": "~1.3.4", + "base64id": "2.0.0", + "cookie": "~0.7.2", + "cors": "~2.8.5", + "debug": "~4.3.1", + "engine.io-parser": "~5.2.1", + "ws": "~8.17.1" + }, + "engines": { + "node": ">=10.2.0" + } + }, + "node_modules/engine.io-client": { + "version": "6.6.3", + "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.6.3.tgz", + "integrity": "sha512-T0iLjnyNWahNyv/lcjS2y4oE358tVS/SYQNxYXGAJ9/GLgH4VCvOQ/mhTjqU88mLZCQgiG8RIegFHYCdVC+j5w==", + "license": "MIT", + "dependencies": { + "@socket.io/component-emitter": "~3.1.0", + "debug": "~4.3.1", + "engine.io-parser": "~5.2.1", + "ws": "~8.17.1", + "xmlhttprequest-ssl": "~2.1.1" + } + }, + "node_modules/engine.io-client/node_modules/debug": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/engine.io-parser": { + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.3.tgz", + "integrity": "sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==", + "license": "MIT", + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/engine.io/node_modules/cookie": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", + "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/engine.io/node_modules/debug": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, "node_modules/enhanced-resolve": { "version": "5.18.2", "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.2.tgz", @@ -1720,6 +1868,27 @@ "@jridgewell/sourcemap-codec": "^1.5.0" } }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "license": "MIT", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/minipass": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", @@ -1783,7 +1952,6 @@ "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true, "license": "MIT" }, "node_modules/nanoid": { @@ -1805,6 +1973,24 @@ "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" } }, + "node_modules/negotiator": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", + "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/picocolors": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", @@ -2057,6 +2243,130 @@ "node": ">=18" } }, + "node_modules/socket.io": { + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.8.1.tgz", + "integrity": "sha512-oZ7iUCxph8WYRHHcjBEc9unw3adt5CmSNlppj/5Q4k2RIrhl8Z5yY2Xr4j9zj0+wzVZ0bxmYoGSzKJnRl6A4yg==", + "license": "MIT", + "dependencies": { + "accepts": "~1.3.4", + "base64id": "~2.0.0", + "cors": "~2.8.5", + "debug": "~4.3.2", + "engine.io": "~6.6.0", + "socket.io-adapter": "~2.5.2", + "socket.io-parser": "~4.2.4" + }, + "engines": { + "node": ">=10.2.0" + } + }, + "node_modules/socket.io-adapter": { + "version": "2.5.5", + "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.5.tgz", + "integrity": "sha512-eLDQas5dzPgOWCk9GuuJC2lBqItuhKI4uxGgo9aIV7MYbk2h9Q6uULEh8WBzThoI7l+qU9Ast9fVUmkqPP9wYg==", + "license": "MIT", + "dependencies": { + "debug": "~4.3.4", + "ws": "~8.17.1" + } + }, + "node_modules/socket.io-adapter/node_modules/debug": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/socket.io-client": { + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.8.1.tgz", + "integrity": "sha512-hJVXfu3E28NmzGk8o1sHhN3om52tRvwYeidbj7xKy2eIIse5IoKX3USlS6Tqt3BHAtflLIkCQBkzVrEEfWUyYQ==", + "license": "MIT", + "dependencies": { + "@socket.io/component-emitter": "~3.1.0", + "debug": "~4.3.2", + "engine.io-client": "~6.6.1", + "socket.io-parser": "~4.2.4" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/socket.io-client/node_modules/debug": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/socket.io-parser": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz", + "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==", + "license": "MIT", + "dependencies": { + "@socket.io/component-emitter": "~3.1.0", + "debug": "~4.3.1" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/socket.io-parser/node_modules/debug": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/socket.io/node_modules/debug": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, "node_modules/source-map-js": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", @@ -2193,6 +2503,21 @@ "node": ">=14.17" } }, + "node_modules/undici-types": { + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.8.0.tgz", + "integrity": "sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==", + "license": "MIT" + }, + "node_modules/vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/vite": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/vite/-/vite-7.0.6.tgz", @@ -2288,6 +2613,35 @@ } } }, + "node_modules/ws": { + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz", + "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==", + "license": "MIT", + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": ">=5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, + "node_modules/xmlhttprequest-ssl": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.1.2.tgz", + "integrity": "sha512-TEU+nJVUUnA4CYJFLvK5X9AOeH4KvDvhIfm0vV1GaQRtchnG0hgK5p8hw/xjv8cunWYCsiPCSDzObPyhEwq3KQ==", + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/yallist": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz", diff --git a/frontend/package.json b/frontend/package.json index cee9931..1ea43b9 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -26,5 +26,9 @@ "tailwindcss": "^4.0.0", "typescript": "^5.0.0", "vite": "^7.0.4" + }, + "dependencies": { + "socket.io": "^4.8.1", + "socket.io-client": "^4.8.1" } } diff --git a/frontend/src/routes/zesty/wsio/+page.svelte b/frontend/src/routes/zesty/wsio/+page.svelte new file mode 100644 index 0000000..32b44d5 --- /dev/null +++ b/frontend/src/routes/zesty/wsio/+page.svelte @@ -0,0 +1,8 @@ + diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts index eccff34..3548199 100644 --- a/frontend/vite.config.ts +++ b/frontend/vite.config.ts @@ -10,6 +10,11 @@ export default defineConfig({ target: "http://backend:5000", changeOrigin: false, secure: false + }, + '/ws': { + target: "http://backend:5000", + changeOrigin: false, + secure: false } } } From 1383c0fbedad9677712fc4803b0bdf1633e6b3b7 Mon Sep 17 00:00:00 2001 From: Mat12143 Date: Sat, 2 Aug 2025 02:12:41 +0200 Subject: [PATCH 03/71] feat: implemented api --- .../src/lib/components/QueueSlider.svelte | 2 +- .../src/lib/components/SuggestionInput.svelte | 12 +++++-- .../src/lib/components/SuggestionList.svelte | 29 ++++++++-------- frontend/src/lib/types.ts | 14 ++++++-- frontend/src/routes/+page.svelte | 6 +--- frontend/src/routes/room/[id]/+page.svelte | 33 +++++++++++++++---- 6 files changed, 65 insertions(+), 31 deletions(-) diff --git a/frontend/src/lib/components/QueueSlider.svelte b/frontend/src/lib/components/QueueSlider.svelte index dec52c5..430a9bc 100644 --- a/frontend/src/lib/components/QueueSlider.svelte +++ b/frontend/src/lib/components/QueueSlider.svelte @@ -21,7 +21,7 @@ {#if i === 1}
{/if} - Song cover + Song cover {#if i === 1}

{song.title} - {song.artist}

diff --git a/frontend/src/lib/components/SuggestionInput.svelte b/frontend/src/lib/components/SuggestionInput.svelte index c93c8b7..de8e437 100644 --- a/frontend/src/lib/components/SuggestionInput.svelte +++ b/frontend/src/lib/components/SuggestionInput.svelte @@ -1,7 +1,15 @@
- - + +
diff --git a/frontend/src/lib/components/SuggestionList.svelte b/frontend/src/lib/components/SuggestionList.svelte index ba7ed69..16cc08c 100644 --- a/frontend/src/lib/components/SuggestionList.svelte +++ b/frontend/src/lib/components/SuggestionList.svelte @@ -1,32 +1,31 @@
- {#each reactiveSugg as sug} + {#each suggestions as sug}
- Song cover -

{sug.name}

+ Song cover +

{sug.title} - {sug.artist}

+1 -

{sug.points}

+

{sug.upvote}

-1
diff --git a/frontend/src/lib/types.ts b/frontend/src/lib/types.ts index 85dff04..3f10d61 100644 --- a/frontend/src/lib/types.ts +++ b/frontend/src/lib/types.ts @@ -1,12 +1,12 @@ import { z } from "zod" -export const SongSchema = z.object({ +const SongSchema = z.object({ uuid: z.string(), title: z.string(), artist: z.string(), tags: z.array(z.string()), image_id: z.string(), - youtube_id: z.number().optional().default(0), + youtube_id: z.string(), }) export type Song = z.infer @@ -25,3 +25,13 @@ export const createEmptySong = function (): Song { youtube_id: 0, } } + +const SuggestionSchema = SongSchema.extend({ + upvote: z.number(), +}) +export type Suggestion = z.infer + +export const parseSuggestion = async function (sugg: any): Promise { + let resp = await SuggestionSchema.parseAsync(sugg) + return resp +} diff --git a/frontend/src/routes/+page.svelte b/frontend/src/routes/+page.svelte index 48f1755..3e7cfc2 100644 --- a/frontend/src/routes/+page.svelte +++ b/frontend/src/routes/+page.svelte @@ -2,11 +2,7 @@
-
+

Scan your nearby rooms

- Room Test -
-
-

Create your room

diff --git a/frontend/src/routes/room/[id]/+page.svelte b/frontend/src/routes/room/[id]/+page.svelte index 31254dd..f3905e6 100644 --- a/frontend/src/routes/room/[id]/+page.svelte +++ b/frontend/src/routes/room/[id]/+page.svelte @@ -2,14 +2,17 @@ import QueueSlider from "$lib/components/QueueSlider.svelte" import SuggestionInput from "$lib/components/SuggestionInput.svelte" import Error from "$lib/components/Error.svelte" - import { parseSong, type Song } from "$lib/types.js" + import { parseSong, parseSuggestion, type Suggestion, type Song } from "$lib/types.js" import { onMount } from "svelte" + import SuggestionList from "$lib/components/SuggestionList.svelte" let { data } = $props() let songs = $state([]) let playing = $state(0) + let suggestions = $state([]) + let error = $state({ code: 0, message: "" }) onMount(async () => { @@ -23,6 +26,25 @@ // Setup websocket connection + // Get room suggestions + + resp = await fetch("/api/room/suggestions?room=" + data.roomId) + + if (resp.status != 200) { + error = { code: 500, message: "Failed to retrive suggestions" } + return + } + + let json = await resp.json() + + json["songs"].forEach(async (i: any) => { + suggestions.push(await parseSuggestion(i)) + }) + + suggestions = suggestions.sort((a, b) => { + return a.upvote - b.upvote + }) + // Get the room queue resp = await fetch("/api/queue?room=" + data.roomId) @@ -30,13 +52,12 @@ error = { code: 404, message: "Room not found" } return } - let json = await resp.json() + json = await resp.json() json["queue"].forEach(async (i: any) => { songs.push(await parseSong(i)) }) - - // Get room suggestions + console.log(songs) }) @@ -47,10 +68,10 @@
- +
- +
{/if} From 9c85ecbfafc24a223487a243aec5484a3fa18041 Mon Sep 17 00:00:00 2001 From: Simone Tesini Date: Sat, 2 Aug 2025 02:15:01 +0200 Subject: [PATCH 04/71] cleanup --- backend/src/app.py | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/backend/src/app.py b/backend/src/app.py index a309c2c..80392bc 100644 --- a/backend/src/app.py +++ b/backend/src/app.py @@ -1,9 +1,7 @@ -from typing import Any - import dotenv from flask import Flask, Response, jsonify, request from flask_cors import CORS -from flask_socketio import SocketIO, emit, join_room, leave_room +from flask_socketio import SocketIO, join_room, leave_room from .connect import get_connection from .qrcode_gen import generate_qr @@ -44,17 +42,6 @@ def error(msg: str, status: int = 400) -> Response: return res -def ws_broadcast(event: str, *, room_id: int | None = None, data: Any) -> None: - final = {} - - if room_id is not None: - final["room_id"] = room_id - - final["data"] = data - - emit(event, final, broadcast=True, namespace="/") - - @socketio.on("connect") def handle_connection(): print("somebody connected to socket.io", flush=True) @@ -121,7 +108,7 @@ def queue_next(): ## queue ended # room.renew_queue() - emit("update_songs", {"songs": [1, 2, 3]}, broadcast=True, namespace="/") + state.socketio.emit("update_queue", {"songs": room.playing}, to=str(room.id)) return {"success": True, "ended": True, "index": room.playing_idx, "queue": room.playing} From a5b1943030f0af4a786a6562b7ce30b45b654ff9 Mon Sep 17 00:00:00 2001 From: Simone Tesini Date: Sat, 2 Aug 2025 03:00:28 +0200 Subject: [PATCH 05/71] add socketio in forntendt --- backend/src/app.py | 6 +- frontend/package-lock.json | 210 +-------------------- frontend/src/lib/util.ts | 1 + frontend/src/routes/room/[id]/+page.svelte | 4 +- frontend/src/routes/room/[id]/+page.ts | 2 + 5 files changed, 17 insertions(+), 206 deletions(-) create mode 100644 frontend/src/lib/util.ts diff --git a/backend/src/app.py b/backend/src/app.py index 083ae8b..a99444c 100644 --- a/backend/src/app.py +++ b/backend/src/app.py @@ -1,11 +1,11 @@ +import uuid +from dataclasses import asdict + import dotenv from flask import Flask, Response, jsonify, request from flask_cors import CORS -import uuid -from dataclasses import asdict from flask_socketio import SocketIO, join_room, leave_room -from .state import State from .connect import get_connection from .qrcode_gen import generate_qr from .room import Room diff --git a/frontend/package-lock.json b/frontend/package-lock.json index c70338b..a545ce8 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -8,8 +8,8 @@ "name": "frontend", "version": "0.0.1", "dependencies": { - "zod": "^4.0.14", - "socket.io-client": "^4.8.1" + "socket.io-client": "^4.8.1", + "zod": "^4.0.14" }, "devDependencies": { "@sveltejs/adapter-auto": "^6.0.0", @@ -1203,15 +1203,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@types/cors": { - "version": "2.8.19", - "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.19.tgz", - "integrity": "sha512-mFNylyeyqN93lfe/9CSxOGREz8cpzAhH+E93xJ4xWQf62V8sQ/24reV2nyzUWM6H6Xji+GGHpkbLe7pVoUEskg==", - "license": "MIT", - "dependencies": { - "@types/node": "*" - } - }, "node_modules/@types/estree": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz", @@ -1223,24 +1214,14 @@ "version": "24.1.0", "resolved": "https://registry.npmjs.org/@types/node/-/node-24.1.0.tgz", "integrity": "sha512-ut5FthK5moxFKH2T1CUOC6ctR67rQRvvHdFLCD2Ql6KXmMuCrjsSsRI9UsLCm9M18BMwClv4pn327UvB7eeO1w==", + "dev": true, "license": "MIT", + "optional": true, + "peer": true, "dependencies": { "undici-types": "~7.8.0" } }, - "node_modules/accepts": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", - "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", - "license": "MIT", - "dependencies": { - "mime-types": "~2.1.34", - "negotiator": "0.6.3" - }, - "engines": { - "node": ">= 0.6" - } - }, "node_modules/acorn": { "version": "8.15.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", @@ -1274,15 +1255,6 @@ "node": ">= 0.4" } }, - "node_modules/base64id": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz", - "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==", - "license": "MIT", - "engines": { - "node": "^4.5.0 || >= 5.9" - } - }, "node_modules/chokidar": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", @@ -1329,19 +1301,6 @@ "node": ">= 0.6" } }, - "node_modules/cors": { - "version": "2.8.5", - "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", - "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", - "license": "MIT", - "dependencies": { - "object-assign": "^4", - "vary": "^1" - }, - "engines": { - "node": ">= 0.10" - } - }, "node_modules/debug": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", @@ -1387,26 +1346,6 @@ "dev": true, "license": "MIT" }, - "node_modules/engine.io": { - "version": "6.6.4", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.6.4.tgz", - "integrity": "sha512-ZCkIjSYNDyGn0R6ewHDtXgns/Zre/NT6Agvq1/WobF7JXgFff4SeDroKiCO3fNJreU9YG429Sc81o4w5ok/W5g==", - "license": "MIT", - "dependencies": { - "@types/cors": "^2.8.12", - "@types/node": ">=10.0.0", - "accepts": "~1.3.4", - "base64id": "2.0.0", - "cookie": "~0.7.2", - "cors": "~2.8.5", - "debug": "~4.3.1", - "engine.io-parser": "~5.2.1", - "ws": "~8.17.1" - }, - "engines": { - "node": ">=10.2.0" - } - }, "node_modules/engine.io-client": { "version": "6.6.3", "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.6.3.tgz", @@ -1446,32 +1385,6 @@ "node": ">=10.0.0" } }, - "node_modules/engine.io/node_modules/cookie": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", - "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/engine.io/node_modules/debug": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", - "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", - "license": "MIT", - "dependencies": { - "ms": "^2.1.3" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, "node_modules/enhanced-resolve": { "version": "5.18.2", "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.2.tgz", @@ -1868,27 +1781,6 @@ "@jridgewell/sourcemap-codec": "^1.5.0" } }, - "node_modules/mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "license": "MIT", - "dependencies": { - "mime-db": "1.52.0" - }, - "engines": { - "node": ">= 0.6" - } - }, "node_modules/minipass": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", @@ -1973,24 +1865,6 @@ "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" } }, - "node_modules/negotiator": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", - "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/picocolors": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", @@ -2243,51 +2117,6 @@ "node": ">=18" } }, - "node_modules/socket.io": { - "version": "4.8.1", - "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.8.1.tgz", - "integrity": "sha512-oZ7iUCxph8WYRHHcjBEc9unw3adt5CmSNlppj/5Q4k2RIrhl8Z5yY2Xr4j9zj0+wzVZ0bxmYoGSzKJnRl6A4yg==", - "license": "MIT", - "dependencies": { - "accepts": "~1.3.4", - "base64id": "~2.0.0", - "cors": "~2.8.5", - "debug": "~4.3.2", - "engine.io": "~6.6.0", - "socket.io-adapter": "~2.5.2", - "socket.io-parser": "~4.2.4" - }, - "engines": { - "node": ">=10.2.0" - } - }, - "node_modules/socket.io-adapter": { - "version": "2.5.5", - "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.5.tgz", - "integrity": "sha512-eLDQas5dzPgOWCk9GuuJC2lBqItuhKI4uxGgo9aIV7MYbk2h9Q6uULEh8WBzThoI7l+qU9Ast9fVUmkqPP9wYg==", - "license": "MIT", - "dependencies": { - "debug": "~4.3.4", - "ws": "~8.17.1" - } - }, - "node_modules/socket.io-adapter/node_modules/debug": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", - "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", - "license": "MIT", - "dependencies": { - "ms": "^2.1.3" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, "node_modules/socket.io-client": { "version": "4.8.1", "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.8.1.tgz", @@ -2350,23 +2179,6 @@ } } }, - "node_modules/socket.io/node_modules/debug": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", - "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", - "license": "MIT", - "dependencies": { - "ms": "^2.1.3" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, "node_modules/source-map-js": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", @@ -2507,16 +2319,10 @@ "version": "7.8.0", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.8.0.tgz", "integrity": "sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==", - "license": "MIT" - }, - "node_modules/vary": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", + "dev": true, "license": "MIT", - "engines": { - "node": ">= 0.8" - } + "optional": true, + "peer": true }, "node_modules/vite": { "version": "7.0.6", diff --git a/frontend/src/lib/util.ts b/frontend/src/lib/util.ts new file mode 100644 index 0000000..df0d44e --- /dev/null +++ b/frontend/src/lib/util.ts @@ -0,0 +1 @@ +export type FetchError = { code: number, message: string } diff --git a/frontend/src/routes/room/[id]/+page.svelte b/frontend/src/routes/room/[id]/+page.svelte index f3905e6..eb225cd 100644 --- a/frontend/src/routes/room/[id]/+page.svelte +++ b/frontend/src/routes/room/[id]/+page.svelte @@ -5,6 +5,7 @@ import { parseSong, parseSuggestion, type Suggestion, type Song } from "$lib/types.js" import { onMount } from "svelte" import SuggestionList from "$lib/components/SuggestionList.svelte" + import { io } from "socket.io-client" let { data } = $props() @@ -25,9 +26,10 @@ } // Setup websocket connection + let socket = io("/", { path: "/ws" }) + await socket.emitWithAck("join_room", { id: data.roomId }) // Get room suggestions - resp = await fetch("/api/room/suggestions?room=" + data.roomId) if (resp.status != 200) { diff --git a/frontend/src/routes/room/[id]/+page.ts b/frontend/src/routes/room/[id]/+page.ts index 1776db6..969ffc5 100644 --- a/frontend/src/routes/room/[id]/+page.ts +++ b/frontend/src/routes/room/[id]/+page.ts @@ -1,5 +1,7 @@ import { error, type Load, type ServerLoad } from "@sveltejs/kit" import type { PageLoad } from "./$types" +import type { FetchError } from "$lib/util" +import { parseSuggestion, type Suggestion } from "$lib/types" export const load: PageLoad = async ({ params }) => { if (params.id) { From a737a651ec0c7790f6514cf84c5ed56ca4616a0c Mon Sep 17 00:00:00 2001 From: Simone Tesini Date: Sat, 2 Aug 2025 03:18:30 +0200 Subject: [PATCH 06/71] add socket events for various backend pioints --- backend/src/app.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/backend/src/app.py b/backend/src/app.py index a99444c..304ab3c 100644 --- a/backend/src/app.py +++ b/backend/src/app.py @@ -112,9 +112,10 @@ def queue_next(): ## queue ended # room.renew_queue() - state.socketio.emit("update_queue", {"songs": room.playing}, to=str(room.id)) + data = {"success": True, "ended": True, "index": room.playing_idx, "queue": room.playing} + state.socketio.emit("new_queue", data, to=str(room.id)) - return {"success": True, "ended": True, "index": room.playing_idx, "queue": room.playing} + return data return {"success": True, "ended": False, "index": room.playing_idx} @@ -202,6 +203,7 @@ def add_song(): ## add the song in the room if does not exists if song.uuid not in room.songs: room.songs[song.uuid] = (song, 1) # start with one vote + socketio.emit("new_song", {"song": song, "user_score": 1}, to=str(room.id)) return {"success": True, "song": song} @@ -233,6 +235,7 @@ def post_song_vote(): ## update the song room.songs[song_id] = (song_info[0], song_info[1] + int(request.args["increment"])) + socketio.emit("new_vote", {"song": song_info[0], "user_score": song_info[1]}) return {"success": True} From ae5efae865f977168fa58d37600bd4cb6df1bbe8 Mon Sep 17 00:00:00 2001 From: panzerotto Date: Sat, 2 Aug 2025 03:40:45 +0200 Subject: [PATCH 07/71] ziopera sto radar fa schifo --- frontend/src/routes/zesty/+page.svelte | 8 +++++ .../src/routes/zesty/components/Radar.svelte | 35 +++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 frontend/src/routes/zesty/+page.svelte create mode 100644 frontend/src/routes/zesty/components/Radar.svelte diff --git a/frontend/src/routes/zesty/+page.svelte b/frontend/src/routes/zesty/+page.svelte new file mode 100644 index 0000000..3f495e4 --- /dev/null +++ b/frontend/src/routes/zesty/+page.svelte @@ -0,0 +1,8 @@ + +
+ +
+ \ No newline at end of file diff --git a/frontend/src/routes/zesty/components/Radar.svelte b/frontend/src/routes/zesty/components/Radar.svelte new file mode 100644 index 0000000..6a4e50e --- /dev/null +++ b/frontend/src/routes/zesty/components/Radar.svelte @@ -0,0 +1,35 @@ +
+ +
+ + +
+
+
+ + +
+
+
+
+
+ + From c65f9e453d6433438f21aaad772b6888adf461af Mon Sep 17 00:00:00 2001 From: panzerotto Date: Sat, 2 Aug 2025 03:44:57 +0200 Subject: [PATCH 08/71] add microBACCO --- frontend/src/routes/zesty/components/Radar.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/routes/zesty/components/Radar.svelte b/frontend/src/routes/zesty/components/Radar.svelte index 6a4e50e..346029f 100644 --- a/frontend/src/routes/zesty/components/Radar.svelte +++ b/frontend/src/routes/zesty/components/Radar.svelte @@ -12,7 +12,7 @@
- +