2021-12-16 00:19:08 +01:00
|
|
|
#include "WebSocket.h"
|
|
|
|
|
|
2021-12-20 20:46:16 +01:00
|
|
|
#include "ArduinoJson.h"
|
2021-12-16 01:56:14 +01:00
|
|
|
#include "Class/NotAsync.h"
|
2021-12-21 19:01:43 +01:00
|
|
|
#include "Class/TCircularBuffer.h"
|
2021-12-16 00:19:08 +01:00
|
|
|
#include "Global.h"
|
|
|
|
|
|
2021-12-16 01:56:14 +01:00
|
|
|
void wsInit() {
|
2021-12-21 19:01:43 +01:00
|
|
|
myWsBuffer = new TCircularBuffer<char*, 20480>;
|
2021-12-20 20:46:16 +01:00
|
|
|
// myNotAsyncActions->add(
|
|
|
|
|
// do_webSocketSendSetup, [&](void*) {
|
|
|
|
|
// delay(100);
|
|
|
|
|
// wsSendSetup();
|
|
|
|
|
// },
|
|
|
|
|
// nullptr);
|
2021-12-16 01:56:14 +01:00
|
|
|
}
|
|
|
|
|
|
2021-12-20 20:46:16 +01:00
|
|
|
void wsPublishData(String topic, String data) {
|
|
|
|
|
if (ws.enabled()) {
|
|
|
|
|
// if (ws.availableForWriteAll()) {
|
|
|
|
|
data = "[" + topic + "]" + data;
|
|
|
|
|
ws.textAll(data);
|
|
|
|
|
//}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2021-12-21 00:30:05 +01:00
|
|
|
//отправка setup массива в sockets способом через буфер string, рабочий способ но буфер стринг - плохой метод
|
2021-12-21 19:01:43 +01:00
|
|
|
// void wsSendSetup3() {
|
|
|
|
|
// File file = seekFile("/setup.json");
|
|
|
|
|
// DynamicJsonDocument doc(2048);
|
|
|
|
|
// int i = 0;
|
|
|
|
|
// file.find("[");
|
|
|
|
|
// SerialPrint("I", F("WS"), F("start send config"));
|
|
|
|
|
// do {
|
|
|
|
|
// i++;
|
|
|
|
|
// deserializeJson(doc, file);
|
|
|
|
|
// wsBuf += doc.as<String>() + "\n";
|
|
|
|
|
// } while (file.findUntil(",", "]"));
|
|
|
|
|
// SerialPrint("I", F("WS"), F("completed send config"));
|
|
|
|
|
//}
|
2021-12-20 20:46:16 +01:00
|
|
|
|
2021-12-21 19:01:43 +01:00
|
|
|
// void loopWsExecute3() {
|
|
|
|
|
// static int attampts = wsAttempts;
|
|
|
|
|
// if (wsBuf.length()) {
|
|
|
|
|
// if (attampts > 0) {
|
|
|
|
|
// if (ws.availableForWriteAll()) {
|
|
|
|
|
// String tmp = selectToMarker(wsBuf, "\n");
|
|
|
|
|
// wsPublishData("config", tmp);
|
|
|
|
|
// wsBuf = deleteBeforeDelimiter(wsBuf, "\n");
|
|
|
|
|
// attampts = wsAttempts;
|
|
|
|
|
// } else {
|
|
|
|
|
// attampts--;
|
|
|
|
|
// SerialPrint("I", F("WS"), String(attampts));
|
|
|
|
|
// }
|
|
|
|
|
// } else {
|
|
|
|
|
// SerialPrint("I", F("WS"), F("socket fatal error"));
|
|
|
|
|
// attampts = wsAttempts;
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// }
|
2021-12-20 02:19:54 +01:00
|
|
|
|
2021-12-21 19:01:43 +01:00
|
|
|
//отправка setup массива в sockets способом через кольцевой буфер char
|
|
|
|
|
// void wsSendSetup() {
|
|
|
|
|
// File file = seekFile("/setup.json");
|
|
|
|
|
// DynamicJsonDocument doc(2048);
|
|
|
|
|
// int i = 0;
|
|
|
|
|
// file.find("[");
|
|
|
|
|
// SerialPrint("I", F("WS"), F("start send config"));
|
|
|
|
|
// do {
|
|
|
|
|
// i++;
|
|
|
|
|
// deserializeJson(doc, file);
|
|
|
|
|
// char* element;
|
|
|
|
|
// char* element = new char[1024];
|
|
|
|
|
// serializeJson(doc, (char*)element, 1024);
|
|
|
|
|
// Serial.println(element);
|
|
|
|
|
//
|
|
|
|
|
// } while (file.findUntil(",", "]"));
|
|
|
|
|
// SerialPrint("I", F("WS"), F("completed send config"));
|
|
|
|
|
//
|
|
|
|
|
// char* itemsend = "element";
|
|
|
|
|
// myWsBuffer->push(itemsend);
|
|
|
|
|
//
|
|
|
|
|
// char* item;
|
|
|
|
|
// while (myWsBuffer->pop(item)) {
|
|
|
|
|
// Serial.println(item);
|
|
|
|
|
// }
|
|
|
|
|
//}
|
2021-12-21 00:30:05 +01:00
|
|
|
|
2021-12-21 19:01:43 +01:00
|
|
|
// void loopWsExecute() {
|
|
|
|
|
// char* item;
|
|
|
|
|
// if (myWsBuffer->pop(item)) {
|
|
|
|
|
// Serial.println(item);
|
|
|
|
|
// }
|
|
|
|
|
// }
|
2021-12-21 00:30:05 +01:00
|
|
|
|
2021-12-20 20:46:16 +01:00
|
|
|
//отправка setup массива в sockets способом прямой загрузки в ws buffer
|
2021-12-21 19:01:43 +01:00
|
|
|
// void wsSendSetupBuffer() {
|
|
|
|
|
// File file = seekFile("/setup.json");
|
|
|
|
|
// DynamicJsonDocument doc(2048);
|
|
|
|
|
// int i = 0;
|
|
|
|
|
// file.find("[");
|
|
|
|
|
// SerialPrint("I", F("WS"), F("start send config"));
|
|
|
|
|
// do {
|
|
|
|
|
// i++;
|
|
|
|
|
// deserializeJson(doc, file);
|
|
|
|
|
// size_t len = measureJson(doc);
|
|
|
|
|
// AsyncWebSocketMessageBuffer* buffer = ws.makeBuffer(len);
|
|
|
|
|
// if (buffer) {
|
|
|
|
|
// serializeJson(doc, (char*)buffer->get(), len);
|
|
|
|
|
// if (ws.enabled()) {
|
|
|
|
|
// if (ws.availableForWriteAll()) {
|
|
|
|
|
// ws.textAll(buffer);
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// // Serial.println(doc.as<String>());
|
|
|
|
|
// } while (file.findUntil(",", "]"));
|
|
|
|
|
// SerialPrint("I", F("WS"), F("completed send config"));
|
|
|
|
|
//}
|
2021-12-16 00:19:08 +01:00
|
|
|
|
2021-12-20 20:46:16 +01:00
|
|
|
//Пример прямого доступа к web socket buffer переделанный для arduino json 6
|
2021-12-21 19:01:43 +01:00
|
|
|
// void sendDataWs() {
|
|
|
|
|
// DynamicJsonDocument doc(1024);
|
|
|
|
|
// doc["a"] = "abc";
|
|
|
|
|
// doc["b"] = "abcd";
|
|
|
|
|
// doc["c"] = "abcde";
|
|
|
|
|
// doc["d"] = "abcdef";
|
|
|
|
|
// doc["e"] = "abcdefg";
|
|
|
|
|
// size_t len = measureJson(doc);
|
|
|
|
|
// AsyncWebSocketMessageBuffer* buffer = ws.makeBuffer(len);
|
|
|
|
|
// if (buffer) {
|
|
|
|
|
// serializeJson(doc, (char*)buffer->get(), len);
|
|
|
|
|
// ws.textAll(buffer);
|
|
|
|
|
// }
|
|
|
|
|
//}
|