Merge pull request #215 from shiguredo/feature/forwarding-filters

forwardig_filters に対応する

Author: zztkm

CHANGES.md

@@ -20,6 +20,11 @@
   - libwebrtc の対象バージョンに追従した
     - <https://webrtc.googlesource.com/src/+/9b81d2c954128831c62d8a0657c7f955b3c02d32>
   - @miosakuma
+- [ADD] `ForwardingFilter` に name と priority を追加する
+  - @zztkm
+- [ADD] シグナリング connect 時にリスト形式の転送フィルターを設定するための項目を追加する
+  - `Configuration`, `SignalingConnect` に forwardingFilters を追加する
+  - @zztkm
 
 ### misc
 

Sora/Configuration.swift

@@ -182,8 +182,13 @@ public struct Configuration {
     public var proxy: Proxy?
 
     /// 転送フィルターの設定
+    ///
+    /// この項目は 2025 年 12 月リリース予定の Sora にて廃止されます
     public var forwardingFilter: ForwardingFilter?
 
+    /// リスト形式の転送フィルターの設定
+    public var forwardingFilters: [ForwardingFilter]?
+
     /// VP9 向け映像コーデックパラメーター
     public var videoVp9Params: Encodable?
 
@@ -323,6 +328,12 @@ public enum ForwardingFilterAction: String, Encodable {
  転送フィルターに関する設定です。
  */
 public struct ForwardingFilter {
+    /// name
+    public var name: String?
+
+    /// priority
+    public var priority: Int?
+
     /// action
     public var action: ForwardingFilterAction?
 
@@ -343,7 +354,9 @@ public struct ForwardingFilter {
      - parameter version: version (オプショナル)
      - parameter metadata: metadata (オプショナル)
      */
-    public init(action: ForwardingFilterAction? = nil, rules: [[ForwardingFilterRule]], version: String? = nil, metadata: Encodable? = nil) {
+    public init(name: String? = nil, priority: Int? = nil, action: ForwardingFilterAction? = nil, rules: [[ForwardingFilterRule]], version: String? = nil, metadata: Encodable? = nil) {
+        self.name = name
+        self.priority = priority
         self.action = action
         self.rules = rules
         self.version = version
@@ -353,6 +366,8 @@ public struct ForwardingFilter {
 
 extension ForwardingFilter: Encodable {
     enum CodingKeys: String, CodingKey {
+        case name
+        case priority
         case action
         case rules
         case version
@@ -361,6 +376,8 @@ extension ForwardingFilter: Encodable {
 
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encodeIfPresent(name, forKey: .name)
+        try container.encodeIfPresent(priority, forKey: .priority)
         try container.encodeIfPresent(action, forKey: .action)
         try container.encode(rules, forKey: .rules)
         try container.encodeIfPresent(version, forKey: .version)

Sora/PeerChannel.swift

@@ -339,6 +339,7 @@ class PeerChannel: NSObject, RTCPeerConnectionDelegate {
             audioStreamingLanguageCode: configuration.audioStreamingLanguageCode,
             redirect: redirect,
             forwardingFilter: configuration.forwardingFilter,
+            forwardingFilters: configuration.forwardingFilters,
             vp9Params: configuration.videoVp9Params,
             av1Params: configuration.videoAv1Params,
             h264Params: configuration.videoH264Params
@@ -641,7 +642,7 @@ class PeerChannel: NSObject, RTCPeerConnectionDelegate {
 
     private func updateSenderOfferEncodings() {
         guard let nativeChannel else {
-            Logger.debug(type: .peerChannel, message: "nativeChannel shoud not be nil")
+            Logger.debug(type: .peerChannel, message: "nativeChannel should not be nil")
             return
         }
 
@@ -657,7 +658,7 @@ class PeerChannel: NSObject, RTCPeerConnectionDelegate {
 
     private func createAndSendAnswer(offer: SignalingOffer) {
         guard let nativeChannel else {
-            Logger.debug(type: .peerChannel, message: "nativeChannel shoud not be nil")
+            Logger.debug(type: .peerChannel, message: "nativeChannel should not be nil")
             return
         }
 

Sora/Signaling.swift

@@ -330,8 +330,13 @@ public struct SignalingConnect {
     public var redirect: Bool?
 
     /// 転送フィルターの設定
+    ///
+    /// この項目は 2025 年 12 月リリース予定の Sora にて廃止されます
     public var forwardingFilter: ForwardingFilter?
 
+    /// リスト形式の転送フィルターの設定
+    public var forwardingFilters: [ForwardingFilter]?
+
     /// VP9 向け映像コーデックパラメーター
     public var vp9Params: Encodable?
 
@@ -784,6 +789,7 @@ extension SignalingConnect: Codable {
         case audio_streaming_language_code
         case redirect
         case forwarding_filter
+        case forwarding_filters
     }
 
     enum VideoCodingKeys: String, CodingKey {
@@ -834,6 +840,7 @@ extension SignalingConnect: Codable {
         try container.encodeIfPresent(audioStreamingLanguageCode, forKey: .audio_streaming_language_code)
         try container.encodeIfPresent(redirect, forKey: .redirect)
         try container.encodeIfPresent(forwardingFilter, forKey: .forwarding_filter)
+        try container.encodeIfPresent(forwardingFilters, forKey: .forwarding_filters)
 
         if videoEnabled {
             if videoCodec != .default || videoBitRate != nil || vp9Params != nil || av1Params != nil || h264Params != nil {