Fix

v2rayN/ServiceLib/Handler/ConfigHandler.cs

@@ -844,7 +844,7 @@ public static class ConfigHandler
     /// <returns>0 if successful, -1 if failed</returns>
     public static async Task<int> SortServers(Config config, string subId, string colName, bool asc)
     {
-        var lstModel = await AppManager.Instance.ProfileItems(subId, "");
+        var lstModel = await AppManager.Instance.ProfileModels(subId, "");
         if (lstModel.Count <= 0)
         {
             return -1;
@@ -1213,7 +1213,8 @@ public static class ConfigHandler
         }
         var extraItem = new ProtocolExtraItem
         {
-            ChildItems = childProfileIndexId, MultipleLoad = multipleLoad,
+            ChildItems = childProfileIndexId,
+            MultipleLoad = multipleLoad,
         };
         profile.SetProtocolExtra(extraItem);
         var ret = await AddServerCommon(config, profile, true);
@@ -1277,7 +1278,7 @@ public static class ConfigHandler
     /// <returns>Number of removed servers or -1 if failed</returns>
     public static async Task<int> RemoveInvalidServerResult(Config config, string subid)
     {
-        var lstModel = await AppManager.Instance.ProfileItems(subid, "");
+        var lstModel = await AppManager.Instance.ProfileModels(subid, "");
         if (lstModel is { Count: <= 0 })
         {
             return -1;

v2rayN/ServiceLib/Helper/DownloaderHelper.cs

@@ -85,7 +85,7 @@ public class DownloaderHelper
                 {
                     maxSpeed = value.BytesPerSecondSpeed;
                 }
-                
+
                 var ts = DateTime.Now - lastUpdateTime;
                 if (ts.TotalMilliseconds >= 1000)
                 {

v2rayN/ServiceLib/Manager/AppManager.cs

@@ -191,10 +191,17 @@ public sealed class AppManager
         return (await ProfileItems(subid))?.Select(t => t.IndexId)?.ToList();
     }
 
-    public async Task<List<ProfileItemModel>?> ProfileItems(string subid, string filter)
+    public async Task<List<ProfileItemModel>?> ProfileModels(string subid, string filter)
     {
-        var sql = @$"select a.*
-                           ,b.remarks subRemarks
+        var sql = @$"select a.IndexId
+                           ,a.ConfigType
+                           ,a.Remarks
+                           ,a.Address
+                           ,a.Port
+                           ,a.Network
+                           ,a.StreamSecurity
+                           ,a.Subid
+                           ,b.remarks as subRemarks
                         from ProfileItem a
                         left join SubItem b on a.subid = b.id
                         where 1=1 ";
@@ -264,107 +271,26 @@ public sealed class AppManager
 
     public async Task MigrateProfileExtra()
     {
-#pragma warning disable CS0618
-        var list = await SQLiteHelper.Instance.TableAsync<ProfileGroupItem>().ToListAsync();
-        var groupItems = new ConcurrentDictionary<string, ProfileGroupItem>(list.Where(t => !string.IsNullOrEmpty(t.IndexId)).ToDictionary(t => t.IndexId!));
+        await MigrateProfileExtraGroup();
 
-        const int pageSize = 500;
+#pragma warning disable CS0618
+
+        const int pageSize = 100;
         var offset = 0;
 
         while (true)
         {
-            var sql = $"SELECT * FROM ProfileItem WHERE ConfigVersion < 3 LIMIT {pageSize} OFFSET {offset}";
+            var sql = $"SELECT * FROM ProfileItem " +
+                $"WHERE ConfigVersion < 3 " +
+                $"AND ConfigType NOT IN ({(int)EConfigType.PolicyGroup}, {(int)EConfigType.ProxyChain}) " +
+                $"LIMIT {pageSize} OFFSET {offset}";
             var batch = await SQLiteHelper.Instance.QueryAsync<ProfileItem>(sql);
             if (batch is null || batch.Count == 0)
             {
                 break;
             }
 
-            var batchSuccessCount = 0;
-            foreach (var item in batch)
-            {
-                try
-                {
-                    var extra = item.GetProtocolExtra();
-
-                    if (item.ConfigType is EConfigType.PolicyGroup or EConfigType.ProxyChain)
-                    {
-                        extra = extra with { GroupType = nameof(item.ConfigType) };
-                        groupItems.TryGetValue(item.IndexId, out var groupItem);
-                        if (groupItem != null && !groupItem.NotHasChild())
-                        {
-                            extra = extra with
-                            {
-                                ChildItems = groupItem.ChildItems,
-                                SubChildItems = groupItem.SubChildItems,
-                                Filter = groupItem.Filter,
-                                MultipleLoad = groupItem.MultipleLoad,
-                            };
-                        }
-                    }
-
-                    switch (item.ConfigType)
-                    {
-                        case EConfigType.Shadowsocks:
-                            extra = extra with { SsMethod = item.Security.NullIfEmpty() };
-                            break;
-                        case EConfigType.VMess:
-                            extra = extra with
-                            {
-                                AlterId = item.AlterId.ToString(),
-                                VmessSecurity = item.Security.NullIfEmpty(),
-                            };
-                            break;
-                        case EConfigType.VLESS:
-                            extra = extra with
-                            {
-                                Flow = item.Flow.NullIfEmpty(),
-                                VlessEncryption = item.Security,
-                            };
-                            break;
-                        case EConfigType.Hysteria2:
-                            extra = extra with
-                            {
-                                SalamanderPass = item.Path.NullIfEmpty(),
-                                Ports = item.Ports.NullIfEmpty(),
-                                UpMbps = _config.HysteriaItem.UpMbps,
-                                DownMbps = _config.HysteriaItem.DownMbps,
-                                HopInterval = _config.HysteriaItem.HopInterval.ToString(),
-                            };
-                            break;
-                        case EConfigType.TUIC:
-                            item.Username = item.Id;
-                            item.Id = item.Security;
-                            item.Password = item.Security;
-                            break;
-                        case EConfigType.HTTP:
-                        case EConfigType.SOCKS:
-                            item.Username = item.Security;
-                            break;
-                        case EConfigType.WireGuard:
-                            extra = extra with
-                            {
-                                WgPublicKey = item.PublicKey.NullIfEmpty(),
-                                WgInterfaceAddress = item.RequestHost.NullIfEmpty(),
-                                WgReserved = item.Path.NullIfEmpty(),
-                                WgMtu = int.TryParse(item.ShortId, out var mtu) ? mtu : 1280
-                            };
-                            break;
-                    }
-
-                    item.SetProtocolExtra(extra);
-
-                    item.Password = item.Id;
-
-                    item.ConfigVersion = 3;
-                    await SQLiteHelper.Instance.UpdateAsync(item);
-                    batchSuccessCount++;
-                }
-                catch (Exception ex)
-                {
-                    Logging.SaveLog($"MigrateProfileExtra Error: {ex}");
-                }
-            }
+            var batchSuccessCount = await MigrateProfileExtraSub(batch);
 
             // Only increment offset by the number of failed items that remain in the result set
             // Successfully updated items are automatically excluded from future queries due to ConfigVersion = 3
@@ -375,6 +301,173 @@ public sealed class AppManager
 #pragma warning restore CS0618
     }
 
+    private async Task<int> MigrateProfileExtraSub(List<ProfileItem> batch)
+    {
+        var updateProfileItems = new List<ProfileItem>();
+
+        foreach (var item in batch)
+        {
+            try
+            {
+                var extra = item.GetProtocolExtra();
+                switch (item.ConfigType)
+                {
+                    case EConfigType.Shadowsocks:
+                        extra = extra with { SsMethod = item.Security.NullIfEmpty() };
+                        break;
+
+                    case EConfigType.VMess:
+                        extra = extra with
+                        {
+                            AlterId = item.AlterId.ToString(),
+                            VmessSecurity = item.Security.NullIfEmpty(),
+                        };
+                        break;
+
+                    case EConfigType.VLESS:
+                        extra = extra with
+                        {
+                            Flow = item.Flow.NullIfEmpty(),
+                            VlessEncryption = item.Security,
+                        };
+                        break;
+
+                    case EConfigType.Hysteria2:
+                        extra = extra with
+                        {
+                            SalamanderPass = item.Path.NullIfEmpty(),
+                            Ports = item.Ports.NullIfEmpty(),
+                            UpMbps = _config.HysteriaItem.UpMbps,
+                            DownMbps = _config.HysteriaItem.DownMbps,
+                            HopInterval = _config.HysteriaItem.HopInterval.ToString(),
+                        };
+                        break;
+
+                    case EConfigType.TUIC:
+                        item.Username = item.Id;
+                        item.Id = item.Security;
+                        item.Password = item.Security;
+                        break;
+
+                    case EConfigType.HTTP:
+                    case EConfigType.SOCKS:
+                        item.Username = item.Security;
+                        break;
+
+                    case EConfigType.WireGuard:
+                        extra = extra with
+                        {
+                            WgPublicKey = item.PublicKey.NullIfEmpty(),
+                            WgInterfaceAddress = item.RequestHost.NullIfEmpty(),
+                            WgReserved = item.Path.NullIfEmpty(),
+                            WgMtu = int.TryParse(item.ShortId, out var mtu) ? mtu : 1280
+                        };
+                        break;
+                }
+
+                item.SetProtocolExtra(extra);
+
+                item.Password = item.Id;
+
+                item.ConfigVersion = 3;
+
+                updateProfileItems.Add(item);
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog($"MigrateProfileExtra Error: {ex}");
+            }
+        }
+
+        if (updateProfileItems.Count > 0)
+        {
+            try
+            {
+                var count = await SQLiteHelper.Instance.UpdateAllAsync(updateProfileItems);
+                return count;
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog($"MigrateProfileExtraGroup update error: {ex}");
+                return 0;
+            }
+        }
+        else
+        {
+            return 0;
+        }
+    }
+
+    private async Task<bool> MigrateProfileExtraGroup()
+    {
+#pragma warning disable CS0618
+        var list = await SQLiteHelper.Instance.TableAsync<ProfileGroupItem>().ToListAsync();
+        var groupItems = new ConcurrentDictionary<string, ProfileGroupItem>(list.Where(t => !string.IsNullOrEmpty(t.IndexId)).ToDictionary(t => t.IndexId!));
+
+        var sql = $"SELECT * FROM ProfileItem WHERE ConfigVersion < 3 AND ConfigType IN ({(int)EConfigType.PolicyGroup}, {(int)EConfigType.ProxyChain})";
+        var items = await SQLiteHelper.Instance.QueryAsync<ProfileItem>(sql);
+
+        if (items is null || items.Count == 0)
+        {
+            Logging.SaveLog("MigrateProfileExtraGroup: No items to migrate.");
+            return true;
+        }
+
+        Logging.SaveLog($"MigrateProfileExtraGroup: Found {items.Count} group items to migrate.");
+
+        var updateProfileItems = new List<ProfileItem>();
+
+        foreach (var item in items)
+        {
+            try
+            {
+                var extra = item.GetProtocolExtra();
+
+                extra = extra with { GroupType = nameof(item.ConfigType) };
+                groupItems.TryGetValue(item.IndexId, out var groupItem);
+                if (groupItem != null && !groupItem.NotHasChild())
+                {
+                    extra = extra with
+                    {
+                        ChildItems = groupItem.ChildItems,
+                        SubChildItems = groupItem.SubChildItems,
+                        Filter = groupItem.Filter,
+                        MultipleLoad = groupItem.MultipleLoad,
+                    };
+                }
+
+                item.SetProtocolExtra(extra);
+
+                item.ConfigVersion = 3;
+                updateProfileItems.Add(item);
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog($"MigrateProfileExtraGroup item error [{item.IndexId}]: {ex}");
+            }
+        }
+
+        if (updateProfileItems.Count > 0)
+        {
+            try
+            {
+                var count = await SQLiteHelper.Instance.UpdateAllAsync(updateProfileItems);
+                Logging.SaveLog($"MigrateProfileExtraGroup: Successfully updated {updateProfileItems.Count} items.");
+                return updateProfileItems.Count == count;
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog($"MigrateProfileExtraGroup update error: {ex}");
+                return false;
+            }
+        }
+
+        return true;
+
+        //await ProfileGroupItemManager.Instance.ClearAll();
+#pragma warning restore CS0618
+    }
+
     #endregion SqliteHelper
 
     #region Core Type

v2rayN/ServiceLib/Manager/GroupProfileManager.cs

@@ -12,7 +12,7 @@ public class GroupProfileManager
         return await HasCycle(indexId, extraInfo, new HashSet<string>(), new HashSet<string>());
     }
 
-    public static async Task<bool> HasCycle(string? indexId, ProtocolExtraItem? extraInfo, HashSet<string> visited, HashSet<string> stack)
+    private static async Task<bool> HasCycle(string? indexId, ProtocolExtraItem? extraInfo, HashSet<string> visited, HashSet<string> stack)
     {
         if (indexId.IsNullOrEmpty() || extraInfo == null)
         {
@@ -81,14 +81,15 @@ public class GroupProfileManager
         {
             return new();
         }
-        var items = await GetSelectedChildProfileItems(protocolExtra);
-        var subItems = await GetSubChildProfileItems(protocolExtra);
-        items.AddRange(subItems);
+
+        var items = new List<ProfileItem>();
+        items.AddRange(await GetSubChildProfileItems(protocolExtra));
+        items.AddRange(await GetSelectedChildProfileItems(protocolExtra));
 
         return items;
     }
 
-    public static async Task<List<ProfileItem>> GetSelectedChildProfileItems(ProtocolExtraItem? extra)
+    private static async Task<List<ProfileItem>> GetSelectedChildProfileItems(ProtocolExtraItem? extra)
     {
         if (extra == null || extra.ChildItems.IsNullOrEmpty())
         {
@@ -105,10 +106,10 @@ public class GroupProfileManager
                 p.ConfigType != EConfigType.Custom
             )
             .ToList();
-        return childProfiles;
+        return childProfiles ?? new();
     }
 
-    public static async Task<List<ProfileItem>> GetSubChildProfileItems(ProtocolExtraItem? extra)
+    private static async Task<List<ProfileItem>> GetSubChildProfileItems(ProtocolExtraItem? extra)
     {
         if (extra == null || extra.SubChildItems.IsNullOrEmpty())
         {

v2rayN/ServiceLib/Models/ConfigItems.cs

@@ -99,7 +99,7 @@ public class UIItem
     public bool EnableDragDropSort { get; set; }
     public bool DoubleClick2Activate { get; set; }
     public bool AutoHideStartup { get; set; }
-    public bool Hide2TrayWhenClose { get; set; }    
+    public bool Hide2TrayWhenClose { get; set; }
     public bool MacOSShowInDock { get; set; }
     public List<ColumnItem> MainColumnItem { get; set; }
     public List<WindowSizeItem> WindowSizeItem { get; set; }

v2rayN/ServiceLib/Models/ProfileItem.cs

@@ -1,7 +1,7 @@
 namespace ServiceLib.Models;
 
 [Serializable]
-public class ProfileItem : ReactiveObject
+public class ProfileItem
 {
     private ProtocolExtraItem? _protocolExtraCache;
 
@@ -10,6 +10,7 @@ public class ProfileItem : ReactiveObject
         IndexId = string.Empty;
         ConfigType = EConfigType.VMess;
         ConfigVersion = 3;
+        Subid = string.Empty;
         Address = string.Empty;
         Port = 0;
         Password = string.Empty;
@@ -21,7 +22,6 @@ public class ProfileItem : ReactiveObject
         Path = string.Empty;
         StreamSecurity = string.Empty;
         AllowInsecure = string.Empty;
-        Subid = string.Empty;
     }
 
     #region function
@@ -148,26 +148,26 @@ public class ProfileItem : ReactiveObject
     public string IndexId { get; set; }
 
     public EConfigType ConfigType { get; set; }
+    public ECoreType? CoreType { get; set; }
     public int ConfigVersion { get; set; }
+    public string Subid { get; set; }
+    public bool IsSub { get; set; } = true;
+    public int? PreSocksPort { get; set; }
+    public bool DisplayLog { get; set; } = true;
+    public string Remarks { get; set; }
     public string Address { get; set; }
     public int Port { get; set; }
     public string Password { get; set; }
     public string Username { get; set; }
     public string Network { get; set; }
-    public string Remarks { get; set; }
     public string HeaderType { get; set; }
     public string RequestHost { get; set; }
     public string Path { get; set; }
     public string StreamSecurity { get; set; }
     public string AllowInsecure { get; set; }
-    public string Subid { get; set; }
-    public bool IsSub { get; set; } = true;
     public string Sni { get; set; }
     public string Alpn { get; set; } = string.Empty;
-    public ECoreType? CoreType { get; set; }
-    public int? PreSocksPort { get; set; }
     public string Fingerprint { get; set; }
-    public bool DisplayLog { get; set; } = true;
     public string PublicKey { get; set; }
     public string ShortId { get; set; }
     public string SpiderX { get; set; }

v2rayN/ServiceLib/Models/ProfileItemModel.cs

@@ -1,16 +1,24 @@
 namespace ServiceLib.Models;
 
 [Serializable]
-public class ProfileItemModel : ProfileItem
+public class ProfileItemModel : ReactiveObject
 {
     public bool IsActive { get; set; }
+    public string IndexId { get; set; }
+    public EConfigType ConfigType { get; set; }
+    public string Remarks { get; set; }
+    public string Address { get; set; }
+    public int Port { get; set; }
+    public string Network { get; set; }
+    public string StreamSecurity { get; set; }
+    public string Subid { get; set; }
     public string SubRemarks { get; set; }
+    public int Sort { get; set; }
 
     [Reactive]
     public int Delay { get; set; }
 
     public decimal Speed { get; set; }
-    public int Sort { get; set; }
 
     [Reactive]
     public string DelayVal { get; set; }
@@ -29,4 +37,15 @@ public class ProfileItemModel : ProfileItem
 
     [Reactive]
     public string TotalDown { get; set; }
+
+    public string GetSummary()
+    {
+        var summary = $"[{ConfigType}] {Remarks}";
+        if (!ConfigType.IsComplexType())
+        {
+            summary += $"({Address}:{Port})";
+        }
+
+        return summary;
+    }
 }

v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs

@@ -49,12 +49,15 @@ public class AddServerViewModel : MyReactiveObject
 
     [Reactive]
     public string WgPublicKey { get; set; }
+
     //[Reactive]
     //public string WgPresharedKey { get; set; }
     [Reactive]
     public string WgInterfaceAddress { get; set; }
+
     [Reactive]
     public string WgReserved { get; set; }
+
     [Reactive]
     public int WgMtu { get; set; }
 

v2rayN/ServiceLib/ViewModels/ProfilesSelectViewModel.cs

@@ -200,7 +200,7 @@ public class ProfilesSelectViewModel : MyReactiveObject
 
     private async Task<List<ProfileItemModel>?> GetProfileItemsEx(string subid, string filter)
     {
-        var lstModel = await AppManager.Instance.ProfileItems(_subIndexId, filter);
+        var lstModel = await AppManager.Instance.ProfileModels(_subIndexId, filter);
         lstModel = (from t in lstModel
                     select new ProfileItemModel
                     {

v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs

@@ -56,7 +56,7 @@ public class ProfilesViewModel : MyReactiveObject
 
     public ReactiveCommand<Unit, Unit> MoveUpCmd { get; }
     public ReactiveCommand<Unit, Unit> MoveDownCmd { get; }
-    public ReactiveCommand<Unit, Unit> MoveBottomCmd { get; } 
+    public ReactiveCommand<Unit, Unit> MoveBottomCmd { get; }
     public ReactiveCommand<SubItem, Unit> MoveToGroupCmd { get; }
 
     //servers ping
@@ -428,7 +428,7 @@ public class ProfilesViewModel : MyReactiveObject
 
     private async Task<List<ProfileItemModel>?> GetProfileItemsEx(string subid, string filter)
     {
-        var lstModel = await AppManager.Instance.ProfileItems(_config.SubIndexId, filter);
+        var lstModel = await AppManager.Instance.ProfileModels(_config.SubIndexId, filter);
 
         await ConfigHandler.SetDefaultServer(_config, lstModel);
 

v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs

@@ -303,7 +303,7 @@ public class StatusBarViewModel : MyReactiveObject
 
     private async Task RefreshServersMenu()
     {
-        var lstModel = await AppManager.Instance.ProfileItems(_config.SubIndexId, "");
+        var lstModel = await AppManager.Instance.ProfileModels(_config.SubIndexId, "");
 
         Servers.Clear();
         if (lstModel.Count > _config.GuiItem.TrayMenuServersLimit)
@@ -315,7 +315,7 @@ public class StatusBarViewModel : MyReactiveObject
         BlServers = true;
         for (var k = 0; k < lstModel.Count; k++)
         {
-            ProfileItem it = lstModel[k];
+            var it = lstModel[k];
             var name = it.GetSummary();
 
             var item = new ComboItem() { ID = it.IndexId, Text = name };