Update main.py

main.py

@@ -1,17 +1,17 @@
 """
-TG Storage API — Store & retrieve files via Telegram as a backend.
+TG Storage API \u2014 Store & retrieve files via Telegram as a backend.
 
 Endpoints:
-  GET    /                        — Frontend UI
-  POST   /upload                  — Upload a file (optional custom_path)
-  GET    /cdn/<path>              — Public CDN URL — works with:
+  GET    /                        \u2014 Frontend UI
+  POST   /upload                  \u2014 Upload a file (optional custom_path)
+  GET    /cdn/<path>              \u2014 Public CDN URL \u2014 works with:
                                       /cdn/<file_id>
                                       /cdn/<custom_path>        e.g. /cdn/logo.png
                                       /cdn/<folder/name.ext>   e.g. /cdn/images/avatar.jpg
-  GET    /file/<file_id>          — Download (auth required, forces attachment)
-  GET    /files                   — List all stored files
-  DELETE /file/<file_id>          — Delete a file record
-  GET    /health                  — Health check
+  GET    /file/<file_id>          \u2014 Download (auth required, forces attachment)
+  GET    /files                   \u2014 List all stored files
+  DELETE /file/<file_id>          \u2014 Delete a file record
+  GET    /health                  \u2014 Health check
 """
 
 import os
@@ -26,6 +26,7 @@ import mimetypes
 import atexit
 from datetime import datetime, timezone
 from pathlib import Path
+from typing import Optional
 
 logger = logging.getLogger(__name__)
 
@@ -39,9 +40,9 @@ from db import (
 )
 from tg import upload_to_telegram, download_from_telegram, init_bot_pool, close_http
 
-# ──────────────────────────────────────────────────
+# \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
 #  App
-# ──────────────────────────────────────────────────
+# \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
 app = Flask(__name__)
 CORS(app)
 
@@ -54,25 +55,48 @@ FRONTEND_PATH = _HERE / "frontend.html"
 # Allowed characters in a custom path segment
 _CUSTOM_PATH_RE = re.compile(r'^[a-zA-Z0-9._\-/]+$')
 
-# ──────────────────────────────────────────────────
+# \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
 #  Startup / Shutdown
-# ──────────────────────────────────────────────────
-_initialized = False
+# \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
+_initialized   = False
+_startup_error: Optional[str] = None   # FIX: track last startup failure message
+
 
 def _startup():
-    global _initialized
+    """
+    FIX: Idempotent startup with proper error tracking.
+
+    - If already initialized \u2192 return immediately (no-op).
+    - If previously failed \u2192 retry (allows recovery when Supabase was
+      temporarily unreachable, e.g. cold-start DNS not yet ready).
+    - On failure \u2192 reset _initialized=False so next request retries,
+      and store the error message for clean logging.
+    - Raises RuntimeError so callers can return 503 instead of crashing.
+    """
+    global _initialized, _startup_error
+
     if _initialized:
         return
-    init_db()          # connect Supabase + verify table exists
-    init_bot_pool()    # verify tokens.txt & build bot pool
-    _initialized = True
+
+    _startup_error = None
+    try:
+        init_db()          # connect Supabase + verify table exists
+        init_bot_pool()    # verify tokens.txt & build bot pool
+        _initialized = True
+        logger.info("Startup complete \u2014 Supabase + Telegram bot pool ready.")
+    except Exception as exc:
+        _initialized   = False          # allow retry on next request
+        _startup_error = str(exc)
+        logger.error(f"Startup failed: {exc}")
+        raise RuntimeError(f"Service not ready: {exc}") from exc
+
 
 atexit.register(close_http)  # drain httpx connection pool on exit
 
 
-# ──────────────────────────────────────────────────
+# \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
 #  Helpers
-# ──────────────────────────────────────────────────
+# \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
 def require_api_key():
     key = request.headers.get("X-API-Key", "")
     if key != ADMIN_API_KEY:
@@ -113,9 +137,9 @@ def _make_stream_response(record: dict, disposition: str = "inline") -> Response
     )
 
 
-# ──────────────────────────────────────────────────
+# \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
 #  Routes
-# ──────────────────────────────────────────────────
+# \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
 
 @app.route("/")
 def frontend():
@@ -126,24 +150,48 @@ def frontend():
 
 @app.route("/health")
 def health():
