Skip to content

Commit 535c093

Browse files
MikeDobrzanMikeDobrzan
committed
Revert "Merge remote-tracking branch 'origin/eventengine/handshake-handler' into eventengine/handshake-handler"
This reverts commit be568f7, reversing changes made to 0da6c9a.
1 parent be568f7 commit 535c093

12 files changed

+58
-139
lines changed

‎src/Api/PubnubApi/EventEngine/Subscribe/Effects/ReceivingEffectHandler.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ public ReceivingEffectHandler(SubscribeManager2 manager, EventQueue eventQueue)
3131

3232
public Task Run(ReceiveReconnectInvocation invocation)
3333
{
34-
if (!ReconnectionDelayUtil.shouldRetry(invocation.ReconnectionPolicy, invocation.AttemptedRetries, invocation.MaximumReconnectionRetries))
34+
if (!ReconnectionDelayUtil.shouldRetry(invocation.Policy, invocation.AttemptedRetries, invocation.MaxConnectionRetry))
3535
{
3636
eventQueue.Enqueue(new ReceiveReconnectGiveUpEvent() { Status = new PNStatus(PNStatusCategory.PNCancelledCategory) });
3737
}
3838
else
3939
{
40-
retryDelay = new Delay(ReconnectionDelayUtil.CalculateDelay(invocation.ReconnectionPolicy, invocation.AttemptedRetries));
40+
retryDelay = new Delay(ReconnectionDelayUtil.CalculateDelay(invocation.Policy, invocation.AttemptedRetries));
4141
// Run in the background
4242
retryDelay.Start().ContinueWith((_) => this.Run((ReceiveMessagesInvocation)invocation));
4343
}

‎src/Api/PubnubApi/EventEngine/Subscribe/Invocations/SubscriptionInvocations.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,17 @@ internal class CancelHandshakeInvocation : HandshakeInvocation, Core.IEffectCanc
5656
internal class HandshakeReconnectInvocation: HandshakeInvocation
5757
{
5858
public int AttemptedRetries;
59-
public int MaximumReconnectionRetries;
60-
public PNReconnectionPolicy ReconnectionPolicy;
59+
public int MaxConnectionRetry;
60+
public PNReconnectionPolicy Policy;
6161
}
6262

6363
internal class CancelHandshakeReconnectInvocation: HandshakeReconnectInvocation, Core.IEffectCancelInvocation { }
6464

6565
internal class ReceiveReconnectInvocation: ReceiveMessagesInvocation
6666
{
6767
public int AttemptedRetries;
68-
public int MaximumReconnectionRetries;
69-
public PNReconnectionPolicy ReconnectionPolicy;
68+
public int MaxConnectionRetry;
69+
public PNReconnectionPolicy Policy;
7070
}
7171

7272
internal class CancelReceiveReconnectInvocation: ReceiveReconnectInvocation, Core.IEffectCancelInvocation { }

‎src/Api/PubnubApi/EventEngine/Subscribe/States/HandshakeFailedState.cs

+7-17
Original file line numberDiff line numberDiff line change
@@ -9,37 +9,27 @@ internal class HandshakeFailedState : Core.State
99
{
1010
public IEnumerable<string> Channels;
1111
public IEnumerable<string> ChannelGroups;
12-
public PNReconnectionPolicy ReconnectionPolicy;
13-
public int MaximumReconnectionRetries;
1412

15-
public override TransitionResult Transition(IEvent e)
13+
public override TransitionResult Transition(IEvent e)
1614
{
1715
return e switch
1816
{
1917
Events.SubscriptionChangedEvent subscriptionChanged => new HandshakingState()
2018
{
21-
Channels = subscriptionChanged.Channels,
22-
ChannelGroups = subscriptionChanged.ChannelGroups,
23-
MaximumReconnectionRetries = this.MaximumReconnectionRetries,
24-
ReconnectionPolicy = this.ReconnectionPolicy
25-
},
19+
Channels = subscriptionChanged.Channels, ChannelGroups = subscriptionChanged.ChannelGroups,
20+
},
2621

2722
Events.ReconnectEvent reconnect => new HandshakingState()
2823
{
29-
Channels = reconnect.Channels,
30-
ChannelGroups = reconnect.ChannelGroups,
31-
MaximumReconnectionRetries = this.MaximumReconnectionRetries,
32-
ReconnectionPolicy = this.ReconnectionPolicy
33-
},
24+
Channels = reconnect.Channels, ChannelGroups = reconnect.ChannelGroups,
25+
},
3426

3527
Events.SubscriptionRestoredEvent subscriptionRestored => new ReceivingState()
3628
{
3729
Channels = subscriptionRestored.Channels,
3830
ChannelGroups = subscriptionRestored.ChannelGroups,
39-
Cursor = subscriptionRestored.Cursor,
40-
MaximumReconnectionRetries = this.MaximumReconnectionRetries,
41-
ReconnectionPolicy = this.ReconnectionPolicy
42-
},
31+
Cursor = subscriptionRestored.Cursor
32+
},
4333

4434
_ => null
4535
};

