py-tgcalls 2.0.0rc3__py3-none-any.whl → 2.0.0rc4__py3-none-any.whl

{py_tgcalls-2.0.0rc3.dist-info → py_tgcalls-2.0.0rc4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py-tgcalls
-Version: 2.0.0rc3
+Version: 2.0.0rc4
 Summary: UNKNOWN
 Home-page: https://github.com/pytgcalls/pytgcalls
 Author: Laky-64
@@ -22,7 +22,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp (>=3.9.3)
 Requires-Dist: deprecation
-Requires-Dist: ntgcalls (>=1.2.0.b4)
+Requires-Dist: ntgcalls (>=1.2.0.b6)
 Requires-Dist: psutil
 Requires-Dist: screeninfo
 Requires-Dist: setuptools

{py_tgcalls-2.0.0rc3.dist-info → py_tgcalls-2.0.0rc4.dist-info}/RECORD

@@ -1,14 +1,14 @@
 pytgcalls/__init__.py,sha256=TfZGf1enqqs50mBB406vygB6zYgn3vAjBYFUDO4Pviw,248
-pytgcalls/__version__.py,sha256=vKxTj9noUY05HBNxeQr2XsQn3xjltT-yAEPqn4h2H9Q,25
+pytgcalls/__version__.py,sha256=TZk9uVn2m_Mjhob6LWvtgl022cEas816bZCaV4pwe-c,25
 pytgcalls/environment.py,sha256=ctCHACvG6l8SdpPewSBhOvc70kbwpv18maC0TwLvZ08,1924
-pytgcalls/exceptions.py,sha256=F4BvlBARLp_Bc2uo6OUlSZvkrNnpBngHE7HZMUgdcvI,3957
+pytgcalls/exceptions.py,sha256=0MmAktc53ajYAc7ThjD2tJ9PDyibUi0iHZMfUy2IoKs,4109
 pytgcalls/ffmpeg.py,sha256=1GavkVf562Y_8cT4EZxxj_b7Y0-l8yyGkX0D5eUHeas,8520
 pytgcalls/filters.py,sha256=cmFWhRkgjQMk1WQqnd-hOAvM6x3dufJ1xjQAEL1vKLQ,4409
 pytgcalls/mtproto_required.py,sha256=6B-31p5qH_6oekUgypV4nK3hqPS6Nr-pA8S81wjnbaY,630
 pytgcalls/mutex.py,sha256=fSsAL4NuB7esBG90k4eUX388Knpr1_76Mz5BZlkSC0w,1119
 pytgcalls/pytgcalls.py,sha256=VI9aRwPE-Lo1lh18ByOnkFxf1_8tq2ECyz5igPo1r8w,1443
 pytgcalls/pytgcalls_session.py,sha256=_BGJWvf7t3mki2DhlEPjh9cypvYuSFkMSxzTsfepwUk,2719
-pytgcalls/scaffold.py,sha256=CSRLYfc4wGv0RE3JMPkmEV3JgFv5Ivh5REp1YkzPFfY,950
+pytgcalls/scaffold.py,sha256=d5NFFm-Ntlu07fpXOE_OI4ULrvNb3Y4WDtM0nsKjqk4,986
 pytgcalls/statictypes.py,sha256=CdlqgQNhTZ_uTE8-B8m01fJ7TlD2B42EI2QBPxDdAtA,3842
 pytgcalls/sync.py,sha256=IsOH3TD7cxUg_-zdGt12HoS8sBlXvcGayPZAoxxKM48,3396
 pytgcalls/version_manager.py,sha256=egeGgvb66zWlLTMuw2U-b0x8MfnRzMm1xAEVN87HF5c,296
@@ -31,7 +31,7 @@ pytgcalls/methods/decorators/on_update.py,sha256=ZTL4YcQk0N4Ru56a5WItUvkSN5SAqr6
 pytgcalls/methods/stream/__init__.py,sha256=_4j-CEby4_2Kadva86tFMC4GSSzhBBjKLXfrgTk4gzo,343
 pytgcalls/methods/stream/mute_stream.py,sha256=auo2aAazfEC90Ab6MzaiPdddiJ1w4fN_9HaORkAeOBY,570
 pytgcalls/methods/stream/pause_stream.py,sha256=z_AIWABrQMHmTwvlah_PrH9EjXbro8gKxZni4Km5ICg,573
-pytgcalls/methods/stream/play.py,sha256=uV-yr1S6I6_x6owfKxfQ3NqwvN9iFU4BAp8YizLqRcs,7155
+pytgcalls/methods/stream/play.py,sha256=acuav8C9wEyur8FMAT7zFxkEvNDu45gnodUmGFrfIKA,7376
 pytgcalls/methods/stream/played_time.py,sha256=IkUdyHrqpzpRl9uf0uZhg1COo4zsHnQOPu3nipjVatI,570
 pytgcalls/methods/stream/resume_stream.py,sha256=z_DgP4cDExjEqEeX_ZL--50MXQ9lrATK876SIwE71PQ,576
 pytgcalls/methods/stream/unmute_stream.py,sha256=KUMhfMbhsPmZsmpF4cGWC1FVW7YwXha2MmQnqrBhM8s,576
@@ -44,7 +44,7 @@ pytgcalls/methods/utilities/idle.py,sha256=lkjbYzpU7iz-maE0kS6RVtHJ4h1PsmGqnZmaE
 pytgcalls/methods/utilities/ping.py,sha256=hhIMSHk2BzMB-IKpwLdZFVrsEvGm2ftJwKLs1k4anh8,244
 pytgcalls/methods/utilities/resolve_chat_id.py,sha256=92x2LHbUlnJMm-kS3fXOYmzYpY2TZbqtQD2rw3eBXDY,382
 pytgcalls/methods/utilities/run.py,sha256=cnYQd2xB5Cr_WS0Q2cXJZPGiN6JOCULzj1r4xXVyrlg,152
-pytgcalls/methods/utilities/start.py,sha256=u3quwI6z8zWdR50Tbzz_3LHGWjrNzgaM6g-WBl7cnmw,7281
+pytgcalls/methods/utilities/start.py,sha256=0TjW64IDYulevNTJIp4ZHWa9pkKCcgeyFhL47PehoqI,8534
 pytgcalls/methods/utilities/stream_params.py,sha256=hYcNxx__McmPeHgOUDEuNcN7ThgDjukejQYHrfmWm-A,1519
 pytgcalls/mtproto/__init__.py,sha256=X4zvzFG7km7qHyE0fdvA550WcOVO_xl_p__gvIfDGmw,130
 pytgcalls/mtproto/bridged_client.py,sha256=kK22n-CKjtfmtNE6bXCpuL6kWAUK2_Ul7cGgx_HNuHQ,4975
@@ -86,8 +86,8 @@ pytgcalls/types/stream/media_stream.py,sha256=vH32FrwdMSA9-S54bvessVHewh_l-5WXqu
 pytgcalls/types/stream/stream_audio_ended.py,sha256=2_EFa98F0vWu0d0jBmLtzp4NH_xBkDO_6yP9UtyKuCs,164
 pytgcalls/types/stream/stream_video_ended.py,sha256=9YFTTZPMDpB95eb815rGtgDrzBGfTeazJ5mZwP6Hvks,164
 pytgcalls/types/stream/video_quality.py,sha256=HBfWq005kh-D19MaVE9VzVdnODzrXf4IJUimCfslfiU,231
-py_tgcalls-2.0.0rc3.dist-info/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-py_tgcalls-2.0.0rc3.dist-info/METADATA,sha256=HrXKhzCJfXyyzAdgc3hO_AVbvh591gXfm-MVQmL8u1c,4886
-py_tgcalls-2.0.0rc3.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-py_tgcalls-2.0.0rc3.dist-info/top_level.txt,sha256=IUDUwn0KkcbUYZbCe9R5AUb2Ob-lmllNUGQqyeXXd8A,10
-py_tgcalls-2.0.0rc3.dist-info/RECORD,,
+py_tgcalls-2.0.0rc4.dist-info/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+py_tgcalls-2.0.0rc4.dist-info/METADATA,sha256=WRIeNUG7mRIALS23Oi0h_2bzY5o0eLfzuQAZpjaATtg,4886
+py_tgcalls-2.0.0rc4.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+py_tgcalls-2.0.0rc4.dist-info/top_level.txt,sha256=IUDUwn0KkcbUYZbCe9R5AUb2Ob-lmllNUGQqyeXXd8A,10
+py_tgcalls-2.0.0rc4.dist-info/RECORD,,

pytgcalls/__version__.py

@@ -1 +1 @@
-__version__ = '2.0.0rc3'
+__version__ = '2.0.0rc4'

pytgcalls/exceptions.py

@@ -72,6 +72,13 @@ class CallDeclined(Exception):
         )
 
 
