pxt-common-packages 9.4.7 → 9.4.8

package/libs/wifi---esp32/buildlogin.sh

@@ -0,0 +1 @@
+npx html-minifier --removeAttributeQuotes --collapse-whitespace --remove-comments --remove-optional-tags --remove-redundant-attributes --remove-script-type-attributes --quoteCharacter "'" --remove-tag-whitespace --use-short-doctype --minify-css true --minify-js true --html5 true -o login.html login.full.html

package/libs/wifi---esp32/controller.ts

@@ -1,4 +1,7 @@
 namespace net {
+    //% shim=_wifi::_readLastAccessPointCredentials
+    declare function _readLastAccessPointCredentials(): string[];
+
     const EV_ScanCompleted = 1000
 
     export class WifiController extends net.Controller {
@@ -31,7 +34,6 @@ namespace net {
                 this.networks.push(ap)
                 i += entrySize
             }
-            control.dmesg(`scan completed`)
             control.raiseEvent(_wifi.eventID(), EV_ScanCompleted)
         }
 
@@ -44,6 +46,22 @@ namespace net {
             return this.networks
         }
 
+        public startLoginServer(hostName: string): void {
+            this.disconnect()
+            _wifi.startLoginServer(hostName);
+            control.onEvent(_wifi.eventID(), WifiEvent.AccessPointCredentialsAvailable, () => {
+                const credentials = _readLastAccessPointCredentials()
+                if (!!credentials && credentials.length == 2) {
+                    const ssid = credentials[0]
+                    const pwd = credentials[1]
+                    net.updateAccessPoint(ssid, pwd)
+                    console.debug(`restarting...`);
+                    pause(100);
+                    control.reset();
+                }
+            })
+        }
+
         public disconnectAP() {
             _wifi.disconnect()
         }

package/libs/wifi---esp32/enums.d.ts

@@ -8,6 +8,8 @@
     GotIP = 2,
     //%
     Disconnected = 3,
+    //%
+    AccessPointCredentialsAvailable = 4,
     }
 
 // Auto-generated. Do not edit. Really.

package/libs/wifi---esp32/httpserver.cpp

