From 3723e0866f4a7903cf795dabc6acbb194da595e2 Mon Sep 17 00:00:00 2001 From: Aigio Liu Date: Fri, 25 Mar 2022 22:44:53 +0800 Subject: [PATCH] =?UTF-8?q?#1167=20=E5=BD=93=E4=BD=BF=E7=94=A8=20IPC.confi?= =?UTF-8?q?g=20=E6=97=B6=EF=BC=8C=E7=A8=8B=E5=BA=8F=E5=86=85=E6=89=93?= =?UTF-8?q?=E5=BC=80=E7=BD=91=E9=A1=B5=E7=AB=AF=E5=8F=A3=E5=8F=B7=E5=80=BC?= =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- references/ArchiSteamFarm | 2 +- .../ArchiSteamFarmServiceImpl.cs | 23 ++++++++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/references/ArchiSteamFarm b/references/ArchiSteamFarm index f1c1e226c..603b7eedf 160000 --- a/references/ArchiSteamFarm +++ b/references/ArchiSteamFarm @@ -1 +1 @@ -Subproject commit f1c1e226cfd43b16b06a35be68a69f651325bed5 +Subproject commit 603b7eedfa758ab46817b68ddb0d262eb3504b36 diff --git a/src/ST.Client/Services/Implementation/ArchiSteamFarmServiceImpl.cs b/src/ST.Client/Services/Implementation/ArchiSteamFarmServiceImpl.cs index ebe2fad45..6915f7bb3 100644 --- a/src/ST.Client/Services/Implementation/ArchiSteamFarmServiceImpl.cs +++ b/src/ST.Client/Services/Implementation/ArchiSteamFarmServiceImpl.cs @@ -197,9 +197,30 @@ namespace System.Application.Services.Implementation } } + string IPCRootUrl + { + get + { + string? value = null; + var a = ArchiSteamFarm.IPC.ArchiKestrel.ServerAddresses; + var loopback = IPAddress.Loopback.ToString(); + if (a != null) + { + value = a.FirstOrDefault(x => x.Contains(loopback) && x.StartsWith(Browser2.Prefix_HTTP)) + ?? a.FirstOrDefault(x => x.Contains(loopback)) + ?? a.FirstOrDefault(); + } + if (string.IsNullOrWhiteSpace(value)) + { + value = $"http://{loopback}:{CurrentIPCPortValue}"; + } + return value; + } + } + public string GetIPCUrl() { - var defaultUrl = $"http://{IPAddress.Loopback}:{CurrentIPCPortValue}"; + var defaultUrl = IPCRootUrl; string absoluteConfigDirectory = Path.Combine(ASFPathHelper.AppDataDirectory, SharedInfo.ConfigDirectory); string customConfigPath = Path.Combine(absoluteConfigDirectory, SharedInfo.IPCConfigFile); if (File.Exists(customConfigPath))