feat: Allow add multi-credential and multi-address for one server, and we can check which address is available before open a connection. #301

VShawn · VShawn · commit 3119bc26ec9a · 2023-03-18T22:30:14.000+08:00
diff --git a/Ui/Model/Protocol/Base/Credential.cs b/Ui/Model/Protocol/Base/Credential.cs
@@ -71,19 +71,18 @@ public static bool TestAddressPortIsAvailable(ProtocolBaseWithAddressPortUserPwd
             string port = string.IsNullOrEmpty(credential.Port) ? protocol.Port : credential.Port;
             try
             {
-
-                var iport = int.Parse(port);
+                var p = int.Parse(port);
                 var client = new TcpClient();
                 if (timeOutMillisecond > 0)
                 {
-                    if (!client.ConnectAsync(address, iport).Wait(timeOutMillisecond))
+                    if (!client.ConnectAsync(address, p).Wait(timeOutMillisecond))
                     {
                         throw new Exception();
                     }
                 }
                 else
                 {
-                    client.Connect(address, iport);
+                    client.Connect(address, p);
                 }
                 client.Close();
 
@@ -93,9 +92,6 @@ public static bool TestAddressPortIsAvailable(ProtocolBaseWithAddressPortUserPwd
             {
                 // ignored
             }
-
-            SimpleLogHelper.Error($"TXT:{address}:{port} 未打开");
-
             return false;
         }
 
diff --git a/Ui/Model/ProtocolAction.cs b/Ui/Model/ProtocolAction.cs
@@ -53,7 +53,7 @@ public static List<ProtocolAction> GetActions(this ProtocolBase server)
                     foreach (var credential in protocol.AlternateCredentials)
                     {
                         actions.Add(new ProtocolAction(
-                            actionName: IoC.Get<ILanguageService>().Translate("Connect") + $" (TXT:with credential {credential.Name})",
+                            actionName: IoC.Get<ILanguageService>().Translate("Connect") + $" ({IoC.Get<ILanguageService>().Translate("with alternative")} `{credential.Name}`)",
                             action: () => { GlobalEventHelper.OnRequestServerConnect?.Invoke(server, fromView: $"{nameof(LauncherWindowView)} - Action - AlternateCredentials", assignCredentialName: credential.Name); }
                         ));
                     }
diff --git a/Ui/Resources/Languages/cs-cz.xaml b/Ui/Resources/Languages/cs-cz.xaml
@@ -250,4 +250,10 @@
     <s:String x:Key="Show XXX button">Show `{0}` button</s:String>
     <s:String x:Key="Show recently used here">Zobrazit nedávno použité zde</s:String>
     <s:String x:Key="Hide recently used">Skrýt nedávno použité</s:String>
+    <s:String x:Key="Leave blank to inherit the default value">Chcete-li zdědit výchozí hodnotu, ponechte prázdné</s:String>
+    <s:String x:Key="Alternative">Alternativní</s:String>
+    <s:String x:Key="with alternative">s alternativou</s:String>
+    <s:String x:Key="Automatic address switching">Automatické přepínání adres</s:String>
+    <s:String x:Key="When the default host or port is unavailable the alternate addresses will be tried in sequence">Pokud není výchozí hostitel nebo port k dispozici, budou postupně vyzkoušeny alternativní adresy</s:String>
+    <s:String x:Key="support multi-address multi-account">support multi-address multi-account</s:String>
 </ResourceDictionary>
diff --git a/Ui/Resources/Languages/de-de.xaml b/Ui/Resources/Languages/de-de.xaml
@@ -250,4 +250,10 @@
     <s:String x:Key="Show XXX button">Show `{0}` button</s:String>
     <s:String x:Key="Show recently used here">Kürzlich verwendete hier anzeigen</s:String>
     <s:String x:Key="Hide recently used">Zuletzt verwendete ausblenden</s:String>
+    <s:String x:Key="Leave blank to inherit the default value">Lassen Sie das Feld leer, um den Standardwert zu übernehmen</s:String>
+    <s:String x:Key="Alternative">Alternative</s:String>
+    <s:String x:Key="with alternative">mit Alternative</s:String>
+    <s:String x:Key="Automatic address switching">Automatische Adressumschaltung</s:String>
+    <s:String x:Key="When the default host or port is unavailable the alternate addresses will be tried in sequence">Wenn der Standardhost oder -port nicht verfügbar ist, werden die alternativen Adressen nacheinander ausprobiert</s:String>
+    <s:String x:Key="support multi-address multi-account">support multi-address multi-account</s:String>
 </ResourceDictionary>
diff --git a/Ui/Resources/Languages/en-us.xaml b/Ui/Resources/Languages/en-us.xaml
@@ -250,4 +250,10 @@
     <s:String x:Key="Show XXX button">Show `{0}` button</s:String>
     <s:String x:Key="Show recently used here"> Show recently used here</s:String>
     <s:String x:Key="Hide recently used"> Hide recently used</s:String>
+    <s:String x:Key="Leave blank to inherit the default value">Leave blank to inherit the default value</s:String>
+    <s:String x:Key="Alternative">Alternative</s:String>
+    <s:String x:Key="with alternative">with alternative</s:String>
+    <s:String x:Key="Automatic address switching">Automatic address switching</s:String>
+    <s:String x:Key="When the default host or port is unavailable the alternate addresses will be tried in sequence">When the default host or port is unavailable the alternate addresses will be tried in sequence</s:String>
+    <s:String x:Key="support multi-address multi-account">support multi-address multi-account</s:String>
 </ResourceDictionary>
diff --git a/Ui/Resources/Languages/fr-fr.xaml b/Ui/Resources/Languages/fr-fr.xaml
@@ -250,4 +250,10 @@
     <s:String x:Key="Show XXX button">Show `{0}` button</s:String>
     <s:String x:Key="Show recently used here">Afficher récemment utilisé ici</s:String>
     <s:String x:Key="Hide recently used">Masquer récemment utilisé</s:String>
+    <s:String x:Key="Leave blank to inherit the default value">Laisser vide pour hériter de la valeur par défaut</s:String>
+    <s:String x:Key="Alternative">Alternative</s:String>
+    <s:String x:Key="with alternative">avec alternative</s:String>
+    <s:String x:Key="Automatic address switching">Changement d'adresse automatique</s:String>
+    <s:String x:Key="When the default host or port is unavailable the alternate addresses will be tried in sequence">Lorsque l'hôte ou le port par défaut n'est pas disponible, les adresses alternatives seront essayées dans l'ordre</s:String>
+    <s:String x:Key="support multi-address multi-account">support multi-address multi-account</s:String>
 </ResourceDictionary>
diff --git a/Ui/Resources/Languages/glossary.csv b/Ui/Resources/Languages/glossary.csv
@@ -265,4 +265,10 @@ Please select a Data Source,Please select a Data Source,请选择一个数据源
 Test connection,Test connection,测试连接,Test connection,Test connection,Test connection,,
 Show XXX button,Show `{0}` button,显示 `{0}` 按钮,Show `{0}` button,Show `{0}` button,Show `{0}` button,Show `{0}` button,Show `{0}` button,
 Show recently used here, Show recently used here, 在此显示最近使用的会话,,,,,
-Hide recently used, Hide recently used, 隐藏最近使用的会话,,,,,
+Hide recently used, Hide recently used, 隐藏最近使用的会话,,,,,
+Leave blank to inherit the default value,Leave blank to inherit the default value,留空以继承默认值,,,,,
+Alternative,Alternative,备选,,,,,
+with alternative,with alternative,使用备选凭证,,,,,
+Automatic address switching,Automatic address switching,自动切换地址,,,,,
+When the default host or port is unavailable the alternate addresses will be tried in sequence,When the default host or port is unavailable the alternate addresses will be tried in sequence,当默认的地址不可用时，将自动依次尝试备选地址,,,,
+support multi-address multi-account,support multi-address multi-account,支持多地址、多账号,support multi-address multi-account,support multi-address multi-account,support multi-address multi-account,support multi-address multi-account,support multi-address multi-account
diff --git a/Ui/Resources/Languages/glossary_maker.py b/Ui/Resources/Languages/glossary_maker.py
@@ -45,15 +45,16 @@ def load_csv(self, csv_file_name: str, encoding: str = 'utf-8'):
         with open(csv_file_name, mode='r', encoding=encoding)as f:
             reader = csv.reader(f)
             for row in reader:
-                lines.append(row)
+                if len(row) > 0:
+                    lines.append(row)
         key_column_index = 0
         en_column_index = 1
         self.keys = [Forbidden_Characters_in_XAML_Key_convert(line[key_column_index]) for line in lines]
         self.english_words = [Special_Marks_to_Characters_in_XAML(line[en_column_index]) for line in lines]
         for col in range(len(lines[0])):
             if col == key_column_index or col == en_column_index:
                 continue
-            self.columns.append([Special_Marks_to_Characters_in_XAML(line[col]) for line in lines])
+            self.columns.append([Special_Marks_to_Characters_in_XAML(line[col]) if len(line) > col else '' for line in lines])
 
     def save_csv(self, csv_file_name: str, encoding: str = 'utf-8'):
         lines = []
diff --git a/Ui/Resources/Languages/glossary_translated_by_google.csv b/Ui/Resources/Languages/glossary_translated_by_google.csv
@@ -278,3 +278,9 @@ Test connection,Test connection,测试连接,Test connection,Test connection,Tes
 Show XXX button,Show `{0}` button,显示 `{0}` 按钮,Show `{0}` button,Show `{0}` button,Show `{0}` button,Show `{0}` button,Show `{0}` button
 Show recently used here, Show recently used here, 在此显示最近使用的会话,Zobrazit nedávno použité zde,Kürzlich verwendete hier anzeigen,Afficher récemment utilisé ici,Mostrar usado recentemente aqui,最近使用したものをここに表示
 Hide recently used, Hide recently used, 隐藏最近使用的会话,Skrýt nedávno použité,Zuletzt verwendete ausblenden,Masquer récemment utilisé,Ocultar usado recentemente,最近使用したものを非表示
+Leave blank to inherit the default value,Leave blank to inherit the default value,留空以继承默认值,"Chcete-li zdědit výchozí hodnotu, ponechte prázdné","Lassen Sie das Feld leer, um den Standardwert zu übernehmen",Laisser vide pour hériter de la valeur par défaut,Deixe em branco para herdar o valor padrão,デフォルト値を継承するには空白のままにします
+Alternative,Alternative,备选,Alternativní,Alternative,Alternative,Alternativa,別
+with alternative,with alternative,使用备选凭证,s alternativou,mit Alternative,avec alternative,com alternativa,代替品あり
+Automatic address switching,Automatic address switching,自动切换地址,Automatické přepínání adres,Automatische Adressumschaltung,Changement d'adresse automatique,Comutação automática de endereço,自動アドレス切り替え
+When the default host or port is unavailable the alternate addresses will be tried in sequence,When the default host or port is unavailable the alternate addresses will be tried in sequence,当默认的地址不可用时，将自动依次尝试备选地址,"Pokud není výchozí hostitel nebo port k dispozici, budou postupně vyzkoušeny alternativní adresy","Wenn der Standardhost oder -port nicht verfügbar ist, werden die alternativen Adressen nacheinander ausprobiert","Lorsque l'hôte ou le port par défaut n'est pas disponible, les adresses alternatives seront essayées dans l'ordre","Quando o host ou porta padrão não estiver disponível, os endereços alternativos serão tentados em sequência",デフォルトのホストまたはポートが使用できない場合、代替アドレスが順番に試行されます
+support multi-address multi-account,support multi-address multi-account,支持多地址、多账号,support multi-address multi-account,support multi-address multi-account,support multi-address multi-account,support multi-address multi-account,support multi-address multi-account
diff --git a/Ui/Resources/Languages/ja-jp.xaml b/Ui/Resources/Languages/ja-jp.xaml
@@ -250,4 +250,10 @@
     <s:String x:Key="Show XXX button">Show `{0}` button</s:String>
     <s:String x:Key="Show recently used here">最近使用したものをここに表示</s:String>
     <s:String x:Key="Hide recently used">最近使用したものを非表示</s:String>
+    <s:String x:Key="Leave blank to inherit the default value">デフォルト値を継承するには空白のままにします</s:String>
+    <s:String x:Key="Alternative">別</s:String>
+    <s:String x:Key="with alternative">代替品あり</s:String>
+    <s:String x:Key="Automatic address switching">自動アドレス切り替え</s:String>
+    <s:String x:Key="When the default host or port is unavailable the alternate addresses will be tried in sequence">デフォルトのホストまたはポートが使用できない場合、代替アドレスが順番に試行されます</s:String>
+    <s:String x:Key="support multi-address multi-account">support multi-address multi-account</s:String>
 </ResourceDictionary>
diff --git a/Ui/Resources/Languages/pt-br.xaml b/Ui/Resources/Languages/pt-br.xaml
@@ -250,4 +250,10 @@
     <s:String x:Key="Show XXX button">Show `{0}` button</s:String>
     <s:String x:Key="Show recently used here">Mostrar usado recentemente aqui</s:String>
     <s:String x:Key="Hide recently used">Ocultar usado recentemente</s:String>
+    <s:String x:Key="Leave blank to inherit the default value">Deixe em branco para herdar o valor padrão</s:String>
+    <s:String x:Key="Alternative">Alternativa</s:String>
+    <s:String x:Key="with alternative">com alternativa</s:String>
+    <s:String x:Key="Automatic address switching">Comutação automática de endereço</s:String>
+    <s:String x:Key="When the default host or port is unavailable the alternate addresses will be tried in sequence">Quando o host ou porta padrão não estiver disponível, os endereços alternativos serão tentados em sequência</s:String>
+    <s:String x:Key="support multi-address multi-account">support multi-address multi-account</s:String>
 </ResourceDictionary>
diff --git a/Ui/Resources/Languages/zh-cn.xaml b/Ui/Resources/Languages/zh-cn.xaml
@@ -250,4 +250,10 @@
     <s:String x:Key="Show XXX button">显示 `{0}` 按钮</s:String>
     <s:String x:Key="Show recently used here"> 在此显示最近使用的会话</s:String>
     <s:String x:Key="Hide recently used"> 隐藏最近使用的会话</s:String>
+    <s:String x:Key="Leave blank to inherit the default value">留空以继承默认值</s:String>
+    <s:String x:Key="Alternative">备选</s:String>
+    <s:String x:Key="with alternative">使用备选凭证</s:String>
+    <s:String x:Key="Automatic address switching">自动切换地址</s:String>
+    <s:String x:Key="When the default host or port is unavailable the alternate addresses will be tried in sequence">当默认的地址不可用时，将自动依次尝试备选地址</s:String>
+    <s:String x:Key="support multi-address multi-account">支持多地址、多账号</s:String>
 </ResourceDictionary>
diff --git a/Ui/Service/SessionControlService_AlternateCredential.cs b/Ui/Service/SessionControlService_AlternateCredential.cs
@@ -37,11 +37,28 @@ private static void ApplyAlternateCredential(ref ProtocolBase serverClone, strin
 
             bool addressIsSwitched = false;
             bool useAssignCredential = false;
+            bool canAddressAutoSwitch = protocol.IsAutoAlternateAddressSwitching == true;
 
             var newCredential = protocol.GetCredential();
 
+
+            // use assign credential
+            var assignCredentialNameClone = assignCredentialName;
+            var assignCredential = protocol.AlternateCredentials.FirstOrDefault(x => x.Name == assignCredentialNameClone);
+            if (assignCredential != null)
+            {
+                // if any host or port in assignCredential，then disabled `AutoAlternateAddressSwitching`
+                if (string.IsNullOrEmpty(assignCredential.Address) == false
+                    || string.IsNullOrEmpty(assignCredential.Port) == false
+                   )
+                {
+                    canAddressAutoSwitch = false;
+                }
+                useAssignCredential = newCredential.SetCredential(assignCredential);
+            }
+
             // auto switching address
-            if (protocol.IsAutoAlternateAddressSwitching == true)
+            if (canAddressAutoSwitch)
             {
                 int milliseconds = 5000;
                 // TODO show a progress window
@@ -53,18 +70,26 @@ private static void ApplyAlternateCredential(ref ProtocolBase serverClone, strin
                     .Where(x => !string.IsNullOrEmpty(x.Address) || !string.IsNullOrEmpty(x.Port)));
 
                 var cts = new CancellationTokenSource();
-                var tasks = credentials.Select(x =>
-                        Task.Factory.StartNew(() =>
+                var tasks = new List<Task<Credential?>>();
+                for (int i = 0; i < credentials.Count; i++)
+                {
+                    var sleep = i * 50;
+                    var x = credentials[i];
+                    tasks.Add(Task.Factory.StartNew(() =>
+                    {
+                        // 根据排序休息一段时间，排在越后面休息时间越长，实现带优先级的检测
+                        if (sleep > 0)
+                            Thread.Sleep(sleep);
+                        if (Credential.TestAddressPortIsAvailable(protocol, x, milliseconds))
                         {
-                            if (Credential.TestAddressPortIsAvailable(protocol, x, milliseconds))
-                            {
-                                return x;
-                            }
-                            Thread.Sleep(milliseconds);
-                            return null;
-                        }, cts.Token))
-                    .ToArray();
-                var t = Task.WaitAny(tasks);
+                            return x;
+                        }
+                        Thread.Sleep(milliseconds);
+                        return null;
+                    }, cts.Token));
+                }
+
+                var t = Task.WaitAny(tasks.ToArray());
                 cts.Cancel(false);
                 if (tasks[t].Result != null)
                 {
@@ -75,29 +100,11 @@ private static void ApplyAlternateCredential(ref ProtocolBase serverClone, strin
                 }
             }
 
-            // use assign credential
-            var assignCredentialNameClone = assignCredentialName;
-            var assignCredential = protocol.AlternateCredentials.FirstOrDefault(x => x.Name == assignCredentialNameClone);
-            if (assignCredential != null)
-            {
-                if (addressIsSwitched)
-                {
-                    var a = newCredential.SetUserName(assignCredential);
-                    var b = newCredential.SetPassword(assignCredential);
-                    useAssignCredential = a || b;
-                }
-                else
-                {
-                    useAssignCredential = newCredential.SetCredential(assignCredential);
-                }
-            }
-
 
             if (addressIsSwitched || useAssignCredential)
             {
                 protocol.SetCredential(newCredential);
             }
-
         }
     }
 }
