diff --git a/backend/services/media_service.py b/backend/services/media_service.py index cba98eb..4620c03 100644 --- a/backend/services/media_service.py +++ b/backend/services/media_service.py @@ -28,4 +28,7 @@ class MediaService: return self.media_proxy.sign(uri) def fetch_media(self, token: str) -> dict[str, Any]: + return self.media_proxy.fetch_payload(token) + + def fetch_media_metadata(self, token: str) -> dict[str, Any]: return self.media_proxy.fetch_metadata(token) diff --git a/core/media_proxy.py b/core/media_proxy.py index 1b9e801..6da15b6 100644 --- a/core/media_proxy.py +++ b/core/media_proxy.py @@ -51,13 +51,26 @@ class MediaProxy: } def fetch_metadata(self, token: str) -> dict[str, Any]: + path, metadata = self._resolve_token(token) + return metadata + + def fetch_payload(self, token: str) -> dict[str, Any]: + path, metadata = self._resolve_token(token) + return { + **metadata, + "filename": path.name, + "cache_control": "private, max-age=300", + "body_base64": _b64encode(path.read_bytes()), + } + + def _resolve_token(self, token: str) -> tuple[Path, dict[str, Any]]: payload = self._decode(token) uri = str(payload.get("uri") or "") expires_at = int(payload.get("expires_at") or 0) if int(time.time()) > expires_at: raise ApiError(ErrorCode.FORBIDDEN, "media token expired", {"expires_at": expires_at}) path = self.storage.ensure_file(uri) - return { + return path, { "uri": uri, "expires_at": expires_at, "content_type": _guess_content_type(path), diff --git a/frontend/shared/types/storage.ts b/frontend/shared/types/storage.ts index 1fb7cfc..6c1ae31 100644 --- a/frontend/shared/types/storage.ts +++ b/frontend/shared/types/storage.ts @@ -28,3 +28,13 @@ export interface MediaSignResult { content_type: string size_bytes: number } + +export interface MediaFetchResult { + uri: string + expires_at: number + content_type: string + size_bytes: number + filename: string + cache_control: string + body_base64: string +} diff --git a/tests/test_s2_routes.py b/tests/test_s2_routes.py index c697b51..7b5354e 100644 --- a/tests/test_s2_routes.py +++ b/tests/test_s2_routes.py @@ -636,6 +636,9 @@ database: self.assertTrue(fetched["ok"]) self.assertEqual(fetched["data"]["uri"], "storage://images/sample.bin") self.assertEqual(fetched["data"]["size_bytes"], 5) + self.assertEqual(fetched["data"]["filename"], "sample.bin") + self.assertEqual(fetched["data"]["body_base64"], "MTIzNDU") + self.assertEqual(fetched["data"]["cache_control"], "private, max-age=300") self.assertNotIn(str(self.root), str(fetched["data"])) bad_token = fetch_media(