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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py-tgcalls
-Version: 2.0.0rc2
+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.1.3)
+Requires-Dist: ntgcalls (>=1.2.0.b6)
 Requires-Dist: psutil
 Requires-Dist: screeninfo
 Requires-Dist: setuptools

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

@@ -1,14 +1,14 @@
 pytgcalls/__init__.py,sha256=TfZGf1enqqs50mBB406vygB6zYgn3vAjBYFUDO4Pviw,248
-pytgcalls/__version__.py,sha256=9mj-rh8xPacGvkhlbfmJuLzTPpmZa4UVQt74z5bJOR4,25
+pytgcalls/__version__.py,sha256=TZk9uVn2m_Mjhob6LWvtgl022cEas816bZCaV4pwe-c,25
 pytgcalls/environment.py,sha256=ctCHACvG6l8SdpPewSBhOvc70kbwpv18maC0TwLvZ08,1924
-pytgcalls/exceptions.py,sha256=-h2WqnZeXbFIojcXSMsvYzsLOZiVZKzp4uZ00d-GTTA,3824
+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=H8B5-16bn5xk5J7N4njJW-xIEMTPeYVxcBAomzn1gbs,1583
+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
@@ -25,34 +25,34 @@ pytgcalls/methods/__init__.py,sha256=hk1blAT5u_Isemdrg0nqInLsdRzTTZnak5NdAfkBPAk
 pytgcalls/methods/calls/__init__.py,sha256=xg4DZZClEnxwaj-DAq3e8gSR-g-MiYBdUEBth64lSXA,214
 pytgcalls/methods/calls/change_volume_call.py,sha256=viA3yHVxPJ421yE1dfFTh-kNEFTxMlaVFxVjC-PeX-0,719
 pytgcalls/methods/calls/get_participants.py,sha256=dT725XXn9oiTbWV6mFradIydoQUx_COPButivDhzAxE,568
-pytgcalls/methods/calls/leave_call.py,sha256=VdJeift1afC3REU-yE3M85lToZeQieVlUj_SdPZJMi4,1101
+pytgcalls/methods/calls/leave_call.py,sha256=ZjZbjlQn8KuX3mUjzXfX42EpL9_iU3fsXYdidfqUrUM,1091
 pytgcalls/methods/decorators/__init__.py,sha256=TCGaEVZnHjtOwv-3PNfaCVm0kyFhJApUPUNntt6MwyM,78
 pytgcalls/methods/decorators/on_update.py,sha256=ZTL4YcQk0N4Ru56a5WItUvkSN5SAqr6_RDZvXmZMIHs,316
 pytgcalls/methods/stream/__init__.py,sha256=_4j-CEby4_2Kadva86tFMC4GSSzhBBjKLXfrgTk4gzo,343
-pytgcalls/methods/stream/mute_stream.py,sha256=djw-CeH01kcviBVW9kMrMg_OYbtRjZhunDI953So9J4,580
-pytgcalls/methods/stream/pause_stream.py,sha256=QLGN_vtTC17YSgIlwcYhUCBWaaCZeFPIksQ9pId5V9A,583
-pytgcalls/methods/stream/play.py,sha256=UzwnbA-cPnWDomPkzOK5Lqk7iOV99WyMJD0LQBAFT_Q,7305
-pytgcalls/methods/stream/played_time.py,sha256=7L9nK8AQRQ-jEIIEOYgOcEksa86iql8K4ryh__e3KVk,580
-pytgcalls/methods/stream/resume_stream.py,sha256=IW5LPtkFcJiprm39FsJa1F_UssRmbD-kyx9LYwO4mI4,586
-pytgcalls/methods/stream/unmute_stream.py,sha256=H2ZmdG0p3BTqMpgLabM3U6S_r1K9DNvmJGs6Rjloel4,586
+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=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
 pytgcalls/methods/utilities/__init__.py,sha256=JcKwqNo6fFXXfuab94fNEraKF1P9fnSSgr0WQDRjF2w,339
 pytgcalls/methods/utilities/cache_peer.py,sha256=Ylt0wCCJOoNKf1wZEXjfE8aBZKUIIgdRUFOMTGA5DfE,140
