From de4b4a348b8033333e8034085c716c02e95c8b7c Mon Sep 17 00:00:00 2001 From: Mayuki Sawatari Date: Fri, 5 Jul 2024 15:27:51 +0900 Subject: [PATCH] Fix heartbeat sequence error --- .../Internal.Shared/StreamingHubClientMessageReader.cs | 8 ++++---- .../Internal.Shared/StreamingHubServerMessageReader.cs | 4 ++-- .../StreamingHubClientMessageReader.cs | 8 ++++---- .../StreamingHubServerMessageReader.cs | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/MagicOnion.Client.Unity/Assets/Scripts/MagicOnion/MagicOnion.Client/Internal.Shared/StreamingHubClientMessageReader.cs b/src/MagicOnion.Client.Unity/Assets/Scripts/MagicOnion/MagicOnion.Client/Internal.Shared/StreamingHubClientMessageReader.cs index 0d5cd3073..69b73f067 100644 --- a/src/MagicOnion.Client.Unity/Assets/Scripts/MagicOnion/MagicOnion.Client/Internal.Shared/StreamingHubClientMessageReader.cs +++ b/src/MagicOnion.Client.Unity/Assets/Scripts/MagicOnion/MagicOnion.Client/Internal.Shared/StreamingHubClientMessageReader.cs @@ -74,20 +74,20 @@ public StreamingHubMessageType ReadMessageType() return (clientRequestMessageId, methodId, data.Slice(offset)); } - public (byte Sequence, long ServerSentAt, ReadOnlyMemory Metadata) ReadServerHeartbeat() + public (short Sequence, long ServerSentAt, ReadOnlyMemory Metadata) ReadServerHeartbeat() { //var type = reader.ReadByte(); // Type is already read by ReadMessageType - var sequence = reader.ReadByte(); // Sequence + var sequence = reader.ReadInt16(); // Sequence var serverSentAt = reader.ReadInt64(); // ServerSentAt (2) reader.Skip(); // Dummy (3) return (sequence, serverSentAt, data.Slice((int)reader.Consumed)); } - public (byte Sequence, long ClientSentAt) ReadClientHeartbeatResponse() + public (short Sequence, long ClientSentAt) ReadClientHeartbeatResponse() { //var type = reader.ReadByte(); // Type is already read by ReadMessageType - var sequence = reader.ReadByte(); // Sequence + var sequence = reader.ReadInt16(); // Sequence var clientSentAt = reader.ReadInt64(); // ClientSentAt (2) reader.Skip(); // Reserved (3) diff --git a/src/MagicOnion.Client.Unity/Assets/Scripts/MagicOnion/MagicOnion.Client/Internal.Shared/StreamingHubServerMessageReader.cs b/src/MagicOnion.Client.Unity/Assets/Scripts/MagicOnion/MagicOnion.Client/Internal.Shared/StreamingHubServerMessageReader.cs index deb1ff617..307bf5016 100644 --- a/src/MagicOnion.Client.Unity/Assets/Scripts/MagicOnion/MagicOnion.Client/Internal.Shared/StreamingHubServerMessageReader.cs +++ b/src/MagicOnion.Client.Unity/Assets/Scripts/MagicOnion/MagicOnion.Client/Internal.Shared/StreamingHubServerMessageReader.cs @@ -79,7 +79,7 @@ public StreamingHubMessageType ReadMessageType() public (short Sequence, long ClientSentAt, ReadOnlyMemory Extra) ReadClientHeartbeat() { - // [Sequence(int8), ClientSentAt(long), ] + // [Sequence(int16), ClientSentAt(long), ] var sequence = reader.ReadInt16(); // Sequence var clientSentAt = reader.ReadInt64(); // ClientSentAt var extra = data.Slice((int)reader.Consumed); @@ -89,7 +89,7 @@ public StreamingHubMessageType ReadMessageType() public short ReadServerHeartbeatResponse() { - // [Sequence(int8), Nil, Nil] + // [Sequence(int16), Nil, Nil] var sequence = reader.ReadInt16(); // Sequence reader.Skip(); // Dummy reader.Skip(); // Dummy diff --git a/src/MagicOnion.Internal/StreamingHubClientMessageReader.cs b/src/MagicOnion.Internal/StreamingHubClientMessageReader.cs index 0d5cd3073..69b73f067 100644 --- a/src/MagicOnion.Internal/StreamingHubClientMessageReader.cs +++ b/src/MagicOnion.Internal/StreamingHubClientMessageReader.cs @@ -74,20 +74,20 @@ public StreamingHubMessageType ReadMessageType() return (clientRequestMessageId, methodId, data.Slice(offset)); } - public (byte Sequence, long ServerSentAt, ReadOnlyMemory Metadata) ReadServerHeartbeat() + public (short Sequence, long ServerSentAt, ReadOnlyMemory Metadata) ReadServerHeartbeat() { //var type = reader.ReadByte(); // Type is already read by ReadMessageType - var sequence = reader.ReadByte(); // Sequence + var sequence = reader.ReadInt16(); // Sequence var serverSentAt = reader.ReadInt64(); // ServerSentAt (2) reader.Skip(); // Dummy (3) return (sequence, serverSentAt, data.Slice((int)reader.Consumed)); } - public (byte Sequence, long ClientSentAt) ReadClientHeartbeatResponse() + public (short Sequence, long ClientSentAt) ReadClientHeartbeatResponse() { //var type = reader.ReadByte(); // Type is already read by ReadMessageType - var sequence = reader.ReadByte(); // Sequence + var sequence = reader.ReadInt16(); // Sequence var clientSentAt = reader.ReadInt64(); // ClientSentAt (2) reader.Skip(); // Reserved (3) diff --git a/src/MagicOnion.Internal/StreamingHubServerMessageReader.cs b/src/MagicOnion.Internal/StreamingHubServerMessageReader.cs index deb1ff617..307bf5016 100644 --- a/src/MagicOnion.Internal/StreamingHubServerMessageReader.cs +++ b/src/MagicOnion.Internal/StreamingHubServerMessageReader.cs @@ -79,7 +79,7 @@ public StreamingHubMessageType ReadMessageType() public (short Sequence, long ClientSentAt, ReadOnlyMemory Extra) ReadClientHeartbeat() { - // [Sequence(int8), ClientSentAt(long), ] + // [Sequence(int16), ClientSentAt(long), ] var sequence = reader.ReadInt16(); // Sequence var clientSentAt = reader.ReadInt64(); // ClientSentAt var extra = data.Slice((int)reader.Consumed); @@ -89,7 +89,7 @@ public StreamingHubMessageType ReadMessageType() public short ReadServerHeartbeatResponse() { - // [Sequence(int8), Nil, Nil] + // [Sequence(int16), Nil, Nil] var sequence = reader.ReadInt16(); // Sequence reader.Skip(); // Dummy reader.Skip(); // Dummy