From 7d89693dcfe60e290638652cba9d5bb7acc02e44 Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Tue, 14 Jul 2026 03:39:35 +0100 Subject: [PATCH] Drain CultMesh transport work before idling --- Aetheria.State.Daemon/Program.cs | 4 ++-- Aetheria.Unity/Packages/manifest.json | 4 ++-- Aetheria.Unity/Packages/packages-lock.json | 10 +++++----- scripts/verify-aetheria-unity-client.ps1 | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Aetheria.State.Daemon/Program.cs b/Aetheria.State.Daemon/Program.cs index d22fd1280..3db37dacc 100644 --- a/Aetheria.State.Daemon/Program.cs +++ b/Aetheria.State.Daemon/Program.cs @@ -1258,9 +1258,9 @@ static async Task RunClientCultMeshPumpAsync( { while (!cancellationToken.IsCancellationRequested) { - var delivered = await server.PollOnceAsync().ConfigureAwait(false); + var poll = await server.PollAvailableAsync(256).ConfigureAwait(false); server.PollResends(); - if (!delivered) + if (poll.TransportItemsConsumed == 0) await Task.Delay(1, cancellationToken).ConfigureAwait(false); } } diff --git a/Aetheria.Unity/Packages/manifest.json b/Aetheria.Unity/Packages/manifest.json index c7c08d05c..d27941798 100644 --- a/Aetheria.Unity/Packages/manifest.json +++ b/Aetheria.Unity/Packages/manifest.json @@ -6,9 +6,9 @@ "com.unity.modules.physics": "1.0.0", "com.unity.modules.uielements": "1.0.0", "com.unity.render-pipelines.universal": "17.4.0", - "org.gamecult.cultlib": "https://github.com/GameCult/CultLib.git?path=/unity/org.gamecult.cultlib#cultlib-unity-v1.0.12", + "org.gamecult.cultlib": "https://github.com/GameCult/CultLib.git?path=/unity/org.gamecult.cultlib#cultlib-unity-v1.0.13", "org.gamecult.eve.plugin-fields": "https://github.com/GameCult/EvePlugins.git?path=/plugins/eve-plugin-fields/unity/org.gamecult.eve.plugin-fields#eve-plugin-fields-unity-v0.1.1", "org.gamecult.eve.surface": "https://github.com/GameCult/EveUnity.git?path=/packages/org.gamecult.eve.surface#eveunity-surface-v0.2.1", - "org.gamecult.eve.unity-scene": "https://github.com/GameCult/EveUnity.git?path=/packages/org.gamecult.eve.unity-scene#eveunity-scene-v0.3.17" + "org.gamecult.eve.unity-scene": "https://github.com/GameCult/EveUnity.git?path=/packages/org.gamecult.eve.unity-scene#eveunity-scene-v0.3.18" } } diff --git a/Aetheria.Unity/Packages/packages-lock.json b/Aetheria.Unity/Packages/packages-lock.json index 00f26aa86..c2d9eec61 100644 --- a/Aetheria.Unity/Packages/packages-lock.json +++ b/Aetheria.Unity/Packages/packages-lock.json @@ -119,11 +119,11 @@ } }, "org.gamecult.cultlib": { - "version": "https://github.com/GameCult/CultLib.git?path=/unity/org.gamecult.cultlib#cultlib-unity-v1.0.12", + "version": "https://github.com/GameCult/CultLib.git?path=/unity/org.gamecult.cultlib#cultlib-unity-v1.0.13", "depth": 0, "source": "git", "dependencies": {}, - "hash": "26b4d1eadc4d0b1fe7a5ffb29a64373576544447" + "hash": "feb5c71513e71d681699f462fe3682b3168c6f73" }, "org.gamecult.eve.plugin-fields": { "version": "https://github.com/GameCult/EvePlugins.git?path=/plugins/eve-plugin-fields/unity/org.gamecult.eve.plugin-fields#eve-plugin-fields-unity-v0.1.1", @@ -142,16 +142,16 @@ "hash": "d0aa50d31f3b6da96bffc194fdc3aa358f37e332" }, "org.gamecult.eve.unity-scene": { - "version": "https://github.com/GameCult/EveUnity.git?path=/packages/org.gamecult.eve.unity-scene#eveunity-scene-v0.3.17", + "version": "https://github.com/GameCult/EveUnity.git?path=/packages/org.gamecult.eve.unity-scene#eveunity-scene-v0.3.18", "depth": 0, "source": "git", "dependencies": { - "org.gamecult.cultlib": "1.0.12", + "org.gamecult.cultlib": "1.0.13", "org.gamecult.eve.plugin-fields": "0.1.1", "org.gamecult.eve.surface": "0.2.1", "com.unity.mathematics": "1.3.2" }, - "hash": "979eee3f8e327c904d25d2d3091a9a6db977842d" + "hash": "ed21479e467faea8ff624f2d2f5a7d2fecf913f4" }, "com.unity.modules.assetbundle": { "version": "1.0.0", diff --git a/scripts/verify-aetheria-unity-client.ps1 b/scripts/verify-aetheria-unity-client.ps1 index 0cc013d42..f47cabc91 100644 --- a/scripts/verify-aetheria-unity-client.ps1 +++ b/scripts/verify-aetheria-unity-client.ps1 @@ -14,14 +14,14 @@ $manifest = Get-Content (Join-Path $ProjectPath "Packages/manifest.json") -Raw | $lock = Get-Content (Join-Path $ProjectPath "Packages/packages-lock.json") -Raw | ConvertFrom-Json $expected = @{ "org.gamecult.cultlib" = @( - "https://github.com/GameCult/CultLib.git?path=/unity/org.gamecult.cultlib#cultlib-unity-v1.0.12", - "26b4d1eadc4d0b1fe7a5ffb29a64373576544447") + "https://github.com/GameCult/CultLib.git?path=/unity/org.gamecult.cultlib#cultlib-unity-v1.0.13", + "feb5c71513e71d681699f462fe3682b3168c6f73") "org.gamecult.eve.surface" = @( "https://github.com/GameCult/EveUnity.git?path=/packages/org.gamecult.eve.surface#eveunity-surface-v0.2.1", "d0aa50d31f3b6da96bffc194fdc3aa358f37e332") "org.gamecult.eve.unity-scene" = @( - "https://github.com/GameCult/EveUnity.git?path=/packages/org.gamecult.eve.unity-scene#eveunity-scene-v0.3.17", - "979eee3f8e327c904d25d2d3091a9a6db977842d") + "https://github.com/GameCult/EveUnity.git?path=/packages/org.gamecult.eve.unity-scene#eveunity-scene-v0.3.18", + "ed21479e467faea8ff624f2d2f5a7d2fecf913f4") } foreach ($packageName in $expected.Keys) { @@ -34,7 +34,7 @@ foreach ($packageName in $expected.Keys) { $cultLibPackage = Get-ChildItem (Join-Path $ProjectPath "Library/PackageCache") -Directory | Where-Object Name -Like "org.gamecult.cultlib@*" | - Where-Object { (Get-Content (Join-Path $_.FullName "package.json") -Raw | ConvertFrom-Json).version -eq "1.0.12" } | + Where-Object { (Get-Content (Join-Path $_.FullName "package.json") -Raw | ConvertFrom-Json).version -eq "1.0.13" } | Select-Object -First 1 if (-not $cultLibPackage) { throw "Resolved CultLib package is missing from Library/PackageCache." }