Merge pull request #104 from shiguredo/feature/add-datachannels-header

data_channels 項目に header 項目を追加

CHANGES.md

@@ -31,6 +31,8 @@
   - @torikizi
 - [ADD] `Sora.Config` に `ClientCert`, `ClientKey`, `CACert` を追加
   - @melpon
+- [ADD] DataChannels に `Header` を追加
+  - @torikizi
 - [ADD] ForwardingFilter に name と priority を追加
   - @torikizi
 - [ADD] ForwardingFilters 機能を使えるようにする

Sora/Sora.cs

@@ -50,7 +50,6 @@ public enum SpotlightFocusRidType
         R1,
         R2,
     }
-
     public class DataChannel
     {
         // 以下は設定必須
@@ -62,6 +61,7 @@ public class DataChannel
         public int? MaxRetransmits;
         public string? Protocol;
         public bool? Compress;
+        public List<string>? Header;
     }
 
     public const string ActionBlock = "block";
@@ -454,6 +454,10 @@ public void Connect(Config config)
             {
                 c.SetCompress(m.Compress.Value);
             }
+            if (m.Header != null)
+            {
+                c.SetHeader(new SoraConf.Internal.DataChannel.Header { content = m.Header });
+            }
             cc.data_channels.Add(c);
         }
         cc.proxy_url = config.ProxyUrl;

proto/sora_conf_internal.proto

@@ -10,6 +10,10 @@ message DataChannel {
     optional int32 max_retransmits = 8;
     optional string protocol = 10;
     optional bool compress = 12;
+    message Header {
+        repeated string content = 1;
+    }
+    optional Header header = 14;
 }
 
 message ForwardingFilter {

src/sora.cpp

@@ -419,6 +419,18 @@ void Sora::DoConnect(const sora_conf::internal::ConnectConfig& cc,
       if (dc.has_compress()) {
         d.compress = dc.compress;
       }
+      if (dc.has_header()) {
+        d.header = std::vector<boost::json::value>();
+        for (const auto& json_str : dc.header.content) {
+          boost::system::error_code ec;
+          auto parsed = boost::json::parse(json_str, ec);
+          if (ec) {
+            RTC_LOG(LS_WARNING) << "Invalid JSON: header=" << json_str;
+          } else {
+            d.header->push_back(std::move(parsed));
+          }
+        }
+      }
       config.data_channels.push_back(std::move(d));
     }
     if (!cc.metadata.empty()) {