Merge remote-tracking branch 'refs/remotes/origin/main'

backend/src/app.py

@@ -1,10 +1,11 @@
+from typing import Any
+
 import dotenv
 from flask import Flask, Response, jsonify, request
 from flask_cors import CORS
 from flask_socketio import SocketIO, emit
 import uuid
 
-from .state import State
 from .connect import get_connection
 from .room import Room
 from .song import Song, init_db, get_song_by_title_artist, add_song_in_db
@@ -22,7 +23,7 @@ socketio = SocketIO(app)
 CORS(app)
 
 db_conn = get_connection()
-state = State(app, db_conn.cursor())
+state = State(app, socketio, db_conn.cursor())
 init_db(state.db)
 
 state.rooms[1000] = Room(

backend/src/state.py

@@ -2,6 +2,7 @@ from dataclasses import dataclass, field
 from sqlite3 import Cursor
 
 from flask import Flask
+from flask_socketio import SocketIO
 
 from .room import Room
 
@@ -9,5 +10,6 @@ from .room import Room
 @dataclass
 class State:
     app: Flask
+    socketio: SocketIO
     db: Cursor
     rooms: dict[int, Room] = field(default_factory=dict)  # { room_id: room, ... }