-pytgcalls/methods/utilities/call_holder.py,sha256=Ateys37G06hliEyyIGYfP08e9AH6P1R5NNxKjuPqrQk,903
+pytgcalls/methods/utilities/call_holder.py,sha256=RZ9DFhZO66ghtGqxLbYS86hq2UCjTzTiN_xzL5bgD-M,903
 pytgcalls/methods/utilities/compose.py,sha256=Nzdv8orMmka5NIBZ1SW1nsqXRzArZl4m6FdZU7syaR4,334
 pytgcalls/methods/utilities/cpu_usage.py,sha256=Mbga4MFCIwuh7WC8sqBbv1Pa6ALcp5AIDyfYMH_Bix4,162
 pytgcalls/methods/utilities/idle.py,sha256=lkjbYzpU7iz-maE0kS6RVtHJ4h1PsmGqnZmaENGIKeE,768
 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=99ey8496uzFdntiPg4wbveRebY05dYIglXpSnrl5Pec,6702
+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=LBY1bsyOVyUqNT8RtxPj-Lbq-SGvbJ4L28AFgO_Claw,5039
+pytgcalls/mtproto/bridged_client.py,sha256=kK22n-CKjtfmtNE6bXCpuL6kWAUK2_Ul7cGgx_HNuHQ,4975
 pytgcalls/mtproto/client_cache.py,sha256=LYjmvhgaaEyczoJFZ35vGXFlN4ADwXYvt1bhrVS4ipw,5088
-pytgcalls/mtproto/hydrogram_client.py,sha256=SIYdKPw_1Epp1BLExIF4fDh3VCbUcpEAJGVf_GWfyoQ,20904
-pytgcalls/mtproto/mtproto_client.py,sha256=Bk5N2OtKR-zvwHotGtTs6kmr9a2JX0bWxocxYTxgTDo,6928
-pytgcalls/mtproto/pyrogram_client.py,sha256=IpPteY4b-dHBJ-T-FNo2VEkAwnVXiyMznCXsBlof6u4,21182
-pytgcalls/mtproto/telethon_client.py,sha256=mg-2LapOHXWPAp5614LjxnY2T-SOOtOd75J3iWEIOwQ,19997
+pytgcalls/mtproto/hydrogram_client.py,sha256=TgItS6KKPJna1yIXJ7iXflfRWRpPvMXHoRKzo6q09lE,21014
+pytgcalls/mtproto/mtproto_client.py,sha256=rqsUOE7llTXSAru9GfBMhUKufEgWQL65QLHRj4TEfgw,6884
+pytgcalls/mtproto/pyrogram_client.py,sha256=cNaQu00rZTFVTj3CE2V_eL5yT1XcGwkgwcGfb6aa53s,21203
+pytgcalls/mtproto/telethon_client.py,sha256=GFZ0LM8PXRVXwJfYV_gVVZ_qjEmWCJD_nmqiPE8oCCo,20105
 pytgcalls/types/__init__.py,sha256=JTMTa2flwWkBSEjhAAXE0oL4IJFRb12XU0npp9Neypc,1071
 pytgcalls/types/browsers.py,sha256=47Kr5q96n4Q4WvVhA6IUlS2egEcA9GRLlDeFcQYyc9M,9545
 pytgcalls/types/cache.py,sha256=FfsOcmYnsBGPlJoTPIXXYcUSpGE3rhx6cjIH77hyUL0,1059
@@ -82,12 +82,12 @@ pytgcalls/types/raw/video_parameters.py,sha256=LXBpdaw5vyNayVfgtmF-gRkCY_ATwAnun
 pytgcalls/types/raw/video_stream.py,sha256=2Chrk7NFWF1H9V7hH71RZ5rF3iBhT53syFkHKw4-5gc,433
 pytgcalls/types/stream/__init__.py,sha256=xfF-9ZulOLk3E6G1nw1Ky0ZRWXlFuER0Uj8HQn3650w,338
 pytgcalls/types/stream/audio_quality.py,sha256=4X94ErmTeLP4TVcE3eLtPPdtluSPxgxbgTosuNJOVhc,141
