Skip to content

Commit 945af13

Browse files
committed
Quick fixie
1 parent ba66343 commit 945af13

File tree

2 files changed

+32
-2
lines changed

2 files changed

+32
-2
lines changed

API/Program.cs

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using MessagePack;
12
using Microsoft.AspNetCore.Http.Connections;
23
using Microsoft.Extensions.Options;
34
using OpenShock.API.Realtime;
@@ -9,6 +10,7 @@
910
using OpenShock.Common.DeviceControl;
1011
using OpenShock.Common.Extensions;
1112
using OpenShock.Common.Hubs;
13+
using OpenShock.Common.JsonSerialization;
1214
using OpenShock.Common.Options;
1315
using OpenShock.Common.Services;
1416
using OpenShock.Common.Services.Device;
@@ -38,7 +40,20 @@
3840

3941
builder.Services.AddSignalR()
4042
.AddOpenShockStackExchangeRedis(options => { options.Configuration = redisConfig; })
41-
.AddMessagePackProtocol();
43+
.AddJsonProtocol(options =>
44+
{
45+
options.PayloadSerializerOptions.PropertyNameCaseInsensitive = true;
46+
options.PayloadSerializerOptions.Converters.Add(new SemVersionJsonConverter());
47+
})
48+
.AddMessagePackProtocol(options =>
49+
{
50+
options.SerializerOptions = MessagePackSerializerOptions.Standard.WithResolver(
51+
MessagePack.Resolvers.CompositeResolver.Create(
52+
MessagePack.Resolvers.NativeGuidResolver.Instance,
53+
MessagePack.Resolvers.StandardResolver.Instance
54+
))
55+
.WithSecurity(MessagePackSecurity.UntrustedData);
56+
});
4257

4358
builder.Services.AddScoped<IDeviceService, DeviceService>();
4459
builder.Services.AddScoped<IControlSender, ControlSender>();

LiveControlGateway/Program.cs

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
using MessagePack;
12
using Microsoft.Extensions.Options;
23
using OpenShock.Common;
34
using OpenShock.Common.DeviceControl;
45
using OpenShock.Common.Extensions;
6+
using OpenShock.Common.JsonSerialization;
57
using OpenShock.Common.Services;
68
using OpenShock.Common.Services.Device;
79
using OpenShock.Common.Services.Ota;
@@ -26,7 +28,20 @@
2628

2729
builder.Services.AddSignalR()
2830
.AddOpenShockStackExchangeRedis(options => { options.Configuration = redisConfig; })
29-
.AddMessagePackProtocol();
31+
.AddJsonProtocol(options =>
32+
{
33+
options.PayloadSerializerOptions.PropertyNameCaseInsensitive = true;
34+
options.PayloadSerializerOptions.Converters.Add(new SemVersionJsonConverter());
35+
})
36+
.AddMessagePackProtocol(options =>
37+
{
38+
options.SerializerOptions = MessagePackSerializerOptions.Standard.WithResolver(
39+
MessagePack.Resolvers.CompositeResolver.Create(
40+
MessagePack.Resolvers.NativeGuidResolver.Instance,
41+
MessagePack.Resolvers.StandardResolver.Instance
42+
))
43+
.WithSecurity(MessagePackSecurity.UntrustedData);
44+
});
3045

3146
builder.Services.AddScoped<IDeviceService, DeviceService>();
3247
builder.Services.AddScoped<IControlSender, ControlSender>();

0 commit comments

Comments
 (0)