Skip to content

Commit e66c720

Browse files
corp-0corp-0
authored
New serverlist backend (#248)
* chore: update packages * feat: change server list URL to new backend * chore: bump release version
1 parent bf7a19a commit e66c720

File tree

6 files changed

+43
-32
lines changed

6 files changed

+43
-32
lines changed

‎UnitystationLauncher.Tests/UnitystationLauncher.Tests.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88
<ItemGroup>
9-
<PackageReference Include="coverlet.msbuild" Version="6.0.0">
9+
<PackageReference Include="coverlet.msbuild" Version="6.0.4">
1010
<PrivateAssets>all</PrivateAssets>
1111
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1212
</PackageReference>
13-
<PackageReference Include="FluentAssertions" Version="6.12.0" />
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
15-
<PackageReference Include="xunit" Version="2.6.4" />
16-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
13+
<PackageReference Include="FluentAssertions" Version="8.8.0" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
15+
<PackageReference Include="xunit" Version="2.9.3" />
16+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1818
<PrivateAssets>all</PrivateAssets>
1919
</PackageReference>
20-
<PackageReference Include="coverlet.collector" Version="6.0.0">
20+
<PackageReference Include="coverlet.collector" Version="6.0.4">
2121
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2222
<PrivateAssets>all</PrivateAssets>
2323
</PackageReference>

‎UnitystationLauncher/Assets/org.unitystation.StationHub.metainfo.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,14 @@
6565
</screenshots>
6666

6767
<releases>
68+
<release version="939" date="2025-11-06">
69+
<description>
70+
<p>Refactor:</p>
71+
<ul>
72+
<li>Added support for the new server list backend. Nothing exciting yet, but just wait until we are done.</li>
73+
</ul>
74+
</description>
75+
</release>
6876
<release version="938" date="2024-12-13">
6977
<description>
7078
<p>Fix:</p>

‎UnitystationLauncher/Constants/ApiUrls.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ namespace UnitystationLauncher.Constants;
33
public static class ApiUrls
44
{
55
private static string ApiBaseUrl => "https://api.unitystation.org";
6-
public static string ServerListUrl => $"{ApiBaseUrl}/serverlist";
6+
private static string CentralCommandBaseUrl => "https://prod-api.unitystation.org";
7+
public static string ServerListUrl => $"{CentralCommandBaseUrl}/baby-serverlist/servers";
78
public static string ValidateUrl => $"{ApiBaseUrl}/validatehubclient";
89
public static string ValidateTokenUrl => $"{ApiBaseUrl}/validatetoken?data=";
910
public static string SignOutUrl => $"{ApiBaseUrl}/signout?data=";

‎UnitystationLauncher/Constants/AppInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ public static class AppInfo
44
{
55
// Whenever you change the currentBuild here, please also update the one in
66
// UnitystationLauncher/Assets/org.unitystation.StationHub.metainfo.xml
7-
public const int CurrentBuild = 938;
7+
public const int CurrentBuild = 939;
88
}

‎UnitystationLauncher/ContentScanning/Resolver.cs‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using System.Collections.Generic;
33
using System.IO;
4-
using System.Reflection;
4+
using System.Reflection.Metadata;
55
using System.Reflection.PortableExecutable;
66
using ILVerify;
77
using Serilog;
@@ -28,7 +28,7 @@ public void Dispose()
2828
}
2929
}
3030

