base setup

Dockerfile

@@ -23,19 +23,25 @@ RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg -
 RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_${NODE_MAJOR}.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list > /dev/null
 RUN apt-get update && apt-get install nodejs -y
 
-COPY ./requirements.txt /code/requirements.txt
-
 # Expose Flask port
-ENV FLASK_PORT=7860
+ENV FAST_API_PORT=7860
 EXPOSE 7860
 
+# Install Python dependencies
+COPY ./requirements.txt /code/requirements.txt
 RUN pip3 install --no-cache-dir --upgrade -r /code/requirements.txt
 
-# Copy the current directory contents into the container at $HOME/app setting the owner to the user
-COPY app/ app/
+# Copy package.json and package-lock.json (or yarn.lock)
+COPY frontend/package*.json frontend/
+RUN cd frontend && npm install
+
+# Copy frontend app and install Node.js dependencies
 COPY frontend/ frontend/
+RUN cd frontend && npm install
+
+# Copy everything else
+COPY app/ app/
 COPY server.py server.py
-COPY build-run.sh build-run.sh
 
 #ENV LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libtcmalloc.so.4
-CMD ["./build-run.sh"]
+CMD ["python3", "server.py"]

_server.py

@@ -0,0 +1,100 @@
+from flask import Flask, send_from_directory, jsonify, request
+from flask_cors import CORS
+from dotenv import load_dotenv
+import os
+import requests
+import subprocess
+import time
+
+from app.auth import get_meeting_token
+
+load_dotenv()
+
+app = Flask(__name__, static_url_path="/", static_folder="frontend/out")
+CORS(app)
+
+def _start_bot(bot_path, args=None):
+    daily_api_key = os.getenv("DAILY_API_KEY") or ""
+    api_path = os.getenv("DAILY_API_PATH") or "https://api.daily.co/v1"
+
+    timeout = int(os.getenv("ROOM_TIMEOUT") or os.getenv("BOT_MAX_DURATION") or 300)
+    exp = time.time() + timeout
+
+    '''
+    res = requests.post(
+        f"{api_path}/rooms",
+        headers={"Authorization": f"Bearer {daily_api_key}"},
+        json={
+            "properties": {
+                "exp": exp,
+                "enable_chat": True,
+                "enable_emoji_reactions": True,
+                "eject_at_room_exp": True,
+                "enable_prejoin_ui": False,
+            }
+        },
+    )
+    if res.status_code != 200:
+        return (
+            jsonify(
+                {
+                    "error": "Unable to create room",
+                    "status_code": res.status_code,
+                    "text": res.text,
+                }
+            ),
+            500,
+        )
+    '''
+    room_url = os.getenv("DAILY_ROOM_URL") #res.json()["url"]
+    room_name = os.getenv("DAILY_ROOM_NAME") #res.json()["name"]
+
+    meeting_token = get_meeting_token(room_url, daily_api_key, exp)
+
+    if args:
+        extra_args = " ".join([f'-{x[0]} "{x[1]}"' for x in args])
+    else:
+        extra_args = ""
+
+    proc = subprocess.Popen(
+        [
+            f"python3 {bot_path} -u {room_url} -t {meeting_token} {extra_args}"
+        ],
+        shell=True,
+        bufsize=1,
+    )
+
+    # Don't return until the bot has joined the room, but wait for at most 2 seconds.
+    attempts = 0
+    while attempts < 20:
+        time.sleep(0.1)
+        attempts += 1
+        res = requests.get(
+            f"{api_path}/rooms/{room_name}/get-session-data",
+            headers={"Authorization": f"Bearer {daily_api_key}"},
+        )
+        if res.status_code == 200:
+            break
+    print(f"Took {attempts} attempts to join room {room_name}")
+
+    return jsonify({"room_url": room_url, "token": meeting_token}), 200
+
+# Routes
+#@app.route("/start-bot", methods=["POST"])
+#def start_bot():
+#    return _start_bot("./app/bot.py")
+
+
+@app.route('/', defaults={'path': ''})
+@app.route('/<path:path>')
+def catch_all(path):
+    full_path = os.path.join(app.static_folder, path)
+    # Check if path is a directory and index.html exists
+    if os.path.isdir(full_path) and os.path.exists(os.path.join(full_path, 'index.html')):
+        return send_from_directory(full_path, 'index.html')
+    # Check if path.html exists
+    elif os.path.exists(full_path + '.html'):
+        return send_from_directory(app.static_folder, path + '.html')
+    # Serve index.html by default
+    else:
+        return send_from_directory(app.static_folder, 'index.html')

build-run.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-cd frontend
-echo "Installing node modules..."
-npm install
-echo "Building frontend..."
-npm run build
-if [ $? -eq 0 ]; then
-    echo -e "\033[1;32m\nfrontend build success \033[0m"
-else
-    echo -e "\033[1;31m\nfrontend build failed\n\033[0m" >&2  exit 1
-fi
-cd ../
-
-gunicorn --workers=2 --log-level debug server:app --bind=0.0.0.0:$FLASK_PORT

