sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-04 11:02:19 +01:00
Code Issues Releases Wiki Activity

sane

Browse Source
This commit is contained in:
J. Nick Koston
2025-09-29 12:45:24 -05:00
parent bb82496c12
commit 3560d6ca96
2 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
esphome/components/api/__init__.py
View File

@@ -160,12 +160,29 @@ CONFIG_SCHEMA = cv.All(
cv.Optional(CONF_ON_CLIENT_DISCONNECTED): automation.validate_automation( cv.Optional(CONF_ON_CLIENT_DISCONNECTED): automation.validate_automation(
single=True single=True
), ),
cv.SplitDefault(CONF_LISTEN_BACKLOG, esp8266=1, default=4): cv.int_range( # Connection limits to prevent memory exhaustion on resource-constrained devices
min=1, max=10 # Each connection uses ~500-1000 bytes of RAM plus system resources
), # Platform defaults based on available RAM and network stack implementation:
cv.SplitDefault(CONF_MAX_CONNECTIONS, esp8266=4, default=8): cv.int_range( cv.SplitDefault(
min=1, max=20 CONF_LISTEN_BACKLOG,
), esp8266=1, # Limited RAM (~40KB free), LWIP raw sockets
esp32=4, # More RAM (520KB), BSD sockets
rp2040=1, # Limited RAM (264KB), LWIP raw sockets like ESP8266
bk72xx=4, # Moderate RAM, BSD-style sockets
rtl87xx=4, # Moderate RAM, BSD-style sockets
host=4, # Abundant resources
ln882x=4, # Moderate RAM
): cv.int_range(min=1, max=10),
cv.SplitDefault(
CONF_MAX_CONNECTIONS,
esp8266=4, # ~40KB free RAM, each connection uses ~500-1000 bytes
esp32=8, # 520KB RAM available
rp2040=4, # 264KB RAM but LWIP constraints
bk72xx=8, # Moderate RAM
rtl87xx=8, # Moderate RAM
host=8, # Abundant resources
ln882x=8, # Moderate RAM
): cv.int_range(min=1, max=20),
} }
).extend(cv.COMPONENT_SCHEMA), ).extend(cv.COMPONENT_SCHEMA),
cv.rename_key(CONF_SERVICES, CONF_ACTIONS), cv.rename_key(CONF_SERVICES, CONF_ACTIONS),
@@ -184,8 +201,10 @@ async def to_code(config):
cg.add(var.set_password(config[CONF_PASSWORD])) cg.add(var.set_password(config[CONF_PASSWORD]))
cg.add(var.set_reboot_timeout(config[CONF_REBOOT_TIMEOUT])) cg.add(var.set_reboot_timeout(config[CONF_REBOOT_TIMEOUT]))
cg.add(var.set_batch_delay(config[CONF_BATCH_DELAY])) cg.add(var.set_batch_delay(config[CONF_BATCH_DELAY]))
cg.add(var.set_listen_backlog(config[CONF_LISTEN_BACKLOG])) if CONF_LISTEN_BACKLOG in config:
cg.add(var.set_max_connections(config[CONF_MAX_CONNECTIONS])) cg.add(var.set_listen_backlog(config[CONF_LISTEN_BACKLOG]))
if CONF_MAX_CONNECTIONS in config:
cg.add(var.set_max_connections(config[CONF_MAX_CONNECTIONS]))
# Set USE_API_SERVICES if any services are enabled # Set USE_API_SERVICES if any services are enabled
if config.get(CONF_ACTIONS) or config[CONF_CUSTOM_SERVICES]: if config.get(CONF_ACTIONS) or config[CONF_CUSTOM_SERVICES]:

7
esphome/components/api/api_server.h
View File

@@ -191,13 +191,10 @@ class APIServer : public Component, public Controller {
// Group smaller types together // Group smaller types together
uint16_t port_{6053}; uint16_t port_{6053};
uint16_t batch_delay_{100}; uint16_t batch_delay_{100};
#ifdef USE_ESP8266 // Connection limits - these defaults will be overridden by config values
uint8_t listen_backlog_{1}; // from cv.SplitDefault in __init__.py which sets platform-specific defaults
uint8_t max_connections_{4};
#else
uint8_t listen_backlog_{4}; uint8_t listen_backlog_{4};
uint8_t max_connections_{8}; uint8_t max_connections_{8};
#endif
bool shutting_down_ = false; bool shutting_down_ = false;
// 7 bytes used, 1 byte padding // 7 bytes used, 1 byte padding