31-
PEReader IResolver.ResolveAssembly(AssemblyName assemblyName)
31+
public PEReader ResolveAssembly(AssemblyNameInfo assemblyName)
3232
{
3333
if (assemblyName.Name == null)
3434
{
@@ -47,7 +47,7 @@ PEReader IResolver.ResolveAssembly(AssemblyName assemblyName)
4747
string fileName = Path.GetFileNameWithoutExtension(file.Name);
4848
if (string.Equals(fileName, assemblyName.Name, StringComparison.OrdinalIgnoreCase))
4949
{
50-
Log.Information($"Found DLL for assembly '{assemblyName.Name}': {file.FullName}");
50+
Log.Information("Found DLL for assembly \'{AssemblyNameName}\': {FileFullName}", assemblyName.Name, file.FullName);
5151
_dictionaryLookup[assemblyName.Name] =
5252
new(file.Open(FileMode.Open, FileAccess.Read, FileShare.Read));
5353
return _dictionaryLookup[assemblyName.Name];
@@ -61,7 +61,7 @@ PEReader IResolver.ResolveAssembly(AssemblyName assemblyName)
6161
string fileName = Path.GetFileNameWithoutExtension(file.Name);
6262
if (string.Equals(fileName, assemblyName.Name, StringComparison.OrdinalIgnoreCase))
6363
{
64-
Log.Information($"Found DLL for assembly '{assemblyName.Name}': {file.FullName}");
64+
Log.Information("Found DLL for assembly \'{AssemblyNameName}\': {FileFullName}", assemblyName.Name, file.FullName);
6565
_dictionaryLookup[assemblyName.Name] =
6666
new(file.Open(FileMode.Open, FileAccess.Read, FileShare.Read));
6767
return _dictionaryLookup[assemblyName.Name];
@@ -75,7 +75,7 @@ PEReader IResolver.ResolveAssembly(AssemblyName assemblyName)
7575
string fileName = Path.GetFileNameWithoutExtension(file.Name);
7676
if (string.Equals(fileName, assemblyName.Name, StringComparison.OrdinalIgnoreCase))
7777
{
78-
Log.Information($"Found DLL for assembly '{assemblyName.Name}': {file.FullName}");
78+
Log.Information("Found DLL for assembly \'{AssemblyNameName}\': {FileFullName}", assemblyName.Name, file.FullName);
7979
_dictionaryLookup[assemblyName.Name] =
8080
new(file.Open(FileMode.Open, FileAccess.Read, FileShare.Read));
8181
return _dictionaryLookup[assemblyName.Name];
@@ -85,10 +85,12 @@ PEReader IResolver.ResolveAssembly(AssemblyName assemblyName)
8585
throw new FileNotFoundException("Unable to find it " + assemblyName.FullName);
8686
}
8787

88-
PEReader IResolver.ResolveModule(AssemblyName referencingAssembly, string fileName)
88+
public PEReader ResolveModule(AssemblyNameInfo referencingAssembly, string fileName)
8989
{
9090
//TODO idk This is never used anywhere
9191
throw new NotImplementedException(
9292
$"idk How IResolver.ResolveModule(AssemblyName {referencingAssembly}, string {fileName}) , And it's never been called so.. ");
9393
}
94+
95+
9496
}

‎UnitystationLauncher/UnitystationLauncher.csproj‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -65,25 +65,25 @@
6565
</Compile>
6666
</ItemGroup>
6767
<ItemGroup>
68-
<PackageReference Include="AsyncImageLoader.Avalonia" Version="3.2.1" />
69-
<PackageReference Include="Avalonia" Version="11.0.7" />
70-
<PackageReference Include="Avalonia.Desktop" Version="11.0.7" />
71-
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.7" />
72-
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.7" />
73-
<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.7" />
74-
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.7" />
75-
<PackageReference Include="MessageBox.Avalonia" Version="3.1.5.1" />
76-
<PackageReference Include="Microsoft.ILVerification" Version="8.0.0" />
77-
<PackageReference Include="morelinq" Version="4.1.0" />
78-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
68+
<PackageReference Include="AsyncImageLoader.Avalonia" Version="3.4.3" />
69+
<PackageReference Include="Avalonia" Version="11.3.8" />
70+
<PackageReference Include="Avalonia.Desktop" Version="11.3.8" />
71+
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.8" />
72+
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.8" />
73+
<PackageReference Include="Avalonia.ReactiveUI" Version="11.3.8" />
74+
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.8" />
75+
<PackageReference Include="MessageBox.Avalonia" Version="3.3.0" />
76+
<PackageReference Include="Microsoft.ILVerification" Version="9.0.10" />
77+
<PackageReference Include="morelinq" Version="4.4.0" />
78+
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
7979
<PackageReference Include="nulastudio.NetCoreBeauty" Version="1.2.9.5" />
80-
<PackageReference Include="Pidgin" Version="3.2.2" />
81-
<PackageReference Include="ReactiveProperty" Version="9.3.4" />
82-
<PackageReference Include="Serilog" Version="3.1.1" />
83-
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
80+
<PackageReference Include="Pidgin" Version="3.5.1" />
81+
<PackageReference Include="ReactiveProperty" Version="9.7.0" />
82+
<PackageReference Include="Serilog" Version="4.3.0" />
83+
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
8484
<PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
85-
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
86-
<PackageReference Include="Autofac" Version="8.0.0" />
85+
<PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
86+
<PackageReference Include="Autofac" Version="8.4.0" />
8787
<PackageReference Include="Humanizer" Version="2.14.1" />
8888
<PackageReference Include="AutofacSerilogIntegration" Version="5.0.0" />
8989
<PackageReference Include="runtime.unix.System.Console" Version="4.3.1" />
@@ -112,7 +112,7 @@
112112
<PackageReference Include="runtime.any.System.Threading.Timer" Version="4.3.0" />
113113
<PackageReference Include="runtime.unix.System.Private.Uri" Version="4.3.2" />
114114
<PackageReference Include="Dotnet.Bundle" Version="0.9.13" />
115-
<PackageReference Include="SharpCompress" Version="0.38.0" />
115+
<PackageReference Include="SharpCompress" Version="0.41.0" />
116116
</ItemGroup>
117117
<ItemGroup>
118118
<None Remove="CodeScanList.json" />

0 commit comments

Comments
 (0)