Merge 6ec7c7c733 into 3a5293bf87

v2rayN/ServiceLib/Handler/CoreConfigHandler.cs

@@ -99,7 +99,12 @@ public static class CoreConfigHandler
         var nodes = await AppManager.Instance.GetProfileItemsByIndexIds(ids);
         foreach (var node in nodes)
         {
-            await FillNodeContext(context, node, false);
+            var actNode = await FillNodeContext(context, node, true);
+            if (node.IndexId == actNode.IndexId)
+            {
+                continue;
+            }
+            context.ServerTestItemMap[node.IndexId] = actNode.IndexId;
         }
         if (coreType == ECoreType.sing_box)
         {

v2rayN/ServiceLib/Handler/Fmt/Hysteria2Fmt.cs

@@ -66,7 +66,7 @@ public class Hysteria2Fmt : BaseFmt
         if (!item.CertSha.IsNullOrEmpty())
         {
             var sha = item.CertSha;
-            var idx = sha.IndexOf('~');
+            var idx = sha.IndexOf(',');
             if (idx > 0)
             {
                 sha = sha[..idx];

v2rayN/ServiceLib/Models/CoreConfigContext.cs

@@ -10,6 +10,9 @@ public record CoreConfigContext
     public Config AppConfig { get; init; } = new();
     public FullConfigTemplateItem? FullConfigTemplate { get; init; } = new();
 
+    // Test ServerTestItem Map
+    public Dictionary<string, string> ServerTestItemMap { get; init; } = new();
+
     // TUN Compatibility
     public bool IsTunEnabled { get; init; } = false;
     public HashSet<string> ProtectDomainList { get; init; } = new();

v2rayN/ServiceLib/Services/CoreConfig/Singbox/CoreConfigSingboxService.cs

@@ -122,8 +122,9 @@ public partial class CoreConfigSingboxService(CoreConfigContext context)
                 {
                     continue;
                 }
-                var item = context.AllProxiesMap.GetValueOrDefault(it.IndexId);
+                var actIndexId = context.ServerTestItemMap.GetValueOrDefault(it.IndexId, it.IndexId);
-                if (item is null || item.IsComplex() || !item.IsValid())
+                var item = context.AllProxiesMap.GetValueOrDefault(actIndexId);
+                if (item is null || item.ConfigType is EConfigType.Custom || !item.IsValid())
                 {
                     continue;
                 }

v2rayN/ServiceLib/Services/CoreConfig/V2ray/CoreConfigV2rayService.cs

@@ -120,8 +120,9 @@ public partial class CoreConfigV2rayService(CoreConfigContext context)
                 {
                     continue;
                 }
-                var item = context.AllProxiesMap.GetValueOrDefault(it.IndexId);
+                var actIndexId = context.ServerTestItemMap.GetValueOrDefault(it.IndexId, it.IndexId);
-                if (item is null || item.IsComplex() || !item.IsValid())
+                var item = context.AllProxiesMap.GetValueOrDefault(actIndexId);
+                if (item is null || item.ConfigType is EConfigType.Custom || !item.IsValid())
                 {
                     continue;
                 }

v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs

@@ -218,7 +218,7 @@ public class AddServerViewModel : MyReactiveObject
             return;
         }
 
-        List<string> shaList = new();
+        List<string> shaList = [];
         foreach (var cert in certList)
         {
             var sha = CertPemManager.GetCertSha256Thumbprint(cert);
@@ -228,7 +228,7 @@ public class AddServerViewModel : MyReactiveObject
             }
             shaList.Add(sha);
         }
-        CertSha = string.Join('~', shaList);
+        CertSha = string.Join(',', shaList);
     }
 
     private async Task FetchCert()