マルチ転送フィルターを設定可能にする

CHANGES.md

@@ -11,6 +11,13 @@
 
 ## develop
 
+- [ADD] forwardingfilters を設定可能にする
+  - マルチ転送フィルターを設定できるように項目を追加
+  - @torikizi
+- [ADD] forwardingfilter に name と priority を追加
+  - 既存の forwardingfilter に name と priority を追加
+  - @torikizi
+
 ## sora-unity-sdk-2024.4.0
 
 - [UPDATE] Sora Unity SDK 2024.4.0 にあげる

SoraUnitySdkSamples/Assets/SoraSample.cs

@@ -127,12 +127,51 @@ public class RuleList
     [Header("ForwardingFilter の設定")]
     public bool enableForwardingFilterAction = false;
     public string forwardingFilterAction;
+    public bool enableForwardingFilterName = false;
+    public string forwardingFilterName;
+    public bool enableForwardingFilterPriority = false;
+    public int forwardingFilterPriority;
     public RuleList[] forwardingFilter;
     public bool enableForwardingFilterVersion = false;
     public string forwardingFilterVersion = "";
     public bool enableForwardingFilterMetadata = false;
     public string forwardingFilterMetadataMessage = "";
 
+
+    [System.Serializable]
+    public class ForwardingFiltersRule
+    {
+        public string field;
+        public string op;
+        public string[] values;
+    }
+    [System.Serializable]
+    public class ForwardingFiltersRuleList
+    {
+        public ForwardingFiltersRule[] data;
+    }
+
+    [System.Serializable]
+    public class ForwardingFiltersItem
+    {
+        public string action;
+        public string name;
+        public int priority;
+        public ForwardingFiltersRuleList[] rules;
+        public string version;
+        public string metadata;
+    }
+
+    [System.Serializable]
+    public class ForwardingFiltersList
+    {
+        public ForwardingFiltersItem[] filters;
+    }
+
+    [Header("ForwardingFilters の設定")]
+
+    public ForwardingFiltersList forwardingFilters;
+
     [Header("DataChannel シグナリングの設定")]
     public bool dataChannelSignaling = false;
     public int dataChannelSignalingTimeout = 30;
@@ -777,10 +816,12 @@ public void OnClickStart()
             }
             fixedDataChannelLabels = config.DataChannels.Select(x => x.Label).ToArray();
         }
-        if (forwardingFilter.Length != 0)
+        if (forwardingFilter != null && forwardingFilter.Length != 0)
         {
             config.ForwardingFilter = new Sora.ForwardingFilter();
             if (enableForwardingFilterAction) config.ForwardingFilter.Action = forwardingFilterAction;
+            if (enableForwardingFilterName) config.ForwardingFilter.Name = forwardingFilterName;
+            if (enableForwardingFilterPriority) config.ForwardingFilter.Priority = forwardingFilterPriority;
             foreach (var rs in forwardingFilter)
             {
                 var ccrs = new List<Sora.ForwardingFilter.Rule>();
@@ -789,6 +830,7 @@ public void OnClickStart()
                     var ccr = new Sora.ForwardingFilter.Rule();
                     ccr.Field = r.field;
                     ccr.Operator = r.op;
+                    ccr.Values = new List<string>();
                     foreach (var v in r.values)
                     {
                         ccr.Values.Add(v);
@@ -800,7 +842,79 @@ public void OnClickStart()
             if (enableForwardingFilterVersion) config.ForwardingFilter.Version = forwardingFilterVersion;
             if (enableForwardingFilterMetadata) config.ForwardingFilter.Metadata = forwardingFilterMetadataJson;
         }
+        if (forwardingFilters != null &&
+            forwardingFilters.filters != null &&
+            forwardingFilters.filters.Length > 0)
+        {
+            config.ForwardingFilters = new List<Sora.ForwardingFilter>();
+
+            foreach (var filter in forwardingFilters.filters)
+            {
+                var newFilter = new Sora.ForwardingFilter();
 
+                if (!string.IsNullOrEmpty(filter.action))
+                {
+                    newFilter.Action = filter.action;
+                }
+                if (!string.IsNullOrEmpty(filter.name))
+                {
+                    newFilter.Name = filter.name;
+                }
+                if (filter.priority >= 0)
+                {
+                    newFilter.Priority = filter.priority;
+                }
+
+                if (filter.rules != null)
+                {
+                    foreach (var ruleSet in filter.rules)
+                    {
+                        if (ruleSet.data != null)
+                        {
+                            var ruleList = new List<Sora.ForwardingFilter.Rule>();
+                            foreach (var rule in ruleSet.data)
+                            {
+                                if (!string.IsNullOrEmpty(rule.field) &&
+                                    !string.IsNullOrEmpty(rule.op) &&
+                                    rule.values != null)
+                                {
+                                    var newRule = new Sora.ForwardingFilter.Rule
+                                    {
+                                        Field = rule.field,
+                                        Operator = rule.op
+                                    };
+                                    newRule.Values.AddRange(rule.values);
+                                    ruleList.Add(newRule);
+                                }
+                            }
+                            if (ruleList.Count > 0)
+                            {
+                                newFilter.Rules.Add(ruleList);
+                            }
+                        }
+                    }
+                }
+
+                if (!string.IsNullOrEmpty(filter.version))
+                {
+                    newFilter.Version = filter.version;
+                }
+                if (!string.IsNullOrEmpty(filter.metadata))
+                {
+                    newFilter.Metadata = filter.metadata;
+                }
+
+                if (newFilter.Action != null ||
+                    newFilter.Name != null ||
+                    newFilter.Priority.HasValue ||
+                    newFilter.Rules.Count > 0 ||
+                    newFilter.Version != null ||
+                    newFilter.Metadata != null)
+                {
+                    config.ForwardingFilters.Add(newFilter);
+                }
+            }
+        }
         sora.Connect(config);
         SetState(State.Started);
         Debug.LogFormat("Sora is Created: signalingUrl={0}, channelId={1}", signalingUrl, channelId);