diff --git a/Ui/View/Editor/Forms/AlternativeCredential/AlternativeCredentialEditView.xaml b/Ui/View/Editor/Forms/AlternativeCredential/AlternativeCredentialEditView.xaml
diff --git a/Ui/View/Editor/Forms/RdpForm.xaml b/Ui/View/Editor/Forms/RdpForm.xaml
diff --git a/Ui/View/Editor/PasswordPopupDialogView.xaml b/Ui/View/Editor/PasswordPopupDialogView.xaml
diff --git a/Ui/View/Launcher/LauncherDictionary.xaml b/Ui/View/Launcher/LauncherDictionary.xaml
diff --git a/Ui/View/Launcher/ServerSelectionsView.xaml b/Ui/View/Launcher/ServerSelectionsView.xaml
diff --git a/Ui/View/LauncherWindowView.xaml.cs b/Ui/View/LauncherWindowView.xaml.cs

Original file line number	Diff line number	Diff line change
`@@ -71,19 +71,18 @@ public static bool TestAddressPortIsAvailable(ProtocolBaseWithAddressPortUserPwd`
`71`	`71`	`string port = string.IsNullOrEmpty(credential.Port) ? protocol.Port : credential.Port;`
`72`	`72`	`try`
`73`	`73`	`{`
`74`		`-`
`75`		`- var iport = int.Parse(port);`
	`74`	`+ var p = int.Parse(port);`
