MarshalX · MarshalX · Feb 10, 2022 · Feb 9, 2022 · Feb 10, 2022 · Feb 10, 2022
diff --git a/.github/codeql/codeql_config.yaml b/.github/codeql/codeql_config.yaml
diff --git a/.github/codeql/codeql_config.yml b/.github/codeql/codeql_config.yml
@@ -0,0 +1,3 @@
+name: "CodeQL config"
+paths:
+  - 'python-webrtc'
diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml
@@ -0,0 +1,22 @@
+name: Black
+
+on: [push, pull_request]
+
+jobs:
+  black:
+    name: Black
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository.
+        uses: actions/checkout@v2
+
+      - name: Setup Python.
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.9
+
+      - name: Check code style.
+        run: |
+          pip install black
+          black --check python-webrtc
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,29 @@
+name: Build
+
+on:
+  pull_request:
+    branches:
+      - main
+  schedule:
+    - cron: '0 8 * * 1'
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository.
+      uses: actions/checkout@v2
+      with:
+        submodules: recursive
+
+    - name: Setup Python.
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.9
+
+    - name: Build.
+      run: |
+        sudo apt install -y python3.9-dev
+        python setup.py build
diff --git a/.github/workflows/codeql_analysis.yml b/.github/workflows/codeql_analysis.yml
@@ -2,10 +2,7 @@ name: CodeQL
 
 on:
   push:
-    branches: [ main ]
   pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ main ]
   schedule:
     - cron: '0 8 * * 1'
 
@@ -19,31 +16,36 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'cpp', 'python' ]
+        language: [
+            # 'cpp',
+            'python'
+        ]
 
     steps:
-    - name: Checkout repository
+    - name: Checkout repository.
       uses: actions/checkout@v2
       with:
         submodules: recursive
 
-    - name: Setup Python
-      uses: actions/setup-python@v1
-      with:
-        python-version: 3.9
-
-    - name: Initialize CodeQL
+    - name: Initialize CodeQL.
       uses: github/codeql-action/init@v1
       with:
         languages: ${{ matrix.language }}
-        config-file: ./.github/codeql/codeql_config.yaml
+        setup-python-dependencies: false
+        config-file: ./.github/codeql/codeql_config.yml
+
+    - name: Setup Python.
+      if: matrix.language == 'cpp'
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.9
 
-    - if: matrix.language == 'cpp'
-      name: Build
+    - name: Build.
+      if: matrix.language == 'cpp'
       run: |
         sudo apt install -y python3.9-dev
-        export NO_LTO=true
         python setup.py build
 
-    - name: Perform CodeQL Analysis
+    # it takes too long for cpp
+    - name: Perform CodeQL Analysis.
       uses: github/codeql-action/analyze@v1
diff --git a/.github/workflows/create_sdist.yml b/.github/workflows/create_sdist.yml
@@ -3,7 +3,6 @@ name: Create and publish Source Distribution
 on:
   push:
     branches:
-      - main
       - pypi-dev
     paths:
       - '.github/workflows/create_sdist.yml'
@@ -23,7 +22,7 @@ jobs:
           submodules: recursive
 
       - name: Setup Python.
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v2
         with:
           python-version: 3.7
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,9 +5,9 @@ include(ExternalProject)
 
 project(python_webrtc
     LANGUAGES C CXX
-    DESCRIPTION "a Python Extension that provides bindings to WebRTC"
+    DESCRIPTION "a Python extension that provides bindings to WebRTC"
     HOMEPAGE_URL "https://github.com/MarshalX/python-webrtc"
-    VERSION "0.0.0.5"
+    VERSION "0.0.0.6"
 )
 
 include(ExternalProject)

