Refactor models into sub-namespaces

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.

v2rayN/ServiceLib/Models/Dto/CheckUpdateModel.cs

@@ -0,0 +1,10 @@
+namespace ServiceLib.Models.Dto;
+
+public class CheckUpdateModel : ReactiveObject
+{
+    public bool? IsSelected { get; set; }
+    public string? CoreType { get; set; }
+    [Reactive] public string? Remarks { get; set; }
+    public string? FileName { get; set; }
+    public bool? IsFinished { get; set; }
+}

v2rayN/ServiceLib/Models/Dto/ClashConnectionModel.cs

@@ -0,0 +1,16 @@
+namespace ServiceLib.Models.Dto;
+
+public class ClashConnectionModel
+{
+    public string? Id { get; set; }
+    public string? Network { get; set; }
+    public string? Type { get; set; }
+    public string? Host { get; set; }
+    public ulong Upload { get; set; }
+    public ulong Download { get; set; }
+    public string? UploadTraffic { get; set; }
+    public string? DownloadTraffic { get; set; }
+    public double Time { get; set; }
+    public string? Elapsed { get; set; }
+    public string? Chain { get; set; }
+}

v2rayN/ServiceLib/Models/Dto/ClashConnections.cs

@@ -0,0 +1,36 @@
+namespace ServiceLib.Models.Dto;
+
+public class ClashConnections
+{
+    public ulong downloadTotal { get; set; }
+    public ulong uploadTotal { get; set; }
+    public List<ConnectionItem>? connections { get; set; }
+}
+
+public class ConnectionItem
+{
+    public string? id { get; set; }
+    public MetadataItem? metadata { get; set; }
+    public ulong upload { get; set; }
+    public ulong download { get; set; }
+    public DateTime start { get; set; }
+    public List<string>? chains { get; set; }
+    public string? rule { get; set; }
+    public string? rulePayload { get; set; }
+}
+
+public class MetadataItem
+{
+    public string? network { get; set; }
+    public string? type { get; set; }
+    public string? sourceIP { get; set; }
+    public string? destinationIP { get; set; }
+    public string? sourcePort { get; set; }
+    public string? destinationPort { get; set; }
+    public string? host { get; set; }
+    public string? nsMode { get; set; }
+    public object? uid { get; set; }
+    public string? process { get; set; }
+    public string? processPath { get; set; }
+    public string? remoteDestination { get; set; }
+}

v2rayN/ServiceLib/Models/Dto/ClashProviders.cs

@@ -0,0 +1,16 @@
+using static ServiceLib.Models.Dto.ClashProxies;
+
+namespace ServiceLib.Models.Dto;
+
+public class ClashProviders
+{
+    public Dictionary<string, ProvidersItem>? providers { get; set; }
+
+    public class ProvidersItem
+    {
+        public string? name { get; set; }
+        public List<ProxiesItem>? proxies { get; set; }
+        public string? type { get; set; }
+        public string? vehicleType { get; set; }
+    }
+}

v2rayN/ServiceLib/Models/Dto/ClashProxies.cs

@@ -0,0 +1,23 @@
+namespace ServiceLib.Models.Dto;
+
+public class ClashProxies
+{
+    public Dictionary<string, ProxiesItem>? proxies { get; set; }
+
+    public class ProxiesItem
+    {
+        public List<string>? all { get; set; }
+        public List<HistoryItem>? history { get; set; }
+        public string? name { get; set; }
+        public string? type { get; set; }
+        public bool udp { get; set; }
+        public string? now { get; set; }
+        public int delay { get; set; }
+    }
+
+    public class HistoryItem
+    {
+        public string? time { get; set; }
+        public int delay { get; set; }
+    }
+}

v2rayN/ServiceLib/Models/Dto/ClashProxyModel.cs

@@ -0,0 +1,17 @@
+namespace ServiceLib.Models.Dto;
+
+[Serializable]
+public class ClashProxyModel : ReactiveObject
+{
+    public string? Name { get; set; }
+
+    public string? Type { get; set; }
+
+    public string? Now { get; set; }
+
+    [Reactive] public int Delay { get; set; }
+
+    [Reactive] public string? DelayName { get; set; }
+
+    public bool IsActive { get; set; }
+}

v2rayN/ServiceLib/Models/Dto/CmdItem.cs

@@ -0,0 +1,7 @@
+namespace ServiceLib.Models.Dto;
+
+public class CmdItem
+{
+    public string? Cmd { get; set; }
+    public List<string>? Arguments { get; set; }
+}

v2rayN/ServiceLib/Models/Dto/ComboItem.cs

