iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-27 22:52:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

добавил асинхронный веб сервер и веб сокеты, проверенный код

Browse Source
This commit is contained in:
Dmitry Borisenko
2021-12-23 00:33:45 +01:00
parent f20486517b
commit 7147e041b4
15 changed files with 201 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

360
src/WebServer.cpp
View File

@@ -1,213 +1,147 @@
//
//
//
// AsyncWebSocket ws("/ws");
// AsyncEventSource events("/events");
//
//
//
//
//
// void init() {
// String login = jsonReadStr(settingsFlashJson, "weblogin");
// String pass = jsonReadStr(settingsFlashJson, "webpass");
//#ifdef ESP32
// server.addHandler(new FSEditor(FileFS, login, pass));
//#else
// server.addHandler(new FSEditor(login, pass));
//#endif
//
// server.serveStatic("/css/", FileFS, "/css/").setCacheControl("max-age=600");
// server.serveStatic("/js/", FileFS, "/js/").setCacheControl("max-age=600");
// server.serveStatic("/favicon.ico", FileFS, "/favicon.ico").setCacheControl("max-age=600");
// server.serveStatic("/icon.jpeg", FileFS, "/icon.jpeg").setCacheControl("max-age=600");
// server.serveStatic("/edit", FileFS, "/edit").setCacheControl("max-age=600");
//
//#ifdef svelte
// server.serveStatic("/", FileFS, "/").setDefaultFile("index.html").setAuthentication(login.c_str(), pass.c_str());
//#else
// server.serveStatic("/", FileFS, "/").setDefaultFile("index.htm").setAuthentication(login.c_str(), pass.c_str());
//#endif
//
// server.onNotFound([](AsyncWebServerRequest *request) {
// SerialPrint("[E]", "WebServer", "not found:\n" + getRequestInfo(request));
// request->send(404);
// });
//
// server.onFileUpload([](AsyncWebServerRequest *request, const String &filename, size_t index, uint8_t *data, size_t len, bool final) {
// // TODO
// if (!index) {
// SerialPrint("I", "WebServer", "start upload " + filename);
// }
// if (final) {
// SerialPrint("I", "WebServer", "finish upload: " + prettyBytes(index + len));
// }
// });
//
// // динамические данные
// server.on("/config.live.json", HTTP_GET, [](AsyncWebServerRequest *request) {
// request->send(200, "application/json", configLiveJson);
// });
//
// server.on("/config.store.json", HTTP_GET, [](AsyncWebServerRequest *request) {
// request->send(200, "application/json", paramsFlashJson);
// });
//
// // данные не являющиеся событиями
// server.on("/config.option.json", HTTP_GET, [](AsyncWebServerRequest *request) {
// request->send(200, "application/json", paramsHeapJson);
// });
//
// // для хранения постоянных данных
// server.on("/config.setup.json", HTTP_GET, [](AsyncWebServerRequest *request) {
// request->send(200, "application/json", settingsFlashJson);
// });
//
// server.on("/cmd", HTTP_GET, [](AsyncWebServerRequest *request) {
// String cmdStr = request->getParam("command")->value();
// SerialPrint("I", "WebServer", "do: " + cmdStr);
// loopCmdAdd(cmdStr);
// request->send(200, "text/html", "OK");
// });
//
// server.begin();
//
// initOta();
// initMDNS();
// initWS();
//
// SerialPrint("I", F("HTTP"), F("HttpServer Init"));
//}
//
// void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len) {
//#ifdef WEBSOCKET_ENABLED
// if (type == WS_EVT_CONNECT) {
// SerialPrint("I", F("WS"), F("CONNECTED"));
// Serial.printf("ws[%s][%u] connect\n", server->url(), client->id());
// // client->printf(json.c_str(), client->id());
// // client->ping();
// } else if (type == WS_EVT_DISCONNECT) {
// Serial.printf("ws[%s][%u] disconnect\n", server->url(), client->id());
// } else if (type == WS_EVT_ERROR) {
// Serial.printf("ws[%s][%u] error(%u): %s\n", server->url(), client->id(), *((uint16_t *)arg), (char *)data);
// } else if (type == WS_EVT_PONG) {
// Serial.printf("ws[%s][%u] pong[%u]: %s\n", server->url(), client->id(), len, (len) ? (char *)data : "");
// } else if (type == WS_EVT_DATA) {
// AwsFrameInfo *info = (AwsFrameInfo *)arg;
// String msg = "";
// if (info->final && info->index == 0 && info->len == len) {
// // the whole message is in a single frame and we got all of it's data
// Serial.printf("ws[%s][%u] %s-message[%llu]: ", server->url(), client->id(), (info->opcode == WS_TEXT) ? "text" : "binary", info->len);
//
// if (info->opcode == WS_TEXT) {
// for (size_t i = 0; i < info->len; i++) {
// msg += (char)data[i];
// }
// } else {
// char buff[3];
// for (size_t i = 0; i < info->len; i++) {
// sprintf(buff, "%02x ", (uint8_t)data[i]);
// msg += buff;
// }
// }
// Serial.printf("%s\n", msg.c_str());
//
// if (msg.startsWith("HELLO")) {
// SerialPrint("I", F("WS"), F("Full update"));
// // publishWidgetsWS();
// // publishStateWS();
// // choose_log_date_and_send(); // функцию выгрузки архива с графиком я не сделал. Забираю при выгрузке по MQTT
// }
//
// if (info->opcode == WS_TEXT)
// client->text("{}");
// else
// client->binary("{}");
// } else {
// // message is comprised of multiple frames or the frame is split into multiple packets
// if (info->index == 0) {
// if (info->num == 0)
// Serial.printf("ws[%s][%u] %s-message start\n", server->url(), client->id(), (info->message_opcode == WS_TEXT) ? "text" : "binary");
// Serial.printf("ws[%s][%u] frame[%u] start[%llu]\n", server->url(), client->id(), info->num, info->len);
// }
//
// Serial.printf("ws[%s][%u] frame[%u] %s[%llu - %llu]: ", server->url(), client->id(), info->num, (info->message_opcode == WS_TEXT) ? "text" : "binary", info->index, info->index + len);
//
// if (info->opcode == WS_TEXT) {
// for (size_t i = 0; i < len; i++) {
// msg += (char)data[i];
// }
// } else {
// char buff[3];
// for (size_t i = 0; i < len; i++) {
// sprintf(buff, "%02x ", (uint8_t)data[i]);
// msg += buff;
// }
// }
// Serial.printf("%s\n", msg.c_str());
//
// if ((info->index + len) == info->len) {
// Serial.printf("ws[%s][%u] frame[%u] end[%llu]\n", server->url(), client->id(), info->num, info->len);
// if (info->final) {
// Serial.printf("ws[%s][%u] %s-message end\n", server->url(), client->id(), (info->message_opcode == WS_TEXT) ? "text" : "binary");
// if (info->message_opcode == WS_TEXT)
// client->text("I got your text message");
// else
// client->binary("I got your binary message");
// }
// }
// }
// }
//#endif
// ;
//}
//
// void initMDNS() {
//#ifdef MDNS_ENABLED
// MDNS.addService("http", "tcp", 80);
// // TODO Add Adduino OTA
//#endif
// ;
//}
//
// void initOta() {
//#ifdef OTA_UPDATES_ENABLED
// ArduinoOTA.onStart([]() {
// events.send("Update Start", "ota");
// });
// ArduinoOTA.onEnd([]() {
// events.send("Update End", "ota");
// });
// ArduinoOTA.onProgress([](unsigned int progress, unsigned int total) {
// char p[32];
// sprintf(p, "Progress: %u%%\n", (progress / (total / 100)));
// events.send(p, "ota");
// });
// ArduinoOTA.onError([](ota_error_t error) {
// if (error == OTA_AUTH_ERROR)
// events.send("Auth Failed", "ota");
// else if (error == OTA_BEGIN_ERROR)
// events.send("Begin Failed", "ota");
// else if (error == OTA_CONNECT_ERROR)
// events.send("Connect Failed", "ota");
// else if (error == OTA_RECEIVE_ERROR)
// events.send("Recieve Failed", "ota");
// else if (error == OTA_END_ERROR)
// events.send("End Failed", "ota");
// });
// ArduinoOTA.setHostname(hostName);
// ArduinoOTA.begin();
//#endif
// ;
//}
//
// void initWS() {
//#ifdef WEBSOCKET_ENABLED
// ws.onEvent(onWsEvent);
// server.addHandler(&ws);
// events.onConnect([](AsyncEventSourceClient *client) {
// client->send("", NULL, millis(), 1000);
// });
// server.addHandler(&events);
//#endif
//}
#include "WebServer.h"
AsyncWebSocket ws("/ws");
AsyncEventSource events("/events");
void webServerInit() {
String login = jsonReadStr(settingsFlashJson, "weblogin");
String pass = jsonReadStr(settingsFlashJson, "webpass");
#ifdef ESP32
// server.addHandler(new FSEditor(FileFS, login, pass));
#else
// server.addHandler(new FSEditor(login, pass));
#endif
server.serveStatic("/css/", FileFS, "/css/").setCacheControl("max-age=600");
server.serveStatic("/js/", FileFS, "/js/").setCacheControl("max-age=600");
server.serveStatic("/favicon.ico", FileFS, "/favicon.ico").setCacheControl("max-age=600");
server.serveStatic("/icon.jpeg", FileFS, "/icon.jpeg").setCacheControl("max-age=600");
server.serveStatic("/edit", FileFS, "/edit").setCacheControl("max-age=600");
server.serveStatic("/", FileFS, "/").setDefaultFile("index.html").setAuthentication(login.c_str(), pass.c_str());
server.onNotFound([](AsyncWebServerRequest *request) {
// SerialPrint("[E]", "WebServer", "not found:\n" + getRequestInfo(request));
request->send(404);
});
server.onFileUpload([](AsyncWebServerRequest *request, const String &filename, size_t index, uint8_t *data, size_t len, bool final) {
// TODO
if (!index) {
// SerialPrint("i", "WebServer", "start upload " + filename);
}
if (final) {
// SerialPrint("i", "WebServer", "finish upload: " + prettyBytes(index + len));
}
});
// динамические данные
// server.on("/config.live.json", HTTP_GET, [](AsyncWebServerRequest *request) {
// request->send(200, "application/json", configLiveJson);
//});
//
// server.on("/config.store.json", HTTP_GET, [](AsyncWebServerRequest *request) {
// request->send(200, "application/json", paramsFlashJson);
//});
//
// server.on("/config.option.json", HTTP_GET, [](AsyncWebServerRequest *request) {
// request->send(200, "application/json", paramsHeapJson);
//});
//
// server.on("/config.setup.json", HTTP_GET, [](AsyncWebServerRequest *request) {
// request->send(200, "application/json", settingsFlashJson);
//});
//
// server.on("/cmd", HTTP_GET, [](AsyncWebServerRequest *request) {
// String cmdStr = request->getParam("command")->value();
// SerialPrint("i", "WebServer", "do: " + cmdStr);
// // loopCmdAdd(cmdStr);
// request->send(200, "text/html", "OK");
//});
server.begin();
SerialPrint("i", F("WEB"), F("WebServer Init"));
}
void webSocketsInit() {
ws.onEvent(onWsEvent);
server.addHandler(&ws);
events.onConnect([](AsyncEventSourceClient *client) {
client->send("", NULL, millis(), 1000);
});
server.addHandler(&events);
SerialPrint("i", F("WEB"), F("WebSockets Init"));
}
void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len) {
if (type == WS_EVT_CONNECT) {
Serial.printf("ws[%s][%u] connect\n", server->url(), client->id());
client->printf("Hello Client %u :)", client->id());
client->ping();
} else if (type == WS_EVT_DISCONNECT) {
Serial.printf("ws[%s][%u] disconnect\n", server->url(), client->id());
} else if (type == WS_EVT_ERROR) {
Serial.printf("ws[%s][%u] error(%u): %s\n", server->url(), client->id(), *((uint16_t *)arg), (char *)data);
} else if (type == WS_EVT_PONG) {
Serial.printf("ws[%s][%u] pong[%u]: %s\n", server->url(), client->id(), len, (len) ? (char *)data : "");
} else if (type == WS_EVT_DATA) {
AwsFrameInfo *info = (AwsFrameInfo *)arg;
String msg = "";
if (info->final && info->index == 0 && info->len == len) {
// the whole message is in a single frame and we got all of it's data
Serial.printf("ws[%s][%u] %s-message[%llu]: ", server->url(), client->id(), (info->opcode == WS_TEXT) ? "text" : "binary", info->len);
if (info->opcode == WS_TEXT) {
for (size_t i = 0; i < info->len; i++) {
msg += (char)data[i];
}
} else {
char buff[3];
for (size_t i = 0; i < info->len; i++) {
sprintf(buff, "%02x ", (uint8_t)data[i]);
msg += buff;
}
}
Serial.printf("%s\n", msg.c_str());
if (info->opcode == WS_TEXT)
client->text("I got your text message");
else
client->binary("I got your binary message");
} else {
// message is comprised of multiple frames or the frame is split into multiple packets
if (info->index == 0) {
if (info->num == 0)
Serial.printf("ws[%s][%u] %s-message start\n", server->url(), client->id(), (info->message_opcode == WS_TEXT) ? "text" : "binary");
Serial.printf("ws[%s][%u] frame[%u] start[%llu]\n", server->url(), client->id(), info->num, info->len);
}
Serial.printf("ws[%s][%u] frame[%u] %s[%llu - %llu]: ", server->url(), client->id(), info->num, (info->message_opcode == WS_TEXT) ? "text" : "binary", info->index, info->index + len);
if (info->opcode == WS_TEXT) {
for (size_t i = 0; i < len; i++) {
msg += (char)data[i];
}
} else {
char buff[3];
for (size_t i = 0; i < len; i++) {
sprintf(buff, "%02x ", (uint8_t)data[i]);
msg += buff;
}
}
Serial.printf("%s\n", msg.c_str());
if ((info->index + len) == info->len) {
Serial.printf("ws[%s][%u] frame[%u] end[%llu]\n", server->url(), client->id(), info->num, info->len);
if (info->final) {
Serial.printf("ws[%s][%u] %s-message end\n", server->url(), client->id(), (info->message_opcode == WS_TEXT) ? "text" : "binary");
if (info->message_opcode == WS_TEXT)
client->text("I got your text message");
else
client->binary("I got your binary message");
}
}
}
}
}