-pytgcalls/types/stream/media_stream.py,sha256=68ji9bDw6edXFcnB5391kdsJrLTDUdjRPNlG0pZBiHA,8978
+pytgcalls/types/stream/media_stream.py,sha256=vH32FrwdMSA9-S54bvessVHewh_l-5WXqupQE8pe-x4,8979
 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.0rc2.dist-info/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-py_tgcalls-2.0.0rc2.dist-info/METADATA,sha256=knBJQ-o80woqWPY4hnlesmREiP9Vvq3y5KRKfM8jXa0,4883
-py_tgcalls-2.0.0rc2.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-py_tgcalls-2.0.0rc2.dist-info/top_level.txt,sha256=IUDUwn0KkcbUYZbCe9R5AUb2Ob-lmllNUGQqyeXXd8A,10
-py_tgcalls-2.0.0rc2.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.0rc2'
+__version__ = '2.0.0rc4'

pytgcalls/exceptions.py

@@ -65,10 +65,24 @@ class TimedOutAnswer(Exception):
         )
 
 
-class NotInGroupCallError(Exception):
+class CallDeclined(Exception):
+    def __init__(self, user_id: int):
+        super().__init__(
+            f'Call declined by {user_id}',
+        )
+
+
+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__(
-            'The userbot there isn\'t in a group call',
+            'The userbot is not in a call',
         )
 
 

pytgcalls/methods/calls/leave_call.py

@@ -3,7 +3,7 @@ from typing import Union
 from ntgcalls import ConnectionNotFound
 
 from ...exceptions import NoActiveGroupCall
-from ...exceptions import NotInGroupCallError
+from ...exceptions import NotInCallError
 from ...mtproto_required import mtproto_required
 from ...mutex import mutex
 from ...scaffold import Scaffold
@@ -35,6 +35,6 @@ class LeaveCall(Scaffold):
         try:
             await self._binding.stop(chat_id)
         except ConnectionNotFound:
-            raise NotInGroupCallError()
+            raise NotInCallError()
         if chat_id < 0:  # type: ignore
             self._need_unmute.discard(chat_id)

pytgcalls/methods/stream/mute_stream.py

@@ -2,7 +2,7 @@ from typing import Union
 
 from ntgcalls import ConnectionNotFound
 
-from ...exceptions import NotInGroupCallError
+from ...exceptions import NotInCallError
 from ...mtproto_required import mtproto_required
 from ...scaffold import Scaffold
 from ...statictypes import statictypes
@@ -19,4 +19,4 @@ class MuteStream(Scaffold):
         try:
             return await self._binding.mute(chat_id)
         except ConnectionNotFound:
-            raise NotInGroupCallError()
+            raise NotInCallError()

pytgcalls/methods/stream/pause_stream.py

@@ -2,7 +2,7 @@ from typing import Union
 
 from ntgcalls import ConnectionNotFound
 
-from ...exceptions import NotInGroupCallError
+from ...exceptions import NotInCallError
 from ...mtproto_required import mtproto_required
 from ...scaffold import Scaffold
 from ...statictypes import statictypes
@@ -19,4 +19,4 @@ class PauseStream(Scaffold):
         try:
             return await self._binding.pause(chat_id)
         except ConnectionNotFound:
-            raise NotInGroupCallError()
+            raise NotInCallError()

pytgcalls/methods/stream/play.py

@@ -37,13 +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
         if config is None:
-            config = GroupCallConfig() \
-                if chat_id < 0 else CallConfig()  # type: ignore
-        if (
-            chat_id < 0 and  # type: ignore
-            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',
             )
@@ -81,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,
@@ -121,7 +119,6 @@ class Play(Scaffold):
                                 chat_id,
                                 data.g_a_or_b,
                                 self._binding.get_protocol(),
-                                media_description.video is not None,
                             )
 
                         try:
@@ -131,7 +128,6 @@ class Play(Scaffold):
                             )
                             auth_params = await self._binding.exchange_keys(
                                 chat_id,
-                                data.p,
                                 result.g_a_or_b,
                                 result.fingerprint,
                             )
