chore(m2): 保存功能验收及后续清理前检查点
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using System.IO;
|
||||
using System.Net;
|
||||
using System.Net.Http;
|
||||
@@ -98,7 +99,8 @@ namespace game.PlayerDataStorage
|
||||
if (mutation) return new PlayerKVResult(PlayerKVError.None, status);
|
||||
var text = await response.Content.ReadAsStringAsync();
|
||||
token.ThrowIfCancellationRequested();
|
||||
return new PlayerKVResult(PlayerKVError.None, status, ParseData(text));
|
||||
var data = ParseData(text, out var updatedAtUtc);
|
||||
return new PlayerKVResult(PlayerKVError.None, status, data, updatedAtUtc: updatedAtUtc);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -125,18 +127,50 @@ namespace game.PlayerDataStorage
|
||||
}
|
||||
}
|
||||
|
||||
static Dictionary<string, string> ParseData(string text)
|
||||
private static Dictionary<string, string> ParseData(string text, out Dictionary<string, DateTime> updatedAtUtc)
|
||||
{
|
||||
updatedAtUtc = null;
|
||||
using (var reader = new JsonTextReader(new StringReader(text)) { DateParseHandling = DateParseHandling.None })
|
||||
{
|
||||
var body = JObject.Load(reader, new JsonLoadSettings { DuplicatePropertyNameHandling = DuplicatePropertyNameHandling.Error });
|
||||
if (reader.Read() || !(body["data"] is JObject data)) throw new JsonReaderException("Invalid KV response.");
|
||||
if (reader.Read() || !(body["data"] is JObject data))
|
||||
{
|
||||
throw new JsonReaderException("Invalid KV response.");
|
||||
}
|
||||
var result = new Dictionary<string, string>(StringComparer.Ordinal);
|
||||
foreach (var property in data.Properties())
|
||||
{
|
||||
if (property.Value.Type != JTokenType.String) throw new JsonReaderException("KV value must be a string.");
|
||||
if (property.Value.Type != JTokenType.String)
|
||||
{
|
||||
throw new JsonReaderException("KV value must be a string.");
|
||||
}
|
||||
result.Add(property.Name, property.Value.Value<string>());
|
||||
}
|
||||
var timestamps = body.Property("updatedAtUtc");
|
||||
if (timestamps != null)
|
||||
{
|
||||
if (!(timestamps.Value is JObject times) || times.Count != result.Count)
|
||||
{
|
||||
throw new JsonReaderException("Invalid KV timestamp metadata.");
|
||||
}
|
||||
updatedAtUtc = new Dictionary<string, DateTime>(StringComparer.Ordinal);
|
||||
var formats = new[] { "yyyy-MM-dd'T'HH:mm:ss'Z'", "yyyy-MM-dd'T'HH:mm:ss.FFFFFFF'Z'" };
|
||||
foreach (var property in times.Properties())
|
||||
{
|
||||
if (!result.ContainsKey(property.Name) || property.Value.Type != JTokenType.String)
|
||||
{
|
||||
throw new JsonReaderException("Invalid KV timestamp entry.");
|
||||
}
|
||||
var value = property.Value.Value<string>();
|
||||
if ((value.Length != 20 && (value.Length < 22 || value.Length > 28)) ||
|
||||
!DateTime.TryParseExact(value, formats, CultureInfo.InvariantCulture,
|
||||
DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal, out var timestamp))
|
||||
{
|
||||
throw new JsonReaderException("KV timestamp must be UTC ISO 8601.");
|
||||
}
|
||||
updatedAtUtc.Add(property.Name, timestamp);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user