tfaour
1d39e439ff
Firmware build check / build-check (push) Successful in 5m37s
Build and release firmware / build-and-release (push) Successful in 5m36s
Build and push server image / test (push) Successful in 1m37s
Build and push server image / build-and-push (push) Successful in 4m18s
Build and push server image / deploy (push) Failing after 1m20s
Server: migration 41 drops the pre-widget-system Frame columns (mode/album_id/current_asset_id/queue/calendar_*/whiteboard_*, etc) docs/widgets.md flagged as the deliberately-deferred Phase 6 cleanup, with a raw-SQL backfill safety net for any frame that still somehow lacks a Widget. Also drops legacy_token_enabled and the shared MANAGEMENT_TOKEN fallback it gated in require_device/require_browser -- the per-frame manage_token/device_token flow (and the /m/ page) fully supersede it now; MANAGEMENT_TOKEN's only remaining role is the optional pre-setup claim gate. Confirmed with the maintainer that the deployed frame is already off the shared token before removing the server-side fallback. Firmware: the captive portal's "Access Token" field and its NVS/ build_url plumbing only ever mattered for pointing new firmware at an old pre-multi-frame server -- gone along with the server-side fallback it fed. Version bump to publish the change.
82 lines
2.7 KiB
C
82 lines
2.7 KiB
C
#include <string.h>
|
|
|
|
#include "esp_app_desc.h"
|
|
#include "esp_crt_bundle.h"
|
|
#include "esp_http_client.h"
|
|
#include "esp_https_ota.h"
|
|
#include "esp_log.h"
|
|
#include "esp_system.h"
|
|
|
|
#include "ota_update.h"
|
|
|
|
static const char *TAG = "ota_update";
|
|
|
|
/* Generous: the image is ~1.2MB and may stream over a WAN reverse
|
|
* proxy; esp_https_ota resets this per-read, so it's an inactivity
|
|
* timeout, not a total-transfer cap. */
|
|
#define OTA_HTTP_TIMEOUT_MS 30000
|
|
|
|
/* Built the same way as every other tools-server URL -- scheme/cert/
|
|
* id/token handling all come from build_url()'s conventions. Duplicated
|
|
* tiny helper rather than exporting frame_client.c's static build_url();
|
|
* kept byte-identical in behavior (see frame_client.c). */
|
|
static void build_ota_url(char *out, size_t out_size, const frame_config_t *cfg)
|
|
{
|
|
const char *toolsserver = cfg->toolsserver;
|
|
size_t len;
|
|
if (strncmp(toolsserver, "http://", 7) == 0 || strncmp(toolsserver, "https://", 8) == 0) {
|
|
len = (size_t)snprintf(out, out_size, "%s/frame/firmware", toolsserver);
|
|
} else {
|
|
len = (size_t)snprintf(out, out_size, "http://%s/frame/firmware", toolsserver);
|
|
}
|
|
|
|
char device_id[FRAME_DEVICE_ID_LEN + 1];
|
|
frame_device_id_get(device_id, sizeof(device_id));
|
|
if (len < out_size) {
|
|
len += (size_t)snprintf(out + len, out_size - len, "?id=%s", device_id);
|
|
}
|
|
|
|
if (cfg->device_token[0] != '\0' && len < out_size) {
|
|
snprintf(out + len, out_size - len, "&token=%s", cfg->device_token);
|
|
}
|
|
}
|
|
|
|
void ota_update_if_available(const frame_config_t *cfg, const char *server_version)
|
|
{
|
|
if (server_version == NULL || server_version[0] == '\0') {
|
|
return; /* server has no uploaded firmware */
|
|
}
|
|
|
|
const char *running = esp_app_get_description()->version;
|
|
if (strcmp(server_version, running) == 0) {
|
|
return; /* already running what the server has */
|
|
}
|
|
|
|
ESP_LOGI(TAG, "Firmware update available: running '%s', server has '%s' -- starting OTA", running,
|
|
server_version);
|
|
|
|
char url[256];
|
|
build_ota_url(url, sizeof(url), cfg);
|
|
|
|
esp_http_client_config_t http_config = {
|
|
.url = url,
|
|
.timeout_ms = OTA_HTTP_TIMEOUT_MS,
|
|
.crt_bundle_attach = esp_crt_bundle_attach,
|
|
.keep_alive_enable = true,
|
|
};
|
|
esp_https_ota_config_t ota_config = {
|
|
.http_config = &http_config,
|
|
};
|
|
|
|
esp_err_t err = esp_https_ota(&ota_config);
|
|
if (err != ESP_OK) {
|
|
/* Not fatal -- the photo already displayed this cycle; we just
|
|
* try again on a future wake. */
|
|
ESP_LOGW(TAG, "OTA failed (%s), will retry on a later wake", esp_err_to_name(err));
|
|
return;
|
|
}
|
|
|
|
ESP_LOGI(TAG, "OTA complete, restarting into '%s'", server_version);
|
|
esp_restart();
|
|
}
|