‎src/Api/PubnubApi/EventEngine/Subscribe/States/HandshakeReconnectingState.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ internal class HandshakeReconnectingState : Core.State
99
{
1010
public IEnumerable<string> Channels;
1111
public IEnumerable<string> ChannelGroups;
12-
public PNReconnectionPolicy ReconnectionPolicy;
13-
public int MaximumReconnectionRetries;
12+
public PNReconnectionPolicy RetryPolicy;
13+
public int MaxConnectionRetry;
1414
public int AttemptedRetries;
1515

1616

1717
public override IEnumerable<IEffectInvocation> OnEntry => new HandshakeReconnectInvocation()
18-
{ Channels = this.Channels, ChannelGroups = this.ChannelGroups, ReconnectionPolicy = this.ReconnectionPolicy, MaximumReconnectionRetries = this.MaximumReconnectionRetries, AttemptedRetries = this.AttemptedRetries }.AsArray();
18+
{ Channels = this.Channels, ChannelGroups = this.ChannelGroups, Policy = this.RetryPolicy, MaxConnectionRetry = this.MaxConnectionRetry, AttemptedRetries = this.AttemptedRetries }.AsArray();
1919
public override IEnumerable<IEffectInvocation> OnExit { get; } = new CancelHandshakeReconnectInvocation().AsArray();
2020

2121
public override TransitionResult Transition(IEvent e)

‎src/Api/PubnubApi/EventEngine/Subscribe/States/HandshakeStoppedState.cs

+7-17
Original file line numberDiff line numberDiff line change
@@ -9,36 +9,26 @@ internal class HandshakeStoppedState : Core.State
99
{
1010
public IEnumerable<string> Channels;
1111
public IEnumerable<string> ChannelGroups;
12-
public PNReconnectionPolicy ReconnectionPolicy;
13-
public int MaximumReconnectionRetries;
14-
15-
public override TransitionResult Transition(IEvent e)
12+
13+
public override TransitionResult Transition(IEvent e)
1614
{
1715
return e switch
1816
{
1917
Events.SubscriptionChangedEvent subscriptionChanged => new HandshakingState()
2018
{
21-
Channels = subscriptionChanged.Channels,
22-
ChannelGroups = subscriptionChanged.ChannelGroups,
23-
MaximumReconnectionRetries = this.MaximumReconnectionRetries,
24-
ReconnectionPolicy = this.ReconnectionPolicy
25-
},
19+
Channels = subscriptionChanged.Channels, ChannelGroups = subscriptionChanged.ChannelGroups,
20+
},
2621

2722
Events.ReconnectEvent reconnect => new HandshakingState()
2823
{
29-
Channels = reconnect.Channels,
30-
ChannelGroups = reconnect.ChannelGroups,
31-
MaximumReconnectionRetries = this.MaximumReconnectionRetries,
32-
ReconnectionPolicy = this.ReconnectionPolicy
33-
},
24+
Channels = reconnect.Channels, ChannelGroups = reconnect.ChannelGroups,
25+
},
3426

3527
Events.SubscriptionRestoredEvent subscriptionRestored => new ReceivingState()
3628
{
3729
Channels = subscriptionRestored.Channels,
3830
ChannelGroups = subscriptionRestored.ChannelGroups,
39-
MaximumReconnectionRetries = this.MaximumReconnectionRetries,
40-
ReconnectionPolicy = this.ReconnectionPolicy,
41-
Cursor = subscriptionRestored.Cursor
31+
Cursor = subscriptionRestored.Cursor
4232
},
4333

4434
_ => null

‎src/Api/PubnubApi/EventEngine/Subscribe/States/HandshakingState.cs

+11-29
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@ internal class HandshakingState : Core.State
99
{
1010
public IEnumerable<string> Channels;
1111
public IEnumerable<string> ChannelGroups;
12-
public PNReconnectionPolicy ReconnectionPolicy;
13-
public int MaximumReconnectionRetries;
1412

15-
public override IEnumerable<IEffectInvocation> OnEntry => new HandshakeInvocation()
13+
public override IEnumerable<IEffectInvocation> OnEntry => new HandshakeInvocation()
1614
{ Channels = this.Channels, ChannelGroups = this.ChannelGroups }.AsArray();
1715

1816
public override IEnumerable<IEffectInvocation> OnExit { get; } = new CancelHandshakeInvocation().AsArray();
@@ -23,46 +21,30 @@ public override TransitionResult Transition(IEvent e)
2321
{
2422
Events.SubscriptionChangedEvent subscriptionChanged => new States.HandshakingState()
2523
{
26-
Channels = subscriptionChanged.Channels,
27-
ChannelGroups = subscriptionChanged.ChannelGroups,
28-
MaximumReconnectionRetries = this.MaximumReconnectionRetries,
29-
ReconnectionPolicy = this.ReconnectionPolicy
30-
},
24+
Channels = subscriptionChanged.Channels, ChannelGroups = subscriptionChanged.ChannelGroups
25+
},
3126

3227
Events.SubscriptionRestoredEvent subscriptionRestored => new States.ReceivingState()
3328
{
3429
Channels = subscriptionRestored.Channels,
3530
ChannelGroups = subscriptionRestored.ChannelGroups,
36-
Cursor = subscriptionRestored.Cursor,
37-
MaximumReconnectionRetries = this.MaximumReconnectionRetries,
38-
ReconnectionPolicy = this.ReconnectionPolicy
39-
},
31+
Cursor = subscriptionRestored.Cursor
32+
},
4033

4134
Events.HandshakeFailureEvent handshakeFailure => new States.HandshakeReconnectingState()
4235
{
43-
Channels = this.Channels,
44-
ChannelGroups = this.ChannelGroups,
45-
AttemptedRetries = 0,
46-
MaximumReconnectionRetries = this.MaximumReconnectionRetries,
47-
ReconnectionPolicy = this.ReconnectionPolicy
48-
}.With(new EmitStatusInvocation(handshakeFailure.Status)),
36+
Channels = this.Channels, ChannelGroups = this.ChannelGroups
37+
}.With(new EmitStatusInvocation(handshakeFailure.Status)),
4938

5039
Events.DisconnectEvent disconnect => new States.HandshakeStoppedState()
5140
{
52-
Channels = disconnect.Channels,
53-
ChannelGroups = disconnect.ChannelGroups,
54-
MaximumReconnectionRetries = this.MaximumReconnectionRetries,
55-
ReconnectionPolicy = this.ReconnectionPolicy
56-
}.With(new EmitStatusInvocation(PNStatusCategory.PNDisconnectedCategory)),
41+
Channels = disconnect.Channels, ChannelGroups = disconnect.ChannelGroups,
42+
}.With(new EmitStatusInvocation(PNStatusCategory.PNDisconnectedCategory)),
5743

