Rev api

netty-socketio-core/src/main/java/com/socketio4j/socketio/ack/AckManager.java

@@ -33,12 +33,14 @@
 import com.socketio4j.socketio.MultiTypeAckCallback;
 import com.socketio4j.socketio.MultiTypeArgs;
 import com.socketio4j.socketio.SocketIOClient;
+import com.socketio4j.socketio.annotation.Internal;
 import com.socketio4j.socketio.handler.ClientHead;
 import com.socketio4j.socketio.protocol.Packet;
 import com.socketio4j.socketio.scheduler.CancelableScheduler;
 import com.socketio4j.socketio.scheduler.SchedulerKey;
 import com.socketio4j.socketio.scheduler.SchedulerKey.Type;
 
+@Internal
 public class AckManager implements Disconnectable {
 
     static class AckEntry {

netty-socketio-core/src/main/java/com/socketio4j/socketio/ack/AckSchedulerKey.java

@@ -18,8 +18,10 @@
 
 import java.util.UUID;
 
+import com.socketio4j.socketio.annotation.Internal;
 import com.socketio4j.socketio.scheduler.SchedulerKey;
 
+@Internal
 public class AckSchedulerKey extends SchedulerKey {
 
     private final long index;

netty-socketio-core/src/main/java/com/socketio4j/socketio/handler/AuthorizeHandler.java

@@ -37,6 +37,7 @@
 import com.socketio4j.socketio.SocketIOClient;
 import com.socketio4j.socketio.Transport;
 import com.socketio4j.socketio.ack.AckManager;
+import com.socketio4j.socketio.annotation.Internal;
 import com.socketio4j.socketio.messages.HttpErrorMessage;
 import com.socketio4j.socketio.namespace.Namespace;
 import com.socketio4j.socketio.namespace.NamespacesHub;
@@ -70,6 +71,7 @@
 
 import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
 
+@Internal
 @Sharable
 public class AuthorizeHandler extends ChannelInboundHandlerAdapter implements Disconnectable {
 

netty-socketio-core/src/main/java/com/socketio4j/socketio/handler/ClientHead.java

@@ -41,6 +41,7 @@
 import com.socketio4j.socketio.HandshakeData;
 import com.socketio4j.socketio.Transport;
 import com.socketio4j.socketio.ack.AckManager;
+import com.socketio4j.socketio.annotation.Internal;
 import com.socketio4j.socketio.messages.OutPacketMessage;
 import com.socketio4j.socketio.namespace.Namespace;
 import com.socketio4j.socketio.protocol.EngineIOVersion;
@@ -60,6 +61,7 @@
 import io.netty.handler.codec.http.HttpHeaderNames;
 import io.netty.util.AttributeKey;
 
+@Internal
 public class ClientHead {
 
     private static final Logger log = LoggerFactory.getLogger(ClientHead.class);

netty-socketio-core/src/main/java/com/socketio4j/socketio/handler/ClientsBox.java

@@ -21,9 +21,11 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import com.socketio4j.socketio.HandshakeData;
+import com.socketio4j.socketio.annotation.Internal;
 
 import io.netty.channel.Channel;
 
+@Internal
 public class ClientsBox {
 
     private final Map<UUID, ClientHead> uuid2clients = new ConcurrentHashMap<>();

netty-socketio-core/src/main/java/com/socketio4j/socketio/handler/EncoderHandler.java

@@ -31,6 +31,7 @@
 
 import com.socketio4j.socketio.Configuration;
 import com.socketio4j.socketio.Transport;
+import com.socketio4j.socketio.annotation.Internal;
 import com.socketio4j.socketio.messages.HttpErrorMessage;
 import com.socketio4j.socketio.messages.HttpMessage;
 import com.socketio4j.socketio.messages.OutPacketMessage;
@@ -71,6 +72,7 @@
 
 import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
 
+@Internal
 @Sharable
 public class EncoderHandler extends ChannelOutboundHandlerAdapter {
 

netty-socketio-core/src/main/java/com/socketio4j/socketio/handler/InPacketHandler.java

@@ -23,6 +23,7 @@
 import org.slf4j.LoggerFactory;
 
 import com.socketio4j.socketio.AuthTokenResult;
+import com.socketio4j.socketio.annotation.Internal;
 import com.socketio4j.socketio.listener.ExceptionListener;
 import com.socketio4j.socketio.messages.PacketsMessage;
 import com.socketio4j.socketio.namespace.Namespace;
@@ -40,6 +41,7 @@
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.util.CharsetUtil;
 
+@Internal
 @Sharable
 public class InPacketHandler extends SimpleChannelInboundHandler<PacketsMessage> {
 

netty-socketio-core/src/main/java/com/socketio4j/socketio/handler/PacketListener.java

@@ -22,6 +22,7 @@
 import com.socketio4j.socketio.AckRequest;
 import com.socketio4j.socketio.Transport;
 import com.socketio4j.socketio.ack.AckManager;
+import com.socketio4j.socketio.annotation.Internal;
 import com.socketio4j.socketio.namespace.Namespace;
 import com.socketio4j.socketio.namespace.NamespacesHub;
 import com.socketio4j.socketio.protocol.EngineIOVersion;
@@ -34,6 +35,7 @@
 
 import io.netty.channel.ChannelFuture;
 
+@Internal
 public class PacketListener {
 
     private final NamespacesHub namespacesHub;

netty-socketio-core/src/main/java/com/socketio4j/socketio/handler/TransportState.java

@@ -20,10 +20,12 @@
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicReference;
 
+import com.socketio4j.socketio.annotation.Internal;
 import com.socketio4j.socketio.protocol.Packet;
 
 import io.netty.channel.Channel;
 
+@Internal
 public class TransportState {
 
     private Queue<Packet> packetsQueue = new ConcurrentLinkedQueue<>();

netty-socketio-core/src/main/java/com/socketio4j/socketio/handler/WrongUrlHandler.java

@@ -19,6 +19,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.socketio4j.socketio.annotation.Internal;
+
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
@@ -33,6 +35,7 @@
 
 import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
 
+@Internal
 @Sharable
 public class WrongUrlHandler extends ChannelInboundHandlerAdapter {
 

netty-socketio-core/src/main/java/com/socketio4j/socketio/messages/HttpErrorMessage.java

@@ -18,6 +18,9 @@
 
 import java.util.Map;
 
+import com.socketio4j.socketio.annotation.Internal;
+
+@Internal
 public class HttpErrorMessage extends HttpMessage {
 
     private final Map<String, Object> data;

netty-socketio-core/src/main/java/com/socketio4j/socketio/messages/HttpMessage.java

@@ -18,6 +18,9 @@
 
 import java.util.UUID;
 
+import com.socketio4j.socketio.annotation.Internal;
+
+@Internal
 public abstract class HttpMessage {
 
     private final String origin;

netty-socketio-core/src/main/java/com/socketio4j/socketio/messages/OutPacketMessage.java

@@ -17,8 +17,10 @@
 package com.socketio4j.socketio.messages;
 
 import com.socketio4j.socketio.Transport;
+import com.socketio4j.socketio.annotation.Internal;
 import com.socketio4j.socketio.handler.ClientHead;
 
+@Internal
 public class OutPacketMessage extends HttpMessage {
 
     private final ClientHead clientHead;

netty-socketio-core/src/main/java/com/socketio4j/socketio/messages/PacketsMessage.java

@@ -17,11 +17,13 @@
 package com.socketio4j.socketio.messages;
 
 import com.socketio4j.socketio.Transport;
+import com.socketio4j.socketio.annotation.Internal;
 import com.socketio4j.socketio.handler.ClientHead;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.util.ReferenceCounted;
 
+@Internal
 public class PacketsMessage implements ReferenceCounted {
 
     private final ClientHead client;

netty-socketio-core/src/main/java/com/socketio4j/socketio/messages/XHROptionsMessage.java

@@ -18,6 +18,9 @@
 
 import java.util.UUID;
 
+import com.socketio4j.socketio.annotation.Internal;
+
+@Internal
 public class XHROptionsMessage extends XHRPostMessage {
 
     public XHROptionsMessage(String origin, UUID sessionId) {

netty-socketio-core/src/main/java/com/socketio4j/socketio/messages/XHRPostMessage.java

@@ -18,6 +18,9 @@
 
 import java.util.UUID;
 
+import com.socketio4j.socketio.annotation.Internal;
+
+@Internal
 public class XHRPostMessage extends HttpMessage {
 
     public XHRPostMessage(String origin, UUID sessionId) {

netty-socketio-core/src/main/java/com/socketio4j/socketio/metrics/NamespaceMeters.java

@@ -21,6 +21,8 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
+import com.socketio4j.socketio.annotation.Internal;
+
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.Gauge;
 import io.micrometer.core.instrument.MeterRegistry;
@@ -38,6 +40,7 @@
  * @author https://github.com/sanjomo
  * @date 05/01/26 3:10 pm
  */
+@Internal
 public final class NamespaceMeters {
 
     /* ===================== Event Counters ===================== */

netty-socketio-core/src/main/java/com/socketio4j/socketio/misc/CompositeIterable.java

@@ -20,6 +20,9 @@
 import java.util.Iterator;
 import java.util.List;
 
+import com.socketio4j.socketio.annotation.Internal;
+
+@Internal
 public class CompositeIterable<T> implements Iterable<T> {
 
     private List<Iterable<T>> iterablesList;

netty-socketio-core/src/main/java/com/socketio4j/socketio/misc/CompositeIterator.java

@@ -18,6 +18,9 @@
 
 import java.util.Iterator;
 
+import com.socketio4j.socketio.annotation.Internal;
+
+@Internal
 public class CompositeIterator<T> implements Iterator<T> {
 
     private final Iterator<Iterator<T>> listIterator;

netty-socketio-core/src/main/java/com/socketio4j/socketio/misc/IterableCollection.java

@@ -19,6 +19,9 @@
 import java.util.AbstractCollection;
 import java.util.Iterator;
 
+import com.socketio4j.socketio.annotation.Internal;
+
+@Internal
 public class IterableCollection<T> extends AbstractCollection<T> {
 
     private final CompositeIterable<T> iterable;

netty-socketio-core/src/main/java/com/socketio4j/socketio/namespace/EventEntry.java

@@ -19,8 +19,10 @@
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
+import com.socketio4j.socketio.annotation.Internal;
 import com.socketio4j.socketio.listener.DataListener;
 
+@Internal
 public class EventEntry<T> {
 
     private final Queue<DataListener<T>> listeners = new ConcurrentLinkedQueue<DataListener<T>>();

netty-socketio-core/src/main/java/com/socketio4j/socketio/namespace/Namespace.java

@@ -45,6 +45,7 @@
 import com.socketio4j.socketio.SingleRoomBroadcastOperations;
 import com.socketio4j.socketio.SocketIOClient;
 import com.socketio4j.socketio.SocketIONamespace;
+import com.socketio4j.socketio.annotation.Internal;
 import com.socketio4j.socketio.annotation.ScannerEngine;
 import com.socketio4j.socketio.listener.CatchAllEventListener;
 import com.socketio4j.socketio.listener.ConnectListener;
@@ -66,13 +67,13 @@
 import com.socketio4j.socketio.store.event.LeaveMessage;
 import com.socketio4j.socketio.transport.NamespaceClient;
 
-
 /**
  * Hub object for all clients in one namespace.
  * Namespace shares by different namespace-clients.
  *
  * @see com.socketio4j.socketio.transport.NamespaceClient
  */
+@Internal
 public class Namespace implements SocketIONamespace {
 
     private static final Logger log = LoggerFactory.getLogger(Namespace.class);

netty-socketio-core/src/main/java/com/socketio4j/socketio/namespace/NamespacesHub.java

@@ -25,8 +25,10 @@
 import com.socketio4j.socketio.Configuration;
 import com.socketio4j.socketio.SocketIOClient;
 import com.socketio4j.socketio.SocketIONamespace;
+import com.socketio4j.socketio.annotation.Internal;
 import com.socketio4j.socketio.misc.CompositeIterable;
 
+@Internal
 public class NamespacesHub {
 
     private final ConcurrentMap<String, SocketIONamespace> namespaces = new ConcurrentHashMap<>();

netty-socketio-core/src/main/java/com/socketio4j/socketio/protocol/AuthPacket.java

@@ -18,7 +18,9 @@
 
 import java.util.UUID;
 
+import com.socketio4j.socketio.annotation.Internal;
 
+@Internal
 public class AuthPacket {
 
     private final UUID sid;

netty-socketio-core/src/main/java/com/socketio4j/socketio/protocol/ConnPacket.java

@@ -18,6 +18,9 @@
 
 import java.util.UUID;
 
+import com.socketio4j.socketio.annotation.Internal;
+
+@Internal
 public class ConnPacket {
 
     private final UUID sid;

netty-socketio-core/src/main/java/com/socketio4j/socketio/protocol/EngineIOVersion.java

@@ -19,12 +19,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import com.socketio4j.socketio.annotation.Internal;
-
 /**
  * Engine.IO protocol version
  */
-@Internal
 public enum EngineIOVersion {
     /**
      * @link <a href="https://github.com/socketio/engine.io-protocol/tree/v2">Engine.IO version 2</a>
@@ -38,15 +35,23 @@ public enum EngineIOVersion {
      * current version
      * @link <a href="https://github.com/socketio/engine.io-protocol/tree/main">Engine.IO version 4</a>
      */
-    V4("4");
+    V4("4"),
+
+    /**
+     * @deprecated Unknown revisions are rejected in handshake; use {@link #isSupported(String)}
+     */
+    @Deprecated
+    UNKNOWN("");
 
     public static final String EIO = "EIO";
 
     private static final Map<String, EngineIOVersion> VERSIONS = new HashMap<>();
 
     static {
         for (EngineIOVersion value : values()) {
-            VERSIONS.put(value.getValue(), value);
+            if (value != UNKNOWN) {
+                VERSIONS.put(value.getValue(), value);
+            }
         }
     }