@@ -0,0 +1,14 @@
+namespace ServiceLib.Models.Dto;
+
+public class ComboItem
+{
+    public string? ID
+    {
+        get; set;
+    }
+
+    public string? Text
+    {
+        get; set;
+    }
+}

v2rayN/ServiceLib/Models/Dto/GitHubRelease.cs

@@ -0,0 +1,65 @@
+namespace ServiceLib.Models.Dto;
+
+public class GitHubReleaseAsset
+{
+    [JsonPropertyName("url")] public string? Url { get; set; }
+
+    [JsonPropertyName("id")] public int Id { get; set; }
+
+    [JsonPropertyName("node_id")] public string? NodeId { get; set; }
+
+    [JsonPropertyName("name")] public string? Name { get; set; }
+
+    [JsonPropertyName("label")] public object Label { get; set; }
+
+    [JsonPropertyName("content_type")] public string? ContentType { get; set; }
+
+    [JsonPropertyName("state")] public string? State { get; set; }
+
+    [JsonPropertyName("size")] public int Size { get; set; }
+
+    [JsonPropertyName("download_count")] public int DownloadCount { get; set; }
+
+    [JsonPropertyName("created_at")] public DateTime CreatedAt { get; set; }
+
+    [JsonPropertyName("updated_at")] public DateTime UpdatedAt { get; set; }
+
+    [JsonPropertyName("browser_download_url")] public string? BrowserDownloadUrl { get; set; }
+}
+
+public class GitHubRelease
+{
+    [JsonPropertyName("url")] public string? Url { get; set; }
+
+    [JsonPropertyName("assets_url")] public string? AssetsUrl { get; set; }
+
+    [JsonPropertyName("upload_url")] public string? UploadUrl { get; set; }
+
+    [JsonPropertyName("html_url")] public string? HtmlUrl { get; set; }
+
+    [JsonPropertyName("id")] public int Id { get; set; }
+
+    [JsonPropertyName("node_id")] public string? NodeId { get; set; }
+
+    [JsonPropertyName("tag_name")] public string? TagName { get; set; }
+
+    [JsonPropertyName("target_commitish")] public string? TargetCommitish { get; set; }
+
+    [JsonPropertyName("name")] public string? Name { get; set; }
+
+    [JsonPropertyName("draft")] public bool Draft { get; set; }
+
+    [JsonPropertyName("prerelease")] public bool Prerelease { get; set; }
+
+    [JsonPropertyName("created_at")] public DateTime CreatedAt { get; set; }
+
+    [JsonPropertyName("published_at")] public DateTime PublishedAt { get; set; }
+
+    [JsonPropertyName("assets")] public List<GitHubReleaseAsset> Assets { get; set; }
+
+    [JsonPropertyName("tarball_url")] public string? TarballUrl { get; set; }
+
+    [JsonPropertyName("zipball_url")] public string? ZipballUrl { get; set; }
+
+    [JsonPropertyName("body")] public string? Body { get; set; }
+}

v2rayN/ServiceLib/Models/Dto/IPAPIInfo.cs

@@ -0,0 +1,19 @@
+namespace ServiceLib.Models.Dto;
+
+internal class IPAPIInfo
+{
+    public string? ip { get; set; }
+    public string? clientIp { get; set; }
+    public string? ip_addr { get; set; }
+    public string? query { get; set; }
+    public string? country { get; set; }
+    public string? country_name { get; set; }
+    public string? country_code { get; set; }
+    public string? countryCode { get; set; }
+    public LocationInfo? location { get; set; }
+}
+
+public class LocationInfo
+{
+    public string? country_code { get; set; }
+}

v2rayN/ServiceLib/Models/Dto/ProfileItemModel.cs

@@ -0,0 +1,51 @@
+namespace ServiceLib.Models.Dto;
+
+[Serializable]
+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; }
+
+    [Reactive]
+    public string DelayVal { get; set; }
+
+    [Reactive]
+    public string SpeedVal { get; set; }
+
+    [Reactive]
+    public string TodayUp { get; set; }
+
+    [Reactive]
+    public string TodayDown { get; set; }
+
+    [Reactive]
+    public string TotalUp { get; set; }
+
+    [Reactive]
+    public string TotalDown { get; set; }
+
+    public string GetSummary()
+    {
+        var summary = $"[{ConfigType}] {Remarks}";
+        if (!ConfigType.IsComplexType())
+        {
+            summary += $"({Address}:{Port})";
+        }
+
+        return summary;
+    }
+}

v2rayN/ServiceLib/Models/Dto/RetResult.cs

