Merge pull request #1 from breba-apps/use-cloudflare-s3

use cloudflare instead of gcp

Author: yasonk

breba-proxy/main.py

@@ -1,21 +1,39 @@
 import logging
 import os
 
+import boto3
+from botocore.config import Config
+from botocore.exceptions import ClientError
 from dotenv import load_dotenv
 from fastapi import FastAPI, Request, HTTPException, Response
-from google.cloud import storage
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
 load_dotenv()
 
 PUBLIC_BUCKET = os.getenv("PUBLIC_BUCKET")
+CLOUDFLARE_ENDPOINT = os.getenv("CLOUDFLARE_ENDPOINT")
+
 if not PUBLIC_BUCKET:
     raise RuntimeError("Missing PUBLIC_BUCKET environment variable")
+if not CLOUDFLARE_ENDPOINT:
+    raise RuntimeError("Missing CLOUDFLARE_ENDPOINT environment variable")
+
+# R2 uses "auto" region; SigV4 works. Some setups prefer 's3v4' explicit signature.
+boto_cfg = Config(
+    region_name="auto",
+    retries={"max_attempts": 3, "mode": "standard"},
+    s3={"addressing_style": "virtual"}
+)
+
+session = boto3.session.Session()
+s3_client = session.client(
+    service_name="s3",
+    endpoint_url=CLOUDFLARE_ENDPOINT,
+    config=boto_cfg,
+)
 
-storage_client = storage.Client()
-bucket = storage_client.bucket(PUBLIC_BUCKET)
 
 app = FastAPI()
 
@@ -45,16 +63,18 @@ async def serve_file(request: Request, path: str = ""):
     if not subdomain:
         raise HTTPException(status_code=400, detail="Missing subdomain")
 
-    blob_path = f"{subdomain}/{path or 'index.html'}"
-    blob = bucket.blob(blob_path)
-
-    if not blob.exists():
-        raise HTTPException(status_code=404, detail="File not found")
+    key = f"{subdomain}/{path or 'index.html'}"
 
-    blob.reload()
+    try:
+        obj = s3_client.get_object(Bucket=PUBLIC_BUCKET, Key=key)
+    except ClientError as e:
+        code = e.response.get("Error", {}).get("Code", "")
+        if code in ("NoSuchKey", "NotFound", "404"):
+            raise HTTPException(status_code=404, detail="File not found")
+        raise HTTPException(status_code=502, detail="Storage backend error")
 
-    content_type = blob.content_type or "application/octet-stream"
-    data = blob.download_as_bytes()
+    data = obj["Body"].read()
+    content_type = obj.get("ContentType") or "application/octet-stream"
 
     return Response(content=data, media_type=content_type)
 

pyproject.toml

@@ -11,8 +11,8 @@ license = { text = "MIT" }
 dependencies = [
     "fastapi",
     "uvicorn",
-    "google-cloud-storage",
     "python-dotenv>=1.1.0",
+    "boto3>=1.40.27",
 ]
 
 [tool.uv]