Merge pull request #20 from obilodeau/deps-update-260503

Dependency updates

Author: obilodeau

Makefile

@@ -30,8 +30,13 @@ install-dev:
 
 # ── Run dev servers (Flask + Vite) in one terminal ──────────────────────────
 
-run:
-	@python ceopardy.py & backend=$$!; \
-		npm run dev --prefix frontend & frontend=$$!; \
-		trap "kill $$backend $$frontend 2>/dev/null" INT TERM; \
-		wait $$backend $$frontend
+# Reinstalls when package.json is newer than the install marker.
+frontend/node_modules/.package-lock.json: frontend/package.json
+	npm install --prefix frontend
+	@touch frontend/node_modules/.package-lock.json
+
+run: frontend/node_modules/.package-lock.json
+	@exec sh -c 'trap "kill 0" INT TERM; \
+		python run.py & \
+		npm run dev --prefix frontend & \
+		wait'

README.adoc

@@ -41,7 +41,7 @@ You need Python, pip, virtualenv and Node.js (LTS). The tl;dr:
     source .venv/bin/activate.fish    # fish
     npm install --prefix frontend
     npm run build --prefix frontend
-    python ceopardy.py
+    python run.py
 
 `make venv` creates `.venv/` and installs both runtime and dev requirements.
 
@@ -63,12 +63,12 @@ Then open http://127.0.0.1:5000/host[the host view] to set up the game.
 http://127.0.0.1:5000/[The players' view] (also known as the viewer) can be
 opened at any time.
 
-`python ceopardy.py` runs the built-in dev server (debug + reloader). For
+`python run.py` runs the built-in dev server (debug + reloader). For
 production, run it under gunicorn with the eventlet worker. Socket.IO requires
 a single worker process unless you also configure a Redis message queue:
 
     pip install gunicorn
-    gunicorn -k eventlet -w 1 -b 127.0.0.1:5000 'ceopardy:app'
+    gunicorn -k eventlet -w 1 -b 127.0.0.1:5000 'run:app'
 
 Put nginx (or similar) in front for TLS and to expose it on the network — the
 app itself binds to localhost because the host interface has no auth.
@@ -80,7 +80,7 @@ Run Flask and Vite side by side. Vite hot-reloads the UI and proxies
 `/api` and `/socket.io` to Flask.
 
     # terminal 1 - Flask
-    python ceopardy.py
+    python run.py
 
     # terminal 2 - Vite dev server
     npm run dev --prefix frontend

api/routes.py

@@ -230,8 +230,6 @@ def init_game():
         {"id": "message1", "html": content},
         namespace=GAME_NS,
     )
-    # Old viewers that are still on a legacy URL should just bounce.
-    app.socketio.emit("redirect", {"url": "/"}, namespace=GAME_NS)
 
     return jsonify(result="success")
 

ceopardy.py

@@ -25,7 +25,7 @@
   * broadcast realtime state changes on the /game Socket.IO namespace
   * serve the built SPA (and some legacy static assets)
 
-For development run Flask (`python ceopardy.py`) and Vite (`npm run dev`)
+For development run Flask (`python run.py`) and Vite (`npm run dev`)
 side by side. Vite proxies /api and /socket.io to Flask.
 """
 
@@ -146,6 +146,7 @@ def create_app():
 
         from controller import Controller
 
+        db.create_all()
         app.controller = Controller()
 
         # Register the REST blueprint. It depends on app.controller being set.
@@ -160,10 +161,3 @@ def teardown_controller(exception):  # noqa: ARG001
                 _ctl = None
 
     return app
-
-
-if __name__ == "__main__":
-    create_app()
-    # WARNING: This app is not ready to be exposed on the network.
-    #          Game host interface would be exposed.
-    socketio.run(app, host="127.0.0.1", port=5000, debug=True)

controller.py

@@ -471,16 +471,22 @@ def db_backup_and_create_new():
         """
         # TODO we might need to lock this thing to avoid state issues with viewers
         previous_roundfile = Game.query.one().round_filename
-        _bkp = "ceopardy_{}_{}.db".format(
+        _bkp_name = "ceopardy_{}_{}.db".format(
             datetime.now().strftime("%Y-%m-%d_%H%M"), previous_roundfile
         )
-        app.logger.info("Backing up current game to {}".format(_bkp))
+        # SQLite URI is resolved against app.instance_path; the live file lives there too.
+        db_path = os.path.join(app.instance_path, config["DATABASE_FILENAME"])
+        bkp_path = os.path.join(app.instance_path, _bkp_name)
+        app.logger.info("Backing up current game to {}".format(bkp_path))
+        db.session.remove()
         db.engine.dispose()
-        os.rename(config["BASE_DIR"] + config["DATABASE_FILENAME"], config["BASE_DIR"] + _bkp)
-        db.session = db.create_scoped_session()
+        if os.path.exists(db_path):
+            os.rename(db_path, bkp_path)
+        else:
+            app.logger.warning("Expected DB file at %s was missing; skipping rename", db_path)
         db.create_all()
         Controller._init()
-        app.logger.info("SQL Engine reconnected, empty database recreated." + "We are ready to go!")
+        app.logger.info("SQL Engine reconnected, empty database recreated. We are ready to go!")
 
 
 class GameProblem(Exception):