feat(picow): surface the IoT gateway in the UI (parity with ESP32)
- SerialMonitor linkifies http://10.13.37.x (the Pico W subnet) the same way it already does http://192.168.4.x for the ESP32, turning the sketch's printed URL into an 'Open IoT Gateway' link. - SimulatorCanvas shows the clickable WiFi badge for the Pico W too (normalizing its 'started' status, which carries the fixed IP, to got_ip so it reuses the ESP32 badge styling + launcher). - async-led and servo-web examples print a clickable http://<ip>/ line so the gateway link appears (relay-web-server already did). Gated e2e (CYW43_GATEWAY_E2E=1) drives the real emulator + a running backend and asserts the served page comes back through /api/gateway.
This commit is contained in:
David Montero
parent
173cc3ea36
commit
1aba6e2e48
|
|
@ -0,0 +1,146 @@
|
|||
/**
|
||||
* picow-gateway-e2e.investigate.test.ts (gated: CYW43_GATEWAY_E2E=1)
|
||||
*
|
||||
* End-to-end proof of the Pico W IoT gateway INBOUND path: a real
|
||||
* RP2040Simulator runs a MicroPython HTTP *server*, and a browser-style
|
||||
* HTTP request to /api/gateway/<clientId>/ is proxied by the backend INTO
|
||||
* the chip over the WebSocket bridge, returning the served page.
|
||||
*
|
||||
* Requires a backend with the inbound proxy + VELXIO_PICOW_NET=1 running;
|
||||
* point at it with VELXIO_E2E_API_BASE (default http://127.0.0.1:8011/api).
|
||||
*/
|
||||
import { describe, it, expect, vi } from 'vitest';
|
||||
import { readFileSync } from 'node:fs';
|
||||
import { WebSocket as NodeWS } from 'ws';
|
||||
|
||||
const FW_PATH = '/home/dave/velxio-prod/velxio/frontend/public/firmware/micropython-rp2040w.uf2';
|
||||
const WASM_PATH = '/home/dave/velxio-prod/velxio/frontend/node_modules/littlefs/dist/littlefs.wasm';
|
||||
|
||||
vi.mock('../simulation/MicroPythonLoader', async (orig) => {
|
||||
const actual = (await orig()) as Record<string, unknown>;
|
||||
return { ...actual, getFirmware: async () => new Uint8Array(readFileSync(FW_PATH)) };
|
||||
});
|
||||
vi.mock('littlefs', async (orig) => {
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
const actual = (await orig()) as any;
|
||||
const create = actual.default;
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
return { ...actual, default: (cfg: any = {}) => create({ ...cfg, wasmBinary: new Uint8Array(readFileSync(WASM_PATH)) }) };
|
||||
});
|
||||
|
||||
const SERVER_PY = [
|
||||
'import network, socket, time',
|
||||
'w = network.WLAN(network.STA_IF)',
|
||||
'w.active(True)',
|
||||
'w.connect("Velxio-GUEST", "")',
|
||||
'for i in range(80):',
|
||||
' if w.isconnected(): break',
|
||||
' time.sleep_ms(150)',
|
||||
'ip = w.ifconfig()[0]',
|
||||
'print("PYIP", ip)',
|
||||
's = socket.socket()',
|
||||
's.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)',
|
||||
's.bind(("0.0.0.0", 80))',
|
||||
's.listen(1)',
|
||||
'print("LISTEN", ip)',
|
||||
'while True:',
|
||||
' cl, addr = s.accept()',
|
||||
' try:',
|
||||
' cl.recv(512)',
|
||||
' cl.send(b"HTTP/1.1 200 OK\\r\\nContent-Type: text/html\\r\\n\\r\\n<html><body>VELXIO-PICO-OK</body></html>")',
|
||||
' except Exception as e:',
|
||||
' print("SRVERR", repr(e))',
|
||||
' cl.close()',
|
||||
].join('\n');
|
||||
|
||||
const API_BASE = process.env.VELXIO_E2E_API_BASE || 'http://127.0.0.1:8011/api';
|
||||
|
||||
describe.skipIf(!process.env.CYW43_GATEWAY_E2E)('Pico W IoT gateway inbound', () => {
|
||||
it('serves the chip web page through /api/gateway', async () => {
|
||||
const { RP2040Simulator } = await import('../simulation/RP2040Simulator');
|
||||
const { PinManager } = await import('../simulation/PinManager');
|
||||
const { Cyw43Bridge } = await import('../simulation/cyw43/Cyw43Bridge');
|
||||
|
||||
// Stable per-tab session id so bridge.clientId matches the WS registration.
|
||||
const ss = new Map<string, string>();
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
(globalThis as any).sessionStorage = {
|
||||
getItem: (k: string) => (ss.has(k) ? ss.get(k) : null),
|
||||
setItem: (k: string, v: string) => { ss.set(k, v); },
|
||||
removeItem: (k: string) => { ss.delete(k); },
|
||||
};
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
(globalThis as any).WebSocket = NodeWS;
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
(globalThis as any).window = { __VELXIO_API_BASE__: API_BASE };
|
||||
|
||||
const sim = new RP2040Simulator(new PinManager());
|
||||
let serial = '';
|
||||
sim.onSerialData = (ch: string) => { serial += ch; if (serial.length > 80000) serial = serial.slice(-40000); };
|
||||
|
||||
const bridge = new Cyw43Bridge('gw-board');
|
||||
sim.attachCyw43(bridge);
|
||||
bridge.wifiEnabled = true;
|
||||
const pktlog: string[] = [];
|
||||
const desc = (b: Uint8Array) => {
|
||||
if (b.length < 14) return 'short';
|
||||
const et = (b[12] << 8) | b[13];
|
||||
const src = Array.from(b.subarray(6, 12)).map((x) => x.toString(16).padStart(2, '0')).join('');
|
||||
if (et === 0x0806) return `ARP op${b[21]} src=${src}`;
|
||||
if (et !== 0x0800) return 'eth0x' + et.toString(16);
|
||||
const proto = b[23], l4 = 14 + (b[14] & 0xf) * 4;
|
||||
if (proto === 6) return `TCP ${(b[l4] << 8) | b[l4 + 1]}->${(b[l4 + 2] << 8) | b[l4 + 3]} fl${b[l4 + 13].toString(16)} src=${src}`;
|
||||
if (proto === 17) return `UDP ${(b[l4] << 8) | b[l4 + 1]}->${(b[l4 + 2] << 8) | b[l4 + 3]}`;
|
||||
return 'ip-proto' + proto;
|
||||
};
|
||||
const origSend = bridge.sendPacket.bind(bridge);
|
||||
bridge.sendPacket = (e: Uint8Array) => { if (pktlog.length < 120) pktlog.push('OUT ' + desc(e)); return origSend(e); };
|
||||
const innerIn = bridge.onPacketIn!;
|
||||
bridge.onPacketIn = (p) => { if (pktlog.length < 120) pktlog.push('IN ' + desc(p.ether)); return innerIn(p); };
|
||||
bridge.connect();
|
||||
const clientId = bridge.clientId;
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
delete (globalThis as any).window;
|
||||
|
||||
await sim.loadMicroPython([{ name: 'main.py', content: SERVER_PY }]);
|
||||
|
||||
// 1. Run until the chip's HTTP server is listening.
|
||||
const upDeadline = Date.now() + 90_000;
|
||||
while (Date.now() < upDeadline && !serial.includes('LISTEN')) {
|
||||
const n = serial.includes('PYIP') ? 1 : 16;
|
||||
for (let i = 0; i < n; i++) sim.runFrameForTime(n === 1 ? 10 : 50);
|
||||
await new Promise((r) => setTimeout(r, 0));
|
||||
}
|
||||
expect(serial).toMatch(/LISTEN 10\.13\.37\.42/);
|
||||
|
||||
// 2. Fire the gateway request and keep stepping the chip so it can
|
||||
// accept the inbound connection and serve the page.
|
||||
const gwUrl = `${API_BASE}/gateway/${encodeURIComponent(clientId)}/`;
|
||||
let result: { status: number; body: string } | null = null;
|
||||
let err: unknown = null;
|
||||
const fetchP = fetch(gwUrl)
|
||||
.then(async (r) => { result = { status: r.status, body: await r.text() }; })
|
||||
.catch((e) => { err = e; });
|
||||
|
||||
const reqDeadline = Date.now() + 30_000;
|
||||
while (Date.now() < reqDeadline && result === null && err === null) {
|
||||
sim.runFrameForTime(10);
|
||||
await new Promise((r) => setTimeout(r, 0));
|
||||
}
|
||||
await fetchP;
|
||||
|
||||
try { bridge.disconnect(); } catch { /* noop */ }
|
||||
try { sim.stop(); } catch { /* noop */ }
|
||||
|
||||
// eslint-disable-next-line no-console
|
||||
console.log('\n===== GATEWAY E2E =====\nclientId=' + clientId +
|
||||
'\nserial(PY)=' + serial.split('\n').filter((l) => l.startsWith('PY') || l.startsWith('LISTEN') || l.startsWith('SRV')).join(' | ') +
|
||||
'\nfetch=' + JSON.stringify(result) + (err ? ' err=' + String(err) : '') +
|
||||
'\npkts=\n' + pktlog.join('\n'));
|
||||
|
||||
expect(err).toBeNull();
|
||||
expect(result).not.toBeNull();
|
||||
expect(result!.status).toBe(200);
|
||||
expect(result!.body).toContain('VELXIO-PICO-OK');
|
||||
}, 140_000);
|
||||
});
|
||||
|
|
@ -261,7 +261,10 @@ export const SerialMonitor: React.FC = () => {
|
|||
// Strip them before any further processing — color isn't
|
||||
// worth a full parser here.
|
||||
const text = activeBoard.serialOutput.replace(/\x1b\[[0-9;]*m/g, '');
|
||||
const ipRegex = /http:\/\/192\.168\.4\.(\d+)(\/[^\s]*)?/g;
|
||||
// ESP32 (QEMU slirp) hands out 192.168.4.x; the Pico W virtual
|
||||
// net hands out 10.13.37.x. Both reach their emulated server
|
||||
// through the same /api/gateway proxy, so linkify either subnet.
|
||||
const ipRegex = /http:\/\/(?:192\.168\.4|10\.13\.37)\.(\d+)(\/[^\s]*)?/g;
|
||||
const matches = [...text.matchAll(ipRegex)];
|
||||
|
||||
if (matches.length > 0) {
|
||||
|
|
|
|||
|
|
@ -2166,12 +2166,23 @@ export const SimulatorCanvas = ({ headerSlot }: SimulatorCanvasProps = {}) => {
|
|||
<CameraToggle boardId={activeBoard.id} />
|
||||
)}
|
||||
|
||||
{/* WiFi status indicator (ESP32 boards only) */}
|
||||
{/* WiFi status indicator + IoT-gateway launcher (ESP32 + Pico W) */}
|
||||
{activeBoard &&
|
||||
isEsp32Kind(activeBoard.boardKind) &&
|
||||
(isEsp32Kind(activeBoard.boardKind) ||
|
||||
activeBoard.boardKind === 'pi-pico-w') &&
|
||||
activeBoard.wifiStatus &&
|
||||
(() => {
|
||||
const status = activeBoard.wifiStatus.status;
|
||||
// The Pico W virtual net assigns its IP deterministically when
|
||||
// the sketch connects; the bridge reports 'started' carrying the
|
||||
// IP. Treat that as got_ip so the badge matches the ESP32 (green,
|
||||
// clickable → the same /api/gateway proxy).
|
||||
const rawStatus = activeBoard.wifiStatus.status;
|
||||
const status =
|
||||
activeBoard.boardKind === 'pi-pico-w' &&
|
||||
rawStatus === 'started' &&
|
||||
activeBoard.wifiStatus.ip
|
||||
? 'got_ip'
|
||||
: rawStatus;
|
||||
const hasIp = status === 'got_ip';
|
||||
const sessionId = getTabSessionId();
|
||||
const clientId = `${sessionId}::${activeBoard.id}`;
|
||||
|
|
|
|||
|
|
@ -66,7 +66,9 @@ async def wifi_connect():
|
|||
print("Connecting WiFi...")
|
||||
while not wlan.isconnected():
|
||||
await asyncio.sleep(0.5)
|
||||
print("IP:", wlan.ifconfig()[0])
|
||||
ip = wlan.ifconfig()[0]
|
||||
print("IP:", ip)
|
||||
print("Open browser: http://%s/" % ip)
|
||||
|
||||
HTML = """<!DOCTYPE html>
|
||||
<html><body><h2>Pico W Async LED</h2>
|
||||
|
|
@ -190,7 +192,7 @@ s.listen(5)
|
|||
|
||||
current_pos = 90
|
||||
write_servo(current_pos)
|
||||
print("Web server started on port 80")
|
||||
print("Web server started. Open browser: http://%s/" % sta.ifconfig()[0])
|
||||
|
||||
while True:
|
||||
conn, addr = s.accept()
|
||||
|
|
|
|||
Loading…
Reference in New Issue