collab-runtime 0.3.0__tar.gz → 0.3.1__tar.gz

{collab_runtime-0.3.0/collab_runtime.egg-info → collab_runtime-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: collab-runtime
-Version: 0.3.0
+Version: 0.3.1
 Summary: Collaborative file locking runtime
 Author-email: KirilMT <kiril.mt95@gmail.com>
 License-Expression: MIT

{collab_runtime-0.3.0 → collab_runtime-0.3.1}/collab/dashboard/index.html

@@ -490,6 +490,9 @@
             </div>
             <div class="nav-right">
                 <span id="last-update" class="chip" data-testid="last-update">Not synced yet</span>
+                <span id="project-info"
+                      class="chip hidden text-muted small"
+                      data-testid="project-info"></span>
                 <span id="user-info" class="chip hidden" data-testid="user-info"></span>
                 <button id="nav-locks"
                         class="btn btn-sm btn-primary"
@@ -649,12 +652,14 @@ SUPABASE_ANON_KEY=your_anon_key</pre>
         <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
         <script src="dashboard-format.js"></script>
         <script>
-        const serverCfg = window.__SUPABASE_CONFIG__ || {};
-        const SUPABASE_URL = serverCfg.url || "";
-        const SUPABASE_KEY = serverCfg.serviceKey || serverCfg.anonKey || "";
-        const SUPABASE_USER = serverCfg.user || null;
-        const IS_ADMIN = !!serverCfg.serviceKey;
-        const SUPABASE_MODE = !!(SUPABASE_URL && SUPABASE_KEY);
+        let runtimeCfg = window.__SUPABASE_CONFIG__ || {};
+        let SUPABASE_URL = "";
+        let SUPABASE_KEY = "";
+        let SUPABASE_USER = null;
+        let IS_ADMIN = false;
+        let SUPABASE_MODE = false;
+        let supabaseClientFingerprint = "";
+        const RUNTIME_CONFIG_PATH = "/collab-runtime-config.json";
 
         const PAGE_SIZE = 25;
         const HISTORY_PREFETCH_GAP_PX = 120;
@@ -744,14 +749,57 @@ SUPABASE_ANON_KEY=your_anon_key</pre>
             document.getElementById("nav-history").disabled = true;
         }
 
+        function applyRuntimeConfig() {
+            SUPABASE_URL = runtimeCfg.url || "";
+            SUPABASE_KEY = runtimeCfg.serviceKey || runtimeCfg.anonKey || "";
+            SUPABASE_USER = runtimeCfg.user || null;
+            IS_ADMIN = !!runtimeCfg.serviceKey;
+            SUPABASE_MODE = !!(SUPABASE_URL && SUPABASE_KEY);
+            updateProjectInfo();
+        }
+
+        function updateProjectInfo() {
+            const el = document.getElementById("project-info");
+            if (!SUPABASE_URL) {
+                el.classList.add("hidden");
+                el.textContent = "";
+                return;
+            }
+            try {
+                const host = new URL(SUPABASE_URL).hostname.replace(".supabase.co", "");
+                el.textContent = host;
+                el.title = "Supabase project: " + SUPABASE_URL;
+                el.classList.remove("hidden");
+            } catch (e) {
+                el.classList.add("hidden");
+            }
+        }
+
+        async function syncRuntimeConfig() {
+            try {
+                const resp = await fetch(RUNTIME_CONFIG_PATH, { cache: "no-store" });
+                if (resp.ok) {
+                    const live = await resp.json();
+                    if (live && live.url) {
+                        runtimeCfg = live;
+                    }
+                }
+            } catch (e) {
+                console.debug("Runtime config fetch skipped", e);
+            }
+            applyRuntimeConfig();
+        }
+
         function showMain() {
             document.getElementById("setup-view").classList.add("hidden");
             document.getElementById("locks-page").classList.remove("hidden");
             document.getElementById("history-page").classList.remove("hidden");
+            const userInfo = document.getElementById("user-info");
             if (SUPABASE_USER) {
-                const userInfo = document.getElementById("user-info");
                 userInfo.classList.remove("hidden");
                 userInfo.innerHTML = '<i class="fab fa-github me-1"></i>' + SUPABASE_USER;
+            } else {
+                userInfo.classList.add("hidden");
             }
         }
 
@@ -763,33 +811,40 @@ SUPABASE_ANON_KEY=your_anon_key</pre>
                 '</td></tr>';
         }
 
