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

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

@@ -123,15 +123,92 @@ public class RuleList
     {
         public Rule[] data;
     }
+    [System.Serializable]
+    public class ForwardingFilter
+    {
+        public bool enableAction = false;
+        public string action;
+        public bool enableName = false;
+        public string name;
+        public bool enablePriority = false;
+        public int priority;
+        public RuleList[] rules;
+        public bool enableVersion = false;
+        public string version = "";
+        public bool enableMetadata = false;
+        public string metadata = "";
+    }
+    public static class ForwardingFilterHelper
+    {
+        [Serializable]
+        private class ForwardingFilterMetadata
+        {
+            public string metadata;
+        }
+        private static void ConfigureFilter(Sora.ForwardingFilter filter, ForwardingFilter settings)
+        {
+            if (settings.enableAction) filter.Action = settings.action;
+            if (settings.enableName) filter.Name = settings.name;
+            if (settings.enablePriority) filter.Priority = settings.priority;
+
+            if (settings.rules != null)
+            {
+                foreach (var ruleSet in settings.rules)
+                {
+                    if (ruleSet?.data == null) continue;
+
+                    var ruleList = new List<Sora.ForwardingFilter.Rule>();
+                    foreach (var rule in ruleSet.data)
+                    {
+                        var newRule = new Sora.ForwardingFilter.Rule
+                        {
+                            Field = rule.field,
+                            Operator = rule.op
+                        };
+                        newRule.Values.AddRange(rule.values);
+                        ruleList.Add(newRule);
+                    }
+
+                    if (ruleList.Any())
+                    {
+                        filter.Rules.Add(ruleList);
+                    }
+                }
+            }
+
+            if (settings.enableVersion) filter.Version = settings.version;
+            if (settings.enableMetadata)
+            {
+                filter.Metadata = ForwardingFilterMetadataHelper.ConvertMetadataToJson(settings.metadata);
+            }
+        }
+        private static class ForwardingFilterMetadataHelper
+        {
+            public static string ConvertMetadataToJson(string metadata)
+            {
+                var ffMetadata = new ForwardingFilterMetadata()
+                {
+                    metadata = metadata
+                };
+                return JsonUtility.ToJson(ffMetadata);
+            }
+        }
+        public static Sora.ForwardingFilter CreateFilter(ForwardingFilter settings)
+        {
+            if (settings == null) return null;
+
+            var filter = new Sora.ForwardingFilter();
+            ConfigureFilter(filter, settings);
+            return filter;
+        }
+    }
 
     [Header("ForwardingFilter の設定")]
-    public bool enableForwardingFilterAction = false;
-    public string forwardingFilterAction;
-    public RuleList[] forwardingFilter;
-    public bool enableForwardingFilterVersion = false;
-    public string forwardingFilterVersion = "";
-    public bool enableForwardingFilterMetadata = false;
-    public string forwardingFilterMetadataMessage = "";
+    [System.Obsolete("forwardingFilter は非推奨です。代わりに forwardingFilters を使用してください。")]
+    public ForwardingFilter forwardingFilter;
+
+    [Header("ForwardingFilters の設定")]
+    public ForwardingFilter[] forwardingFilters;
 
     [Header("DataChannel シグナリングの設定")]
     public bool dataChannelSignaling = false;
@@ -597,12 +674,6 @@ class VideoH264Params
         public string profile_level_id;
     }
 
-    [Serializable]
-    class ForwardingFilterMetadata
-    {
-        public string forwarding_filter_metadata;
-    }
-
     public void OnClickStart()
     {
 
@@ -677,16 +748,6 @@ public void OnClickStart()
             };
             videoH264ParamsJson = JsonUtility.ToJson(h264Params);
         }
-        // enableForwardingFilterMetadata が true の場合はメタデータを設定する
-        string forwardingFilterMetadataJson = "";
-        if (enableForwardingFilterMetadata)
-        {
-            var ffm = new ForwardingFilterMetadata()
-            {
-                forwarding_filter_metadata = forwardingFilterMetadataMessage
-            };
-            forwardingFilterMetadataJson = JsonUtility.ToJson(ffm);
-        }
 
         InitSora();
 
@@ -777,30 +838,23 @@ public void OnClickStart()
             }
             fixedDataChannelLabels = config.DataChannels.Select(x => x.Label).ToArray();
         }
-        if (forwardingFilter.Length != 0)
+        if (forwardingFilter != null)
         {
-            config.ForwardingFilter = new Sora.ForwardingFilter();
-            if (enableForwardingFilterAction) config.ForwardingFilter.Action = forwardingFilterAction;
-            foreach (var rs in forwardingFilter)
+            config.ForwardingFilter = ForwardingFilterHelper.CreateFilter(forwardingFilter);
+        }
+        if (forwardingFilters != null && forwardingFilters.Length > 0)
+        {
+            config.ForwardingFilters = new List<Sora.ForwardingFilter>();
+
+            foreach (var filter in forwardingFilters)
             {
-                var ccrs = new List<Sora.ForwardingFilter.Rule>();
-                foreach (var r in rs.data)
+                var newFilter = ForwardingFilterHelper.CreateFilter(filter);
+                if (newFilter != null)
                 {
-                    var ccr = new Sora.ForwardingFilter.Rule();
-                    ccr.Field = r.field;
-                    ccr.Operator = r.op;
-                    foreach (var v in r.values)
-                    {
-                        ccr.Values.Add(v);
-                    }
-                    ccrs.Add(ccr);
+                    config.ForwardingFilters.Add(newFilter);
                 }
-                config.ForwardingFilter.Rules.Add(ccrs);
             }
-            if (enableForwardingFilterVersion) config.ForwardingFilter.Version = forwardingFilterVersion;
-            if (enableForwardingFilterMetadata) config.ForwardingFilter.Metadata = forwardingFilterMetadataJson;
         }
-
         sora.Connect(config);
         SetState(State.Started);
         Debug.LogFormat("Sora is Created: signalingUrl={0}, channelId={1}", signalingUrl, channelId);