-    _startup()
-    total = count_files()
+    # FIX: wrap _startup() so a Supabase/network error returns 503 instead of 500 crash
+    try:
+        _startup()
+    except Exception as exc:
+        return jsonify({
+            "status":    "error",
+            "error":     str(exc),
+            "timestamp": datetime.now(timezone.utc).isoformat(),
+            "base_url":  BASE_URL,
+        }), 503
+
+    try:
+        total = count_files()
+    except Exception as exc:
+        logger.exception("count_files failed during health check")
+        return jsonify({
+            "status":    "degraded",
+            "error":     str(exc),
+            "timestamp": datetime.now(timezone.utc).isoformat(),
+            "base_url":  BASE_URL,
+        }), 503
+
     return jsonify({
-        "status": "ok",
-        "timestamp": datetime.now(timezone.utc).isoformat(),
+        "status":      "ok",
+        "timestamp":   datetime.now(timezone.utc).isoformat(),
         "total_files": total,
-        "base_url": BASE_URL,
+        "base_url":    BASE_URL,
     })
 
 
-# ── CDN — public, no auth ─────────────────────────────────────────────
+# \u2500\u2500 CDN \u2014 public, no auth \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
 @app.route("/cdn/<path:path>")
 def cdn_file(path: str):
-    _startup()
-    # 1 — custom path lookup
+    try:
+        _startup()
+    except Exception as exc:
+        return jsonify({"detail": str(exc)}), 503
+
+    # 1 \u2014 custom path lookup
     record = get_file_by_custom_path(path)
 
-    # 2 — fall back to file_id lookup
+    # 2 \u2014 fall back to file_id lookup
     if not record:
         record = get_file_record(path)
 
@@ -156,10 +204,14 @@ def cdn_file(path: str):
     return _make_stream_response(record)
 
 
-# ── Upload ────────────────────────────────────────────────────────────
+# \u2500\u2500 Upload \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
 @app.route("/upload", methods=["POST"])
 def upload_file_route():
-    _startup()
+    try:
+        _startup()
+    except Exception as exc:
+        return jsonify({"detail": str(exc)}), 503
+
     require_api_key()
 
     if "file" not in request.files:
@@ -208,25 +260,29 @@ def upload_file_route():
         custom_path=clean_custom_path,
     )
 
-    logger.info(f"Uploaded {filename!r} → {public_url}")
+    logger.info(f"Uploaded {filename!r} \u2192 {public_url}")
 
     return jsonify({
-        "file_id":     file_id,
-        "filename":    filename,
-        "mime_type":   mime_type,
-        "size_bytes":  size,
-        "custom_path": clean_custom_path,
-        "public_url":  public_url,
+        "file_id":         file_id,
+        "filename":        filename,
+        "mime_type":       mime_type,
+        "size_bytes":      size,
+        "custom_path":     clean_custom_path,
+        "public_url":      public_url,
         "cdn_url_by_id":   _build_public_url(file_id),
         "cdn_url_by_path": _build_public_url(clean_custom_path) if clean_custom_path else None,
-        "uploaded_at": datetime.now(timezone.utc).isoformat(),
+        "uploaded_at":     datetime.now(timezone.utc).isoformat(),
     })
 
 
-# ── Authenticated download ────────────────────────────────────────────
+# \u2500\u2500 Authenticated download \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
 @app.route("/file/<file_id>", methods=["GET"])
 def download_file_route(file_id: str):
-    _startup()
+    try:
+        _startup()
+    except Exception as exc:
+        return jsonify({"detail": str(exc)}), 503
+
     require_api_key()
 
     record = get_file_record(file_id)
@@ -249,10 +305,14 @@ def download_file_route(file_id: str):
     )
 
 
-# ── List ──────────────────────────────────────────────────────────────
+# \u2500\u2500 List \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
 @app.route("/files")
 def list_files_route():
-    _startup()
+    try:
+        _startup()
+    except Exception as exc:
+        return jsonify({"detail": str(exc)}), 503
+
     require_api_key()
 
     limit  = request.args.get("limit", 50, type=int)
@@ -265,14 +325,18 @@ def list_files_route():
     return jsonify({"total": total, "limit": limit, "offset": offset, "files": records})
 
 
-# ── Delete ────────────────────────────────────────────────────────────
+# \u2500\u2500 Delete \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
 @app.route("/file/<file_id>", methods=["DELETE"])
 def delete_file_route(file_id: str):
-    _startup()
+    try:
+        _startup()
+    except Exception as exc:
+        return jsonify({"detail": str(exc)}), 503
+
     require_api_key()
 
     record = get_file_record(file_id)
     if not record:
         return jsonify({"detail": "File not found."}), 404
     delete_file_record(file_id)
-    return jsonify({"deleted": True, "file_id": file_id})
+    return jsonify({"deleted": True, "file_id": file_id})