`76`	`75`	`var client = new TcpClient();`
`77`	`76`	`if (timeOutMillisecond > 0)`
`78`	`77`	`{`
`79`		`- if (!client.ConnectAsync(address, iport).Wait(timeOutMillisecond))`
	`78`	`+ if (!client.ConnectAsync(address, p).Wait(timeOutMillisecond))`
`80`	`79`	`{`
`81`	`80`	`throw new Exception();`
`82`	`81`	`}`
`83`	`82`	`}`
`84`	`83`	`else`
`85`	`84`	`{`
`86`		`- client.Connect(address, iport);`
	`85`	`+ client.Connect(address, p);`
`87`	`86`	`}`
`88`	`87`	`client.Close();`
`89`	`88`
`@@ -93,9 +92,6 @@ public static bool TestAddressPortIsAvailable(ProtocolBaseWithAddressPortUserPwd`
`93`	`92`	`{`
`94`	`93`	`// ignored`
`95`	`94`	`}`
`96`		`-`
`97`		`- SimpleLogHelper.Error($"TXT:{address}:{port} 未打开");`
`98`		`-`
`99`	`95`	`return false;`
`100`	`96`	`}`
`101`	`97`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public static List<ProtocolAction> GetActions(this ProtocolBase server)`
`53`	`53`	`foreach (var credential in protocol.AlternateCredentials)`
`54`	`54`	`{`
`55`	`55`	`actions.Add(new ProtocolAction(`
`56`		`- actionName: IoC.Get<ILanguageService>().Translate("Connect") + $" (TXT:with credential {credential.Name})",`
	`56`	+ actionName: IoC.Get<ILanguageService>().Translate("Connect") + $" ({IoC.Get<ILanguageService>().Translate("with alternative")} `{credential.Name}`)",
`57`	`57`	`action: () => { GlobalEventHelper.OnRequestServerConnect?.Invoke(server, fromView: $"{nameof(LauncherWindowView)} - Action - AlternateCredentials", assignCredentialName: credential.Name); }`
`58`	`58`	`));`
`59`	`59`	`}`