Links2004/arduinoWebSockets
1
0
Fork 1
mirror of https://github.com/Links2004/arduinoWebSockets.git synced 2025-07-18 17:52:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

[SocketIO] allow to send any message

Browse Source
This commit is contained in:
Links
2019-07-20 13:46:59 +02:00
parent 9a803e1fb3
commit e2669c1c5e
2 changed files with 39 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/SocketIOclient.cpp
View File

@ -40,12 +40,13 @@ bool SocketIOclient::isConnected(void) {
/** /**
* send text data to client * send text data to client
* @param num uint8_t client id * @param num uint8_t client id
* @param type socketIOmessageType_t
* @param payload uint8_t * * @param payload uint8_t *
* @param length size_t * @param length size_t
* @param headerToPayload bool (see sendFrame for more details) * @param headerToPayload bool (see sendFrame for more details)
* @return true if ok * @return true if ok
*/ */
bool SocketIOclient::sendEVENT(uint8_t * payload, size_t length, bool headerToPayload) { bool SocketIOclient::send(socketIOmessageType_t type, uint8_t * payload, size_t length, bool headerToPayload) {
bool ret = false; bool ret = false;
if(length == 0) { if(length == 0) {
length = strlen((const char *)payload); length = strlen((const char *)payload);
@ -56,7 +57,7 @@ bool SocketIOclient::sendEVENT(uint8_t * payload, size_t length, bool headerToPa
ret = WebSocketsClient::sendFrameHeader(&_client, WSop_text, length + 2, true); ret = WebSocketsClient::sendFrameHeader(&_client, WSop_text, length + 2, true);
// Engine.IO / Socket.IO Header // Engine.IO / Socket.IO Header
if(ret) { if(ret) {
uint8_t buf[3] = { eIOtype_MESSAGE, sIOtype_EVENT, 0x00 }; uint8_t buf[3] = { eIOtype_MESSAGE, type, 0x00 };
ret = WebSocketsClient::write(&_client, buf, 2); ret = WebSocketsClient::write(&_client, buf, 2);
} }
if(ret && payload && length > 0) { if(ret && payload && length > 0) {
@ -66,12 +67,38 @@ bool SocketIOclient::sendEVENT(uint8_t * payload, size_t length, bool headerToPa
} else { } else {
// TODO implement // TODO implement
} }
// return WebSocketsClient::sendFrame(&_client, WSop_text, payload, length, true, true, headerToPayload);
} }
return false; return false;
} }
bool SocketIOclient::send(socketIOmessageType_t type, const uint8_t * payload, size_t length) {
return send(type, (uint8_t *)payload, length);
}
bool SocketIOclient::send(socketIOmessageType_t type, char * payload, size_t length, bool headerToPayload) {
return send(type, (uint8_t *)payload, length, headerToPayload);
}
bool SocketIOclient::send(socketIOmessageType_t type, const char * payload, size_t length) {
return send(type, (uint8_t *)payload, length);
}
bool SocketIOclient::send(socketIOmessageType_t type, String & payload) {
return send(type, (uint8_t *)payload.c_str(), payload.length());
}
/**
* send text data to client
* @param num uint8_t client id
* @param payload uint8_t *
* @param length size_t
* @param headerToPayload bool (see sendFrame for more details)
* @return true if ok
*/
bool SocketIOclient::sendEVENT(uint8_t * payload, size_t length, bool headerToPayload) {
return send(sIOtype_EVENT, payload, length, headerToPayload);
}
bool SocketIOclient::sendEVENT(const uint8_t * payload, size_t length) { bool SocketIOclient::sendEVENT(const uint8_t * payload, size_t length) {
return sendEVENT((uint8_t *)payload, length); return sendEVENT((uint8_t *)payload, length);
} }

7
src/SocketIOclient.h
View File

@ -59,6 +59,13 @@ class SocketIOclient : protected WebSocketsClient {
bool sendEVENT(const char * payload, size_t length = 0); bool sendEVENT(const char * payload, size_t length = 0);
bool sendEVENT(String & payload); 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 loop(void); void loop(void);
protected: protected: