avoid having a transceiver._transport

instead accesss it via the receivers transport. This is somewhat
arbitrary since senders and receivers always exist but similar
to how a transceivers receiver track is always set.

Also remove transceiver.transport accessor added in
  aiortc#1229 (comment)

Author: fippo

src/aiortc/rtcpeerconnection.py

@@ -251,7 +251,7 @@ def create_media_description_for_transceiver(
             )
         ]
 
-    add_transport_description(media, transceiver._transport)
+    add_transport_description(media, transceiver.receiver.transport)
 
     return media
 
@@ -410,7 +410,7 @@ async def addIceCandidate(self, candidate: RTCIceCandidate) -> None:
                 candidate.sdpMid == transceiver.mid
                 or candidate.sdpMLineIndex == transceiver._get_mline_index()
             ) and not transceiver._bundled:
-                iceTransport = transceiver._transport.transport
+                iceTransport = transceiver.receiver.transport.transport
                 await iceTransport.addRemoteCandidate(candidate)
                 return
 
@@ -500,8 +500,8 @@ async def close(self) -> None:
 
         # stop transports
         for transceiver in self.__transceivers:
-            await transceiver._transport.stop()
-            await transceiver._transport.transport.stop()
+            await transceiver.receiver.transport.stop()
+            await transceiver.receiver.transport.transport.stop()
         if self.__sctp:
             await self.__sctp.transport.stop()
             await self.__sctp.transport.transport.stop()
@@ -551,7 +551,7 @@ async def createAnswer(self) -> RTCSessionDescription:
                     ),
                     mid=transceiver.mid,
                 )
-                dtlsTransport = transceiver._transport
+                dtlsTransport = transceiver.receiver.transport
             else:
                 media = create_media_description_for_sctp(
                     self.__sctp, legacy=self._sctpLegacySdp, mid=self.__sctp.mid
@@ -789,7 +789,7 @@ async def setLocalDescription(
             for i, media in enumerate(description.media):
                 if media.kind in ["audio", "video"]:
                     transceiver = self.__getTransceiverByMLineIndex(i)
-                    transceiver._transport._set_role(media.dtls.role)
+                    transceiver.receiver.transport._set_role(media.dtls.role)
                 elif media.kind == "application":
                     self.__sctp.transport._set_role(media.dtls.role)
 
@@ -803,7 +803,7 @@ async def setLocalDescription(
         for i, media in enumerate(description.media):
             if media.kind in ["audio", "video"]:
                 transceiver = self.__getTransceiverByMLineIndex(i)
-                add_transport_description(media, transceiver._transport)
+                add_transport_description(media, transceiver.receiver.transport)
             elif media.kind == "application":
                 add_transport_description(media, self.__sctp.transport)
 
@@ -900,7 +900,7 @@ async def setRemoteDescription(
                     )
 
                 # memorise transport parameters
-                dtlsTransport = transceiver._transport
+                dtlsTransport = transceiver.receiver.transport
                 self.__remoteDtls[transceiver] = media.dtls
                 self.__remoteIce[transceiver] = media.ice
 
@@ -947,32 +947,31 @@ async def setRemoteDescription(
         bundle = next((x for x in description.group if x.semantic == "BUNDLE"), None)
         if bundle and bundle.items:
             # find main media stream
-            masterMid = bundle.items[0]
-            masterTransport = None
+            primaryMid = bundle.items[0]
+            primaryTransport = None
             for transceiver in self.__transceivers:
-                if transceiver.mid == masterMid:
-                    masterTransport = transceiver._transport
+                if transceiver.mid == primaryMid:
+                    primaryTransport = transceiver.receiver.transport
                     break
-            if self.__sctp and self.__sctp.mid == masterMid:
-                masterTransport = self.__sctp.transport
+            if self.__sctp and self.__sctp.mid == primaryMid:
+                primaryTransport = self.__sctp.transport
 
             # replace transport for bundled media
             oldTransports = set()
             slaveMids = bundle.items[1:]
             for transceiver in self.__transceivers:
                 if transceiver.mid in slaveMids and not transceiver._bundled:
-                    oldTransports.add(transceiver._transport)
-                    transceiver.receiver.setTransport(masterTransport)
-                    transceiver.sender.setTransport(masterTransport)
+                    oldTransports.add(transceiver.receiver.transport)
+                    transceiver.receiver.setTransport(primaryTransport)
+                    transceiver.sender.setTransport(primaryTransport)
                     transceiver._bundled = True
-                    transceiver._transport = masterTransport
             if (
                 self.__sctp
                 and self.__sctp.mid in slaveMids
                 and not self.__sctp._bundled
             ):
                 oldTransports.add(self.__sctp.transport)
-                self.__sctp.setTransport(masterTransport)
+                self.__sctp.setTransport(primaryTransport)
                 self.__sctp._bundled = True
 
             # stop and discard old ICE transports
@@ -1015,7 +1014,7 @@ async def setRemoteDescription(
 
     async def __connect(self) -> None:
         for transceiver in self.__transceivers:
-            dtlsTransport = transceiver._transport
+            dtlsTransport = transceiver.receiver.transport
             iceTransport = dtlsTransport.transport
             if (
                 iceTransport.iceGatherer.getLocalCandidates()
@@ -1065,7 +1064,7 @@ def __createDtlsTransport(self) -> RTCDtlsTransport:
             if len(self.__transceivers) > 0:
                 parameters = self.__transceivers[
                     0
-                ].transport.transport.iceGatherer.getLocalParameters()
+                ].receiver.transport.transport.iceGatherer.getLocalParameters()
             else:
                 parameters = (
                     self.__sctp.transport.transport.iceGatherer.getLocalParameters()
@@ -1103,7 +1102,7 @@ def __createSctpTransport(self) -> None:
             and len(self.__transceivers) > 0
         )
         if bundled:
-            dtlsTransport = self.__transceivers[0].transport
+            dtlsTransport = self.__transceivers[0].receiver.transport
         else:
             dtlsTransport = self.__createDtlsTransport()
         self.__sctp = RTCSctpTransport(dtlsTransport)
@@ -1121,7 +1120,7 @@ def __createTransceiver(
         bundled = False
         if self.__configuration.bundlePolicy == RTCBundlePolicy.MAX_BUNDLE:
             if len(self.__transceivers) > 0:
-                dtlsTransport = self.__transceivers[0].transport
+                dtlsTransport = self.__transceivers[0].receiver.transport
                 bundled = True
             elif self.__sctp:
                 dtlsTransport = self.__sctp.transport
@@ -1131,7 +1130,7 @@ def __createTransceiver(
                 filter(lambda t: t.kind == kind, self.__transceivers), None
             )
             if transceiver:
-                dtlsTransport = transceiver.transport
+                dtlsTransport = transceiver.receiver.transport
                 bundled = True
 
         if not dtlsTransport:
@@ -1146,7 +1145,6 @@ def __createTransceiver(
         transceiver.receiver._set_rtcp_ssrc(transceiver.sender._ssrc)
         transceiver.sender._stream_id = self.__stream_id
         transceiver._bundled = bundled
-        transceiver._transport = dtlsTransport
         self.__transceivers.append(transceiver)
         return transceiver
 

src/aiortc/rtcrtptransceiver.py

@@ -2,7 +2,6 @@
 from typing import Optional
 
 from .codecs import get_capabilities
-from .rtcdtlstransport import RTCDtlsTransport
 from .rtcrtpparameters import (
     RTCRtpCodecCapability,
     RTCRtpCodecParameters,
@@ -40,7 +39,6 @@ def __init__(
 
         self._offerDirection: Optional[str] = None
         self._preferred_codecs: list[RTCRtpCodecCapability] = []
-        self._transport: RTCDtlsTransport = None
 
         # FIXME: this is only used by RTCPeerConnection
         self._bundled = False
@@ -130,13 +128,6 @@ async def stop(self) -> None:
         await self.__sender.stop()
         self.__stopped = True
 
-    @property
-    def transport(self) -> RTCDtlsTransport:
-        """
-        The :class:`RTCDtlsTransport` over which media are transmitted.
-        """
-        return self._transport
-
     def _setCurrentDirection(self, direction: str) -> None:
         self.__currentDirection = direction
 

tests/test_rtcpeerconnection.py

@@ -5254,11 +5254,17 @@ async def test_bundlepolicy_max_bundle_ufrag_and_pwd(self) -> None:
         transceiver2 = pc.addTransceiver("video")
 
         await pc.createOffer()
-        param1 = transceiver1.transport.transport.iceGatherer.getLocalParameters()
-        param2 = transceiver2.transport.transport.iceGatherer.getLocalParameters()
+        param1 = (
+            transceiver1.receiver.transport.transport.iceGatherer.getLocalParameters()
+        )
+        param2 = (
+            transceiver2.receiver.transport.transport.iceGatherer.getLocalParameters()
+        )
         self.assertEqual(param1.usernameFragment, param2.usernameFragment)
         self.assertEqual(param1.password, param2.password)
-        self.assertEqual(transceiver1.transport, transceiver2.transport)
+        self.assertEqual(
+            transceiver1.receiver.transport, transceiver2.receiver.transport
+        )
 
     @asynctest
     async def test_bundlepolicy_max_bundle_ufrag_and_pwd_datachannel(self) -> None:
@@ -5269,11 +5275,13 @@ async def test_bundlepolicy_max_bundle_ufrag_and_pwd_datachannel(self) -> None:
         transceiver = pc.addTransceiver("audio")
 
         await pc.createOffer()
-        param1 = transceiver.transport.transport.iceGatherer.getLocalParameters()
+        param1 = (
+            transceiver.receiver.transport.transport.iceGatherer.getLocalParameters()
+        )
         param2 = pc.sctp.transport.transport.iceGatherer.getLocalParameters()
         self.assertEqual(param1.usernameFragment, param2.usernameFragment)
         self.assertEqual(param1.password, param2.password)
-        self.assertEqual(transceiver.transport, pc.sctp.transport)
+        self.assertEqual(transceiver.receiver.transport, pc.sctp.transport)
 
     @asynctest
     async def test_bundlepolicy_transports_balanced(self) -> None:
@@ -5282,10 +5290,14 @@ async def test_bundlepolicy_transports_balanced(self) -> None:
         transceiver2 = pc.addTransceiver("video")
         transceiver3 = pc.addTransceiver("audio")
         pc.createDataChannel("somechannel")
-        self.assertNotEqual(transceiver1.transport, transceiver2.transport)
-        self.assertEqual(transceiver1.transport, transceiver3.transport)
-        self.assertNotEqual(transceiver1.transport, pc.sctp.transport)
-        self.assertNotEqual(transceiver2.transport, pc.sctp.transport)
+        self.assertNotEqual(
+            transceiver1.receiver.transport, transceiver2.receiver.transport
+        )
+        self.assertEqual(
+            transceiver1.receiver.transport, transceiver3.receiver.transport
+        )
+        self.assertNotEqual(transceiver1.receiver.transport, pc.sctp.transport)
+        self.assertNotEqual(transceiver2.receiver.transport, pc.sctp.transport)
 
     @asynctest
     async def test_bundlepolicy_transports_max_compat(self) -> None:
@@ -5296,10 +5308,14 @@ async def test_bundlepolicy_transports_max_compat(self) -> None:
         transceiver2 = pc.addTransceiver("video")
         transceiver3 = pc.addTransceiver("audio")
         pc.createDataChannel("somechannel")
-        self.assertNotEqual(transceiver1.transport, transceiver2.transport)
-        self.assertNotEqual(transceiver1.transport, transceiver3.transport)
-        self.assertNotEqual(transceiver1.transport, pc.sctp.transport)
-        self.assertNotEqual(transceiver2.transport, pc.sctp.transport)
+        self.assertNotEqual(
+            transceiver1.receiver.transport, transceiver2.receiver.transport
+        )
+        self.assertNotEqual(
+            transceiver1.receiver.transport, transceiver3.receiver.transport
+        )
+        self.assertNotEqual(transceiver1.receiver.transport, pc.sctp.transport)
+        self.assertNotEqual(transceiver2.receiver.transport, pc.sctp.transport)
 
     @asynctest
     async def test_bundlepolicy_transports_max_bundle(self) -> None:
@@ -5310,6 +5326,10 @@ async def test_bundlepolicy_transports_max_bundle(self) -> None:
         transceiver2 = pc.addTransceiver("video")
         transceiver3 = pc.addTransceiver("audio")
         pc.createDataChannel("somechannel")
-        self.assertEqual(transceiver1.transport, transceiver2.transport)
-        self.assertEqual(transceiver1.transport, transceiver3.transport)
-        self.assertEqual(transceiver1.transport, pc.sctp.transport)
+        self.assertEqual(
+            transceiver1.receiver.transport, transceiver2.receiver.transport
+        )
+        self.assertEqual(
+            transceiver1.receiver.transport, transceiver3.receiver.transport
+        )
+        self.assertEqual(transceiver1.receiver.transport, pc.sctp.transport)