Refactor models into sub-namespaces

2dust · 2dust · commit 8090799ccc7c · 2026-05-11T11:00:19.000+08:00
Move many model classes into new sub-namespaces (ServiceLib.Models.CoreConfigs, ServiceLib.Models.Configs, ServiceLib.Models.Dto, ServiceLib.Models.Entities). Update GlobalUsings in ServiceLib, v2rayN.Desktop, v2rayN and add a tests GlobalUsings file to reference the new namespaces. Adjust static using directives in ClashApiManager and ClashProxiesViewModel to use ServiceLib.Models.Dto. This is a reorganization/rename of files and namespaces with no functional changes.
diff --git a/v2rayN/ServiceLib.Tests/GlobalUsings.cs b/v2rayN/ServiceLib.Tests/GlobalUsings.cs
@@ -0,0 +1,40 @@
+global using System.Collections.Concurrent;
+global using System.Diagnostics;
+global using System.Net;
+global using System.Net.NetworkInformation;
+global using System.Net.Sockets;
+global using System.Reactive;
+global using System.Reactive.Disposables;
+global using System.Reactive.Linq;
+global using System.Reflection;
+global using System.Runtime.InteropServices;
+global using System.Security.Cryptography;
+global using System.Text;
+global using System.Text.Encodings.Web;
+global using System.Text.Json;
+global using System.Text.Json.Nodes;
+global using System.Text.Json.Serialization;
+global using System.Text.RegularExpressions;
+global using DynamicData;
+global using DynamicData.Binding;
+global using ReactiveUI;
+global using ReactiveUI.Fody.Helpers;
+global using ServiceLib.Base;
+global using ServiceLib.Common;
+global using ServiceLib.Enums;
+global using ServiceLib.Events;
+global using ServiceLib.Handler;
+global using ServiceLib.Handler.Builder;
+global using ServiceLib.Handler.Fmt;
+global using ServiceLib.Handler.SysProxy;
+global using ServiceLib.Helper;
+global using ServiceLib.Manager;
+global using ServiceLib.Models.CoreConfigs;
+global using ServiceLib.Models.Configs;
+global using ServiceLib.Models.Dto;
+global using ServiceLib.Models.Entities;
+global using ServiceLib.Resx;
+global using ServiceLib.Services;
+global using ServiceLib.Services.CoreConfig;
+global using ServiceLib.Services.Statistics;
+global using SQLite;
diff --git a/v2rayN/ServiceLib/GlobalUsings.cs b/v2rayN/ServiceLib/GlobalUsings.cs
@@ -29,7 +29,10 @@
 global using ServiceLib.Handler.SysProxy;
 global using ServiceLib.Helper;
 global using ServiceLib.Manager;
-global using ServiceLib.Models;
+global using ServiceLib.Models.CoreConfigs;
+global using ServiceLib.Models.Configs;
+global using ServiceLib.Models.Dto;
+global using ServiceLib.Models.Entities;
 global using ServiceLib.Resx;
 global using ServiceLib.Services;
 global using ServiceLib.Services.CoreConfig;
diff --git a/v2rayN/ServiceLib/Manager/ClashApiManager.cs b/v2rayN/ServiceLib/Manager/ClashApiManager.cs
@@ -1,4 +1,4 @@
-using static ServiceLib.Models.ClashProxies;
+using static ServiceLib.Models.Dto.ClashProxies;
 
 namespace ServiceLib.Manager;
 
diff --git a/v2rayN/ServiceLib/Models/Configs/Config.cs b/v2rayN/ServiceLib/Models/Configs/Config.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.Configs;
 
 [Serializable]
 public class Config
diff --git a/v2rayN/ServiceLib/Models/Configs/ConfigItems.cs b/v2rayN/ServiceLib/Models/Configs/ConfigItems.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.Configs;
 
 [Serializable]
 public class CoreBasicItem
