Skip to content

Refactor profile item config #8659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
2dust merged 22 commits into from
Feb 5, 2026
Merged

Refactor profile item config #8659

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
a6b12aa
Refactor
DHR60 Dec 25, 2025
1c2d086
Add hysteria2 bandwidth and hop interval support
DHR60 Jan 17, 2026
2d45035
Upgrade config version and rename
DHR60 Jan 19, 2026
ee7d3c6
Refactor id and security
DHR60 Jan 21, 2026
82443a6
Refactor flow
DHR60 Jan 21, 2026
7bfd2f5
Fix hy2 bbr
DHR60 Jan 21, 2026
189ab47
Fix warning CS0618
DHR60 Jan 21, 2026
0eae23a
Remove unused code
DHR60 Jan 21, 2026
2c454ae
Fix hy2 migrate
DHR60 Jan 21, 2026
274fc80
Fix
DHR60 Jan 21, 2026
323bf70
Refactor
DHR60 Jan 21, 2026
3b826e3
Refactor ProfileItem protocol extra handling
2dust Jan 21, 2026
37734d2
Refactor, use record instead of class
DHR60 Jan 21, 2026
314fb7c
Hy2 SalamanderPass
DHR60 Feb 5, 2026
fa8c3f3
Fix Tuic
DHR60 Feb 5, 2026
1b79d2f
Fix group
DHR60 Feb 5, 2026
ad685fc
Fix Tuic
DHR60 Feb 5, 2026
6d95366
Fix hy2 Brutal Bandwidth
DHR60 Feb 5, 2026
e2cd306
Clean Code
DHR60 Feb 5, 2026
e47dc40
Fix
DHR60 Feb 5, 2026
6810483
Support interval range
DHR60 Feb 5, 2026
0667743
Add Username
DHR60 Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix
  • Loading branch information
@DHR60
DHR60 committed Feb 5, 2026
commit e47dc40488704e0c209bb3afaa4213840b2c29df
57 changes: 37 additions & 20 deletions v2rayN/ServiceLib/Manager/AppManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,10 @@ public bool InitComponents()
_ = StatePort;
_ = StatePort2;

_ = MigrateProfileExtra();
Task.Run(async () =>
{
await MigrateProfileExtra();
}).Wait();

return true;
}
Expand Down Expand Up @@ -277,29 +280,33 @@ public async Task MigrateProfileExtra()
break;
}

var batchSuccessCount = 0;
foreach (var item in batch)
{
var extra = item.GetProtocolExtra();

if (item.ConfigType is EConfigType.PolicyGroup or EConfigType.ProxyChain)
try
{
extra = extra with { GroupType = nameof(item.ConfigType) };
groupItems.TryGetValue(item.IndexId, out var groupItem);
if (groupItem != null && !groupItem.NotHasChild())
var extra = item.GetProtocolExtra();

if (item.ConfigType is EConfigType.PolicyGroup or EConfigType.ProxyChain)
{
extra = extra with
extra = extra with { GroupType = nameof(item.ConfigType) };
groupItems.TryGetValue(item.IndexId, out var groupItem);
if (groupItem != null && !groupItem.NotHasChild())
{
ChildItems = groupItem.ChildItems,
SubChildItems = groupItem.SubChildItems,
Filter = groupItem.Filter,
MultipleLoad = groupItem.MultipleLoad,
};
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() };
extra = extra with { SsMethod = item.Security.NullIfEmpty() };
break;
case EConfigType.VMess:
extra = extra with
Expand All @@ -312,6 +319,7 @@ public async Task MigrateProfileExtra()
extra = extra with
{
Flow = item.Flow.NullIfEmpty(),
VlessEncryption = item.Security,
};
break;
case EConfigType.Hysteria2:
Expand Down Expand Up @@ -341,18 +349,27 @@ public async Task MigrateProfileExtra()
WgMtu = int.TryParse(item.ShortId, out var mtu) ? mtu : 1280
};
break;
default:
break;
}
}

item.SetProtocolExtra(extra);
item.SetProtocolExtra(extra);

item.Password = item.Id;
item.Password = item.Id;

item.ConfigVersion = 3;
await SQLiteHelper.Instance.UpdateAsync(item);
item.ConfigVersion = 3;
await SQLiteHelper.Instance.UpdateAsync(item);
batchSuccessCount++;
}
catch (Exception ex)
{
Logging.SaveLog($"MigrateProfileExtra Error: {ex}");
}
}

offset += pageSize;
// 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
offset += batch.Count - batchSuccessCount;
}

//await ProfileGroupItemManager.Instance.ClearAll();
Expand Down
6 changes: 3 additions & 3 deletions v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,13 @@ private async Task<int> GenOutbound(ProfileItem node, Outbound4Sbox outbound)

outbound.packet_encoding = "xudp";

if (protocolExtra.Flow.IsNullOrEmpty())
if (!protocolExtra.Flow.IsNullOrEmpty())
{
await GenOutboundMux(node, outbound);
outbound.flow = protocolExtra.Flow;
}
else
{
outbound.flow = protocolExtra.Flow;
await GenOutboundMux(node, outbound);
}

await GenOutboundTransport(node, outbound);
Expand Down
5 changes: 2 additions & 3 deletions v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,13 +144,12 @@ private async Task<int> GenOutbound(ProfileItem node, Outbounds4Ray outbound)
usersItem.email = Global.UserEMail;
usersItem.encryption = protocolExtra.VlessEncryption;

if (protocolExtra.Flow.IsNullOrEmpty())
if (!protocolExtra.Flow.IsNullOrEmpty())
{
await GenOutboundMux(node, outbound, muxEnabled, muxEnabled);
usersItem.flow = protocolExtra.Flow;
}
else
{
usersItem.flow = protocolExtra.Flow;
await GenOutboundMux(node, outbound, false, muxEnabled);
}
outbound.settings.servers = null;
Expand Down