frontend/app/page.js

@@ -1,113 +1,11 @@
-import Image from 'next/image'
+import Link from "next/link";
 
 export default function Home() {
   return (
     <main className="flex min-h-screen flex-col items-center justify-between p-24">
-      <div className="z-10 max-w-5xl w-full items-center justify-between font-mono text-sm lg:flex">
-        <p className="fixed left-0 top-0 flex w-full justify-center border-b border-gray-300 bg-gradient-to-b from-zinc-200 pb-6 pt-8 backdrop-blur-2xl dark:border-neutral-800 dark:bg-zinc-800/30 dark:from-inherit lg:static lg:w-auto  lg:rounded-xl lg:border lg:bg-gray-200 lg:p-4 lg:dark:bg-zinc-800/30">
-          Get started by editing&nbsp;
-          <code className="font-mono font-bold">app/page.js</code>
-        </p>
-        <div className="fixed bottom-0 left-0 flex h-48 w-full items-end justify-center bg-gradient-to-t from-white via-white dark:from-black dark:via-black lg:static lg:h-auto lg:w-auto lg:bg-none">
-          <a
-            className="pointer-events-none flex place-items-center gap-2 p-8 lg:pointer-events-auto lg:p-0"
-            href="https://vercel.com?utm_source=create-next-app&utm_medium=appdir-template&utm_campaign=create-next-app"
-            target="_blank"
-            rel="noopener noreferrer"
-          >
-            By{' '}
-            <Image
-              src="/vercel.svg"
-              alt="Vercel Logo"
-              className="dark:invert"
-              width={100}
-              height={24}
-              priority
-            />
-          </a>
-        </div>
-      </div>
-
-      <div className="relative flex place-items-center before:absolute before:h-[300px] before:w-[480px] before:-translate-x-1/2 before:rounded-full before:bg-gradient-radial before:from-white before:to-transparent before:blur-2xl before:content-[''] after:absolute after:-z-20 after:h-[180px] after:w-[240px] after:translate-x-1/3 after:bg-gradient-conic after:from-sky-200 after:via-blue-200 after:blur-2xl after:content-[''] before:dark:bg-gradient-to-br before:dark:from-transparent before:dark:to-blue-700 before:dark:opacity-10 after:dark:from-sky-900 after:dark:via-[#0141ff] after:dark:opacity-40 before:lg:h-[360px] z-[-1]">
-        <Image
-          className="relative dark:drop-shadow-[0_0_0.3rem_#ffffff70] dark:invert"
-          src="/next.svg"
-          alt="Next.js Logo"
-          width={180}
-          height={37}
-          priority
-        />
-      </div>
-
-      <div className="mb-32 grid text-center lg:max-w-5xl lg:w-full lg:mb-0 lg:grid-cols-4 lg:text-left">
-        <a
-          href="https://nextjs.org/docs?utm_source=create-next-app&utm_medium=appdir-template&utm_campaign=create-next-app"
-          className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          <h2 className={`mb-3 text-2xl font-semibold`}>
-            Docs{' '}
-            <span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
-              -&gt;
-            </span>
-          </h2>
-          <p className={`m-0 max-w-[30ch] text-sm opacity-50`}>
-            Find in-depth information about Next.js features and API.
-          </p>
-        </a>
-
-        <a
-          href="https://nextjs.org/learn?utm_source=create-next-app&utm_medium=appdir-template-tw&utm_campaign=create-next-app"
-          className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800 hover:dark:bg-opacity-30"
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          <h2 className={`mb-3 text-2xl font-semibold`}>
-            Learn{' '}
-            <span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
-              -&gt;
-            </span>
-          </h2>
-          <p className={`m-0 max-w-[30ch] text-sm opacity-50`}>
-            Learn about Next.js in an interactive course with&nbsp;quizzes!
-          </p>
-        </a>
-
-        <a
-          href="https://vercel.com/templates?framework=next.js&utm_source=create-next-app&utm_medium=appdir-template&utm_campaign=create-next-app"
-          className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          <h2 className={`mb-3 text-2xl font-semibold`}>
-            Templates{' '}
-            <span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
-              -&gt;
-            </span>
-          </h2>
-          <p className={`m-0 max-w-[30ch] text-sm opacity-50`}>
-            Explore starter templates for Next.js.
-          </p>
-        </a>
-
-        <a
-          href="https://vercel.com/new?utm_source=create-next-app&utm_medium=appdir-template&utm_campaign=create-next-app"
-          className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          <h2 className={`mb-3 text-2xl font-semibold`}>
-            Deploy{' '}
-            <span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
-              -&gt;
-            </span>
-          </h2>
-          <p className={`m-0 max-w-[30ch] text-sm opacity-50`}>
-            Instantly deploy your Next.js site to a shareable URL with Vercel.
-          </p>
-        </a>
-      </div>
+      Hello
+      <hr />
+      <Link href="/test">Test</Link>
     </main>
-  )
+  );
 }

frontend/app/test/page.js

