@mikrojs/native 0.6.0-pr-70.gd2fdc0d → 0.6.0

package/CMakeLists.txt

@@ -81,7 +81,7 @@ endif()
 include(cmake/mikrojs_bytecode.cmake)
 mikrojs_generate_bytecode(
     RUNTIME_DIR "${CMAKE_CURRENT_SOURCE_DIR}/runtime"
-    MODULES cbor env result schema fs http/helpers http/request i2c kv/nvs kv/rtc kv/shared neopixel observable observable/operators pin pwm reader sleep spi sntp stdio stream sys test uart udp wifi
+    MODULES cbor env result schema fs http/helpers http/request i2c kv/nvs kv/rtc kv/shared neopixel observable observable/lazy observable/operators pin pwm reader sleep spi sntp stdio stream sys test uart udp wifi
     MODULE_PREFIX "mikrojs"
     SYMBOL_PREFIX "mikrojs"
     TARGET gen_bytecode

package/include/mikrojs/mikrojs.h

@@ -30,7 +30,8 @@ typedef struct MIKConfig {
     uint32_t mem_reserved;
     uint32_t fs_read_max; /* 0 = keep runtime default (65536) */
     char entry_point[128];
-    char wifi_country[3]; /* Two-letter country code + NUL, e.g. "NO" */
+    char wifi_country[3];   /* Two-letter country code + NUL, e.g. "NO" */
+    char wifi_hostname[64]; /* DHCP hostname; empty = use mikrojs-<device-id> default */
 } MIKConfig;
 
 void MIK_DefaultConfig(MIKConfig* config);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikrojs/native",
-  "version": "0.6.0-pr-70.gd2fdc0d",
+  "version": "0.6.0",
   "description": "Mikro.js C++ runtime library and Node.js native addon",
   "keywords": [
     "esp32",
@@ -78,7 +78,7 @@
     "cmake-js": "^8.0.0",
     "node-addon-api": "^8.7.0",
     "node-gyp-build": "^4.8.4",
-    "@mikrojs/quickjs": "0.6.0-pr-70.gd2fdc0d"
+    "@mikrojs/quickjs": "0.6.0"
   },
   "devDependencies": {
     "@swc/core": "^1.15.30",

package/runtime/ble/ble.ts

@@ -1,8 +1,7 @@
-import {Observable} from 'mikrojs/observable'
+import {lazyEvent} from 'mikrojs/observable/lazy'
 import {err, ok} from 'mikrojs/result'
 import {Ble as NativeBle} from 'native:ble'
 
-import type {Subscriber} from '../observable/types.js'
 import type {Result} from '../result/types.js'
 import type {
   AdvertiseHandle,
@@ -143,32 +142,6 @@ function normalizeServices(services: Service[]) {
 
 const native = new NativeBle()
 
-/* Lazy-attach: native.on runs only after the first JS subscriber and is
- * removed when the last one leaves. Same pattern as wifi.ts; see the note
- * there for the mbedTLS internal-RAM rationale. */
-function lazyEvent<T>(eventName: string): Observable<T> {
-  const subscribers: Subscriber<T>[] = []
-  function handler(value: unknown): void {
-    const snapshot = subscribers.slice()
-    for (const s of snapshot) {
-      if (!s.closed) s.next(value as T)
-    }
-  }
-  return new Observable<T>((sub) => {
-    subscribers.push(sub)
-    if (subscribers.length === 1) {
-      native.on(eventName, handler)
-    }
-    sub.addTeardown(() => {
-      const i = subscribers.indexOf(sub)
-      if (i >= 0) subscribers.splice(i, 1)
-      if (subscribers.length === 0) {
-        native.off(eventName, handler)
-      }
-    })
-  })
-}
-
 const ble: Ble = {
   get name(): string {
     return native.getName()
@@ -248,9 +221,9 @@ const peripheral: Peripheral = {
     return ok(handle)
   },
 
-  onConnect: lazyEvent<ConnectionInfo>('connect'),
-  onDisconnect: lazyEvent<ConnectionInfo>('disconnect'),
-  onMtu: lazyEvent<MtuInfo>('mtu'),
+  onConnect: lazyEvent<ConnectionInfo>(native, 'connect'),
+  onDisconnect: lazyEvent<ConnectionInfo>(native, 'disconnect'),
+  onMtu: lazyEvent<MtuInfo>(native, 'mtu'),
 }
 
 export {ble, peripheral}

package/runtime/internal.d.ts

@@ -11,6 +11,10 @@ declare module 'mikrojs/kv/shared' {
   export {KVError, makeCreateValue, type NativeKvFns} from './kv/shared.js'
 }
 
+declare module 'mikrojs/observable/lazy' {
+  export {lazyEvent} from './observable/lazy.js'
+}
+
 declare module 'native:cbor' {
   import type {CborError} from '@mikrojs/native/runtime/cbor/types'
   import type {Result} from 'mikrojs/result'
@@ -411,7 +415,6 @@ declare module 'native:wifi' {
     // Network config
     mac(): R<string>
     getHostname(): string | undefined
-    setHostname(hostname: string): R<void>
     getIpConfig(): R<{ip: string; netmask: string; gateway: string; dns: string} | undefined>
     setIpConfig(opts: {
       ip?: string
@@ -450,7 +453,6 @@ declare module 'native:wifi' {
     getPowerSave(): string
     setPowerSave(mode: string): R<void>
     getCountry(): string | undefined
-    setCountry(cc: string): R<void>
   }
 
   export declare const Wifi: {

package/runtime/observable/lazy.ts

@@ -0,0 +1,39 @@
+import {Observable} from 'native:observable'
+
+import type {Subscriber} from './types.js'
+
+/* Lazy-attach Observable: native.on is only called once a JS subscriber
+ * appears, and native.off runs when the last one unsubscribes. Code paths
+ * that import the host module (wifi/ble/...) but don't subscribe take the
+ * exact same internal-RAM path as before observables existed — important
+ * because mbedTLS handshake needs ~16 KB contiguous internal SRAM and each
+ * eager closure pinned at module load chips into that headroom. */
+
+interface NativeEventSource {
+  on(event: string, listener: (...args: unknown[]) => void): void
+  off(event: string, listener: (...args: unknown[]) => void): void
+}
+
+export function lazyEvent<T>(source: NativeEventSource, eventName: string): Observable<T> {
+  const subscribers: Subscriber<T>[] = []
+  function handler(value: unknown): void {
+    /* Snapshot so unsubscribes during dispatch don't shift indices. */
+    const snapshot = subscribers.slice()
+    for (const s of snapshot) {
+      if (!s.closed) s.next(value as T)
+    }
+  }
+  return new Observable<T>((sub) => {
+    subscribers.push(sub)
+    if (subscribers.length === 1) {
+      source.on(eventName, handler)
+    }
+    sub.addTeardown(() => {
+      const i = subscribers.indexOf(sub)
+      if (i >= 0) subscribers.splice(i, 1)
+      if (subscribers.length === 0) {
+        source.off(eventName, handler)
+      }
+    })
+  })
+}

package/runtime/observable/operators.ts

@@ -17,12 +17,16 @@
  * See `.claude/plans/observable.md` for the full design.
  */
 
-/* Importing from `mikrojs/observable` (not `native:observable`) so this
- * module typechecks from any package that already re-exports it. At runtime
- * `mikrojs/observable` resolves to the bytecode bundle which re-exports the
- * native class; at typecheck it resolves to the ambient `declare class` in
- * runtime/observable/types.ts. */
-import {Observable} from 'mikrojs/observable'
+import {Observable as NativeObservable} from 'native:observable'
+
+import type {Observable as ObservableT} from './types.js'
+
+/* `native:observable` resolves only inside the runtime build; outside
+ * (twoslash, host typecheck without internal.d.ts) it falls back to `any`,
+ * which collapses pipe/operator inference at use sites. Pin the type to the
+ * declared class in `./types.ts` so consumers always see the typed shape. */
+const Observable = NativeObservable as unknown as typeof ObservableT
+type Observable<Ok, Err = never> = ObservableT<Ok, Err>
 
 /* Catch a thrown error and re-throw it on the next tick. The synchronous
  * caller keeps going; the error eventually surfaces as an uncaught

package/runtime/udp/udp.ts

@@ -1,5 +1,5 @@
-import {Observable} from 'mikrojs/observable'
 import {ok} from 'mikrojs/result'
+import {Observable} from 'native:observable'
 import {bind as nativeBind, type NativeUdpSocket} from 'native:udp'
 
 import type {Subscriber} from '../observable/types.js'

package/runtime/wifi/types.ts

@@ -130,7 +130,7 @@ export interface Wifi {
   readonly onRssiLow: Observable<number>
 
   readonly mac: string
-  hostname: string | undefined
+  readonly hostname: string | undefined
   ipConfig(): Result<IpConfig | undefined, WifiError>
   ipConfig(opts: StaticIpConfig): Result<void, WifiError>
   ipConfig(opts?: StaticIpConfig): Result<IpConfig | undefined, WifiError> | Result<void, WifiError>
@@ -141,7 +141,7 @@ export interface Wifi {
   rssiThreshold: number
 
   powerSave: PowerSaveMode
-  country: WifiCountryCode | undefined
+  readonly country: WifiCountryCode | undefined
 }
 
 export declare const wifi: Wifi

package/runtime/wifi/wifi.ts

@@ -1,8 +1,7 @@
-import {Observable} from 'mikrojs/observable'
+import {lazyEvent} from 'mikrojs/observable/lazy'
 import {err, ok} from 'mikrojs/result'
 import {Wifi as NativeWifi} from 'native:wifi'
 
-import type {Subscriber} from '../observable/types.js'
 import type {Result} from '../result/types.js'
 import type {
   ApStartOptions,
@@ -38,36 +37,6 @@ const StatusFromCode = new Map<number, WifiStatus>(
 
 const native = new NativeWifi()
 
-/* Lazy-attach Observable: native.on is only called once a JS subscriber
- * appears, and native.off runs when the last one unsubscribes. Code paths
- * that import wifi but don't subscribe (e.g. a fetch-only flow) take the
- * exact same internal-RAM path as before observables existed — important
- * because mbedTLS handshake needs ~16 KB contiguous internal SRAM and
- * each eager closure pinned at module load chips into that headroom. */
-function lazyEvent<T>(eventName: string): Observable<T> {
-  const subscribers: Subscriber<T>[] = []
-  function handler(value: unknown): void {
-    /* Snapshot so unsubscribes during dispatch don't shift indices. */
-    const snapshot = subscribers.slice()
-    for (const s of snapshot) {
-      if (!s.closed) s.next(value as T)
-    }
-  }
-  return new Observable<T>((sub) => {
-    subscribers.push(sub)
-    if (subscribers.length === 1) {
-      native.on(eventName, handler)
-    }
-    sub.addTeardown(() => {
-      const i = subscribers.indexOf(sub)
-      if (i >= 0) subscribers.splice(i, 1)
-      if (subscribers.length === 0) {
-        native.off(eventName, handler)
-      }
-    })
-  })
-}
-
 const ap: WifiAp = {
   start(options: ApStartOptions): Result<void, WifiError> {
     return native.apStart(options as Parameters<typeof native.apStart>[0])
@@ -102,8 +71,8 @@ const ap: WifiAp = {
     native.apSetInactiveTimeout(seconds)
   },
 
-  onStationConnect: lazyEvent<ApStationInfo>('station-connect'),
-  onStationDisconnect: lazyEvent<ApStationInfo>('station-disconnect'),
+  onStationConnect: lazyEvent<ApStationInfo>(native, 'station-connect'),
+  onStationDisconnect: lazyEvent<ApStationInfo>(native, 'station-disconnect'),
 }
 
 const MAX_CONNECT_RETRIES = 5
@@ -161,9 +130,9 @@ const wifi: Wifi = {
     return ok(asyncResult.value as ScanResult[])
   },
 
-  onConnect: lazyEvent<WifiConnectionInfo>('connect'),
-  onDisconnect: lazyEvent<WifiDisconnectReason>('disconnect'),
-  onRssiLow: lazyEvent<number>('rssi-low'),
+  onConnect: lazyEvent<WifiConnectionInfo>(native, 'connect'),
+  onDisconnect: lazyEvent<WifiDisconnectReason>(native, 'disconnect'),
+  onRssiLow: lazyEvent<number>(native, 'rssi-low'),
 
   get mac(): string {
     const result = native.mac()
@@ -174,12 +143,6 @@ const wifi: Wifi = {
     return native.getHostname()
   },
 
-  set hostname(value: string | undefined) {
-    if (value !== undefined) {
-      native.setHostname(value)
-    }
-  },
-
   ipConfig: ((
     opts?: StaticIpConfig,
   ): Result<IpConfig | undefined, WifiError> | Result<void, WifiError> => {
@@ -219,12 +182,6 @@ const wifi: Wifi = {
   get country(): WifiCountryCode | undefined {
     return native.getCountry() as WifiCountryCode | undefined
   },
-
-  set country(cc: WifiCountryCode | undefined) {
-    if (cc !== undefined) {
-      native.setCountry(cc)
-    }
-  },
 }
 
 export {wifi}

package/src/mik_app_config.cpp

@@ -19,6 +19,7 @@ void MIK_DefaultConfig(MIKConfig* config) {
     config->fs_read_max = 0; /* 0 = runtime default (65536) */
     config->entry_point[0] = '\0';
     config->wifi_country[0] = '\0';
+    config->wifi_hostname[0] = '\0';
 }
 
 /* Minimal JSON parser for config file — avoids cJSON dependency.
@@ -343,8 +344,10 @@ int MIK_LoadConfig(const char* base_path, MIKConfig* config) {
             if (mik__json_get_number(buf, "fsReadMax", &num_val)) {
                 config->fs_read_max = (uint32_t)num_val;
             }
-            mik__json_get_string(buf, "wifiCountry", config->wifi_country,
+            mik__json_get_string(buf, "wifi.country", config->wifi_country,
                                  sizeof(config->wifi_country));
+            mik__json_get_string(buf, "wifi.hostname", config->wifi_hostname,
+                                 sizeof(config->wifi_hostname));
 
             platform->log(MIK_LOG_INFO, TAG,
                            "Loaded config: restart=%d delay=%dms stack=%u reserved=%lu",