notfire/Iceshrimp.NET
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[backend/core] Switch to ConcurrentDictionary for ContextCache, Separate ContextCache from PreloadedContexts, limit ContextCache to 20 entries (ISH-166)

Browse source
This commit is contained in:
Laura Hausmann 2024-03-11 04:28:03 +01:00
parent be65176d29
commit a8d68ac1e6
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Iceshrimp.Backend/Core/Federation/ActivityStreams/LDHelpers.cs
View file

@ -1,3 +1,4 @@
using System.Collections.Concurrent;
using Iceshrimp.Backend.Core.Configuration; using Iceshrimp.Backend.Core.Configuration;
using Iceshrimp.Backend.Core.Database.Tables; using Iceshrimp.Backend.Core.Database.Tables;
using Iceshrimp.Backend.Core.Federation.ActivityStreams.Types; using Iceshrimp.Backend.Core.Federation.ActivityStreams.Types;
@ -11,7 +12,7 @@ namespace Iceshrimp.Backend.Core.Federation.ActivityStreams;
public static class LdHelpers public static class LdHelpers
{ {
private static readonly Dictionary<string, RemoteDocument> ContextCache = new() private static readonly Dictionary<string, RemoteDocument> PreloadedContexts = new()
{ {
{ {
"https://www.w3.org/ns/activitystreams", new RemoteDocument "https://www.w3.org/ns/activitystreams", new RemoteDocument
@ -52,6 +53,8 @@ public static class LdHelpers
} }
}; };
private static readonly ConcurrentDictionary<string, RemoteDocument> ContextCache = new();
private static readonly JToken DefaultContext = private static readonly JToken DefaultContext =
JToken.Parse(File.ReadAllText(Path.Combine("Core", "Federation", "ActivityStreams", "Contexts", JToken.Parse(File.ReadAllText(Path.Combine("Core", "Federation", "ActivityStreams", "Contexts",
"default.json"))); "default.json")));
@ -88,7 +91,9 @@ public static class LdHelpers
private static RemoteDocument CustomLoader(Uri uri, JsonLdLoaderOptions jsonLdLoaderOptions) private static RemoteDocument CustomLoader(Uri uri, JsonLdLoaderOptions jsonLdLoaderOptions)
{ {
var key = uri.AbsolutePath == "/schemas/litepub-0.1.jsonld" ? "litepub-0.1" : uri.ToString(); var key = uri.AbsolutePath == "/schemas/litepub-0.1.jsonld" ? "litepub-0.1" : uri.ToString();
ContextCache.TryGetValue(key, out var result); if (!PreloadedContexts.TryGetValue(key, out var result))
ContextCache.TryGetValue(key, out result);
if (result != null) if (result != null)
{ {
result.ContextUrl = uri; result.ContextUrl = uri;
@ -97,7 +102,16 @@ public static class LdHelpers
//TODO: cache in redis //TODO: cache in redis
result = DefaultDocumentLoader.LoadJson(uri, jsonLdLoaderOptions); result = DefaultDocumentLoader.LoadJson(uri, jsonLdLoaderOptions);
ContextCache.Add(uri.ToString(), result); ContextCache.TryAdd(uri.ToString(), result);
// Cleanup to make sure this doesn't take up more and more memory
while (ContextCache.Count > 20)
{
var hit = ContextCache.Keys.FirstOrDefault();
if (hit == null) break;
var success = ContextCache.TryRemove(hit, out _);
if (!success) break;
}
return result; return result;
} }