diff --git a/v2rayN/ServiceLib/Models/CoreConfigs/CoreConfigContext.cs b/v2rayN/ServiceLib/Models/CoreConfigs/CoreConfigContext.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.CoreConfigs;
 
 public record CoreConfigContext
 {
diff --git a/v2rayN/ServiceLib/Models/CoreConfigs/CoreInfo.cs b/v2rayN/ServiceLib/Models/CoreConfigs/CoreInfo.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.CoreConfigs;
 
 [Serializable]
 public class CoreInfo
diff --git a/v2rayN/ServiceLib/Models/CoreConfigs/SingboxConfig.cs b/v2rayN/ServiceLib/Models/CoreConfigs/SingboxConfig.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.CoreConfigs;
 
 public class SingboxConfig
 {
diff --git a/v2rayN/ServiceLib/Models/CoreConfigs/V2rayConfig.cs b/v2rayN/ServiceLib/Models/CoreConfigs/V2rayConfig.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.CoreConfigs;
 
 public class V2rayConfig
 {
diff --git a/v2rayN/ServiceLib/Models/CoreConfigs/V2rayMetricsVars.cs b/v2rayN/ServiceLib/Models/CoreConfigs/V2rayMetricsVars.cs
@@ -1,6 +1,6 @@
 using System.Collections;
 
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.CoreConfigs;
 
 internal class V2rayMetricsVars
 {
diff --git a/v2rayN/ServiceLib/Models/CoreConfigs/V2rayTcpRequest.cs b/v2rayN/ServiceLib/Models/CoreConfigs/V2rayTcpRequest.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.CoreConfigs;
 
 public class V2rayTcpRequest
 {
diff --git a/v2rayN/ServiceLib/Models/Dto/CheckUpdateModel.cs b/v2rayN/ServiceLib/Models/Dto/CheckUpdateModel.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.Dto;
 
 public class CheckUpdateModel : ReactiveObject
 {
diff --git a/v2rayN/ServiceLib/Models/Dto/ClashConnectionModel.cs b/v2rayN/ServiceLib/Models/Dto/ClashConnectionModel.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.Dto;
 
 public class ClashConnectionModel
 {
diff --git a/v2rayN/ServiceLib/Models/Dto/ClashConnections.cs b/v2rayN/ServiceLib/Models/Dto/ClashConnections.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.Dto;
 
 public class ClashConnections
 {
diff --git a/v2rayN/ServiceLib/Models/Dto/ClashProviders.cs b/v2rayN/ServiceLib/Models/Dto/ClashProviders.cs
@@ -1,6 +1,6 @@
-using static ServiceLib.Models.ClashProxies;
+using static ServiceLib.Models.Dto.ClashProxies;
 
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.Dto;
 
 public class ClashProviders
 {
diff --git a/v2rayN/ServiceLib/Models/Dto/ClashProxies.cs b/v2rayN/ServiceLib/Models/Dto/ClashProxies.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.Dto;
 
 public class ClashProxies
 {
diff --git a/v2rayN/ServiceLib/Models/Dto/ClashProxyModel.cs b/v2rayN/ServiceLib/Models/Dto/ClashProxyModel.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.Dto;
 
 [Serializable]
 public class ClashProxyModel : ReactiveObject
diff --git a/v2rayN/ServiceLib/Models/Dto/CmdItem.cs b/v2rayN/ServiceLib/Models/Dto/CmdItem.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.Dto;
 
 public class CmdItem
 {
diff --git a/v2rayN/ServiceLib/Models/Dto/ComboItem.cs b/v2rayN/ServiceLib/Models/Dto/ComboItem.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.Dto;
 
 public class ComboItem
 {
diff --git a/v2rayN/ServiceLib/Models/Dto/GitHubRelease.cs b/v2rayN/ServiceLib/Models/Dto/GitHubRelease.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.Dto;
 
 public class GitHubReleaseAsset
 {
diff --git a/v2rayN/ServiceLib/Models/Dto/IPAPIInfo.cs b/v2rayN/ServiceLib/Models/Dto/IPAPIInfo.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.Dto;
 
 internal class IPAPIInfo
 {
diff --git a/v2rayN/ServiceLib/Models/Dto/ProfileItemModel.cs b/v2rayN/ServiceLib/Models/Dto/ProfileItemModel.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.Dto;
 
 [Serializable]
 public class ProfileItemModel : ReactiveObject
diff --git a/v2rayN/ServiceLib/Models/Dto/RetResult.cs b/v2rayN/ServiceLib/Models/Dto/RetResult.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.Dto;
 
 public class RetResult
 {
diff --git a/v2rayN/ServiceLib/Models/Dto/RoutingItemModel.cs b/v2rayN/ServiceLib/Models/Dto/RoutingItemModel.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.Dto;
 
 [Serializable]
 public class RoutingItemModel : RoutingItem
diff --git a/v2rayN/ServiceLib/Models/Dto/RoutingTemplate.cs b/v2rayN/ServiceLib/Models/Dto/RoutingTemplate.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.Dto;
 
 [Serializable]
 public class RoutingTemplate
diff --git a/v2rayN/ServiceLib/Models/Dto/RulesItemModel.cs b/v2rayN/ServiceLib/Models/Dto/RulesItemModel.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.Dto;
 
 [Serializable]
 public class RulesItemModel : RulesItem
diff --git a/v2rayN/ServiceLib/Models/Dto/SemanticVersion.cs b/v2rayN/ServiceLib/Models/Dto/SemanticVersion.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.Dto;
 
 public class SemanticVersion
 {
diff --git a/v2rayN/ServiceLib/Models/Dto/ServerSpeedItem.cs b/v2rayN/ServiceLib/Models/Dto/ServerSpeedItem.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.Dto;
 
 [Serializable]
 public class ServerSpeedItem : ServerStatItem
diff --git a/v2rayN/ServiceLib/Models/Dto/ServerTestItem.cs b/v2rayN/ServiceLib/Models/Dto/ServerTestItem.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.Dto;
 
 [Serializable]
 public class ServerTestItem
diff --git a/v2rayN/ServiceLib/Models/Dto/SpeedTestResult.cs b/v2rayN/ServiceLib/Models/Dto/SpeedTestResult.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.Dto;
 
 [Serializable]
 public class SpeedTestResult
diff --git a/v2rayN/ServiceLib/Models/Dto/SsSIP008.cs b/v2rayN/ServiceLib/Models/Dto/SsSIP008.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.Dto;
 
 public class SsSIP008
 {
diff --git a/v2rayN/ServiceLib/Models/Dto/UpdateResult.cs b/v2rayN/ServiceLib/Models/Dto/UpdateResult.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.Dto;
 
 public class UpdateResult
 {
diff --git a/v2rayN/ServiceLib/Models/Dto/VmessQRCode.cs b/v2rayN/ServiceLib/Models/Dto/VmessQRCode.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.Dto;
 
 /// <summary>
 /// https://github.com/2dust/v2rayN/wiki/
diff --git a/v2rayN/ServiceLib/Models/Entities/DNSItem.cs b/v2rayN/ServiceLib/Models/Entities/DNSItem.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.Entities;
 
 [Serializable]
 public class DNSItem
diff --git a/v2rayN/ServiceLib/Models/Entities/FullConfigTemplateItem.cs b/v2rayN/ServiceLib/Models/Entities/FullConfigTemplateItem.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.Entities;
 
 [Serializable]
 public class FullConfigTemplateItem
diff --git a/v2rayN/ServiceLib/Models/Entities/ProfileExItem.cs b/v2rayN/ServiceLib/Models/Entities/ProfileExItem.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.Entities;
 
 [Serializable]
 public class ProfileExItem
diff --git a/v2rayN/ServiceLib/Models/Entities/ProfileGroupItem.cs b/v2rayN/ServiceLib/Models/Entities/ProfileGroupItem.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.Entities;
 
 [Obsolete("Use ProtocolExtraItem instead.")]
 [Serializable]
diff --git a/v2rayN/ServiceLib/Models/Entities/ProfileItem.cs b/v2rayN/ServiceLib/Models/Entities/ProfileItem.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.Entities;
 
 [Serializable]
 public class ProfileItem
diff --git a/v2rayN/ServiceLib/Models/Entities/ProtocolExtraItem.cs b/v2rayN/ServiceLib/Models/Entities/ProtocolExtraItem.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.Entities;
 
 public record ProtocolExtraItem
 {
diff --git a/v2rayN/ServiceLib/Models/Entities/RoutingItem.cs b/v2rayN/ServiceLib/Models/Entities/RoutingItem.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.Entities;
 
 [Serializable]
 public class RoutingItem
diff --git a/v2rayN/ServiceLib/Models/Entities/RulesItem.cs b/v2rayN/ServiceLib/Models/Entities/RulesItem.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.Entities;
 
 [Serializable]
 public class RulesItem
diff --git a/v2rayN/ServiceLib/Models/Entities/ServerStatItem.cs b/v2rayN/ServiceLib/Models/Entities/ServerStatItem.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.Entities;
 
 [Serializable]
 public class ServerStatItem
diff --git a/v2rayN/ServiceLib/Models/Entities/SubItem.cs b/v2rayN/ServiceLib/Models/Entities/SubItem.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.Entities;
 
 [Serializable]
 public class SubItem
diff --git a/v2rayN/ServiceLib/Models/Entities/TransportExtraItem.cs b/v2rayN/ServiceLib/Models/Entities/TransportExtraItem.cs
@@ -1,4 +1,4 @@
-namespace ServiceLib.Models;
+namespace ServiceLib.Models.Entities;
 
 public record TransportExtraItem
 {
diff --git a/v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs b/v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs
@@ -1,6 +1,6 @@
 using System.Reactive.Concurrency;
-using static ServiceLib.Models.ClashProviders;
-using static ServiceLib.Models.ClashProxies;
+using static ServiceLib.Models.Dto.ClashProviders;
+using static ServiceLib.Models.Dto.ClashProxies;
 
 namespace ServiceLib.ViewModels;
 
diff --git a/v2rayN/v2rayN.Desktop/GlobalUsings.cs b/v2rayN/v2rayN.Desktop/GlobalUsings.cs
@@ -30,6 +30,9 @@
 global using ServiceLib.Events;
 global using ServiceLib.Handler;
 global using ServiceLib.Manager;
-global using ServiceLib.Models;
+global using ServiceLib.Models.CoreConfigs;
+global using ServiceLib.Models.Configs;
+global using ServiceLib.Models.Dto;
+global using ServiceLib.Models.Entities;
 global using ServiceLib.Resx;
 global using ServiceLib.ViewModels;
diff --git a/v2rayN/v2rayN/GlobalUsings.cs b/v2rayN/v2rayN/GlobalUsings.cs
@@ -29,7 +29,10 @@
 global using ServiceLib.Events;
 global using ServiceLib.Handler;
 global using ServiceLib.Manager;
-global using ServiceLib.Models;
+global using ServiceLib.Models.CoreConfigs;
+global using ServiceLib.Models.Configs;
+global using ServiceLib.Models.Dto;
+global using ServiceLib.Models.Entities;
 global using ServiceLib.Resx;
 global using ServiceLib.ViewModels;
 global using v2rayN.Common;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using static ServiceLib.Models.ClashProxies;`
	`1`	`+using static ServiceLib.Models.Dto.ClashProxies;`
`2`	`2`
`3`	`3`	`namespace ServiceLib.Manager;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace ServiceLib.Models;`
	`1`	`+namespace ServiceLib.Models.Configs;`
`2`	`2`
`3`	`3`	`[Serializable]`
`4`	`4`	`public class Config`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace ServiceLib.Models;`
	`1`	`+namespace ServiceLib.Models.CoreConfigs;`
`2`	`2`
`3`	`3`	`public record CoreConfigContext`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System.Collections;`
`2`	`2`
`3`		`-namespace ServiceLib.Models;`
	`3`	`+namespace ServiceLib.Models.CoreConfigs;`
`4`	`4`
`5`	`5`	`internal class V2rayMetricsVars`
`6`	`6`	`{`