5844
Events.HandshakeSuccessEvent success => new ReceivingState()
5945
{
60-
Channels = this.Channels,
61-
ChannelGroups = this.ChannelGroups,
62-
Cursor = success.Cursor,
63-
MaximumReconnectionRetries = this.MaximumReconnectionRetries,
64-
ReconnectionPolicy = this.ReconnectionPolicy
65-
}.With(new EmitStatusInvocation(success.Status)),
46+
Channels = this.Channels, ChannelGroups = this.ChannelGroups, Cursor = success.Cursor
47+
}.With(new EmitStatusInvocation(success.Status)),
6648

6749
_ => null
6850
};

‎src/Api/PubnubApi/EventEngine/Subscribe/States/ReceiveFailedState.cs

+7-15
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ internal class ReceiveFailedState : Core.State
1111
public IEnumerable<string> Channels;
1212
public IEnumerable<string> ChannelGroups;
1313
public SubscriptionCursor Cursor;
14-
public PNReconnectionPolicy ReconnectionPolicy;
15-
public int MaximumReconnectionRetries;
1614

17-
public IEnumerable<IEffectInvocation> OnEntry { get; }
15+
public IEnumerable<IEffectInvocation> OnEntry { get; }
1816
public IEnumerable<IEffectInvocation> OnExit { get; }
1917

