py-tgcalls 2.1.2b3__py3-none-any.whl → 2.2.0rc1__py3-none-any.whl

{py_tgcalls-2.1.2b3.dist-info → py_tgcalls-2.2.0rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: py-tgcalls
-Version: 2.1.2b3
+Version: 2.2.0rc1
 Summary: Async client API for the Telegram Calls.
 Author-email: Laky-64 <iraci.matteo@gmail.com>
 Project-URL: Homepage, https://pytgcalls.github.io/
@@ -20,7 +20,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp>=3.9.3
-Requires-Dist: ntgcalls<1.4.0,>=1.3.5b5
+Requires-Dist: ntgcalls<3.0.0,>=2.0.0rc1
 Requires-Dist: deprecation
 Provides-Extra: pyrogram
 Requires-Dist: pyrogram>=1.2.20; extra == "pyrogram"

{py_tgcalls-2.1.2b3.dist-info → py_tgcalls-2.2.0rc1.dist-info}/RECORD

@@ -1,12 +1,13 @@
-py_tgcalls-2.1.2b3.dist-info/licenses/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+py_tgcalls-2.2.0rc1.dist-info/licenses/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
 pytgcalls/__init__.py,sha256=qbfwN7rYwIdCegMOzdcbvwazeNjDzgmowgcqLFNqKIM,308
-pytgcalls/__version__.py,sha256=jIltsC16890jgPh8YRlK5nMNGzaAe5P19p3v0qdpUyM,24
+pytgcalls/__version__.py,sha256=jo4muqb6qG7eUqrTQ9ReKjcC5myNMlrB6VPZVMqXPWE,25
 pytgcalls/environment.py,sha256=ctCHACvG6l8SdpPewSBhOvc70kbwpv18maC0TwLvZ08,1924
-pytgcalls/exceptions.py,sha256=yezms8JiO7aGEkUrvTkR9QHhXtVOIXmm1Q4nQbx9tm0,3958
-pytgcalls/ffmpeg.py,sha256=tm6DBxyNfPh3h3an-b2s9x1UyX-cvkCdov9prlXxVZY,8649
+pytgcalls/exceptions.py,sha256=Rijc-8T93WEWJxNW9jncU8_M6mYZZZcs8F2bqitEIeI,3787
+pytgcalls/ffmpeg.py,sha256=CZvSyuztc-TGKbKI9_2G7CLITe1ITf315YPyprWu_Pg,8645
 pytgcalls/filters.py,sha256=qTFDlt-23xnMh_Ug2WmmOUf13JPX6_yacrv7c3F9Pp0,6125
+pytgcalls/list_to_cmd.py,sha256=rGJLsejbAQdDb8pctMbLnwea5NkitlfVKc3IpoGi4V4,240
 pytgcalls/mtproto_required.py,sha256=6B-31p5qH_6oekUgypV4nK3hqPS6Nr-pA8S81wjnbaY,630
-pytgcalls/mutex.py,sha256=6hOwGnUTNUJliJ1GGhk47D0A3KEn8eVd-kjZq_1DdZY,670
+pytgcalls/mutex.py,sha256=vWqji9IAHtAc61FUTVXncx5rZ3rVf5qG_7PI4LmuYmU,733
 pytgcalls/pytgcalls.py,sha256=DxCE0--mb53vyDXLLBAwy1cPrJgLsyC9rba_h2OzR2o,1608
 pytgcalls/pytgcalls_session.py,sha256=_BGJWvf7t3mki2DhlEPjh9cypvYuSFkMSxzTsfepwUk,2719
 pytgcalls/scaffold.py,sha256=Gahln5l70FJZwo1KGqv1A7K9Vn_ozAATpADGFJuPhKA,3162
@@ -14,7 +15,7 @@ pytgcalls/statictypes.py,sha256=CdlqgQNhTZ_uTE8-B8m01fJ7TlD2B42EI2QBPxDdAtA,3842
 pytgcalls/sync.py,sha256=IsOH3TD7cxUg_-zdGt12HoS8sBlXvcGayPZAoxxKM48,3396
 pytgcalls/version_manager.py,sha256=egeGgvb66zWlLTMuw2U-b0x8MfnRzMm1xAEVN87HF5c,296
 pytgcalls/wait_counter_lock.py,sha256=J-KCWUBCt7ktKQKyIseNG0RfXDVRh-h0wKhaZlf4aFs,437
-pytgcalls/ytdlp.py,sha256=jRA-mKQEXleWvaoGv9wtMa77aRjxsyQxn6_0tXI3-sA,2435
+pytgcalls/ytdlp.py,sha256=MEPkVlFdbexbgqVRMt7C1YadPIER2R-4oN03osl5vq8,2473
 pytgcalls/custom_api/__init__.py,sha256=ZT8d0lc2YrDuw_YSFAXXHHMewoXGFZ-ANOBIAr0vGFQ,60
 pytgcalls/custom_api/custom_api.py,sha256=Ko3aS6psrwPmOhRPxvG0fepXt4STrA0StvINSxz4Cj8,1890
 pytgcalls/handlers/__init__.py,sha256=pubbxI4pLqQpAKf8-toD6ija4cpSvbCJOQFjTiDjX1E,75
@@ -35,7 +36,7 @@ pytgcalls/methods/decorators/on_update.py,sha256=ZTL4YcQk0N4Ru56a5WItUvkSN5SAqr6
 pytgcalls/methods/internal/__init__.py,sha256=fcgIxUJKT6QJD30ltnOfzKsLhzTTTklD2qxKlwCvyv0,1057
 pytgcalls/methods/internal/clear_cache.py,sha256=qgG-oubmdtnefnXSiHSPHyBTyXypiLDC7G8l3FzjNw8,236
 pytgcalls/methods/internal/clear_call.py,sha256=yElvn3i6_j14Q7n9kcLSl-muYAGcaIZaEFHdp6MrN0g,549
-pytgcalls/methods/internal/connect_call.py,sha256=s4R-74sLippqPy1hpQasUaxwiJnZ9GVx6lgcaPqex8M,5900
+pytgcalls/methods/internal/connect_call.py,sha256=Py-sB_ImH839tK9GxNUCJDJUNizsZtlm5m6kuiUX3lE,5739
 pytgcalls/methods/internal/emit_sig_data.py,sha256=ucIsknhJHB-0x7lcymXvwQ647AJQ852zH2W6MdlC3ws,216
 pytgcalls/methods/internal/handle_connection_changed.py,sha256=_1u3J6_Pjl1Gs1u_WkhG2FAUl_hxlHUiflaMkKkJDsc,866
 pytgcalls/methods/internal/handle_mtproto_updates.py,sha256=Ev2Jake6Z_SrBodnjO5N16YiYaEY3Ti4tkU1pKOsJVM,7747
@@ -110,12 +111,12 @@ pytgcalls/types/stream/device.py,sha256=EdoDg6lPE7fgoZI04Nr0E9zbIk-iRIBgYYAzVqoC
 pytgcalls/types/stream/direction.py,sha256=VepLMe-dXg4M5eVdVyIb2uxYvnpB9OJL5fEgPYUFtTI,592
 pytgcalls/types/stream/external_media.py,sha256=RiuSX5tZGdNsQZ8LIRk5Lp4Ksv9oTvaccmInJRZYo4M,114
 pytgcalls/types/stream/frame.py,sha256=TXo5HZVHbbaVNBqulMhTqGODXH3bpBVlN_of1rosNUQ,586
-pytgcalls/types/stream/media_stream.py,sha256=_NJFTAIUdYyTh-gjiqs6aCpAIfSVjE16mBYUapMnDfg,11917
-pytgcalls/types/stream/record_stream.py,sha256=RWeD9U-sqUmb_PuZQxYnExZyoibepU_8oI2yrH2Y18c,3135
+pytgcalls/types/stream/media_stream.py,sha256=zcRVpNXfL8mhg-SEfAi-f0lDUZMyNYLetophvcAN_gQ,11968
+pytgcalls/types/stream/record_stream.py,sha256=f4VQ6MY8HtOxt7vz0hWBFmbbAIvTRHpAIU2nmj0TF6Y,3197
 pytgcalls/types/stream/stream_ended.py,sha256=xR_kZwFf03hA6rw_nvI7Be7GwoCKzQf_1MKaGpPDXqY,716
 pytgcalls/types/stream/stream_frames.py,sha256=028ZhNV-mN3BGqMlmxusAV1xDQpXRYCeM0WXBZhRUhA,446
 pytgcalls/types/stream/video_quality.py,sha256=HBfWq005kh-D19MaVE9VzVdnODzrXf4IJUimCfslfiU,231
-py_tgcalls-2.1.2b3.dist-info/METADATA,sha256=wzJ9y03r_nlZyBHgX4lM7sPk03_7diECvlHeM_gpp6E,5284
-py_tgcalls-2.1.2b3.dist-info/WHEEL,sha256=GHB6lJx2juba1wDgXDNlMTyM13ckjBMKf-OnwgKOCtA,91
-py_tgcalls-2.1.2b3.dist-info/top_level.txt,sha256=IUDUwn0KkcbUYZbCe9R5AUb2Ob-lmllNUGQqyeXXd8A,10
-py_tgcalls-2.1.2b3.dist-info/RECORD,,
+py_tgcalls-2.2.0rc1.dist-info/METADATA,sha256=GjtrQPZp1x1J9YvVAqpqZ_vJVn8428ncuuyi4FVBW0c,5286
+py_tgcalls-2.2.0rc1.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+py_tgcalls-2.2.0rc1.dist-info/top_level.txt,sha256=IUDUwn0KkcbUYZbCe9R5AUb2Ob-lmllNUGQqyeXXd8A,10
+py_tgcalls-2.2.0rc1.dist-info/RECORD,,

{py_tgcalls-2.1.2b3.dist-info → py_tgcalls-2.2.0rc1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.0)
+Generator: setuptools (80.4.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

pytgcalls/__version__.py

@@ -1 +1 @@
-__version__ = '2.1.2b3'
+__version__ = '2.2.0rc1'

pytgcalls/exceptions.py

@@ -169,10 +169,3 @@ class UnsupportedMethod(Exception):
         super().__init__(
             'Unsupported method for this kind of call',
         )
-
-
-class RTMPStreamingUnsupported(Exception):
-    def __init__(self):
-        super().__init__(
-            'Streaming into an RTMP connection is not supported',
-        )

pytgcalls/ffmpeg.py

@@ -207,12 +207,12 @@ def build_command(
     if headers is not None:
         for i in headers:
             ffmpeg_command.append('-headers')
-            ffmpeg_command.append(f'"{i}: {headers[i]}"')
+            ffmpeg_command.append(f'{i}: {headers[i]}')
 
     ffmpeg_command += [
         '-nostdin',
         '-i',
-        f'"{path}"' if name == 'ffmpeg' else path,
+        f'{path}' if name == 'ffmpeg' else path,
     ]
     ffmpeg_command += command['mid']
 

pytgcalls/list_to_cmd.py

@@ -0,0 +1,11 @@
+import platform
+import shlex
+import subprocess
+from typing import List
+
+
+def list_to_cmd(args: List[str]) -> str:
+    if platform.system() == 'Windows':
+        return subprocess.list2cmdline(args)
+    else:
+        return shlex.join(args)

pytgcalls/methods/internal/connect_call.py

@@ -1,14 +1,13 @@
 import asyncio
-import json
 from typing import Optional
 from typing import Union
 
 from ntgcalls import ConnectionMode
 from ntgcalls import ConnectionNotFound
 from ntgcalls import MediaDescription
+from ntgcalls import StreamMode
 from ntgcalls import TelegramServerError
 
-from ...exceptions import RTMPStreamingUnsupported
 from ...exceptions import TimedOutAnswer
 from ...scaffold import Scaffold
 from ...types import CallConfig
@@ -33,8 +32,12 @@ class ConnectCall(Scaffold):
                     if not payload:
                         payload = await self._binding.create_call(
                             chat_id,
-                            media_description,
                         )
+                    await self._binding.set_stream_sources(
+                        chat_id,
+                        StreamMode.CAPTURE,
+                        media_description,
+                    )
                     result_params = await self._app.join_group_call(
                         chat_id,
                         payload,
@@ -43,15 +46,6 @@ class ConnectCall(Scaffold):
                         media_description.screen is None,
                         self._cache_user_peer.get(chat_id),
                     )
-                    is_rtmp = json.loads(result_params).get('rtmp')
-                    if (
-                        media_description.camera is not None or
-                        media_description.microphone is not None or
-                        media_description.screen is not None or
-                        media_description.speaker is not None
-                    ) and is_rtmp:
-                        raise RTMPStreamingUnsupported()
-
                     await self._binding.connect(
                         chat_id,
                         result_params,
@@ -74,6 +68,10 @@ class ConnectCall(Scaffold):
                     )
                     await self._binding.create_p2p_call(
                         chat_id,
+                    )
+                    await self._binding.set_stream_sources(
+                        chat_id,
+                        StreamMode.CAPTURE,
                         media_description,
                     )
                     data.g_a_or_b = await self._binding.init_exchange(

pytgcalls/mutex.py

@@ -7,7 +7,9 @@ def mutex(func):
     @wraps(func)
     async def async_wrapper(*args, **kwargs):
         self = args[0]
-        chat_id = await self.resolve_chat_id(args[1])
+        chat_id = await self.resolve_chat_id(
+            args[1] if len(args) > 1 else kwargs['chat_id'],
+        )
         async with self._lock:
             self._calls_lock[chat_id] = self._calls_lock.get(
                 chat_id,

pytgcalls/types/stream/media_stream.py

@@ -13,6 +13,7 @@ from ...exceptions import NoAudioSourceFound
 from ...exceptions import NoVideoSourceFound
 from ...ffmpeg import build_command
 from ...ffmpeg import check_stream
+from ...list_to_cmd import list_to_cmd
 from ...media_devices.input_device import InputDevice
 from ...media_devices.screen_device import ScreenDevice
 from ...statictypes import statictypes
@@ -145,7 +146,7 @@ class MediaStream(Stream):
             if self._is_audio_external else
             AudioStream(
                 MediaSource.SHELL,
-                ' '.join(
+                list_to_cmd(
                     build_command(
                         'ffmpeg',
                         self._ffmpeg_parameters,
@@ -178,7 +179,7 @@ class MediaStream(Stream):
             if self._is_video_external else
             VideoStream(
                 MediaSource.SHELL,
-                ' '.join(
+                list_to_cmd(
                     build_command(
                         'ffmpeg',
                         self._ffmpeg_parameters,
@@ -229,7 +230,7 @@ class MediaStream(Stream):
                         ]
                     except LiveStreamFound:
                         live_stream = True
-                    self.camera.path = ' '.join(
+                    self.camera.path = list_to_cmd(
                         build_command(
                             'ffmpeg',
                             self._ffmpeg_parameters,
@@ -278,7 +279,7 @@ class MediaStream(Stream):
                         )
                     except LiveStreamFound:
                         live_stream = True
-                    self.microphone.path = ' '.join(
+                    self.microphone.path = list_to_cmd(
                         build_command(
                             'ffmpeg',
                             self._ffmpeg_parameters,

pytgcalls/types/stream/record_stream.py

@@ -3,6 +3,7 @@ from typing import Union
 
 from ntgcalls import MediaSource
 
+from ...list_to_cmd import list_to_cmd
 from ...media_devices.speaker_device import SpeakerDevice
 from ...statictypes import statictypes
 from ..raw.audio_parameters import AudioParameters
@@ -72,7 +73,7 @@ class RecordStream(Stream):
             ]
             return AudioStream(
                 media_source=MediaSource.SHELL,
-                path=' '.join(commands),
+                path=list_to_cmd(commands),
                 parameters=raw_audio_parameters,
             )
         if isinstance(audio, SpeakerDevice):
@@ -81,6 +82,7 @@ class RecordStream(Stream):
                 path=audio.metadata,
                 parameters=raw_audio_parameters,
             )
+        return None
 
     @staticmethod
     def _get_video_stream(enable):

pytgcalls/ytdlp.py

@@ -7,6 +7,7 @@ from typing import Tuple
 
 from .exceptions import YtDlpError
 from .ffmpeg import cleanup_commands
+from .list_to_cmd import list_to_cmd
 from .types.raw import VideoParameters
 
 py_logger = logging.getLogger('pytgcalls')
@@ -37,7 +38,7 @@ class YtDlp:
             'yt-dlp',
             '-g',
             '-f',
-            'bestvideo[vcodec~=\'(vp09|avc1)\']+m4a/best',
+            'bestvideo[vcodec~="(vp09|avc1)"]+m4a/best',
             '-S',
             'res:'
             f'{min(video_parameters.width, video_parameters.height)}',
@@ -59,7 +60,7 @@ class YtDlp:
 
         py_logger.log(
             logging.DEBUG,
-            f'Running with "{" ".join(commands)}" command',
+            f'Running with "{list_to_cmd(commands)}" command',
         )
         try:
             proc = await asyncio.create_subprocess_exec(