Terminal: change command-line parser (#2247)
Change the underlying command line handling:
- switch to a custom parser, inspired by redis / sds
- update terminalRegisterCommand signature, pass only bare minimum
- clean-up `help` & `commands`. update settings `set`, `get` and `del`
- allow our custom test suite to run command-line tests
- clean-up Stream IO to allow us to print large things into debug stream (for example, `eeprom.dump`)
- send parsing errors to the debug log
As a proof of concept, introduce `TERMINAL_MQTT_SUPPORT` and `TERMINAL_WEB_API_SUPPORT`
- MQTT subscribes to the `<root>/cmd/set` and sends response to the `<root>/cmd`. We can't output too much, as we don't have any large-send API.
- Web API listens to the `/api/cmd?apikey=...&line=...` (or PUT, params inside the body). This one is intended as a possible replacement of the `API_SUPPORT`. Internals introduce a 'task' around the AsyncWebServerRequest object that will simulate what WiFiClient does and push data into it continuously, switching between CONT and SYS.
Both are experimental. We only accept a single command and not every command is updated to use Print `ctx.output` object. We are also somewhat limited by the Print / Stream overall, perhaps I am overestimating the usefulness of Arduino compatibility to such an extent :)
Web API handler can also sometimes show only part of the result, whenever the command tries to yield() by itself waiting for something. Perhaps we would need to create a custom request handler for that specific use-case. 4 years ago |
|
- /*
-
- OTA MODULE COMMON FUNCTIONS
-
- */
-
- #include "ota.h"
- #include "system.h"
- #include "terminal.h"
- #include "ws.h"
-
- void otaPrintError() {
- if (Update.hasError()) {
- #if TERMINAL_SUPPORT
- Update.printError(terminalDefaultStream());
- #elif DEBUG_SERIAL_SUPPORT && defined(DEBUG_PORT)
- Update.printError(DEBUG_PORT);
- #endif
- }
- }
-
- bool otaFinalize(size_t size, int reason, bool evenIfRemaining) {
- if (Update.isRunning() && Update.end(evenIfRemaining)) {
- DEBUG_MSG_P(PSTR("[OTA] Success: %7u bytes\n"), size);
- deferredReset(500, reason);
- return true;
- }
-
- otaPrintError();
- eepromRotate(true);
-
- return false;
- }
-
- // Helper methods from UpdaterClass that need to be called manually for async mode,
- // because we are not using Stream interface to feed it data.
- bool otaVerifyHeader(uint8_t* data, size_t len) {
- if (len < 4) {
- return false;
- }
-
- // ref: https://github.com/esp8266/Arduino/pull/6820
- // accept gzip, let unpacker figure things out later
- if (data[0] == 0x1F && data[1] == 0x8B) {
- return true;
- }
-
- // Check for magic byte with a normal .bin
- if (data[0] != 0xE9) {
- return false;
- }
-
- // Make sure that flash config can be recognized and fit the flash
- const auto flash_config = ESP.magicFlashChipSize((data[3] & 0xf0) >> 4);
- if (flash_config && (flash_config > ESP.getFlashChipRealSize())) {
- return false;
- }
-
- return true;
- }
-
- void otaProgress(size_t bytes, size_t each) {
- // Removed to avoid websocket ping back during upgrade (see #1574)
- // TODO: implement as separate from debugging message
- #if WEB_SUPPORT
- if (wsConnected()) return;
- #endif
-
- // Telnet and serial will still output things, but slightly throttled
- static size_t last = 0;
- if (bytes < last) {
- last = 0;
- }
-
- if ((bytes > each) && (bytes - each > last)) {
- DEBUG_MSG_P(PSTR("[OTA] Progress: %7u bytes\r"), bytes);
- last = bytes;
- }
- }
|