@@ -0,0 +1,166 @@
+#include "wifi.h"
+#include "esp_netif.h"
+#include "esp_wifi.h"
+#include <esp_http_server.h>
+#include <mdns.h>
+
+#define TAG "http"
+#define LOG(...) ESP_LOGI(TAG, __VA_ARGS__)
+
+namespace _wifi {
+
+static httpd_handle_t _server = NULL;
+static const char* _lastApBuffer = NULL;
+static wifi_config_t wifi_config;
+
+esp_err_t login_handler(httpd_req_t *req)
+{
+    LOG("login");
+    const char resp[] = "<style>html{background:#aaa}*{font-size:xx-large;font-family:monospace}form{min-height:100vh;display:flex;justify-content:center;align-items:center;flex-direction:column;gap:.5rem}</style><meta name='viewport'content='width=device-width,initial-scale=1'><form action='/add-ap'><label for='ssid'>WiFi:</label> <input name='name'id='ssid'placeholder='WiFi'required> <label for='password'>Password:</label> <input type='password'name='password'id='password'placeholder='Password'required> <input id='submit'type='submit'value='connect'></form>";
+    httpd_resp_send(req, resp, HTTPD_RESP_USE_STRLEN);
+    return ESP_OK;
+}
+
+esp_err_t add_ap_handler(httpd_req_t *req)
+{
+    LOG("add_ap");
+
+    /* Read URL query string length and allocate memory for length + 1,
+     * extra byte for null termination */
+    size_t buf_len = httpd_req_get_url_query_len(req) + 1;
+    if (buf_len > 1 && buf_len < 256) {
+        char* buf = (char*)malloc(buf_len);
+        if (httpd_req_get_url_query_str(req, buf, buf_len) == ESP_OK) {
+            char name[64];
+            char password[64];
+            /* Get value of expected key from query string */
+            if ((httpd_query_key_value(buf, "name", name, sizeof(name)) == ESP_OK) &&
+                (httpd_query_key_value(buf, "password", password, sizeof(password)) == ESP_OK)) {
+                // save ap info, let TS handle it
+                if (NULL == _lastApBuffer) {
+                    _lastApBuffer = buf;
+                    pxt::raiseEvent(_wifi::eventID(), (int)_wifi::WifiEvent::AccessPointCredentialsAvailable);
+                    return ESP_OK;
+                }
+            }
+        }
+        free(buf);
+        return ESP_OK;
+    }
+
+    httpd_resp_send_500(req);
+    return ESP_OK;
+}
+
+//%
+RefCollection *_readLastAccessPointCredentials() {
+    auto res = Array_::mk();
+    registerGCObj(res);
+
+    char name[64];
+    char password[64];
+    /* Get value of expected key from query string */
+    if (NULL != _lastApBuffer &&
+        (httpd_query_key_value(_lastApBuffer, "name", name, sizeof(name)) == ESP_OK) &&
+        (httpd_query_key_value(_lastApBuffer, "password", password, sizeof(password)) == ESP_OK)) {
+
+        {
+            auto str = mkString(name, -1);
+            registerGCObj(str);
+            res->head.push((TValue)str);
+            unregisterGCObj(str);
+        }   
+        {
+            auto str = mkString(password, -1);
+            registerGCObj(str);
+            res->head.push((TValue)str);
+            unregisterGCObj(str);
+        }
+    }
+
+    unregisterGCObj(res);
+    return res;
+}
+
+// HTTP Error (404) Handler - Redirects all requests to the root page
+esp_err_t http_404_error_handler(httpd_req_t *req, httpd_err_code_t err)
+{
+    // Set status
+    httpd_resp_set_status(req, "302 Temporary Redirect");
+    // Redirect to the "/" root directory
+    httpd_resp_set_hdr(req, "Location", "/");
+    // iOS requires content in the response to detect a captive portal, simply redirecting is not sufficient.
+    httpd_resp_send(req, "Redirect to the captive portal", HTTPD_RESP_USE_STRLEN);
+
+    ESP_LOGI(TAG, "Redirecting to root");
+    return ESP_OK;
+}
+
+/* URI handler structure for GET / */
+httpd_uri_t login_get = {
+    .uri      = "/",
+    .method   = HTTP_GET,
+    .handler  = login_handler,
+    .user_ctx = NULL
+};
+
+/* URI handler structure for POST /uri */
+httpd_uri_t add_ap_get = {
+    .uri      = "/add-ap",
+    .method   = HTTP_GET,
+    .handler  = add_ap_handler,
+    .user_ctx = NULL
+};
+
+/* Function for starting the webserver */
+static void init(const char* hostName)
+{
+    LOG("starting login server %s", hostName);
+    const char* ssid = hostName;
+
+    esp_netif_create_default_wifi_ap();
+
+    wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
+    ESP_ERROR_CHECK(esp_wifi_init(&cfg));
+
+    memcpy(wifi_config.ap.ssid, ssid, strlen(ssid));
+    wifi_config.ap.ssid_len = static_cast<uint8_t>(strlen(ssid));
+    wifi_config.ap.channel = 11;
+    wifi_config.ap.max_connection = 1;
+    wifi_config.ap.authmode = WIFI_AUTH_OPEN;
+
+    ESP_ERROR_CHECK(esp_wifi_set_storage(WIFI_STORAGE_RAM));
+    ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_APSTA));
+    ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_AP, &wifi_config));    
+
+    /* Generate default configuration */
+    httpd_config_t config = HTTPD_DEFAULT_CONFIG();
+
+    /* Empty handle to esp_http_server */
+    httpd_handle_t server = NULL;
+
+    ESP_ERROR_CHECK(httpd_start(&server, &config));
+
+    httpd_register_uri_handler(server, &login_get);
+    httpd_register_uri_handler(server, &add_ap_get);
+    httpd_register_err_handler(server, HTTPD_404_NOT_FOUND, http_404_error_handler);
+
+    esp_netif_ip_info_t ip_info;
+    esp_netif_get_ip_info(esp_netif_get_handle_from_ifkey("WIFI_AP_DEF"), &ip_info);
+    LOG("SoftAP ip: " IPSTR, IP2STR(&ip_info.ip));
+
+    LOG("start mDNS service %s", hostName);
+    ESP_ERROR_CHECK(mdns_init());
+    ESP_ERROR_CHECK(mdns_hostname_set(hostName));
+    ESP_ERROR_CHECK(mdns_service_add(NULL, "_http", "_tcp", 80, NULL, 0));
+
+    _server = server;
+}
+
+void startHttpServer(const char* hostName) {
+    if (NULL == _server) {
+        init(hostName);
+    }
+}
+
+}

package/libs/wifi---esp32/login.full.html

@@ -0,0 +1,37 @@
+<html>
+  <head>
+    <style>
+      html {
+        background: #aaa;
+      }
+      * {
+        font-size: xx-large;
+        font-family: monospace;
+      }
+      form {
+        min-height: 100vh;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        flex-direction: column;
+        gap: 0.5rem;
+      }
+    </style>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  </head>
+  <body>
+    <form action="/add-ap">
+      <label for="ssid">WiFi:</label>
+      <input type="text" name="name" id="ssid" placeholder="WiFi" required />
+      <label for="password">Password:</label>
+      <input
+        type="password"
+        name="password"
+        id="password"
+        placeholder="Password"
+        required
+      />
+      <input id="submit" type="submit" value="connect" />
+    </form>
+  </body>
+</html>

package/libs/wifi---esp32/login.html

