WIP adding devices.json and auth

tannewt · tannewt · commit 4f0a7aedfd10 · 2022-06-27T13:34:13.000-07:00
diff --git a/ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.mk
@@ -13,5 +13,5 @@ LONGINT_IMPL = MPZ
 CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 
 CIRCUITPY_ESP_FLASH_MODE=dio
-CIRCUITPY_ESP_FLASH_FREQ=80m
+CIRCUITPY_ESP_FLASH_FREQ=40m
 CIRCUITPY_ESP_FLASH_SIZE=16MB
diff --git a/ports/espressif/common-hal/mdns/Server.c b/ports/espressif/common-hal/mdns/Server.c
@@ -35,7 +35,7 @@
 
 STATIC bool inited = false;
 
-void mdns_server_construct(mdns_server_obj_t *self) {
+void mdns_server_construct(mdns_server_obj_t *self, bool workflow) {
     if (inited) {
         return;
     }
@@ -46,19 +46,21 @@ void mdns_server_construct(mdns_server_obj_t *self) {
     snprintf(self->default_hostname, sizeof(self->default_hostname), "cpy-%02x%02x%02x", mac[3], mac[4], mac[5]);
     common_hal_mdns_server_set_hostname(self, self->default_hostname);
 
-    // Set a delegated entry to ourselves. This allows us to respond to "circuitpython.local"
-    // queries as well.
-    // TODO: Allow for disabling this with `supervisor.disable_web_workflow()`.
-    mdns_ip_addr_t our_ip;
-    esp_netif_get_ip_info(common_hal_wifi_radio_obj.netif, &common_hal_wifi_radio_obj.ip_info);
-    our_ip.next = NULL;
-    our_ip.addr.type = ESP_IPADDR_TYPE_V4;
-    our_ip.addr.u_addr.ip4 = common_hal_wifi_radio_obj.ip_info.ip;
-    our_ip.addr.u_addr.ip6.addr[1] = 0;
-    our_ip.addr.u_addr.ip6.addr[2] = 0;
-    our_ip.addr.u_addr.ip6.addr[3] = 0;
-    our_ip.addr.u_addr.ip6.zone = 0;
-    mdns_delegate_hostname_add("circuitpython", &our_ip);
+    if (workflow) {
+        // Set a delegated entry to ourselves. This allows us to respond to "circuitpython.local"
+        // queries as well.
+        // TODO: Allow for disabling this with `supervisor.disable_web_workflow()`.
+        mdns_ip_addr_t our_ip;
+        esp_netif_get_ip_info(common_hal_wifi_radio_obj.netif, &common_hal_wifi_radio_obj.ip_info);
+        our_ip.next = NULL;
+        our_ip.addr.type = ESP_IPADDR_TYPE_V4;
+        our_ip.addr.u_addr.ip4 = common_hal_wifi_radio_obj.ip_info.ip;
+        our_ip.addr.u_addr.ip6.addr[1] = 0;
+        our_ip.addr.u_addr.ip6.addr[2] = 0;
+        our_ip.addr.u_addr.ip6.addr[3] = 0;
+        our_ip.addr.u_addr.ip6.zone = 0;
+        mdns_delegate_hostname_add("circuitpython", &our_ip);
+    }
 }
 
 void common_hal_mdns_server_construct(mdns_server_obj_t *self, mp_obj_t network_interface) {
@@ -69,7 +71,7 @@ void common_hal_mdns_server_construct(mdns_server_obj_t *self, mp_obj_t network_
     if (inited) {
         mp_raise_RuntimeError(translate("mDNS already initialized"));
     }
-    mdns_server_construct(self);
+    mdns_server_construct(self, false);
 }
 
 void common_hal_mdns_server_deinit(mdns_server_obj_t *self) {
@@ -104,6 +106,48 @@ void common_hal_mdns_server_set_instance_name(mdns_server_obj_t *self, const cha
     self->instance_name = instance_name;
 }
 
+size_t mdns_server_find(mdns_server_obj_t *self, const char *service_type, const char *protocol,
+    mp_float_t timeout, mdns_remoteservice_obj_t *out, size_t out_len) {
+    mdns_search_once_t *search = mdns_query_async_new(NULL, service_type, protocol, MDNS_TYPE_PTR, timeout * 1000, 255, NULL);
+    if (search == NULL) {
+        return 0;
+    }
+    mdns_result_t *results;
+    while (!mdns_query_async_get_results(search, 1, &results)) {
+        RUN_BACKGROUND_TASKS;
+    }
+    mdns_query_async_delete(search);
+    // Count how many results we got.
+    // TODO: Remove this loop when moving off 4.4. Newer APIs will give us num_results
+    // back directly.
+    mdns_result_t *next = results;
+    uint8_t num_results = 0;
+    while (next != NULL) {
+        num_results++;
+        next = next->next;
+    }
+
+    next = results;
+    // Don't error if we're out of memory. Instead, truncate the tuple.
+    uint8_t added = 0;
+    while (next != NULL && added < out_len) {
+        mdns_remoteservice_obj_t *service = &out[added];
+
+        service->result = next;
+        service->base.type = &mdns_remoteservice_type;
+        next = next->next;
+        // Break the linked list so we free each result separately.
+        service->result->next = NULL;
+        added++;
+    }
+    if (added < out_len) {
+        // Free the remaining results from the IDF because we don't have
+        // enough space in Python.
+        mdns_query_results_free(next);
+    }
+    return num_results;
+}
+
 mp_obj_t common_hal_mdns_server_find(mdns_server_obj_t *self, const char *service_type, const char *protocol, mp_float_t timeout) {
     mdns_search_once_t *search = mdns_query_async_new(NULL, service_type, protocol, MDNS_TYPE_PTR, timeout * 1000, 255, NULL);
     if (search == NULL) {
diff --git a/ports/espressif/common-hal/wifi/Radio.c b/ports/espressif/common-hal/wifi/Radio.c
@@ -48,6 +48,10 @@
 
 #define MAC_ADDRESS_LENGTH 6
 
+#include "esp_log.h"
+
+static const char *TAG = "radio";
+
 static void set_mode_station(wifi_radio_obj_t *self, bool state) {
     wifi_mode_t next_mode;
     if (state) {
@@ -236,11 +240,12 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t
     if (!common_hal_wifi_radio_get_enabled(self)) {
         mp_raise_RuntimeError(translate("wifi is not enabled"));
     }
+    ESP_LOGI(TAG, "connect");
     wifi_config_t *config = &self->sta_config;
 
-    size_t timeout_ms = timeout * 1000;
-    uint32_t start_time = common_hal_time_monotonic_ms();
-    uint32_t end_time = start_time + timeout_ms;
+    // size_t timeout_ms = timeout * 1000;
+    // uint32_t start_time = common_hal_time_monotonic_ms();
+    // uint32_t end_time = start_time + timeout_ms;
 
     EventBits_t bits;
     // can't block since both bits are false after wifi_init
@@ -304,7 +309,9 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t
     esp_wifi_set_config(ESP_IF_WIFI_STA, config);
     self->starting_retries = 5;
     self->retries_left = 5;
+    ESP_LOGI(TAG, "wifi connect");
     esp_wifi_connect();
+    ESP_LOGI(TAG, "wifi connect done");
 
     do {
         RUN_BACKGROUND_TASKS;
@@ -314,10 +321,11 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t
             pdTRUE,
             0);
         // Don't retry anymore if we're over our time budget.
-        if (self->retries_left > 0 && common_hal_time_monotonic_ms() > end_time) {
-            self->retries_left = 0;
-        }
+        // if (self->retries_left > 0 && common_hal_time_monotonic_ms() > end_time) {
+        //     self->retries_left = 0;
+        // }
     } while ((bits & (WIFI_CONNECTED_BIT | WIFI_DISCONNECTED_BIT)) == 0 && !mp_hal_is_interrupted());
+    ESP_LOGI(TAG, "connect done");
     if ((bits & WIFI_DISCONNECTED_BIT) != 0) {
         if (self->last_disconnect_reason == WIFI_REASON_AUTH_FAIL) {
             return WIFI_RADIO_ERROR_AUTH_FAIL;
diff --git a/ports/espressif/common-hal/wifi/__init__.c b/ports/espressif/common-hal/wifi/__init__.c
@@ -44,7 +44,7 @@ wifi_radio_obj_t common_hal_wifi_radio_obj;
 
 #include "supervisor/workflow.h"
 
-static const char *TAG = "wifi";
+static const char *TAG = "CP wifi";
 
 static void event_handler(void *arg, esp_event_base_t event_base,
     int32_t event_id, void *event_data) {
diff --git a/ports/espressif/esp-idf-config/sdkconfig.defaults b/ports/espressif/esp-idf-config/sdkconfig.defaults
@@ -297,7 +297,7 @@ CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2304
 CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192
 CONFIG_ESP_MINIMAL_SHARED_STACK_SIZE=2048
 CONFIG_ESP_INT_WDT=y
-CONFIG_ESP_INT_WDT_TIMEOUT_MS=300
+CONFIG_ESP_INT_WDT_TIMEOUT_MS=1000
 CONFIG_ESP_INT_WDT_CHECK_CPU1=y
 # CONFIG_ESP_TASK_WDT is not set
 # CONFIG_ESP_PANIC_HANDLER_IRAM is not set
@@ -805,9 +805,9 @@ CONFIG_LOG_BOOTLOADER_LEVEL_INFO=y
 CONFIG_LOG_BOOTLOADER_LEVEL=3
 # CONFIG_APP_ROLLBACK_ENABLE is not set
 # CONFIG_FLASH_ENCRYPTION_ENABLED is not set
-# CONFIG_FLASHMODE_QIO is not set
+CONFIG_FLASHMODE_QIO=y
 # CONFIG_FLASHMODE_QOUT is not set
-CONFIG_FLASHMODE_DIO=y
+# CONFIG_FLASHMODE_DIO is not set
 # CONFIG_FLASHMODE_DOUT is not set
 # CONFIG_MONITOR_BAUD_9600B is not set
 # CONFIG_MONITOR_BAUD_57600B is not set
diff --git a/shared-bindings/mdns/Server.c b/shared-bindings/mdns/Server.c
@@ -136,7 +136,7 @@ MP_PROPERTY_GETSET(mdns_server_instance_name_obj,
 //|         :param float/int timeout: Time to wait for responses"""
 //|         ...
 //|
-STATIC mp_obj_t mdns_server_find(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+STATIC mp_obj_t _mdns_server_find(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     mdns_server_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
     check_for_deinit(self);
 
@@ -156,7 +156,7 @@ STATIC mp_obj_t mdns_server_find(mp_uint_t n_args, const mp_obj_t *pos_args, mp_
 
     return common_hal_mdns_server_find(self, service_type, protocol, timeout);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mdns_server_find_obj, 1, mdns_server_find);
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mdns_server_find_obj, 1, _mdns_server_find);
 
 //|     def advertise_service(self, *,  service_type: str, protocol: str, port: int) -> None:
 //|         """Respond to queries for the given service with the given port.
diff --git a/shared-bindings/mdns/Server.h b/shared-bindings/mdns/Server.h
@@ -30,6 +30,8 @@
 
 #include "common-hal/mdns/Server.h"
 
+#include "shared-bindings/mdns/RemoteService.h"
+
 extern const mp_obj_type_t mdns_server_type;
 
 void common_hal_mdns_server_construct(mdns_server_obj_t *self, mp_obj_t network_interface);
@@ -43,4 +45,6 @@ mp_obj_t common_hal_mdns_server_find(mdns_server_obj_t *self, const char *servic
 void common_hal_mdns_server_advertise_service(mdns_server_obj_t *self, const char *service_type, const char *protocol, mp_int_t port);
 
 // For internal use.
-void mdns_server_construct(mdns_server_obj_t *self);
+void mdns_server_construct(mdns_server_obj_t *self, bool workflow);
+size_t mdns_server_find(mdns_server_obj_t *self, const char *service_type, const char *protocol,
+    mp_float_t timeout, mdns_remoteservice_obj_t *out, size_t out_len);
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
