webflash: combine build and serve commands

Author: vk2seb

.github/workflows/deploy.yaml

@@ -11,11 +11,14 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - run: git submodule update --init
-      - run: |
-          mkdir build
-          cp src/index.html src/bg.jpg build
-          cp tiliqua/gateware/src/tiliqua/flash_core.py build
-          cp coi-serviceworker/coi-serviceworker.js build
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.13"
+      - name: Install PDM
+        run: pip install pdm
+      - name: Build application
+        run: pdm build-site
       - name: Deploy to GitHub Pages
         uses: peaceiris/actions-gh-pages@v4
         if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}

.gitignore

@@ -4,3 +4,4 @@ __pycache__/
 .pytest_cache/
 .ruff_cache/
 .pdm-python
+build/

pyproject.toml

@@ -13,3 +13,7 @@ license = {text = "MIT"}
 
 [tool.pdm]
 distribution = false
+
+[tool.pdm.scripts]
+build-site = "python scripts/server.py --build-only"
+serve = "python scripts/server.py"

scripts/server.py

@@ -0,0 +1,82 @@
+#!/usr/bin/env python3
+import argparse
+import shutil
+import os
+from pathlib import Path
+
+
+def build_application():
+    project_root = Path(__file__).parent.parent
+    build_dir = project_root / "build"
+    
+    if build_dir.exists():
+        shutil.rmtree(build_dir)
+    build_dir.mkdir()
+    
+    files_to_copy = [
+        ("src/index.html", "index.html"),
+        ("src/bg.jpg", "bg.jpg"),
+        ("tiliqua/gateware/src/tiliqua/flash_core.py", "flash_core.py"),
+        ("coi-serviceworker/coi-serviceworker.js", "coi-serviceworker.js"),
+    ]
+    
+    for src_path, dest_name in files_to_copy:
+        src = project_root / src_path
+        dest = build_dir / dest_name
+        
+        if not src.exists():
+            raise FileNotFoundError(f"Source file not found: {src}")
+        
+        shutil.copy2(src, dest)
+        print(f"Copied {src_path} -> build/{dest_name}")
+    
+    print(f"Build completed successfully in {build_dir}")
+
+
+def serve_application():
+    from flask import Flask, send_from_directory
+
+    build_dir = Path(__file__).parent.parent / "build"
+    
+    if not build_dir.exists():
+        raise FileNotFoundError(f"Build directory not found: {build_dir}. Run with --build-only first.")
+    
+    app = Flask(__name__)
+    
+    @app.after_request
+    def add_security_headers(response):
+        response.headers['Cross-Origin-Opener-Policy'] = 'same-origin'
+        response.headers['Cross-Origin-Embedder-Policy'] = 'require-corp'
+        return response
+    
+    @app.route('/')
+    def serve_index():
+        return send_from_directory(build_dir, 'index.html')
+    
+    @app.route('/<path:path>')
+    def serve_file(path):
+        return send_from_directory(build_dir, path)
+    
+    port = int(os.environ.get('PORT', 8000))
+    print(f"Serving from {build_dir} on http://localhost:{port}")
+    app.run(host='localhost', port=port, debug=True)
+
+
+def main():
+    parser = argparse.ArgumentParser(description='Build and/or serve tiliqua-webflash')
+    parser.add_argument('--build-only', action='store_true', 
+                       help='Only build the application, do not serve')
+    
+    args = parser.parse_args()
+    
+    build_application()
+    
+    if args.build_only:
+        print("Build-only mode: exiting after build")
+        return
+    
+    serve_application()
+
+
+if __name__ == "__main__":
+    main()