Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add allowing stateful reconnects in server handshake message. #1935

Merged
merged 1 commit into from
May 13, 2024
Merged

add allowing stateful reconnects in server handshake message. #1935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/Microsoft.Azure.SignalR.Protocols/ServiceMessage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,11 @@ public class HandshakeRequestMessage : ExtensibleServiceMessage
/// </summary>
public int MigrationLevel { get; set; }

/// <summary>
/// Gets or sets the allowing of client stateful reconnects.
/// </summary>
public bool AllowStatefulReconnects { get; set; }

/// <summary>
/// Initializes a new instance of the <see cref="HandshakeRequestMessage"/> class.
/// </summary>
Expand Down
9 changes: 7 additions & 2 deletions src/Microsoft.Azure.SignalR.Protocols/ServiceProtocol.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,13 +313,14 @@ private static void WriteMessageCore(ref MessagePackWriter writer, ServiceMessag

private static void WriteHandshakeRequestMessage(ref MessagePackWriter writer, HandshakeRequestMessage message)
{
writer.WriteArrayHeader(6);
writer.WriteArrayHeader(7);
writer.Write(ServiceProtocolConstants.HandshakeRequestType);
writer.Write(message.Version);
writer.Write(message.ConnectionType);
writer.Write(message.ConnectionType == 0 ? "" : message.Target ?? string.Empty);
writer.Write((int)message.MigrationLevel);
writer.Write(message.MigrationLevel);
message.WriteExtensionMembers(ref writer);
writer.Write(message.AllowStatefulReconnects);
}

private static void WriteHandshakeResponseMessage(ref MessagePackWriter writer, HandshakeResponseMessage message)
Expand Down Expand Up @@ -800,6 +801,10 @@ private static HandshakeRequestMessage CreateHandshakeRequestMessage(ref Message
{
result.ReadExtensionMembers(ref reader);
}
if (arrayLength >= 7)
{
result.AllowStatefulReconnects = ReadBoolean(ref reader, "enableStatefulReconnects");
}
return result;
}

Expand Down
6 changes: 5 additions & 1 deletion test/Microsoft.Azure.SignalR.Protocols.Tests/ServiceMessageEqualityComparer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,11 @@ public int GetHashCode(ServiceMessage obj)

private bool HandshakeRequestMessagesEqual(HandshakeRequestMessage x, HandshakeRequestMessage y)
{
return x.Version == y.Version;
return x.Version == y.Version &&
x.AllowStatefulReconnects == y.AllowStatefulReconnects &&
x.MigrationLevel == y.MigrationLevel &&
(x.Target ?? string.Empty) == (y.Target ?? string.Empty) &&
x.ConnectionType == y.ConnectionType;
}

private bool HandshakeResponseMessagesEqual(HandshakeResponseMessage x, HandshakeResponseMessage y)
Expand Down
22 changes: 19 additions & 3 deletions test/Microsoft.Azure.SignalR.Protocols.Tests/ServiceProtocolFacts.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,18 @@ public static IEnumerable<object[]> TestParseOldData
name: "HandshakeRequestWithMigratableStatus_NoOptionalField",
message: new HandshakeRequestMessage(1) { MigrationLevel = 1},
binary: "lQEBAKAB"),
new ProtocolTestData(
name: "HandshakeRequest_2",
message: new HandshakeRequestMessage(1),
binary: "lgEBAKAAgA=="),
new ProtocolTestData(
name: "HandshakeRequestWithProperty_2",
message: new HandshakeRequestMessage(1) { ConnectionType = 1, Target = "abc" },
binary: "lgEBAaNhYmMAgA=="),
new ProtocolTestData(
name: "HandshakeRequestWithMigratableStatus_2",
message: new HandshakeRequestMessage(1) { MigrationLevel = 1},
binary: "lgEBAKABgA=="),
new ProtocolTestData(
name: "HandshakeResponse_NoOptionalField",
message: new HandshakeResponseMessage(),
Expand Down Expand Up @@ -276,15 +288,19 @@ public static IEnumerable<object[]> TestParseOldData
new ProtocolTestData(
name: "HandshakeRequest",
message: new HandshakeRequestMessage(1),
binary: "lgEBAKAAgA=="),
binary: "lwEBAKAAgMI="),
new ProtocolTestData(
name: "HandshakeRequestWithProperty",
message: new HandshakeRequestMessage(1) { ConnectionType = 1, Target = "abc" },
binary: "lgEBAaNhYmMAgA=="),
binary: "lwEBAaNhYmMAgMI="),
new ProtocolTestData(
name: "HandshakeRequestWithMigratableStatus",
message: new HandshakeRequestMessage(1) { MigrationLevel = 1},
binary: "lgEBAKABgA=="),
binary: "lwEBAKABgMI="),
new ProtocolTestData(
name: "HandshakeRequestWithStatefulReconnects",
message: new HandshakeRequestMessage(1) { AllowStatefulReconnects = true},
binary: "lwEBAKAAgMM="),
new ProtocolTestData(
name: "HandshakeResponse",
message: new HandshakeResponseMessage(),
Expand Down