Sora から切断された場合の切断処理を改善する #241
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zztkm
commented
Apr 2, 2025
CHANGES.md
Outdated
Comment on lines
26
to
30
| - [UPDATE] Sora から切断された場合の切断処理を改善する | ||
| - Sora から Close Frame を受けとった場合にステータスコードと理由を `MediaChannelHandlers.onDisconnect` で返すようになった | ||
| - ネットワークエラーや Sora がダウンした場合のエラー内容を `MediaChannelHandlers.onDisconnect` で返すようになった | ||
| - いままでは WebSocket メッセージ受信失敗時のエラーである `The operation couldn’t be completed. Socket is not connected` というエラーしか返せていなかった状態が改善された | ||
| - @zztkm |
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR aims to improve the disconnection behavior when Sora disconnects and update the changelog accordingly.
- Updated the WebRTC version.
- Improved the disconnection handling for Sora in the changelog, including returning status codes and reasons via MediaChannelHandlers.onDisconnect.
- Added the encoding parameter "scaleResolutionDownTo" for simulcast video.
Files not reviewed (2)
- Sora/SignalingChannel.swift: Language not supported
- Sora/URLSessionWebSocketChannel.swift: Language not supported
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Contributor
There was a problem hiding this comment.
Pull Request Overview
This pull request improves the handling of WebSocket disconnections and error reporting for Sora while updating the changelog to reflect these changes and added simulcast video encoding parameters.
- Updated Sora disconnection processing to return error details via MediaChannelHandlers.onDisconnect
- Enhanced logging for WebSocket send/receive errors
- Documented the simulcast video encoding parameter change
Files not reviewed (2)
- Sora/SignalingChannel.swift: Language not supported
- Sora/URLSessionWebSocketChannel.swift: Language not supported
…ect-process-from-sora' into feature/fix-disconnect-process-from-sora
Contributor
There was a problem hiding this comment.
Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.
Comments suppressed due to low confidence (1)
Sora/URLSessionWebSocketChannel.swift:166
- [nitpick] The disconnect call on message reception failure has been removed in favor of handling it in didCompleteWithError. Consider adding a more detailed comment explaining this design decision for clarity.
case .failure(let error):
miosakuma
reviewed
Apr 4, 2025
| disconnect(error: error) | ||
| } | ||
| // 2025.2.x から、ステータスコード 1000 の場合でも error として上位層に伝搬させることにする (上位層が error 前提で組まれているためこのような方針にした) | ||
| // これは disconnect が error を渡さないと機能 |
Contributor
Author
There was a problem hiding this comment.
すみません修正漏れでした。そこの文章はいらないので削除しようと思います。
miosakuma
approved these changes
Apr 4, 2025
Contributor
miosakuma
left a comment
miosakuma
left a comment
There was a problem hiding this comment.
コメントが不備ではないかという指摘をしましたが、あとは大丈夫です。
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
MediaChannelHandlers.onDisconnectで受け取ることができるようにするSoraError.webSocketErrorしか受信できなかったが、以下の内容を受信できるようになったMediaChannelHandlers.onDisconnectで通知するMediaChannelHandlers.onDisconnectで受信するメッセージの内容は変わるが、コールバックが発火するタイミングに変更はないうエラーしか返せていなかった状態が改善されたThis pull request includes several changes to improve WebSocket handling and error reporting in the
Soraproject. The most important changes focus on enhancing the disconnect process and improving logging for WebSocket operations.Improvements to WebSocket handling and error reporting:
Sora/URLSessionWebSocketChannel.swift: Added a method to handle WebSocket disconnection, including handling errors from Sora or network issues, and improved logging for disconnect events. [1] [2] [3] [4]Sora/URLSessionWebSocketChannel.swift: Enhanced logging for sending text and binary messages, and improved error logging when message sending fails. [1] [2]Sora/URLSessionWebSocketChannel.swift: Improved error handling and logging for message reception failures, ensuring that higher-level error detection occurs in thedidCompleteWithErrormethod. [1] [2]Documentation updates:
CHANGES.md: Updated the change log to reflect the improvements in WebSocket disconnection handling and the addition of new encoding parameters for simulcast video.Code comments:
Sora/SignalingChannel.swift: Updated comments to clarify the behavior of theonDisconnectWithErrorhandler for WebSocket disconnections.