create-caspian-app 0.2.0-beta.49 → 0.2.0-beta.50

package/dist/main.py

@@ -6,6 +6,7 @@ import importlib.util
 import mimetypes
 import secrets
 import traceback
+import json
 from pathlib import Path
 from fastapi import FastAPI, Request, Response
 from fastapi.responses import RedirectResponse, FileResponse, HTMLResponse
@@ -35,7 +36,6 @@ from casp.layout import (
 import hashlib
 from casp.streaming import SSE
 from typing import Any, Optional, get_args, get_origin, Union
-import re
 from src.lib.auth.auth_config import build_auth_settings
 
 load_dotenv()
@@ -70,6 +70,37 @@ IS_PRODUCTION = os.getenv('APP_ENV') == 'production'
 CACHE_ENABLED = os.getenv('CACHE_ENABLED', 'false').lower() == 'true'
 DEFAULT_TTL = int(os.getenv('CACHE_TTL', 600))
 
+
+def _dev_cookie_scope() -> str:
+    if IS_PRODUCTION:
+        return ""
+
+    scope = os.getenv("CASPIAN_BROWSER_SYNC_PORT")
+    if not scope:
+        bs_config_path = Path("settings/bs-config.json")
+        if bs_config_path.exists():
+            try:
+                local_url = json.loads(
+                    bs_config_path.read_text(encoding="utf-8")
+                ).get("local", "")
+                scope = local_url.rsplit(":", 1)[-1].strip("/")
+            except (OSError, json.JSONDecodeError):
+                scope = ""
+
+    scope = scope or os.getenv("PORT", "")
+    return scope if scope.isdigit() else ""
+
+
+def _scoped_cookie_name(base_name: str) -> str:
+    scope = _dev_cookie_scope()
+    return f"{base_name}_{scope}" if scope else base_name
+
+
+CSRF_COOKIE_NAME = _scoped_cookie_name("pp_csrf")
+SESSION_COOKIE_NAME = _scoped_cookie_name(
+    os.getenv('AUTH_COOKIE_NAME', 'session')
+)
+
 # ====
 # Static File Routes
 # ====
@@ -129,7 +160,7 @@ class CSRFMiddleware:
 
         async def send_wrapper(message):
             if message["type"] == "http.response.start":
-                cookie_value = f"pp_csrf={csrf_token}; Path=/; SameSite=Lax"
+                cookie_value = f"{CSRF_COOKIE_NAME}={csrf_token}; Path=/; SameSite=Lax"
                 if IS_PRODUCTION:
                     cookie_value += "; Secure"
                 new_headers = list(message.get("headers", []))
@@ -159,7 +190,7 @@ class AuthMiddleware:
         providers = Auth.get_providers()
 
         if providers:
-            oauth_response = auth_inst.auth_providers(*providers)
+            oauth_response = await auth_inst.auth_providers(*providers)
             if oauth_response:
                 await oauth_response(scope, receive, send)
                 return
@@ -217,40 +248,44 @@ class RPCMiddleware:
 # Route Registration
 # ====
 
+_route_module_cache = {}
+_route_signature_cache = {}
 
-_VOID_TAGS_PATTERN = r"(?:area|base|br|col|embed|hr|img|input|link|meta|param|source|track|wbr)"
-_VOID_END_TAG_RE = re.compile(rf"</\s*{_VOID_TAGS_PATTERN}\s*>", re.IGNORECASE)
-_VOID_OPEN_TAG_RE = re.compile(
-    rf"<\s*({_VOID_TAGS_PATTERN})(\b[^>]*)>", re.IGNORECASE)
 
+def load_route_module(file_path: str):
+    abs_path = os.path.abspath(file_path)
+    try:
+        mtime_ns = os.stat(abs_path).st_mtime_ns
+    except OSError:
+        raise FileNotFoundError(f"Route module not found: {abs_path}")
 
-def normalize_void_tags(html: str) -> str:
-    html = _VOID_END_TAG_RE.sub("", html)
-
-    def _open_repl(m: re.Match) -> str:
-        tag = m.group(1)
-        attrs = m.group(2) or ""
-        full = m.group(0)
-        if full.rstrip().endswith("/>"):
-            return full
-        if attrs and not attrs.startswith(" "):
-            attrs = " " + attrs
-        return f"<{tag}{attrs} />"
-
-    return _VOID_OPEN_TAG_RE.sub(_open_repl, html)
-
+    cached = _route_module_cache.get(abs_path)
+    if cached is not None and cached[0] == mtime_ns:
+        return cached[1]
 
-def load_route_module(file_path: str):
-    unique_id = hashlib.md5(file_path.encode()).hexdigest()[:8]
+    unique_id = hashlib.md5(abs_path.encode()).hexdigest()[:8]
     module_name = f"page_{unique_id}"
-    spec = importlib.util.spec_from_file_location(module_name, file_path)
+    spec = importlib.util.spec_from_file_location(module_name, abs_path)
     assert spec is not None and spec.loader is not None, f"Cannot load spec for {file_path}"
     module = importlib.util.module_from_spec(spec)
     spec.loader.exec_module(module)
     setattr(module, 'render_page', render_page)
+    _route_module_cache[abs_path] = (mtime_ns, module)
+    _route_signature_cache.pop(abs_path, None)
     return module
 
 
+def get_page_signature(file_path: str, page_func):
+    abs_path = os.path.abspath(file_path)
+    cached = _route_signature_cache.get(abs_path)
+    if cached is not None and cached[0] is page_func:
+        return cached[1]
+
+    sig = inspect.signature(page_func)
+    _route_signature_cache[abs_path] = (page_func, sig)
+    return sig
+
+
 def _unwrap_optional(annotation: Any) -> Any:
     """
     Optional[T] is Union[T, NoneType]. Return T when applicable.
@@ -338,7 +373,7 @@ def register_single_route(url_pattern: str, file_path: str):
         current_uri = request.url.path
 
         # 1. Cache Check (Fast Path)
-        if request.method == 'GET':
+        if CACHE_ENABLED and request.method == 'GET':
             cached_resp = CacheHandler.serve_cache(current_uri, DEFAULT_TTL)
             if cached_resp:
                 return HTMLResponse(content=cached_resp)
@@ -356,7 +391,7 @@ def register_single_route(url_pattern: str, file_path: str):
             if not hasattr(module, 'page'):
                 raise AttributeError(f"Missing 'def page():' in {file_path}")
 
-            sig = inspect.signature(module.page)
+            sig = get_page_signature(file_path, module.page)
             call_kwargs = {}
             call_args = []
 
@@ -434,7 +469,6 @@ def register_single_route(url_pattern: str, file_path: str):
         )
 
         html_output = transform_scripts(html_output)
-        html_output = normalize_void_tags(html_output)
         response = HTMLResponse(content=html_output)
         response.headers['X-PP-Root-Layout'] = root_layout_id
 
@@ -540,7 +574,7 @@ app.add_middleware(CSRFMiddleware)
 app.add_middleware(
     SessionMiddleware,
     secret_key=os.getenv('AUTH_SECRET', 'change-me'),
-    session_cookie=os.getenv('AUTH_COOKIE_NAME', 'session'),
+    session_cookie=SESSION_COOKIE_NAME,
     max_age=SESSION_LIFETIME_HOURS * 3600,
     same_site='lax',
     https_only=IS_PRODUCTION,

package/dist/settings/bs-config.ts

@@ -165,7 +165,7 @@ const pipeline = new DebouncedWorker(
       !changedFile.includes("__pycache__");
 
     if (needsPythonRestart) {
-      await restartPythonServer(pythonPort);
+      await restartPythonServer(pythonPort, bsPort);
       updateRouteFilesCache();
 
       const isReady = await waitForPort(pythonPort);
@@ -201,7 +201,7 @@ const pipeline = new DebouncedWorker(
             "→ Structure changed (New/Deleted file), restarting Python server...",
           ),
         );
-        await restartPythonServer(pythonPort);
+        await restartPythonServer(pythonPort, bsPort);
         const isReady = await waitForPort(pythonPort);
         if (isReady && bs.active) bs.reload();
       } else if (bs.active) {
@@ -295,7 +295,7 @@ const publicPipeline = new DebouncedWorker(
   createSrcWatcher(join(__dirname, "..", "utils", "**", "*.py"), {
     onEvent: async (_ev, _abs, _) => {
       if (_abs.includes("__pycache__")) return;
-      await restartPythonServer(pythonPort);
+      await restartPythonServer(pythonPort, bsPort);
       const isReady = await waitForPort(pythonPort);
       if (isReady && bs.active) bs.reload();
     },
@@ -308,7 +308,7 @@ const publicPipeline = new DebouncedWorker(
   createSrcWatcher(join(__dirname, "..", "main.py"), {
     onEvent: async (_ev, _abs, _) => {
       if (_abs.includes("__pycache__")) return;
-      await restartPythonServer(pythonPort);
+      await restartPythonServer(pythonPort, bsPort);
       const isReady = await waitForPort(pythonPort);
       if (isReady && bs.active) bs.reload();
     },
@@ -318,7 +318,7 @@ const publicPipeline = new DebouncedWorker(
     interval: 1000,
   });
 
-  startPythonServer(pythonPort);
+  startPythonServer(pythonPort, bsPort);
 
   bs.init(
     {

package/dist/settings/python-server.ts

@@ -53,7 +53,7 @@ export function waitForPort(port: number, timeout = 10000): Promise<boolean> {
 
 export function waitForPortRelease(
   port: number,
-  timeout = 5000
+  timeout = 5000,
 ): Promise<boolean> {
   const start = Date.now();
   return new Promise((resolve) => {
@@ -114,29 +114,44 @@ async function killProcessTree(child: ChildProcess): Promise<void> {
   }
 }
 
-function spawnPython(port: number): ChildProcess {
+function spawnPython(port: number, browserSyncPort?: number): ChildProcess {
   const pythonPath = getVenvPythonPath();
   const args = ["-u", "main.py"];
 
   console.log(`→ Starting Python server on port ${port}...`);
 
+  const env = {
+    ...process.env,
+    PYTHONUNBUFFERED: "1",
+    PORT: String(port),
+    ...(browserSyncPort
+      ? { CASPIAN_BROWSER_SYNC_PORT: String(browserSyncPort) }
+      : {}),
+  };
+
   const child = spawn(pythonPath, args, {
     stdio: "inherit",
     shell: false,
     detached: !isWindows(),
-    env: { ...process.env, PYTHONUNBUFFERED: "1", PORT: String(port) },
+    env,
   });
 
   child.on("error", (err) => console.error("Failed to start Python:", err));
   return child;
 }
 
-export function startPythonServer(port: number): void {
+export function startPythonServer(
+  port: number,
+  browserSyncPort?: number,
+): void {
   if (pythonProcess && pythonProcess.exitCode === null) return;
-  pythonProcess = spawnPython(port);
+  pythonProcess = spawnPython(port, browserSyncPort);
 }
 
-export async function restartPythonServer(port: number): Promise<void> {
+export async function restartPythonServer(
+  port: number,
+  browserSyncPort?: number,
+): Promise<void> {
   if (isRestarting) return;
   isRestarting = true;
 
@@ -150,7 +165,7 @@ export async function restartPythonServer(port: number): Promise<void> {
       await waitForPortRelease(port);
     }
 
-    pythonProcess = spawnPython(port);
+    pythonProcess = spawnPython(port, browserSyncPort);
   } finally {
     isRestarting = false;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-caspian-app",
-  "version": "0.2.0-beta.49",
+  "version": "0.2.0-beta.50",
   "description": "Scaffold a new Caspian project (FastAPI-powered reactive Python framework).",
   "main": "dist/index.js",
   "type": "module",