@@ -153,9 +149,10 @@ 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:
+                    if retries == 3 or is_p2p:
                         raise
                     (py_logger.warning if retries >= 1 else py_logger.info)(
                         f'Telegram is having some internal server issues. '
@@ -167,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/stream/played_time.py

@@ -2,7 +2,7 @@ from typing import Union
 
 from ntgcalls import ConnectionNotFound
 
-from ...exceptions import NotInGroupCallError
+from ...exceptions import NotInCallError
 from ...mtproto_required import mtproto_required
 from ...scaffold import Scaffold
 from ...statictypes import statictypes
@@ -19,4 +19,4 @@ class PlayedTime(Scaffold):
         try:
             return await self._binding.time(chat_id)
         except ConnectionNotFound:
-            raise NotInGroupCallError()
+            raise NotInCallError()

pytgcalls/methods/stream/resume_stream.py

@@ -2,7 +2,7 @@ from typing import Union
 
 from ntgcalls import ConnectionNotFound
 
-from ...exceptions import NotInGroupCallError
+from ...exceptions import NotInCallError
 from ...mtproto_required import mtproto_required
 from ...scaffold import Scaffold
 from ...statictypes import statictypes
@@ -19,4 +19,4 @@ class ResumeStream(Scaffold):
         try:
             return await self._binding.resume(chat_id)
         except ConnectionNotFound:
-            raise NotInGroupCallError()
+            raise NotInCallError()

pytgcalls/methods/stream/unmute_stream.py

@@ -2,7 +2,7 @@ from typing import Union
 
 from ntgcalls import ConnectionNotFound
 
-from ...exceptions import NotInGroupCallError
+from ...exceptions import NotInCallError
 from ...mtproto_required import mtproto_required
 from ...scaffold import Scaffold
 from ...statictypes import statictypes
@@ -19,4 +19,4 @@ class UnMuteStream(Scaffold):
         try:
             return await self._binding.unmute(chat_id)
         except ConnectionNotFound:
-            raise NotInGroupCallError()
+            raise NotInCallError()

pytgcalls/methods/utilities/call_holder.py

@@ -9,9 +9,9 @@ class CallHolder(Scaffold):
     def __init__(self):
         super().__init__()
         self._conversions = {
-            StreamStatus.Playing: Call.Status.PLAYING,
-            StreamStatus.Paused: Call.Status.PAUSED,
-            StreamStatus.Idling: Call.Status.IDLE,
+            StreamStatus.PLAYING: Call.Status.PLAYING,
+            StreamStatus.PAUSED: Call.Status.PAUSED,
+            StreamStatus.IDLING: Call.Status.IDLE,
         }
 
     @property

pytgcalls/methods/utilities/start.py

@@ -2,9 +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
@@ -26,13 +30,29 @@ class Start(Scaffold):
         @self._app.on_update()
         async def update_handler(update: Update):
             chat_id = update.chat_id
-            if isinstance(update, RawCallUpdate):
-                if update.chat_id in self._p2p_configs:
-                    if update.status & RawCallUpdate.Type.UPDATED_CALL:
-                        if not self._p2p_configs[chat_id].wait_data.done():
+            if update.chat_id in self._p2p_configs:
+                if not self._p2p_configs[chat_id].wait_data.done():
+                    if isinstance(update, RawCallUpdate):
+                        if update.status & RawCallUpdate.Type.UPDATED_CALL:
                             self._p2p_configs[chat_id].wait_data.set_result(
                                 update,
                             )
+                    if isinstance(update, ChatUpdate):
+                        if update.status & ChatUpdate.Status.DISCARDED_CALL:
+                            self._p2p_configs[chat_id].wait_data.set_exception(
+                                CallDeclined(
+                                    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(
@@ -86,7 +106,6 @@ class Start(Scaffold):
                 )
 
         async def clear_call(chat_id):
-            self._p2p_configs.pop(chat_id, None)
             try:
                 await self._binding.stop(chat_id)
             except ConnectionNotFound:
@@ -109,7 +128,7 @@ class Start(Scaffold):
             await self.propagate(
                 StreamAudioEnded(
                     chat_id,
-                ) if stream == stream.Audio else
+                ) if stream == StreamType.AUDIO else
                 StreamVideoEnded(
                     chat_id,
                 ),
@@ -123,7 +142,26 @@ class Start(Scaffold):
                     data,
                 )
 
+        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)
             self._cache_user_peer.pop(chat_id)
             self._need_unmute.discard(chat_id)
 
@@ -159,9 +197,9 @@ class Start(Scaffold):
                     self.loop,
                 ),
             )
