Merge pull request #5026 from GibMeMyPacket/feat/singbox/exp_cachefile

Add `Enable cache file for sing-box`
2dust · Apr 27, 2024 · 855fd4f · 855fd4f
2 parents 870955f + 8078399
commit 855fd4f
Show file tree

Hide file tree

Showing 12 changed files with 480 additions and 401 deletions.
diff --git a/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayN/v2rayN/Handler/ConfigHandler.cs
@@ -50,8 +50,8 @@ public static int LoadConfig(ref Config? config)
                 {
                     logEnabled = false,
                     loglevel = "warning",
-
                     muxEnabled = false,
+                    enableCacheFile4Sbox = false,
                 };
             }
 
@@ -305,6 +305,7 @@ public static int ImportOldGuiConfig(Config config, string fileName)
                     logEnabled = configOld.logEnabled,
                     loglevel = configOld.loglevel,
                     muxEnabled = configOld.muxEnabled,
+                    enableCacheFile4Sbox = false,
                 };
             }
 

diff --git a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
@@ -54,7 +54,7 @@ public int GenerateClientConfigContent(ProfileItem node, out SingboxConfig? sing
 
                 GenDns(node, singboxConfig);
 
-                GenStatistic(singboxConfig);
+                GenExperimental(singboxConfig);
 
                 ConvertGeo2Ruleset(singboxConfig);
 
@@ -822,30 +822,66 @@ private int GenDns(ProfileItem node, SingboxConfig singboxConfig)
             return 0;
         }
 
-        private int GenStatistic(SingboxConfig singboxConfig)
+        private int GenExperimentalStatistic(SingboxConfig singboxConfig)
         {
             if (_config.guiItem.enableStatistics)
             {
-                singboxConfig.experimental = new Experimental4Sbox()
+                singboxConfig.experimental ??= new Experimental4Sbox();
+                singboxConfig.experimental.clash_api = new Clash_Api4Sbox()
                 {
-                    cache_file = new CacheFile4Sbox()
-                    {
-                        enabled = true
-                    },
-                    //v2ray_api = new V2ray_Api4Sbox()
-                    //{
-                    //    listen = $"{Global.Loopback}:{Global.StatePort}",
-                    //    stats = new Stats4Sbox()
-                    //    {
-                    //        enabled = true,
-                    //    }
-                    //},
-                    clash_api = new Clash_Api4Sbox()
-                    {
-                        external_controller = $"{Global.Loopback}:{LazyConfig.Instance.StatePort}",
-                    }
+                    external_controller = $"{Global.Loopback}:{LazyConfig.Instance.StatePort}",
+                };
+                // singboxConfig.experimental.v2ray_api = new V2ray_Api4Sbox()
+                // {
+                //     listen = $"{Global.Loopback}:{Global.StatePort}",
+                //     stats = new Stats4Sbox()
+                //     {
+                //         enabled = true,
+                //     }
+                // };
+                // singboxConfig.experimental = new Experimental4Sbox()
+                // {
+                //     cache_file = new CacheFile4Sbox()
+                //     {
+                //         enabled = true
+                //     },
+                //     //v2ray_api = new V2ray_Api4Sbox()
+                //     //{
+                //     //    listen = $"{Global.Loopback}:{Global.StatePort}",
+                //     //    stats = new Stats4Sbox()
+                //     //    {
+                //     //        enabled = true,
+                //     //    }
+                //     //},
+                //     clash_api = new Clash_Api4Sbox()
+                //     {
+                //         external_controller = $"{Global.Loopback}:{LazyConfig.Instance.StatePort}",
+                //     }
+                // };
+            }
+            return 0;
+        }
+
+        private int GenExperimentalCacheFile(SingboxConfig singboxConfig)
+        {
+            if (_config.coreBasicItem.enableCacheFile4Sbox)
+            {
+                singboxConfig.experimental ??= new Experimental4Sbox();
+                singboxConfig.experimental.cache_file = new CacheFile4Sbox()
+                {
+                    enabled = true
                 };
             }
+
+            return 0;
+        }
+
+        private int GenExperimental(SingboxConfig singboxConfig)
+        {
+            var r = GenExperimentalStatistic(singboxConfig);
+            if (r != 0) return r;
+            r = GenExperimentalCacheFile(singboxConfig);
+            if (r != 0) return r;
             return 0;
         }
 

diff --git a/v2rayN/v2rayN/Models/ConfigItems.cs b/v2rayN/v2rayN/Models/ConfigItems.cs
@@ -33,6 +33,8 @@ public class CoreBasicItem
         public string defUserAgent { get; set; }
 
         public bool enableFragment { get; set; }
+
+        public bool enableCacheFile4Sbox { get; set; }
     }
 
     [Serializable]

diff --git a/v2rayN/v2rayN/Models/SingboxConfig.cs b/v2rayN/v2rayN/Models/SingboxConfig.cs
@@ -7,7 +7,7 @@ public class SingboxConfig
         public List<Inbound4Sbox> inbounds { get; set; }
         public List<Outbound4Sbox> outbounds { get; set; }
         public Route4Sbox route { get; set; }
-        public Experimental4Sbox experimental { get; set; }
+        public Experimental4Sbox? experimental { get; set; }
     }
 
     public class Log4Sbox