Update app.py

app.py

@@ -7,28 +7,21 @@ import logging
 app = FastAPI()
 logging.basicConfig(level=logging.INFO)
 
-# Allow all CORS so browser apps can call this API
-def configure_cors(app: FastAPI):
-    app.add_middleware(
-        CORSMiddleware,
-        allow_origins=["*"],
-        allow_methods=["*"],
-        allow_headers=["*"],
-    )
-
-configure_cors(app)
+# Enable CORS for all origins
+app.add_middleware(
+    CORSMiddleware,
+    allow_origins=["*"],
+    allow_methods=["*"],
+    allow_headers=["*"],
+)
 
-# Precompute Base62 index mapping for O(1) lookup
-BASE_62_MAP = {c: i for i, c in enumerate(
-    "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
-)}
+BASE_62_MAP = {c: i for i, c in enumerate("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")}
 
 async def get_client() -> httpx.AsyncClient:
     if not hasattr(app.state, "client"):
-        app.state.client = httpx.AsyncClient(timeout=10.0)
+        app.state.client = httpx.AsyncClient(timeout=15.0)
     return app.state.client
 
-# Convert base62 string to integer
 def base62_to_int(token: str) -> int:
     result = 0
     for ch in token:
@@ -43,8 +36,10 @@ async def get_base_url(token: str) -> str:
         n = base62_to_int(token[1:3])
     return f"https://p{n:02d}-sharedstreams.icloud.com/{token}/sharedstreams/"
 
-# Common headers and payload for iCloud requests
-ICLOUD_HEADERS = {"Origin": "https://www.icloud.com", "Content-Type": "text/plain"}
+ICLOUD_HEADERS = {
+    "Origin": "https://www.icloud.com",
+    "Content-Type": "text/plain"
+}
 ICLOUD_PAYLOAD = '{"streamCtag":null}'
 
 async def get_redirected_base_url(base_url: str, token: str) -> str:
@@ -53,16 +48,24 @@ async def get_redirected_base_url(base_url: str, token: str) -> str:
         f"{base_url}webstream", headers=ICLOUD_HEADERS, data=ICLOUD_PAYLOAD, follow_redirects=False
     )
     if resp.status_code == 330:
-        body = resp.json()
-        host = body.get("X-Apple-MMe-Host")
-        return f"https://{host}/{token}/sharedstreams/"
-    return base_url
+        try:
+            body = resp.json()
+            host = body.get("X-Apple-MMe-Host")
+            if not host:
+                raise ValueError("Missing X-Apple-MMe-Host in 330 response")
+            logging.info(f"Redirected to {host}")
+            return f"https://{host}/{token}/sharedstreams/"
+        except Exception as e:
+            logging.error(f"Redirect parsing failed: {e}")
+            raise
+    elif resp.status_code == 200:
+        return base_url
+    else:
+        resp.raise_for_status()
 
 async def post_json(path: str, base_url: str, payload: str) -> dict:
     client = await get_client()
-    resp = await client.post(
-        f"{base_url}{path}", headers=ICLOUD_HEADERS, data=payload
-    )
+    resp = await client.post(f"{base_url}{path}", headers=ICLOUD_HEADERS, data=payload)
     resp.raise_for_status()
     return resp.json()
 
@@ -88,7 +91,6 @@ async def get_album(token: str):
         videos = []
         for photo in metadata:
             if photo.get("mediaAssetType", "").lower() != "video":
-                logging.info(f"Photo {photo.get('photoGuid')} is not a video.")
                 continue
 
             derivatives = photo.get("derivatives", {})
@@ -98,13 +100,11 @@ async def get_album(token: str):
                 default=None
             )
             if not best:
-                logging.info(f"No video derivative for photo {photo.get('photoGuid')}")
                 continue
 
             checksum = best.get("checksum")
             info = asset_map.get(checksum)
             if not info:
-                logging.info(f"Missing asset for checksum {checksum}")
                 continue
             video_url = f"https://{info['url_location']}{info['url_path']}"
 
@@ -118,12 +118,13 @@ async def get_album(token: str):
             videos.append({
                 "caption": photo.get("caption", ""),
                 "url": video_url,
-                "poster": poster
+                "poster": poster or ""
             })
 
         return {"videos": videos}
+
     except Exception as e:
-        logging.error(f"Error in get_album: {e}")
+        logging.exception("Error in get_album")
         return {"error": str(e)}
 
 @app.get("/album/{token}/raw")
@@ -136,5 +137,5 @@ async def get_album_raw(token: str):
         asset_map = await get_asset_urls(base_url, guids)
         return {"metadata": metadata, "asset_urls": asset_map}
     except Exception as e:
-        logging.error(f"Error in get_album_raw: {e}")
+        logging.exception("Error in get_album_raw")
         return {"error": str(e)}