pyLiveMusic 0.2__tar.gz → 0.3__tar.gz

{pylivemusic-0.2 → pylivemusic-0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyLiveMusic
-Version: 0.2
+Version: 0.3
 Summary: A python framework for creating private room for live streaming audio using webrtc.
 Author: Bakachii
 License-Expression: MIT

{pylivemusic-0.2 → pylivemusic-0.3}/src/_core/_core_engine/_webrtc/backend.py

@@ -352,27 +352,21 @@ class Room:
 
 
     # WebRTC offer
-
     async def offer(self, peer, sdp):
         offer = RTCSessionDescription(
             sdp=sdp,
             type="offer",
         )
 
-        await peer.connection.setRemoteDescription(
-            offer
-        )
+        await peer.connection.setRemoteDescription(offer)
 
         await peer.set_remote_ready()
 
         answer = await peer.connection.createAnswer()
 
-        await peer.connection.setLocalDescription(
-            answer
-        )
+        await peer.connection.setLocalDescription(answer)
 
         return peer.connection.localDescription
-
     # State
 
     def state(self):

{pylivemusic-0.2 → pylivemusic-0.3}/src/_core/_core_engine/_webrtc/peer.py

@@ -1,13 +1,14 @@
+import asyncio
+
 from aiortc import RTCPeerConnection
 from aiortc.contrib.media import MediaRelay
-from pyLiveMusic._logger import logs
 
+from pyLiveMusic._logger import logs
 from _utils._settings import QUALITY_BITRATES
 
 
 class Peer:
     def __init__(self, relay, audio_track, quality="high", on_close=None):
-
         self.id = None
         self.connection = RTCPeerConnection()
         logs.info("[WEBRTC] Creating peer")
@@ -22,6 +23,9 @@ class Peer:
         self._on_close = on_close
         self._closed = False
 
+        self._remote_ready = asyncio.Event()
+        self._pending_candidates = []
+
         @self.connection.on("connectionstatechange")
         async def connection_state():
             logs.info(
@@ -51,10 +55,20 @@ class Peer:
                 f"{self.connection.signalingState}"
             )
 
+    async def add_candidate(self, candidate):
+        if not self._remote_ready.is_set():
+            self._pending_candidates.append(candidate)
+            return
 
-    async def add_ice_candidate(self, candidate):
         await self.connection.addIceCandidate(candidate)
 
+    async def set_remote_ready(self):
+        self._remote_ready.set()
+
+        for candidate in self._pending_candidates:
+            await self.connection.addIceCandidate(candidate)
+
+        self._pending_candidates.clear()
 
     async def set_quality(self, quality):
         if quality not in QUALITY_BITRATES:
@@ -70,10 +84,9 @@ class Peer:
 
         await self.sender.setParameters(parameters)
 
-
     async def close(self):
         if self._closed:
             return
 
         self._closed = True
-        await self.connection.close()
+        await self.connection.close()

pylivemusic-0.3/src/_core/_core_engine/_webrtc/signaling.py

@@ -0,0 +1,109 @@
+from aiohttp import web
+from aiortc.sdp import candidate_from_sdp
+
+from pyLiveMusic._logger import logs
+
+
+async def offer(request):
+    try:
+        room_id = request.match_info["room_id"]
+
+        room = request.app["state"].rooms.get(room_id)
+
+        if room is None:
+            raise web.HTTPNotFound(text="Room not found")
+
+        data = await request.json()
+
+        sdp = data.get("sdp")
+
+        if not sdp:
+            raise web.HTTPBadRequest(text="Missing SDP")
+
+        peer = await room.add_peer()
+
+        try:
+            answer = await room.offer(peer, sdp)
+
+        except Exception:
+            await room.remove_peer(peer)
+            raise
+
+        return web.json_response({
+            "peer_id": peer.id,
+            "type": answer.type,
+            "sdp": answer.sdp,
+        })
+
+    except web.HTTPException:
+        raise
+
+    except Exception:
+        logs.exception("[WEBRTC] Offer error")
+        raise
+
+
+async def candidate(request):
+    try:
+        room_id = request.match_info["room_id"]
+
+        room = request.app["state"].rooms.get(room_id)
+
+        if room is None:
+            raise web.HTTPNotFound(
+                text="Room not found"
+            )
+
+        data = await request.json()
+
+        peer_id = data.get("peer_id")
+
+        if not peer_id:
+            raise web.HTTPBadRequest(
+                text="Missing peer_id"
+            )
+
+        peer = room.get_peer(peer_id)
+
+        if peer is None:
+            raise web.HTTPNotFound(
+                text="Peer not found"
+            )
+
+        value = data.get("candidate")
+
+        if not value:
+            return web.json_response({
+                "ok": True
+            })
+
+        candidate_sdp = value.get("candidate")
+
+        if not candidate_sdp:
+            return web.json_response({
+                "ok": True
+            })
+
+        try:
+            ice = candidate_from_sdp(candidate_sdp)
+
+        except Exception as error:
+            raise web.HTTPBadRequest(
+                text=f"Invalid ICE candidate: {error}"
+            )
+
+        ice.sdpMid = value.get("sdpMid")
+        ice.sdpMLineIndex = value.get("sdpMLineIndex")
+
+        await peer.add_candidate(ice)
+
+        return web.json_response({
+            "ok": True
+        })
+
+    except web.HTTPException:
+        raise
+
+    except Exception:
+        logs.exception("[WEBRTC] Candidate error")
+        raise

{pylivemusic-0.2 → pylivemusic-0.3}/src/pyLiveMusic/__init__.py

@@ -1,6 +1,6 @@
 from .core import Client
 
-__version__ = "0.2"  # MAJOR.PATCH
+__version__ = "0.3"  # MAJOR.PATCH
 
 __author__ = "github.com/Bakachii"
 __all__ = ["Client"]

{pylivemusic-0.2 → pylivemusic-0.3}/src/pyLiveMusic.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyLiveMusic
-Version: 0.2
+Version: 0.3
 Summary: A python framework for creating private room for live streaming audio using webrtc.
 Author: Bakachii
 License-Expression: MIT

pylivemusic-0.2/src/_core/_core_engine/_webrtc/signaling.py

@@ -1,91 +0,0 @@
-from aiohttp import web
-from aiortc.sdp import candidate_from_sdp
-
-
-async def offer(request):
-    room_id = request.match_info["room_id"]
-    room = request.app["state"].rooms.get(room_id)
-
-    if room is None:
-        raise web.HTTPNotFound(text="Room not found")
-
-    data = await request.json()
-
-    peer = await room.add_peer()
-
-    try:
-        answer = await room.offer(
-            peer,
-            data["sdp"]
-        )
-
-    except Exception:
-        await room.remove_peer(peer)
-        raise
-
-    return web.json_response({
-        "peer_id": peer.id,
-        "type": answer.type,
-        "sdp": answer.sdp,
-    })
-
-
-async def candidate(request):
-    room_id = request.match_info["room_id"]
-
-    room = request.app["state"].rooms.get(room_id)
-
-    if room is None:
-        raise web.HTTPNotFound(
-            text="Room not found"
-        )
-
-    data = await request.json()
-
-    peer_id = data.get("peer_id")
-
-    if not peer_id:
-        raise web.HTTPBadRequest(
-            text="Missing peer_id"
-        )
-
-    peer = room.get_peer(peer_id)
-
-    if peer is None:
-        raise web.HTTPNotFound(
-            text="Peer not found"
-        )
-
-    value = data.get("candidate")
-
-    if not value:
-        return web.json_response({
-            "ok": True
-        })
-
-    candidate_sdp = value.get("candidate")
-
-    if not candidate_sdp:
-        return web.json_response({
-            "ok": True
-        })
-
-    try:
-        ice = candidate_from_sdp(
-            candidate_sdp
-        )
-    except Exception as error:
-        raise web.HTTPBadRequest(
-            text=f"Invalid ICE candidate: {error}"
-        )
-
-    ice.sdpMid = value.get("sdpMid")
-    ice.sdpMLineIndex = value.get(
-        "sdpMLineIndex"
-    )
-
-    await peer.add_candidate(ice)
-
-    return web.json_response({
-        "ok": True
-    })