sora-sdk 2024.4.0.dev20__tar.gz → 2024.4.0.dev22__tar.gz

{sora_sdk-2024.4.0.dev20/src/sora_sdk.egg-info → sora_sdk-2024.4.0.dev22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sora_sdk
-Version: 2024.4.0.dev20
+Version: 2024.4.0.dev22
 Summary: WebRTC SFU Sora Python SDK
 Home-page: https://github.com/shiguredo/sora-python-sdk
 Author-email: "Shiguredo Inc." <contact+pypi@shiguredo.jp>
@@ -290,7 +290,8 @@ PyPI 経由ではインストールできません。
 - Windows 11 x86_64
 - Windows Server 2022 x86_64
 - macOS Sequoia 15 arm64
-- macOS Sonoma 14 arm64
+- macOS Ventura 14 arm64
+- macOS Sonoma 13 arm64
 - Ubuntu 24.04 LTS x86_64
 - Ubuntu 24.04 LTS arm64
 - Ubuntu 22.04 LTS x86_64
@@ -311,7 +312,6 @@ PyPI 経由ではインストールできません。
 ### 優先実装が可能な機能一覧
 
 - Windows 11 arm64
-- macOS Ventura 13 arm64
 - Ubuntu 24.04 arm64
 - Ubuntu 22.04 arm64
 - Ubuntu 20.04 arm64 (NVIDIA Jetson JetPack SDK 5)

{sora_sdk-2024.4.0.dev20 → sora_sdk-2024.4.0.dev22}/README.md

@@ -92,7 +92,8 @@ PyPI 経由ではインストールできません。
 - Windows 11 x86_64
 - Windows Server 2022 x86_64
 - macOS Sequoia 15 arm64
-- macOS Sonoma 14 arm64
+- macOS Ventura 14 arm64
+- macOS Sonoma 13 arm64
 - Ubuntu 24.04 LTS x86_64
 - Ubuntu 24.04 LTS arm64
 - Ubuntu 22.04 LTS x86_64
@@ -113,7 +114,6 @@ PyPI 経由ではインストールできません。
 ### 優先実装が可能な機能一覧
 
 - Windows 11 arm64
-- macOS Ventura 13 arm64
 - Ubuntu 24.04 arm64
 - Ubuntu 22.04 arm64
 - Ubuntu 20.04 arm64 (NVIDIA Jetson JetPack SDK 5)

{sora_sdk-2024.4.0.dev20 → sora_sdk-2024.4.0.dev22}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "sora_sdk"
 authors = [{ name = "Shiguredo Inc.", email = "contact+pypi@shiguredo.jp" }]
-version = "2024.4.0.dev20"
+version = "2024.4.0.dev22"
 description = "WebRTC SFU Sora Python SDK"
 readme = "README.md"
 license = { file = "LICENSE" }

{sora_sdk-2024.4.0.dev20 → sora_sdk-2024.4.0.dev22}/run.py

@@ -226,7 +226,7 @@ def main():
             args.local_sora_cpp_sdk_args,
         )
 