@@ -0,0 +1,26 @@
+namespace ServiceLib.Models.Dto;
+
+public class RetResult
+{
+    public bool Success { get; set; }
+    public string? Msg { get; set; }
+    public object? Data { get; set; }
+
+    public RetResult(bool success = false)
+    {
+        Success = success;
+    }
+
+    public RetResult(bool success, string? msg)
+    {
+        Success = success;
+        Msg = msg;
+    }
+
+    public RetResult(bool success, string? msg, object? data)
+    {
+        Success = success;
+        Msg = msg;
+        Data = data;
+    }
+}

v2rayN/ServiceLib/Models/Dto/RoutingItemModel.cs

@@ -0,0 +1,6 @@
+namespace ServiceLib.Models.Dto;
+
+[Serializable]
+public class RoutingItemModel : RoutingItem
+{
+}

v2rayN/ServiceLib/Models/Dto/RoutingTemplate.cs

@@ -0,0 +1,8 @@
+namespace ServiceLib.Models.Dto;
+
+[Serializable]
+public class RoutingTemplate
+{
+    public string Version { get; set; }
+    public RoutingItem[] RoutingItems { get; set; }
+}

v2rayN/ServiceLib/Models/Dto/RulesItemModel.cs

@@ -0,0 +1,11 @@
+namespace ServiceLib.Models.Dto;
+
+[Serializable]
+public class RulesItemModel : RulesItem
+{
+    public string InboundTags { get; set; }
+    public string Ips { get; set; }
+    public string Domains { get; set; }
+    public string Protocols { get; set; }
+    public string RuleTypeName { get; set; }
+}

v2rayN/ServiceLib/Models/Dto/SemanticVersion.cs

@@ -0,0 +1,186 @@
+namespace ServiceLib.Models.Dto;
+
+public class SemanticVersion
+{
+    private readonly int major;
+    private readonly int minor;
+    private readonly int patch;
+    private readonly string version;
+
+    public SemanticVersion(int major, int minor, int patch)
+    {
+        this.major = major;
+        this.minor = minor;
+        this.patch = patch;
+        version = $"{major}.{minor}.{patch}";
+    }
+
+    public SemanticVersion(string? version)
+    {
+        try
+        {
+            if (string.IsNullOrEmpty(version))
+            {
+                major = 0;
+                minor = 0;
+                patch = 0;
+                return;
+            }
+            this.version = version.RemovePrefix('v');
+
+            var parts = this.version.Split('.');
+            if (parts.Length == 2)
+            {
+                major = int.Parse(parts.First());
+                minor = int.Parse(parts.Last());
+                patch = 0;
+            }
+            else if (parts.Length is 3 or 4)
+            {
+                major = int.Parse(parts[0]);
+                minor = int.Parse(parts[1]);
+                patch = int.Parse(parts[2]);
+            }
+            else
+            {
+                throw new ArgumentException("Invalid version string");
+            }
+        }
+        catch
+        {
+            major = 0;
+            minor = 0;
+            patch = 0;
+        }
+    }
+
+    public override bool Equals(object? obj)
+    {
+        if (obj is SemanticVersion other)
+        {
+            return major == other.major && minor == other.minor && patch == other.patch;
+        }
+        else
+        {
+            return false;
+        }
+    }
+
+    public override int GetHashCode()
+    {
+        return major.GetHashCode() ^ minor.GetHashCode() ^ patch.GetHashCode();
+    }
+
+    /// <summary>
+    /// Use ToVersionString(string? prefix) instead if possible.
+    /// </summary>
+    /// <returns>major.minor.patch</returns>
+    public override string ToString()
+    {
+        return version;
+    }
+
+    public string ToVersionString(string? prefix = null)
+    {
+        if (prefix == null)
+        {
+            return version;
+        }
+        else
+        {
+            return $"{prefix}{version}";
+        }
+    }
+
+    public static bool operator ==(SemanticVersion v1, SemanticVersion v2)
+    { return v1.Equals(v2); }
+
+    public static bool operator !=(SemanticVersion v1, SemanticVersion v2)
+    { return !v1.Equals(v2); }
+
+    public static bool operator >=(SemanticVersion v1, SemanticVersion v2)
+    { return v1.GreaterEquals(v2); }
+
+    public static bool operator <=(SemanticVersion v1, SemanticVersion v2)
+    { return v1.LessEquals(v2); }
+
+    #region Private
+
+    private bool GreaterEquals(SemanticVersion other)
+    {
+        if (major < other.major)
+        {
+            return false;
+        }
+        else if (major > other.major)
+        {
+            return true;
+        }
+        else
+        {
+            if (minor < other.minor)
+            {
+                return false;
+            }
+            else if (minor > other.minor)
+            {
+                return true;
+            }
+            else
+            {
+                if (patch < other.patch)
+                {
+                    return false;
+                }
+                else if (patch > other.patch)
+                {
+                    return true;
+                }
+                else
+                {
+                    return true;
+                }
+            }
+        }
+    }
+
+    private bool LessEquals(SemanticVersion other)
+    {
+        if (major < other.major)
+        {
+            return true;
+        }
+        else if (major > other.major)
+        {
+            return false;
+        }
+        else
+        {
+            if (minor < other.minor)
+            {
+                return true;
+            }
+            else if (minor > other.minor)
+            {
+                return false;
+            }
+            else
+            {
+                if (patch < other.patch)
+                {
+                    return true;
+                }
+                else if (patch > other.patch)
+                {
+                    return false;
+                }
+                else
+                {
+                    return true;
+                }
+            }
+        }
+    }
+
+    #endregion Private
+}