-        function loadSupabaseClient() {
+        function loadSupabaseLibrary() {
             return new Promise((resolve, reject) => {
                 if (window.supabase) {
-                    try {
-                        supabaseClient = window.supabase.createClient(SUPABASE_URL, SUPABASE_KEY);
-                        resolve();
-                    } catch (e) {
-                        reject(e);
-                    }
+                    resolve();
                     return;
                 }
-
                 const script = document.createElement("script");
                 script.src = "https://cdn.jsdelivr.net/npm/@supabase/supabase-js/dist/umd/supabase.min.js";
-                script.onload = () => {
-                    try {
-                        supabaseClient = window.supabase.createClient(SUPABASE_URL, SUPABASE_KEY);
-                        resolve();
-                    } catch (e) {
-                        reject(e);
-                    }
-                };
+                script.onload = () => resolve();
                 script.onerror = reject;
                 document.head.appendChild(script);
             });
         }
 
+        function buildSupabaseClient() {
+            return window.supabase.createClient(SUPABASE_URL, SUPABASE_KEY);
+        }
+
+        async function ensureSupabaseClient() {
+            await syncRuntimeConfig();
+            if (!SUPABASE_MODE) {
+                return false;
+            }
+            const fingerprint =
+                SUPABASE_URL + "|" + (runtimeCfg.serviceKey ? "service" : "anon");
+            if (supabaseClient && supabaseClientFingerprint === fingerprint) {
+                return true;
+            }
+            await loadSupabaseLibrary();
+            supabaseClient = buildSupabaseClient();
+            supabaseClientFingerprint = fingerprint;
+            return true;
+        }
+
         function subscribeRealtime() {
             if (!supabaseClient) {
                 return;
@@ -820,6 +875,10 @@ SUPABASE_ANON_KEY=your_anon_key</pre>
             const syncBtn = document.getElementById("sync-btn");
             syncBtn.disabled = true;
             try {
+                if (!(await ensureSupabaseClient())) {
+                    showSetup();
+                    return;
+                }
                 const { data, error } = await supabaseClient
                     .from("file_locks")
                     .select("*")
@@ -844,7 +903,7 @@ SUPABASE_ANON_KEY=your_anon_key</pre>
                 console.error(e);
                 showLocksError("Unable to fetch active locks.");
             } finally {
-                syncBtn.disabled = false;
+                syncBtn.disabled = !SUPABASE_MODE;
             }
         }
 
@@ -929,6 +988,9 @@ SUPABASE_ANON_KEY=your_anon_key</pre>
 
             historyLoading = true;
             try {
+                if (!(await ensureSupabaseClient())) {
+                    return;
+                }
                 const from = historyOffset;
                 const to = historyOffset + PAGE_SIZE - 1;
                 const { data, error } = await supabaseClient
@@ -1082,17 +1144,15 @@ SUPABASE_ANON_KEY=your_anon_key</pre>
         async function init() {
             releaseModal = new bootstrap.Modal(document.getElementById("releaseModal"));
             wireEvents();
-
-            if (!SUPABASE_MODE) {
-                showSetup();
-                return;
-            }
-
-            showMain();
-            applyRoute();
+            applyRuntimeConfig();
 
             try {
-                await loadSupabaseClient();
+                if (!(await ensureSupabaseClient())) {
+                    showSetup();
+                    return;
+                }
+                showMain();
+                applyRoute();
                 await refreshLocks();
                 if (routeFromHash() === "history") {
                     resetHistory();

{collab_runtime-0.3.0 → collab_runtime-0.3.1}/collab/dashboard_server.py

@@ -15,19 +15,87 @@ import os
 import tempfile
 import threading
 import time
-from functools import partial
+import urllib.parse
 from typing import Any, Callable, Optional, Tuple
 
 logger = logging.getLogger(__name__)
 
 DASHBOARD_TEMP_PREFIX = ".collab-dashboard-"
+RUNTIME_CONFIG_PATH = "/collab-runtime-config.json"
 
 
-class _QuietDashboardHandler(http.server.SimpleHTTPRequestHandler):
-    """Serve dashboard static files without per-request stderr logging."""
+def load_runtime_supabase_config(project_root: str) -> dict[str, Any]:
+    """Read ``.env`` from *project_root* and return dashboard Supabase settings.
 
-    def log_message(self, format: str, *args: Any) -> None:
-        """Suppress default SimpleHTTPRequestHandler request log lines."""
+    The local dashboard fetches this on each sync so credential changes take effect
+    without restarting the watcher or reopening a stale browser tab. The project
+    ``.env`` is read directly (not via ``load_dotenv``) so polling never mutates the
+    running watcher's process environment.
+    """
+    from dotenv import dotenv_values
+
+    env_path = os.path.join(project_root, ".env")
+    file_vals: dict[str, Any] = {}
+    if os.path.isfile(env_path):
+        try:
+            file_vals = dict(dotenv_values(env_path))
+        except OSError as exc:
+            logger.debug("Could not read %s for runtime config: %s", env_path, exc)
+
+    def pick(name: str) -> Optional[str]:
+        val = file_vals.get(name)
+        if not val:
+            val = os.getenv(name)
+        return val
+
+    url = pick("SUPABASE_URL") or ""
+    anon = pick("SUPABASE_ANON_KEY") or ""
+    service = pick("SUPABASE_SERVICE_ROLE_KEY") or None
+    user = (
+        pick("COLLAB_DEVELOPER_ID")
+        or pick("DEVELOPER_ID")
+        or os.getenv("USERNAME")
+        or os.getenv("USER")
+        or ""
+    )
+    return {
+        "url": url,
+        "anonKey": anon,
+        "serviceKey": service,
+        "user": user,
+    }
+
+
+def create_dashboard_handler(project_root: str, directory: str) -> type:
+    """Build a request handler that serves static assets and live runtime config."""
+
+    class DashboardHandler(http.server.SimpleHTTPRequestHandler):
+        """Serve dashboard static files without per-request stderr logging."""
+
+        def __init__(self, *args: Any, **kwargs: Any) -> None:
+            super().__init__(*args, directory=directory, **kwargs)
+
+        def log_message(self, format: str, *args: Any) -> None:
+            """Suppress default SimpleHTTPRequestHandler request log lines."""
+
+        def do_GET(self) -> None:
+            parsed = urllib.parse.urlparse(self.path)
+            if parsed.path == RUNTIME_CONFIG_PATH:
+                self._serve_runtime_config()
+                return
+            super().do_GET()
+
+        def _serve_runtime_config(self) -> None:
+            payload = load_runtime_supabase_config(project_root)
+            body = json.dumps(payload).encode("utf-8")
+            self.send_response(200)
+            self.send_header("Content-Type", "application/json; charset=utf-8")
+            self.send_header("Content-Length", str(len(body)))
+            self.send_header("Cache-Control", "no-store")
+            self.end_headers()
+            self.wfile.write(body)
+
+    return DashboardHandler
 
 
 def dashboard_directory(resource_root: str) -> str:
@@ -96,17 +164,18 @@ def start_dashboard_http_server(
     resource_root: str,
     injected_html_path: str,
     *,
+    project_root: Optional[str] = None,
     log_error: Callable[[str, Any], None] = logger.error,
     log_warning: Callable[[str, Any], None] = logger.warning,
 ) -> Optional[str]:
     """Serve ``collab/dashboard`` and return the URL to the injected HTML file."""
     dash_dir = dashboard_directory(resource_root)
     filename = os.path.basename(injected_html_path)
+    env_root = project_root or resource_root
 
     try:
-        handler = partial(_QuietDashboardHandler, directory=dash_dir)
-
-        server = http.server.ThreadingHTTPServer(("127.0.0.1", 0), handler)
+        handler_cls = create_dashboard_handler(env_root, dash_dir)
+        server = http.server.ThreadingHTTPServer(("127.0.0.1", 0), handler_cls)
         port = server.server_address[1]
 
         thread = threading.Thread(target=server.serve_forever, daemon=True)
@@ -152,6 +221,7 @@ def prepare_dashboard_server(
     resource_root: str,
     injected: dict[str, Any],
     *,
+    project_root: Optional[str] = None,
     log_error: Callable[[str, Any], None] = logger.error,
     log_warning: Callable[[str, Any], None] = logger.warning,
 ) -> Tuple[Optional[str], Optional[str]]:
@@ -163,6 +233,7 @@ def prepare_dashboard_server(
     url = start_dashboard_http_server(
         resource_root,
         html_path,
+        project_root=project_root,
         log_error=log_error,
         log_warning=log_warning,
     )

{collab_runtime-0.3.0 → collab_runtime-0.3.1}/collab/live_locks_watcher.py

@@ -707,6 +707,7 @@ def _start_dashboard_server() -> str | None:
     url, _html_path = prepare_dashboard_server(
         _RESOURCE_ROOT,
         injected,
+        project_root=_PROJECT_ROOT,
         log_error=logger.warning,
         log_warning=logger.debug,
     )

{collab_runtime-0.3.0 → collab_runtime-0.3.1}/collab/lock_client.py

@@ -2090,7 +2090,9 @@ class LockClient:
             "serviceKey": SUPABASE_SERVICE_ROLE_KEY or None,
             "user": self.developer_id or "",
         }
-        return prepare_dashboard_server(_RESOURCE_ROOT, injected)
+        return prepare_dashboard_server(
+            _RESOURCE_ROOT, injected, project_root=_PROJECT_ROOT
+        )
 
     # ------------------------------------------------------------------
     # Watcher (foreground process)

{collab_runtime-0.3.0 → collab_runtime-0.3.1/collab_runtime.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: collab-runtime
-Version: 0.3.0
+Version: 0.3.1
 Summary: Collaborative file locking runtime
 Author-email: KirilMT <kiril.mt95@gmail.com>
 License-Expression: MIT

{collab_runtime-0.3.0 → collab_runtime-0.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "collab-runtime"
-version = "0.3.0"
+version = "0.3.1"
 description = "Collaborative file locking runtime"
 readme = "docs/pypi/README.md"
 license = "MIT"