-        configuration = "Release"
+        configuration = "Debug" if args.debug else "Release"
 
         webrtc_platform = get_webrtc_platform(platform)
         webrtc_info = get_webrtc_info(

{sora_sdk-2024.4.0.dev20 → sora_sdk-2024.4.0.dev22/src/sora_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sora_sdk
-Version: 2024.4.0.dev20
+Version: 2024.4.0.dev22
 Summary: WebRTC SFU Sora Python SDK
 Home-page: https://github.com/shiguredo/sora-python-sdk
 Author-email: "Shiguredo Inc." <contact+pypi@shiguredo.jp>
@@ -290,7 +290,8 @@ PyPI 経由ではインストールできません。
 - Windows 11 x86_64
 - Windows Server 2022 x86_64
 - macOS Sequoia 15 arm64
-- macOS Sonoma 14 arm64
+- macOS Ventura 14 arm64
+- macOS Sonoma 13 arm64
 - Ubuntu 24.04 LTS x86_64
 - Ubuntu 24.04 LTS arm64
 - Ubuntu 22.04 LTS x86_64
@@ -311,7 +312,6 @@ PyPI 経由ではインストールできません。
 ### 優先実装が可能な機能一覧
 
 - Windows 11 arm64
-- macOS Ventura 13 arm64
 - Ubuntu 24.04 arm64
 - Ubuntu 22.04 arm64
 - Ubuntu 20.04 arm64 (NVIDIA Jetson JetPack SDK 5)

{sora_sdk-2024.4.0.dev20 → sora_sdk-2024.4.0.dev22}/src/sora_sdk.egg-info/SOURCES.txt

@@ -23,6 +23,8 @@ tests/test_openh264.py
 tests/test_re_offer_re_answer_sdp.py
 tests/test_sendonly_recvonly.py
 tests/test_signaling_message.py
+tests/test_signaling_notify.py
 tests/test_simulcast.py
 tests/test_sora_disconnect.py
+tests/test_type_switched.py
 tests/test_vad.py

{sora_sdk-2024.4.0.dev20 → sora_sdk-2024.4.0.dev22}/tests/test_encoded_transform.py

@@ -35,7 +35,7 @@ class SendonlyEncodedTransform:
         # 接続した
         self._connected: Event = Event()
         # 終了
-        self._closed = Event()
+        self._disconnected = Event()
 
         self._audio_channels: int = 1
         self._audio_sample_rate: int = 16000
@@ -117,13 +117,13 @@ class SendonlyEncodedTransform:
         return self._is_called_on_video_transform
 
     def _fake_audio_loop(self):
-        while not self._closed.is_set():
+        while not self._disconnected.is_set():
             time.sleep(0.02)
             if self._audio_source is not None:
                 self._audio_source.on_data(numpy.zeros((320, 1), dtype=numpy.int16))
 
     def _fake_video_loop(self):
-        while not self._closed.is_set():
+        while not self._disconnected.is_set():
             time.sleep(1.0 / 30)
             if self._video_source is not None:
                 self._video_source.on_captured(
@@ -148,7 +148,7 @@ class SendonlyEncodedTransform:
 
     def _on_disconnect(self, error_code, message):
         print(f"Disconnected Sora: error_code='{error_code}' message='{message}'")
-        self._closed.set()
+        self._disconnected.set()
         self._connected.clear()
 
         if self._fake_audio_thread is not None:
@@ -209,7 +209,7 @@ class RecvonlyEncodedTransform:
         # 接続した
         self._connected: Event = Event()
         # 終了
-        self._closed = Event()
+        self._disconnected = Event()
 
         self._audio_output_frequency: int = 24000
         self._audio_output_channels: int = 1
@@ -276,7 +276,7 @@ class RecvonlyEncodedTransform:
 
     def _on_disconnect(self, error_code, message):
         print(f"Disconnected Sora: error_code='{error_code}' message='{message}'")
-        self._closed = True
+        self._disconnected.set()
         self._connected.clear()
 
     def _on_track(self, track: SoraMediaTrack) -> None:

sora_sdk-2024.4.0.dev22/tests/test_signaling_notify.py

@@ -0,0 +1,53 @@
+import sys
+import uuid
+
+from client import SoraClient, SoraRole
+
+
+def test_signaling_notify(setup):
+    """
+    2 接続での connection.created と connection.destroyed の通知を確認する
+    """
+    signaling_urls = setup.get("signaling_urls")
+    channel_id_prefix = setup.get("channel_id_prefix")
+    metadata = setup.get("metadata")
+
+    channel_id = f"{channel_id_prefix}_{__name__}_{sys._getframe().f_code.co_name}_{uuid.uuid4()}"
+
+    with SoraClient(
+        signaling_urls,
+        SoraRole.SENDRECV,
+        channel_id,
+        audio=True,
+        video=True,
+        metadata=metadata,
+    ) as c1:
+        # c1 に自分の connection.created が通知される
+        notify = c1.wait_notify(lambda notify: notify["event_type"] == "connection.created")
+        assert notify["connection_id"] == c1.connection_id
+        assert notify["channel_connections"] == 1
+
+        with SoraClient(
+            signaling_urls,
+            SoraRole.SENDRECV,
+            channel_id,
+            audio=True,
+            video=True,
+            metadata=metadata,
+        ) as c2:
+            # c2 に自分の connection.created が通知される
+            notify = c2.wait_notify(lambda notify: notify["event_type"] == "connection.created")
+            assert notify["connection_id"] == c2.connection_id
+            assert notify["channel_connections"] == 2
+            # data に c1 の connection_id が入ってる
+            assert notify["data"][0]["connection_id"] == c1.connection_id
+
+            # c1 に c2 の connection.created が通知される
+            notify = c1.wait_notify(lambda notify: notify["event_type"] == "connection.created")
+            assert notify["connection_id"] == c2.connection_id
+            assert notify["channel_connections"] == 2
+
+        # c1 に c2 の connection.destroyed が通知される
+        notify = c1.wait_notify(lambda notify: notify["event_type"] == "connection.destroyed")
+        assert notify["connection_id"] == c2.connection_id
+        assert notify["channel_connections"] == 1

{sora_sdk-2024.4.0.dev20 → sora_sdk-2024.4.0.dev22}/tests/test_sora_disconnect.py

@@ -6,6 +6,8 @@ import pytest
 from api import disconnect_connection_api
 from client import SoraClient, SoraRole
 
+from sora_sdk import SoraSignalingErrorCode
+
 
 @pytest.mark.skipif(sys.platform != "linux", reason="linux でのみ実行する")
 def test_websocket_signaling_only_disconnect_api(setup):
@@ -33,10 +35,17 @@ def test_websocket_signaling_only_disconnect_api(setup):
         response = disconnect_connection_api(api_url, channel_id, conn.connection_id)
         assert response.status_code == 200
 
+        time.sleep(3)
+
         assert conn.ws_close is True
         assert conn.ws_close_code == 1000
         assert conn.ws_close_reason == "DISCONNECTED-API"
 
+        # C++ SDK 側でこのテストが通るようなコードが必要
+        # assert conn.disconnect_code == SoraSignalingErrorCode.CLOSE_SUCCEEDED
+        # assert conn.disconnect_reason is not None
+        # assert "DISCONNECTED-API" in conn.disconnect_reason
+
     # TODO: LIFETIME-EXPIRED のテスト
 
 
@@ -66,10 +75,17 @@ def test_websocket_datachannel_signaling_disconnect_api(setup):
         response = disconnect_connection_api(api_url, channel_id, conn.connection_id)
         assert response.status_code == 200
 
+        time.sleep(3)
+
         assert conn.ws_close is True
         assert conn.ws_close_code == 1000
         assert conn.ws_close_reason == "DISCONNECTED-API"
 
+        # C++ SDK 側でこのテストが通るようなコードが必要
+        # assert conn.disconnect_code == SoraSignalingErrorCode.CLOSE_SUCCEEDED
+        # assert conn.disconnect_reason is not None
+        # assert "DISCONNECTED-API" in conn.disconnect_reason
+
     # TODO: LIFETIME-EXPIRED のテスト
 
 
@@ -112,4 +128,8 @@ def test_datachannel_only_signaling_disconnect_api(setup):
         assert conn.close_message["code"] == 1000
         assert conn.close_message["reason"] == "DISCONNECTED-API"
 
+        assert conn.disconnect_code == SoraSignalingErrorCode.CLOSE_SUCCEEDED
+        assert conn.disconnect_reason is not None
+        assert "DISCONNECTED-API" in conn.disconnect_reason
+
     # TODO: LIFETIME-EXPIRED のテスト

sora_sdk-2024.4.0.dev22/tests/test_type_switched.py

@@ -0,0 +1,118 @@
+import sys
+import time
+import uuid
+
+import pytest
+from client import SoraClient, SoraRole
+
+
+def test_websocket_signaling_only_type_switched(setup):
+    signaling_urls = setup.get("signaling_urls")
+    channel_id_prefix = setup.get("channel_id_prefix")
+    metadata = setup.get("metadata")
+
+    channel_id = f"{channel_id_prefix}_{__name__}_{sys._getframe().f_code.co_name}_{uuid.uuid4()}"
+
+    """
+    - WebSocket シグナリングのみ
+    - type: switched 送られてこない
+    """
+    with SoraClient(
+        signaling_urls,
+        SoraRole.RECVONLY,
+        channel_id,
+        audio=True,
+        video=True,
+        metadata=metadata,
+        data_channel_signaling=False,
+        ignore_disconnect_websocket=False,
+    ) as conn:
+        time.sleep(3)
+
+        assert conn.switched is False
+        assert conn.ws_close_code is None
+        assert conn.ws_close_reason is None
+
+
+def test_hybrid_signaling_type_switched(setup):
+    signaling_urls = setup.get("signaling_urls")
+    channel_id_prefix = setup.get("channel_id_prefix")
+    metadata = setup.get("metadata")
+
+    channel_id = f"{channel_id_prefix}_{__name__}_{sys._getframe().f_code.co_name}_{uuid.uuid4()}"
+
+    """
+    - WebSocket シグナリング + DataChannel シグナリング
+    - type: switched 送られてくる
+    """
+    with SoraClient(
+        signaling_urls,
+        SoraRole.RECVONLY,
+        channel_id,
+        audio=True,
+        video=True,
+        metadata=metadata,
+        data_channel_signaling=True,
+        ignore_disconnect_websocket=False,
+    ) as conn:
+        time.sleep(3)
+
+        assert conn.switched is True
+        assert conn.ws_close_code is None
+        assert conn.ws_close_reason is None
+
+
+def test_datachannel_signaling_only_type_switched(setup):
+    signaling_urls = setup.get("signaling_urls")
+    channel_id_prefix = setup.get("channel_id_prefix")
+    metadata = setup.get("metadata")
+
+    channel_id = f"{channel_id_prefix}_{__name__}_{sys._getframe().f_code.co_name}_{uuid.uuid4()}"
+
+    """
+    - DataChannel シグナリングのみ
+    - type: switched 送られてくる
+    - Python SDK は WebSocket を自分で切断する
+    """
+    with SoraClient(
+        signaling_urls,
+        SoraRole.RECVONLY,
+        channel_id,
+        audio=True,
+        video=True,
+        metadata=metadata,
+        data_channel_signaling=True,
+        ignore_disconnect_websocket=True,
+    ) as conn:
+        time.sleep(3)
+
+        assert conn.switched is True
+        assert conn.ws_close_code == 1000
+        assert conn.ws_close_reason == "SELF-CLOSED"
+
+
+@pytest.mark.skip(reason="Sora がまだ対応していない")
+def test_disconnect_before_switched(setup):
+    # switched 前に type: disconnect を送りつける
+    # ignore_disconnect_websocket は true
+    signaling_urls = setup.get("signaling_urls")
+    channel_id_prefix = setup.get("channel_id_prefix")
+    metadata = setup.get("metadata")
+
+    channel_id = f"{channel_id_prefix}_{__name__}_{sys._getframe().f_code.co_name}_{uuid.uuid4()}"
+
+    with SoraClient(
+        signaling_urls,
+        SoraRole.RECVONLY,
+        channel_id,
+        audio=True,
+        video=True,
+        metadata=metadata,
+        data_channel_signaling=True,
+        ignore_disconnect_websocket=True,
+    ) as conn:
+        conn.disconnect()
+
+        if not conn.switched:
+            assert conn.ws_close_code == 1000
+            assert conn.ws_close_reason == "TYPE-DISCONNECT"

{sora_sdk-2024.4.0.dev20 → sora_sdk-2024.4.0.dev22}/tests/test_vad.py

@@ -30,7 +30,7 @@ class VAD:
         # 接続した
         self._connected: Event = Event()
         # 終了
-        self._closed = Event()
+        self._disconnected = Event()
 
         self._audio_output_frequency: int = 24000
         self._audio_output_channels: int = 1
@@ -86,7 +86,7 @@ class VAD:
 
     def _on_disconnect(self, error_code, message):
         print(f"Disconnected Sora: error_code='{error_code}' message='{message}'")
-        self._closed = True
+        self._disconnected.set()
         self._connected.clear()
 
     def _on_frame(self, frame: SoraAudioFrame):