-            self._binding.on_disconnect(
-                lambda chat_id: asyncio.run_coroutine_threadsafe(
-                    clear_cache(chat_id),
+            self._binding.on_connection_change(
+                lambda chat_id, state: asyncio.run_coroutine_threadsafe(
+                    connection_changed(chat_id, state),
                     self.loop,
                 ),
             )

pytgcalls/mtproto/bridged_client.py

@@ -34,7 +34,6 @@ class BridgedClient(HandlersHolder):
         user_id: int,
         g_a_hash: bytes,
         protocol: Protocol,
-        video: bool,
     ):
         pass
 
@@ -151,15 +150,10 @@ class BridgedClient(HandlersHolder):
         class_name = input_peer.__class__.__name__
         if class_name in ['PeerUser', 'InputPeerUser']:
             return input_peer.user_id
-        elif (
-            hasattr(input_peer, 'channel_id') or
-            class_name in ['Channel', 'ChannelForbidden']
-        ):
-            return -1000000000000 - getattr(
-                input_peer,
-                'channel_id',
-                input_peer.id,
-            )
+        elif class_name in ['Channel', 'ChannelForbidden']:
+            return -1000000000000 - input_peer.id
+        elif hasattr(input_peer, 'channel_id'):
+            return -1000000000000 - input_peer.channel_id
         elif class_name == 'Chat':
             return -input_peer.id
         else:
@@ -168,7 +162,7 @@ class BridgedClient(HandlersHolder):
     @staticmethod
     def user_from_call(call) -> Optional[int]:
         class_name = call.__class__.__name__
-        if class_name == 'PhoneCallAccepted':
+        if class_name in ['PhoneCallAccepted', 'PhoneCallWaiting']:
             return call.participant_id
         elif class_name in ['PhoneCallRequested', 'PhoneCall']:
             return call.admin_id

pytgcalls/mtproto/hydrogram_client.py

@@ -43,6 +43,7 @@ from hydrogram.raw.types import PhoneCallDiscarded
 from hydrogram.raw.types import PhoneCallDiscardReasonHangup
 from hydrogram.raw.types import PhoneCallProtocol
 from hydrogram.raw.types import PhoneCallRequested
+from hydrogram.raw.types import PhoneCallWaiting
 from hydrogram.raw.types import UpdateChannel
 from hydrogram.raw.types import UpdateGroupCall
 from hydrogram.raw.types import UpdateGroupCallConnection
@@ -97,7 +98,7 @@ class HydrogramClient(BridgedClient):
             ):
                 if isinstance(
                     update.phone_call,
-                    (PhoneCallAccepted, PhoneCallRequested),
+                    (PhoneCallAccepted, PhoneCallRequested, PhoneCallWaiting),
                 ):
                     self._cache.set_phone_call(
                         self.user_from_call(update.phone_call),
@@ -406,7 +407,6 @@ class HydrogramClient(BridgedClient):
         user_id: int,
         g_a_hash: bytes,
         protocol: Protocol,
-        video: bool,
     ):
         await self._app.invoke(
             RequestCall(
@@ -414,7 +414,7 @@ class HydrogramClient(BridgedClient):
                 random_id=self.rnd_id(),
                 g_a_hash=g_a_hash,
                 protocol=self.parse_protocol(protocol),
-                video=video,
+                video=False,
             ),
         )
 
@@ -512,9 +512,12 @@ class HydrogramClient(BridgedClient):
         self,
         chat_id: int,
     ):