2018
public override TransitionResult Transition(IEvent e)
@@ -25,28 +23,22 @@ public override TransitionResult Transition(IEvent e)
2523
{
2624
Channels = subscriptionChanged.Channels,
2725
ChannelGroups = subscriptionChanged.ChannelGroups,
28-
Cursor = this.Cursor,
29-
MaximumReconnectionRetries = this.MaximumReconnectionRetries,
30-
ReconnectionPolicy = this.ReconnectionPolicy
31-
},
26+
Cursor = this.Cursor
27+
},
3228

3329
Events.ReconnectEvent reconnect => new ReceivingState()
3430
{
3531
Channels = reconnect.Channels,
3632
ChannelGroups = reconnect.ChannelGroups,
37-
Cursor = reconnect.Cursor,
38-
MaximumReconnectionRetries = this.MaximumReconnectionRetries,
39-
ReconnectionPolicy = this.ReconnectionPolicy
40-
},
33+
Cursor = reconnect.Cursor
34+
},
4135

4236
Events.SubscriptionRestoredEvent subscriptionRestored => new ReceivingState()
4337
{
4438
Channels = subscriptionRestored.Channels,
4539
ChannelGroups = subscriptionRestored.ChannelGroups,
46-
Cursor = subscriptionRestored.Cursor,
47-
MaximumReconnectionRetries = this.MaximumReconnectionRetries,
48-
ReconnectionPolicy = this.ReconnectionPolicy
49-
},
40+
Cursor = subscriptionRestored.Cursor
41+
},
5042

5143
_ => null
5244
};

‎src/Api/PubnubApi/EventEngine/Subscribe/States/ReceiveReconnectingState.cs

+3-16
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,10 @@ internal class ReceiveReconnectingState : Core.State
1010
{
1111
public IEnumerable<string> Channels;
1212
public IEnumerable<string> ChannelGroups;
13-
public PNReconnectionPolicy ReconnectionPolicy;
14-
public int MaximumReconnectionRetries;
15-
public int AttemptedRetries;
16-
public SubscriptionCursor Cursor;
13+
public SubscriptionCursor Cursor;
1714

1815
public override IEnumerable<IEffectInvocation> OnEntry => new ReceiveReconnectInvocation()
19-
{
20-
Channels = this.Channels,
21-
ChannelGroups = this.ChannelGroups,
22-
Cursor = this.Cursor,
23-
ReconnectionPolicy = this.ReconnectionPolicy,
24-
MaximumReconnectionRetries = this.MaximumReconnectionRetries,
25-
AttemptedRetries = this.AttemptedRetries
26-
}.AsArray();
16+
{ Channels = this.Channels, ChannelGroups = this.ChannelGroups, Cursor = this.Cursor }.AsArray();
2717

2818
public override IEnumerable<IEffectInvocation> OnExit { get; } =
2919
new CancelReceiveReconnectInvocation().AsArray();
@@ -64,10 +54,7 @@ public override TransitionResult Transition(IEvent e)
6454
{
6555
Channels = this.Channels,
6656
ChannelGroups = this.ChannelGroups,
67-
Cursor = this.Cursor,
68-
AttemptedRetries = this.AttemptedRetries,
69-
MaximumReconnectionRetries = this.MaximumReconnectionRetries,
70-
ReconnectionPolicy = this.ReconnectionPolicy
57+
Cursor = this.Cursor
7158
}.With(new EmitStatusInvocation(receiveReconnectFailure.Status)),
7259

7360
Events.ReceiveReconnectGiveUpEvent receiveReconnectGiveUp => new ReceiveFailedState()

‎src/Api/PubnubApi/EventEngine/Subscribe/States/ReceiveStoppedState.cs

+6-14
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ internal class ReceiveStoppedState : Core.State
1111
public IEnumerable<string> Channels;
1212
public IEnumerable<string> ChannelGroups;
1313
public SubscriptionCursor Cursor;
14-
public PNReconnectionPolicy ReconnectionPolicy;
15-
public int MaximumReconnectionRetries;
1614

17-
public override TransitionResult Transition(IEvent e)
15+
public override TransitionResult Transition(IEvent e)
1816
{
1917
return e switch
2018
{
@@ -23,27 +21,21 @@ public override TransitionResult Transition(IEvent e)
2321
Channels = subscriptionChanged.Channels,
2422
ChannelGroups = subscriptionChanged.ChannelGroups,
2523
Cursor = this.Cursor,
26-
MaximumReconnectionRetries = this.MaximumReconnectionRetries,
27-
ReconnectionPolicy = this.ReconnectionPolicy
28-
},
24+
},
2925

3026
Events.ReconnectEvent reconnect => new ReceivingState()
3127
{
3228
Channels = reconnect.Channels,
3329
ChannelGroups = reconnect.ChannelGroups,
34-
Cursor = reconnect.Cursor,
35-
MaximumReconnectionRetries = this.MaximumReconnectionRetries,
36-
ReconnectionPolicy = this.ReconnectionPolicy
37-
},
30+
Cursor = reconnect.Cursor
31+
},
3832

