Merge pull request #804 from Cysharp/feature/FixHeartbeatSequence

Fix heartbeat sequence error
Cysharp · Jul 5, 2024 · 764456c · 764456c
2 parents 031788f + de4b4a3
commit 764456c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/...s/Scripts/MagicOnion/MagicOnion.Client/Internal.Shared/StreamingHubClientMessageReader.cs b/...s/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<byte> Metadata) ReadServerHeartbeat()
+        public (short Sequence, long ServerSentAt, ReadOnlyMemory<byte> 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/...s/Scripts/MagicOnion/MagicOnion.Client/Internal.Shared/StreamingHubServerMessageReader.cs b/...s/Scripts/MagicOnion/MagicOnion.Client/Internal.Shared/StreamingHubServerMessageReader.cs
@@ -79,7 +79,7 @@ public StreamingHubMessageType ReadMessageType()
 
         public (short Sequence, long ClientSentAt, ReadOnlyMemory<byte> Extra) ReadClientHeartbeat()
         {
-            // [Sequence(int8), ClientSentAt(long), <Extra>]
+            // [Sequence(int16), ClientSentAt(long), <Extra>]
             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
@@ -74,20 +74,20 @@ public StreamingHubMessageType ReadMessageType()
             return (clientRequestMessageId, methodId, data.Slice(offset));
         }
 
-        public (byte Sequence, long ServerSentAt, ReadOnlyMemory<byte> Metadata) ReadServerHeartbeat()
+        public (short Sequence, long ServerSentAt, ReadOnlyMemory<byte> 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
@@ -79,7 +79,7 @@ public StreamingHubMessageType ReadMessageType()
 
         public (short Sequence, long ClientSentAt, ReadOnlyMemory<byte> Extra) ReadClientHeartbeat()
         {
-            // [Sequence(int8), ClientSentAt(long), <Extra>]
+            // [Sequence(int16), ClientSentAt(long), <Extra>]
             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