Merge branch 'public' of https://github.com/rmontrosecbw/moddable into Wiznet_W5500_Ethernet_support

* 'public' of https://github.com/rmontrosecbw/moddable:
  include manifest file of embedded:io/provider/MCP23X17
  Add MCP23017 expander module to manifest
  add xsCallFunction* Moddable-OpenSource#1536
  don't need to import UDP
  first try at 419 mDNS typings
  419 mdns - first time
  xsbug & mcsim icons for macOS Tahoe
  xsbug & mcsim icons for macOS Tahoe
  xsbug & mcsim icons for macOS Tahoe
  The mbedtls include path in Espressif SDK version 5.5.x is $(IDF_PATH)/components/mbedtls/mbedtls/include/. This is correct in make.esp32.mk but was left out of nmake.esp32.mk Moddable-OpenSource#1534
  Fix typo in controller
  fix default manifest for git repos Moddable-OpenSource#1532
  option to use Map for txt record
  changes from TC53 discussion
  XS linker; fix byte code map of strings > 64 KB
  onReady isn't passed connection

Author: rmontrosecbw

contributed/conversationalAI/Controller.js

@@ -136,7 +136,7 @@ class Controller extends Behavior {
 				const service = assets.services[option.service];
 				const voiceName = option.voiceName;
 				const voice = service.voices.find(voice => voice.id == voiceName);
-				persona.voiceName = voice ? voiceName : sercice.defaultVoice;
+				persona.voiceName = voice ? voiceName : service.defaultVoice;
 			}
 		}
 	}

documentation/xs/XS in C.md

@@ -36,7 +36,7 @@
 -->
 
 # XS in C
