Skip to content

New serverlist backend #248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
corp-0 merged 3 commits into from
Nov 8, 2025
Merged

New serverlist backend #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a1098c
chore: update packages
corp-0 Nov 6, 2025
9c04c78
feat: change server list URL to new backend
corp-0 Nov 6, 2025
2a4b5ed
chore: bump release version
corp-0 Nov 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions UnitystationLauncher.Tests/UnitystationLauncher.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="coverlet.msbuild" Version="6.0.0">
<PackageReference Include="coverlet.msbuild" Version="6.0.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="xunit" Version="2.6.4" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
<PackageReference Include="FluentAssertions" Version="8.8.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.0.0">
<PackageReference Include="coverlet.collector" Version="6.0.4">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
8 changes: 8 additions & 0 deletions UnitystationLauncher/Assets/org.unitystation.StationHub.metainfo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,14 @@
</screenshots>

<releases>
<release version="939" date="2025-11-06">
<description>
<p>Refactor:</p>
<ul>
<li>Added support for the new server list backend. Nothing exciting yet, but just wait until we are done.</li>
</ul>
</description>
</release>
<release version="938" date="2024-12-13">
<description>
<p>Fix:</p>
Expand Down
3 changes: 2 additions & 1 deletion UnitystationLauncher/Constants/ApiUrls.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ namespace UnitystationLauncher.Constants;
public static class ApiUrls
{
private static string ApiBaseUrl => "https://api.unitystation.org";
public static string ServerListUrl => $"{ApiBaseUrl}/serverlist";
private static string CentralCommandBaseUrl => "https://prod-api.unitystation.org";
public static string ServerListUrl => $"{CentralCommandBaseUrl}/baby-serverlist/servers";
public static string ValidateUrl => $"{ApiBaseUrl}/validatehubclient";
public static string ValidateTokenUrl => $"{ApiBaseUrl}/validatetoken?data=";
public static string SignOutUrl => $"{ApiBaseUrl}/signout?data=";
Expand Down
2 changes: 1 addition & 1 deletion UnitystationLauncher/Constants/AppInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ public static class AppInfo
{
// Whenever you change the currentBuild here, please also update the one in
// UnitystationLauncher/Assets/org.unitystation.StationHub.metainfo.xml
public const int CurrentBuild = 938;
public const int CurrentBuild = 939;
}
14 changes: 8 additions & 6 deletions UnitystationLauncher/ContentScanning/Resolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Reflection;
using System.Reflection.Metadata;
using System.Reflection.PortableExecutable;
using ILVerify;
using Serilog;
Expand All @@ -28,7 +28,7 @@ public void Dispose()
}
}

