up 6.58

https://github.com/2dust/v2rayN/issues/5646

v2rayN/ServiceLib/Common/FileManager.cs

@@ -106,7 +106,12 @@ namespace ServiceLib.Common
         {
             try
             {
-                ZipFile.CreateFromDirectory(sourceDirectoryName, destinationArchiveFileName);
+                if (File.Exists(destinationArchiveFileName))
+                {
+                    File.Delete(destinationArchiveFileName);
+                }
+
+                ZipFile.CreateFromDirectory(sourceDirectoryName, destinationArchiveFileName, CompressionLevel.SmallestSize, true);
             }
             catch (Exception ex)
             {
@@ -115,5 +120,42 @@ namespace ServiceLib.Common
             }
             return true;
         }
+
+        public static void CopyDirectory(string sourceDir, string destinationDir, bool recursive, string ignoredName)
+        {
+            // Get information about the source directory
+            var dir = new DirectoryInfo(sourceDir);
+
+            // Check if the source directory exists
+            if (!dir.Exists)
+                throw new DirectoryNotFoundException($"Source directory not found: {dir.FullName}");
+
+            // Cache directories before we start copying
+            DirectoryInfo[] dirs = dir.GetDirectories();
+
+            // Create the destination directory
+            Directory.CreateDirectory(destinationDir);
+
+            // Get the files in the source directory and copy to the destination directory
+            foreach (FileInfo file in dir.GetFiles())
+            {
+                if (!Utils.IsNullOrEmpty(ignoredName) && file.Name.Contains(ignoredName))
+                {
+                    continue;
+                }
+                string targetFilePath = Path.Combine(destinationDir, file.Name);
+                file.CopyTo(targetFilePath);
+            }
+
+            // If recursive and copying subdirectories, recursively call this method
+            if (recursive)
+            {
+                foreach (DirectoryInfo subDir in dirs)
+                {
+                    string newDestinationDir = Path.Combine(destinationDir, subDir.Name);
+                    CopyDirectory(subDir.FullName, newDestinationDir, true, ignoredName);
+                }
+            }
+        }
     }
 }

v2rayN/ServiceLib/Common/YamlUtils.cs

@@ -1,4 +1,5 @@
-using YamlDotNet.Serialization;
+using YamlDotNet.Core;
+using YamlDotNet.Serialization;
 using YamlDotNet.Serialization.NamingConventions;
 
 namespace ServiceLib.Common
@@ -35,13 +36,17 @@ namespace ServiceLib.Common
         /// </summary>
         /// <param name="obj"></param>
         /// <returns></returns>
-        public static string ToYaml(Object obj)
+        public static string ToYaml(Object? obj)
         {
+            string result = string.Empty;
+            if (obj == null)
+            {
+                return result;
+            }
             var serializer = new SerializerBuilder()
                     .WithNamingConvention(HyphenatedNamingConvention.Instance)
                     .Build();
 
-            string result = string.Empty;
             try
             {
                 result = serializer.Serialize(obj);
@@ -53,6 +58,24 @@ namespace ServiceLib.Common
             return result;
         }
 
+        public static string? PreprocessYaml(string str)
+        {
+            var deserializer = new DeserializerBuilder()
+                .WithNamingConvention(PascalCaseNamingConvention.Instance)
+                .Build();
+            try
+            {
+                var mergingParser = new MergingParser(new Parser(new StringReader(str)));
+                var obj = new DeserializerBuilder().Build().Deserialize(mergingParser);
+                return ToYaml(obj);
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog("PreprocessYaml", ex);
+                return null;
+            }
+        }
+
         #endregion YAML
     }
 }

v2rayN/ServiceLib/Handler/ConfigHandler.cs

@@ -204,6 +204,8 @@ namespace ServiceLib.Handler
                 };
             }
 
+            config.webDavItem ??= new();
+
             return 0;
         }
 

v2rayN/ServiceLib/Handler/CoreConfig/CoreConfigClash.cs

@@ -64,6 +64,12 @@
                 var txtFile = File.ReadAllText(addressFileName);
                 txtFile = txtFile.Replace(tagYamlStr1, tagYamlStr2);
 
+                //YAML anchors
+                if (txtFile.Contains("<<:") && txtFile.Contains("*") && txtFile.Contains("&"))
+                {
+                    txtFile = YamlUtils.PreprocessYaml(txtFile);
+                }
+
                 var fileContent = YamlUtils.FromYaml<Dictionary<string, object>>(txtFile);
                 if (fileContent == null)
                 {

v2rayN/ServiceLib/Handler/CoreConfig/CoreConfigSingbox.cs

@@ -1250,7 +1250,7 @@ namespace ServiceLib.Handler.CoreConfig
 
         private int GenExperimental(SingboxConfig singboxConfig)
         {
-            if (_config.guiItem.enableStatistics)
+            //if (_config.guiItem.enableStatistics)
             {
                 singboxConfig.experimental ??= new Experimental4Sbox();
                 singboxConfig.experimental.clash_api = new Clash_Api4Sbox()

v2rayN/ServiceLib/Handler/NoticeHandler.cs

@@ -22,13 +22,13 @@ namespace ServiceLib.Handler
             MessageBus.Current.SendMessage(content, Global.CommandSendMsgView);
         }
 
-        public void SendMessage(string? content, bool time)
+        public void SendMessageEx(string? content)
         {
             if (content.IsNullOrEmpty())
             {
                 return;
             }
-            content = $"{DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")} {content}";
+            content = $"{DateTime.Now:yyyy/MM/dd HH:mm:ss} {content}";
             SendMessage(content);
         }
 

v2rayN/ServiceLib/Handler/TaskHandler.cs

