From cf06295c79e8d61d80849c2632c5faf0c1446f8c Mon Sep 17 00:00:00 2001 From: Bernard Gawor Date: Fri, 10 Oct 2025 17:24:03 +0200 Subject: [PATCH 01/10] update api, implement example --- examples/selective_subscription/__init__.py | 1 + examples/selective_subscription/main.py | 36 ++++ .../selective_subscription/pyproject.toml | 19 ++ .../selective_subscription/__init__.py | 1 + .../selective_subscription/app.py | 152 ++++++++++++++ .../selective_subscription/config.py | 7 + .../notification_handler.py | 60 ++++++ .../selective_subscription/room_service.py | 70 +++++++ .../selective_subscription/worker.py | 31 +++ .../templates/index.html | 196 ++++++++++++++++++ examples/selective_subscription/uv.lock | 188 +++++++++++++++++ fishjam/api/_fishjam_client.py | 28 +++ 12 files changed, 789 insertions(+) create mode 100644 examples/selective_subscription/__init__.py create mode 100644 examples/selective_subscription/main.py create mode 100644 examples/selective_subscription/pyproject.toml create mode 100644 examples/selective_subscription/selective_subscription/__init__.py create mode 100644 examples/selective_subscription/selective_subscription/app.py create mode 100644 examples/selective_subscription/selective_subscription/config.py create mode 100644 examples/selective_subscription/selective_subscription/notification_handler.py create mode 100644 examples/selective_subscription/selective_subscription/room_service.py create mode 100644 examples/selective_subscription/selective_subscription/worker.py create mode 100644 examples/selective_subscription/templates/index.html create mode 100644 examples/selective_subscription/uv.lock diff --git a/examples/selective_subscription/__init__.py b/examples/selective_subscription/__init__.py new file mode 100644 index 0000000..7231b39 --- /dev/null +++ b/examples/selective_subscription/__init__.py @@ -0,0 +1 @@ +"""Selective subscription demo package.""" \ No newline at end of file diff --git a/examples/selective_subscription/main.py b/examples/selective_subscription/main.py new file mode 100644 index 0000000..fa9b283 --- /dev/null +++ b/examples/selective_subscription/main.py @@ -0,0 +1,36 @@ +from contextlib import asynccontextmanager + +import uvicorn +from selective_subscription.app import app, room_service +from selective_subscription.config import HOST, PORT +from selective_subscription.notification_handler import NotificationHandler +from selective_subscription.selective_subscription.worker import async_worker + + +@asynccontextmanager +async def lifespan(app): + """Application lifespan manager.""" + async with async_worker() as worker: + notification_handler = NotificationHandler(room_service) + worker.run_in_background(notification_handler.start()) + + print(f"Selective subscription demo started on http://{HOST}:{PORT}") + print("Available endpoints:") + print(" POST /api/peers - Create a new peer") + print(" GET /api/rooms/{room_name}/peers - Get available peers") + print(" POST /api/subscriptions - Toggle subscription") + + yield + + +app.router.lifespan_context = lifespan + + +if __name__ == "__main__": + uvicorn.run( + "main:app", + host=HOST, + port=PORT, + reload=True, + log_level="info" + ) \ No newline at end of file diff --git a/examples/selective_subscription/pyproject.toml b/examples/selective_subscription/pyproject.toml new file mode 100644 index 0000000..433b1d9 --- /dev/null +++ b/examples/selective_subscription/pyproject.toml @@ -0,0 +1,19 @@ +[project] +name = "selective-subscription-demo" +version = "0.1.0" +description = "Selective subscription demo using Fishjam Python SDK" +readme = "README.md" +requires-python = ">=3.11" +dependencies = [ + "starlette>=0.35.0", + "uvicorn>=0.25.0", + "jinja2>=3.1.0", + "python-multipart>=0.0.6", +] + +[build-system] +requires = ["hatchling"] +build-backend = "hatchling.build" + +[tool.hatch.build.targets.wheel] +packages = ["selective_subscription"] \ No newline at end of file diff --git a/examples/selective_subscription/selective_subscription/__init__.py b/examples/selective_subscription/selective_subscription/__init__.py new file mode 100644 index 0000000..7231b39 --- /dev/null +++ b/examples/selective_subscription/selective_subscription/__init__.py @@ -0,0 +1 @@ +"""Selective subscription demo package.""" \ No newline at end of file diff --git a/examples/selective_subscription/selective_subscription/app.py b/examples/selective_subscription/selective_subscription/app.py new file mode 100644 index 0000000..c5c2680 --- /dev/null +++ b/examples/selective_subscription/selective_subscription/app.py @@ -0,0 +1,152 @@ +import json +from typing import Dict, Any + +from starlette.applications import Starlette +from starlette.middleware import Middleware +from starlette.middleware.cors import CORSMiddleware +from starlette.requests import Request +from starlette.responses import JSONResponse, Response +from starlette.routing import Route +from starlette.templating import Jinja2Templates + +from .room_service import RoomService + + +# Initialize services +room_service = RoomService() +templates = Jinja2Templates(directory="templates") + + +async def create_peer(request: Request) -> Response: + """Create a new peer in a room.""" + try: + body = await request.json() + room_name = body.get("room_name") + peer_name = body.get("peer_name") + + if not room_name or not peer_name: + return JSONResponse( + {"error": "room_name and peer_name are required"}, + status_code=400 + ) + + peer, token = room_service.create_peer() + + return JSONResponse({ + "peer_id": peer.id, + "token": token, + "room_name": room_name, + "peer_name": peer_name + }) + + except Exception as e: + return JSONResponse({"error": str(e)}, status_code=500) + + +async def get_available_peers(request: Request) -> Response: + """Get peers available for subscription.""" + room_name = request.path_params.get("room_name") + peer_id = request.query_params.get("peer_id") + + if not room_name: + return JSONResponse({"error": "room_name is required"}, status_code=400) + + peers = room_service.get_available_peers(room_name, peer_id) + + return JSONResponse({ + "peers": [ + { + "id": peer.id, + "metadata": peer.metadata if peer.metadata else {}, + "tracks": [ + { + "id": track["id"], + "type": track.get("type", "unknown") + } + for track in peer.tracks + ] + } + for peer in peers + ] + }) + + +async def toggle_subscription(request: Request) -> Response: + """Toggle subscription to a peer's tracks.""" + try: + body = await request.json() + peer_id = body.get("peer_id") + target_peer_id = body.get("target_peer_id") + + if not peer_id or not target_peer_id: + return JSONResponse( + {"error": "peer_id and target_peer_id are required"}, + status_code=400 + ) + + subscribed = room_service.toggle_subscription(peer_id, target_peer_id) + + return JSONResponse({ + "subscribed": subscribed, + "peer_id": peer_id, + "target_peer_id": target_peer_id + }) + + except Exception as e: + return JSONResponse({"error": str(e)}, status_code=500) + + +async def get_subscription_status(request: Request) -> Response: + """Get current subscription status for a peer.""" + peer_id = request.path_params.get("peer_id") + + if not peer_id: + return JSONResponse({"error": "peer_id is required"}, status_code=400) + + session = room_service.get_peer_session(peer_id) + + if not session: + return JSONResponse({"error": "Peer not found"}, status_code=404) + + return JSONResponse({ + "peer_id": peer_id, + "subscribed_peers": list(session.subscribed_peers) + }) + + +async def health_check(request: Request) -> Response: + """Health check endpoint.""" + return JSONResponse({"status": "OK"}) + + +async def serve_index(request: Request) -> Response: + """Serve the main HTML interface.""" + return templates.TemplateResponse("index.html", {"request": request}) + + +# Define routes +routes = [ + Route("/", serve_index, methods=["GET"]), + Route("/health", health_check, methods=["GET"]), + Route("/api/peers", create_peer, methods=["POST"]), + Route("/api/rooms/{room_name}/peers", get_available_peers, methods=["GET"]), + Route("/api/subscriptions", toggle_subscription, methods=["POST"]), + Route("/api/peers/{peer_id}/subscriptions", get_subscription_status, methods=["GET"]), +] + +# Define middleware +middleware = [ + Middleware( + CORSMiddleware, + allow_origins=["*"], + allow_credentials=True, + allow_methods=["*"], + allow_headers=["*"], + ) +] + +# Create application +app = Starlette( + routes=routes, + middleware=middleware, +) \ No newline at end of file diff --git a/examples/selective_subscription/selective_subscription/config.py b/examples/selective_subscription/selective_subscription/config.py new file mode 100644 index 0000000..805cef6 --- /dev/null +++ b/examples/selective_subscription/selective_subscription/config.py @@ -0,0 +1,7 @@ +import os + +FISHJAM_ID = os.getenv("FISHJAM_ID", "") +FISHJAM_TOKEN = os.environ["FISHJAM_MANAGEMENT_TOKEN"] +FISHJAM_URL = os.getenv("FISHJAM_URL", "http://localhost:5002") +HOST = os.getenv("HOST", "localhost") +PORT = int(os.getenv("PORT", "8000")) \ No newline at end of file diff --git a/examples/selective_subscription/selective_subscription/notification_handler.py b/examples/selective_subscription/selective_subscription/notification_handler.py new file mode 100644 index 0000000..fdea42f --- /dev/null +++ b/examples/selective_subscription/selective_subscription/notification_handler.py @@ -0,0 +1,60 @@ +from typing import Dict, Set +import asyncio + +from .config import FISHJAM_ID, FISHJAM_TOKEN, FISHJAM_URL +from .room_service import RoomService +from fishjam._ws_notifier import FishjamNotifier +from fishjam.events import ( + ServerMessagePeerType, + ServerMessagePeerConnected, + ServerMessagePeerDisconnected, + ServerMessageTrackAdded, + ServerMessageTrackRemoved, +) +from fishjam.events.allowed_notifications import AllowedNotification + + +class NotificationHandler: + """Handles Fishjam server notifications for selective subscription. + """ + + def __init__(self, room_service: RoomService): + self.room_service = room_service + self._notifier = FishjamNotifier(FISHJAM_ID, FISHJAM_TOKEN) + @self._notifier.on_server_notification + async def _(notification: AllowedNotification): + match notification: + case ServerMessagePeerConnected( + peer_type=ServerMessagePeerType.PEER_TYPE_WEBRTC, + ): + await handle_peer_connected(notification) + case ServerMessagePeerDisconnected( + peer_type=ServerMessagePeerType.PEER_TYPE_WEBRTC, + ): + await handle_peer_disconnected(notification) + case ServerMessageTrackAdded( + peer_type=ServerMessagePeerType.PEER_TYPE_WEBRTC, + ): + await handle_track_added(notification) + case ServerMessageTrackRemoved( + peer_type=ServerMessagePeerType.PEER_TYPE_WEBRTC, + ): + await handle_track_removed(notification) + + async def handle_peer_connected(notification: ServerMessagePeerConnected): + print(f"Peer connected: {notification.peer_id}") + + async def handle_peer_disconnected(notification: ServerMessagePeerDisconnected): + print(f"Peer disconnected: {notification.peer_id}") + + async def handle_track_added(notification: ServerMessageTrackAdded): + print(f"Track added: {notification.track}") + + async def handle_track_removed(notification: ServerMessageTrackRemoved): + print(f"Track removed: {notification.track}") + + async def start(self) -> None: + """Long-running coroutine that connects the notifier and processes messages.""" + await self._notifier.connect() + + diff --git a/examples/selective_subscription/selective_subscription/room_service.py b/examples/selective_subscription/selective_subscription/room_service.py new file mode 100644 index 0000000..ee05b12 --- /dev/null +++ b/examples/selective_subscription/selective_subscription/room_service.py @@ -0,0 +1,70 @@ +from dataclasses import dataclass +from typing import Dict, List, Optional + +from fishjam import FishjamClient, Peer, PeerOptions, Room, RoomOptions +from fishjam.errors import NotFoundError + +from .config import FISHJAM_ID, FISHJAM_TOKEN, FISHJAM_URL + + +class RoomService: + """Service for managing rooms and peer subscriptions.""" + + def __init__(self): + self.fishjam = FishjamClient( + FISHJAM_ID, + FISHJAM_TOKEN, + ) + self.room = self.fishjam.create_room(RoomOptions( + max_peers=10, + room_type="conference" + )) + + def get_or_create_room(self) -> Room: + """Get existing room or create a new one.""" + if self.room: + try: + room = self.fishjam.get_room(self.room.id) + return room + except NotFoundError: + pass + + return self.fishjam.create_room() + + def create_peer(self) -> tuple[Peer, str]: + """Create a peer with manual subscription mode.""" + room = self.get_or_create_room() + + options = PeerOptions( + subscribe_mode="manual", + ) + + peer, token = self.fishjam.create_peer(room.id, options) + return peer, token + + + def subscibe_peer(self, peer_id: str, target_peer_id: str): + """Subscribe a peer to all tracks of another peer.""" + room = self.get_or_create_room() + + self.fishjam.subscribe_peer(room.id, peer_id, target_peer_id) + + def subscribe_tracks(self, peer_id: str, track_ids: List[str]): + """Subscribe a peer to specific tracks.""" + room = self.get_or_create_room() + + self.fishjam.subscribe_tracks(room.id, peer_id, track_ids) + + def get_peer_session(self, peer_id: str): + """Return a lightweight session-like object for example endpoints.""" + room = self.get_or_create_room() + for p in room.peers: + if p.id == peer_id: + # create a simple object that has subscribed_peers attribute + class _Session: + def __init__(self): + self.subscribed_peers: set[str] = set() + + return _Session() + + return None \ No newline at end of file diff --git a/examples/selective_subscription/selective_subscription/worker.py b/examples/selective_subscription/selective_subscription/worker.py new file mode 100644 index 0000000..3bff365 --- /dev/null +++ b/examples/selective_subscription/selective_subscription/worker.py @@ -0,0 +1,31 @@ +from asyncio import Task, TaskGroup +from contextlib import asynccontextmanager +from typing import Any, Coroutine + + +class BackgroundWorker: + def __init__(self, tg: TaskGroup) -> None: + self._tg = tg + self._tasks: set[Task[None]] = set() + + def run_in_background(self, coro: Coroutine[Any, Any, None]): + task = self._tg.create_task(coro) + task.add_done_callback(self._remove_task) + self._tasks.add(task) + return task + + def _remove_task(self, task: Task[None]): + self._tasks.discard(task) + + def cleanup(self): + for task in self._tasks: + task.cancel() + self._tasks = set() + + +@asynccontextmanager +async def async_worker(): + async with TaskGroup() as tg: + worker = BackgroundWorker(tg) + yield worker + worker.cleanup() diff --git a/examples/selective_subscription/templates/index.html b/examples/selective_subscription/templates/index.html new file mode 100644 index 0000000..66ee1f5 --- /dev/null +++ b/examples/selective_subscription/templates/index.html @@ -0,0 +1,196 @@ + + + + Selective Subscription Demo + + + +
+

