Refactoring Project

v2rayN/v2rayN/Common/DownloaderHelper.cs → v2rayN/ServiceLib/Common/DownloaderHelper.cs

@@ -1,10 +1,9 @@
 using Downloader;
-using System.IO;
 using System.Net;
 
-namespace v2rayN
+namespace ServiceLib.Common
 {
-    internal class DownloaderHelper
+    public class DownloaderHelper
     {
         private static readonly Lazy<DownloaderHelper> _instance = new(() => new());
         public static DownloaderHelper Instance => _instance.Value;

v2rayN/v2rayN/Common/FileManager.cs → v2rayN/ServiceLib/Common/FileManager.cs

@@ -1,8 +1,7 @@
-using System.IO;
-using System.IO.Compression;
+using System.IO.Compression;
 using System.Text;
 
-namespace v2rayN
+namespace ServiceLib.Common
 {
     public static class FileManager
     {
@@ -86,5 +85,19 @@ public static bool ZipExtractToFile(string fileName, string toPath, string ignor
             }
             return true;
         }
+
+        public static bool CreateFromDirectory(string sourceDirectoryName, string destinationArchiveFileName)
+        {
+            try
+            {
+                ZipFile.CreateFromDirectory(sourceDirectoryName, destinationArchiveFileName);
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+                return false;
+            }
+            return true;
+        }
     }
 }

v2rayN/v2rayN/Common/HttpClientHelper.cs → v2rayN/ServiceLib/Common/HttpClientHelper.cs

@@ -1,10 +1,8 @@
-using System.IO;
-using System.Net.Http;
-using System.Net.Http.Headers;
+using System.Net.Http.Headers;
 using System.Net.Mime;
 using System.Text;
 
-namespace v2rayN
+namespace ServiceLib.Common
 {
     /// <summary>
     /// </summary>

v2rayN/v2rayN/Common/Job.cs → v2rayN/ServiceLib/Common/Job.cs

@@ -1,7 +1,7 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 
-namespace v2rayN
+namespace ServiceLib.Common
 {
     /*
      * See:

v2rayN/v2rayN/Common/JsonUtils.cs → v2rayN/ServiceLib/Common/JsonUtils.cs

@@ -1,11 +1,10 @@
-using System.IO;
-using System.Text.Json;
+using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 
-namespace v2rayN
+namespace ServiceLib.Common
 {
-    internal class JsonUtils
+    public class JsonUtils
     {
         /// <summary>
         /// DeepCopy

v2rayN/v2rayN/Common/Logging.cs → v2rayN/ServiceLib/Common/Logging.cs

@@ -1,9 +1,8 @@
 using NLog;
 using NLog.Config;
 using NLog.Targets;
-using System.IO;
 
-namespace v2rayN
+namespace ServiceLib.Common
 {
     public class Logging
     {

v2rayN/v2rayN/Common/QueryableExtension.cs → v2rayN/ServiceLib/Common/QueryableExtension.cs

@@ -1,7 +1,7 @@
 using System.Linq.Expressions;
 using System.Reflection;
 
-namespace v2rayN
+namespace ServiceLib.Common
 {
     public static class QueryableExtension
     {

v2rayN/v2rayN/Common/SemanticVersion.cs → v2rayN/ServiceLib/Common/SemanticVersion.cs

@@ -1,4 +1,4 @@
-namespace v2rayN
+namespace ServiceLib.Common
 {
     public class SemanticVersion
     {

v2rayN/v2rayN/Common/SqliteHelper.cs → v2rayN/ServiceLib/Common/SqliteHelper.cs

@@ -1,7 +1,7 @@
 using SQLite;
 using System.Collections;
 
-namespace v2rayN
+namespace ServiceLib.Common
 {
     public sealed class SQLiteHelper
     {

v2rayN/v2rayN/Common/StringEx.cs → v2rayN/ServiceLib/Common/StringEx.cs

@@ -1,9 +1,8 @@
 using System.Diagnostics.CodeAnalysis;
-using System.IO;
 
-namespace v2rayN
+namespace ServiceLib.Common
 {
-    internal static class StringEx
+    public static class StringEx
     {
         public static bool IsNullOrEmpty([NotNullWhen(false)] this string? value)
         {

v2rayN/v2rayN/Common/Utils.cs → v2rayN/ServiceLib/Common/Utils.cs

@@ -1,6 +1,5 @@
 using System.Collections.Specialized;
 using System.Diagnostics;
-using System.IO;
 using System.IO.Compression;
 using System.Net;
 using System.Net.NetworkInformation;
@@ -10,9 +9,9 @@
 using System.Text;
 using System.Text.RegularExpressions;
 
-namespace v2rayN
+namespace ServiceLib.Common
 {
-    internal class Utils
+    public class Utils
     {
         #region 资源Json操作
 

v2rayN/v2rayN/Common/YamlUtils.cs → v2rayN/ServiceLib/Common/YamlUtils.cs

@@ -1,9 +1,9 @@
 using YamlDotNet.Serialization;
 using YamlDotNet.Serialization.NamingConventions;
 
-namespace v2rayN.Common
+namespace ServiceLib.Common
 {
-    internal class YamlUtils
+    public class YamlUtils
     {
         #region YAML
 

v2rayN/v2rayN/Enums/EConfigType.cs → v2rayN/ServiceLib/Enums/EConfigType.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Enums
+namespace ServiceLib.Enums
 {
     public enum EConfigType
     {

v2rayN/v2rayN/Enums/ECoreType.cs → v2rayN/ServiceLib/Enums/ECoreType.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Enums
+namespace ServiceLib.Enums
 {
     public enum ECoreType
     {

v2rayN/v2rayN/Enums/EGirdOrientation.cs → v2rayN/ServiceLib/Enums/EGirdOrientation.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Enums
+namespace ServiceLib.Enums
 {
     public enum EGirdOrientation
     {

v2rayN/v2rayN/Enums/EGlobalHotkey.cs → v2rayN/ServiceLib/Enums/EGlobalHotkey.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Enums
+namespace ServiceLib.Enums
 {
     public enum EGlobalHotkey
     {

v2rayN/v2rayN/Enums/EInboundProtocol.cs → v2rayN/ServiceLib/Enums/EInboundProtocol.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Enums
+namespace ServiceLib.Enums
 {
     public enum EInboundProtocol
     {

v2rayN/v2rayN/Enums/EMove.cs → v2rayN/ServiceLib/Enums/EMove.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Enums
+namespace ServiceLib.Enums
 {
     public enum EMove
     {

v2rayN/v2rayN/Enums/ERuleMode.cs → v2rayN/ServiceLib/Enums/ERuleMode.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Enums
+namespace ServiceLib.Enums
 {
     public enum ERuleMode
     {

v2rayN/v2rayN/Enums/EServerColName.cs → v2rayN/ServiceLib/Enums/EServerColName.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Enums
+namespace ServiceLib.Enums
 {
     public enum EServerColName
     {

v2rayN/v2rayN/Enums/ESpeedActionType.cs → v2rayN/ServiceLib/Enums/ESpeedActionType.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Enums
+namespace ServiceLib.Enums
 {
     public enum ESpeedActionType
     {

v2rayN/v2rayN/Enums/ESysProxyType.cs → v2rayN/ServiceLib/Enums/ESysProxyType.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Enums
+namespace ServiceLib.Enums
 {
     public enum ESysProxyType
     {

v2rayN/v2rayN/Enums/ETransport.cs → v2rayN/ServiceLib/Enums/ETransport.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Enums
+namespace ServiceLib.Enums
 {
     public enum ETransport
     {

v2rayN/v2rayN/Enums/EViewAction.cs → v2rayN/ServiceLib/Enums/EViewAction.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Enums
+namespace ServiceLib.Enums
 {
     public enum EViewAction
     {

v2rayN/v2rayN/Global.cs → v2rayN/ServiceLib/Global.cs

@@ -1,8 +1,6 @@
-using v2rayN.Enums;
-
-namespace v2rayN
+namespace ServiceLib
 {
-    internal class Global
+    public class Global
     {
         #region const
 
@@ -32,21 +30,21 @@ internal class Global
         public const string CoreSpeedtestConfigFileName = "configSpeedtest.json";
         public const string CoreMultipleLoadConfigFileName = "configMultipleLoad.json";
         public const string ClashMixinConfigFileName = "Mixin.yaml";
-        public const string V2raySampleClient = "v2rayN.Sample.SampleClientConfig";
-        public const string SingboxSampleClient = "v2rayN.Sample.SingboxSampleClientConfig";
-        public const string V2raySampleHttpRequestFileName = "v2rayN.Sample.SampleHttpRequest";
-        public const string V2raySampleHttpResponseFileName = "v2rayN.Sample.SampleHttpResponse";
-        public const string V2raySampleInbound = "v2rayN.Sample.SampleInbound";
-        public const string V2raySampleOutbound = "v2rayN.Sample.SampleOutbound";
-        public const string SingboxSampleOutbound = "v2rayN.Sample.SingboxSampleOutbound";
-        public const string CustomRoutingFileName = "v2rayN.Sample.custom_routing_";
-        public const string TunSingboxDNSFileName = "v2rayN.Sample.tun_singbox_dns";
-        public const string TunSingboxInboundFileName = "v2rayN.Sample.tun_singbox_inbound";
-        public const string TunSingboxRulesFileName = "v2rayN.Sample.tun_singbox_rules";
-        public const string DNSV2rayNormalFileName = "v2rayN.Sample.dns_v2ray_normal";
-        public const string DNSSingboxNormalFileName = "v2rayN.Sample.dns_singbox_normal";
-        public const string ClashMixinYaml = "v2rayN.Sample.clash_mixin_yaml";
-        public const string ClashTunYaml = "v2rayN.Sample.clash_tun_yaml";
+        public const string V2raySampleClient = "ServiceLib.Sample.SampleClientConfig";
+        public const string SingboxSampleClient = "ServiceLib.Sample.SingboxSampleClientConfig";
+        public const string V2raySampleHttpRequestFileName = "ServiceLib.Sample.SampleHttpRequest";
+        public const string V2raySampleHttpResponseFileName = "ServiceLib.Sample.SampleHttpResponse";
+        public const string V2raySampleInbound = "ServiceLib.Sample.SampleInbound";
+        public const string V2raySampleOutbound = "ServiceLib.Sample.SampleOutbound";
+        public const string SingboxSampleOutbound = "ServiceLib.Sample.SingboxSampleOutbound";
+        public const string CustomRoutingFileName = "ServiceLib.Sample.custom_routing_";
+        public const string TunSingboxDNSFileName = "ServiceLib.Sample.tun_singbox_dns";
+        public const string TunSingboxInboundFileName = "ServiceLib.Sample.tun_singbox_inbound";
+        public const string TunSingboxRulesFileName = "ServiceLib.Sample.tun_singbox_rules";
+        public const string DNSV2rayNormalFileName = "ServiceLib.Sample.dns_v2ray_normal";
+        public const string DNSSingboxNormalFileName = "ServiceLib.Sample.dns_singbox_normal";
+        public const string ClashMixinYaml = "ServiceLib.Sample.clash_mixin_yaml";
+        public const string ClashTunYaml = "ServiceLib.Sample.clash_tun_yaml";
 
         public const string DefaultSecurity = "auto";
         public const string DefaultNetwork = "tcp";

v2rayN/ServiceLib/GlobalUsings.cs

@@ -0,0 +1,7 @@
+global using ServiceLib.Common;
+global using ServiceLib.Enums;
+global using ServiceLib.Handler.CoreConfig;
+global using ServiceLib.Handler.Fmt;
+global using ServiceLib.Handler.Statistics;
+global using ServiceLib.Models;
+global using ServiceLib.Resx;

v2rayN/v2rayN/Handler/ClashApiHandler.cs → v2rayN/ServiceLib/Handler/ClashApiHandler.cs

@@ -1,7 +1,6 @@
-using v2rayN.Models;
-using static v2rayN.Models.ClashProxies;
+using static ServiceLib.Models.ClashProxies;
 
-namespace v2rayN.Handler
+namespace ServiceLib.Handler
 {
     public sealed class ClashApiHandler
     {

v2rayN/v2rayN/Handler/ConfigHandler.cs → v2rayN/ServiceLib/Handler/ConfigHandler.cs

@@ -1,18 +1,13 @@
 using System.Data;
-using System.IO;
 using System.Text.RegularExpressions;
 using System.Web;
-using v2rayN.Enums;
-using v2rayN.Handler.CoreConfig;
-using v2rayN.Handler.Fmt;
-using v2rayN.Models;
 
-namespace v2rayN.Handler
+namespace ServiceLib.Handler
 {
     /// <summary>
     /// 本软件配置文件处理类
     /// </summary>
-    internal class ConfigHandler
+    public class ConfigHandler
     {
         private static string configRes = Global.ConfigFileName;
         private static readonly object objLock = new();
@@ -1156,7 +1151,7 @@ public static int AddCustomServer4Multiple(Config config, List<ProfileItem> sele
 
             var profileItem = LazyConfig.Instance.GetProfileItem(indexId) ?? new();
             profileItem.indexId = indexId;
-            profileItem.remarks = coreType == ECoreType.sing_box ? Resx.ResUI.menuSetDefaultMultipleServer : Resx.ResUI.menuSetDefaultLoadBalanceServer;
+            profileItem.remarks = coreType == ECoreType.sing_box ? ResUI.menuSetDefaultMultipleServer : ResUI.menuSetDefaultLoadBalanceServer;
             profileItem.address = Global.CoreMultipleLoadConfigFileName;
             profileItem.configType = EConfigType.Custom;
             profileItem.coreType = coreType;

v2rayN/v2rayN/Handler/CoreConfig/CoreConfigClash.cs → v2rayN/ServiceLib/Handler/CoreConfig/CoreConfigClash.cs

@@ -1,15 +1,9 @@
-using System.IO;
-using v2rayN.Common;
-using v2rayN.Enums;
-using v2rayN.Models;
-using v2rayN.Resx;
-
-namespace v2rayN.Handler.CoreConfig
+namespace ServiceLib.Handler.CoreConfig
 {
     /// <summary>
     /// Core configuration file processing class
     /// </summary>
-    internal class CoreConfigClash
+    public class CoreConfigClash
     {
         private Config _config;
 

v2rayN/v2rayN/Handler/CoreConfig/CoreConfigHandler.cs → v2rayN/ServiceLib/Handler/CoreConfig/CoreConfigHandler.cs

@@ -1,14 +1,9 @@
-using System.IO;
-using v2rayN.Enums;
-using v2rayN.Models;
-using v2rayN.Resx;
-
-namespace v2rayN.Handler.CoreConfig
+namespace ServiceLib.Handler.CoreConfig
 {
     /// <summary>
     /// Core configuration file processing class
     /// </summary>
-    internal class CoreConfigHandler
+    public class CoreConfigHandler
     {
         public static int GenerateClientConfig(ProfileItem node, string? fileName, out string msg, out string content)
         {

v2rayN/v2rayN/Handler/CoreConfig/CoreConfigSingbox.cs → v2rayN/ServiceLib/Handler/CoreConfig/CoreConfigSingbox.cs

@@ -1,14 +1,10 @@
 using System.Data;
-using System.IO;
 using System.Net;
 using System.Net.NetworkInformation;
-using v2rayN.Enums;
-using v2rayN.Models;
-using v2rayN.Resx;
 
-namespace v2rayN.Handler.CoreConfig
+namespace ServiceLib.Handler.CoreConfig
 {
-    internal class CoreConfigSingbox
+    public class CoreConfigSingbox
     {
         private Config _config;
 

v2rayN/v2rayN/Handler/CoreConfig/CoreConfigV2ray.cs → v2rayN/ServiceLib/Handler/CoreConfig/CoreConfigV2ray.cs

@@ -1,13 +1,10 @@
 using System.Net;
 using System.Net.NetworkInformation;
 using System.Text.Json.Nodes;
-using v2rayN.Enums;
-using v2rayN.Models;
-using v2rayN.Resx;
 
-namespace v2rayN.Handler.CoreConfig
+namespace ServiceLib.Handler.CoreConfig
 {
-    internal class CoreConfigV2ray
+    public class CoreConfigV2ray
     {
         private Config _config;