-Revised: July 2, 2025
+Revised: October 2, 2025
 
 **See end of document for [copyright and license](#license)**
 
@@ -797,6 +797,10 @@ This section describes the macros related to accessing properties of objects (or
       <td><code>xsCall0</code> ... <code>xsCall7, xsmcCall</code></td>
       <td>Calls the function referred to by a property of an instance</td>
     </tr>
+    <tr>
+      <td><code>xsCallFunction0</code> ... <code> xsCallFunction8</code></td>
+      <td>Calls the function with the provided instance as <code>this</code></td>
+    </tr>
     <tr>
       <td><code>xsNew0</code> ... <code>xsNew7, xsmcNew</code></td>
       <td>Calls the constructor referred to by a property of an instance</td>
@@ -1344,7 +1348,7 @@ this[0](2, 3)
 
 ##### In C:
 
-```
+```c
 xsCall0(xsGlobal, xsID_foo);
 xsCall1(xsThis, xsID("foo"), xsInteger(1));
 xsCall2(xsThis, 0, xsInteger(2), xsInteger(3));
@@ -1385,6 +1389,43 @@ xsmcCall(xsResult, xsThis, 0, &xsVar(1), &xsVar(2), NULL);
 
 ***
 
+#### xsCallFunction*
+
+When you have a reference to a function, you can call the function with one of the `xsCallFunction*` macros (where `*` is `0` through `7`, representing the number of parameter slots passed). If the value is not a reference to a function, the `xsCall*` macro throws an exception.
+
+**`xsSlot xsCallFunction0(xsSlot theFunction, xsSlot theThis)`**<BR>
+**`xsSlot xsCallFunction1(xsSlot theFunction, xsSlot theThis, xsSlot theParam0)`**<BR>
+**`xsSlot xsCallFunction2(xsSlot theFunction, xsSlot theThis, xsSlot theParam0, xsSlot theParam1)`**<BR>
+**`xsSlot xsCallFunction3(xsSlot theFunction, xsSlot theThis, xsSlot theParam0, xsSlot theParam1, xsSlot theParam2)`**<BR>
+**`xsSlot xsCallFunction4(xsSlot theFunction, xsSlot theThis, xsSlot theParam0, xsSlot theParam1, xsSlot theParam2, xsSlot theParam3)`**<BR>
+**`xsSlot xsCallFunction5(xsSlot theFunction, xsSlot theThis, xsSlot theParam0, xsSlot theParam1, xsSlot theParam2, xsSlot theParam3, xsSlot theParam4)`**<BR>
+**`xsSlot xsCallFunction6(xsSlot theFunction, xsSlot theThis, xsSlot theParam0, xsSlot theParam1, xsSlot theParam2, xsSlot theParam3, xsSlot theParam4, xsSlot theParam5)`**<BR>
+**`xsSlot xsCallFunction7(xsSlot theFunction, xsSlot theThis, xsSlot theParam0, xsSlot theParam1, xsSlot theParam2, xsSlot theParam3, xsSlot theParam4, xsSlot theParam5, xsSlot theParam6)`**
+
+| Arguments | Description |
+| --- | :-- |
+| `theFunction` | A reference to a function instance
+| `theThis` | A reference to the instance that will be `this` when the function is called
+| `theParam0` ... `theParam6` | The parameter slots to pass to the function
+
+Returns the result slot of the function
+
+##### In ECMAScript:
+
+```javascript
+foo.call()
+foo.call(device, 12);
+```
+
+##### In C:
+
+```c
+xsCallFunction0(xsGet(xsGlobal, xsID_foo), xsGlobal);
+xsCallFunction1(xsThis, xsID("foo"), xsGet(xsGlobal, xsID("device"), xsInteger(12));
+```
+
+***
+
 <a id="xsnew"></a>
 #### xsNew*
 
@@ -1841,7 +1882,7 @@ XS in C defines the following macros to throw specific exceptions.
 
 ##### In C:
 
-```
+```c
 xpt2046 xpt = calloc(1, sizeof(xpt2046Record));
 if (!xpt) xsUnknownError("out of memory");
 

examples/io/ble/client/temperaturemonitor/main.js

@@ -20,7 +20,7 @@
 
 import {GAPClient, GATTClient} from "embedded:io/bluetoothle/central"
 
-const scan = new GAPClient({
+new GAPClient({
 	services: [
 		"1809"		// temperature monitor
 	],
@@ -41,20 +41,21 @@ function instantiateTemperatureMonitor(address) {
 	new GATTClient({
 		address,
 		security: {		// "just works" security configuration
-			manInTheMiddle: false,	/* default – false */
+			authenticate: false,	/* default – false */
 			bond: false,			/* default – false */
 			display: false,			/* or true – default false */
 			keyboard: false,		/* or true or "yes/no" – default false */
+			lazy: true,				/* default – true */
 		},
 		onError() {
 			trace("connection error\n");
 		},
-		onPasskey(action, number) {
+		onPasskey(action, data) {
 			trace("** implement onPasskey as required by your security settings **\n");
-			this.replyToPasskey(action, number);
+			this.replyToPasskey(action, data);
 		},
 		onSecured(state) {
-			trace(`onSecured: encrypted ${state.encrypted}, authenticated ${state.authenticated}, bonded ${state.bonded}\n`);
+			trace(`onSecured: encrypted ${state.encrypted}, authenticated ${state.authenticated}, keySize ${state.keySize}, bonded ${state.bonded}\n`);
 
 			this.getPrimaryServices([ "1809"], (error, services) => {
 				this.getCharacteristics(services[0], ["2a1c"], (error, characteristics) => {

examples/io/ble/server/heartratemonitor-server/main.js

@@ -17,7 +17,7 @@ import Timer from "timer";
 
 const deviceName = "419 HRM";
 
-let hrm = new GATTServer({
+new GATTServer({
 	mtu: 128,
 	services: [
 		// Generic Access Service
@@ -95,7 +95,7 @@ let hrm = new GATTServer({
 				}
 			]
 		},
-		// Heart Rate notification frequency – custom service and characteristic
+		// Heart Rate notification frequency – custom service and characteristic
 		{
 			uuid: "cfe6f7f2-16d2-4b7e-9253-a1d1c1577a35",
 			characteristics: [
@@ -131,7 +131,7 @@ let hrm = new GATTServer({
 		trace("disconnect!\n");
 		Timer.clear(connection.heartRateTimer);
 	},
-	onReady(connection) {
+	onReady() {
 		trace("hrm onReady\n");
 		this.startAdvertising({
 			flags: 6,

examples/io/dnssd/main.js

@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2025 Moddable Tech, Inc.
+ *
+ *   This file is part of the Moddable SDK.
+ *
+ *   This work is licensed under the
+ *       Creative Commons Attribution 4.0 International License.
+ *   To view a copy of this license, visit
+ *       <http://creativecommons.org/licenses/by/4.0>.
+ *   or send a letter to Creative Commons, PO Box 1866,
+ *   Mountain View, CA 94042, USA.
+ *
+ */
+
+import Timer from "timer";
+
+const mdns = new (device.network.mdns.io)(device.network.mdns);
+
+const claim = mdns.claim({
+	host: "a-server",
+	onReady() {
+		trace(`a-server claimed\n`);
+	},
+	onError() {
+		trace("couldn't claim a-server\n");
+	}
+});
+
+const ad = mdns.advertise({
+	serviceType: "_http._tcp",
+	instanceName: "419 Web Server",
+	host: "a-server",
+	port: 8080,
+	txt: new Map([
+		["home", "/index.html"]
+	]),
+	onError(error) {
+		trace("advertise failed\n");
+	}
+});
+ad.counter = 0;
+
+Timer.repeat(() => {
+	ad.updateTXT(new Map([
+		["home", "/index.html"],
+		["counter", (++ad.counter).toString()],
+	]));
+}, 1000)
+
+mdns.discover({
+	serviceType: "_airplay._tcp",
+	onFound(service) {
+		trace(`Found: "${service.name}" on ${service.host} @ ${service.address}:${service.port}\n`);
+		this.history ??= new Map;
+		const txt = service.txt ?? new Map;
+		this.history.set(service.host, txt); 
+		for (const [key, value] of txt)
+			trace(`  ${key}:${value}\n`);
+	},
+	onUpdate(service) {
+		trace(`Update: ${service.name}\n`);
+
+		const previous = this.history.get(service.host);
+		const txt = service.txt ?? new Map;
+		this.history.set(service.host, txt);
+
+		for (const [key, value] of previous) {
+			if (!txt.has(key))
+				trace(`  removed ${key}:${value}\n`);
+		}
+		for (const [key, value] of txt) {
+			if (!previous.has(key))
+				trace(`  added ${key}:${value}\n`);
+		}
+		for (const [key, value] of txt) {
+			if (previous.has(key) && (previous.get(key) !== txt.get(key)))
+				trace(`  changed ${key} from ${previous.get(key)} to ${txt.get(key)}\n`);
+		}
+	},
+	onLost(service) {
+		trace(`Lost: ${service.name}\n`);
+		this.history.delete(service.host);
+	},
+	onError(error) {
+		trace(`failed\n`);
+	}
+});

examples/io/dnssd/manifest.json

@@ -0,0 +1,10 @@
+{
+	"include": [
+		"$(MODDABLE)/examples/manifest_base.json",
+		"$(MODDABLE)/modules/io/manifest.json",
+		"$(MODULES)/io/dnssd/manifest.json"
+	],
+	"modules": {
+		"*": "./main"
+	}
+}

examples/io/i2c/expander/main.js

@@ -12,7 +12,7 @@
  *
  */
 
-import Expander from "embedded:io/provider/MCP23017";
+import Expander from "embedded:io/provider/MCP23X17";
 
 const expander = new Expander({
 	i2c: device.I2C.default,

examples/io/i2c/expander/manifest.json

@@ -1,7 +1,8 @@
 {
 	"include": [
 		"$(MODDABLE)/examples/manifest_base.json",
-		"$(MODDABLE)/modules/io/manifest.json"
+		"$(MODDABLE)/modules/io/manifest.json",
+		"$(MODDABLE)/modules/io/expander/manifest.json"
 	],
 	"modules": {
 		"*": "./main"

modules/io/ble/client/esp32/bleclient.c

@@ -453,6 +453,7 @@ typedef struct {
 	uint8_t			isClose;
 
 	uint8_t 		secure;
+	uint8_t			lazy;
 
 	BLEGATTCharacteristicValue		values;
 	uint8_t							onReadableInFlight;
@@ -511,7 +512,7 @@ void xs_gattclient_constructor(xsMachine *the)
 {
 	ble_addr_t address;
 	int mtu = 0;
-	uint8_t secure = 0, manInTheMiddle = 0, bond = 0, display = 0, keyboard = 0;
+	uint8_t secure = 0, authenticate = 0, bond = 0, display = 0, keyboard = 0, lazy = 0;
 
 	xsmcVars(2);
 
@@ -540,8 +541,11 @@ void xs_gattclient_constructor(xsMachine *the)
 	if (xsmcHas(xsArg(0), xsID_security)) {
 		xsmcGet(xsVar(0), xsArg(0), xsID_security);
 
-		xsmcGet(xsVar(1), xsVar(0), xsID_manInTheMiddle);
-		manInTheMiddle = xsmcTest(xsVar(1));
+		xsmcGet(xsVar(1), xsVar(0), xsID_authenticate);
+		authenticate = xsmcTest(xsVar(1));
+
+		xsmcGet(xsVar(1), xsVar(0), xsID_lazy);
+		lazy = xsmcTest(xsVar(1));
 
 		xsmcGet(xsVar(1), xsVar(0), xsID_bond);
 		bond = xsmcTest(xsVar(1));
@@ -561,8 +565,8 @@ void xs_gattclient_constructor(xsMachine *the)
 		else
 			keyboard = xsmcTest(xsVar(1));
 
-		if (manInTheMiddle && !(keyboard || display))
-			xsUnknownError("manInTheMiddle requires keyboard and/or display");
+		if (authenticate && !(keyboard || display))
+			xsUnknownError("authenticate requires keyboard and/or display");
 
 		secure = 1;
 	}
@@ -581,6 +585,7 @@ void xs_gattclient_constructor(xsMachine *the)
 	gc->onPasskey = onPasskey;
 	gc->mtu = (uint16_t)mtu;
 	gc->secure = secure;
+	gc->lazy = lazy;
 
 	xsmcSetHostData(xsThis, gc);
 	xsSetHostHooks(xsThis, (xsHostHooks *)&xsGATTClientHooks);
@@ -596,7 +601,7 @@ void xs_gattclient_constructor(xsMachine *the)
 		else
 			ble_hs_cfg.sm_io_cap = display ? BLE_HS_IO_DISPLAY_ONLY : BLE_HS_IO_NO_INPUT_OUTPUT;
 		ble_hs_cfg.sm_bonding = bond;
-		ble_hs_cfg.sm_mitm = manInTheMiddle;
+		ble_hs_cfg.sm_mitm = authenticate;
 	}
 }
 
@@ -835,7 +840,7 @@ static int onGATTMCUExchanged(uint16_t conn_handle, const struct ble_gatt_error
 
 	gattClientExecuted(gc, 0);
 
-	if (gc->secure)
+	if (gc->secure && !gc->lazy)
 		ble_gap_security_initiate(conn_handle);
 
 	return 0;
@@ -860,7 +865,7 @@ int onGATTConnectionEvent(struct ble_gap_event *event, void *arg)
 				gc->mtu = ble_att_mtu(gc->conn_handle);
 				gattClientExecuted(gc, 0);
 
-				if (gc->secure)
+				if (gc->secure && !gc->lazy)
 					ble_gap_security_initiate(gc->conn_handle);
 			}
 			break;