From 98bd14562a0e4c15dc59a011f5c5e630576360d9 Mon Sep 17 00:00:00 2001 From: Luca Date: Wed, 14 Jul 2021 13:53:30 +0200 Subject: [PATCH] Fix issue #695 --- src/SocketIOclient.h | 162 ++++++++++++++++++++++++++----------------- 1 file changed, 98 insertions(+), 64 deletions(-) diff --git a/src/SocketIOclient.h b/src/SocketIOclient.h index a71afed..634a362 100644 --- a/src/SocketIOclient.h +++ b/src/SocketIOclient.h @@ -9,6 +9,7 @@ #define SOCKETIOCLIENT_H_ #include "WebSockets.h" +#include "WebSocketsClient.h" #define EIO_HEARTBEAT_INTERVAL 20000 @@ -16,89 +17,122 @@ #define SIO_MAX_HEADER_SIZE (EIO_MAX_HEADER_SIZE + 1) typedef enum { - eIOtype_OPEN = '0', ///< Sent from the server when a new transport is opened (recheck) - eIOtype_CLOSE = '1', ///< Request the close of this transport but does not shutdown the connection itself. - eIOtype_PING = '2', ///< Sent by the client. Server should answer with a pong packet containing the same data - eIOtype_PONG = '3', ///< Sent by the server to respond to ping packets. - eIOtype_MESSAGE = '4', ///< actual message, client and server should call their callbacks with the data - eIOtype_UPGRADE = '5', ///< Before engine.io switches a transport, it tests, if server and client can communicate over this transport. If this test succeed, the client sends an upgrade packets which requests the server to flush its cache on the old transport and switch to the new transport. - eIOtype_NOOP = '6', ///< A noop packet. Used primarily to force a poll cycle when an incoming websocket connection is received. + eIOtype_OPEN = + '0', ///< Sent from the server when a new transport is opened (recheck) + eIOtype_CLOSE = '1', ///< Request the close of this transport but does not + ///< shutdown the connection itself. + eIOtype_PING = '2', ///< Sent by the client. Server should answer with a pong + ///< packet containing the same data + eIOtype_PONG = '3', ///< Sent by the server to respond to ping packets. + eIOtype_MESSAGE = '4', ///< actual message, client and server should call + ///< their callbacks with the data + eIOtype_UPGRADE = + '5', ///< Before engine.io switches a transport, it tests, if server and + ///< client can communicate over this transport. If this test + ///< succeed, the client sends an upgrade packets which requests the + ///< server to flush its cache on the old transport and switch to + ///< the new transport. + eIOtype_NOOP = '6', ///< A noop packet. Used primarily to force a poll cycle + ///< when an incoming websocket connection is received. } engineIOmessageType_t; typedef enum { - sIOtype_CONNECT = '0', - sIOtype_DISCONNECT = '1', - sIOtype_EVENT = '2', - sIOtype_ACK = '3', - sIOtype_ERROR = '4', - sIOtype_BINARY_EVENT = '5', - sIOtype_BINARY_ACK = '6', + sIOtype_CONNECT = '0', + sIOtype_DISCONNECT = '1', + sIOtype_EVENT = '2', + sIOtype_ACK = '3', + sIOtype_ERROR = '4', + sIOtype_BINARY_EVENT = '5', + sIOtype_BINARY_ACK = '6', } socketIOmessageType_t; class SocketIOclient : protected WebSocketsClient { - public: + public: #ifdef __AVR__ - typedef void (*SocketIOclientEvent)(socketIOmessageType_t type, uint8_t * payload, size_t length); + typedef void (*SocketIOclientEvent)(socketIOmessageType_t type, + uint8_t* payload, size_t length); #else - typedef std::function SocketIOclientEvent; + typedef std::function + SocketIOclientEvent; #endif - SocketIOclient(void); - virtual ~SocketIOclient(void); + SocketIOclient(void); + virtual ~SocketIOclient(void); - void begin(const char * host, uint16_t port, const char * url = "/socket.io/?EIO=3", const char * protocol = "arduino"); - void begin(String host, uint16_t port, String url = "/socket.io/?EIO=3", String protocol = "arduino"); + void begin(const char* host, uint16_t port, + const char* url = "/socket.io/?EIO=3", + const char* protocol = "arduino"); + void begin(String host, uint16_t port, String url = "/socket.io/?EIO=3", + String protocol = "arduino"); #ifdef HAS_SSL - void beginSSL(const char * host, uint16_t port, const char * url = "/socket.io/?EIO=3", const char * protocol = "arduino"); - void beginSSL(String host, uint16_t port, String url = "/socket.io/?EIO=3", String protocol = "arduino"); + void beginSSL(const char* host, uint16_t port, + const char* url = "/socket.io/?EIO=3", + const char* protocol = "arduino"); + void beginSSL(String host, uint16_t port, String url = "/socket.io/?EIO=3", + String protocol = "arduino"); #ifndef SSL_AXTLS - void beginSSLWithCA(const char * host, uint16_t port, const char * url = "/socket.io/?EIO=3", const char * CA_cert = NULL, const char * protocol = "arduino"); - void beginSSLWithCA(const char * host, uint16_t port, const char * url = "/socket.io/?EIO=3", BearSSL::X509List * CA_cert = NULL, const char * protocol = "arduino"); - void setSSLClientCertKey(const char * clientCert = NULL, const char * clientPrivateKey = NULL); - void setSSLClientCertKey(BearSSL::X509List * clientCert = NULL, BearSSL::PrivateKey * clientPrivateKey = NULL); + void beginSSLWithCA(const char* host, uint16_t port, + const char* url = "/socket.io/?EIO=3", + const char* CA_cert = NULL, + const char* protocol = "arduino"); + void beginSSLWithCA(const char* host, uint16_t port, + const char* url = "/socket.io/?EIO=3", + BearSSL::X509List* CA_cert = NULL, + const char* protocol = "arduino"); + void setSSLClientCertKey(const char* clientCert = NULL, + const char* clientPrivateKey = NULL); + void setSSLClientCertKey(BearSSL::X509List* clientCert = NULL, + BearSSL::PrivateKey* clientPrivateKey = NULL); #endif #endif - bool isConnected(void); - - void onEvent(SocketIOclientEvent cbEvent); - - bool sendEVENT(uint8_t * payload, size_t length = 0, bool headerToPayload = false); - bool sendEVENT(const uint8_t * payload, size_t length = 0); - bool sendEVENT(char * payload, size_t length = 0, bool headerToPayload = false); - bool sendEVENT(const char * payload, size_t length = 0); - bool sendEVENT(String & payload); - - bool send(socketIOmessageType_t type, uint8_t * payload, size_t length = 0, bool headerToPayload = false); - bool send(socketIOmessageType_t type, const uint8_t * payload, size_t length = 0); - bool send(socketIOmessageType_t type, char * payload, size_t length = 0, bool headerToPayload = false); - bool send(socketIOmessageType_t type, const char * payload, size_t length = 0); - bool send(socketIOmessageType_t type, String & payload); - - void setExtraHeaders(const char * extraHeaders = NULL); - void setReconnectInterval(unsigned long time); - - void loop(void); - - void configureEIOping(bool disableHeartbeat = false); - - protected: - bool _disableHeartbeat = false; - uint64_t _lastHeartbeat = 0; - SocketIOclientEvent _cbEvent; - virtual void runIOCbEvent(socketIOmessageType_t type, uint8_t * payload, size_t length) { - if(_cbEvent) { - _cbEvent(type, payload, length); - } + bool isConnected(void); + + void onEvent(SocketIOclientEvent cbEvent); + + bool sendEVENT(uint8_t* payload, size_t length = 0, + bool headerToPayload = false); + bool sendEVENT(const uint8_t* payload, size_t length = 0); + bool sendEVENT(char* payload, size_t length = 0, + bool headerToPayload = false); + bool sendEVENT(const char* payload, size_t length = 0); + bool sendEVENT(String& payload); + + bool send(socketIOmessageType_t type, uint8_t* payload, size_t length = 0, + bool headerToPayload = false); + bool send(socketIOmessageType_t type, const uint8_t* payload, + size_t length = 0); + bool send(socketIOmessageType_t type, char* payload, size_t length = 0, + bool headerToPayload = false); + bool send(socketIOmessageType_t type, const char* payload, size_t length = 0); + bool send(socketIOmessageType_t type, String& payload); + + void setExtraHeaders(const char* extraHeaders = NULL); + void setReconnectInterval(unsigned long time); + + void loop(void); + + void configureEIOping(bool disableHeartbeat = false); + + protected: + bool _disableHeartbeat = false; + uint64_t _lastHeartbeat = 0; + SocketIOclientEvent _cbEvent; + virtual void runIOCbEvent(socketIOmessageType_t type, uint8_t* payload, + size_t length) { + if (_cbEvent) { + _cbEvent(type, payload, length); } + } - void initClient(void); + void initClient(void); - // Handeling events from websocket layer - virtual void runCbEvent(WStype_t type, uint8_t * payload, size_t length) { - handleCbEvent(type, payload, length); - } - void handleCbEvent(WStype_t type, uint8_t * payload, size_t length); + // Handeling events from websocket layer + virtual void runCbEvent(WStype_t type, uint8_t* payload, size_t length) { + handleCbEvent(type, payload, length); + } + void handleCbEvent(WStype_t type, uint8_t* payload, size_t length); }; #endif /* SOCKETIOCLIENT_H_ */