py-tgcalls 2.0.0rc6__py3-none-any.whl → 2.0.2__py3-none-any.whl

pytgcalls/methods/utilities/start.py

@@ -1,9 +1,9 @@
 import asyncio
 import logging
 
+from ntgcalls import ConnectionError
 from ntgcalls import ConnectionNotFound
 from ntgcalls import ConnectionState
-from ntgcalls import ConnectionError
 from ntgcalls import MediaState
 from ntgcalls import StreamType
 from ntgcalls import TelegramServerError
@@ -16,6 +16,7 @@ from ...pytgcalls_session import PyTgCallsSession
 from ...scaffold import Scaffold
 from ...types import CallData
 from ...types import ChatUpdate
+from ...types import GroupCallParticipant
 from ...types import RawCallUpdate
 from ...types import StreamAudioEnded
 from ...types import StreamVideoEnded
@@ -32,15 +33,17 @@ class Start(Scaffold):
         async def update_handler(update: Update):
             chat_id = update.chat_id
             if update.chat_id in self._p2p_configs:
-                if not self._p2p_configs[chat_id].wait_data.done():
+                p2p_config = self._p2p_configs[chat_id]
+                if not p2p_config.wait_data.done():
                     if isinstance(update, RawCallUpdate):
                         if update.status & RawCallUpdate.Type.UPDATED_CALL:
-                            self._p2p_configs[chat_id].wait_data.set_result(
+                            p2p_config.wait_data.set_result(
                                 update,
                             )
-                    if isinstance(update, ChatUpdate):
+                    if isinstance(update, ChatUpdate) and \
+                            p2p_config.outgoing:
                         if update.status & ChatUpdate.Status.DISCARDED_CALL:
-                            self._p2p_configs[chat_id].wait_data.set_exception(
+                            p2p_config.wait_data.set_exception(
                                 CallDeclined(
                                     chat_id,
                                 ),
@@ -67,27 +70,39 @@ class Start(Scaffold):
                     )
             if isinstance(update, RawCallUpdate):
                 if update.status & RawCallUpdate.Type.SIGNALING_DATA:
-                    await self._binding.send_signaling(
-                        update.chat_id,
-                        update.signaling_data,
-                    )
+                    try:
+                        await self._binding.send_signaling(
+                            update.chat_id,
+                            update.signaling_data,
+                        )
+                    except (ConnectionNotFound, ConnectionError):
+                        pass
             if isinstance(update, ChatUpdate):
                 if update.status & ChatUpdate.Status.LEFT_CALL:
                     await clear_call(chat_id)
             if isinstance(update, UpdatedGroupCallParticipant):
                 participant = update.participant
+                action = participant.action
                 chat_peer = self._cache_user_peer.get(chat_id)
                 if chat_peer:
                     is_self = BridgedClient.chat_id(
                         chat_peer,
                     ) == participant.user_id if chat_peer else False
                     if is_self:
-                        if participant.left:
-                            await clear_call(chat_id)
-                        if chat_id in self._need_unmute and \
-                                not participant.joined and \
-                                not participant.left and \
-                                not participant.muted_by_admin:
+                        if action == GroupCallParticipant.Action.LEFT:
+                            if await clear_call(chat_id):
+                                await self.propagate(
+                                    ChatUpdate(
+                                        chat_id,
+                                        ChatUpdate.Status.KICKED,
+                                    ),
+                                    self,
+                                )
+                        if (
+                            chat_id in self._need_unmute and
+                            action == GroupCallParticipant.Action.UPDATED and
+                            not participant.muted_by_admin
+                        ):
                             try:
                                 await update_status(
                                     chat_id,
@@ -96,7 +111,10 @@ class Start(Scaffold):
                             except ConnectionNotFound:
                                 pass
 
-                        if participant.muted_by_admin and not participant.left:
+                        if (
+                            participant.muted_by_admin and
+                            action != GroupCallParticipant.Action.LEFT
+                        ):
                             self._need_unmute.add(chat_id)
                         else:
                             self._need_unmute.discard(chat_id)
@@ -106,12 +124,15 @@ class Start(Scaffold):
                     self,
                 )
 
-        async def clear_call(chat_id):
+        async def clear_call(chat_id) -> bool:
+            res = False
             try:
                 await self._binding.stop(chat_id)
+                res = True
             except ConnectionNotFound:
                 pass
             await clear_cache(chat_id)
+            return res
 
         async def update_status(chat_id: int, state: MediaState):
             try:
@@ -155,12 +176,12 @@ class Start(Scaffold):
                     self._wait_connect[chat_id].set_exception(
                         TelegramServerError(),
                     )
-                    await clear_call(chat_id)
+                    await clear_cache(chat_id)
 
             if state != ConnectionState.CONNECTED:
                 if chat_id > 0:
                     await self._app.discard_call(chat_id)
-                await clear_call(chat_id)
+                await clear_cache(chat_id)
 
         async def clear_cache(chat_id: int):
             self._p2p_configs.pop(chat_id, None)

pytgcalls/mtproto/client_cache.py

@@ -5,7 +5,7 @@ from typing import List
 from typing import Optional
 
 from ..types import Cache
-from ..types.groups import GroupCallParticipant
+from ..types.chats import GroupCallParticipant
 from ..types.participant_list import ParticipantList
 from .bridged_client import BridgedClient
 

pytgcalls/mtproto/hydrogram_client.py

@@ -84,13 +84,15 @@ class HydrogramClient(BridgedClient):
                 update,
                 UpdatePhoneCallSignalingData,
             ):
-                await self.propagate(
-                    RawCallUpdate(
-                        self._cache.get_user_id(update.phone_call_id),
-                        RawCallUpdate.Type.SIGNALING_DATA,
-                        signaling_data=update.data,
-                    ),
-                )
+                user_id = self._cache.get_user_id(update.phone_call_id)
+                if user_id is not None:
+                    await self.propagate(
+                        RawCallUpdate(
+                            user_id,
+                            RawCallUpdate.Type.SIGNALING_DATA,
+                            signaling_data=update.data,
+                        ),
+                    )
 
             if isinstance(
                 update,

pytgcalls/mtproto/mtproto_client.py

@@ -6,7 +6,7 @@ from typing import Optional
 from ntgcalls import Protocol
 
 from ..exceptions import InvalidMTProtoClient
-from ..types.groups import GroupCallParticipant
+from ..types.chats import GroupCallParticipant
 from .bridged_client import BridgedClient
 
 

pytgcalls/mtproto/pyrogram_client.py

@@ -92,13 +92,15 @@ class PyrogramClient(BridgedClient):
                 update,
                 UpdatePhoneCallSignalingData,
             ):
-                await self.propagate(
-                    RawCallUpdate(
-                        self._cache.get_user_id(update.phone_call_id),
-                        RawCallUpdate.Type.SIGNALING_DATA,
-                        signaling_data=update.data,
-                    ),
-                )
+                user_id = self._cache.get_user_id(update.phone_call_id)
+                if user_id is not None:
+                    await self.propagate(
+                        RawCallUpdate(
+                            user_id,
+                            RawCallUpdate.Type.SIGNALING_DATA,
+                            signaling_data=update.data,
+                        ),
+                    )
 
             if isinstance(
                 update,

pytgcalls/mtproto/telethon_client.py

@@ -82,13 +82,15 @@ class TelethonClient(BridgedClient):
                 update,
                 UpdatePhoneCallSignalingData,
             ):
-                await self.propagate(
-                    RawCallUpdate(
-                        self._cache.get_user_id(update.phone_call_id),
-                        RawCallUpdate.Type.SIGNALING_DATA,
-                        signaling_data=update.data,
-                    ),
-                )
+                user_id = self._cache.get_user_id(update.phone_call_id)
+                if user_id is not None:
+                    await self.propagate(
+                        RawCallUpdate(
+                            user_id,
+                            RawCallUpdate.Type.SIGNALING_DATA,
+                            signaling_data=update.data,
+                        ),
+                    )
 
             if isinstance(
                 update,

pytgcalls/mutex.py

@@ -1,37 +1,10 @@
-import asyncio
-import logging
 from functools import wraps
-from inspect import signature
-from typing import Optional
 
 
 def mutex(func):
-    sig = signature(func)
-
     @wraps(func)
     async def async_wrapper(*args, **kwargs):
         self = args[0]
-        bound = sig.bind(*args, **kwargs)
-
-        if 'chat_id' in bound.arguments:
-            chat_id: Optional[int] = None
-            try:
-                chat_id = await self.resolve_chat_id(
-                    bound.arguments['chat_id'],
-                )
-            except Exception as e:
-                logging.debug(
-                    'Error occurred while resolving chat_id. Reason: ' +
-                    str(e),
-                )
-            if chat_id is not None:
-                if chat_id not in self._lock:
-                    self._lock[chat_id] = asyncio.Lock()
-                async with self._lock[chat_id]:
-                    try:
-                        return await func(*args, **kwargs)
-                    finally:
-                        self._lock.pop(chat_id, None)
-
-        return await func(*args, **kwargs)
+        async with self._lock:
+            return await func(*args, **kwargs)
     return async_wrapper

pytgcalls/pytgcalls.py

@@ -41,6 +41,7 @@ class PyTgCalls(Methods, Scaffold):
         self._binding = NTgCalls()
         self.loop = asyncio.get_event_loop()
         self.workers = workers
+        self._lock = asyncio.Lock()
         self.executor = ThreadPoolExecutor(
             self.workers,
             thread_name_prefix='Handler',

pytgcalls/scaffold.py

@@ -21,7 +21,6 @@ class Scaffold(HandlersHolder):
         self._binding = None
         self.loop = None
         self._need_unmute = set()
-        self._lock = dict()
         self._p2p_configs = dict()
         self._wait_connect = dict()
 

pytgcalls/types/__init__.py

@@ -6,11 +6,9 @@ from .calls import CallData
 from .calls import CallProtocol
 from .calls import GroupCallConfig
 from .calls import RawCallUpdate
-from .groups import ChatUpdate
-from .groups import GroupCallParticipant
-from .groups import JoinedGroupCallParticipant
-from .groups import LeftGroupCallParticipant
-from .groups import UpdatedGroupCallParticipant
+from .chats import ChatUpdate
+from .chats import GroupCallParticipant
+from .chats import UpdatedGroupCallParticipant
 from .stream import AudioQuality
 from .stream import MediaStream
 from .stream import StreamAudioEnded
@@ -30,8 +28,6 @@ __all__ = (
     'RawCallUpdate',
     'GroupCallConfig',
     'GroupCallParticipant',
-    'JoinedGroupCallParticipant',
-    'LeftGroupCallParticipant',
     'MediaStream',
     'StreamAudioEnded',
     'StreamVideoEnded',

pytgcalls/types/calls/call.py

@@ -1,7 +1,7 @@
 from enum import auto
-from enum import Flag
 
 from ...types.py_object import PyObject
+from ..flag import Flag
 
 
 class Call(PyObject):
@@ -10,24 +10,15 @@ class Call(PyObject):
         PAUSED = auto()
         IDLE = auto()
 
-        def __repr__(self):
-            cls_name = self.__class__.__name__
-            return f'{cls_name}.{self.name}'
-
     class Type(Flag):
         GROUP = auto()
         PRIVATE = auto()
 
-        def __repr__(self):
-            cls_name = self.__class__.__name__
-            return f'{cls_name}.{self.name}'
-
     def __init__(
         self,
         chat_id: int,
         status: Status,
     ):
-        self.chat_id: int = chat_id
         self.call_type = Call.Type.GROUP \
             if chat_id < 0 else Call.Type.PRIVATE
         self.status = status

pytgcalls/types/calls/call_data.py

@@ -3,6 +3,8 @@ from asyncio import Future
 from typing import Any
 from typing import Optional
 
+from ntgcalls import DhConfig
+
 
 class CallData:
     def __init__(
@@ -11,9 +13,9 @@ class CallData:
         loop: asyncio.AbstractEventLoop,
         g_a_hash: Optional[bytes] = None,
     ):
-        self.g: bytes = dhc_config.g
-        self.p: bytes = dhc_config.p
-        self.random: bytes = dhc_config.random
+        self.dh_config = DhConfig(
+            dhc_config.g, dhc_config.p, dhc_config.random,
+        )
         self.g_a_or_b: Optional[bytes] = g_a_hash
         self.outgoing: bool = g_a_hash is None
         self.wait_data: Future = loop.create_future()

pytgcalls/types/calls/raw_call_update.py

@@ -10,8 +10,8 @@ class RawCallUpdate(Update):
         ACCEPTED = auto()
         CONFIRMED = auto()
         REQUESTED = auto()
-        UPDATED_CALL = ACCEPTED | CONFIRMED
         SIGNALING_DATA = auto()
+        UPDATED_CALL = ACCEPTED | CONFIRMED
 
     def __init__(
         self,

pytgcalls/types/{groups → chats}/__init__.py

@@ -1,13 +1,9 @@
 from .chat_update import ChatUpdate
 from .group_call_participant import GroupCallParticipant
-from .joined_group_call_participant import JoinedGroupCallParticipant
-from .left_group_call_participant import LeftGroupCallParticipant
 from .updated_group_call_participant import UpdatedGroupCallParticipant
 
 __all__ = (
     'ChatUpdate',
     'GroupCallParticipant',
-    'JoinedGroupCallParticipant',
-    'LeftGroupCallParticipant',
     'UpdatedGroupCallParticipant',
 )

pytgcalls/types/{groups → chats}/chat_update.py

@@ -1,7 +1,7 @@
 from enum import auto
-from enum import Flag
 from typing import Any
 
+from ..flag import Flag
 from ..update import Update
 
 
@@ -15,10 +15,6 @@ class ChatUpdate(Update):
         INCOMING_CALL = auto()
         LEFT_CALL = KICKED | LEFT_GROUP | CLOSED_VOICE_CHAT | DISCARDED_CALL
 
-        def __repr__(self):
-            cls_name = self.__class__.__name__
-            return f'{cls_name}.{self.name}'
-
     def __init__(
         self,
         chat_id: int,

pytgcalls/types/{groups → chats}/group_call_participant.py

@@ -1,7 +1,15 @@
+from enum import auto
+
 from ...types.py_object import PyObject
+from ..flag import Flag
 
 
 class GroupCallParticipant(PyObject):
+    class Action(Flag):
+        JOINED = auto()
+        LEFT = auto()
+        UPDATED = auto()
+
     def __init__(
         self,
         user_id: int,
@@ -23,5 +31,9 @@ class GroupCallParticipant(PyObject):
         self.video_camera: bool = video_camera
         self.raised_hand: bool = raised_hand
         self.volume: int = volume
-        self.joined: bool = joined
-        self.left: bool = left
+        if joined:
+            self.action = self.Action.JOINED
+        elif left:
+            self.action = self.Action.LEFT
+        else:
+            self.action = self.Action.UPDATED

pytgcalls/types/{groups → chats}/updated_group_call_participant.py

@@ -1,4 +1,4 @@
-from ..groups import GroupCallParticipant
+from ..chats import GroupCallParticipant
 from ..update import Update
 
 

pytgcalls/types/dict.py

@@ -0,0 +1,5 @@
+from ..types.py_object import PyObject
+
+
+class Dict(dict, PyObject):
+    pass

pytgcalls/types/flag.py

@@ -0,0 +1,6 @@
+from enum import Flag as _Flag
+
+
+class Flag(_Flag):
+    def __repr__(self):
+        return f'{self.__class__.__name__}.{self.name}'

pytgcalls/types/participant_list.py

@@ -1,6 +1,6 @@
 from typing import Dict
 
-from ..types.groups import GroupCallParticipant
+from ..types.chats import GroupCallParticipant
 from ..types.list import List
 
 
@@ -17,7 +17,7 @@ class ParticipantList:
         self,
         participant: GroupCallParticipant,
     ):
-        if participant.left:
+        if participant.action == GroupCallParticipant.Action.LEFT:
             if participant.user_id in self._list_participants:
                 del self._list_participants[participant.user_id]
         else:

pytgcalls/types/stream/media_stream.py

@@ -1,5 +1,4 @@
 from enum import auto
-from enum import Flag
 from pathlib import Path
 from typing import Dict
 from typing import Optional
@@ -17,6 +16,7 @@ from ...media_devices import DeviceInfo
 from ...media_devices import ScreenInfo
 from ...statictypes import statictypes
 from ...ytdlp import YtDlp
+from ..flag import Flag
 from ..raw.audio_parameters import AudioParameters
 from ..raw.audio_stream import AudioStream
 from ..raw.stream import Stream
@@ -33,10 +33,6 @@ class MediaStream(Stream):
         IGNORE = auto()
         NO_LATENCY = auto()
 
-        def __repr__(self):
-            cls_name = self.__class__.__name__
-            return f'{cls_name}.{self.name}'
-
     @statictypes
     def __init__(
         self,

pytgcalls/ytdlp.py

@@ -58,7 +58,14 @@ class YtDlp:
                 stdout=asyncio.subprocess.PIPE,
                 stderr=asyncio.subprocess.PIPE,
             )
-            stdout, stderr = await proc.communicate()
+            try:
+                stdout, stderr = await asyncio.wait_for(
+                    proc.communicate(),
+                    20,
+                )
+            except asyncio.TimeoutError:
+                proc.terminate()
+                raise YtDlpError('yt-dlp process timeout')
             if stderr:
                 raise YtDlpError(stderr.decode())
             data = stdout.decode().strip().split('\n')

py_tgcalls-2.0.0rc6.dist-info/METADATA

@@ -1,128 +0,0 @@
-Metadata-Version: 2.1
-Name: py-tgcalls
-Version: 2.0.0rc6
-Summary: UNKNOWN
-Home-page: https://github.com/pytgcalls/pytgcalls
-Author: Laky-64
-Author-email: iraci.matteo@gmail.com
-License: LGPL-3.0
-Platform: UNKNOWN
-Classifier: License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Requires-Python: >=3.8
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: aiohttp (>=3.9.3)
-Requires-Dist: deprecation
-Requires-Dist: ntgcalls (>=1.2.0.b6)
-Requires-Dist: psutil
-Requires-Dist: screeninfo
-Requires-Dist: setuptools
-
-<img src="https://raw.githubusercontent.com/pytgcalls/pytgcalls/master/.github/images/banner.png" alt="pytgcalls logo" />
-<p align="center">
-    <b>A simple and elegant client that allows you to make group voice calls quickly and easily.</b>
-    <br>
-    <a href="https://github.com/pytgcalls/pytgcalls/tree/master/example">
-        Examples
-    </a>
-    •
-    <a href="https://pytgcalls.github.io/">
-        Documentation
-    </a>
-    •
-    <a href="https://pypi.org/project/py-tgcalls/">
-        PyPi
-    </a>
-    •
-    <a href="https://t.me/pytgcallsnews">
-        Channel
-    </a>
-    •
-    <a href="https://t.me/pytgcallschat">
-        Chat
-    </a>
-</p>
-
-# PyTgCalls [![PyPI](https://img.shields.io/pypi/v/py-tgcalls.svg?logo=python&logoColor=%23959DA5&label=pypi&labelColor=%23282f37)](https://pypi.org/project/py-tgcalls/) [![Downloads](https://pepy.tech/badge/py-tgcalls)](https://pepy.tech/project/py-tgcalls)
-This project allows making Telegram group call using MtProto and WebRTC, this is possible thanks to the power of [NTgCalls] library and [@evgeny-nadymov]
-
-#### Example Usage
-```python
-from pytgcalls import PyTgCalls
-from pytgcalls import idle
-from pytgcalls.types import MediaStream
-...
-chat_id = -1001185324811
-app = PyTgCalls(client)
-app.start()
-app.join_group_call(
-    chat_id,
-    MediaStream(
-        'http://docs.evostream.com/sample_content/assets/sintel1m720p.mp4',
-    )
-)
-idle()
-```
-
-## Features
-- Prebuilt wheels for macOS, Linux and Windows.
-- Supporting all type of MTProto libraries: Pyrogram, Telethon and Hydrogram.
-- Work with voice chats in channels and chats.
-- Join as channels or chats.
-- Mute/unmute, pause/resume, stop/play, volume control and more...
-
-## Requirements
-- Python 3.7 or higher.
-- An MTProto Client
-- A [Telegram API key](https://docs.pyrogram.org/intro/setup#api-keys).
-
-## How to install?
-Here's how to install the PyTgCalls lib, the commands are given below:
-
-``` bash
-# With Git
-pip install git+https://github.com/pytgcalls/pytgcalls -U
-
-# With PyPi (Recommended)
-pip install py-tgcalls -U
-```
-
-## Key Contributors
-* <b><a href="https://github.com/Laky-64">@Laky-64</a> (DevOps Engineer, Software Architect):</b>
-    * Played a crucial role in developing PyTgCalls being an ex developer of pyservercall and of tgcallsjs.
-    * Automation with GitHub Actions
-* <b><a href="https://github.com/kuogi">@kuogi</a> (Senior UI/UX designer, Documenter):</b>
-    * As a Senior UI/UX Designer, Kuogi has significantly improved the user interface of our documentation,
-      making it more visually appealing and user-friendly.
-    * Played a key role in writing and structuring our documentation, ensuring that it is clear,
-      informative, and accessible to all users.
-* <b><a href="https://github.com/vrumger">@vrumger</a> (Senior Node.js Developer, Software Architect):</b>
-    * Has made important fixes and enhancements to the WebRTC component of the library,
-      improving its stability and performance.
-    * Main developer of TgCallsJS
-* <b><a href="https://github.com/alemidev">@alemidev</a> (Senior Python Developer):</b>
-    * Has made important fixes and enhancements to the async part of the library
-
-## Junior Developers
-* <b><a href="https://github.com/TuriOG">@TuriOG</a> (Junior Python Developer):</b>
-    * Currently working on integrating NTgCalls into <a href="//github.com/pytgcalls/pytgcalls">PyTgCalls</a>, an important step
-      in expanding the functionality and usability of the library.
-
-## Special Thanks
-* <b><a href="https://github.com/evgeny-nadymov">@evgeny-nadymov</a>:</b>
-  A heartfelt thank you to Evgeny Nadymov for graciously allowing us to use their code from telegram-react.
-  His contribution has been pivotal to the success of this project.
-
-[NTgCalls]: https://github.com/pytgcalls/ntgcalls
-[@evgeny-nadymov]: https://github.com/evgeny-nadymov/
-
-

pytgcalls/types/groups/joined_group_call_participant.py

@@ -1,12 +0,0 @@
-from ..groups import GroupCallParticipant
-from ..update import Update
-
-
-class JoinedGroupCallParticipant(Update):
-    def __init__(
-        self,
-        chat_id: int,
-        participant: GroupCallParticipant,
-    ):
-        super().__init__(chat_id)
-        self.participant = participant