3933
Events.SubscriptionRestoredEvent subscriptionRestored => new ReceivingState()
4034
{
4135
Channels = subscriptionRestored.Channels,
4236
ChannelGroups = subscriptionRestored.ChannelGroups,
43-
Cursor = subscriptionRestored.Cursor,
44-
MaximumReconnectionRetries = this.MaximumReconnectionRetries,
45-
ReconnectionPolicy = this.ReconnectionPolicy
46-
},
37+
Cursor = subscriptionRestored.Cursor
38+
},
4739

4840
_ => null
4941
};

‎src/Api/PubnubApi/EventEngine/Subscribe/States/ReceivingState.cs

+2-7
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ internal class ReceivingState : Core.State
1010
{
1111
public IEnumerable<string> Channels;
1212
public IEnumerable<string> ChannelGroups;
13-
public PNReconnectionPolicy ReconnectionPolicy;
14-
public int MaximumReconnectionRetries;
15-
public SubscriptionCursor Cursor;
13+
public SubscriptionCursor Cursor;
1614

1715
public override IEnumerable<IEffectInvocation> OnEntry => new ReceiveMessagesInvocation()
1816
{ Channels = this.Channels, ChannelGroups = this.ChannelGroups, Cursor = this.Cursor }.AsArray();
@@ -58,10 +56,7 @@ public override TransitionResult Transition(IEvent e)
5856
{
5957
Channels = this.Channels,
6058
ChannelGroups = this.ChannelGroups,
61-
AttemptedRetries = 0,
62-
MaximumReconnectionRetries = this.MaximumReconnectionRetries,
63-
ReconnectionPolicy = this.ReconnectionPolicy,
64-
Cursor = this.Cursor
59+
Cursor = this.Cursor
6560
},
6661

6762
_ => null

‎src/Api/PubnubApi/EventEngine/Subscribe/States/UnsubscribedState.cs

+5-13
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,21 @@ namespace PubnubApi.EventEngine.Subscribe.States
77
{
88
internal class UnsubscribedState : Core.State
99
{
10-
public PNReconnectionPolicy ReconnectionPolicy;
11-
public int MaximumReconnectionRetries;
12-
13-
public override TransitionResult Transition(Core.IEvent e)
10+
public override TransitionResult Transition(Core.IEvent e)
1411
{
1512
return e switch
1613
{
1714
Events.SubscriptionChangedEvent subscriptionChanged => new HandshakingState()
1815
{
19-
Channels = subscriptionChanged.Channels,
20-
ChannelGroups = subscriptionChanged.ChannelGroups,
21-
MaximumReconnectionRetries = this.MaximumReconnectionRetries,
22-
ReconnectionPolicy = this.ReconnectionPolicy
23-
},
16+
Channels = subscriptionChanged.Channels, ChannelGroups = subscriptionChanged.ChannelGroups,
17+
},
2418

2519
Events.SubscriptionRestoredEvent subscriptionRestored => new States.ReceivingState()
2620
{
2721
Channels = subscriptionRestored.Channels,
2822
ChannelGroups = subscriptionRestored.ChannelGroups,
29-
Cursor = subscriptionRestored.Cursor,
30-
MaximumReconnectionRetries = this.MaximumReconnectionRetries,
31-
ReconnectionPolicy = this.ReconnectionPolicy
32-
},
23+
Cursor = subscriptionRestored.Cursor
24+
},
3325

3426
_ => null
3527
};

0 commit comments

Comments
 (0)