mirror of
https://github.com/me-no-dev/ESPAsyncWebServer.git
synced 2025-08-12 09:04:33 +02:00
Made sure all flavors of AsyncWebSocket binary(), text(), binaryAll() and textAll() are implemented
This commit is contained in:
@@ -954,21 +954,19 @@ void AsyncWebSocket::text(uint32_t id, const __FlashStringHelper *data)
|
|||||||
free(message);
|
free(message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
void AsyncWebSocket::text(uint32_t id, AsyncWebSocketMessageBuffer *buffer)
|
||||||
void AsyncWebSocket::textAll(AsyncWebSocketMessageBuffer * buffer)
|
|
||||||
{
|
{
|
||||||
if (buffer) {
|
if (buffer) {
|
||||||
textAll(std::move(buffer->_buffer));
|
text(id, std::move(buffer->_buffer));
|
||||||
delete buffer;
|
delete buffer;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
void AsyncWebSocket::text(uint32_t id, std::shared_ptr<std::vector<uint8_t>> buffer)
|
||||||
void AsyncWebSocket::textAll(std::shared_ptr<std::vector<uint8_t>> buffer)
|
|
||||||
{
|
{
|
||||||
for (auto &c : _clients)
|
if (AsyncWebSocketClient *c = client(id))
|
||||||
if (c.status() == WS_CONNECTED)
|
c->text(buffer);
|
||||||
c.text(buffer);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void AsyncWebSocket::textAll(const uint8_t *message, size_t len)
|
void AsyncWebSocket::textAll(const uint8_t *message, size_t len)
|
||||||
{
|
{
|
||||||
textAll(makeSharedBuffer(message, len));
|
textAll(makeSharedBuffer(message, len));
|
||||||
@@ -1005,6 +1003,20 @@ void AsyncWebSocket::textAll(const __FlashStringHelper *data)
|
|||||||
free(message);
|
free(message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
void AsyncWebSocket::textAll(AsyncWebSocketMessageBuffer * buffer)
|
||||||
|
{
|
||||||
|
if (buffer) {
|
||||||
|
textAll(std::move(buffer->_buffer));
|
||||||
|
delete buffer;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void AsyncWebSocket::textAll(std::shared_ptr<std::vector<uint8_t>> buffer)
|
||||||
|
{
|
||||||
|
for (auto &c : _clients)
|
||||||
|
if (c.status() == WS_CONNECTED)
|
||||||
|
c.text(buffer);
|
||||||
|
}
|
||||||
|
|
||||||
void AsyncWebSocket::binary(uint32_t id, const uint8_t *message, size_t len)
|
void AsyncWebSocket::binary(uint32_t id, const uint8_t *message, size_t len)
|
||||||
{
|
{
|
||||||
@@ -1034,27 +1046,24 @@ void AsyncWebSocket::binary(uint32_t id, const __FlashStringHelper *data, size_t
|
|||||||
free(message);
|
free(message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
void AsyncWebSocket::binary(uint32_t id, AsyncWebSocketMessageBuffer *buffer)
|
||||||
void AsyncWebSocket::binaryAll(AsyncWebSocketMessageBuffer * buffer)
|
|
||||||
{
|
{
|
||||||
if (buffer) {
|
if (buffer) {
|
||||||
binaryAll(std::move(buffer->_buffer));
|
binary(id, std::move(buffer->_buffer));
|
||||||
delete buffer;
|
delete buffer;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
void AsyncWebSocket::binary(uint32_t id, std::shared_ptr<std::vector<uint8_t>> buffer)
|
||||||
void AsyncWebSocket::binaryAll(std::shared_ptr<std::vector<uint8_t>> buffer)
|
|
||||||
{
|
{
|
||||||
for (auto &c : _clients)
|
if (AsyncWebSocketClient *c = client(id))
|
||||||
if (c.status() == WS_CONNECTED)
|
c->binary(buffer);
|
||||||
c.binary(buffer);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void AsyncWebSocket::binaryAll(const uint8_t *message, size_t len)
|
void AsyncWebSocket::binaryAll(const uint8_t *message, size_t len)
|
||||||
{
|
{
|
||||||
binaryAll(makeSharedBuffer(message, len));
|
binaryAll(makeSharedBuffer(message, len));
|
||||||
}
|
}
|
||||||
|
|
||||||
void AsyncWebSocket::binaryAll(const char *message, size_t len)
|
void AsyncWebSocket::binaryAll(const char *message, size_t len)
|
||||||
{
|
{
|
||||||
binaryAll((const uint8_t *)message, len);
|
binaryAll((const uint8_t *)message, len);
|
||||||
@@ -1078,6 +1087,19 @@ void AsyncWebSocket::binaryAll(const __FlashStringHelper *data, size_t len)
|
|||||||
free(message);
|
free(message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
void AsyncWebSocket::binaryAll(AsyncWebSocketMessageBuffer * buffer)
|
||||||
|
{
|
||||||
|
if (buffer) {
|
||||||
|
binaryAll(std::move(buffer->_buffer));
|
||||||
|
delete buffer;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
void AsyncWebSocket::binaryAll(std::shared_ptr<std::vector<uint8_t>> buffer)
|
||||||
|
{
|
||||||
|
for (auto &c : _clients)
|
||||||
|
if (c.status() == WS_CONNECTED)
|
||||||
|
c.binary(buffer);
|
||||||
|
}
|
||||||
|
|
||||||
size_t AsyncWebSocket::printf(uint32_t id, const char *format, ...){
|
size_t AsyncWebSocket::printf(uint32_t id, const char *format, ...){
|
||||||
AsyncWebSocketClient * c = client(id);
|
AsyncWebSocketClient * c = client(id);
|
||||||
|
@@ -257,28 +257,32 @@ class AsyncWebSocket: public AsyncWebHandler {
|
|||||||
void text(uint32_t id, const char *message);
|
void text(uint32_t id, const char *message);
|
||||||
void text(uint32_t id, const String &message);
|
void text(uint32_t id, const String &message);
|
||||||
void text(uint32_t id, const __FlashStringHelper *message);
|
void text(uint32_t id, const __FlashStringHelper *message);
|
||||||
|
void text(uint32_t id, AsyncWebSocketMessageBuffer *buffer);
|
||||||
|
void text(uint32_t id, std::shared_ptr<std::vector<uint8_t>> buffer);
|
||||||
|
|
||||||
void textAll(std::shared_ptr<std::vector<uint8_t>> buffer);
|
|
||||||
void textAll(const uint8_t *message, size_t len);
|
void textAll(const uint8_t *message, size_t len);
|
||||||
void textAll(const char * message, size_t len);
|
void textAll(const char * message, size_t len);
|
||||||
void textAll(const char * message);
|
void textAll(const char * message);
|
||||||
void textAll(const String &message);
|
void textAll(const String &message);
|
||||||
void textAll(const __FlashStringHelper *message); // need to convert
|
void textAll(const __FlashStringHelper *message);
|
||||||
void textAll(AsyncWebSocketMessageBuffer *buffer);
|
void textAll(AsyncWebSocketMessageBuffer *buffer);
|
||||||
|
void textAll(std::shared_ptr<std::vector<uint8_t>> buffer);
|
||||||
|
|
||||||
void binary(uint32_t id, const uint8_t *message, size_t len);
|
void binary(uint32_t id, const uint8_t *message, size_t len);
|
||||||
void binary(uint32_t id, const char *message, size_t len);
|
void binary(uint32_t id, const char *message, size_t len);
|
||||||
void binary(uint32_t id, const char *message);
|
void binary(uint32_t id, const char *message);
|
||||||
void binary(uint32_t id, const String &message);
|
void binary(uint32_t id, const String &message);
|
||||||
void binary(uint32_t id, const __FlashStringHelper *message, size_t len);
|
void binary(uint32_t id, const __FlashStringHelper *message, size_t len);
|
||||||
|
void binary(uint32_t id, AsyncWebSocketMessageBuffer *buffer);
|
||||||
|
void binary(uint32_t id, std::shared_ptr<std::vector<uint8_t>> buffer);
|
||||||
|
|
||||||
void binaryAll(std::shared_ptr<std::vector<uint8_t>> buffer);
|
|
||||||
void binaryAll(const uint8_t *message, size_t len);
|
void binaryAll(const uint8_t *message, size_t len);
|
||||||
void binaryAll(const char *message, size_t len);
|
void binaryAll(const char *message, size_t len);
|
||||||
void binaryAll(const char *message);
|
void binaryAll(const char *message);
|
||||||
void binaryAll(const String &message);
|
void binaryAll(const String &message);
|
||||||
void binaryAll(const __FlashStringHelper *message, size_t len);
|
void binaryAll(const __FlashStringHelper *message, size_t len);
|
||||||
void binaryAll(AsyncWebSocketMessageBuffer *buffer);
|
void binaryAll(AsyncWebSocketMessageBuffer *buffer);
|
||||||
|
void binaryAll(std::shared_ptr<std::vector<uint8_t>> buffer);
|
||||||
|
|
||||||
size_t printf(uint32_t id, const char *format, ...) __attribute__ ((format (printf, 3, 4)));
|
size_t printf(uint32_t id, const char *format, ...) __attribute__ ((format (printf, 3, 4)));
|
||||||
size_t printfAll(const char *format, ...) __attribute__ ((format (printf, 2, 3)));
|
size_t printfAll(const char *format, ...) __attribute__ ((format (printf, 2, 3)));
|
||||||
|
Reference in New Issue
Block a user