@@ -61,7 +61,7 @@
                 {
                     if ((dtNow - autoUpdateGeoTime).Hours % config.guiItem.autoUpdateInterval == 0)
                     {
-                        updateHandle.UpdateGeoFileAll(config, (bool success, string msg) =>
+                        await updateHandle.UpdateGeoFileAll(config, (bool success, string msg) =>
                         {
                             update(false, msg);
                         });

v2rayN/ServiceLib/Handler/UpdateHandler.cs

@@ -437,6 +437,15 @@ namespace ServiceLib.Handler
         {
             if (Utils.IsWindows())
             {
+                //Check for standalone windows .Net version
+                if (coreInfo?.coreType == ECoreType.v2rayN
+                    && File.Exists(Path.Combine(Utils.StartupPath(), "wpfgfx_cor3.dll"))
+                    && File.Exists(Path.Combine(Utils.StartupPath(), "D3DCompiler_47_cor3.dll"))
+                    )
+                {
+                    return coreInfo?.coreDownloadUrl64.Replace("v2rayN.zip", "zz_v2rayN-SelfContained.zip");
+                }
+
                 return RuntimeInformation.ProcessArchitecture switch
                 {
                     Architecture.Arm64 => coreInfo?.coreDownloadUrlArm64,

v2rayN/ServiceLib/Handler/WebDavHandler.cs

@@ -0,0 +1,171 @@
+using System.Net;
+using WebDav;
+
+namespace ServiceLib.Handler
+{
+    public sealed class WebDavHandler
+    {
+        private static readonly Lazy<WebDavHandler> _instance = new(() => new());
+        public static WebDavHandler Instance => _instance.Value;
+
+        private Config? _config;
+        private WebDavClient? _client;
+        private string? _lastDescription;
+        private string _webDir = Global.AppName + "_backup";
+        private string _webFileName = "backup.zip";
+        private string _logTitle = "WebDav--";
+
+        public WebDavHandler()
+        {
+            _config = LazyConfig.Instance.Config;
+        }
+
+        private async Task<bool> GetClient()
+        {
+            try
+            {
+                if (_config.webDavItem.url.IsNullOrEmpty()
+                || _config.webDavItem.userName.IsNullOrEmpty()
+                || _config.webDavItem.password.IsNullOrEmpty())
+                {
+                    throw new ArgumentException("webdav parameter error or null");
+                }
+                if (_client != null)
+                {
+                    _client?.Dispose();
+                    _client = null;
+                }
+                if (_config.webDavItem.dirName.IsNullOrEmpty())
+                {
+                    _webDir = Global.AppName + "_backup";
+                }
+                else
+                {
+                    _webDir = _config.webDavItem.dirName.TrimEx();
+                }
+
+                var clientParams = new WebDavClientParams
+                {
+                    BaseAddress = new Uri(_config.webDavItem.url),
+                    Credentials = new NetworkCredential(_config.webDavItem.userName, _config.webDavItem.password)
+                };
+                _client = new WebDavClient(clientParams);
+            }
+            catch (Exception ex)
+            {
+                SaveLog(ex);
+                return false;
+            }
+            return await Task.FromResult(true);
+        }
+
+        private async Task<bool> TryCreateDir()
+        {
+            if (_client is null) return false;
+            try
+            {
+                var result2 = await _client.Mkcol(_webDir);
+                if (result2.IsSuccessful)
+                {
+                    return true;
+                }
+                SaveLog(result2.Description);
+            }
+            catch (Exception ex)
+            {
+                SaveLog(ex);
+            }
+            return false;
+        }
+
+        private void SaveLog(string desc)
+        {
+            _lastDescription = desc;
+            Logging.SaveLog(_logTitle + desc);
+        }
+
+        private void SaveLog(Exception ex)
+        {
+            _lastDescription = ex.Message;
+            Logging.SaveLog(_logTitle, ex);
+        }
+
+        public async Task<bool> CheckConnection()
+        {
+            if (await GetClient() == false)
+            {
+                return false;
+            }
+            await TryCreateDir();
+
+            var testName = "readme_test";
+            var myContent = new StringContent(testName);
+            var result = await _client.PutFile($"{_webDir}/{testName}", myContent);
+            if (result.IsSuccessful)
+            {
+                await _client.Delete($"{_webDir}/{testName}");
+                return true;
+            }
+            else
+            {
+                SaveLog(result.Description);
+                return false;
+            }
+        }
+
+        public async Task<bool> PutFile(string fileName)
+        {
+            if (await GetClient() == false)
+            {
+                return false;
+            }
+            await TryCreateDir();
+
+            try
+            {
+                using var fs = File.OpenRead(fileName);
+                var result = await _client.PutFile($"{_webDir}/{_webFileName}", fs); // upload a resource
+                if (result.IsSuccessful)
+                {
+                    return true;
+                }
+
+                SaveLog(result.Description);
+            }
+            catch (Exception ex)
+            {
+                SaveLog(ex);
+            }
+            return false;
+        }
+
+        public async Task<bool> GetRawFile(string fileName)
+        {
+            if (await GetClient() == false)
+            {
+                return false;
+            }
+            await TryCreateDir();
+
+            try
+            {
+                var response = await _client.GetRawFile($"{_webDir}/{_webFileName}");
+                if (!response.IsSuccessful)
+                {
+                    SaveLog(response.Description);
+                    return false;
+                }
+                using var outputFileStream = new FileStream(fileName, FileMode.Create);
+                response.Stream.CopyTo(outputFileStream);
+                return true;
+            }
+            catch (Exception ex)
+            {
+                SaveLog(ex);
+            }
+            return false;
+        }
+
+        public string GetLastError() => _lastDescription ?? string.Empty;
+    }
+}

v2rayN/ServiceLib/Models/Config.cs

@@ -47,6 +47,7 @@
         public HysteriaItem hysteriaItem { get; set; }
         public ClashUIItem clashUIItem { get; set; }
         public SystemProxyItem systemProxyItem { get; set; }
+        public WebDavItem webDavItem { get; set; }
         public List<InItem> inbound { get; set; }
         public List<KeyEventItem> globalHotkeys { get; set; }
         public List<CoreTypeItem> coreTypeItem { get; set; }

v2rayN/ServiceLib/Models/ConfigItems.cs

@@ -248,4 +248,13 @@
         public bool notProxyLocalAddress { get; set; } = true;
         public string systemProxyAdvancedProtocol { get; set; }
     }
+
+    [Serializable]
+    public class WebDavItem
+    {
+        public string? url { get; set; }
+        public string? userName { get; set; }
+        public string? password { get; set; }
+        public string? dirName { get; set; }
+    }
 }

v2rayN/ServiceLib/Resx/ResUI.Designer.cs

@@ -582,6 +582,51 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 WebDav Check 的本地化字符串。
+        /// </summary>
+        public static string LvWebDavCheck {
+            get {
+                return ResourceManager.GetString("LvWebDavCheck", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Remote folder name (optional) 的本地化字符串。
+        /// </summary>
+        public static string LvWebDavDirName {
+            get {
+                return ResourceManager.GetString("LvWebDavDirName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 WebDav Password 的本地化字符串。
+        /// </summary>
+        public static string LvWebDavPassword {
+            get {
+                return ResourceManager.GetString("LvWebDavPassword", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 WebDav Url 的本地化字符串。
+        /// </summary>
+        public static string LvWebDavUrl {
+            get {
+                return ResourceManager.GetString("LvWebDavUrl", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 WebDav User Name 的本地化字符串。
+        /// </summary>
+        public static string LvWebDavUserName {
+            get {
+                return ResourceManager.GetString("LvWebDavUserName", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Add a custom configuration server 的本地化字符串。
         /// </summary>
@@ -690,6 +735,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Backup and Restore 的本地化字符串。
+        /// </summary>
+        public static string menuBackupAndRestore {
+            get {
+                return ResourceManager.GetString("menuBackupAndRestore", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Check Update 的本地化字符串。
         /// </summary>
@@ -861,6 +915,33 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Backup to local 的本地化字符串。
+        /// </summary>
+        public static string menuLocalBackup {
+            get {
+                return ResourceManager.GetString("menuLocalBackup", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Local 的本地化字符串。
+        /// </summary>
+        public static string menuLocalBackupAndRestore {
+            get {
+                return ResourceManager.GetString("menuLocalBackupAndRestore", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Restore from local 的本地化字符串。
+        /// </summary>
+        public static string menuLocalRestore {
+            get {
+                return ResourceManager.GetString("menuLocalRestore", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 One-click multi test Latency and speed (Ctrl+E) 的本地化字符串。
         /// </summary>
@@ -1095,6 +1176,33 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Backup to remote (WebDAV) 的本地化字符串。
+        /// </summary>
+        public static string menuRemoteBackup {
+            get {
+                return ResourceManager.GetString("menuRemoteBackup", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Remote (WebDAV) 的本地化字符串。
+        /// </summary>
+        public static string menuRemoteBackupAndRestore {
+            get {
+                return ResourceManager.GetString("menuRemoteBackupAndRestore", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Restore from remote (WebDAV) 的本地化字符串。
+        /// </summary>
+        public static string menuRemoteRestore {
+            get {
+                return ResourceManager.GetString("menuRemoteRestore", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Remove duplicate servers 的本地化字符串。
         /// </summary>

v2rayN/ServiceLib/Resx/ResUI.resx

@@ -1279,4 +1279,40 @@
   <data name="TbPreSocksPort4Sub" xml:space="preserve">
     <value>Custom config socks port</value>
   </data>
+  <data name="menuBackupAndRestore" xml:space="preserve">
+    <value>Backup and Restore</value>
+  </data>
+  <data name="menuLocalBackup" xml:space="preserve">
+    <value>Backup to local</value>
+  </data>
+  <data name="menuLocalRestore" xml:space="preserve">
+    <value>Restore from local</value>
+  </data>
+  <data name="menuRemoteBackup" xml:space="preserve">
+    <value>Backup to remote (WebDAV)</value>
+  </data>
+  <data name="menuRemoteRestore" xml:space="preserve">
+    <value>Restore from remote (WebDAV)</value>
+  </data>
+  <data name="menuLocalBackupAndRestore" xml:space="preserve">
+    <value>Local</value>
+  </data>
+  <data name="menuRemoteBackupAndRestore" xml:space="preserve">
+    <value>Remote (WebDAV)</value>
+  </data>
+  <data name="LvWebDavUrl" xml:space="preserve">
+    <value>WebDav Url</value>
+  </data>
+  <data name="LvWebDavUserName" xml:space="preserve">
+    <value>WebDav User Name</value>
+  </data>
+  <data name="LvWebDavPassword" xml:space="preserve">
+    <value>WebDav Password</value>
+  </data>
+  <data name="LvWebDavCheck" xml:space="preserve">
+    <value>WebDav Check</value>
+  </data>
+  <data name="LvWebDavDirName" xml:space="preserve">
+    <value>Remote folder name (optional)</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx

@@ -1276,4 +1276,40 @@
   <data name="TbPreSocksPort4Sub" xml:space="preserve">
     <value>自定义配置的Socks端口</value>
   </data>
+  <data name="menuBackupAndRestore" xml:space="preserve">
+    <value>备份和还原</value>
+  </data>
+  <data name="menuLocalBackup" xml:space="preserve">
+    <value>备份到本地</value>
+  </data>
+  <data name="menuLocalRestore" xml:space="preserve">
+    <value>从本地恢复</value>
+  </data>
+  <data name="menuRemoteBackup" xml:space="preserve">
+    <value>备份到远程 (WebDAV)</value>
+  </data>
+  <data name="menuRemoteRestore" xml:space="preserve">
+    <value>从远程恢复 (WebDAV)</value>
+  </data>
+  <data name="menuLocalBackupAndRestore" xml:space="preserve">
+    <value>本地</value>
+  </data>
+  <data name="menuRemoteBackupAndRestore" xml:space="preserve">
+    <value>远程 (WebDAV)</value>
+  </data>
+  <data name="LvWebDavUserName" xml:space="preserve">
+    <value>WebDav 账户</value>
+  </data>
+  <data name="LvWebDavCheck" xml:space="preserve">
+    <value>WebDav 可用检查</value>
+  </data>
+  <data name="LvWebDavPassword" xml:space="preserve">
+    <value>WebDav 密码</value>
+  </data>
+  <data name="LvWebDavUrl" xml:space="preserve">
+    <value>WebDav 服务器地址</value>
+  </data>
+  <data name="LvWebDavDirName" xml:space="preserve">
+    <value>远程文件夹名称(可选)</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx

@@ -1156,4 +1156,40 @@
   <data name="TbPreSocksPort4Sub" xml:space="preserve">
     <value>自訂配置的Socks端口</value>
   </data>
+  <data name="menuBackupAndRestore" xml:space="preserve">
+    <value>備份和還原</value>
+  </data>
+  <data name="menuLocalBackup" xml:space="preserve">
+    <value>備份到本地</value>
+  </data>
+  <data name="menuLocalRestore" xml:space="preserve">
+    <value>從本地恢復</value>
+  </data>
+  <data name="menuRemoteBackup" xml:space="preserve">
+    <value>備份到遠端 (WebDAV)</value>
+  </data>
+  <data name="menuRemoteRestore" xml:space="preserve">
+    <value>從遠端恢復 (WebDAV)</value>
+  </data>
+  <data name="menuLocalBackupAndRestore" xml:space="preserve">
+    <value>本地</value>
+  </data>
+  <data name="menuRemoteBackupAndRestore" xml:space="preserve">
+    <value>遠端 (WebDAV)</value>
+  </data>
+  <data name="LvWebDavUserName" xml:space="preserve">
+    <value>WebDav 賬戶</value>
+  </data>
+  <data name="LvWebDavCheck" xml:space="preserve">
+    <value>WebDav 可用檢查</value>
+  </data>
+  <data name="LvWebDavPassword" xml:space="preserve">
+    <value>WebDav 密碼</value>
+  </data>
+  <data name="LvWebDavUrl" xml:space="preserve">
+    <value>WebDav 服務器地址</value>
+  </data>
+  <data name="LvWebDavDirName" xml:space="preserve">
+    <value>遠端資料夾名稱(可選)</value>
+  </data>
 </root>

v2rayN/ServiceLib/ServiceLib.csproj

@@ -4,7 +4,7 @@
 	<TargetFramework>net8.0</TargetFramework>
 	<ImplicitUsings>enable</ImplicitUsings>
 	<Nullable>enable</Nullable>
-	<Version>6.57</Version>
+	<Version>6.58</Version>
   </PropertyGroup>
 
 	<ItemGroup>
@@ -13,6 +13,7 @@
 		<PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
 		<PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
 		<PackageReference Include="Splat.NLog" Version="15.1.1" />
+		<PackageReference Include="WebDav.Client" Version="2.8.0" />
 		<PackageReference Include="YamlDotNet" Version="16.1.0" />
 		<PackageReference Include="QRCoder" Version="1.6.0" />
 	</ItemGroup>

v2rayN/ServiceLib/ViewModels/BackupAndRestoreViewModel.cs

@@ -0,0 +1,156 @@
+using ReactiveUI;
+using ReactiveUI.Fody.Helpers;
+using Splat;
+using System.Reactive;
+
+namespace ServiceLib.ViewModels
+{
+    public class BackupAndRestoreViewModel : MyReactiveObject
+    {
+        public ReactiveCommand<Unit, Unit> RemoteBackupCmd { get; }
+        public ReactiveCommand<Unit, Unit> RemoteRestoreCmd { get; }
+        public ReactiveCommand<Unit, Unit> WebDavCheckCmd { get; }
+
+        [Reactive]
+        public WebDavItem SelectedSource { get; set; }
+
+        [Reactive]
+        public string OperationMsg { get; set; }
+
+        public BackupAndRestoreViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
+        {
+            _config = LazyConfig.Instance.Config;
+            _updateView = updateView;
+            _noticeHandler = Locator.Current.GetService<NoticeHandler>();
+
+            WebDavCheckCmd = ReactiveCommand.CreateFromTask(async () =>
+            {
+                await WebDavCheck();
+            });
+
+            RemoteBackupCmd = ReactiveCommand.CreateFromTask(async () =>
+            {
+                await RemoteBackup();
+            });
+            RemoteRestoreCmd = ReactiveCommand.CreateFromTask(async () =>
+            {
+                await RemoteRestore();
+            });
+
+            SelectedSource = JsonUtils.DeepCopy(_config.webDavItem);
+        }
+
+        private void DisplayOperationMsg(string msg = "")
+        {
+            OperationMsg = msg;
+        }
+
+        private async Task WebDavCheck()
+        {
+            DisplayOperationMsg();
+            _config.webDavItem = SelectedSource;
+            ConfigHandler.SaveConfig(_config);
+
+            var result = await WebDavHandler.Instance.CheckConnection();
+            if (result)
+            {
+                DisplayOperationMsg(ResUI.OperationSuccess);
+            }
+            else
+            {
+                DisplayOperationMsg(WebDavHandler.Instance.GetLastError());
+            }
+        }
+
+        private async Task RemoteBackup()
+        {
+            DisplayOperationMsg();
+            var fileName = Utils.GetBackupPath($"backup_{DateTime.Now:yyyyMMddHHmmss}.zip");
+            var result = await CreateZipFileFromDirectory(fileName);
+            if (result)
+            {
+                var result2 = await WebDavHandler.Instance.PutFile(fileName);
+                if (result2)
+                {
+                    DisplayOperationMsg(ResUI.OperationSuccess);
+                    return;
+                }
+            }
+
+            DisplayOperationMsg(WebDavHandler.Instance.GetLastError());
+        }
+
+        private async Task RemoteRestore()
+        {
+            DisplayOperationMsg();
+            var fileName = Utils.GetTempPath(Utils.GetGUID());
+            var result = await WebDavHandler.Instance.GetRawFile(fileName);
+            if (result)
+            {
+                await LocalRestore(fileName);
+                return;
+            }
+
+            DisplayOperationMsg(WebDavHandler.Instance.GetLastError());
+        }
+
+        public async Task<bool> LocalBackup(string fileName)
+        {
+            DisplayOperationMsg();
+            var result = await CreateZipFileFromDirectory(fileName);
+            if (result)
+            {
+                DisplayOperationMsg(ResUI.OperationSuccess);
+            }
+            else
+            {
+                DisplayOperationMsg(WebDavHandler.Instance.GetLastError());
+            }
+
+            return result;
+        }
+
+        public async Task LocalRestore(string fileName)
+        {
+            DisplayOperationMsg();
+            if (Utils.IsNullOrEmpty(fileName))
+            {
+                return;
+            }
+            //exist
+            if (!File.Exists(fileName))
+            {
+                return;
+            }
+
+            //backup first
+            var fileBackup = Utils.GetBackupPath($"backup_{DateTime.Now:yyyyMMddHHmmss}.zip");
+            var result = await CreateZipFileFromDirectory(fileBackup);
+            if (result)
+            {
+                Locator.Current.GetService<MainWindowViewModel>()?.V2rayUpgrade(fileName);
+            }
+            else
+            {
+                DisplayOperationMsg(WebDavHandler.Instance.GetLastError());
+            }
+        }
+
+        private async Task<bool> CreateZipFileFromDirectory(string fileName)
+        {
+            if (Utils.IsNullOrEmpty(fileName))
+            {
+                return false;
+            }
+
+            var configDir = Utils.GetConfigPath();
+            var configDirZipTemp = Utils.GetTempPath($"v2rayN_{DateTime.Now:yyyyMMddHHmmss}");
+            var configDirTemp = Path.Combine(configDirZipTemp, "guiConfigs");
+
+            await Task.Run(() => FileManager.CopyDirectory(configDir, configDirTemp, true, "cache.db"));
+            var ret = await Task.Run(() => FileManager.CreateFromDirectory(configDirZipTemp, fileName));
+            await Task.Run(() => Directory.Delete(configDirZipTemp, true));
+            return ret;
+        }
+    }
+}

v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs

@@ -3,7 +3,6 @@ using DynamicData.Binding;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using Splat;
-using System.Diagnostics;
 using System.Reactive;
 
 namespace ServiceLib.ViewModels
@@ -11,6 +10,7 @@ namespace ServiceLib.ViewModels
     public class CheckUpdateViewModel : MyReactiveObject
     {
         private const string _geo = "GeoFiles";
+        private string _v2rayN = ECoreType.v2rayN.ToString();
         private List<CheckUpdateItem> _lstUpdated = [];
 
         private IObservableCollection<CheckUpdateItem> _checkUpdateItem = new ObservableCollectionExtended<CheckUpdateItem>();
@@ -52,7 +52,7 @@ namespace ServiceLib.ViewModels
             _checkUpdateItem.Add(new CheckUpdateItem()
             {
                 isSelected = false,
-                coreType = ECoreType.v2rayN.ToString(),
+                coreType = _v2rayN,
                 remarks = ResUI.menuCheckUpdate,
             });
             _checkUpdateItem.Add(new CheckUpdateItem()
@@ -98,7 +98,7 @@ namespace ServiceLib.ViewModels
                     {
                         await CheckUpdateGeo();
                     }
-                    else if (item.coreType == ECoreType.v2rayN.ToString())
+                    else if (item.coreType == _v2rayN)
                     {
                         await CheckUpdateN(EnableCheckPreReleaseUpdate);
                     }
@@ -147,29 +147,29 @@ namespace ServiceLib.ViewModels
 
         private async Task CheckUpdateN(bool preRelease)
         {
-            //Check for standalone windows .Net version
-            if (Utils.IsWindows()
-                && File.Exists(Path.Combine(Utils.StartupPath(), "wpfgfx_cor3.dll"))
-                && File.Exists(Path.Combine(Utils.StartupPath(), "D3DCompiler_47_cor3.dll"))
-                )
-            {
-                UpdateView(ResUI.UpdateStandalonePackageTip, ResUI.UpdateStandalonePackageTip);
-                return;
-            }
+            ////Check for standalone windows .Net version
+            //if (Utils.IsWindows()
+            //    && File.Exists(Path.Combine(Utils.StartupPath(), "wpfgfx_cor3.dll"))
+            //    && File.Exists(Path.Combine(Utils.StartupPath(), "D3DCompiler_47_cor3.dll"))
+            //    )
+            //{
+            //    UpdateView(_v2rayN, ResUI.UpdateStandalonePackageTip);
+            //    return;
+            //}
 
             void _updateUI(bool success, string msg)
             {
-                UpdateView(ECoreType.v2rayN.ToString(), msg);
+                UpdateView(_v2rayN, msg);
                 if (success)
                 {
-                    UpdateView(ECoreType.v2rayN.ToString(), ResUI.OperationSuccess);
-                    UpdatedPlusPlus(ECoreType.v2rayN.ToString(), msg);
+                    UpdateView(_v2rayN, ResUI.OperationSuccess);
+                    UpdatedPlusPlus(_v2rayN, msg);
                 }
             }
             await (new UpdateHandler()).CheckUpdateGuiN(_config, _updateUI, preRelease)
                 .ContinueWith(t =>
                 {
-                    UpdatedPlusPlus(ECoreType.v2rayN.ToString(), "");
+                    UpdatedPlusPlus(_v2rayN, "");
                 });
         }
 
@@ -201,7 +201,7 @@ namespace ServiceLib.ViewModels
                 Task.Delay(1000);
                 UpgradeCore();
 
-                if (_lstUpdated.Any(x => x.coreType == ECoreType.v2rayN.ToString() && x.isFinished == true))
+                if (_lstUpdated.Any(x => x.coreType == _v2rayN && x.isFinished == true))
                 {
                     Task.Delay(1000);
                     UpgradeN();
@@ -228,30 +228,16 @@ namespace ServiceLib.ViewModels
         {
             try
             {
-                var fileName = _lstUpdated.FirstOrDefault(x => x.coreType == ECoreType.v2rayN.ToString())?.fileName;
+                var fileName = _lstUpdated.FirstOrDefault(x => x.coreType == _v2rayN)?.fileName;
                 if (fileName.IsNullOrEmpty())
                 {
                     return;
                 }
-
-                Process process = new()
-                {
-                    StartInfo = new ProcessStartInfo
-                    {
-                        FileName = "v2rayUpgrade",
-                        Arguments = fileName.AppendQuotes(),
-                        WorkingDirectory = Utils.StartupPath()
-                    }
-                };
-                process.Start();
-                if (process.Id > 0)
-                {
-                    Locator.Current.GetService<MainWindowViewModel>()?.MyAppExitAsync(false);
-                }
+                Locator.Current.GetService<MainWindowViewModel>()?.V2rayUpgrade(fileName);
             }
             catch (Exception ex)
             {
-                UpdateView(ECoreType.v2rayN.ToString(), ex.Message);
+                UpdateView(_v2rayN, ex.Message);
             }
         }
 

v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs

@@ -135,7 +135,7 @@ namespace ServiceLib.ViewModels
 
         private void UpdateHandler(bool notify, string msg)
         {
-            _noticeHandler?.SendMessage(msg, true);
+            _noticeHandler?.SendMessageEx(msg);
         }
 
         public void ProxiesReload()

v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs

@@ -71,13 +71,6 @@ namespace ServiceLib.ViewModels
         public ReactiveCommand<Unit, Unit> ClearServerStatisticsCmd { get; }
         public ReactiveCommand<Unit, Unit> OpenTheFileLocationCmd { get; }
 
-        //CheckUpdate
-        public ReactiveCommand<Unit, Unit> CheckUpdateNCmd { get; }
-
-        public ReactiveCommand<Unit, Unit> CheckUpdateXrayCoreCmd { get; }
-        public ReactiveCommand<Unit, Unit> CheckUpdateClashMetaCoreCmd { get; }
-        public ReactiveCommand<Unit, Unit> CheckUpdateSingBoxCoreCmd { get; }
-        public ReactiveCommand<Unit, Unit> CheckUpdateGeoCmd { get; }
         public ReactiveCommand<Unit, Unit> ReloadCmd { get; }
 
         [Reactive]
@@ -295,28 +288,6 @@ namespace ServiceLib.ViewModels
                 Utils.ProcessStart("Explorer", $"/select,{Utils.GetConfigPath()}");
             });
 
-            //CheckUpdate
-            CheckUpdateNCmd = ReactiveCommand.Create(() =>
-            {
-                CheckUpdateN();
-            });
-            CheckUpdateXrayCoreCmd = ReactiveCommand.Create(() =>
-            {
-                CheckUpdateCore(ECoreType.Xray, null);
-            });
-            CheckUpdateClashMetaCoreCmd = ReactiveCommand.Create(() =>
-            {
-                CheckUpdateCore(ECoreType.mihomo, false);
-            });
-            CheckUpdateSingBoxCoreCmd = ReactiveCommand.Create(() =>
-            {
-                CheckUpdateCore(ECoreType.sing_box, null);
-            });
-            CheckUpdateGeoCmd = ReactiveCommand.Create(() =>
-            {
-                CheckUpdateGeo();
-            });
-
             ReloadCmd = ReactiveCommand.Create(() =>
             {
                 Reload();
@@ -391,7 +362,7 @@ namespace ServiceLib.ViewModels
 
         private void UpdateTaskHandler(bool success, string msg)
         {
-            _noticeHandler?.SendMessage(msg);
+            _noticeHandler?.SendMessageEx(msg);
             if (success)
             {
                 var indexIdOld = _config.indexId;
@@ -457,6 +428,24 @@ namespace ServiceLib.ViewModels
             }
         }
 
+        public async Task V2rayUpgrade(string fileName)
+        {
+            Process process = new()
+            {
+                StartInfo = new ProcessStartInfo
+                {
+                    FileName = "v2rayUpgrade",
+                    Arguments = fileName.AppendQuotes(),
+                    WorkingDirectory = Utils.StartupPath()
+                }
+            };
+            process.Start();
+            if (process.Id > 0)
+            {
+                await MyAppExitAsync(false);
+            }
+        }
+
         #endregion Actions
 
         #region Servers && Groups
@@ -631,7 +620,7 @@ namespace ServiceLib.ViewModels
             }
             (new UpdateHandler()).RunAvailabilityCheck(async (bool success, string msg) =>
             {
-                _noticeHandler?.SendMessage(msg, true);
+                _noticeHandler?.SendMessageEx(msg);
 
                 if (!_config.uiItem.showInTaskbar)
                 {
@@ -718,99 +707,6 @@ namespace ServiceLib.ViewModels
 
         #endregion Setting
 
-        #region CheckUpdate
-
-        private void CheckUpdateN()
-        {
-            //Check for standalone windows .Net version
-            if (Utils.IsWindows()
-                && File.Exists(Path.Combine(Utils.StartupPath(), "wpfgfx_cor3.dll"))
-                && File.Exists(Path.Combine(Utils.StartupPath(), "D3DCompiler_47_cor3.dll"))
-                )
-            {
-                _noticeHandler?.SendMessageAndEnqueue(ResUI.UpdateStandalonePackageTip);
-                return;
-            }
-
-            void _updateUI(bool success, string msg)
-            {
-                _noticeHandler?.SendMessage(msg);
-                if (success)
-                {
-                    try
-                    {
-                        var fileName = msg;
-                        Process process = new()
-                        {
-                            StartInfo = new ProcessStartInfo
-                            {
-                                FileName = "v2rayUpgrade",
-                                Arguments = fileName.AppendQuotes(),
-                                WorkingDirectory = Utils.StartupPath()
-                            }
-                        };
-                        process.Start();
-                        if (process.Id > 0)
-                        {
-                            MyAppExitAsync(false);
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        _noticeHandler?.SendMessage(ex.Message);
-                    }
-                }
-            }
-            (new UpdateHandler()).CheckUpdateGuiN(_config, _updateUI, _config.guiItem.checkPreReleaseUpdate);
-        }
-
-        private void CheckUpdateCore(ECoreType type, bool? preRelease)
-        {
-            void _updateUI(bool success, string msg)
-            {
-                _noticeHandler?.SendMessage(msg);
-                if (success)
-                {
-                    CloseCore();
-
-                    string fileName = Utils.GetTempPath(Utils.GetDownloadFileName(msg));
-                    string toPath = Utils.GetBinPath("", type.ToString());
-
-                    if (fileName.Contains(".tar.gz"))
-                    {
-                        //It's too complicated to unzip. TODO
-                    }
-                    else if (fileName.Contains(".gz"))
-                    {
-                        FileManager.UncompressedFile(fileName, toPath, type.ToString());
-                    }
-                    else
-                    {
-                        FileManager.ZipExtractToFile(fileName, toPath, _config.guiItem.ignoreGeoUpdateCore ? "geo" : "");
-                    }
-
-                    _noticeHandler?.SendMessage(ResUI.MsgUpdateV2rayCoreSuccessfullyMore);
-
-                    Reload();
-
-                    _noticeHandler?.SendMessage(ResUI.MsgUpdateV2rayCoreSuccessfully);
-
-                    if (File.Exists(fileName))
-                    {
-                        File.Delete(fileName);
-                    }
-                }
-            }
-            (new UpdateHandler()).CheckUpdateCore(type, _config, _updateUI, preRelease ?? _config.guiItem.checkPreReleaseUpdate);
-        }
-
-        private void CheckUpdateGeo()
-        {
-            (new UpdateHandler()).UpdateGeoFileAll(_config, UpdateTaskHandler);
-        }
-
-        #endregion CheckUpdate
-
         #region core job
 
         public void Reload()
@@ -881,7 +777,7 @@ namespace ServiceLib.ViewModels
         private async Task ChangeSystemProxyStatusAsync(ESysProxyType type, bool blChange)
         {
             await _updateView?.Invoke(EViewAction.UpdateSysProxy, _config.tunModeItem.enableTun ? true : false);
-            _noticeHandler?.SendMessage($"{ResUI.TipChangeSystemProxy} - {_config.systemProxyItem.sysProxyType.ToString()}", true);
+            _noticeHandler?.SendMessageEx($"{ResUI.TipChangeSystemProxy} - {_config.systemProxyItem.sysProxyType.ToString()}");
 
             BlSystemProxyClear = (type == ESysProxyType.ForcedClear);
             BlSystemProxySet = (type == ESysProxyType.ForcedChange);
@@ -941,7 +837,7 @@ namespace ServiceLib.ViewModels
 
             if (ConfigHandler.SetDefaultRouting(_config, item) == 0)
             {
-                _noticeHandler?.SendMessage(ResUI.TipChangeRouting, true);
+                _noticeHandler?.SendMessageEx(ResUI.TipChangeRouting);
                 Reload();
                 await _updateView?.Invoke(EViewAction.DispatcherRefreshIcon, null);
             }

v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs

@@ -258,7 +258,7 @@ namespace ServiceLib.ViewModels
         {
             if (Utils.IsNullOrEmpty(result.IndexId))
             {
-                _noticeHandler?.SendMessage(result.Delay, true);
+                _noticeHandler?.SendMessageEx(result.Delay);
                 _noticeHandler?.Enqueue(result.Delay);
                 return;
             }

v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml

@@ -0,0 +1,96 @@
+<UserControl
+    x:Class="v2rayN.Desktop.Views.CheckUpdateView"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
+    xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    x:DataType="vms:CheckUpdateViewModel"
+    mc:Ignorable="d">
+    <Button Classes="Tertiary">
+        <Button.Content>
+            <TextBlock Text="{x:Static resx:ResUI.menuCheckUpdate}" />
+        </Button.Content>
+        <Button.Flyout>
+            <Flyout Placement="RightEdgeAlignedTop">
+                <DockPanel Margin="16">
+                    <StackPanel
+                        HorizontalAlignment="Right"
+                        Classes="Margin8"
+                        DockPanel.Dock="Bottom"
+                        Orientation="Horizontal">
+
+                        <TextBlock
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            Classes="Margin8"
+                            Text="{x:Static resx:ResUI.TbSettingsEnableCheckPreReleaseUpdate}" />
+                        <ToggleSwitch
+                            x:Name="togEnableCheckPreReleaseUpdate"
+                            HorizontalAlignment="Left"
+                            Classes="Margin8" />
+
+                        <Button
+                            x:Name="btnCheckUpdate"
+                            Width="100"
+                            Classes="Margin8"
+                            Content="{x:Static resx:ResUI.menuCheckUpdate}" />
+                    </StackPanel>
+
+                    <StackPanel>
+                        <ListBox
+                            x:Name="lstCheckUpdates"
+                            BorderThickness="1"
+                            ItemsSource="{Binding CheckUpdateItems}">
+                            <ItemsControl.ItemsPanel>
+                                <ItemsPanelTemplate>
+                                    <StackPanel Orientation="Vertical" />
+                                </ItemsPanelTemplate>
+                            </ItemsControl.ItemsPanel>
+                            <ItemsControl.ItemTemplate>
+                                <DataTemplate>
+                                    <Border
+                                        Width="500"
+                                        Height="80"
+                                        Margin="0"
+                                        VerticalAlignment="Center"
+                                        Theme="{StaticResource CardBorder}">
+                                        <Grid>
+                                            <Grid.RowDefinitions>
+                                                <RowDefinition Height="Auto" />
+                                            </Grid.RowDefinitions>
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="1*" />
+                                                <ColumnDefinition Width="1*" />
+                                                <ColumnDefinition Width="3*" />
+                                            </Grid.ColumnDefinitions>
+                                            <ToggleSwitch
+                                                x:Name="togAutoRefresh"
+                                                Grid.Column="0"
+                                                Margin="8"
+                                                HorizontalAlignment="Left"
+                                                VerticalAlignment="Center"
+                                                IsChecked="{Binding isSelected}" />
+                                            <TextBlock
+                                                Grid.Column="1"
+                                                VerticalAlignment="Center"
+                                                Text="{Binding coreType}" />
+                                            <TextBlock
+                                                Grid.Column="2"
+                                                VerticalAlignment="Center"
+                                                Text="{Binding remarks}"
+                                                TextWrapping="WrapWithOverflow" />
+                                        </Grid>
+                                    </Border>
+                                </DataTemplate>
+                            </ItemsControl.ItemTemplate>
+                        </ListBox>
+                    </StackPanel>
+                </DockPanel>
+            </Flyout>
+        </Button.Flyout>
+    </Button>
+</UserControl>

v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml.cs

@@ -0,0 +1,48 @@
+using Avalonia.ReactiveUI;
+using Avalonia.Threading;
+using ReactiveUI;
+using System.Reactive.Disposables;
+
+namespace v2rayN.Desktop.Views
+{
+    public partial class CheckUpdateView : ReactiveUserControl<CheckUpdateViewModel>
+    {
+        public CheckUpdateView()
+        {
+            InitializeComponent();
+
+            ViewModel = new CheckUpdateViewModel(UpdateViewHandler);
+
+            this.WhenActivated(disposables =>
+            {
+                this.OneWayBind(ViewModel, vm => vm.CheckUpdateItems, v => v.lstCheckUpdates.ItemsSource).DisposeWith(disposables);
+
+                this.Bind(ViewModel, vm => vm.EnableCheckPreReleaseUpdate, v => v.togEnableCheckPreReleaseUpdate.IsChecked).DisposeWith(disposables);
+                this.BindCommand(ViewModel, vm => vm.CheckUpdateCmd, v => v.btnCheckUpdate).DisposeWith(disposables);
+                this.OneWayBind(ViewModel, vm => vm.IsCheckUpdate, v => v.btnCheckUpdate.IsEnabled).DisposeWith(disposables);
+            });
+        }
+
+        private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
+        {
+            switch (action)
+            {
+                case EViewAction.DispatcherCheckUpdate:
+                    if (obj is null) return false;
+                    Dispatcher.UIThread.Post(() =>
+                        ViewModel?.UpdateViewResult((CheckUpdateItem)obj),
+                    DispatcherPriority.Default);
+                    break;
+
+                case EViewAction.DispatcherCheckUpdateFinished:
+                    if (obj is null) return false;
+                    Dispatcher.UIThread.Post(() =>
+                        ViewModel?.UpdateFinishedResult((bool)obj),
+                    DispatcherPriority.Default);
+                    break;
+            }
+
+            return await Task.FromResult(true);
+        }
+    }
+}

v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml

@@ -104,7 +104,7 @@
                     <DataTemplate>
                         <Border
                             Width="160"
-                            Margin="4,0"
+                            Margin="0"
                             Padding="0"
                             Theme="{StaticResource CardBorder}">
                             <DockPanel>

v2rayN/v2rayN.Desktop/Views/MainWindow.axaml

@@ -87,16 +87,8 @@
 
                 <MenuItem Padding="8,0">
                     <MenuItem.Header>
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="{x:Static resx:ResUI.menuCheckUpdate}" />
-                        </StackPanel>
+                        <ContentControl x:Name="conCheckUpdate" />
                     </MenuItem.Header>
-                    <MenuItem x:Name="menuCheckUpdateN" Header="V2rayN" />
-                    <MenuItem x:Name="menuCheckUpdateXrayCore" Header="Xray Core" />
-                    <MenuItem x:Name="menuCheckUpdateMihomoCore" Header="Mihomo Core" />
-                    <MenuItem x:Name="menuCheckUpdateSingBoxCore" Header="Sing-box Core" />
-                    <Separator />
-                    <MenuItem x:Name="menuCheckUpdateGeo" Header="Geo files" />
                 </MenuItem>
 
                 <MenuItem x:Name="menuHelp" Padding="8,0">

v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs

@@ -72,13 +72,7 @@ namespace v2rayN.Desktop.Views
                 this.BindCommand(ViewModel, vm => vm.ClearServerStatisticsCmd, v => v.menuClearServerStatistics).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.OpenTheFileLocationCmd, v => v.menuOpenTheFileLocation).DisposeWith(disposables);
 
-                //check update
-                this.BindCommand(ViewModel, vm => vm.CheckUpdateNCmd, v => v.menuCheckUpdateN).DisposeWith(disposables);
-                this.BindCommand(ViewModel, vm => vm.CheckUpdateXrayCoreCmd, v => v.menuCheckUpdateXrayCore).DisposeWith(disposables);
-                this.BindCommand(ViewModel, vm => vm.CheckUpdateClashMetaCoreCmd, v => v.menuCheckUpdateMihomoCore).DisposeWith(disposables);
-                this.BindCommand(ViewModel, vm => vm.CheckUpdateSingBoxCoreCmd, v => v.menuCheckUpdateSingBoxCore).DisposeWith(disposables);
-                this.BindCommand(ViewModel, vm => vm.CheckUpdateGeoCmd, v => v.menuCheckUpdateGeo).DisposeWith(disposables);
-
+                
                 this.BindCommand(ViewModel, vm => vm.ReloadCmd, v => v.menuReload).DisposeWith(disposables);
                 this.OneWayBind(ViewModel, vm => vm.BlReloadEnabled, v => v.menuReload.IsEnabled).DisposeWith(disposables);
 
@@ -172,6 +166,7 @@ namespace v2rayN.Desktop.Views
                 tabClashConnections2.Content ??= new ClashConnectionsView();
             }
             conTheme.Content ??= new ThemeSettingView();
+            conCheckUpdate.Content ??= new CheckUpdateView();
 
             RestoreUI();
             AddHelpMenuItem();

v2rayN/v2rayN/Common/UI.cs

@@ -35,5 +35,25 @@ namespace v2rayN
 
             return true;
         }
+
+        public static bool? SaveFileDialog(out string fileName, string filter)
+        {
+            fileName = string.Empty;
+
+            SaveFileDialog fileDialog = new()
+            {
+                Filter = filter,
+                FilterIndex = 2,
+                RestoreDirectory = true
+            };
+            if (fileDialog.ShowDialog() != true)
+            {
+                return false;
+            }
+
+            fileName = fileDialog.FileName;
+
+            return true;
+        }
     }
 }

v2rayN/v2rayN/Views/BackupAndRestoreView.xaml

@@ -0,0 +1,256 @@
+<reactiveui:ReactiveUserControl
+    x:Class="v2rayN.Views.BackupAndRestoreView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:converters="clr-namespace:v2rayN.Converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
+    xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
+    xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
+    d:DesignHeight="600"
+    d:DesignWidth="800"
+    x:TypeArguments="vms:BackupAndRestoreViewModel"
+    mc:Ignorable="d">
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Popupbox.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
+    <DockPanel Margin="16">
+        <DockPanel Margin="8" DockPanel.Dock="Bottom">
+            <Button
+                Width="100"
+                Margin="8"
+                Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}"
+                Content="{x:Static resx:ResUI.menuClose}"
+                DockPanel.Dock="Right"
+                IsCancel="True"
+                IsDefault="True"
+                Style="{StaticResource MaterialDesignFlatButton}" />
+
+            <TextBlock
+                x:Name="txtMsg"
+                Margin="8"
+                HorizontalAlignment="Left"
+                Style="{StaticResource ToolbarTextBlock}" />
+        </DockPanel>
+
+        <StackPanel>
+            <materialDesign:Card Width="Auto" Margin="8">
+                <Grid Margin="8">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="300" />
+                        <ColumnDefinition Width="200" />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        Margin="8"
+                        Style="{StaticResource ModuleTitle}"
+                        Text="{x:Static resx:ResUI.menuLocalBackupAndRestore}" />
+
+                    <TextBlock
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Margin="8"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.menuLocalBackup}" />
+                    <Button
+                        x:Name="menuLocalBackup"
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Margin="8"
+                        VerticalAlignment="Center"
+                        Content="{x:Static resx:ResUI.menuLocalBackup}"
+                        Style="{StaticResource DefButton}" />
+
+                    <Separator
+                        Grid.Row="2"
+                        Grid.ColumnSpan="2"
+                        Style="{StaticResource MaterialDesignLightSeparator}" />
+
+                    <TextBlock
+                        Grid.Row="3"
+                        Grid.Column="0"
+                        Margin="8"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.menuLocalRestore}" />
+                    <Button
+                        x:Name="menuLocalRestore"
+                        Grid.Row="3"
+                        Grid.Column="1"
+                        Margin="8"
+                        VerticalAlignment="Center"
+                        Content="{x:Static resx:ResUI.menuLocalRestore}"
+                        Style="{StaticResource DefButton}" />
+                </Grid>
+            </materialDesign:Card>
+            <materialDesign:Card Width="Auto" Margin="8">
+                <Grid Margin="8">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="300" />
+                        <ColumnDefinition Width="200" />
+                    </Grid.ColumnDefinitions>
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Margin="8"
+                            Style="{StaticResource ModuleTitle}"
+                            Text="{x:Static resx:ResUI.menuRemoteBackupAndRestore}" />
+
+                        <materialDesign:PopupBox
+                            Padding="8,0"
+                            HorizontalAlignment="Right"
+                            StaysOpen="True"
+                            Style="{StaticResource MaterialDesignToolForegroundPopupBox}">
+                            <StackPanel Margin="16">
+                                <Grid>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="300" />
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock
+                                        Grid.Row="0"
+                                        Grid.Column="0"
+                                        Margin="8"
+                                        VerticalAlignment="Center"
+                                        Style="{StaticResource ToolbarTextBlock}"
+                                        Text="{x:Static resx:ResUI.LvWebDavUrl}" />
+
+                                    <TextBox
+                                        x:Name="txtWebDavUrl"
+                                        Grid.Row="0"
+                                        Grid.Column="1"
+                                        Margin="8"
+                                        VerticalAlignment="Center"
+                                        Style="{StaticResource DefTextBox}"
+                                        TextWrapping="Wrap" />
+
+                                    <TextBlock
+                                        Grid.Row="1"
+                                        Grid.Column="0"
+                                        Margin="8"
+                                        VerticalAlignment="Center"
+                                        Style="{StaticResource ToolbarTextBlock}"
+                                        Text="{x:Static resx:ResUI.LvWebDavUserName}" />
+
+                                    <TextBox
+                                        x:Name="txtWebDavUserName"
+                                        Grid.Row="1"
+                                        Grid.Column="1"
+                                        Margin="8"
+                                        VerticalAlignment="Center"
+                                        Style="{StaticResource DefTextBox}" />
+
+                                    <TextBlock
+                                        Grid.Row="2"
+                                        Grid.Column="0"
+                                        Margin="8"
+                                        VerticalAlignment="Center"
+                                        Style="{StaticResource ToolbarTextBlock}"
+                                        Text="{x:Static resx:ResUI.LvWebDavPassword}" />
+
+                                    <TextBox
+                                        x:Name="txtWebDavPassword"
+                                        Grid.Row="2"
+                                        Grid.Column="1"
+                                        Margin="8"
+                                        VerticalAlignment="Center"
+                                        Style="{StaticResource DefTextBox}" />
+
+                                    <TextBlock
+                                        Grid.Row="3"
+                                        Grid.Column="0"
+                                        Margin="8"
+                                        VerticalAlignment="Center"
+                                        Style="{StaticResource ToolbarTextBlock}"
+                                        Text="{x:Static resx:ResUI.LvWebDavDirName}" />
+
+                                    <TextBox
+                                        x:Name="txtWebDavDirName"
+                                        Grid.Row="3"
+                                        Grid.Column="1"
+                                        Margin="8"
+                                        VerticalAlignment="Center"
+                                        Style="{StaticResource DefTextBox}" />
+
+                                    <Button
+                                        x:Name="menuWebDavCheck"
+                                        Grid.Row="4"
+                                        Grid.Column="1"
+                                        Margin="8"
+                                        VerticalAlignment="Center"
+                                        Content="{x:Static resx:ResUI.LvWebDavCheck}"
+                                        Style="{StaticResource DefButton}" />
+                                </Grid>
+                            </StackPanel>
+                        </materialDesign:PopupBox>
+                    </StackPanel>
+
+                    <TextBlock
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Margin="8"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.menuRemoteBackup}" />
+                    <Button
+                        x:Name="menuRemoteBackup"
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Margin="8"
+                        VerticalAlignment="Center"
+                        Content="{x:Static resx:ResUI.menuRemoteBackup}"
+                        Style="{StaticResource DefButton}" />
+
+                    <Separator
+                        Grid.Row="2"
+                        Grid.ColumnSpan="3"
+                        Style="{StaticResource MaterialDesignLightSeparator}" />
+                    <TextBlock
+                        Grid.Row="3"
+                        Grid.Column="0"
+                        Margin="8"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.menuRemoteRestore}" />
+                    <Button
+                        x:Name="menuRemoteRestore"
+                        Grid.Row="3"
+                        Grid.Column="1"
+                        Margin="8"
+                        VerticalAlignment="Center"
+                        Content="{x:Static resx:ResUI.menuRemoteRestore}"
+                        Style="{StaticResource DefButton}" />
+                </Grid>
+            </materialDesign:Card>
+        </StackPanel>
+    </DockPanel>
+</reactiveui:ReactiveUserControl>

v2rayN/v2rayN/Views/BackupAndRestoreView.xaml.cs

@@ -0,0 +1,65 @@
+using ReactiveUI;
+using Splat;
+using System.Reactive.Disposables;
+using System.Windows;
+
+namespace v2rayN.Views
+{
+    public partial class BackupAndRestoreView
+    {
+        private NoticeHandler? _noticeHandler;
+
+        public BackupAndRestoreView()
+        {
+            InitializeComponent();
+            menuLocalBackup.Click += MenuLocalBackup_Click;
+            menuLocalRestore.Click += MenuLocalRestore_Click;
+
+            ViewModel = new BackupAndRestoreViewModel(UpdateViewHandler);
+
+            _noticeHandler = Locator.Current.GetService<NoticeHandler>();
+            this.WhenActivated(disposables =>
+            {
+                this.Bind(ViewModel, vm => vm.OperationMsg, v => v.txtMsg.Text).DisposeWith(disposables);
+
+                this.Bind(ViewModel, vm => vm.SelectedSource.url, v => v.txtWebDavUrl.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.SelectedSource.userName, v => v.txtWebDavUserName.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.SelectedSource.password, v => v.txtWebDavPassword.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.SelectedSource.dirName, v => v.txtWebDavDirName.Text).DisposeWith(disposables);
+                
+                this.BindCommand(ViewModel, vm => vm.WebDavCheckCmd, v => v.menuWebDavCheck).DisposeWith(disposables);
+
+                this.BindCommand(ViewModel, vm => vm.RemoteBackupCmd, v => v.menuRemoteBackup).DisposeWith(disposables);
+                this.BindCommand(ViewModel, vm => vm.RemoteRestoreCmd, v => v.menuRemoteRestore).DisposeWith(disposables);
+            });
+        }
+
+        private void MenuRemoteRestore_Click(object sender, RoutedEventArgs e)
+        {
+            throw new NotImplementedException();
+        }
+
+        private void MenuLocalBackup_Click(object sender, RoutedEventArgs e)
+        {
+            if (UI.SaveFileDialog(out string fileName, "Zip|*.zip") != true)
+            {
+                return;
+            }
+            ViewModel?.LocalBackup(fileName);
+        }
+
+        private void MenuLocalRestore_Click(object sender, RoutedEventArgs e)
+        {
+            if (UI.OpenFileDialog(out string fileName, "Zip|*.zip|All|*.*") != true)
+            {
+                return;
+            }
+            ViewModel?.LocalRestore(fileName);
+        }
+
+        private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
+        {
+            return await Task.FromResult(true);
+        }
+    }
+}

v2rayN/v2rayN/Views/CheckUpdateView.xaml

@@ -22,32 +22,25 @@
             Orientation="Horizontal">
 
             <TextBlock
-                Grid.Row="9"
-                Grid.Column="0"
                 Margin="{StaticResource SettingItemMargin}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="{x:Static resx:ResUI.TbSettingsEnableCheckPreReleaseUpdate}" />
             <ToggleButton
                 x:Name="togEnableCheckPreReleaseUpdate"
-                Grid.Row="9"
-                Grid.Column="1"
                 Margin="{StaticResource SettingItemMargin}"
                 HorizontalAlignment="Left" />
 
             <Button
                 x:Name="btnCheckUpdate"
-                Grid.Row="2"
                 Width="100"
                 Margin="8"
-                Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}"
                 Content="{x:Static resx:ResUI.menuCheckUpdate}"
                 IsCancel="True"
                 IsDefault="True"
                 Style="{StaticResource MaterialDesignFlatButton}" />
 
             <Button
-                Grid.Row="2"
                 Width="100"
                 Margin="8"
                 HorizontalAlignment="Right"

v2rayN/v2rayN/Views/MainWindow.xaml

@@ -186,14 +186,14 @@
                                     Height="{StaticResource MenuItemHeight}"
                                     Header="{x:Static resx:ResUI.menuClearServerStatistics}" />
                                 <Separator Margin="-40,5" />
+                                <MenuItem
+                                    x:Name="menuBackupAndRestore"
+                                    Height="{StaticResource MenuItemHeight}"
+                                    Header="{x:Static resx:ResUI.menuBackupAndRestore}" />
                                 <MenuItem
                                     x:Name="menuOpenTheFileLocation"
                                     Height="{StaticResource MenuItemHeight}"
                                     Header="{x:Static resx:ResUI.menuOpenTheFileLocation}" />
-                                <!--<MenuItem
-                                    x:Name="menuImportOldGuiConfig"
-                                    Height="{StaticResource MenuItemHeight}"
-                                    Header="{x:Static resx:ResUI.menuImportOldGuiConfig}" />-->
                             </MenuItem>
                         </Menu>
                         <Separator />

v2rayN/v2rayN/Views/MainWindow.xaml.cs

@@ -17,6 +17,7 @@ namespace v2rayN.Views
     {
         private static Config _config;
         private CheckUpdateView? _checkUpdateView;
+        private BackupAndRestoreView? _backupAndRestoreView;
 
         public MainWindow()
         {
@@ -33,6 +34,7 @@ namespace v2rayN.Views
             menuClose.Click += menuClose_Click;
             menuExit.Click += menuExit_Click;
             menuCheckUpdate.Click += MenuCheckUpdate_Click;
+            menuBackupAndRestore.Click += MenuBackupAndRestore_Click;
 
             MessageBus.Current.Listen<string>(Global.CommandSendSnackMsg).Subscribe(x => DelegateSnackMsg(x));
             ViewModel = new MainWindowViewModel(UpdateViewHandler);
@@ -71,14 +73,6 @@ namespace v2rayN.Views
                 this.BindCommand(ViewModel, vm => vm.RebootAsAdminCmd, v => v.menuRebootAsAdmin).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.ClearServerStatisticsCmd, v => v.menuClearServerStatistics).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.OpenTheFileLocationCmd, v => v.menuOpenTheFileLocation).DisposeWith(disposables);
-                //this.BindCommand(ViewModel, vm => vm.ImportOldGuiConfigCmd, v => v.menuImportOldGuiConfig).DisposeWith(disposables);
-
-                //check update
-                //this.BindCommand(ViewModel, vm => vm.CheckUpdateNCmd, v => v.menuCheckUpdateN).DisposeWith(disposables);
-                //this.BindCommand(ViewModel, vm => vm.CheckUpdateXrayCoreCmd, v => v.menuCheckUpdateXrayCore).DisposeWith(disposables);
-                //this.BindCommand(ViewModel, vm => vm.CheckUpdateClashMetaCoreCmd, v => v.menuCheckUpdateMihomoCore).DisposeWith(disposables);
-                //this.BindCommand(ViewModel, vm => vm.CheckUpdateSingBoxCoreCmd, v => v.menuCheckUpdateSingBoxCore).DisposeWith(disposables);
-                //this.BindCommand(ViewModel, vm => vm.CheckUpdateGeoCmd, v => v.menuCheckUpdateGeo).DisposeWith(disposables);
 
                 this.BindCommand(ViewModel, vm => vm.ReloadCmd, v => v.menuReload).DisposeWith(disposables);
                 this.OneWayBind(ViewModel, vm => vm.BlReloadEnabled, v => v.menuReload.IsEnabled).DisposeWith(disposables);
@@ -196,12 +190,6 @@ namespace v2rayN.Views
             AddHelpMenuItem();
         }
 
-        private void MenuCheckUpdate_Click(object sender, RoutedEventArgs e)
-        {
-            _checkUpdateView ??= new CheckUpdateView();
-            DialogHost.Show(_checkUpdateView, "RootDialog");
-        }
-
         #region Event
 
         private void OnProgramStarted(object state, bool timeout)
@@ -433,6 +421,18 @@ namespace v2rayN.Views
             ViewModel?.ScanScreenTaskAsync(result);
         }
 
+        private void MenuCheckUpdate_Click(object sender, RoutedEventArgs e)
+        {
+            _checkUpdateView ??= new CheckUpdateView();
+            DialogHost.Show(_checkUpdateView, "RootDialog");
+        }
+
+        private void MenuBackupAndRestore_Click(object sender, RoutedEventArgs e)
+        {
+            _backupAndRestoreView ??= new BackupAndRestoreView();
+            DialogHost.Show(_backupAndRestoreView, "RootDialog");
+        }
+
         #endregion Event
 
         #region UI

v2rayN/v2rayN/Views/ProfilesView.xaml.cs

@@ -1,5 +1,4 @@
 using MaterialDesignThemes.Wpf;
-using Microsoft.Win32;
 using ReactiveUI;
 using Splat;
 using System.Reactive.Disposables;
@@ -129,17 +128,11 @@ namespace v2rayN.Views
 
                 case EViewAction.SaveFileDialog:
                     if (obj is null) return false;
-                    SaveFileDialog fileDialog = new()
-                    {
-                        Filter = "Config|*.json",
-                        FilterIndex = 2,
-                        RestoreDirectory = true
-                    };
-                    if (fileDialog.ShowDialog() != true)
+                    if (UI.SaveFileDialog(out string fileName, "Config|*.json") != true)
                     {
                         return false;
                     }
-                    ViewModel?.Export2ClientConfigResult(fileDialog.FileName, (ProfileItem)obj);
+                    ViewModel?.Export2ClientConfigResult(fileName, (ProfileItem)obj);
                     break;
 
                 case EViewAction.AddServerWindow:

v2rayN/v2rayUpgrade/Program.cs

@@ -66,7 +66,7 @@ namespace v2rayUpgrade
             {
                 string thisAppOldFile = $"{GetExePath()}.tmp";
                 File.Delete(thisAppOldFile);
-                string startKey = "v2rayN/";
+                string splitKey = "/";
 
                 using ZipArchive archive = ZipFile.OpenRead(fileName);
                 foreach (ZipArchiveEntry entry in archive.Entries)
@@ -77,11 +77,11 @@ namespace v2rayUpgrade
                         {
                             continue;
                         }
-                        string fullName = entry.FullName;
-                        if (fullName.StartsWith(startKey))
-                        {
-                            fullName = fullName[startKey.Length..];
-                        }
+
+                        var lst = entry.FullName.Split(splitKey);
+                        if (lst.Length == 1) continue;
+                        string fullName = string.Join(splitKey, lst[1..lst.Length]);
+
                         if (string.Equals(GetExePath(), GetPath(fullName), StringComparison.OrdinalIgnoreCase))
                         {
                             File.Move(GetExePath(), thisAppOldFile);
@@ -90,6 +90,8 @@ namespace v2rayUpgrade
                         string entryOutputPath = GetPath(fullName);
                         Directory.CreateDirectory(Path.GetDirectoryName(entryOutputPath)!);
                         entry.ExtractToFile(entryOutputPath, true);
+
+                        Console.WriteLine(entryOutputPath);
                     }
                     catch (Exception ex)
                     {
@@ -104,11 +106,12 @@ namespace v2rayUpgrade
             }
             if (sb.Length > 0)
             {
-                Console.WriteLine("Upgrade Failed,Hold ctrl + c to copy to clipboard.\n" +
-                    "(升级失败,按住ctrl+c可以复制到剪贴板)." + sb.ToString());
+                Console.WriteLine("Upgrade Failed.\n" +
+                    "(升级失败)." + sb.ToString());
                 return;
             }
 
+            Console.WriteLine("Start v2rayN, please wait...(正在重启，请等待)");
             Process.Start("v2rayN");
         }