Jibo-Revival-Group/JiboExperiments
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extract JSON snapshot persistence helpers

Browse Source
This commit is contained in:
Jacob Dubin
2026-05-17 06:58:12 -05:00
parent d37521281e
commit 785dc2b48b
3 changed files with 131 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
OpenJibo/src/Jibo.Cloud/dotnet/src/Jibo.Cloud.Infrastructure/Persistence/InMemoryCloudStateStore.cs
View File

@@ -18,7 +18,7 @@ public sealed class InMemoryCloudStateStore : ICloudStateStore
private readonly ConcurrentDictionary<string, CloudSession> _sessionsByToken = new(StringComparer.OrdinalIgnoreCase); private readonly ConcurrentDictionary<string, CloudSession> _sessionsByToken = new(StringComparer.OrdinalIgnoreCase);
private readonly ConcurrentDictionary<string, string> _symmetricKeys = new(StringComparer.OrdinalIgnoreCase); private readonly ConcurrentDictionary<string, string> _symmetricKeys = new(StringComparer.OrdinalIgnoreCase);
private readonly ConcurrentDictionary<string, KeyRequestRecord> _keyRequests = new(StringComparer.OrdinalIgnoreCase); private readonly ConcurrentDictionary<string, KeyRequestRecord> _keyRequests = new(StringComparer.OrdinalIgnoreCase);
private readonly string? _persistencePath; private readonly JsonSnapshotStore _snapshotStore;
private readonly Lock _syncRoot = new(); private readonly Lock _syncRoot = new();
private readonly List<UpdateManifest> _updates; private readonly List<UpdateManifest> _updates;
private readonly List<MediaRecord> _media = []; private readonly List<MediaRecord> _media = [];
@@ -33,7 +33,7 @@ public sealed class InMemoryCloudStateStore : ICloudStateStore
public InMemoryCloudStateStore(string? persistencePath = null) public InMemoryCloudStateStore(string? persistencePath = null)
{ {
_persistencePath = persistencePath; _snapshotStore = new JsonSnapshotStore(persistencePath, PersistenceJsonOptions);
_robot = new DeviceRegistration _robot = new DeviceRegistration
{ {
HostMappings = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase) HostMappings = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
@@ -104,14 +104,7 @@ public sealed class InMemoryCloudStateStore : ICloudStateStore
public void LoadPersistedState() public void LoadPersistedState()
{ {
if (string.IsNullOrWhiteSpace(_persistencePath) || !File.Exists(_persistencePath)) var snapshot = _snapshotStore.Load<PersistentStateSnapshot>();
{
return;
}
try
{
var snapshot = JsonSerializer.Deserialize<PersistentStateSnapshot>(File.ReadAllText(_persistencePath), PersistenceJsonOptions);
if (snapshot is null) if (snapshot is null)
{ {
return; return;
@@ -188,27 +181,11 @@ public sealed class InMemoryCloudStateStore : ICloudStateStore
_lastLoadedUtc = snapshot.LastLoadedUtc ?? DateTimeOffset.UtcNow; _lastLoadedUtc = snapshot.LastLoadedUtc ?? DateTimeOffset.UtcNow;
_lastSavedUtc = snapshot.LastSavedUtc; _lastSavedUtc = snapshot.LastSavedUtc;
} }
catch
{
// Ignore corrupt state and continue with the in-memory defaults.
}
}
public void SavePersistedState() public void SavePersistedState()
{ {
if (string.IsNullOrWhiteSpace(_persistencePath))
{
return;
}
lock (_syncRoot) lock (_syncRoot)
{ {
var directory = Path.GetDirectoryName(_persistencePath);
if (!string.IsNullOrWhiteSpace(directory))
{
Directory.CreateDirectory(directory);
}
var now = DateTimeOffset.UtcNow; var now = DateTimeOffset.UtcNow;
var snapshot = new PersistentStateSnapshot var snapshot = new PersistentStateSnapshot
{ {
@@ -229,8 +206,7 @@ public sealed class InMemoryCloudStateStore : ICloudStateStore
Loops = _loops.ToArray(), Loops = _loops.ToArray(),
People = _people.ToArray() People = _people.ToArray()
}; };
_snapshotStore.Save(snapshot);
File.WriteAllText(_persistencePath, JsonSerializer.Serialize(snapshot, PersistenceJsonOptions));
_lastSavedUtc = now; _lastSavedUtc = now;
} }
} }

32
OpenJibo/src/Jibo.Cloud/dotnet/src/Jibo.Cloud.Infrastructure/Persistence/InMemoryPersonalMemoryStore.cs
View File

@@ -13,7 +13,7 @@ public sealed class InMemoryPersonalMemoryStore : IPersonalMemoryStore
}; };
private readonly ConcurrentDictionary<string, TenantMemoryRecord> _tenantMemory = new(StringComparer.OrdinalIgnoreCase); private readonly ConcurrentDictionary<string, TenantMemoryRecord> _tenantMemory = new(StringComparer.OrdinalIgnoreCase);
private readonly string? _persistencePath; private readonly JsonSnapshotStore _snapshotStore;
private readonly Lock _syncRoot = new(); private readonly Lock _syncRoot = new();
private long _revision; private long _revision;
private DateTimeOffset? _lastLoadedUtc; private DateTimeOffset? _lastLoadedUtc;
@@ -21,7 +21,7 @@ public sealed class InMemoryPersonalMemoryStore : IPersonalMemoryStore
public InMemoryPersonalMemoryStore(string? persistencePath = null) public InMemoryPersonalMemoryStore(string? persistencePath = null)
{ {
_persistencePath = persistencePath; _snapshotStore = new JsonSnapshotStore(persistencePath, PersistenceJsonOptions);
LoadPersistedState(); LoadPersistedState();
} }
@@ -36,14 +36,7 @@ public sealed class InMemoryPersonalMemoryStore : IPersonalMemoryStore
public void LoadPersistedState() public void LoadPersistedState()
{ {
if (string.IsNullOrWhiteSpace(_persistencePath) || !File.Exists(_persistencePath)) var snapshot = _snapshotStore.Load<PersistentStateSnapshot>();
{
return;
}
try
{
var snapshot = JsonSerializer.Deserialize<PersistentStateSnapshot>(File.ReadAllText(_persistencePath), PersistenceJsonOptions);
if (snapshot is null) if (snapshot is null)
{ {
return; return;
@@ -59,27 +52,11 @@ public sealed class InMemoryPersonalMemoryStore : IPersonalMemoryStore
_lastLoadedUtc = snapshot.LastLoadedUtc ?? DateTimeOffset.UtcNow; _lastLoadedUtc = snapshot.LastLoadedUtc ?? DateTimeOffset.UtcNow;
_lastSavedUtc = snapshot.LastSavedUtc; _lastSavedUtc = snapshot.LastSavedUtc;
} }
catch
{
// Ignore corrupt state and continue with the in-memory defaults.
}
}
public void SavePersistedState() public void SavePersistedState()
{ {
if (string.IsNullOrWhiteSpace(_persistencePath))
{
return;
}
lock (_syncRoot) lock (_syncRoot)
{ {
var directory = Path.GetDirectoryName(_persistencePath);
if (!string.IsNullOrWhiteSpace(directory))
{
Directory.CreateDirectory(directory);
}
var now = DateTimeOffset.UtcNow; var now = DateTimeOffset.UtcNow;
var snapshot = new PersistentStateSnapshot var snapshot = new PersistentStateSnapshot
{ {
@@ -103,8 +80,7 @@ public sealed class InMemoryPersonalMemoryStore : IPersonalMemoryStore
}) })
.ToArray() .ToArray()
}; };
_snapshotStore.Save(snapshot);
File.WriteAllText(_persistencePath, JsonSerializer.Serialize(snapshot, PersistenceJsonOptions));
_lastSavedUtc = now; _lastSavedUtc = now;
} }
} }

48
OpenJibo/src/Jibo.Cloud/dotnet/src/Jibo.Cloud.Infrastructure/Persistence/JsonSnapshotStore.cs Normal file
View File

@@ -0,0 +1,48 @@
using System.Text.Json;
namespace Jibo.Cloud.Infrastructure.Persistence;
internal sealed class JsonSnapshotStore
{
private readonly string? _persistencePath;
private readonly JsonSerializerOptions _options;
public JsonSnapshotStore(string? persistencePath, JsonSerializerOptions options)
{
_persistencePath = persistencePath;
_options = options;
}
public TSnapshot? Load<TSnapshot>()
{
if (string.IsNullOrWhiteSpace(_persistencePath) || !File.Exists(_persistencePath))
{
return default;
}
try
{
return JsonSerializer.Deserialize<TSnapshot>(File.ReadAllText(_persistencePath), _options);
}
catch
{
return default;
}
}
public void Save<TSnapshot>(TSnapshot snapshot)
{
if (string.IsNullOrWhiteSpace(_persistencePath))
{
return;
}
var directory = Path.GetDirectoryName(_persistencePath);
if (!string.IsNullOrWhiteSpace(directory))
{
Directory.CreateDirectory(directory);
}
File.WriteAllText(_persistencePath, JsonSerializer.Serialize(snapshot, _options));
}
}