@@ -0,0 +1 @@
+<style>html{background:#aaa}*{font-size:xx-large;font-family:monospace}form{min-height:100vh;display:flex;justify-content:center;align-items:center;flex-direction:column;gap:.5rem}</style><meta name='viewport'content='width=device-width,initial-scale=1'><form action='/add-ap'><label for='ssid'>WiFi:</label> <input name='name'id='ssid'placeholder='WiFi'required> <label for='password'>Password:</label> <input type='password'name='password'id='password'placeholder='Password'required> <input id='submit'type='submit'value='connect'></form>

package/libs/wifi---esp32/pxt.json

@@ -7,6 +7,7 @@
         "enums.d.ts",
         "controller.ts",
         "wifi.h",
+        "httpserver.cpp",
         "socket.cpp",
         "wifi.cpp"
     ],

package/libs/wifi---esp32/shims.d.ts

@@ -35,6 +35,10 @@ declare namespace _wifi {
     //% shim=_wifi::scanStart
     function scanStart(): void;
 
+    /** Starts an HTTP server with a login dialog route */
+    //% shim=_wifi::startLoginServer
+    function startLoginServer(hostName: string): void;
+
     /** Get the results of the scan if any. */
     //% shim=_wifi::scanResults
     function scanResults(): Buffer;

package/libs/wifi---esp32/sim/wifisockets.ts

@@ -248,6 +248,9 @@ namespace pxsim._wifi {
         _raiseEvent(WifiEvent.ScanDone)
     }
 
+    export function startLoginServer(): void {
+    }
+
     export function scanResults(): RefBuffer {
         const b = new Uint8Array(7)
         b[0] = -20 // rssi

package/libs/wifi---esp32/wifi.cpp

@@ -1,5 +1,4 @@
 #include "wifi.h"
-
 #include "freertos/event_groups.h"
 #include "esp_wifi.h"
 #include "esp_netif.h"
@@ -12,15 +11,6 @@ void settings_init(void);
 
 namespace _wifi {
 
-enum class WifiEvent {
-    //%
-    ScanDone = 1,
-    //%
-    GotIP = 2,
-    //%
-    Disconnected = 3,
-};
-
 /** Get ID used in events. */
 //%
 int eventID() {
@@ -65,16 +55,17 @@ static void init() {
 
     settings_init();
 
+    ESP_ERROR_CHECK(esp_netif_init());
     ESP_ERROR_CHECK(esp_event_loop_create_default());
+
     wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
     ESP_ERROR_CHECK(esp_wifi_init(&cfg));
 
-    esp_netif_init();
     esp_netif_config_t netif_config = ESP_NETIF_DEFAULT_WIFI_STA();
     esp_netif_t *netif = esp_netif_new(&netif_config);
     assert(netif);
-    esp_netif_attach_wifi_station(netif);
-    esp_wifi_set_default_wifi_sta_handlers();
+    ESP_ERROR_CHECK(esp_netif_attach_wifi_station(netif));
+    ESP_ERROR_CHECK(esp_wifi_set_default_wifi_sta_handlers());
 
     ESP_ERROR_CHECK(
         esp_event_handler_register(WIFI_EVENT, WIFI_EVENT_SCAN_DONE, &scan_done_handler, NULL));
@@ -84,8 +75,8 @@ static void init() {
         esp_event_handler_register(IP_EVENT, IP_EVENT_STA_GOT_IP, &got_ip_handler, NULL));
     ESP_ERROR_CHECK(esp_wifi_set_storage(WIFI_STORAGE_RAM));
     ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA));
-    // ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_NULL));
     ESP_ERROR_CHECK(esp_wifi_start());
+
     initialized = true;
 }
 
@@ -93,6 +84,7 @@ static void init() {
 //%
 void scanStart() {
     init();
+
     scan_done = false;
     wifi_scan_config_t scan_config;
     memset(&scan_config, 0, sizeof(scan_config));
@@ -101,6 +93,13 @@ void scanStart() {
     LOG("scan start: %d", err);
 }
 
+/** Starts an HTTP server with a login dialog route */
+//%
+void startLoginServer(String hostName) {
+    init();
+    _wifi::startHttpServer(hostName->getUTF8Data());
+}
+
 #define JD_WIFI_APFLAGS_HAS_PASSWORD 0x1
 #define JD_WIFI_APFLAGS_WPS 0x2
 #define JD_WIFI_APFLAGS_HAS_SECONDARY_CHANNEL_ABOVE 0x4

package/libs/wifi---esp32/wifi.h

@@ -8,5 +8,17 @@ namespace pxt {
 } // namespace pxt
 
 namespace _wifi {
-int eventID();
+    enum class WifiEvent {
+        //%
+        ScanDone = 1,
+        //%
+        GotIP = 2,
+        //%
+        Disconnected = 3,
+        //%
+        AccessPointCredentialsAvailable = 4
+    };
+
+    int eventID();
+    void startHttpServer(const char* hostName);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pxt-common-packages",
-  "version": "9.4.7",
+  "version": "9.4.8",
   "description": "Microsoft MakeCode (PXT) common packages",
   "keywords": [
     "MakeCode",