Skip to content

Commit 400b44d

Browse files
committed
#304 expose Namespace as a readonly property
1 parent 8d5d25c commit 400b44d

File tree

2 files changed

+25
-14
lines changed

2 files changed

+25
-14
lines changed

src/SocketIOClient/SocketIO.cs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ private Uri ServerUri
7272
_serverUri = value;
7373
if (value != null && value.AbsolutePath != "/")
7474
{
75-
_namespace = value.AbsolutePath;
75+
Namespace = value.AbsolutePath;
7676
}
7777
}
7878
}
@@ -83,7 +83,7 @@ private Uri ServerUri
8383
/// </summary>
8484
public string Id { get; private set; }
8585

86-
string _namespace;
86+
public string Namespace { get; private set; }
8787

8888
/// <summary>
8989
/// Whether or not the socket is connected to the server.
@@ -211,7 +211,7 @@ private async Task InitTransportAsync()
211211
Transport = new WebSocketTransport(transportOptions, ws);
212212
}
213213
_resources.Add(Transport);
214-
Transport.Namespace = _namespace;
214+
Transport.Namespace = Namespace;
215215
SetHeaders();
216216
Transport.SetProxy(Options.Proxy);
217217
Transport.OnReceived = OnMessageReceived;
@@ -550,7 +550,7 @@ public async Task DisconnectAsync()
550550
_connCts.TryDispose();
551551
var msg = new DisconnectedMessage
552552
{
553-
Namespace = _namespace
553+
Namespace = Namespace
554554
};
555555
try
556556
{
@@ -629,7 +629,7 @@ internal async Task ClientAckAsync(int packetId, CancellationToken cancellationT
629629
msg = new ServerBinaryAckMessage
630630
{
631631
Id = packetId,
632-
Namespace = _namespace,
632+
Namespace = Namespace,
633633
Json = result.Json
634634
};
635635
msg.OutgoingBytes = new List<byte[]>(result.Bytes);
@@ -638,7 +638,7 @@ internal async Task ClientAckAsync(int packetId, CancellationToken cancellationT
638638
{
639639
msg = new ServerAckMessage
640640
{
641-
Namespace = _namespace,
641+
Namespace = Namespace,
642642
Id = packetId,
643643
Json = result.Json
644644
};
@@ -648,7 +648,7 @@ internal async Task ClientAckAsync(int packetId, CancellationToken cancellationT
648648
{
649649
msg = new ServerAckMessage
650650
{
651-
Namespace = _namespace,
651+
Namespace = Namespace,
652652
Id = packetId
653653
};
654654
}
@@ -675,7 +675,7 @@ public async Task EmitAsync(string eventName, CancellationToken cancellationToke
675675
{
676676
var msg = new BinaryMessage
677677
{
678-
Namespace = _namespace,
678+
Namespace = Namespace,
679679
OutgoingBytes = new List<byte[]>(result.Bytes),
680680
Event = eventName,
681681
Json = result.Json
@@ -686,7 +686,7 @@ public async Task EmitAsync(string eventName, CancellationToken cancellationToke
686686
{
687687
var msg = new EventMessage
688688
{
689-
Namespace = _namespace,
689+
Namespace = Namespace,
690690
Event = eventName,
691691
Json = result.Json
692692
};
@@ -697,7 +697,7 @@ public async Task EmitAsync(string eventName, CancellationToken cancellationToke
697697
{
698698
var msg = new EventMessage
699699
{
700-
Namespace = _namespace,
700+
Namespace = Namespace,
701701
Event = eventName
702702
};
703703
await Transport.SendAsync(msg, cancellationToken).ConfigureAwait(false);
@@ -727,7 +727,7 @@ public async Task EmitAsync(string eventName, CancellationToken cancellationToke
727727
var msg = new ClientBinaryAckMessage
728728
{
729729
Event = eventName,
730-
Namespace = _namespace,
730+
Namespace = Namespace,
731731
Json = result.Json,
732732
Id = _packetId,
733733
OutgoingBytes = new List<byte[]>(result.Bytes)
@@ -739,7 +739,7 @@ public async Task EmitAsync(string eventName, CancellationToken cancellationToke
739739
var msg = new ClientAckMessage
740740
{
741741
Event = eventName,
742-
Namespace = _namespace,
742+
Namespace = Namespace,
743743
Id = _packetId,
744744
Json = result.Json
745745
};
@@ -751,7 +751,7 @@ public async Task EmitAsync(string eventName, CancellationToken cancellationToke
751751
var msg = new ClientAckMessage
752752
{
753753
Event = eventName,
754-
Namespace = _namespace,
754+
Namespace = Namespace,
755755
Id = _packetId
756756
};
757757
await Transport.SendAsync(msg, cancellationToken).ConfigureAwait(false);

tests/SocketIOClient.UnitTest/SocketIOTest.cs

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -620,5 +620,16 @@ public async Task Should_be_able_to_cancel_reconnecting_after_disconnected()
620620
{
621621
await Should_be_able_to_cancel_reconnecting(async io => await io.DisconnectAsync());
622622
}
623+
624+
[TestMethod]
625+
[DataRow("http://localhost:11002", null)]
626+
[DataRow("http://localhost:11002/", null)]
627+
[DataRow("http://localhost:11002/namespace", "/namespace")]
628+
[DataRow("http://localhost:11002/namespace/test", "/namespace/test")]
629+
public void Should_set_namespace(string url, string ns)
630+
{
631+
using var io = new SocketIO(url);
632+
io.Namespace.Should().Be(ns);
633+
}
623634
}
624-
}
635+
}

0 commit comments

Comments
 (0)