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

HandshakeReconnectingState and other Pascal casing #172

Merged
merged 3 commits into from
Jun 23, 2023
Merged

HandshakeReconnectingState and other Pascal casing #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6568e45
HandshakeReconnectingState and other Pascal casing
budgetpreneur Jun 23, 2023
6a80bec
EmitStatusInvocation
budgetpreneur Jun 23, 2023
a213d1b
HandshakeFailedState
budgetpreneur Jun 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/Api/PubnubApi/EventEngine/Subscribe/Effects/HandshakeEffectHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ public async Task Run(HandshakeInvocation invocation) {
// TODO fix this, probably wrong :)
var resp = await manager.HandshakeRequest<string>(
PNOperationType.PNSubscribeOperation,
invocation.channels.ToArray(),
invocation.channelGroups.ToArray(),
invocation.Channels.ToArray(),
invocation.ChannelGroups.ToArray(),
null,
null,
invocation.initialSubscribeQueryParams,
invocation.externalQueryParams
invocation.InitialSubscribeQueryParams,
invocation.ExternalQueryParams
);

if (!resp.Item2.Error) {
Expand Down
16 changes: 11 additions & 5 deletions src/Api/PubnubApi/EventEngine/Subscribe/Events/SubscriptionEvents.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

namespace PubnubApi.PubnubEventEngine.Subscribe.Events {
public class SubscriptionChangedEvent : Core.IEvent {
public IEnumerable<string> channels;
public IEnumerable<string> channelGroups;
public IEnumerable<string> Channels;
public IEnumerable<string> ChannelGroups;
}

public class SubscriptionRestoredEvent : Core.IEvent {
public IEnumerable<string> channels;
public IEnumerable<string> channelGroups;
public SubscriptionCursor cursor;
public IEnumerable<string> Channels;
public IEnumerable<string> ChannelGroups;
public SubscriptionCursor Cursor;
}

public class HandshakeSuccessEvent : Core.IEvent {
Expand All @@ -22,6 +22,8 @@ public class HandshakeFailureEvent : Core.IEvent {
}

public class HandshakeReconnectSuccessEvent : HandshakeSuccessEvent {
public IEnumerable<string> Channels;
public IEnumerable<string> ChannelGroups;
}

public class HandshakeReconnectFailureEvent : HandshakeFailureEvent {
Expand All @@ -31,6 +33,8 @@ public class HandshakeReconnectRetryEvent : Core.IEvent {
}

public class HandshakeReconnectGiveUpEvent : Core.IEvent {
public IEnumerable<string> Channels;
public IEnumerable<string> ChannelGroups;
// TODO status or reason?
public PNStatus status;
}
Expand Down Expand Up @@ -65,5 +69,7 @@ public class DisconnectEvent : Core.IEvent {
}

public class ReconnectEvent : Core.IEvent {
public IEnumerable<string> Channels;
public IEnumerable<string> ChannelGroups;
}
}
24 changes: 17 additions & 7 deletions src/Api/PubnubApi/EventEngine/Subscribe/Invocations/SubscriptionInvocations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,34 @@ internal class EmitMessagesInvocation : Core.IEffectInvocation {
}

internal class EmitStatusInvocation : Core.IEffectInvocation {

public IEnumerable<string> Channels;
public IEnumerable<string> ChannelGroups;
}

internal class HandshakeInvocation : Core.IEffectInvocation {
public IEnumerable<string> channels;
public IEnumerable<string> channelGroups;
public Dictionary<string, string> initialSubscribeQueryParams = new Dictionary<string, string>();
public Dictionary<string, object> externalQueryParams = new Dictionary<string, object>();
public IEnumerable<string> Channels;
public IEnumerable<string> ChannelGroups;
public Dictionary<string, string> InitialSubscribeQueryParams = new Dictionary<string, string>();
public Dictionary<string, object> ExternalQueryParams = new Dictionary<string, object>();
}

internal class ReceiveMessagesInvocation : Core.IEffectInvocation { }
internal class ReceiveMessagesInvocation : Core.IEffectInvocation
{
public IEnumerable<string> Channels;
public IEnumerable<string> ChannelGroups;
}

internal class CancelReceiveMessagesInvocation : ReceiveMessagesInvocation, Core.IEffectCancelInvocation { }

internal class HandshakeCancelInvocation : HandshakeInvocation, Core.IEffectCancelInvocation { }

//internal class ReconnectInvocation : Core.IEffectInvocation { }
internal class HandshakeReconnectInvocation: Core.IEffectInvocation { }
internal class HandshakeReconnectInvocation: Core.IEffectInvocation
{
public IEnumerable<string> Channels;
public IEnumerable<string> ChannelGroups;
}

internal class CancelHandshakeReconnectInvocation: HandshakeReconnectInvocation, Core.IEffectCancelInvocation { }

internal class ReceiveReconnectInvocation: Core.IEffectInvocation { }
Expand Down
44 changes: 43 additions & 1 deletion src/Api/PubnubApi/EventEngine/Subscribe/States/HandshakeFailedState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,49 @@ internal class HandshakeFailedState : Core.IState {
public IEnumerable<IEffectInvocation> OnEntry { get; }
public IEnumerable<IEffectInvocation> OnExit { get; }
public Tuple<Core.IState, IEnumerable<IEffectInvocation>> Transition(IEvent e) {
throw new NotImplementedException();
switch (e) {
case Events.SubscriptionChangedEvent subscriptionChanged:
return new Tuple<Core.IState, IEnumerable<IEffectInvocation>>(
new HandshakingState() {
Channels = subscriptionChanged.Channels,
ChannelGroups = subscriptionChanged.ChannelGroups,
},
new[] {
new HandshakeInvocation() {
Channels = subscriptionChanged.Channels,
ChannelGroups = subscriptionChanged.ChannelGroups,
},
}
);
case Events.ReconnectEvent reconnect:
return new Tuple<Core.IState, IEnumerable<IEffectInvocation>>(
new HandshakingState() {
Channels = reconnect.Channels,
ChannelGroups = reconnect.ChannelGroups,
},
new[] {
new HandshakeInvocation() {
Channels = reconnect.Channels,
ChannelGroups = reconnect.ChannelGroups,
},
}
);
case Events.SubscriptionRestoredEvent subscriptionRestored:
return new Tuple<IState, IEnumerable<IEffectInvocation>>(
new ReceivingState() {
Channels = subscriptionRestored.Channels,
ChannelGroups = subscriptionRestored.ChannelGroups
},
new[] {
new ReceiveMessagesInvocation() {
Channels = subscriptionRestored.Channels,
ChannelGroups = subscriptionRestored.ChannelGroups,
},
}
);

default: return null;
}
}
}
}
42 changes: 33 additions & 9 deletions src/Api/PubnubApi/EventEngine/Subscribe/States/HandshakeReconnectingState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,51 @@ internal class HandshakeReconnectingState : Core.IState {
case Events.SubscriptionChangedEvent subscriptionChanged:
return new Tuple<Core.IState, IEnumerable<IEffectInvocation>>(
new HandshakingState() {
channels = subscriptionChanged.channels,
channelGroups = subscriptionChanged.channelGroups,
Channels = subscriptionChanged.Channels,
ChannelGroups = subscriptionChanged.ChannelGroups,
},
new[] {
new HandshakeInvocation() {
channels = subscriptionChanged.channels,
channelGroups = subscriptionChanged.channelGroups,
Channels = subscriptionChanged.Channels,
ChannelGroups = subscriptionChanged.ChannelGroups,
},
}
);
case Events.DisconnectEvent disconnectEvent:
case Events.DisconnectEvent disconnect:
return new Tuple<Core.IState, IEnumerable<IEffectInvocation>>(
new HandshakeStoppedState() {
Channels = disconnectEvent.Channels,
ChannelGroups = disconnectEvent.ChannelGroups
Channels = disconnect.Channels,
ChannelGroups = disconnect.ChannelGroups
},
null
);
case Events.HandshakeReconnectGiveUpEvent handshakeReconnectGiveUpEvent:
case Events.HandshakeReconnectGiveUpEvent handshakeReconnectGiveUp:
return new Tuple<IState, IEnumerable<IEffectInvocation>>(
new HandshakeFailedState() { },
new HandshakeFailedState() {
Channels = handshakeReconnectGiveUp.Channels,
ChannelGroups = handshakeReconnectGiveUp.ChannelGroups
},
null
);
case Events.HandshakeReconnectSuccessEvent handshakeReconnectSuccess:
return new Tuple<IState, IEnumerable<IEffectInvocation>>(
new ReceivingState() {
Channels = handshakeReconnectSuccess.Channels,
ChannelGroups = handshakeReconnectSuccess.ChannelGroups
},
new[] {
new EmitStatusInvocation() {
Channels = handshakeReconnectSuccess.Channels,
ChannelGroups = handshakeReconnectSuccess.ChannelGroups,
},
}
);
case Events.SubscriptionRestoredEvent subscriptionRestored:
return new Tuple<IState, IEnumerable<IEffectInvocation>>(
new HandshakeFailedState() {
Channels = subscriptionRestored.Channels,
ChannelGroups = subscriptionRestored.ChannelGroups
},
null
);

Expand Down
4 changes: 2 additions & 2 deletions src/Api/PubnubApi/EventEngine/Subscribe/States/HandshakingState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
namespace PubnubApi.PubnubEventEngine.Subscribe.States {
internal class HandshakingState : Core.IState {

public IEnumerable<string> channels;
public IEnumerable<string> channelGroups;
public IEnumerable<string> Channels;
public IEnumerable<string> ChannelGroups;

public IEnumerable<IEffectInvocation> OnEntry { get; }
public IEnumerable<IEffectInvocation> OnExit { get; }
Expand Down
8 changes: 4 additions & 4 deletions src/Api/PubnubApi/EventEngine/Subscribe/States/UnsubscribedState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ internal class UnsubscribedState : Core.IState {
case Events.SubscriptionChangedEvent subscriptionChanged:
return new Tuple<Core.IState, IEnumerable<IEffectInvocation>>(
new HandshakingState() {
channels = subscriptionChanged.channels,
channelGroups = subscriptionChanged.channelGroups,
Channels = subscriptionChanged.Channels,
ChannelGroups = subscriptionChanged.ChannelGroups,
},
new[] {
new HandshakeInvocation() {
channels = subscriptionChanged.channels,
channelGroups = subscriptionChanged.channelGroups,
Channels = subscriptionChanged.Channels,
ChannelGroups = subscriptionChanged.ChannelGroups,
},
}
);
Expand Down