diff --git a/SECURITY.md b/SECURITY.md
@@ -0,0 +1,9 @@
+# Security Policy
+
+## Supported Versions
+
+Only the latest published version on [PyPI](https://pypi.org/project/wrtc/#history) supported with security updates.
+
+## Reporting a Vulnerability
+
+Email for reports: ilya@marshal.dev
diff --git a/docs/links/wrtc/__init__.py b/docs/links/wrtc/__init__.py
@@ -3,12 +3,17 @@
 import typing
 
 __all__ = [
+    "CallbackPythonWebRTCException",
     "MediaStream",
     "MediaStreamSourceState",
     "MediaStreamTrack",
     "MediaStreamTrackState",
     "PeerConnectionFactory",
+    "PythonWebRTCException",
+    "PythonWebRTCExceptionBase",
     "RTCAudioSource",
+    "RTCCallbackException",
+    "RTCException",
     "RTCIceConnectionState",
     "RTCIceGatheringState",
     "RTCOnDataEvent",
@@ -18,6 +23,7 @@
     "RTCSdpType",
     "RTCSessionDescription",
     "RTCSessionDescriptionInit",
+    "SdpParseException",
     "answer",
     "checking",
     "closed",
@@ -42,6 +48,9 @@
 ]
 
 
+class CallbackPythonWebRTCException():
+    def what(self) -> str: ...
+    pass
 class MediaStream():
     def addTrack(self, arg0: MediaStreamTrack) -> None: ...
     def clone(self) -> MediaStream: ...
@@ -170,11 +179,20 @@ def getOrCreateDefault() -> PeerConnectionFactory: ...
     @staticmethod
     def release() -> None: ...
     pass
+class PythonWebRTCExceptionBase(Exception, BaseException):
+    pass
+class PythonWebRTCException(PythonWebRTCExceptionBase, Exception, BaseException):
+    pass
 class RTCAudioSource():
     def __init__(self) -> None: ...
     def createTrack(self) -> MediaStreamTrack: ...
     def onData(self, arg0: RTCOnDataEvent) -> None: ...
     pass
+class RTCCallbackException():
+    def what(self) -> str: ...
+    pass
+class RTCException(PythonWebRTCExceptionBase, Exception, BaseException):
+    pass
 class RTCIceConnectionState():
     """
     Members:
@@ -306,10 +324,10 @@ def __init__(self) -> None: ...
     @staticmethod
     def addTrack(*args, **kwargs) -> typing.Any: ...
     def close(self) -> None: ...
-    def createAnswer(self, arg0: typing.Callable[[RTCSessionDescription], None]) -> None: ...
-    def createOffer(self, arg0: typing.Callable[[RTCSessionDescription], None]) -> None: ...
-    def setLocalDescription(self, arg0: typing.Callable[[], None], arg1: RTCSessionDescription) -> None: ...
-    def setRemoteDescription(self, arg0: typing.Callable[[], None], arg1: RTCSessionDescription) -> None: ...
+    def createAnswer(self, arg0: typing.Callable[[RTCSessionDescription], None], arg1: typing.Callable[[CallbackPythonWebRTCException], None]) -> None: ...
+    def createOffer(self, arg0: typing.Callable[[RTCSessionDescription], None], arg1: typing.Callable[[CallbackPythonWebRTCException], None]) -> None: ...
+    def setLocalDescription(self, arg0: typing.Callable[[], None], arg1: typing.Callable[[CallbackPythonWebRTCException], None], arg2: RTCSessionDescription) -> None: ...
+    def setRemoteDescription(self, arg0: typing.Callable[[], None], arg1: typing.Callable[[CallbackPythonWebRTCException], None], arg2: RTCSessionDescription) -> None: ...
     pass
 class RTCPeerConnectionState():
     """
@@ -430,6 +448,8 @@ def type(self) -> RTCSdpType:
     def type(self, arg0: RTCSdpType) -> None:
         pass
     pass
+class SdpParseException(PythonWebRTCExceptionBase, Exception, BaseException):
+    pass
 def getUserMedia() -> MediaStream:
     pass
 def ping() -> None:

diff --git a/examples/telegram_group_calls.py b/examples/telegram_group_calls.py
@@ -20,7 +20,7 @@ def parse_sdp(sdp):
     def lookup(prefix):
         for line in lines:
             if line.startswith(prefix):
-                return line[len(prefix):]
+                return line[len(prefix) :]
 
     info = {
         'fingerprint': lookup('a=fingerprint:').split(' ')[1],
@@ -38,27 +38,23 @@ def lookup(prefix):
 
 def get_params_from_parsed_sdp(info):
     return {
-        'fingerprints': [
-            {
-                'fingerprint': info['fingerprint'],
-                'hash': info['hash'],
-                'setup': 'active'
-            }
-        ],
+        'fingerprints': [{'fingerprint': info['fingerprint'], 'hash': info['hash'], 'setup': 'active'}],
         'pwd': info['pwd'],
         'ssrc': info['source'],
         'ssrc-groups': [],
-        'ufrag': info['ufrag']
+        'ufrag': info['ufrag'],
     }
 
 
 def build_answer(sdp):
     def add_candidates():
         candidates_sdp = []
         for cand in sdp['transport']['candidates']:
-            candidates_sdp.append(f"a=candidate:{cand['foundation']} {cand['component']} {cand['protocol']} "
-                                  f"{cand['priority']} {cand['ip']} {cand['port']} typ {cand['type']} "
-                                  f"generation {cand['generation']}")
+            candidates_sdp.append(
+                f"a=candidate:{cand['foundation']} {cand['component']} {cand['protocol']} "
+                f"{cand['priority']} {cand['ip']} {cand['port']} typ {cand['type']} "
+                f"generation {cand['generation']}"
+            )
 
         return '\n'.join(candidates_sdp)
 
@@ -114,11 +110,11 @@ def get_ms_time():
 
         if last_read_ms == 0 or start_time - last_read_ms >= 10:
             data = f.read(length)
-            if not data:   # eof
+            if not data:  # eof
                 f.close()
                 break
 
-            event_data = webrtc.RTCOnDataEvent(data, length // 4)   # 2 channels
+            event_data = webrtc.RTCOnDataEvent(data, length // 4)  # 2 channels
             event_data.channel_count = 2
             audio_source.on_data(event_data)
 
@@ -140,9 +136,7 @@ async def main(client, input_peer, input_filename):
     await pc.set_local_description(local_sdp)
 
     app = PyrogramBridge(client)
-    app.register_group_call_native_callback(
-        group_call_participants_update_callback, group_call_update_callback
-    )
+    app.register_group_call_native_callback(group_call_participants_update_callback, group_call_update_callback)
     await app.get_and_set_group_call(input_peer)
     await app.resolve_and_set_join_as(None)
 
@@ -159,9 +153,7 @@ def pre_update_processing():
     # aw
1241
ait asyncio.wait_for(REMOTE_ANSWER_EVENT.wait(), 30)
 
     await pc.set_remote_description(
-        webrtc.RTCSessionDescription(
-            webrtc.RTCSessionDescriptionInit(webrtc.RTCSdpType.answer, remote_sdp)
-        )
+        webrtc.RTCSessionDescription(webrtc.RTCSessionDescriptionInit(webrtc.RTCSdpType.answer, remote_sdp))
     )
 
     thread = threading.Thread(target=send_audio_data, args=(audio_source, input_filename))

diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,21 @@
+[tool.black]
+line-length = 120
+skip-string-normalization=true
+target-version = ['py37']
+include = '\.pyi?$'
+exclude = '''
+(
+  /(
+      \.eggs
+    | \.git
+    | \.hg
+    | \.mypy_cache
+    | \.tox
+    | \.venv
+    | _build
+    | buck-out
+    | build
+    | dist
+  )/
+)
+'''
diff --git a/python-webrtc/cpp/CMakeLists.txt b/python-webrtc/cpp/CMakeLists.txt
@@ -2,7 +2,7 @@ configure_file("${src_loc}/config.h.in" "${src_loc}/config.h")
 
 file(GLOB_RECURSE MODULE_SRC ${src_loc}/*.cpp ${src_loc}/*.h)
 
-if ("$ENV{NO_LTO}" STREQUAL "true")
+if(UNIX AND NOT APPLE)
   set(CMAKE_INTERPROCEDURAL_OPTIMIZATION OFF)
 endif()