+        peer = self._cache.get_phone_call(chat_id)
+        if peer is None:
+            return
         await self._app.invoke(
             DiscardCall(
-                peer=self._cache.get_phone_call(chat_id),
+                peer=peer,
                 duration=0,
                 reason=PhoneCallDiscardReasonHangup(),
                 connection_id=0,

pytgcalls/mtproto/mtproto_client.py

@@ -74,14 +74,12 @@ class MtProtoClient:
         user_id: int,
         g_a_hash: bytes,
         protocol: Protocol,
-        video: bool,
     ):
         if self._bind_client is not None:
             return await self._bind_client.request_call(
                 user_id,
                 g_a_hash,
                 protocol,
-                video,
             )
         else:
             raise InvalidMTProtoClient()

pytgcalls/mtproto/pyrogram_client.py

@@ -45,6 +45,7 @@ from pyrogram.raw.types import PhoneCallDiscarded
 from pyrogram.raw.types import PhoneCallDiscardReasonHangup
 from pyrogram.raw.types import PhoneCallProtocol
 from pyrogram.raw.types import PhoneCallRequested
+from pyrogram.raw.types import PhoneCallWaiting
 from pyrogram.raw.types import UpdateChannel
 from pyrogram.raw.types import UpdateGroupCall
 from pyrogram.raw.types import UpdateGroupCallConnection
@@ -105,7 +106,7 @@ class PyrogramClient(BridgedClient):
             ):
                 if isinstance(
                     update.phone_call,
-                    (PhoneCallAccepted, PhoneCallRequested),
+                    (PhoneCallAccepted, PhoneCallRequested, PhoneCallWaiting),
                 ):
                     self._cache.set_phone_call(
                         self.user_from_call(update.phone_call),
@@ -301,8 +302,8 @@ class PyrogramClient(BridgedClient):
             raise ContinuePropagation()
 
     async def get_call(
-            self,
-            chat_id: int,
+        self,
+        chat_id: int,
     ) -> Optional[InputGroupCall]:
         chat = await self._app.resolve_peer(chat_id)
         if isinstance(chat, InputPeerChannel):
@@ -347,16 +348,16 @@ class PyrogramClient(BridgedClient):
         )
 
     async def get_group_call_participants(
-            self,
-            chat_id: int,
+        self,
+        chat_id: int,
     ):
         return await self._cache.get_participant_list(
             chat_id,
         )
 
     async def get_participants(
-            self,
-            input_call: InputGroupCall,
+        self,
+        input_call: InputGroupCall,
     ) -> List[GroupCallParticipant]:
         return [
             self.parse_participant(participant)
@@ -374,12 +375,12 @@ class PyrogramClient(BridgedClient):
         ]
 
     async def join_group_call(
-            self,
-            chat_id: int,
-            json_join: str,
-            invite_hash: str,
-            have_video: bool,
-            join_as: InputPeer,
+        self,
+        chat_id: int,
+        json_join: str,
+        invite_hash: str,
+        have_video: bool,
+        join_as: InputPeer,
     ) -> str:
         chat_call = await self._cache.get_full_chat(chat_id)
         if chat_call is not None:
@@ -414,7 +415,6 @@ class PyrogramClient(BridgedClient):
         user_id: int,
         g_a_hash: bytes,
         protocol: Protocol,
-        video: bool,
     ):
         await self._app.invoke(
             RequestCall(
@@ -422,7 +422,7 @@ class PyrogramClient(BridgedClient):
                 random_id=self.rnd_id(),
                 g_a_hash=g_a_hash,
                 protocol=self.parse_protocol(protocol),
-                video=video,
+                video=False,
             ),
         )
 
@@ -520,9 +520,12 @@ class PyrogramClient(BridgedClient):
         self,
         chat_id: int,
     ):