Selective Subscription Demo

+ +
+ + +
+ +
+ + +
+ + + + + + + +
+
+ + + + \ No newline at end of file diff --git a/examples/selective_subscription/uv.lock b/examples/selective_subscription/uv.lock new file mode 100644 index 0000000..82edbf3 --- /dev/null +++ b/examples/selective_subscription/uv.lock @@ -0,0 +1,188 @@ +version = 1 +revision = 3 +requires-python = ">=3.11" + +[[package]] +name = "anyio" +version = "4.11.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "idna" }, + { name = "sniffio" }, + { name = "typing-extensions", marker = "python_full_version < '3.13'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/c6/78/7d432127c41b50bccba979505f272c16cbcadcc33645d5fa3a738110ae75/anyio-4.11.0.tar.gz", hash = "sha256:82a8d0b81e318cc5ce71a5f1f8b5c4e63619620b63141ef8c995fa0db95a57c4", size = 219094, upload-time = "2025-09-23T09:19:12.58Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/15/b3/9b1a8074496371342ec1e796a96f99c82c945a339cd81a8e73de28b4cf9e/anyio-4.11.0-py3-none-any.whl", hash = "sha256:0287e96f4d26d4149305414d4e3bc32f0dcd0862365a4bddea19d7a1ec38c4fc", size = 109097, upload-time = "2025-09-23T09:19:10.601Z" }, +] + +[[package]] +name = "click" +version = "8.3.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "colorama", marker = "sys_platform == 'win32'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/46/61/de6cd827efad202d7057d93e0fed9294b96952e188f7384832791c7b2254/click-8.3.0.tar.gz", hash = "sha256:e7b8232224eba16f4ebe410c25ced9f7875cb5f3263ffc93cc3e8da705e229c4", size = 276943, upload-time = "2025-09-18T17:32:23.696Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/db/d3/9dcc0f5797f070ec8edf30fbadfb200e71d9db6b84d211e3b2085a7589a0/click-8.3.0-py3-none-any.whl", hash = "sha256:9b9f285302c6e3064f4330c05f05b81945b2a39544279343e6e7c5f27a9baddc", size = 107295, upload-time = "2025-09-18T17:32:22.42Z" }, +] + +[[package]] +name = "colorama" +version = "0.4.6" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d8/53/6f443c9a4a8358a93a6792e2acffb9d9d5cb0a5cfd8802644b7b1c9a02e4/colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44", size = 27697, upload-time = "2022-10-25T02:36:22.414Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6", size = 25335, upload-time = "2022-10-25T02:36:20.889Z" }, +] + +[[package]] +name = "h11" +version = "0.16.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/01/ee/02a2c011bdab74c6fb3c75474d40b3052059d95df7e73351460c8588d963/h11-0.16.0.tar.gz", hash = "sha256:4e35b956cf45792e4caa5885e69fba00bdbc6ffafbfa020300e549b208ee5ff1", size = 101250, upload-time = "2025-04-24T03:35:25.427Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/04/4b/29cac41a4d98d144bf5f6d33995617b185d14b22401f75ca86f384e87ff1/h11-0.16.0-py3-none-any.whl", hash = "sha256:63cf8bbe7522de3bf65932fda1d9c2772064ffb3dae62d55932da54b31cb6c86", size = 37515, upload-time = "2025-04-24T03:35:24.344Z" }, +] + +[[package]] +name = "idna" +version = "3.10" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/f1/70/7703c29685631f5a7590aa73f1f1d3fa9a380e654b86af429e0934a32f7d/idna-3.10.tar.gz", hash = "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9", size = 190490, upload-time = "2024-09-15T18:07:39.745Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/76/c6/c88e154df9c4e1a2a66ccf0005a88dfb2650c1dffb6f5ce603dfbd452ce3/idna-3.10-py3-none-any.whl", hash = "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3", size = 70442, upload-time = "2024-09-15T18:07:37.964Z" }, +] + +[[package]] +name = "jinja2" +version = "3.1.6" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "markupsafe" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/df/bf/f7da0350254c0ed7c72f3e33cef02e048281fec7ecec5f032d4aac52226b/jinja2-3.1.6.tar.gz", hash = "sha256:0137fb05990d35f1275a587e9aee6d56da821fc83491a0fb838183be43f66d6d", size = 245115, upload-time = "2025-03-05T20:05:02.478Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/62/a1/3d680cbfd5f4b8f15abc1d571870c5fc3e594bb582bc3b64ea099db13e56/jinja2-3.1.6-py3-none-any.whl", hash = "sha256:85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67", size = 134899, upload-time = "2025-03-05T20:05:00.369Z" }, +] + +[[package]] +name = "markupsafe" +version = "3.0.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/b2/97/5d42485e71dfc078108a86d6de8fa46db44a1a9295e89c5d6d4a06e23a62/markupsafe-3.0.2.tar.gz", hash = "sha256:ee55d3edf80167e48ea11a923c7386f4669df67d7994554387f84e7d8b0a2bf0", size = 20537, upload-time = "2024-10-18T15:21:54.129Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/6b/28/bbf83e3f76936960b850435576dd5e67034e200469571be53f69174a2dfd/MarkupSafe-3.0.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:9025b4018f3a1314059769c7bf15441064b2207cb3f065e6ea1e7359cb46db9d", size = 14353, upload-time = "2024-10-18T15:21:02.187Z" }, + { url = "https://files.pythonhosted.org/packages/6c/30/316d194b093cde57d448a4c3209f22e3046c5bb2fb0820b118292b334be7/MarkupSafe-3.0.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:93335ca3812df2f366e80509ae119189886b0f3c2b81325d39efdb84a1e2ae93", size = 12392, upload-time = "2024-10-18T15:21:02.941Z" }, + { url = "https://files.pythonhosted.org/packages/f2/96/9cdafba8445d3a53cae530aaf83c38ec64c4d5427d975c974084af5bc5d2/MarkupSafe-3.0.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2cb8438c3cbb25e220c2ab33bb226559e7afb3baec11c4f218ffa7308603c832", size = 23984, upload-time = "2024-10-18T15:21:03.953Z" }, + { url = "https://files.pythonhosted.org/packages/f1/a4/aefb044a2cd8d7334c8a47d3fb2c9f328ac48cb349468cc31c20b539305f/MarkupSafe-3.0.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a123e330ef0853c6e822384873bef7507557d8e4a082961e1defa947aa59ba84", size = 23120, upload-time = "2024-10-18T15:21:06.495Z" }, + { url = "https://files.pythonhosted.org/packages/8d/21/5e4851379f88f3fad1de30361db501300d4f07bcad047d3cb0449fc51f8c/MarkupSafe-3.0.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1e084f686b92e5b83186b07e8a17fc09e38fff551f3602b249881fec658d3eca", size = 23032, upload-time = "2024-10-18T15:21:07.295Z" }, + { url = "https://files.pythonhosted.org/packages/00/7b/e92c64e079b2d0d7ddf69899c98842f3f9a60a1ae72657c89ce2655c999d/MarkupSafe-3.0.2-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:d8213e09c917a951de9d09ecee036d5c7d36cb6cb7dbaece4c71a60d79fb9798", size = 24057, upload-time = "2024-10-18T15:21:08.073Z" }, + { url = "https://files.pythonhosted.org/packages/f9/ac/46f960ca323037caa0a10662ef97d0a4728e890334fc156b9f9e52bcc4ca/MarkupSafe-3.0.2-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:5b02fb34468b6aaa40dfc198d813a641e3a63b98c2b05a16b9f80b7ec314185e", size = 23359, upload-time = "2024-10-18T15:21:09.318Z" }, + { url = "https://files.pythonhosted.org/packages/69/84/83439e16197337b8b14b6a5b9c2105fff81d42c2a7c5b58ac7b62ee2c3b1/MarkupSafe-3.0.2-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:0bff5e0ae4ef2e1ae4fdf2dfd5b76c75e5c2fa4132d05fc1b0dabcd20c7e28c4", size = 23306, upload-time = "2024-10-18T15:21:10.185Z" }, + { url = "https://files.pythonhosted.org/packages/9a/34/a15aa69f01e2181ed8d2b685c0d2f6655d5cca2c4db0ddea775e631918cd/MarkupSafe-3.0.2-cp311-cp311-win32.whl", hash = "sha256:6c89876f41da747c8d3677a2b540fb32ef5715f97b66eeb0c6b66f5e3ef6f59d", size = 15094, upload-time = "2024-10-18T15:21:11.005Z" }, + { url = "https://files.pythonhosted.org/packages/da/b8/3a3bd761922d416f3dc5d00bfbed11f66b1ab89a0c2b6e887240a30b0f6b/MarkupSafe-3.0.2-cp311-cp311-win_amd64.whl", hash = "sha256:70a87b411535ccad5ef2f1df5136506a10775d267e197e4cf531ced10537bd6b", size = 15521, upload-time = "2024-10-18T15:21:12.911Z" }, + { url = "https://files.pythonhosted.org/packages/22/09/d1f21434c97fc42f09d290cbb6350d44eb12f09cc62c9476effdb33a18aa/MarkupSafe-3.0.2-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:9778bd8ab0a994ebf6f84c2b949e65736d5575320a17ae8984a77fab08db94cf", size = 14274, upload-time = "2024-10-18T15:21:13.777Z" }, + { url = "https://files.pythonhosted.org/packages/6b/b0/18f76bba336fa5aecf79d45dcd6c806c280ec44538b3c13671d49099fdd0/MarkupSafe-3.0.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:846ade7b71e3536c4e56b386c2a47adf5741d2d8b94ec9dc3e92e5e1ee1e2225", size = 12348, upload-time = "2024-10-18T15:21:14.822Z" }, + { url = "https://files.pythonhosted.org/packages/e0/25/dd5c0f6ac1311e9b40f4af06c78efde0f3b5cbf02502f8ef9501294c425b/MarkupSafe-3.0.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1c99d261bd2d5f6b59325c92c73df481e05e57f19837bdca8413b9eac4bd8028", size = 24149, upload-time = "2024-10-18T15:21:15.642Z" }, + { url = "https://files.pythonhosted.org/packages/f3/f0/89e7aadfb3749d0f52234a0c8c7867877876e0a20b60e2188e9850794c17/MarkupSafe-3.0.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e17c96c14e19278594aa4841ec148115f9c7615a47382ecb6b82bd8fea3ab0c8", size = 23118, upload-time = "2024-10-18T15:21:17.133Z" }, + { url = "https://files.pythonhosted.org/packages/d5/da/f2eeb64c723f5e3777bc081da884b414671982008c47dcc1873d81f625b6/MarkupSafe-3.0.2-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:88416bd1e65dcea10bc7569faacb2c20ce071dd1f87539ca2ab364bf6231393c", size = 22993, upload-time = "2024-10-18T15:21:18.064Z" }, + { url = "https://files.pythonhosted.org/packages/da/0e/1f32af846df486dce7c227fe0f2398dc7e2e51d4a370508281f3c1c5cddc/MarkupSafe-3.0.2-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:2181e67807fc2fa785d0592dc2d6206c019b9502410671cc905d132a92866557", size = 24178, upload-time = "2024-10-18T15:21:18.859Z" }, + { url = "https://files.pythonhosted.org/packages/c4/f6/bb3ca0532de8086cbff5f06d137064c8410d10779c4c127e0e47d17c0b71/MarkupSafe-3.0.2-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:52305740fe773d09cffb16f8ed0427942901f00adedac82ec8b67752f58a1b22", size = 23319, upload-time = "2024-10-18T15:21:19.671Z" }, + { url = "https://files.pythonhosted.org/packages/a2/82/8be4c96ffee03c5b4a034e60a31294daf481e12c7c43ab8e34a1453ee48b/MarkupSafe-3.0.2-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:ad10d3ded218f1039f11a75f8091880239651b52e9bb592ca27de44eed242a48", size = 23352, upload-time = "2024-10-18T15:21:20.971Z" }, + { url = "https://files.pythonhosted.org/packages/51/ae/97827349d3fcffee7e184bdf7f41cd6b88d9919c80f0263ba7acd1bbcb18/MarkupSafe-3.0.2-cp312-cp312-win32.whl", hash = "sha256:0f4ca02bea9a23221c0182836703cbf8930c5e9454bacce27e767509fa286a30", size = 15097, upload-time = "2024-10-18T15:21:22.646Z" }, + { url = "https://files.pythonhosted.org/packages/c1/80/a61f99dc3a936413c3ee4e1eecac96c0da5ed07ad56fd975f1a9da5bc630/MarkupSafe-3.0.2-cp312-cp312-win_amd64.whl", hash = "sha256:8e06879fc22a25ca47312fbe7c8264eb0b662f6db27cb2d3bbbc74b1df4b9b87", size = 15601, upload-time = "2024-10-18T15:21:23.499Z" }, + { url = "https://files.pythonhosted.org/packages/83/0e/67eb10a7ecc77a0c2bbe2b0235765b98d164d81600746914bebada795e97/MarkupSafe-3.0.2-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:ba9527cdd4c926ed0760bc301f6728ef34d841f405abf9d4f959c478421e4efd", size = 14274, upload-time = "2024-10-18T15:21:24.577Z" }, + { url = "https://files.pythonhosted.org/packages/2b/6d/9409f3684d3335375d04e5f05744dfe7e9f120062c9857df4ab490a1031a/MarkupSafe-3.0.2-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:f8b3d067f2e40fe93e1ccdd6b2e1d16c43140e76f02fb1319a05cf2b79d99430", size = 12352, upload-time = "2024-10-18T15:21:25.382Z" }, + { url = "https://files.pythonhosted.org/packages/d2/f5/6eadfcd3885ea85fe2a7c128315cc1bb7241e1987443d78c8fe712d03091/MarkupSafe-3.0.2-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:569511d3b58c8791ab4c2e1285575265991e6d8f8700c7be0e88f86cb0672094", size = 24122, upload-time = "2024-10-18T15:21:26.199Z" }, + { url = "https://files.pythonhosted.org/packages/0c/91/96cf928db8236f1bfab6ce15ad070dfdd02ed88261c2afafd4b43575e9e9/MarkupSafe-3.0.2-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:15ab75ef81add55874e7ab7055e9c397312385bd9ced94920f2802310c930396", size = 23085, upload-time = "2024-10-18T15:21:27.029Z" }, + { url = "https://files.pythonhosted.org/packages/c2/cf/c9d56af24d56ea04daae7ac0940232d31d5a8354f2b457c6d856b2057d69/MarkupSafe-3.0.2-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f3818cb119498c0678015754eba762e0d61e5b52d34c8b13d770f0719f7b1d79", size = 22978, upload-time = "2024-10-18T15:21:27.846Z" }, + { url = "https://files.pythonhosted.org/packages/2a/9f/8619835cd6a711d6272d62abb78c033bda638fdc54c4e7f4272cf1c0962b/MarkupSafe-3.0.2-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:cdb82a876c47801bb54a690c5ae105a46b392ac6099881cdfb9f6e95e4014c6a", size = 24208, upload-time = "2024-10-18T15:21:28.744Z" }, + { url = "https://files.pythonhosted.org/packages/f9/bf/176950a1792b2cd2102b8ffeb5133e1ed984547b75db47c25a67d3359f77/MarkupSafe-3.0.2-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:cabc348d87e913db6ab4aa100f01b08f481097838bdddf7c7a84b7575b7309ca", size = 23357, upload-time = "2024-10-18T15:21:29.545Z" }, + { url = "https://files.pythonhosted.org/packages/ce/4f/9a02c1d335caabe5c4efb90e1b6e8ee944aa245c1aaaab8e8a618987d816/MarkupSafe-3.0.2-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:444dcda765c8a838eaae23112db52f1efaf750daddb2d9ca300bcae1039adc5c", size = 23344, upload-time = "2024-10-18T15:21:30.366Z" }, + { url = "https://files.pythonhosted.org/packages/ee/55/c271b57db36f748f0e04a759ace9f8f759ccf22b4960c270c78a394f58be/MarkupSafe-3.0.2-cp313-cp313-win32.whl", hash = "sha256:bcf3e58998965654fdaff38e58584d8937aa3096ab5354d493c77d1fdd66d7a1", size = 15101, upload-time = "2024-10-18T15:21:31.207Z" }, + { url = "https://files.pythonhosted.org/packages/29/88/07df22d2dd4df40aba9f3e402e6dc1b8ee86297dddbad4872bd5e7b0094f/MarkupSafe-3.0.2-cp313-cp313-win_amd64.whl", hash = "sha256:e6a2a455bd412959b57a172ce6328d2dd1f01cb2135efda2e4576e8a23fa3b0f", size = 15603, upload-time = "2024-10-18T15:21:32.032Z" }, + { url = "https://files.pythonhosted.org/packages/62/6a/8b89d24db2d32d433dffcd6a8779159da109842434f1dd2f6e71f32f738c/MarkupSafe-3.0.2-cp313-cp313t-macosx_10_13_universal2.whl", hash = "sha256:b5a6b3ada725cea8a5e634536b1b01c30bcdcd7f9c6fff4151548d5bf6b3a36c", size = 14510, upload-time = "2024-10-18T15:21:33.625Z" }, + { url = "https://files.pythonhosted.org/packages/7a/06/a10f955f70a2e5a9bf78d11a161029d278eeacbd35ef806c3fd17b13060d/MarkupSafe-3.0.2-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:a904af0a6162c73e3edcb969eeeb53a63ceeb5d8cf642fade7d39e7963a22ddb", size = 12486, upload-time = "2024-10-18T15:21:34.611Z" }, + { url = "https://files.pythonhosted.org/packages/34/cf/65d4a571869a1a9078198ca28f39fba5fbb910f952f9dbc5220afff9f5e6/MarkupSafe-3.0.2-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4aa4e5faecf353ed117801a068ebab7b7e09ffb6e1d5e412dc852e0da018126c", size = 25480, upload-time = "2024-10-18T15:21:35.398Z" }, + { url = "https://files.pythonhosted.org/packages/0c/e3/90e9651924c430b885468b56b3d597cabf6d72be4b24a0acd1fa0e12af67/MarkupSafe-3.0.2-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c0ef13eaeee5b615fb07c9a7dadb38eac06a0608b41570d8ade51c56539e509d", size = 23914, upload-time = "2024-10-18T15:21:36.231Z" }, + { url = "https://files.pythonhosted.org/packages/66/8c/6c7cf61f95d63bb866db39085150df1f2a5bd3335298f14a66b48e92659c/MarkupSafe-3.0.2-cp313-cp313t-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d16a81a06776313e817c951135cf7340a3e91e8c1ff2fac444cfd75fffa04afe", size = 23796, upload-time = "2024-10-18T15:21:37.073Z" }, + { url = "https://files.pythonhosted.org/packages/bb/35/cbe9238ec3f47ac9a7c8b3df7a808e7cb50fe149dc7039f5f454b3fba218/MarkupSafe-3.0.2-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:6381026f158fdb7c72a168278597a5e3a5222e83ea18f543112b2662a9b699c5", size = 25473, upload-time = "2024-10-18T15:21:37.932Z" }, + { url = "https://files.pythonhosted.org/packages/e6/32/7621a4382488aa283cc05e8984a9c219abad3bca087be9ec77e89939ded9/MarkupSafe-3.0.2-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:3d79d162e7be8f996986c064d1c7c817f6df3a77fe3d6859f6f9e7be4b8c213a", size = 24114, upload-time = "2024-10-18T15:21:39.799Z" }, + { url = "https://files.pythonhosted.org/packages/0d/80/0985960e4b89922cb5a0bac0ed39c5b96cbc1a536a99f30e8c220a996ed9/MarkupSafe-3.0.2-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:131a3c7689c85f5ad20f9f6fb1b866f402c445b220c19fe4308c0b147ccd2ad9", size = 24098, upload-time = "2024-10-18T15:21:40.813Z" }, + { url = "https://files.pythonhosted.org/packages/82/78/fedb03c7d5380df2427038ec8d973587e90561b2d90cd472ce9254cf348b/MarkupSafe-3.0.2-cp313-cp313t-win32.whl", hash = "sha256:ba8062ed2cf21c07a9e295d5b8a2a5ce678b913b45fdf68c32d95d6c1291e0b6", size = 15208, upload-time = "2024-10-18T15:21:41.814Z" }, + { url = "https://files.pythonhosted.org/packages/4f/65/6079a46068dfceaeabb5dcad6d674f5f5c61a6fa5673746f42a9f4c233b3/MarkupSafe-3.0.2-cp313-cp313t-win_amd64.whl", hash = "sha256:e444a31f8db13eb18ada366ab3cf45fd4b31e4db1236a4448f68778c1d1a5a2f", size = 15739, upload-time = "2024-10-18T15:21:42.784Z" }, +] + +[[package]] +name = "python-multipart" +version = "0.0.20" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/f3/87/f44d7c9f274c7ee665a29b885ec97089ec5dc034c7f3fafa03da9e39a09e/python_multipart-0.0.20.tar.gz", hash = "sha256:8dd0cab45b8e23064ae09147625994d090fa46f5b0d1e13af944c331a7fa9d13", size = 37158, upload-time = "2024-12-16T19:45:46.972Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/45/58/38b5afbc1a800eeea951b9285d3912613f2603bdf897a4ab0f4bd7f405fc/python_multipart-0.0.20-py3-none-any.whl", hash = "sha256:8a62d3a8335e06589fe01f2a3e178cdcc632f3fbe0d492ad9ee0ec35aab1f104", size = 24546, upload-time = "2024-12-16T19:45:44.423Z" }, +] + +[[package]] +name = "selective-subscription-demo" +version = "0.1.0" +source = { editable = "." } +dependencies = [ + { name = "jinja2" }, + { name = "python-multipart" }, + { name = "starlette" }, + { name = "uvicorn" }, +] + +[package.metadata] +requires-dist = [ + { name = "jinja2", specifier = ">=3.1.0" }, + { name = "python-multipart", specifier = ">=0.0.6" }, + { name = "starlette", specifier = ">=0.35.0" }, + { name = "uvicorn", specifier = ">=0.25.0" }, +] + +[[package]] +name = "sniffio" +version = "1.3.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/a2/87/a6771e1546d97e7e041b6ae58d80074f81b7d5121207425c964ddf5cfdbd/sniffio-1.3.1.tar.gz", hash = "sha256:f4324edc670a0f49750a81b895f35c3adb843cca46f0530f79fc1babb23789dc", size = 20372, upload-time = "2024-02-25T23:20:04.057Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e9/44/75a9c9421471a6c4805dbf2356f7c181a29c1879239abab1ea2cc8f38b40/sniffio-1.3.1-py3-none-any.whl", hash = "sha256:2f6da418d1f1e0fddd844478f41680e794e6051915791a034ff65e5f100525a2", size = 10235, upload-time = "2024-02-25T23:20:01.196Z" }, +] + +[[package]] +name = "starlette" +version = "0.48.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "anyio" }, + { name = "typing-extensions", marker = "python_full_version < '3.13'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/a7/a5/d6f429d43394057b67a6b5bbe6eae2f77a6bf7459d961fdb224bf206eee6/starlette-0.48.0.tar.gz", hash = "sha256:7e8cee469a8ab2352911528110ce9088fdc6a37d9876926e73da7ce4aa4c7a46", size = 2652949, upload-time = "2025-09-13T08:41:05.699Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/be/72/2db2f49247d0a18b4f1bb9a5a39a0162869acf235f3a96418363947b3d46/starlette-0.48.0-py3-none-any.whl", hash = "sha256:0764ca97b097582558ecb498132ed0c7d942f233f365b86ba37770e026510659", size = 73736, upload-time = "2025-09-13T08:41:03.869Z" }, +] + +[[package]] +name = "typing-extensions" +version = "4.15.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/72/94/1a15dd82efb362ac84269196e94cf00f187f7ed21c242792a923cdb1c61f/typing_extensions-4.15.0.tar.gz", hash = "sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466", size = 109391, upload-time = "2025-08-25T13:49:26.313Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/18/67/36e9267722cc04a6b9f15c7f3441c2363321a3ea07da7ae0c0707beb2a9c/typing_extensions-4.15.0-py3-none-any.whl", hash = "sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548", size = 44614, upload-time = "2025-08-25T13:49:24.86Z" }, +] + +[[package]] +name = "uvicorn" +version = "0.37.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "click" }, + { name = "h11" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/71/57/1616c8274c3442d802621abf5deb230771c7a0fec9414cb6763900eb3868/uvicorn-0.37.0.tar.gz", hash = "sha256:4115c8add6d3fd536c8ee77f0e14a7fd2ebba939fed9b02583a97f80648f9e13", size = 80367, upload-time = "2025-09-23T13:33:47.486Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/85/cd/584a2ceb5532af99dd09e50919e3615ba99aa127e9850eafe5f31ddfdb9a/uvicorn-0.37.0-py3-none-any.whl", hash = "sha256:913b2b88672343739927ce381ff9e2ad62541f9f8289664fa1d1d3803fa2ce6c", size = 67976, upload-time = "2025-09-23T13:33:45.842Z" }, +] diff --git a/fishjam/api/_fishjam_client.py b/fishjam/api/_fishjam_client.py index 9ce0914..77d927e 100644 --- a/fishjam/api/_fishjam_client.py +++ b/fishjam/api/_fishjam_client.py @@ -12,6 +12,8 @@ from fishjam._openapi_client.api.room import get_all_rooms as room_get_all_rooms from fishjam._openapi_client.api.room import get_room as room_get_room from fishjam._openapi_client.api.room import refresh_token as room_refresh_token +from fishjam._openapi_client.api.room import subscribe_peer as room_subscribe_peer +from fishjam._openapi_client.api.room import subscribe_tracks as room_subscribe_tracks from fishjam._openapi_client.api.streamer import ( generate_streamer_token as streamer_generate_streamer_token, ) @@ -87,6 +89,8 @@ class PeerOptions: """Enables the peer to use simulcast""" metadata: dict[str, Any] | None = None """Peer metadata""" + subscribe_mode: Literal["auto", "manual"] = "auto" + """Configuration of peer's subscribing policy""" @dataclass @@ -251,6 +255,30 @@ def create_livestream_streamer_token(self, room_id: str) -> str: ) return response.token + + def subscribe_peer(self, room_id: str, peer_id: str, target_peer_id: str): + "" "Subscribe a peer to all tracks of another peer.""" + + response = self._request( + room_subscribe_peer, + room_id=room_id, + id=peer_id, + peer_id=target_peer_id, + ) + + return response + + def subscribe_tracks(self, room_id: str, peer_id: str, track_ids: list[str]): + "" "Subscribe a peer to specific tracks of another peer.""" + + response = self._request( + room_subscribe_tracks, + room_id=room_id, + id=peer_id, + body={"track_ids": track_ids}, + ) + + return response def __parse_peer_metadata(self, metadata: dict | None) -> PeerOptionsWebRTCMetadata: peer_metadata = PeerOptionsWebRTCMetadata() From 353b166f375b0d20246782a95dc6133f2eb68595 Mon Sep 17 00:00:00 2001 From: Bernard Gawor Date: Mon, 13 Oct 2025 11:02:35 +0200 Subject: [PATCH 02/10] almost working with dashboard --- examples/selective_subscription/main.py | 7 +- .../selective_subscription/app.py | 93 +-- .../selective_subscription/config.py | 2 +- .../notification_handler.py | 7 +- .../selective_subscription/room_service.py | 12 +- .../templates/index.html | 598 ++++++++++++++---- examples/selective_subscription/uv.lock | 188 ------ fishjam/api/_fishjam_client.py | 11 +- pyproject.toml | 4 +- uv.lock | 24 + 10 files changed, 560 insertions(+), 386 deletions(-) delete mode 100644 examples/selective_subscription/uv.lock diff --git a/examples/selective_subscription/main.py b/examples/selective_subscription/main.py index fa9b283..3422aa5 100644 --- a/examples/selective_subscription/main.py +++ b/examples/selective_subscription/main.py @@ -4,12 +4,11 @@ from selective_subscription.app import app, room_service from selective_subscription.config import HOST, PORT from selective_subscription.notification_handler import NotificationHandler -from selective_subscription.selective_subscription.worker import async_worker +from selective_subscription.worker import async_worker @asynccontextmanager async def lifespan(app): - """Application lifespan manager.""" async with async_worker() as worker: notification_handler = NotificationHandler(room_service) worker.run_in_background(notification_handler.start()) @@ -17,8 +16,8 @@ async def lifespan(app): print(f"Selective subscription demo started on http://{HOST}:{PORT}") print("Available endpoints:") print(" POST /api/peers - Create a new peer") - print(" GET /api/rooms/{room_name}/peers - Get available peers") - print(" POST /api/subscriptions - Toggle subscription") + print(" POST /api/subscribe_peer - subscribe to all tracks of a peer") + print(" POST /api/subscribe_tracks - subscribe to specific tracks") yield diff --git a/examples/selective_subscription/selective_subscription/app.py b/examples/selective_subscription/selective_subscription/app.py index c5c2680..e1c827e 100644 --- a/examples/selective_subscription/selective_subscription/app.py +++ b/examples/selective_subscription/selective_subscription/app.py @@ -1,4 +1,5 @@ import json +from pathlib import Path from typing import Dict, Any from starlette.applications import Starlette @@ -12,13 +13,11 @@ from .room_service import RoomService -# Initialize services room_service = RoomService() -templates = Jinja2Templates(directory="templates") +templates = Jinja2Templates(directory=str(Path(__file__).resolve().parent.parent / "templates")) async def create_peer(request: Request) -> Response: - """Create a new peer in a room.""" try: body = await request.json() room_name = body.get("room_name") @@ -42,99 +41,60 @@ async def create_peer(request: Request) -> Response: except Exception as e: return JSONResponse({"error": str(e)}, status_code=500) - -async def get_available_peers(request: Request) -> Response: - """Get peers available for subscription.""" - room_name = request.path_params.get("room_name") - peer_id = request.query_params.get("peer_id") - - if not room_name: - return JSONResponse({"error": "room_name is required"}, status_code=400) - - peers = room_service.get_available_peers(room_name, peer_id) - - return JSONResponse({ - "peers": [ - { - "id": peer.id, - "metadata": peer.metadata if peer.metadata else {}, - "tracks": [ - { - "id": track["id"], - "type": track.get("type", "unknown") - } - for track in peer.tracks - ] - } - for peer in peers - ] - }) - - -async def toggle_subscription(request: Request) -> Response: - """Toggle subscription to a peer's tracks.""" +async def subscribe_peer(request: Request) -> Response: try: body = await request.json() peer_id = body.get("peer_id") target_peer_id = body.get("target_peer_id") - + if not peer_id or not target_peer_id: return JSONResponse( {"error": "peer_id and target_peer_id are required"}, status_code=400 ) - - subscribed = room_service.toggle_subscription(peer_id, target_peer_id) - - return JSONResponse({ - "subscribed": subscribed, - "peer_id": peer_id, - "target_peer_id": target_peer_id - }) + + room_service.subscibe_peer(peer_id, target_peer_id) + + return JSONResponse({"status": "subscribed"}) except Exception as e: return JSONResponse({"error": str(e)}, status_code=500) + +async def subscribe_tracks(request: Request) -> Response: + try: + body = await request.json() + peer_id = body.get("peer_id") + track_ids = body.get("track_ids") + if not peer_id or not track_ids: + return JSONResponse( + {"error": "peer_id and track_ids are required"}, + status_code=400 + ) -async def get_subscription_status(request: Request) -> Response: - """Get current subscription status for a peer.""" - peer_id = request.path_params.get("peer_id") - - if not peer_id: - return JSONResponse({"error": "peer_id is required"}, status_code=400) - - session = room_service.get_peer_session(peer_id) - - if not session: - return JSONResponse({"error": "Peer not found"}, status_code=404) - - return JSONResponse({ - "peer_id": peer_id, - "subscribed_peers": list(session.subscribed_peers) - }) + room_service.subscribe_tracks(peer_id, track_ids) + return JSONResponse({"status": "subscribed"}) + + except Exception as e: + return JSONResponse({"error": str(e)}, status_code=500) async def health_check(request: Request) -> Response: - """Health check endpoint.""" return JSONResponse({"status": "OK"}) async def serve_index(request: Request) -> Response: - """Serve the main HTML interface.""" return templates.TemplateResponse("index.html", {"request": request}) -# Define routes routes = [ Route("/", serve_index, methods=["GET"]), Route("/health", health_check, methods=["GET"]), Route("/api/peers", create_peer, methods=["POST"]), - Route("/api/rooms/{room_name}/peers", get_available_peers, methods=["GET"]), - Route("/api/subscriptions", toggle_subscription, methods=["POST"]), - Route("/api/peers/{peer_id}/subscriptions", get_subscription_status, methods=["GET"]), + Route("/api/subscribe_peer", subscribe_peer, methods=["POST"]), + Route("/api/subscribe_tracks", subscribe_tracks, methods=["POST"]), ] -# Define middleware middleware = [ Middleware( CORSMiddleware, @@ -145,7 +105,6 @@ async def serve_index(request: Request) -> Response: ) ] -# Create application app = Starlette( routes=routes, middleware=middleware, diff --git a/examples/selective_subscription/selective_subscription/config.py b/examples/selective_subscription/selective_subscription/config.py index 805cef6..9289b03 100644 --- a/examples/selective_subscription/selective_subscription/config.py +++ b/examples/selective_subscription/selective_subscription/config.py @@ -1,6 +1,6 @@ import os -FISHJAM_ID = os.getenv("FISHJAM_ID", "") +FISHJAM_ID = os.environ["FISHJAM_ID"] FISHJAM_TOKEN = os.environ["FISHJAM_MANAGEMENT_TOKEN"] FISHJAM_URL = os.getenv("FISHJAM_URL", "http://localhost:5002") HOST = os.getenv("HOST", "localhost") diff --git a/examples/selective_subscription/selective_subscription/notification_handler.py b/examples/selective_subscription/selective_subscription/notification_handler.py index fdea42f..04a3934 100644 --- a/examples/selective_subscription/selective_subscription/notification_handler.py +++ b/examples/selective_subscription/selective_subscription/notification_handler.py @@ -1,7 +1,4 @@ -from typing import Dict, Set -import asyncio - -from .config import FISHJAM_ID, FISHJAM_TOKEN, FISHJAM_URL +from .config import FISHJAM_ID, FISHJAM_TOKEN from .room_service import RoomService from fishjam._ws_notifier import FishjamNotifier from fishjam.events import ( @@ -15,8 +12,6 @@ class NotificationHandler: - """Handles Fishjam server notifications for selective subscription. - """ def __init__(self, room_service: RoomService): self.room_service = room_service diff --git a/examples/selective_subscription/selective_subscription/room_service.py b/examples/selective_subscription/selective_subscription/room_service.py index ee05b12..c2b29b0 100644 --- a/examples/selective_subscription/selective_subscription/room_service.py +++ b/examples/selective_subscription/selective_subscription/room_service.py @@ -1,14 +1,12 @@ -from dataclasses import dataclass -from typing import Dict, List, Optional +from typing import List from fishjam import FishjamClient, Peer, PeerOptions, Room, RoomOptions from fishjam.errors import NotFoundError -from .config import FISHJAM_ID, FISHJAM_TOKEN, FISHJAM_URL +from .config import FISHJAM_ID, FISHJAM_TOKEN class RoomService: - """Service for managing rooms and peer subscriptions.""" def __init__(self): self.fishjam = FishjamClient( @@ -21,7 +19,6 @@ def __init__(self): )) def get_or_create_room(self) -> Room: - """Get existing room or create a new one.""" if self.room: try: room = self.fishjam.get_room(self.room.id) @@ -32,7 +29,6 @@ def get_or_create_room(self) -> Room: return self.fishjam.create_room() def create_peer(self) -> tuple[Peer, str]: - """Create a peer with manual subscription mode.""" room = self.get_or_create_room() options = PeerOptions( @@ -44,23 +40,19 @@ def create_peer(self) -> tuple[Peer, str]: def subscibe_peer(self, peer_id: str, target_peer_id: str): - """Subscribe a peer to all tracks of another peer.""" room = self.get_or_create_room() self.fishjam.subscribe_peer(room.id, peer_id, target_peer_id) def subscribe_tracks(self, peer_id: str, track_ids: List[str]): - """Subscribe a peer to specific tracks.""" room = self.get_or_create_room() self.fishjam.subscribe_tracks(room.id, peer_id, track_ids) def get_peer_session(self, peer_id: str): - """Return a lightweight session-like object for example endpoints.""" room = self.get_or_create_room() for p in room.peers: if p.id == peer_id: - # create a simple object that has subscribed_peers attribute class _Session: def __init__(self): self.subscribed_peers: set[str] = set() diff --git a/examples/selective_subscription/templates/index.html b/examples/selective_subscription/templates/index.html index 66ee1f5..5706d5f 100644 --- a/examples/selective_subscription/templates/index.html +++ b/examples/selective_subscription/templates/index.html @@ -3,61 +3,278 @@ Selective Subscription Demo
-

Selective Subscription Demo

- -
- - -
+

🐟 Selective Subscription Demo

-
- - + +
+

Create Peers

+
+ + +
+
- - - -