+class CallDiscarded(Exception):
+    def __init__(self, user_id: int):
+        super().__init__(
+            f'Call discarded by {user_id}',
+        )
+
+
 class NotInCallError(Exception):
     def __init__(self):
         super().__init__(

pytgcalls/methods/stream/play.py

@@ -37,10 +37,10 @@ class Play(Scaffold):
         config: Optional[Union[CallConfig, GroupCallConfig]] = None,
     ):
         chat_id = await self.resolve_chat_id(chat_id)
-        is_p2p = chat_id < 0  # type: ignore
+        is_p2p = chat_id > 0  # type: ignore
         if config is None:
-            config = GroupCallConfig() if is_p2p else CallConfig()
-        if is_p2p and not isinstance(config, GroupCallConfig):
+            config = GroupCallConfig() if not is_p2p else CallConfig()
+        if not is_p2p and not isinstance(config, GroupCallConfig):
             raise ValueError(
                 'Group call config must be provided for group calls',
             )
@@ -78,6 +78,7 @@ class Play(Scaffold):
         try:
             for retries in range(4):
                 try:
+                    self._wait_connect[chat_id] = self.loop.create_future()
                     if isinstance(config, GroupCallConfig):
                         call_params: str = await self._binding.create_call(
                             chat_id,
@@ -148,6 +149,7 @@ class Play(Scaffold):
                             raise TimedOutAnswer()
                         finally:
                             self._p2p_configs.pop(chat_id, None)
+                    await self._wait_connect[chat_id]
                     break
                 except TelegramServerError:
                     if retries == 3 or is_p2p:
@@ -162,6 +164,8 @@ class Play(Scaffold):
                     except ConnectionNotFound:
                         pass
                     raise
+                finally:
+                    self._wait_connect.pop(chat_id, None)
 
             if isinstance(config, GroupCallConfig):
                 participants = await self._app.get_group_call_participants(

pytgcalls/methods/utilities/start.py

@@ -2,10 +2,13 @@ import asyncio
 import logging
 
 from ntgcalls import ConnectionNotFound
+from ntgcalls import ConnectionState
 from ntgcalls import MediaState
 from ntgcalls import StreamType
+from ntgcalls import TelegramServerError
 
 from ...exceptions import CallDeclined
+from ...exceptions import CallDiscarded
 from ...exceptions import PyTgCallsAlreadyRunning
 from ...mtproto import BridgedClient
 from ...pytgcalls_session import PyTgCallsSession
@@ -41,6 +44,15 @@ class Start(Scaffold):
                                     chat_id,
                                 ),
                             )
