@mikrojs/firmware 0.20.0 → 0.20.2-next.20260907205905

package/components/mikrojs/CMakeLists.txt

@@ -41,6 +41,17 @@ if(CONFIG_BT_ENABLED)
     list(APPEND _MIK_BLE_SRCS "mik_ble.cpp" "mik_ble_c_shim.c")
 endif()
 
+# The WiFi driver and the `wifi` native module only compile under
+# CONFIG_MIKROJS_WIFI. Nothing else references esp_wifi, so leaving
+# mik_wifi.cpp out is what drops net80211, pp and wpa_supplicant from the
+# link (about 20 KB of static RAM). `esp_wifi` stays in REQUIRES
+# unconditionally: IDF expands REQUIRES before sdkconfig is loaded, so a
+# CONFIG_-gated entry would always be empty there.
+set(_MIK_WIFI_SRCS "")
+if(CONFIG_MIKROJS_WIFI)
+    list(APPEND _MIK_WIFI_SRCS "mik_wifi.cpp")
+endif()
+
 # mik_ota.cpp includes <miniz.h> for tinfl (gunzip). On the esp32c6 the
 # implementation is in the chip mask ROM and the header comes from the
 # always-available `esp_rom` common dependency, so no REQUIRES entry is needed.
@@ -118,7 +129,7 @@ idf_component_register(
     "mik_spi.cpp"
     "mik_sntp.cpp"
     "mik_uart.cpp"
-    "mik_wifi.cpp"
+    ${_MIK_WIFI_SRCS}
 )
 
 # QuickJS headers as SYSTEM includes (suppresses warnings)
@@ -195,8 +206,11 @@ endif()
 include("${MIK_BYTECODE_CMAKE}")
 
 # Force linker to include self-registering native modules
-set(_MIK_MODULES cbor pin i2c i2s spi http http_server wifi rtc nvs_kv sntp sleep neopixel pwm uart ota)
+set(_MIK_MODULES cbor pin i2c i2s spi http http_server rtc nvs_kv sntp sleep neopixel pwm uart ota)
 list(APPEND _MIK_MODULES ota_client)
+if(CONFIG_MIKROJS_WIFI)
+    list(APPEND _MIK_MODULES wifi)
+endif()
 set(_MIK_BYTECODE_MODULES abort cbor env result schema fs http/server i2c i2s kv/nvs kv/rtc kv/shared module neopixel observable observable/lazy observable/operators ota ota/client ota/config pin pwm reader sleep spi sntp stdio stream sys test uart udp watchdog)
 if(CONFIG_BT_ENABLED)
     list(APPEND _MIK_MODULES ble)

package/components/mikrojs/Kconfig

@@ -22,6 +22,32 @@ menu "mikrojs console"
 
 endmenu
 
+menu "mikrojs WiFi"
+
+    config MIKROJS_WIFI
+        bool "Compile the WiFi driver and the mikro/wifi module"
+        default y
+        depends on SOC_WIFI_SUPPORTED
+        help
+            When enabled, the firmware links the ESP-IDF WiFi driver
+            (net80211, pp, wpa_supplicant) and provides the `mikro/wifi`
+            module. The driver takes about 20 KB of internal RAM at boot
+            whether or not the radio is ever started.
+
+            Disable for apps that do all their networking over another
+            link (a cellular modem on a UART, for instance) to get that
+            RAM back. `import 'mikro/wifi'` then throws ReferenceError:
+            Native module 'native:mikro/wifi' is not available, the boot
+            banner lists no WiFi radio and BoardInfo.features omits
+            "wifi". HTTP and SNTP still compile; they need a network
+            interface from elsewhere.
+
+            IDF's own CONFIG_ESP_WIFI_ENABLED cannot do this: it has no
+            prompt on WiFi-capable chips, so setting it to n in
+            sdkconfig.defaults is silently reverted to y.
+
+endmenu
+
 menu "mikrojs runtime memory"
 
     config MIKROJS_QUICKJS_HEAP_PSRAM

package/components/mikrojs/mik_main.cpp