PEReader IResolver.ResolveAssembly(AssemblyName assemblyName)
public PEReader ResolveAssembly(AssemblyNameInfo assemblyName)
{
if (assemblyName.Name == null)
{
Expand All @@ -47,7 +47,7 @@ PEReader IResolver.ResolveAssembly(AssemblyName assemblyName)
string fileName = Path.GetFileNameWithoutExtension(file.Name);
if (string.Equals(fileName, assemblyName.Name, StringComparison.OrdinalIgnoreCase))
{
Log.Information($"Found DLL for assembly '{assemblyName.Name}': {file.FullName}");
Log.Information("Found DLL for assembly \'{AssemblyNameName}\': {FileFullName}", assemblyName.Name, file.FullName);
_dictionaryLookup[assemblyName.Name] =
new(file.Open(FileMode.Open, FileAccess.Read, FileShare.Read));
return _dictionaryLookup[assemblyName.Name];
Expand All @@ -61,7 +61,7 @@ PEReader IResolver.ResolveAssembly(AssemblyName assemblyName)
string fileName = Path.GetFileNameWithoutExtension(file.Name);
if (string.Equals(fileName, assemblyName.Name, StringComparison.OrdinalIgnoreCase))
{
Log.Information($"Found DLL for assembly '{assemblyName.Name}': {file.FullName}");
Log.Information("Found DLL for assembly \'{AssemblyNameName}\': {FileFullName}", assemblyName.Name, file.FullName);
_dictionaryLookup[assemblyName.Name] =
new(file.Open(FileMode.Open, FileAccess.Read, FileShare.Read));
return _dictionaryLookup[assemblyName.Name];
Expand All @@ -75,7 +75,7 @@ PEReader IResolver.ResolveAssembly(AssemblyName assemblyName)
string fileName = Path.GetFileNameWithoutExtension(file.Name);
if (string.Equals(fileName, assemblyName.Name, StringComparison.OrdinalIgnoreCase))
{
Log.Information($"Found DLL for assembly '{assemblyName.Name}': {file.FullName}");
Log.Information("Found DLL for assembly \'{AssemblyNameName}\': {FileFullName}", assemblyName.Name, file.FullName);
_dictionaryLookup[assemblyName.Name] =
new(file.Open(FileMode.Open, FileAccess.Read, FileShare.Read));
return _dictionaryLookup[assemblyName.Name];
Expand All @@ -85,10 +85,12 @@ PEReader IResolver.ResolveAssembly(AssemblyName assemblyName)
throw new FileNotFoundException("Unable to find it " + assemblyName.FullName);
}

PEReader IResolver.ResolveModule(AssemblyName referencingAssembly, string fileName)
public PEReader ResolveModule(AssemblyNameInfo referencingAssembly, string fileName)
{
//TODO idk This is never used anywhere
throw new NotImplementedException(
$"idk How IResolver.ResolveModule(AssemblyName {referencingAssembly}, string {fileName}) , And it's never been called so.. ");
}


}
36 changes: 18 additions & 18 deletions UnitystationLauncher/UnitystationLauncher.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,25 +65,25 @@
</Compile>
</ItemGroup>
<ItemGroup>
<PackageReference Include="AsyncImageLoader.Avalonia" Version="3.2.1" />
<PackageReference Include="Avalonia" Version="11.0.7" />
<PackageReference Include="Avalonia.Desktop" Version="11.0.7" />
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.7" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.7" />
<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.7" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.7" />
<PackageReference Include="MessageBox.Avalonia" Version="3.1.5.1" />
<PackageReference Include="Microsoft.ILVerification" Version="8.0.0" />
<PackageReference Include="morelinq" Version="4.1.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="AsyncImageLoader.Avalonia" Version="3.4.3" />
<PackageReference Include="Avalonia" Version="11.3.8" />
<PackageReference Include="Avalonia.Desktop" Version="11.3.8" />
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.8" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.8" />
<PackageReference Include="Avalonia.ReactiveUI" Version="11.3.8" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.8" />
<PackageReference Include="MessageBox.Avalonia" Version="3.3.0" />
<PackageReference Include="Microsoft.ILVerification" Version="9.0.10" />
<PackageReference Include="morelinq" Version="4.4.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="nulastudio.NetCoreBeauty" Version="1.2.9.5" />
<PackageReference Include="Pidgin" Version="3.2.2" />
<PackageReference Include="ReactiveProperty" Version="9.3.4" />
<PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="Pidgin" Version="3.5.1" />
<PackageReference Include="ReactiveProperty" Version="9.7.0" />
<PackageReference Include="Serilog" Version="4.3.0" />
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
<PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
<PackageReference Include="Autofac" Version="8.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
<PackageReference Include="Autofac" Version="8.4.0" />
<PackageReference Include="Humanizer" Version="2.14.1" />
<PackageReference Include="AutofacSerilogIntegration" Version="5.0.0" />
<PackageReference Include="runtime.unix.System.Console" Version="4.3.1" />
Expand Down Expand Up @@ -112,7 +112,7 @@
<PackageReference Include="runtime.any.System.Threading.Timer" Version="4.3.0" />
<PackageReference Include="runtime.unix.System.Private.Uri" Version="4.3.2" />
<PackageReference Include="Dotnet.Bundle" Version="0.9.13" />
<PackageReference Include="SharpCompress" Version="0.38.0" />
<PackageReference Include="SharpCompress" Version="0.41.0" />
</ItemGroup>
<ItemGroup>
<None Remove="CodeScanList.json" />
Expand Down
Loading