+            if chat_id in self._wait_connect and \
+                    not self._wait_connect[chat_id].done():
+                if isinstance(update, ChatUpdate):
+                    if update.status & ChatUpdate.Status.DISCARDED_CALL:
+                        self._wait_connect[chat_id].set_exception(
+                            CallDiscarded(
+                                chat_id,
+                            ),
+                        )
             if isinstance(update, RawCallUpdate):
                 if update.status & RawCallUpdate.Type.REQUESTED:
                     self._p2p_configs[chat_id] = CallData(
@@ -130,10 +142,23 @@ class Start(Scaffold):
                     data,
                 )
 
-        async def disconnected(chat_id: int):
-            if chat_id > 0:
-                await self._app.discard_call(chat_id)
-            await clear_call(chat_id)
+        async def connection_changed(chat_id: int, state: ConnectionState):
+            if chat_id in self._wait_connect:
+                if state == ConnectionState.CONNECTED:
+                    self._wait_connect[chat_id].set_result(None)
+                elif state == ConnectionState.FAILED or\
+                        state == ConnectionState.TIMEOUT:
+                    self._wait_connect[chat_id].set_exception(
+                        TelegramServerError(),
+                    )
+                    await clear_call(chat_id)
+
+            if state == ConnectionState.FAILED or \
+                    state == ConnectionState.TIMEOUT or \
+                    state == ConnectionState.CLOSED:
+                if chat_id > 0:
+                    await self._app.discard_call(chat_id)
+                await clear_call(chat_id)
 
         async def clear_cache(chat_id: int):
             self._p2p_configs.pop(chat_id, None)
@@ -172,9 +197,9 @@ class Start(Scaffold):
                     self.loop,
                 ),
             )
-            self._binding.on_disconnect(
-                lambda chat_id: asyncio.run_coroutine_threadsafe(
-                    disconnected(chat_id),
+            self._binding.on_connection_change(
+                lambda chat_id, state: asyncio.run_coroutine_threadsafe(
+                    connection_changed(chat_id, state),
                     self.loop,
                 ),
             )

pytgcalls/scaffold.py

@@ -23,6 +23,7 @@ class Scaffold(HandlersHolder):
         self._need_unmute = set()
         self._lock = dict()
         self._p2p_configs = dict()
+        self._wait_connect = dict()
 
     def _handle_mtproto(self):
         pass