Solar/Swarm
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

♻️ Refactor the websocket system

Browse Source
This commit is contained in:
LittleSheep
2025-07-29 20:43:17 +08:00
parent 1f7b19938b
commit f1b594bdf2
7 changed files with 33 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
DysonNetwork.Shared/Proto/GrpcTypeHelper.cs
View File

@@ -5,14 +5,14 @@ using System.Text.Json.Serialization.Metadata;
using Google.Protobuf.Collections;
using Google.Protobuf.WellKnownTypes;
using DysonNetwork.Shared.Data;
using Newtonsoft.Json;
using Google.Protobuf;
using JsonSerializer = System.Text.Json.JsonSerializer;
namespace DysonNetwork.Shared.Proto;
public abstract class GrpcTypeHelper
{
public static readonly JsonSerializerOptions SerializerOptions = new()
public static readonly JsonSerializerOptions? SerializerOptions = new()
{
PropertyNamingPolicy = JsonNamingPolicy.SnakeCaseLower,
DefaultIgnoreCondition = JsonIgnoreCondition.Never,
@@ -75,7 +75,7 @@ public abstract class GrpcTypeHelper
case Value.KindOneofCase.StructValue:
result[kvp.Key] = JsonSerializer.Deserialize<JsonElement>(
JsonSerializer.Serialize(
value.StructValue.Fields.ToDictionary(f => f.Key, f => ConvertValueToObject(f.Value)),
value.StructValue.Fields.ToDictionary(f => f.Key, f => ConvertValueToObject(f.Value)),
SerializerOptions
),
SerializerOptions
@@ -109,7 +109,7 @@ public abstract class GrpcTypeHelper
_ => JsonSerializer.Deserialize<JsonElement>(JsonSerializer.Serialize(value, SerializerOptions), SerializerOptions)
};
}
public static T? ConvertValueToClass<T>(Value value)
{
return value.KindCase switch
@@ -118,7 +118,7 @@ public abstract class GrpcTypeHelper
_ => JsonSerializer.Deserialize<T>(JsonSerializer.Serialize(value, SerializerOptions), SerializerOptions)
};
}
public static Value ConvertObjectToValue(object? obj)
{
return obj switch
@@ -133,7 +133,7 @@ public abstract class GrpcTypeHelper
_ => Value.ForString(JsonSerializer.Serialize(obj, SerializerOptions)) // fallback to JSON string
};
}
public static Value ConvertClassToValue<T>(T obj)
{
if (obj is JsonElement element)
@@ -144,4 +144,16 @@ public abstract class GrpcTypeHelper
_ => Value.ForString(JsonSerializer.Serialize(obj, SerializerOptions))
};
}
}
public static ByteString ConvertObjectToByteString(object? obj)
{
return ByteString.CopyFromUtf8(
JsonSerializer.Serialize(obj, SerializerOptions)
);
}
public static T? ConvertByteStringToObject<T>(ByteString bytes)
{
return JsonSerializer.Deserialize<T>(bytes.ToStringUtf8(), SerializerOptions);
}
}

4
DysonNetwork.Shared/Proto/pusher.proto
View File

@@ -55,7 +55,7 @@ message SendEmailRequest {
// Represents a WebSocket packet.
message WebSocketPacket {
string type = 1;
google.protobuf.Value data = 2;
bytes data = 2;
google.protobuf.StringValue error_message = 3;
}
@@ -125,4 +125,4 @@ message ReceiveWebSocketPacketRequest {
WebSocketPacket packet = 1;
Account account = 2;
string device_id = 3;
}
}