Skip to content

[DRAFT] Provide Support for Socket IO Protocol V5 #909

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

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

[DRAFT] Provide Support for Socket IO Protocol V5 #909

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
8cbf883
V5: Remove the implicit connection to the default namespace
iHDeveloper Jun 16, 2023
a20b422
Hotfix: Missing namespace separator + invalid order
iHDeveloper Jun 22, 2023
78bc212
Hotfix: Ignoring packets for non-default namespace
iHDeveloper Jun 22, 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
2 changes: 1 addition & 1 deletion src/main/java/com/corundumstudio/socketio/handler/AuthorizeHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ public void connect(UUID sessionId) {
public void connect(ClientHead client) {
Namespace ns = namespacesHub.get(Namespace.DEFAULT_NAME);

if (!client.getNamespaces().contains(ns)) {
if (!EngineIOVersion.V4.equals(client.getEngineIOVersion()) && !client.getNamespaces().contains(ns)) {
Packet packet = new Packet(PacketType.MESSAGE, client.getEngineIOVersion());
packet.setSubType(PacketType.CONNECT);
if (EngineIOVersion.V4.equals(client.getEngineIOVersion())) {
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/corundumstudio/socketio/handler/InPacketHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@ protected void channelRead0(io.netty.channel.ChannelHandlerContext ctx, PacketsM
}

NamespaceClient nClient = client.getChildClient(ns);
if (!client.getNamespaces().isEmpty() && nClient == null) {
nClient = client.getChildClient(client.getNamespaces().stream().findFirst().get());
}
if (nClient == null) {
log.debug("Can't find namespace client in namespace: {}, sessionId: {} probably it was disconnected.", ns.getName(), client.getSessionId());
return;
Expand Down
10 changes: 7 additions & 3 deletions src/main/java/com/corundumstudio/socketio/handler/PacketListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import com.corundumstudio.socketio.ack.AckManager;
import com.corundumstudio.socketio.namespace.Namespace;
import com.corundumstudio.socketio.namespace.NamespacesHub;
import com.corundumstudio.socketio.protocol.ConnPacket;
import com.corundumstudio.socketio.protocol.EngineIOVersion;
import com.corundumstudio.socketio.protocol.Packet;
import com.corundumstudio.socketio.protocol.PacketType;
Expand Down Expand Up @@ -92,11 +93,14 @@ public void onPacket(Packet packet, NamespaceClient client, Transport transport)

if (packet.getSubType() == PacketType.CONNECT) {
Namespace namespace = namespacesHub.get(packet.getNsp());
namespace.onConnect(client);

// send connect handshake packet back to client
if (!EngineIOVersion.V4.equals(client.getEngineIOVersion())) {
client.getBaseClient().send(packet, transport);
if (EngineIOVersion.V4.equals(client.getEngineIOVersion())) {
packet.setData(new ConnPacket(client.getSessionId()));
}
client.getBaseClient().send(packet, transport);

namespace.onConnect(client);
}

if (packet.getSubType() == PacketType.ACK
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/corundumstudio/socketio/protocol/PacketEncoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,7 @@ public void encodePacket(Packet packet, ByteBuf buffer, ByteBufAllocator allocat
if (packet.getSubType() == PacketType.CONNECT) {
if (!packet.getNsp().isEmpty()) {
buf.writeBytes(packet.getNsp().getBytes(CharsetUtil.UTF_8));
buf.writeByte(',');
}
if (EngineIOVersion.V4.equals(packet.getEngineIOVersion())
&& packet.getData() != null) {
Expand Down