Skip to content

Commit 08f4587

Browse files
doghappydoghappy
committed
feat: OnReconnected, OnReconnectAttempt, OnReconnectError and OnReconnectFailed.
1 parent d65c218 commit 08f4587

File tree

13 files changed

+423
-334
lines changed

13 files changed

+423
-334
lines changed

‎src/SocketIOClient.Test/SocketIOTests/ReconnectionTest.cs‎

Lines changed: 104 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -8,45 +8,46 @@ public abstract class ReconnectionTest
88
{
99
protected abstract ISocketIOCreateable SocketIOCreator { get; }
1010

11-
public virtual async Task ReconnectionTrueTest()
12-
{
13-
int hiCount = 0;
14-
string res = null;
15-
int disconnectionCount = 0;
16-
var client = SocketIOCreator.Create();
17-
client.On("hi", response =>
18-
{
19-
res = response.GetValue<string>();
20-
hiCount++;
21-
});
22-
23-
client.OnDisconnected += (sender, e) =>
24-
{
25-
disconnectionCount++;
26-
};
27-
28-
client.OnConnected += async (sender, e) =>
29-
{
30-
await client.EmitAsync("hi", "SocketIOClient.Test");
31-
await Task.Delay(10);
32-
if (hiCount >= 2)
33-
{
34-
await client.DisconnectAsync();
35-
}
36-
else
37-
{
38-
await client.EmitAsync("sever disconnect", true);
39-
}
40-
};
41-
await client.ConnectAsync();
42-
await Task.Delay(2400);
43-
44-
Assert.IsFalse(client.Connected);
45-
Assert.IsTrue(client.Disconnected);
46-
Assert.AreEqual(2, hiCount);
47-
Assert.AreEqual(1, disconnectionCount);
48-
Assert.AreEqual($"{SocketIOCreator.Prefix}SocketIOClient.Test", res);
49-
}
11+
// NOTE: This test case is wrong, because the client will not automatically reconnect after the server closes the connection.
12+
//public virtual async Task ReconnectionTrueTest()
13+
//{
14+
// int hiCount = 0;
15+
// string res = null;
16+
// int disconnectionCount = 0;
17+
// var client = SocketIOCreator.Create();
18+
// client.On("hi", response =>
19+
// {
20+
// res = response.GetValue<string>();
21+
// hiCount++;
22+
// });
23+
24+
// client.OnDisconnected += (sender, e) =>
25+
// {
26+
// disconnectionCount++;
27+
// };
28+
29+
// client.OnConnected += async (sender, e) =>
30+
// {
31+
// await client.EmitAsync("hi", "SocketIOClient.Test");
32+
// await Task.Delay(10);
33+
// if (hiCount >= 2)
34+
// {
35+
// await client.DisconnectAsync();
36+
// }
37+
// else
38+
// {
39+
// await client.EmitAsync("sever disconnect", true);
40+
// }
41+
// };
42+
// await client.ConnectAsync();
43+
// await Task.Delay(2400);
44+
45+
// Assert.IsFalse(client.Connected);
46+
// Assert.IsTrue(client.Disconnected);
47+
// Assert.AreEqual(2, hiCount);
48+
// Assert.AreEqual(1, disconnectionCount);
49+
// Assert.AreEqual($"{SocketIOCreator.Prefix}SocketIOClient.Test", res);
50+
//}
5051

5152
public virtual async Task ReconnectionFalseTest()
5253
{
@@ -96,68 +97,71 @@ public virtual async Task ReconnectionFalseTest()
9697
Assert.AreEqual($"{SocketIOCreator.Prefix}SocketIOClient.Test", res);
9798
}
9899

99-
public virtual async Task ReconnectingTest()
100-
{
101-
int disconnectionCount = 0;
102-
int reconnectingCount = 0;
103-
int attempt = 0;
104-
bool connectedFlag = false;
105-
var client = SocketIOCreator.Create();
106-
107-
client.OnDisconnected += (sender, e) => disconnectionCount++;
108-
109-
client.OnReconnecting += (sender, e) =>
110-
{
111-
reconnectingCount++;
112-
attempt = e;
113-
};
114-
115-
client.OnConnected += async (sender, e) =>
116-
{
117-
if (!connectedFlag)
118-
{
119-
await Task.Delay(200);
120-
connectedFlag = true;
121-
await client.EmitAsync("sever disconnect", true);
122-
}
123-
};
124-
await client.ConnectAsync();
125-
await Task.Delay(2400);
126-
await client.DisconnectAsync();
127-
128-
Assert.AreEqual(1, disconnectionCount);
129-
Assert.AreEqual(1, reconnectingCount);
130-
Assert.AreEqual(1, attempt);
131-
}
132-
133-
public virtual async Task ReconnectionAttemptsExceededTest()
134-
{
135-
var client = SocketIOCreator.Create();
136-
client.ServerUri = new System.Uri("http://localhost:11011");
137-
client.Options.AllowedRetryFirstConnection = true;
138-
client.Options.ReconnectionAttempts = 5;
139-
140-
int reconnectingCount = 0;
141-
int attempt = 0;
142-
int reconnectionErrorCount = 0;
143-
144-
client.OnReconnecting += (sender, e) =>
145-
{
146-
reconnectingCount++;
147-
attempt = e;
148-
};
149-
150-
client.OnReconnectFailed += (sender, e) =>
151-
{
152-
reconnectionErrorCount++;
153-
};
154-
155-
await client.ConnectAsync();
156100

157-
Assert.AreEqual(reconnectingCount, 5);
158-
Assert.AreEqual(reconnectionErrorCount, 1);
159-
Assert.AreEqual(attempt, 5);
160-
}
101+
// NOTE: This test case is wrong, because the client will not automatically reconnect after the server closes the connection.
102+
//public virtual async Task ReconnectingTest()
103+
//{
104+
// int disconnectionCount = 0;
105+
// int reconnectingCount = 0;
106+
// int attempt = 0;
107+
// bool connectedFlag = false;
108+
// var client = SocketIOCreator.Create();
109+
110+
// client.OnDisconnected += (sender, e) => disconnectionCount++;
111+
112+
// client.OnReconnecting += (sender, e) =>
113+
// {
114+
// reconnectingCount++;
115+
// attempt = e;
116+
// };
117+
118+
// client.OnConnected += async (sender, e) =>
119+
// {
120+
// if (!connectedFlag)
121+
// {
122+
// await Task.Delay(200);
123+
// connectedFlag = true;
124+
// await client.EmitAsync("sever disconnect", true);
125+
// }
126+
// };
127+
// await client.ConnectAsync();
128+
// await Task.Delay(2400);
129+
// await client.DisconnectAsync();
130+
131+
// Assert.AreEqual(1, disconnectionCount);
132+
// Assert.AreEqual(1, reconnectingCount);
133+
// Assert.AreEqual(1, attempt);
134+
//}
135+
136+
// NOTE: This test case is wrong, because the client will not automatically reconnect after the server closes the connection.
137+
//public virtual async Task ReconnectionAttemptsExceededTest()
138+
//{
139+
// var client = SocketIOCreator.Create();
140+
// client.ServerUri = new System.Uri("http://localhost:11011");
141+
// client.Options.AllowedRetryFirstConnection = true;
142+
// client.Options.ReconnectionAttempts = 5;
143+
144+
// int reconnectingCount = 0;
145+
// int attempt = 0;
146+
// int reconnectionErrorCount = 0;
147+
148+
// client.OnReconnecting += (sender, e) =>
149+
// {
150+
// reconnectingCount++;
151+
// attempt = e;
152+
// };
153+
154+
// client.OnReconnectFailed += (sender, e) =>
155+
// {
156+
// reconnectionErrorCount++;
157+
// };
158+
159+
// await client.ConnectAsync();
160+
161+
// Assert.AreEqual(reconnectingCount, 5);
162+
// Assert.AreEqual(reconnectionErrorCount, 1);
163+
// Assert.AreEqual(attempt, 5);
164+
//}
161165

162166

163167
[Timeout(30000)]

‎src/SocketIOClient.Test/SocketIOTests/V2/ReconnectionV2NspTest.cs‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,32 @@ public ReconnectionV2NspTest()
1313

1414
protected override ISocketIOCreateable SocketIOCreator { get; }
1515

16-
[TestMethod]
17-
public override async Task ReconnectionTrueTest()
18-
{
19-
await base.ReconnectionTrueTest();
20-
}
16+
// NOTE: This test case is wrong, because the client will not automatically reconnect after the server closes the connection.
17+
//[TestMethod]
18+
//public override async Task ReconnectionTrueTest()
19+
//{
20+
// await base.ReconnectionTrueTest();
21+
//}
2122

2223
[TestMethod]
2324
public override async Task ReconnectionFalseTest()
2425
{
2526
await base.ReconnectionFalseTest();
2627
}
2728

28-
[TestMethod]
29-
public override async Task ReconnectingTest()
30-
{
31-
await base.ReconnectingTest();
32-
}
29+
// NOTE: This test case is wrong, because the client will not automatically reconnect after the server closes the connection.
30+
//[TestMethod]
31+
//public override async Task ReconnectingTest()
32+
//{
33+
// await base.ReconnectingTest();
34+
//}
3335

34-
[TestMethod]
35-
public override async Task ReconnectionAttemptsExceededTest()
36-
{
37-
await base.ReconnectionAttemptsExceededTest();
38-
}
36+
// NOTE: This test case is wrong, because the client will not automatically reconnect after the server closes the connection.
37+
//[TestMethod]
38+
//public override async Task ReconnectionAttemptsExceededTest()
39+
//{
40+
// await base.ReconnectionAttemptsExceededTest();
41+
//}
3942

4043
[TestMethod]
4144
public override async Task ManuallyReconnectionTest()

‎src/SocketIOClient.Test/SocketIOTests/V2/ReconnectionV2Test.cs‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,32 @@ public ReconnectionV2Test()
1313

1414
protected override ISocketIOCreateable SocketIOCreator { get; }
1515

16-
[TestMethod]
17-
public override async Task ReconnectionTrueTest()
18-
{
19-
await base.ReconnectionTrueTest();
20-
}
16+
// NOTE: This test case is wrong, because the client will not automatically reconnect after the server closes the connection.
17+
//[TestMethod]
18+
//public override async Task ReconnectionTrueTest()
19+
//{
20+
// await base.ReconnectionTrueTest();
21+
//}
2122

2223
[TestMethod]
2324
public override async Task ReconnectionFalseTest()
2425
{
2526
await base.ReconnectionFalseTest();
2627
}
2728

28-
[TestMethod]
29-
public override async Task ReconnectingTest()
30-
{
31-
await base.ReconnectingTest();
32-
}
29+
// NOTE: This test case is wrong, because the client will not automatically reconnect after the server closes the connection.
30+
//[TestMethod]
31+
//public override async Task ReconnectingTest()
32+
//{
33+
// await base.ReconnectingTest();
34+
//}
3335

34-
[TestMethod]
35-
public override async Task ReconnectionAttemptsExceededTest()
36-
{
37-
await base.ReconnectionAttemptsExceededTest();
38-
}
36+
// NOTE: This test case is wrong, because the client will not automatically reconnect after the server closes the connection.
37+
//[TestMethod]
38+
//public override async Task ReconnectionAttemptsExceededTest()
39+
//{
40+
// await base.ReconnectionAttemptsExceededTest();
41+
//}
3942

4043
[TestMethod]
4144
public override async Task ManuallyReconnectionTest()

‎src/SocketIOClient.Test/SocketIOTests/V3/ReconnectionV3NspTest.cs‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,32 @@ public ReconnectionV3NspTest()
1313

1414
protected override ISocketIOCreateable SocketIOCreator { get; }
1515

16-
[TestMethod]
17-
public override async Task ReconnectionTrueTest()
18-
{
19-
await base.ReconnectionTrueTest();
20-
}
16+
// NOTE: This test case is wrong, because the client will not automatically reconnect after the server closes the connection.
17+
//[TestMethod]
18+
//public override async Task ReconnectionTrueTest()
19+
//{
20+
// await base.ReconnectionTrueTest();
21+
//}
2122

2223
[TestMethod]
2324
public override async Task ReconnectionFalseTest()
2425
{
2526
await base.ReconnectionFalseTest();
2627
}
2728

28-
[TestMethod]
29-
public override async Task ReconnectingTest()
30-
{
31-
await base.ReconnectingTest();
32-
}
29+
// NOTE: This test case is wrong, because the client will not automatically reconnect after the server closes the connection.
30+
//[TestMethod]
31+
//public override async Task ReconnectingTest()
32+
//{
33+
// await base.ReconnectingTest();
34+
//}
3335

34-
[TestMethod]
35-
public override async Task ReconnectionAttemptsExceededTest()
36-
{
37-
await base.ReconnectionAttemptsExceededTest();
38-
}
36+
// NOTE: This test case is wrong, because the client will not automatically reconnect after the server closes the connection.
37+
//[TestMethod]
38+
//public override async Task ReconnectionAttemptsExceededTest()
39+
//{
40+
// await base.ReconnectionAttemptsExceededTest();
41+
//}
3942

4043
[TestMethod]
4144
public override async Task ManuallyReconnectionTest()

0 commit comments

Comments
 (0)