@@ -320,12 +320,14 @@ void MIK_Main(void) {
      * the low-level radio driver is linked, even when no higher-level
      * stack is compiled in. WiFi and BLE each require both silicon support
      * and a corresponding `mikrojs/wifi`/`mikrojs/ble` JS module — we gate
-     * on the CONFIG_* flags as a proxy. 802.15.4 is deliberately omitted
-     * until a `mikrojs/zigbee` or `mikrojs/thread` module ships. */
+     * on the flags that compile those modules in: CONFIG_MIKROJS_WIFI (the
+     * component's own switch, since IDF forces CONFIG_ESP_WIFI_ENABLED on
+     * for capable silicon) and CONFIG_BT_ENABLED. 802.15.4 is deliberately
+     * omitted until a `mikrojs/zigbee` or `mikrojs/thread` module ships. */
     esp_chip_info_t chip_info;
     esp_chip_info(&chip_info);
 
-#if CONFIG_ESP_WIFI_ENABLED
+#if CONFIG_MIKROJS_WIFI
     bool has_wifi = (chip_info.features & CHIP_FEATURE_WIFI_BGN) != 0;
 #else
     bool has_wifi = false;
@@ -744,24 +746,19 @@ void MIK_Main(void) {
         if (safe_mode) {
             ESP_LOGW(TAG, "Safe mode: skipping entry point %s", app_config.entry_point);
         } else {
-            /* Catch async fatals (unhandled rejections) during an OTA trial. */
+            /* Catch fatals during an OTA trial: MIK_RunEntry hands a synchronous
+             * throw to this handler itself, the loop's rejection flush hands it
+             * unhandled rejections. Both note the failure and arm the panic
+             * restart so reconcile reverts on the next (clean-looking) boot. */
             MIK_SetErrorHandler(mik_rt, ota_trial_error_handler, nullptr);
-            char entry_err[160] = {0};
-            int rc = MIK_RunEntryErr(mik_rt, app_config.entry_point, entry_err, sizeof(entry_err));
+            int rc = MIK_RunEntry(mik_rt, app_config.entry_point);
             if (rc == -EINVAL) {
                 ESP_LOGW(TAG, "No entry point configured (no \"main\" field in package.json)");
             } else if (rc == -ENOENT) {
                 ESP_LOGW(TAG, "Entry point not found: %s", app_config.entry_point);
             } else if (rc == -EFAULT) {
+                /* Already reported to the console by the runtime. */
                 ESP_LOGE(TAG, "Failed to evaluate %s", app_config.entry_point);
-                /* A synchronous top-level throw doesn't reach the rejection handler
-                 * above. If this is a trial build, flag it and arm the panic restart
-                 * so reconcile reverts on the next (clean-looking) boot. */
-                if (mik__ota_in_trial()) {
-                    mik__ota_note_trial_failure(entry_err[0] ? entry_err
-                                                             : "entry failed to evaluate");
-                    MIK_Stop(mik_rt);
-                }
             }
         }
     }

package/components/mikrojs/mik_ota_client_module.cpp

@@ -75,6 +75,10 @@ struct MIKOtaClientState {
      * only copy left after ota.reconcile() ran. settle() marks it delivered. */
     bool has_last_install = false;
     MIKOtaDiagnostic last_install = {};
+    /* Set by report() when the stored decline made it into the body, so settle()
+     * clears only a record the registry has seen. A read that failed leaves the
+     * record for the next round. */
+    bool decline_reported = false;
 };
 
 int mik__ota_client_slot = -1;
@@ -350,7 +354,8 @@ JSValue kv_string_or_undefined(JSContext* ctx, const char* key) {
     MIKOtaClientState* state = state_of(ctx);
     if (!state || !state->env || !state->env->kv_get_str) return JS_UNDEFINED;
     char buf[256] = {};
-    if (!state->env->kv_get_str(state->env->opaque, key, buf, sizeof(buf)) || buf[0] == '\0') {
+    if (state->env->kv_get_str(state->env->opaque, key, buf, sizeof(buf)) != MIK_OTA_KV_OK ||
+        buf[0] == '\0') {
         return JS_UNDEFINED;
     }
     return JS_NewString(ctx, buf);
@@ -911,7 +916,8 @@ JSValue ota_report(JSContext* ctx, JSValue, int, JSValue*) {
      * decline(). Without it a registry cannot tell a device still working
      * through a download from one that has stopped. */
     MIKOtaDeclineRecord declined;
-    if (mikrojs::MIKOtaStore(env).GetDecline(&declined)) {
+    state->decline_reported = mikrojs::MIKOtaStore(env).GetDecline(&declined);
+    if (state->decline_reported) {
         JSValue last = JS_NewObject(ctx);
         JS_SetPropertyStr(ctx, last, "checksum", JS_NewString(ctx, declined.checksum));
         JS_SetPropertyStr(ctx, last, "reason", JS_NewString(ctx, declined.reason));
@@ -960,10 +966,13 @@ JSValue ota_settle(JSContext* ctx, JSValue, int argc, JSValue* argv) {
     /* Confirm before the deliveries, as the built-in does: it must settle the
      * document held BEFORE this round, never the one about to be armed. */
     mikrojs::mik__ota_policy_confirm(state->env);
-    /* The round completed, so the cached install report and the stored decline
-     * record were delivered. */
+    /* The round completed, so the cached install report was delivered, and so
+     * was the stored decline record if report() carried it. */
     state->has_last_install = false;
-    mikrojs::MIKOtaStore(state->env).ClearDecline();
+    if (state->decline_reported) {
+        mikrojs::MIKOtaStore(state->env).ClearDecline();
+        state->decline_reported = false;
+    }
 
     bool renamed = false;
     if (usable) {

package/components/mikrojs/mik_ota_env.cpp

@@ -105,11 +105,13 @@ bool env_kv_set_blob(void*, const char* key, const uint8_t* data, size_t len) {
     return kv_write_blob(key, data, len);
 }
 
-bool env_kv_get_str(void*, const char* key, char* out, size_t max_len) {
+MIKOtaKvStatus env_kv_get_str(void*, const char* key, char* out, size_t max_len) {
     uint8_t buf[320];
     size_t len = sizeof(buf);
-    if (kv_read_blob(key, buf, &len) != MIK_OTA_KV_OK) return false;
-    return mik__kv_decode_str(buf, len, out, max_len);
+    MIKOtaKvStatus status = kv_read_blob(key, buf, &len);
+    if (status != MIK_OTA_KV_OK) return status;
+    /* Stored bytes that will not decode are corruption, not absence. */
+    return mik__kv_decode_str(buf, len, out, max_len) ? MIK_OTA_KV_OK : MIK_OTA_KV_ERROR;
 }
 
 bool env_kv_set_str(void*, const char* key, const char* value) {
@@ -119,11 +121,12 @@ bool env_kv_set_str(void*, const char* key, const char* value) {
     return kv_write_blob(key, buf, needed);
 }
 
-bool env_kv_get_i32(void*, const char* key, int32_t* out) {
+MIKOtaKvStatus env_kv_get_i32(void*, const char* key, int32_t* out) {
     uint8_t buf[16];
     size_t len = sizeof(buf);
-    if (kv_read_blob(key, buf, &len) != MIK_OTA_KV_OK) return false;
-    return mik__kv_decode_i32(buf, len, out);
+    MIKOtaKvStatus status = kv_read_blob(key, buf, &len);
+    if (status != MIK_OTA_KV_OK) return status;
+    return mik__kv_decode_i32(buf, len, out) ? MIK_OTA_KV_OK : MIK_OTA_KV_ERROR;
 }
 
 bool env_kv_set_i32(void*, const char* key, int32_t value) {

package/components/mikrojs/test/CMakeLists.txt

@@ -1,5 +1,7 @@
 # ble_test.cpp references mik__ble_consume which is only defined when
-# NimBLE (CONFIG_BT_ENABLED) is available. Exclude it for BT-less builds.
+# NimBLE (CONFIG_BT_ENABLED) is available, and wifi_test.cpp references
+# mik__wifi_consume which needs CONFIG_MIKROJS_WIFI. Exclude each for
+# builds without its stack.
 set(_MIK_TEST_SRCS
     abort_test.cpp
     fs_js_test.cpp
@@ -25,11 +27,13 @@ set(_MIK_TEST_SRCS
     timers_test.cpp
     udp_test.cpp
     watchdog_test.cpp
-    wifi_test.cpp
 )
 if(CONFIG_BT_ENABLED)
     list(APPEND _MIK_TEST_SRCS ble_test.cpp)
 endif()
+if(CONFIG_MIKROJS_WIFI)
+    list(APPEND _MIK_TEST_SRCS wifi_test.cpp)
+endif()
 
 idf_component_register(SRCS ${_MIK_TEST_SRCS}
         INCLUDE_DIRS "."

package/components/mikrojs/test/ota_host/.gitignore

@@ -0,0 +1,2 @@
+.build/
+.cache/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikrojs/firmware",
-  "version": "0.20.0",
+  "version": "0.20.2-next.20260907205905",
   "description": "Mikro.js ESP32 firmware: ESP-IDF component, build tools, and project template",
   "keywords": [
     "esp-idf",
@@ -46,9 +46,9 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "esbuild": "^0.28.0",
-    "@mikrojs/native": "0.20.0",
-    "@mikrojs/quickjs": "0.20.0"
+    "@mikrojs/native": "0.20.2-next.20260907205905+8b6f502",
+    "@mikrojs/quickjs": "0.20.2-next.20260907205905+8b6f502",
+    "esbuild": "^0.28.2"
   },
   "engines": {
     "node": ">=24.0.0"