feat: check alternative addresses when rdp is reconnecting. #869

VShawn · VShawn · commit aa84184cdd40 · 2025-02-28T20:40:41.000+08:00
diff --git a/Shawn.Utils b/Shawn.Utils
@@ -1 +1 @@
-Subproject commit a17f49bb7f55a087f70f38f7187246736868c138
+Subproject commit 70f726109b6293a0128c34abddbcad4f140a7070
diff --git a/Ui/Service/SessionControlService_AlternateCredential.cs b/Ui/Service/SessionControlService_AlternateCredential.cs
@@ -74,7 +74,7 @@ public static void CredentialTest()
         /// <summary>
         /// Find the first connectable address from the given credentials. if return null then no address is connectable.
         /// </summary>
-        private static async Task<Credential?> FindFirstConnectableAddressAsync(IEnumerable<Credential> pingCredentials, string protocolDisplayName)
+        public static async Task<Credential?> FindFirstConnectableAddressAsync(IEnumerable<Credential> pingCredentials, string protocolDisplayName)
         {
             var credentials = pingCredentials.Select(x => x.CloneMe()).ToList();
             const int maxWaitSeconds = 5;
@@ -209,7 +209,7 @@ await Execute.OnUIThreadAsync(() =>
         /// <summary>
         /// if return null then no address is connectable.
         /// </summary>
-        private static async Task<Credential?> GetCredential(ProtocolBaseWithAddressPort protocol, string assignCredentialName)
+        public static async Task<Credential?> GetCredential(ProtocolBaseWithAddressPort protocol, string assignCredentialName = "")
         {
             var newCredential = protocol.GetCredential();
             newCredential.Name = protocol.DisplayName;
diff --git a/Ui/View/Host/ProtocolHosts/AxMsRdpClient09Host.cs b/Ui/View/Host/ProtocolHosts/AxMsRdpClient09Host.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Diagnostics;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
@@ -12,6 +13,10 @@
 using Shawn.Utils.Wpf;
 using Shawn.Utils.Wpf.Controls;
 using Stylet;
+using Windows.Security.Credentials;
+using System.Collections.Generic;
+using _1RM.Model.Protocol.Base;
+using _1RM.Service;
 
 namespace _1RM.View.Host.ProtocolHosts
 {
@@ -49,6 +54,28 @@ public override void ReConn()
             });
             RdpClientDispose();
 
+
+            // check if it needs to auto switch address
+            var isAutoAlternateAddressSwitching = _rdpSettings.IsAutoAlternateAddressSwitching == true
+                                                  // if none of the alternate credential has host or port，then disabled `AutoAlternateAddressSwitching`
+                                                  && _rdpSettings.AlternateCredentials.Any(x => !string.IsNullOrEmpty(x.Address) || !string.IsNullOrEmpty(x.Port));
+            if (isAutoAlternateAddressSwitching)
+            {
+                var t = Task.Factory.StartNew(async () =>
+                {
+                    var c = await SessionControlService.GetCredential(_rdpSettings);
+                    if (c != null)
+                    {
+                        _rdpSettings.SetCredential(c);
+                        _rdpSettings.DisplayName = c.Name;
+                        _rdpClient.Server = _rdpSettings.Address;
+                        _rdpClient.AdvancedSettings2.RDPPort = _rdpSettings.GetPort();
+                    }
+                });
+                t.Wait();
+            }
+
+
             Status = ProtocolHostStatus.NotInit;
 
             int w = 0;
diff --git a/VncSharpCore b/VncSharpCore
@@ -1 +1 @@
-Subproject commit aa6e1cad78cb478aeea1d4619b5e8306a33c3469
+Subproject commit b193a8f4823d427a4b63e6a190ed529ca277ce37