+        peer = self._cache.get_phone_call(chat_id)
+        if peer is None:
+            return
         await self._app.invoke(
             DiscardCall(
-                peer=self._cache.get_phone_call(chat_id),
+                peer=peer,
                 duration=0,
                 reason=PhoneCallDiscardReasonHangup(),
                 connection_id=0,
@@ -532,10 +535,10 @@ class PyrogramClient(BridgedClient):
         self._cache.drop_phone_call(chat_id)
 
     async def change_volume(
-            self,
-            chat_id: int,
-            volume: int,
-            participant: InputPeer,
+        self,
+        chat_id: int,
+        volume: int,
+        participant: InputPeer,
     ):
         chat_call = await self._cache.get_full_chat(chat_id)
         if chat_call is not None:
@@ -549,12 +552,12 @@ class PyrogramClient(BridgedClient):
             )
 
     async def set_call_status(
-            self,
-            chat_id: int,
-            muted_status: Optional[bool],
-            paused_status: Optional[bool],
-            stopped_status: Optional[bool],
-            participant: InputPeer,
+        self,
+        chat_id: int,
+        muted_status: Optional[bool],
+        paused_status: Optional[bool],
+        stopped_status: Optional[bool],
+        participant: InputPeer,
     ):
         chat_call = await self._cache.get_full_chat(chat_id)
         if chat_call is not None:

pytgcalls/mtproto/telethon_client.py

@@ -39,6 +39,7 @@ from telethon.tl.types import PhoneCallDiscarded
 from telethon.tl.types import PhoneCallDiscardReasonHangup
 from telethon.tl.types import PhoneCallProtocol
 from telethon.tl.types import PhoneCallRequested
+from telethon.tl.types import PhoneCallWaiting
 from telethon.tl.types import TypeInputChannel
 from telethon.tl.types import TypeInputPeer
 from telethon.tl.types import TypeInputUser
@@ -95,7 +96,7 @@ class TelethonClient(BridgedClient):
             ):
                 if isinstance(
                     update.phone_call,
-                    (PhoneCallAccepted, PhoneCallRequested),
+                    (PhoneCallAccepted, PhoneCallRequested, PhoneCallWaiting),
                 ):
                     self._cache.set_phone_call(
                         self.user_from_call(update.phone_call),
@@ -383,7 +384,6 @@ class TelethonClient(BridgedClient):
         user_id: int,
         g_a_hash: bytes,
         protocol: Protocol,
-        video: bool,
     ):
         return await self._app(
             RequestCallRequest(
@@ -391,7 +391,7 @@ class TelethonClient(BridgedClient):
                 random_id=self.rnd_id(),
                 g_a_hash=g_a_hash,
                 protocol=self.parse_protocol(protocol),
-                video=video,
+                video=False,
             ),
         )
 
@@ -489,9 +489,12 @@ class TelethonClient(BridgedClient):
         self,
         chat_id: int,
     ):
+        peer = self._cache.get_phone_call(chat_id)
+        if peer is None:
+            return
         await self._app(
             DiscardCallRequest(
-                peer=self._cache.get_phone_call(chat_id),
+                peer=peer,
                 duration=0,
                 reason=PhoneCallDiscardReasonHangup(),
                 connection_id=0,

pytgcalls/pytgcalls.py

@@ -2,7 +2,6 @@ import asyncio
 import os
 from concurrent.futures import ThreadPoolExecutor
 from typing import Any
-from typing import Optional
 
 from ntgcalls import NTgCalls
 
@@ -24,8 +23,6 @@ class PyTgCalls(Methods, Scaffold):
         app: Any,
         workers: int = WORKERS,
         cache_duration: int = CACHE_DURATION,
-        ntg_logs_path: Optional[str] = None,
-        allow_rtc_logs: bool = False,
     ):
         super().__init__()
         self._mtproto = app
@@ -41,7 +38,7 @@ class PyTgCalls(Methods, Scaffold):
             self._app.package_name,
         )
         self._cache_user_peer = Cache()
-        self._binding = NTgCalls(ntg_logs_path, allow_rtc_logs)
+        self._binding = NTgCalls()
         self.loop = asyncio.get_event_loop()
         self.workers = workers
         self.executor = ThreadPoolExecutor(

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

pytgcalls/types/stream/media_stream.py

@@ -240,7 +240,7 @@ class MediaStream(Stream):
 
     @staticmethod
     def _flags(flags: Flags) -> InputMode:
-        new_flags = InputMode.Shell
+        new_flags = InputMode.SHELL
         if flags & MediaStream.Flags.NO_LATENCY:
-            new_flags |= InputMode.NoLatency
+            new_flags |= InputMode.NO_LATENCY
         return new_flags