From ddcd48a7ab688bc73fd7ef1fa0ca2315b585f127 Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Tue, 14 Jul 2026 01:46:01 +0100 Subject: [PATCH] Serve provider assets through CultMesh content sessions --- Aetheria.State.Daemon/Program.cs | 5 ++--- Aetheria.Unity/Packages/manifest.json | 4 ++-- Aetheria.Unity/Packages/packages-lock.json | 10 +++++----- scripts/verify-aetheria-unity-client.ps1 | 8 ++++---- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/Aetheria.State.Daemon/Program.cs b/Aetheria.State.Daemon/Program.cs index 7a36f926c..d22fd1280 100644 --- a/Aetheria.State.Daemon/Program.cs +++ b/Aetheria.State.Daemon/Program.cs @@ -477,6 +477,7 @@ static RudpCultNetSchemaServer StartClientCultMeshHost( MaxFragmentBytes = 1024, MaxPendingReliablePackets = 8192 }); + _ = new CultMeshContentServer(server, node.Cache); var advertisedEndpoint = $"rudp://{options.ClientCultMeshAdvertiseHost}:{((IPEndPoint)socket.LocalEndPoint!).Port}"; server.OnCultNet((request, peer) => { @@ -992,9 +993,8 @@ static IReadOnlyDictionary BuildBundleCdnDocum foreach (var bundle in FindAssetBundles(options)) { var artifact = PackAssetBundle(bundle.Path, bundle.Platform); + CultMeshCdn.PublishAsync(node.Cache, artifact).GetAwaiter().GetResult(); Add(artifact.ManifestKey, artifact.Manifest); - foreach (var chunk in artifact.Chunks) - Add(CultMeshCdnArtifactChunk.CreateRecordKey(chunk), chunk); } return documents; @@ -2190,7 +2190,6 @@ static CultMeshCdnArtifact PackAssetBundle(string path, string platform) File.ReadAllBytes(path), new CultMeshCdnPackOptions { - ChunkSizeBytes = 24 * 1024, Kind = CultMeshCdnArtifactKinds.Asset, Version = "1", MimeType = "application/vnd.unity.assetbundle", diff --git a/Aetheria.Unity/Packages/manifest.json b/Aetheria.Unity/Packages/manifest.json index c4b34e022..c7c08d05c 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.10", + "org.gamecult.cultlib": "https://github.com/GameCult/CultLib.git?path=/unity/org.gamecult.cultlib#cultlib-unity-v1.0.12", "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.15" + "org.gamecult.eve.unity-scene": "https://github.com/GameCult/EveUnity.git?path=/packages/org.gamecult.eve.unity-scene#eveunity-scene-v0.3.17" } } diff --git a/Aetheria.Unity/Packages/packages-lock.json b/Aetheria.Unity/Packages/packages-lock.json index fd9f8bdc3..00f26aa86 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.10", + "version": "https://github.com/GameCult/CultLib.git?path=/unity/org.gamecult.cultlib#cultlib-unity-v1.0.12", "depth": 0, "source": "git", "dependencies": {}, - "hash": "085aa2c0756328770623474c4e9fbacd7218b390" + "hash": "26b4d1eadc4d0b1fe7a5ffb29a64373576544447" }, "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.15", + "version": "https://github.com/GameCult/EveUnity.git?path=/packages/org.gamecult.eve.unity-scene#eveunity-scene-v0.3.17", "depth": 0, "source": "git", "dependencies": { - "org.gamecult.cultlib": "1.0.10", + "org.gamecult.cultlib": "1.0.12", "org.gamecult.eve.plugin-fields": "0.1.1", "org.gamecult.eve.surface": "0.2.1", "com.unity.mathematics": "1.3.2" }, - "hash": "474cadac1c173e24b2c9b9ddde7b781059dbae4c" + "hash": "979eee3f8e327c904d25d2d3091a9a6db977842d" }, "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 db03ff991..770bd7511 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.10", - "085aa2c0756328770623474c4e9fbacd7218b390") + "https://github.com/GameCult/CultLib.git?path=/unity/org.gamecult.cultlib#cultlib-unity-v1.0.12", + "26b4d1eadc4d0b1fe7a5ffb29a64373576544447") "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.15", - "474cadac1c173e24b2c9b9ddde7b781059dbae4c") + "https://github.com/GameCult/EveUnity.git?path=/packages/org.gamecult.eve.unity-scene#eveunity-scene-v0.3.17", + "979eee3f8e327c904d25d2d3091a9a6db977842d") } foreach ($packageName in $expected.Keys) {