@mikrojs/firmware 0.17.0 → 0.17.1-next.20260731001908

package/components/mikrojs/CMakeLists.txt

@@ -117,6 +117,17 @@ target_compile_options(${COMPONENT_LIB} PUBLIC $<$<COMPILE_LANGUAGE:CXX>:-fpermi
 # own C/C++ can be bitten by aliasing UB during optimization.
 target_compile_options(${COMPONENT_LIB} PRIVATE -Wno-implicit-fallthrough -Wno-maybe-uninitialized -Wno-missing-field-initializers -fno-strict-aliasing)
 
+# NDEBUG for the QuickJS sources only: without it quickjs.c enables
+# ENABLE_DUMPS, which adds a list_head (+8 bytes) to every JSString, links
+# each string into rt->string_list, and keeps assert() live in the
+# interpreter. ESP-IDF keeps assertions enabled globally, so NDEBUG is not
+# set project-wide; scoping it here leaves IDF and mikrojs asserts intact.
+# -Wno-unused-but-set-variable: several quickjs.c variables are only read
+# inside assert(), which NDEBUG compiles away.
+set_source_files_properties(${QUICKJS_SOURCES} PROPERTIES
+    COMPILE_DEFINITIONS NDEBUG
+    COMPILE_OPTIONS "-Wno-unused-but-set-variable")
+
 # ── Board and version metadata ──────────────────────────────────────
 execute_process(
     COMMAND node ${_MIK_RESOLVE} version

package/components/mikrojs/mik_wifi.cpp

@@ -253,8 +253,38 @@ static void mik__wifi_event_handler(void* arg, esp_event_base_t event_base, int3
     }
 }
 
+/* Shape the device's stored name into an RFC 1123 hostname label: extract the
+ * name from the `[rev, name]` JSON pair, lowercase it, map anything outside
+ * [a-z0-9] to `-`, collapse runs, trim hyphens at both ends, cap at 63 chars.
+ * Returns false when no usable label comes out. */
+static bool mik__wifi_hostname_from_device_name(char* out, size_t out_size) {
+    const MIKPlatform* platform = MIK_GetPlatform();
+    if (!platform->get_device_name) return false;
+    const char* pair = platform->get_device_name();
+    if (!pair) return false;
+    const char* p = strchr(pair, '"');
+    if (!p) return false;
+    size_t n = 0;
+    for (p++; *p != '\0' && *p != '"'; p++) {
+        /* CLI-validated names contain no escapes; a backslash means this pair
+         * came from somewhere else, so don't guess at decoding it. */
+        if (*p == '\\') return false;
+        char c = *p;
+        if (c >= 'A' && c <= 'Z') c = static_cast<char>(c - 'A' + 'a');
+        if (!((c >= 'a' && c <= 'z') || (c >= '0' && c <= '9'))) c = '-';
+        if (c == '-' && (n == 0 || out[n - 1] == '-')) continue;
+        if (n >= 63 || n + 1 >= out_size) break;
+        out[n++] = c;
+    }
+    while (n > 0 && out[n - 1] == '-') n--;
+    if (n == 0) return false;
+    out[n] = '\0';
+    return true;
+}
+
 /* Pick the DHCP hostname for the STA netif: configured `wifi.hostname` from
- * mikro.config.json takes priority; otherwise default to `mikrojs-<device-id>`.
+ * mikro.config.json takes priority, then the device's stored name (shaped into
+ * a valid hostname label); otherwise default to `mikrojs-<device-id>`.
  * Returns true if a hostname was applied. */
 static bool mik__wifi_apply_hostname(JSContext* ctx) {
     if (!s_sta_netif) return false;
@@ -266,6 +296,9 @@ static bool mik__wifi_apply_hostname(JSContext* ctx) {
             hostname = mik_rt->config.wifi_hostname;
         }
     }
+    if (!hostname && mik__wifi_hostname_from_device_name(buf, sizeof(buf))) {
+        hostname = buf;
+    }
     if (!hostname) {
         const char* dev_id = MIK_GetPlatform()->get_device_id();
         if (!dev_id || !dev_id[0]) return false;

package/components/mikrojs/test/wifi_test.cpp

@@ -4,6 +4,7 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "mikrojs.h"
+#include "mikrojs/platform.h"
 #include "private.h"
 #include "quickjs.h"
 #include "unity.h"
@@ -427,6 +428,46 @@ TEST_CASE("Wifi hostname reflects configured wifi.hostname", "[wifi]") {
     teardown();
 }
 
+TEST_CASE("Wifi hostname falls back to the device name", "[wifi]") {
+    /* No wifi.hostname configured, but a stored device name. The name pair is
+     * NVS-backed, so save and restore whatever the device really has. */
+    const MIKPlatform* platform = MIK_GetPlatform();
+    char saved[256] = {0};
+    const char* prev = platform->get_device_name();
+    bool had_name = prev != nullptr;
+    if (had_name) {
+        snprintf(saved, sizeof(saved), "%s", prev);
+    }
+    platform->set_device_name("[1,\"Living_Room.Sensor\"]");
+
+    esp_wifi_disconnect();
+    vTaskDelay(pdMS_TO_TICKS(100));
+    rt = MIK_NewRuntime();
+    ctx = MIK_GetJSContext(rt);
+    MIKConfig cfg;
+    MIK_DefaultConfig(&cfg);
+    snprintf(cfg.wifi_country, sizeof(cfg.wifi_country), "US");
+    MIK_SetConfig(rt, &cfg);
+
+    JSValue ret = eval_module(R"(
+        import { Wifi } from "native:mikro/wifi";
+        globalThis.__hostname = new Wifi().getHostname();
+    )");
+    /* Restore before any assertion: a failing TEST_ASSERT longjmps out of the
+     * test body, and the hostname was already applied during the eval above. */
+    platform->set_device_name(had_name ? saved : nullptr);
+    TEST_ASSERT_FALSE_MESSAGE(JS_IsException(ret), "Module eval should not throw");
+
+    JSValue global = JS_GetGlobalObject(ctx);
+    JSValue hnVal = JS_GetPropertyStr(ctx, global, "__hostname");
+    const char* hn = JS_ToCString(ctx, hnVal);
+    TEST_ASSERT_EQUAL_STRING("living-room-sensor", hn);
+    JS_FreeCString(ctx, hn);
+    JS_FreeValue(ctx, hnVal);
+    JS_FreeValue(ctx, global);
+    teardown();
+}
+
 TEST_CASE("Wifi getIpConfig returns object with expected keys", "[wifi]") {
     setup();
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikrojs/firmware",
-  "version": "0.17.0",
+  "version": "0.17.1-next.20260731001908",
   "description": "Mikro.js ESP32 firmware: ESP-IDF component, build tools, and project template",
   "keywords": [
     "esp-idf",
@@ -47,8 +47,8 @@
   },
   "dependencies": {
     "esbuild": "^0.28.0",
-    "@mikrojs/quickjs": "0.17.0",
-    "@mikrojs/native": "0.17.0"
+    "@mikrojs/native": "0.17.1-next.20260731001908+ba9853e",
+    "@mikrojs/quickjs": "0.17.1-next.20260731001908+ba9853e"
   },
   "engines": {
     "node": ">=24.0.0"