2022-02-02 21:17:50 +01:00
|
|
|
|
#include "WsServer.h"
|
2022-04-28 00:13:26 +03:00
|
|
|
|
#include "classes/IoTScenario.h"
|
|
|
|
|
|
extern IoTScenario iotScen;
|
|
|
|
|
|
|
2022-02-02 21:17:50 +01:00
|
|
|
|
#ifdef STANDARD_WEB_SOCKETS
|
|
|
|
|
|
void standWebSocketsInit() {
|
2023-09-24 20:58:51 +03:00
|
|
|
|
standWebSocket.begin();
|
|
|
|
|
|
standWebSocket.onEvent(webSocketEvent);
|
|
|
|
|
|
SerialPrint("i", "WS", "WS server initialized");
|
2022-02-02 21:17:50 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
2023-09-24 20:58:51 +03:00
|
|
|
|
void webSocketEvent(uint8_t num, WStype_t type, uint8_t* payload,
|
|
|
|
|
|
size_t length) {
|
|
|
|
|
|
switch (type) {
|
|
|
|
|
|
case WStype_ERROR: {
|
|
|
|
|
|
Serial.printf("[%u] Error!\n", num);
|
|
|
|
|
|
} break;
|
|
|
|
|
|
|
|
|
|
|
|
case WStype_DISCONNECTED: {
|
|
|
|
|
|
Serial.printf("[%u] Disconnected!\n", num);
|
|
|
|
|
|
} break;
|
|
|
|
|
|
|
|
|
|
|
|
case WStype_CONNECTED: {
|
|
|
|
|
|
// IPAddress ip = standWebSocket.remoteIP(num);
|
|
|
|
|
|
SerialPrint("i", "WS " + String(num), "WS client connected");
|
|
|
|
|
|
if (num >= 3) {
|
|
|
|
|
|
SerialPrint("E", "WS", "Too many clients, connection closed!!!");
|
|
|
|
|
|
jsonWriteInt(errorsHeapJson, "wse1", 1);
|
|
|
|
|
|
standWebSocket.close();
|
|
|
|
|
|
standWebSocketsInit();
|
|
|
|
|
|
}
|
|
|
|
|
|
// Serial.printf("[%u] Connected from %d.%d.%d.%d url: %s\n", num, ip[0],
|
|
|
|
|
|
// ip[1], ip[2], ip[3], payload); standWebSocket.sendTXT(num,
|
|
|
|
|
|
// "Connected");
|
|
|
|
|
|
} break;
|
|
|
|
|
|
|
|
|
|
|
|
case WStype_TEXT: {
|
|
|
|
|
|
bool endOfHeaderFound = false;
|
|
|
|
|
|
size_t maxAllowedHeaderSize =
|
|
|
|
|
|
15; // максимальное количество символов заголовка
|
|
|
|
|
|
size_t headerLenth = 0;
|
|
|
|
|
|
String headerStr;
|
|
|
|
|
|
for (size_t i = 0; i <= maxAllowedHeaderSize; i++) {
|
|
|
|
|
|
headerLenth++;
|
|
|
|
|
|
char s = (char)payload[i];
|
|
|
|
|
|
headerStr += s;
|
|
|
|
|
|
if (s == '|') {
|
|
|
|
|
|
endOfHeaderFound = true;
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
if (!endOfHeaderFound) {
|
|
|
|
|
|
SerialPrint("E", "WS " + String(num), "Package without header");
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//----------------------------------------------------------------------//
|
|
|
|
|
|
// Страница веб интерфейса dashboard
|
|
|
|
|
|
//----------------------------------------------------------------------//
|
|
|
|
|
|
|
|
|
|
|
|
// публикация всех виджетов
|
|
|
|
|
|
if (headerStr == "/|") {
|
|
|
|
|
|
sendFileToWsByFrames("/layout.json", "layout", "", num,
|
|
|
|
|
|
WEB_SOCKETS_FRAME_SIZE);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (headerStr == "/params|") {
|
|
|
|
|
|
// публикация всех статус сообщений при подключении svelte приложения
|
|
|
|
|
|
String params = "{}";
|
|
|
|
|
|
for (std::list<IoTItem*>::iterator it = IoTItems.begin();
|
|
|
|
|
|
it != IoTItems.end(); ++it) {
|
|
|
|
|
|
if ((*it)->getSubtype() != "Loging") {
|
|
|
|
|
|
if ((*it)->getSubtype() != "LogingDaily") {
|
|
|
|
|
|
if ((*it)->iAmLocal)
|
|
|
|
|
|
jsonWriteStr(params, (*it)->getID(), (*it)->getValue());
|
2022-10-13 20:55:01 +02:00
|
|
|
|
}
|
2023-09-24 20:58:51 +03:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
sendStringToWs("params", params, num);
|
2022-10-07 18:30:51 +02:00
|
|
|
|
|
2023-09-24 20:58:51 +03:00
|
|
|
|
// генерация события подключения в модулях
|
|
|
|
|
|
for (std::list<IoTItem*>::iterator it = IoTItems.begin();
|
|
|
|
|
|
it != IoTItems.end(); ++it) {
|
|
|
|
|
|
if ((*it)->iAmLocal) (*it)->onMqttWsAppConnectEvent();
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// отвечаем на запрос графиков
|
|
|
|
|
|
if (headerStr == "/charts|") {
|
|
|
|
|
|
// обращение к логированию из ядра
|
|
|
|
|
|
// отправка данных графиков только в выбранный сокет
|
|
|
|
|
|
for (std::list<IoTItem*>::iterator it = IoTItems.begin();
|
|
|
|
|
|
it != IoTItems.end(); ++it) {
|
|
|
|
|
|
// сбрасываем даты графиков
|
|
|
|
|
|
// if ((*it)->getID().endsWith("-date")) {
|
|
|
|
|
|
// (*it)->setTodayDate();
|
|
|
|
|
|
// }
|
|
|
|
|
|
if ((*it)->getSubtype() == "Loging" || "LogingDaily") {
|
|
|
|
|
|
(*it)->setPublishDestination(TO_WS, num);
|
|
|
|
|
|
(*it)->publishValue();
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//----------------------------------------------------------------------//
|
|
|
|
|
|
// Страница веб интерфейса configutation
|
|
|
|
|
|
//----------------------------------------------------------------------//
|
|
|
|
|
|
|
|
|
|
|
|
// отвечаем данными на запрос страницы
|
|
|
|
|
|
if (headerStr == "/config|") {
|
|
|
|
|
|
sendFileToWsByFrames("/items.json", "itemsj", "", num,
|
|
|
|
|
|
WEB_SOCKETS_FRAME_SIZE);
|
|
|
|
|
|
sendFileToWsByFrames("/widgets.json", "widget", "", num,
|
|
|
|
|
|
WEB_SOCKETS_FRAME_SIZE);
|
|
|
|
|
|
sendFileToWsByFrames("/config.json", "config", "", num,
|
|
|
|
|
|
WEB_SOCKETS_FRAME_SIZE);
|
|
|
|
|
|
sendFileToWsByFrames("/scenario.txt", "scenar", "", num,
|
|
|
|
|
|
WEB_SOCKETS_FRAME_SIZE);
|
|
|
|
|
|
sendStringToWs("settin", settingsFlashJson, num);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// обработка кнопки сохранить
|
|
|
|
|
|
if (headerStr == "/gifnoc|") {
|
|
|
|
|
|
writeFileUint8tByFrames("config.json", payload, length, headerLenth,
|
|
|
|
|
|
256);
|
|
|
|
|
|
}
|
|
|
|
|
|
if (headerStr == "/tuoyal|") {
|
|
|
|
|
|
writeFileUint8tByFrames("layout.json", payload, length, headerLenth,
|
|
|
|
|
|
256);
|
|
|
|
|
|
}
|
|
|
|
|
|
if (headerStr == "/oiranecs|") {
|
|
|
|
|
|
writeFileUint8tByFrames("scenario.txt", payload, length, headerLenth,
|
|
|
|
|
|
256);
|
|
|
|
|
|
clearConfigure();
|
|
|
|
|
|
configure("/config.json");
|
|
|
|
|
|
iotScen.loadScenario("/scenario.txt");
|
|
|
|
|
|
// создаем событие завершения конфигурирования для возможности
|
|
|
|
|
|
// выполнения блока кода при загрузке
|
|
|
|
|
|
createItemFromNet("onStart", "1", 1);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//----------------------------------------------------------------------//
|
|
|
|
|
|
// Страница веб интерфейса connection
|
|
|
|
|
|
//----------------------------------------------------------------------//
|
|
|
|
|
|
|
|
|
|
|
|
// отвечаем данными на запрос страницы
|
|
|
|
|
|
if (headerStr == "/connection|") {
|
|
|
|
|
|
sendStringToWs("settin", settingsFlashJson, num);
|
|
|
|
|
|
sendStringToWs("ssidli", ssidListHeapJson, num);
|
|
|
|
|
|
sendStringToWs("errors", errorsHeapJson, num);
|
|
|
|
|
|
// запуск асинхронного сканирования wifi сетей при переходе на страницу
|
|
|
|
|
|
// соединений RouterFind(jsonReadStr(settingsFlashJson,
|
|
|
|
|
|
// F("routerssid")));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// обработка кнопки сохранить settings.json
|
|
|
|
|
|
if (headerStr == "/sgnittes|") {
|
|
|
|
|
|
writeUint8tToString(payload, length, headerLenth, settingsFlashJson);
|
|
|
|
|
|
writeFileUint8tByFrames("settings.json", payload, length, headerLenth,
|
|
|
|
|
|
256);
|
|
|
|
|
|
sendStringToWs("errors", errorsHeapJson, num);
|
|
|
|
|
|
// если не было создано приема данных по udp - то создадим его
|
|
|
|
|
|
addThisDeviceToList();
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// обработка кнопки сохранить настройки mqtt
|
|
|
|
|
|
if (headerStr == "/mqtt|") {
|
|
|
|
|
|
sendStringToWs("settin", settingsFlashJson,
|
|
|
|
|
|
num); // отправляем в ответ новые полученные настройки
|
|
|
|
|
|
handleMqttStatus(false, 8); // меняем статус на неопределенный
|
|
|
|
|
|
mqttReconnect(); // начинаем переподключение
|
|
|
|
|
|
sendStringToWs("errors", errorsHeapJson,
|
|
|
|
|
|
num); // отправляем что статус неопределен
|
|
|
|
|
|
sendStringToWs("ssidli", ssidListHeapJson, num);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// запуск асинхронного сканирования wifi сетей при нажатии выпадающего
|
|
|
|
|
|
// списка
|
|
|
|
|
|
if (headerStr == "/scan|") {
|
2023-10-01 19:55:09 +03:00
|
|
|
|
std::vector<String> jArray;
|
2023-09-24 20:58:51 +03:00
|
|
|
|
jsonReadArray(settingsFlashJson, "routerssid", jArray);
|
|
|
|
|
|
RouterFind(jArray);
|
|
|
|
|
|
sendStringToWs("ssidli", ssidListHeapJson, num);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//----------------------------------------------------------------------//
|
|
|
|
|
|
// Страница веб интерфейса list
|
|
|
|
|
|
//----------------------------------------------------------------------//
|
|
|
|
|
|
|
|
|
|
|
|
// отвечаем данными на запрос страницы list
|
|
|
|
|
|
if (headerStr == "/list|") {
|
|
|
|
|
|
sendStringToWs("settin", settingsFlashJson, num);
|
|
|
|
|
|
// отправим список устройств в зависимости от того что выбрал user
|
|
|
|
|
|
// sendDeviceList(num);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// отвечаем на запрос списка устройств (это отдельный запрос который
|
|
|
|
|
|
// делает приложение при подключении)
|
|
|
|
|
|
if (headerStr == "/devlist|") {
|
|
|
|
|
|
// отправим список устройств в зависимости от того что выбрал user
|
|
|
|
|
|
sendDeviceList(num);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// сохраняем данные листа
|
|
|
|
|
|
if (headerStr == "/tsil|") {
|
|
|
|
|
|
writeFileUint8tByFrames("devlist.json", payload, length, headerLenth,
|
|
|
|
|
|
256);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//----------------------------------------------------------------------//
|
|
|
|
|
|
// Страница веб интерфейса system
|
|
|
|
|
|
//----------------------------------------------------------------------//
|
|
|
|
|
|
|
|
|
|
|
|
// отвечаем данными на запрос страницы
|
|
|
|
|
|
if (headerStr == "/system|") {
|
|
|
|
|
|
sendStringToWs("errors", errorsHeapJson, num);
|
|
|
|
|
|
sendStringToWs("settin", settingsFlashJson, num);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//----------------------------------------------------------------------//
|
|
|
|
|
|
// Страница веб интерфейса dev
|
|
|
|
|
|
//----------------------------------------------------------------------//
|
|
|
|
|
|
if (headerStr == "/dev|") {
|
|
|
|
|
|
sendStringToWs("errors", errorsHeapJson, num);
|
|
|
|
|
|
sendStringToWs("settin", settingsFlashJson, num);
|
|
|
|
|
|
sendFileToWsByFrames("/config.json", "config", "", num,
|
|
|
|
|
|
WEB_SOCKETS_FRAME_SIZE);
|
|
|
|
|
|
sendFileToWsByFrames("/items.json", "itemsj", "", num,
|
|
|
|
|
|
WEB_SOCKETS_FRAME_SIZE);
|
|
|
|
|
|
// sendFileToWsByFrames("/layout.json", "layout", "", num,
|
|
|
|
|
|
// WEB_SOCKETS_FRAME_SIZE);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (headerStr == "/test|") {
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//----------------------------------------------------------------------//
|
|
|
|
|
|
// отдельные команды веб интерфейса
|
|
|
|
|
|
//----------------------------------------------------------------------//
|
|
|
|
|
|
|
|
|
|
|
|
// переписать любое поле в errors json
|
|
|
|
|
|
if (headerStr == "/rorre|") {
|
|
|
|
|
|
writeUint8tValueToJsonString(payload, length, headerLenth,
|
|
|
|
|
|
errorsHeapJson);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// команда перезагрузки esp
|
|
|
|
|
|
if (headerStr == "/reboot|") {
|
|
|
|
|
|
ESP.restart();
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// команда очистки всех логов esp
|
|
|
|
|
|
if (headerStr == "/clean|") {
|
|
|
|
|
|
cleanLogs();
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// команда обновления прошивки esp
|
|
|
|
|
|
if (headerStr == "/update|") {
|
|
|
|
|
|
upgrade_firmware(3);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Прием команд control c dashboard
|
|
|
|
|
|
if (headerStr == "/control|") {
|
|
|
|
|
|
String msg;
|
|
|
|
|
|
writeUint8tToString(payload, length, headerLenth, msg);
|
|
|
|
|
|
String key = selectFromMarkerToMarker(msg, "/", 0);
|
|
|
|
|
|
String value = selectFromMarkerToMarker(msg, "/", 1);
|
|
|
|
|
|
generateOrder(key, value);
|
|
|
|
|
|
SerialPrint(
|
|
|
|
|
|
"i", F("=>WS"),
|
|
|
|
|
|
"Msg from svelte web, WS No: " + String(num) + ", msg: " + msg);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (headerStr == "/tst|") {
|
|
|
|
|
|
standWebSocket.sendTXT(num, "/tstr|");
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// получаем команду посланную из модуля
|
|
|
|
|
|
if (headerStr == "/order|") {
|
|
|
|
|
|
String json;
|
|
|
|
|
|
writeUint8tToString(payload, length, headerLenth, json);
|
|
|
|
|
|
|
|
|
|
|
|
String id, key, value;
|
|
|
|
|
|
jsonRead(json, "id", id);
|
|
|
|
|
|
jsonRead(json, "key", key);
|
|
|
|
|
|
jsonRead(json, "value", value);
|
|
|
|
|
|
|
|
|
|
|
|
SerialPrint("i", F("=>WS"), "Msg from module, id: " + id);
|
|
|
|
|
|
|
|
|
|
|
|
for (std::list<IoTItem*>::iterator it = IoTItems.begin();
|
|
|
|
|
|
it != IoTItems.end(); ++it) {
|
|
|
|
|
|
if ((*it)->getID() == id) {
|
|
|
|
|
|
(*it)->onModuleOrder(key, value);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
2022-12-14 00:56:25 +01:00
|
|
|
|
|
2023-09-24 20:58:51 +03:00
|
|
|
|
} break;
|
2022-02-02 21:17:50 +01:00
|
|
|
|
|
2023-09-24 20:58:51 +03:00
|
|
|
|
case WStype_BIN: {
|
|
|
|
|
|
Serial.printf("[%u] get binary length: %u\n", num, length);
|
|
|
|
|
|
// hexdump(payload, length);
|
|
|
|
|
|
// standWebSocket.sendBIN(num, payload, length);
|
|
|
|
|
|
} break;
|
2022-02-02 21:17:50 +01:00
|
|
|
|
|
2023-09-24 20:58:51 +03:00
|
|
|
|
case WStype_FRAGMENT_TEXT_START: {
|
|
|
|
|
|
Serial.printf("[%u] fragment test start: %u\n", num, length);
|
|
|
|
|
|
} break;
|
2022-02-02 21:17:50 +01:00
|
|
|
|
|
2023-09-24 20:58:51 +03:00
|
|
|
|
case WStype_FRAGMENT_BIN_START: {
|
|
|
|
|
|
Serial.printf("[%u] fragment bin start: %u\n", num, length);
|
|
|
|
|
|
} break;
|
2022-02-02 21:17:50 +01:00
|
|
|
|
|
2023-09-24 20:58:51 +03:00
|
|
|
|
case WStype_FRAGMENT: {
|
|
|
|
|
|
Serial.printf("[%u] fragment: %u\n", num, length);
|
|
|
|
|
|
} break;
|
2022-02-02 21:17:50 +01:00
|
|
|
|
|
2023-09-24 20:58:51 +03:00
|
|
|
|
case WStype_FRAGMENT_FIN: {
|
|
|
|
|
|
Serial.printf("[%u] fragment finish: %u\n", num, length);
|
|
|
|
|
|
} break;
|
2022-02-02 21:17:50 +01:00
|
|
|
|
|
2023-09-24 20:58:51 +03:00
|
|
|
|
case WStype_PING: {
|
|
|
|
|
|
Serial.printf("[%u] ping: %u\n", num, length);
|
|
|
|
|
|
} break;
|
2022-02-02 21:17:50 +01:00
|
|
|
|
|
2023-09-24 20:58:51 +03:00
|
|
|
|
case WStype_PONG: {
|
|
|
|
|
|
Serial.printf("[%u] pong: %u\n", num, length);
|
|
|
|
|
|
} break;
|
2022-02-02 21:17:50 +01:00
|
|
|
|
|
2023-09-24 20:58:51 +03:00
|
|
|
|
default: { Serial.printf("[%u] not recognized: %u\n", num, length); } break;
|
|
|
|
|
|
}
|
2022-02-02 21:17:50 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
2023-09-24 20:58:51 +03:00
|
|
|
|
// публикация статус сообщений в ws (недостаток в том что делаем бродкаст всем
|
|
|
|
|
|
// клиентам поднятым в свелте!!!)
|
2022-08-23 15:05:18 +02:00
|
|
|
|
void publishStatusWs(const String& topic, const String& data) {
|
2023-09-24 20:58:51 +03:00
|
|
|
|
String path = mqttRootDevice + "/" + topic;
|
|
|
|
|
|
String json = "{}";
|
|
|
|
|
|
jsonWriteStr(json, "status", data);
|
|
|
|
|
|
jsonWriteStr(json, "topic", path);
|
|
|
|
|
|
sendStringToWs("status", json, -1);
|
2022-08-31 00:13:45 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
2022-12-14 00:56:25 +01:00
|
|
|
|
// публикация дополнительных json сообщений в ws
|
2022-12-04 14:50:16 +01:00
|
|
|
|
void publishJsonWs(const String& topic, String& json) {
|
2023-09-24 20:58:51 +03:00
|
|
|
|
String path = mqttRootDevice + "/" + topic;
|
|
|
|
|
|
jsonWriteStr(json, "topic", path);
|
|
|
|
|
|
// TO DO отправка полей в веб
|
|
|
|
|
|
// sendStringToWs("status", json, -1);
|
2022-08-23 15:05:18 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
2022-12-14 00:56:25 +01:00
|
|
|
|
// данные которые мы отправляем в сокеты переодически
|
2022-02-08 16:47:17 +01:00
|
|
|
|
void periodicWsSend() {
|
2023-09-24 20:58:51 +03:00
|
|
|
|
sendStringToWs("ssidli", ssidListHeapJson, -1);
|
|
|
|
|
|
sendStringToWs("errors", errorsHeapJson, -1);
|
|
|
|
|
|
// отправляем переодичестки только в авто режиме
|
|
|
|
|
|
if (jsonReadInt(settingsFlashJson, F("udps")) != 0) {
|
|
|
|
|
|
sendStringToWs("devlis", devListHeapJson, -1);
|
|
|
|
|
|
}
|
2022-02-08 16:47:17 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
2022-02-02 21:17:50 +01:00
|
|
|
|
#ifdef ESP32
|
|
|
|
|
|
void hexdump(const void* mem, uint32_t len, uint8_t cols = 16) {
|
2023-09-24 20:58:51 +03:00
|
|
|
|
const uint8_t* src = (const uint8_t*)mem;
|
|
|
|
|
|
Serial.printf("\n[HEXDUMP] Address: 0x%08X len: 0x%X (%d)", (ptrdiff_t)src,
|
|
|
|
|
|
len, len);
|
|
|
|
|
|
for (uint32_t i = 0; i < len; i++) {
|
|
|
|
|
|
if (i % cols == 0) {
|
|
|
|
|
|
Serial.printf("\n[0x%08X] 0x%08X: ", (ptrdiff_t)src, i);
|
2022-02-02 21:17:50 +01:00
|
|
|
|
}
|
2023-09-24 20:58:51 +03:00
|
|
|
|
Serial.printf("%02X ", *src);
|
|
|
|
|
|
src++;
|
|
|
|
|
|
}
|
|
|
|
|
|
Serial.printf("\n");
|
2022-02-02 21:17:50 +01:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2023-09-24 20:58:51 +03:00
|
|
|
|
void sendFileToWsByFrames(const String& filename, const String& header,
|
|
|
|
|
|
const String& json, int client_id, size_t frameSize) {
|
|
|
|
|
|
if (header.length() != 6) {
|
|
|
|
|
|
SerialPrint("E", "FS", F("wrong header size"));
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
auto path = filepath(filename);
|
|
|
|
|
|
auto file = FileFS.open(path, "r");
|
|
|
|
|
|
if (!file) {
|
|
|
|
|
|
SerialPrint("E", "FS", F("reed file error"));
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
size_t totalSize = file.size();
|
|
|
|
|
|
// Serial.println("Send file '" + String(filename) + "', file size: " +
|
|
|
|
|
|
// String(totalSize));
|
|
|
|
|
|
|
|
|
|
|
|
char buf[32];
|
|
|
|
|
|
sprintf(buf, "%04d", json.length() + 12);
|
|
|
|
|
|
String data = header + "|" + String(buf) + "|" + json;
|
|
|
|
|
|
|
|
|
|
|
|
size_t headerSize = data.length();
|
|
|
|
|
|
auto frameBuf = new uint8_t[frameSize];
|
|
|
|
|
|
size_t maxPayloadSize = frameSize - headerSize;
|
|
|
|
|
|
uint8_t* payloadBuf = nullptr;
|
|
|
|
|
|
|
|
|
|
|
|
int i = 0;
|
|
|
|
|
|
while (file.available()) {
|
|
|
|
|
|
if (i == 0) {
|
|
|
|
|
|
data.toCharArray((char*)frameBuf, frameSize);
|
|
|
|
|
|
payloadBuf = &frameBuf[headerSize];
|
|
|
|
|
|
} else {
|
|
|
|
|
|
maxPayloadSize = frameSize;
|
|
|
|
|
|
headerSize = 0;
|
|
|
|
|
|
payloadBuf = &frameBuf[0];
|
2022-10-07 18:30:51 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
2023-09-24 20:58:51 +03:00
|
|
|
|
size_t payloadSize = file.read(payloadBuf, maxPayloadSize);
|
|
|
|
|
|
if (payloadSize) {
|
|
|
|
|
|
size_t size = headerSize + payloadSize;
|
|
|
|
|
|
|
|
|
|
|
|
bool fin = false;
|
|
|
|
|
|
if (size == frameSize) {
|
|
|
|
|
|
fin = false;
|
|
|
|
|
|
} else {
|
|
|
|
|
|
fin = true;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool continuation = false;
|
|
|
|
|
|
if (i == 0) {
|
|
|
|
|
|
continuation = false;
|
|
|
|
|
|
} else {
|
|
|
|
|
|
continuation = true;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Serial.println(String(i) + ") " + "ws: " + String(client_id) + " fr sz:
|
|
|
|
|
|
// " + String(size) + " fin: " + String(fin) + " cnt: " +
|
|
|
|
|
|
// String(continuation));
|
|
|
|
|
|
|
|
|
|
|
|
if (client_id == -1) {
|
|
|
|
|
|
standWebSocket.broadcastBIN(frameBuf, size, fin, continuation);
|
|
|
|
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
standWebSocket.sendBIN(client_id, frameBuf, size, fin, continuation);
|
|
|
|
|
|
}
|
2022-10-07 18:30:51 +02:00
|
|
|
|
}
|
2023-09-24 20:58:51 +03:00
|
|
|
|
i++;
|
|
|
|
|
|
}
|
|
|
|
|
|
payloadBuf = &frameBuf[0];
|
|
|
|
|
|
delete[] payloadBuf;
|
|
|
|
|
|
file.close();
|
2022-10-09 10:55:37 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
2022-10-09 14:30:42 +02:00
|
|
|
|
void sendStringToWs(const String& header, String& payload, int client_id) {
|
2023-09-20 13:02:27 +03:00
|
|
|
|
if ((!getNumAPClients() && !isNetworkActive()) || !getNumWSClients()) {
|
|
|
|
|
|
// standWebSocket.disconnect(); // это и ниже надо сделать при -
|
|
|
|
|
|
// standWebSocket.close(); // - отключении AP И WiFi(STA), надо менять ядро WiFi. Сейчас не закрывается сессия клиента при пропаже AP И WiFi(STA)
|
2023-09-10 18:24:55 +03:00
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2022-10-09 10:55:37 +02:00
|
|
|
|
if (header.length() != 6) {
|
|
|
|
|
|
SerialPrint("E", "FS", F("wrong header size"));
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
String msg = header + "|0012|" + payload;
|
|
|
|
|
|
size_t totalSize = msg.length();
|
|
|
|
|
|
|
|
|
|
|
|
char dataArray[totalSize];
|
|
|
|
|
|
msg.toCharArray(dataArray, totalSize + 1);
|
2022-10-09 14:30:42 +02:00
|
|
|
|
if (client_id == -1) {
|
|
|
|
|
|
standWebSocket.broadcastBIN((uint8_t*)dataArray, totalSize);
|
|
|
|
|
|
} else {
|
|
|
|
|
|
standWebSocket.sendBIN(client_id, (uint8_t*)dataArray, totalSize);
|
|
|
|
|
|
}
|
2022-10-07 18:30:51 +02:00
|
|
|
|
}
|
2023-06-09 01:11:15 +02:00
|
|
|
|
|
|
|
|
|
|
void sendDeviceList(uint8_t num) {
|
2023-09-24 20:58:51 +03:00
|
|
|
|
if (jsonReadInt(settingsFlashJson, F("udps")) != 0) {
|
|
|
|
|
|
// если включен автопоиск то отдаем список из оперативной памяти
|
|
|
|
|
|
SerialPrint("i", "FS", "heap list");
|
|
|
|
|
|
sendStringToWs("devlis", devListHeapJson, num);
|
|
|
|
|
|
} else {
|
|
|
|
|
|
// если выключен автопоиск то отдаем список из флешь памяти
|
|
|
|
|
|
sendFileToWsByFrames("/devlist.json", "devlis", "", num,
|
|
|
|
|
|
WEB_SOCKETS_FRAME_SIZE);
|
|
|
|
|
|
SerialPrint("i", "FS", "flash list");
|
|
|
|
|
|
}
|
2023-06-09 01:11:15 +02:00
|
|
|
|
}
|
2023-09-20 13:02:27 +03:00
|
|
|
|
|
|
|
|
|
|
int getNumWSClients() {
|
|
|
|
|
|
return standWebSocket.connectedClients(false);
|
|
|
|
|
|
}
|