v2rayN/ServiceLib/Models/Dto/ServerSpeedItem.cs

@@ -0,0 +1,21 @@
+namespace ServiceLib.Models.Dto;
+
+[Serializable]
+public class ServerSpeedItem : ServerStatItem
+{
+    public long ProxyUp { get; set; }
+
+    public long ProxyDown { get; set; }
+
+    public long DirectUp { get; set; }
+
+    public long DirectDown { get; set; }
+}
+
+[Serializable]
+public class TrafficItem
+{
+    public ulong Up { get; set; }
+
+    public ulong Down { get; set; }
+}

v2rayN/ServiceLib/Models/Dto/ServerTestItem.cs

@@ -0,0 +1,14 @@
+namespace ServiceLib.Models.Dto;
+
+[Serializable]
+public class ServerTestItem
+{
+    public string? IndexId { get; set; }
+    public string? Address { get; set; }
+    public int Port { get; set; }
+    public EConfigType ConfigType { get; set; }
+    public bool AllowTest { get; set; }
+    public int QueueNum { get; set; }
+    public ProfileItem Profile { get; set; }
+    public ECoreType CoreType { get; set; }
+}

v2rayN/ServiceLib/Models/Dto/SpeedTestResult.cs

@@ -0,0 +1,11 @@
+namespace ServiceLib.Models.Dto;
+
+[Serializable]
+public class SpeedTestResult
+{
+    public string? IndexId { get; set; }
+
+    public string? Delay { get; set; }
+
+    public string? Speed { get; set; }
+}

v2rayN/ServiceLib/Models/Dto/SsSIP008.cs

@@ -0,0 +1,17 @@
+namespace ServiceLib.Models.Dto;
+
+public class SsSIP008
+{
+    public List<SsServer>? servers { get; set; }
+}
+
+[Serializable]
+public class SsServer
+{
+    public string? remarks { get; set; }
+    public string? server { get; set; }
+    public string? server_port { get; set; }
+    public string? method { get; set; }
+    public string? password { get; set; }
+    public string? plugin { get; set; }
+}

v2rayN/ServiceLib/Models/Dto/UpdateResult.cs

@@ -0,0 +1,21 @@
+namespace ServiceLib.Models.Dto;
+
+public class UpdateResult
+{
+    public bool Success { get; set; }
+    public string? Msg { get; set; }
+    public SemanticVersion? Version { get; set; }
+    public string? Url { get; set; }
+
+    public UpdateResult(bool success, string? msg)
+    {
+        Success = success;
+        Msg = msg;
+    }
+
+    public UpdateResult(bool success, SemanticVersion? version)
+    {
+        Success = success;
+        Version = version;
+    }
+}

v2rayN/ServiceLib/Models/Dto/VmessQRCode.cs

@@ -0,0 +1,43 @@
+namespace ServiceLib.Models.Dto;
+
+/// <summary>
+/// https://github.com/2dust/v2rayN/wiki/
+/// </summary>
+[Serializable]
+public class VmessQRCode
+{
+    [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+    public int v { get; set; } = 2;
+
+    public string ps { get; set; } = string.Empty;
+
+    public string add { get; set; } = string.Empty;
+
+    [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+    public int port { get; set; } = 0;
+
+    public string id { get; set; } = string.Empty;
+
+    [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+    public int aid { get; set; } = 0;
+
+    public string scy { get; set; } = string.Empty;
+
+    public string net { get; set; } = string.Empty;
+
+    public string type { get; set; } = string.Empty;
+
+    public string host { get; set; } = string.Empty;
+
+    public string path { get; set; } = string.Empty;
+
+    public string tls { get; set; } = string.Empty;
+
+    public string sni { get; set; } = string.Empty;
+
+    public string alpn { get; set; } = string.Empty;
+
+    public string fp { get; set; } = string.Empty;
+
+    public string insecure { get; set; } = string.Empty;
+}