mirror of
https://github.com/rstrouse/ESPSomfy-RTS.git
synced 2026-11-20 15:52:12 +01:00
Step 4a of docs/SECURITY_PLAN.md. Port 80 keeps the eleven HTTP routes of ADR 0006 and the socket at /ws; everything else moved to protocol 2. - Port 8081 (ApiRoutes) and the socket on 8080 (SocketEmitter) are gone. Protocol 2 owns its frame buffer and loop-task check. - Port 80 drops every route the old web UI called: reads, edits, settings, scans, reboot, /shades.cfg, /discovery. HttpRoutes.cpp holds what stays. - ModelSnapshot, SnapshotSlots and the read documents are gone. The item snapshot types stay, as ItemSnapshot, for events, MQTT and the command replies. - Model edits reply only to their protocol 2 op: requestResult goes. - The settings' toJSON writers, used only by the settings routes, go. - The _espsomfy_rts._tcp mDNS record moves to port 80, with path=/ws. - The memory event reports the loop-rate window it closes. - A deleted room no longer re-publishes its retained MQTT topics. - e2e: the heap check reads the sync's status; the sync is checked on its own instead of against /controller. - README gets an API and ports section. BREAKING CHANGE: ports 8081 and 8080 and the old HTTP routes are gone. Home Assistant needs integration 3.0.0 or newer. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
88 lines
3.1 KiB
C++
88 lines
3.1 KiB
C++
#include <freertos/FreeRTOS.h>
|
|
#include <freertos/queue.h>
|
|
#include <LittleFS.h>
|
|
#include "esp_log.h"
|
|
#include "LoopQueue.h"
|
|
#include "ConfigFile.h"
|
|
#include "Somfy.h"
|
|
#include "SomfyEditor.h"
|
|
#include "Utils.h"
|
|
#include "outputs/ProtoSocket.h"
|
|
#include "DeviceOps.h"
|
|
|
|
static const char *TAG = "LoopQueue";
|
|
|
|
extern SomfyShadeController somfy;
|
|
extern ShadeRequests shadeRequests;
|
|
extern rebootDelay_t rebootDelay;
|
|
|
|
static restore_options_t restoreOptions(uint8_t parts) {
|
|
restore_options_t opts;
|
|
opts.settings = parts & RESTORE_SETTINGS;
|
|
opts.shades = parts & RESTORE_SHADES;
|
|
opts.network = parts & RESTORE_NETWORK;
|
|
opts.transceiver = parts & RESTORE_TRANSCEIVER;
|
|
opts.repeaters = parts & RESTORE_REPEATERS;
|
|
opts.mqtt = parts & RESTORE_MQTT;
|
|
return opts;
|
|
}
|
|
|
|
void LoopQueue::begin() {
|
|
if(!this->queue) this->queue = xQueueCreate(LOOP_QUEUE_SIZE, sizeof(loop_item_t));
|
|
}
|
|
bool LoopQueue::submit(const loop_item_t &item, bool first) {
|
|
if(!this->queue) return false;
|
|
// async_tcp also services the sockets, so it must never wait on loop() or
|
|
// the radio.
|
|
QueueHandle_t q = static_cast<QueueHandle_t>(this->queue);
|
|
if((first ? xQueueSendToFront(q, &item, 0) : xQueueSend(q, &item, 0)) != pdTRUE) {
|
|
ESP_LOGE(TAG, "Loop queue full, dropping item");
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
void LoopQueue::drain() {
|
|
if(!this->queue) return;
|
|
QueueHandle_t q = static_cast<QueueHandle_t>(this->queue);
|
|
loop_item_t item;
|
|
// Items run in order, so only the one at the head can be held back.
|
|
while(xQueuePeek(q, &item, 0) == pdTRUE) {
|
|
if(holdLoopItem(item, somfy.transceiver.txSuspended(), somfy.transceiver.txHasRoom())) break;
|
|
// loop() is the only consumer so this is the item we peeked.
|
|
xQueueReceive(q, &item, 0);
|
|
switch(item.type) {
|
|
case loop_item_type_t::shade_request: {
|
|
const shade_request_result_t result = shadeRequests.run(item.request);
|
|
if(result == shade_request_result_t::radio_refused)
|
|
ESP_LOGW(TAG, "Radio didn't take shade request %u", static_cast<uint8_t>(item.request.type));
|
|
protoSocket.replyRequest(item.replyTo, item.request, result);
|
|
break;
|
|
}
|
|
case loop_item_type_t::restore_shades: {
|
|
restore_options_t opts = restoreOptions(item.restoreParts);
|
|
const bool restored = ShadeConfigFile::restore(&somfy, "/shades.tmp", opts);
|
|
// It holds the whole backup, rolling codes included, and has no use now.
|
|
LittleFS.remove("/shades.tmp");
|
|
// A failed restore stops before it changes anything, so there is
|
|
// nothing to reboot for.
|
|
if(!restored) {
|
|
ESP_LOGE(TAG, "Restore failed, keeping the current settings");
|
|
break;
|
|
}
|
|
ESP_LOGI(TAG, "Rebooting ESP for restored settings...");
|
|
rebootDelay.reboot = true;
|
|
rebootDelay.rebootTime = millis() + 1000;
|
|
break;
|
|
}
|
|
case loop_item_type_t::model_edit:
|
|
runModelEdit(item.edit);
|
|
break;
|
|
case loop_item_type_t::proto_read:
|
|
protoSocket.replyRead(item.replyTo, item.op, item.groupId);
|
|
break;
|
|
case loop_item_type_t::proto_device:
|
|
runDeviceOp(item);
|
|
break;
|
|
}
|
|
}
|
|
}
|