Merge branch 'release/2023.1.1'

.github/actions/download/action.yml

@@ -0,0 +1,25 @@
+name: download-artifact
+
+description: Download Artifact
+
+inputs:
+  platform:
+    description: Platform
+    required: true
+  python_version:
+    description: Python version
+    required: true
+
+runs:
+  using: composite
+  steps:
+    - uses: actions/download-artifact@v3
+      with:
+        name: ${{ inputs.platform }}_python-${{ inputs.python_version }}
+        path: ${{ inputs.platform }}_python-${{ inputs.python_version }}
+    - name: Append path to package_paths.env
+      shell: bash
+      run: |
+        PACKAGE_NAME=$(basename `ls -1 ${{ inputs.platform }}_python-${{ inputs.python_version }}/*.whl`)
+        mv ${{ inputs.platform }}_python-${{ inputs.python_version }}/*.whl ./
+        echo "$PACKAGE_NAME" >> package_paths.env

.github/workflows/build.yml

@@ -181,3 +181,50 @@ jobs:
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           password: ${{ secrets.PYPI_API_TOKEN }}
+
+  create-release:
+    if: contains(github.ref, 'tags/202')
+    needs:
+      - build_linux_macos
+      - build_windows
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/download
+        with: {"platform":"ubuntu-22.04_x86_64", "python_version":"3.8"}
+      - uses: ./.github/actions/download
+        with: {"platform":"ubuntu-22.04_x86_64", "python_version":"3.9"}
+      - uses: ./.github/actions/download
+        with: {"platform":"ubuntu-22.04_x86_64", "python_version":"3.10"}
+      - uses: ./.github/actions/download
+        with: {"platform":"ubuntu-22.04_x86_64", "python_version":"3.11"}
+      - uses: ./.github/actions/download
+        with: {"platform":"ubuntu-20.04_armv8_jetson", "python_version":"3.8"}
+      - uses: ./.github/actions/download
+        with: {"platform":"macos-13_arm64", "python_version":"3.8"}
+      - uses: ./.github/actions/download
+        with: {"platform":"macos-13_arm64", "python_version":"3.9"}
+      - uses: ./.github/actions/download
+        with: {"platform":"macos-13_arm64", "python_version":"3.10"}
+      - uses: ./.github/actions/download
+        with: {"platform":"macos-13_arm64", "python_version":"3.11"}
+      - uses: ./.github/actions/download
+        with: {"platform":"windows-2019", "python_version":"3.8"}
+      - uses: ./.github/actions/download
+        with: {"platform":"windows-2019", "python_version":"3.9"}
+      - uses: ./.github/actions/download
+        with: {"platform":"windows-2019", "python_version":"3.10"}
+      - uses: ./.github/actions/download
+        with: {"platform":"windows-2019", "python_version":"3.11"}
+      - name: Env to output
+        run: |
+          echo "package_paths<<EOF" >> $GITHUB_OUTPUT
+          cat package_paths.env >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
+        id: env
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        with:
+          files:
+            ${{ steps.env.outputs.package_paths }}

CHANGES.md

@@ -11,6 +11,15 @@
 
 ## develop
 
+## 2023.1.1
+
+**2023-06-27**
+
+- [FIX] connect 直後に disconnect すると落ちるのを修正
+  - @melpon
+- [FIX] C++ SDK のバージョンを 2023.7.1 に上げる
+  - @voluntas
+
 ## 2023.1.0
 
 **2023-06-20**

README.md

@@ -1,6 +1,5 @@
 # Sora Python SDK
 
-[![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/shiguredo/sora-python-sdk.svg)](https://github.com/shiguredo/sora-python-sdk)
 [![PyPI](https://img.shields.io/pypi/v/sora_sdk)](https://pypi.org/project/sora-sdk/)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 

VERSION

@@ -1,5 +1,5 @@
-SORA_CPP_SDK_VERSION=2023.7.0
+SORA_CPP_SDK_VERSION=2023.7.1
 WEBRTC_BUILD_VERSION=m114.5735.2.0
 BOOST_VERSION=1.82.0
 LYRA_VERSION=1.3.0
-CMAKE_VERSION=3.26.4
+CMAKE_VERSION=3.26.4

pyproject.toml

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

src/sora_connection.cpp

@@ -61,14 +61,7 @@ void SoraConnection::Disconnect() {
   if (thread_) {
     // Disconnect の中で OnDisconnect が呼ばれるので GIL をリリースする
     nb::gil_scoped_release release;
-    if (conn_->GetPeerConnection() != nullptr) {
-      // 切断済みではない場合は切断する
-      //
-      // TODO(sile): ioc_ が別スレッドで動作している関係上、上のチェックでは完璧ではなくレースコンディションが存在するはず
-      // レースコンディションを完全になくすためには C++ SDK 側での対応が必要なものと思われる
-      // (e.g., 切断済みの場合に conn_->Disconnect() が呼ばれた場合には単に無視する仕様にする、など）
-      conn_->Disconnect();
-    }
+    conn_->Disconnect();
     thread_->join();
     thread_ = nullptr;
   }