@@ -0,0 +1,7 @@
+export default function Test() {
+  return (
+    <main className="flex min-h-screen flex-col items-center justify-between p-24">
+      Hi
+    </main>
+  );
+}

requirements.txt

@@ -1,15 +1,7 @@
 daily-python
-blinker==1.7.0
-click==8.1.7
-Flask==3.0.0
-Flask-Cors==4.0.0
-gunicorn==21.2.0
-itsdangerous==2.1.2
-Jinja2==3.1.2
-MarkupSafe==2.1.3
-packaging==23.2
-Werkzeug==3.0.1
 python-dotenv
 imageio-ffmpeg
 imageio
-requests
+requests
+fastapi
+uvicorn[standard]

server.py

@@ -1,91 +1,52 @@
-from flask import Flask, send_from_directory, jsonify, request
-from flask_cors import CORS
+from fastapi import FastAPI, HTTPException
+from fastapi.middleware.cors import CORSMiddleware
+from fastapi.staticfiles import StaticFiles
+from fastapi.responses import FileResponse
 from dotenv import load_dotenv
+from pathlib import Path
 import os
-import requests
-import subprocess
-import time
-
-from app.auth import get_meeting_token
 
 load_dotenv()
 
-app = Flask(__name__, static_url_path="/", static_folder="frontend/out")
-CORS(app)
-
-def _start_bot(bot_path, args=None):
-    daily_api_key = os.getenv("DAILY_API_KEY") or ""
-    api_path = os.getenv("DAILY_API_PATH") or "https://api.daily.co/v1"
-
-    timeout = int(os.getenv("ROOM_TIMEOUT") or os.getenv("BOT_MAX_DURATION") or 300)
-    exp = time.time() + timeout
-
-    '''
-    res = requests.post(
-        f"{api_path}/rooms",
-        headers={"Authorization": f"Bearer {daily_api_key}"},
-        json={
-            "properties": {
-                "exp": exp,
-                "enable_chat": True,
-                "enable_emoji_reactions": True,
-                "eject_at_room_exp": True,
-                "enable_prejoin_ui": False,
-            }
-        },
-    )
-    if res.status_code != 200:
-        return (
-            jsonify(
-                {
-                    "error": "Unable to create room",
-                    "status_code": res.status_code,
-                    "text": res.text,
-                }
-            ),
-            500,
-        )
-    '''
-    room_url = os.getenv("DAILY_ROOM_URL") #res.json()["url"]
-    room_name = os.getenv("DAILY_ROOM_NAME") #res.json()["name"]
-
-    meeting_token = get_meeting_token(room_url, daily_api_key, exp)
-
-    if args:
-        extra_args = " ".join([f'-{x[0]} "{x[1]}"' for x in args])
+app = FastAPI()
+
+app.add_middleware(
+    CORSMiddleware,
+    allow_origins=["*"],
+    allow_credentials=True,
+    allow_methods=["*"],
+    allow_headers=["*"],
+)
+
+# Mount the static directory
+app.mount("/static", StaticFiles(directory="frontend/out", html=True), name="static")
+
+@app.get("/{path_name:path}")
+async def catch_all(path_name: str):
+    # Default route for the root
+    if path_name == "":
+        path_name = "index"
+
+    # Construct file path with .html extension
+    file_path = Path("frontend/out") / f"{path_name}.html"
+    
+    if file_path.is_file():
+        # Serve the .html file if it exists
+        return FileResponse(file_path)
     else:
-        extra_args = ""
-
-    proc = subprocess.Popen(
-        [
-            f"python3 {bot_path} -u {room_url} -t {meeting_token} {extra_args}"
-        ],
-        shell=True,
-        bufsize=1,
+        # If the specific .html file does not exist, raise a 404 error
+        raise HTTPException(status_code=404, detail="Item not found")
+
+# Run the application using Uvicorn
+if __name__ == "__main__":
+    import uvicorn
+
+    uvicorn.run(
+        "server:app",
+        host="0.0.0.0",
+        port=int(os.getenv('FAST_API_PORT', 8000)),
+        reload=os.getenv('FAST_API_RELOAD', 'false').lower() == 'true',
+        #ssl_certfile=args.ssl_certfile,
+        #ssl_keyfile=args.ssl_keyfile,
     )
-
-    # Don't return until the bot has joined the room, but wait for at most 2 seconds.
-    attempts = 0
-    while attempts < 20:
-        time.sleep(0.1)
-        attempts += 1
-        res = requests.get(
-            f"{api_path}/rooms/{room_name}/get-session-data",
-            headers={"Authorization": f"Bearer {daily_api_key}"},
-        )
-        if res.status_code == 200:
-            break
-    print(f"Took {attempts} attempts to join room {room_name}")
-
-    return jsonify({"room_url": room_url, "token": meeting_token}), 200
-
-# Routes
-@app.route("/start-bot", methods=["POST"])
-def start_bot():
-    return _start_bot("./app/bot.py")
-
-@app.route("/")
-def home():
-    print(f'Static folder path: {app.static_folder}')
-    return send_from_directory(app.static_folder, 'index.html')
-
+