From 1295b5609f7574112f90609e42ec46c7d7d5f523 Mon Sep 17 00:00:00 2001 From: Heitor Ramon Ribeiro Date: Wed, 11 Nov 2026 21:42:35 -0300 Subject: [PATCH 01/24] chore: bump pinned Node.js to 24.22.3 --- .github/workflows/ci.yml | 2 +- .github/workflows/sim.yml | 2 +- .nvmrc | 2 +- README.md | 2 +- apps/farm/Dockerfile | 4 ++-- docs/LOCAL-CI.md | 4 ++-- packages/sim-cams/Dockerfile | 2 +- packages/webrtc-experiment/README.md | 2 +- scripts/local-ci.sh | 4 ++-- scripts/test-telemetry-http-built-client.ts | 2 +- tests/helpers/telemetry-built-harness.ts | 4 ++-- tests/node/pause-control-rtc.test.ts | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3dc54cb1..2358014f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: version: '12.18.0' - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 with: - node-version: '24.22.2' + node-version: '24.22.3' - run: pnpm install --frozen-lockfile --ignore-scripts - run: bash scripts/test-local-ci.sh - run: pnpm run check:all diff --git a/.github/workflows/sim.yml b/.github/workflows/sim.yml index 95db920d..2e6dfe86 100644 --- a/.github/workflows/sim.yml +++ b/.github/workflows/sim.yml @@ -16,7 +16,7 @@ jobs: version: '12.18.0' - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 with: - node-version: '24.22.2' + node-version: '24.22.3' - run: pnpm install --frozen-lockfile --ignore-scripts - run: docker compose -f infra/sim/docker-compose.yml --profile klipper config --quiet - run: docker compose -f infra/sim/docker-compose.yml --profile klipper up -d diff --git a/.nvmrc b/.nvmrc index b74495a0..229b3ce8 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -24.22.2 +24.22.3 diff --git a/README.md b/README.md index 4ff5dd65..dc6fb44d 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ Testes locais, integração com fixtures e aceitação com simuladores são evid ## Execute localmente -Você precisa de **Node.js 24.22.2 na série 24.x** e **pnpm 12.18.0**. Os fluxos de CI usam Node 24.22.2. Docker Compose é necessário para a integração com simuladores, não para abrir a interface inicial. +Você precisa de **Node.js 24.22.3 na série 24.x** e **pnpm 12.18.0**. Os fluxos de CI usam Node 24.22.3. Docker Compose é necessário para a integração com simuladores, não para abrir a interface inicial. ```sh git clone https://github.com/bloodf/Open3DFarmManager.git diff --git a/apps/farm/Dockerfile b/apps/farm/Dockerfile index 7af1e3fc..ce619669 100644 --- a/apps/farm/Dockerfile +++ b/apps/farm/Dockerfile @@ -1,4 +1,4 @@ -FROM node:24.22.2-alpine AS build +FROM node:24.22.3-alpine AS build RUN npm install -g pnpm@12.18.0 WORKDIR /app COPY package.json pnpm-workspace.yaml pnpm-lock.yaml ./ @@ -13,7 +13,7 @@ RUN pnpm install --frozen-lockfile --ignore-scripts COPY . . RUN pnpm --dir apps/farm build -FROM node:24.22.2-alpine AS runtime +FROM node:24.22.3-alpine AS runtime WORKDIR /app ENV NODE_ENV=production NITRO_HOST=0.0.0.0 NITRO_PORT=3000 COPY --from=build --chown=10001:10001 /app/apps/farm/.output ./ diff --git a/docs/LOCAL-CI.md b/docs/LOCAL-CI.md index ff129f80..22fc94ef 100644 --- a/docs/LOCAL-CI.md +++ b/docs/LOCAL-CI.md @@ -10,7 +10,7 @@ bash scripts/test-local-ci.sh bash scripts/local-ci.sh code ``` -The code job requires pnpm 12.18.0, Node 24.22.2, existing workspace dependencies, +The code job requires pnpm 12.18.0, Node 24.22.3, existing workspace dependencies, Chromium and its operating-system libraries. Install browser prerequisites separately; this runner never installs operating-system packages. Like `.github/workflows/ci.yml`, it uses a frozen dependency install with scripts @@ -39,7 +39,7 @@ bash scripts/local-ci.sh all --containers --simulator The image job builds the workflow Dockerfile for `linux/amd64`, starts a read-only, capability-dropped container on a dynamically allocated loopback port, and checks `/healthz`. Install the `linux/amd64` base images -`node:24.22.2-alpine` separately first; the runner refuses to +`node:24.22.3-alpine` separately first; the runner refuses to pull shared build bases implicitly. The GitHub job builds on Ubuntu amd64 and uses port 3100. The dynamic port avoids disturbing other local services. diff --git a/packages/sim-cams/Dockerfile b/packages/sim-cams/Dockerfile index fb99422f..940bcfae 100644 --- a/packages/sim-cams/Dockerfile +++ b/packages/sim-cams/Dockerfile @@ -1,4 +1,4 @@ -FROM node:24.22.2-alpine +FROM node:24.22.3-alpine WORKDIR /app COPY packages/sim-cams/package.json ./ COPY packages/sim-cams/src ./src diff --git a/packages/webrtc-experiment/README.md b/packages/webrtc-experiment/README.md index 4fda3444..3adb9ac0 100644 --- a/packages/webrtc-experiment/README.md +++ b/packages/webrtc-experiment/README.md @@ -6,7 +6,7 @@ A prova original deste pacote privado MIT comprova um RTCDataChannel real e crip A prova histórica em `interop.test.ts` conectou o Chromium ao adaptador isolado em `packages/connector/src/webrtc`, executado em processos Node e Bun reais com `node-datachannel` 0.33.5. Ela exige entrega sintética nos dois sentidos, comparação dos certificados efetivos com SDP e rejeição de identidade, transcrição, replay e fingerprints SDP adulterados. O código não inicia o CLI ou um serviço de produção. -O harness atual usa somente Node 24.22.2, conforme o runtime do workspace. Os manifests agora fixam `node-datachannel` 0.33.6; a atualização gerada do lock pnpm, a execução nativa e a aceitação por plataforma dessa versão permanecem pendentes. A evidência acima refere-se à versão 0.33.5. Consulte a [proveniência atual](../../THIRD_PARTY.md#experimental-connector-webrtc-dependency). +O harness atual usa somente Node 24.22.3, conforme o runtime do workspace. Os manifests agora fixam `node-datachannel` 0.33.6; a atualização gerada do lock pnpm, a execução nativa e a aceitação por plataforma dessa versão permanecem pendentes. A evidência acima refere-se à versão 0.33.5. Consulte a [proveniência atual](../../THIRD_PARTY.md#experimental-connector-webrtc-dependency). ```sh pnpm --dir packages/webrtc-experiment run test:session diff --git a/scripts/local-ci.sh b/scripts/local-ci.sh index 53d19802..01bc98f8 100755 --- a/scripts/local-ci.sh +++ b/scripts/local-ci.sh @@ -95,7 +95,7 @@ code_job() { if ! command -v pnpm >/dev/null || ! command -v node >/dev/null; then printf '%s\n' 'UNSUPPORTED: pnpm and Node are required.' >&2; return 2 fi - [[ $(pnpm --version) == 12.18.0 && $(node --version) == v24.22.2 ]] || { printf '%s\n' 'UNSUPPORTED: workflow requires pnpm 12.18.0 and Node 24.22.2.' >&2; return 2; } + [[ $(pnpm --version) == 12.18.0 && $(node --version) == v24.22.3 ]] || { printf '%s\n' 'UNSUPPORTED: workflow requires pnpm 12.18.0 and Node 24.22.3.' >&2; return 2; } [[ -d node_modules ]] || { printf '%s\n' 'UNSUPPORTED: install workspace dependencies before running local CI.' >&2; return 2; } pnpm install --frozen-lockfile --ignore-scripts pnpm run lint @@ -109,7 +109,7 @@ image_job() { printf '%s\n' 'Resource name collision; refusing to use pre-existing image or container.' >&2 return 2 fi - for base in node:24.22.2-alpine; do + for base in node:24.22.3-alpine; do local platform platform=$(docker image inspect --format '{{.Os}}/{{.Architecture}}' "$base" 2>/dev/null || true) if [[ $platform == / ]]; then diff --git a/scripts/test-telemetry-http-built-client.ts b/scripts/test-telemetry-http-built-client.ts index ea0cc935..6a2ae589 100644 --- a/scripts/test-telemetry-http-built-client.ts +++ b/scripts/test-telemetry-http-built-client.ts @@ -7,7 +7,7 @@ import { TelemetryQueue } from '../packages/connector/src/cloud/queue.ts' import { drainTelemetryOnce } from '../packages/connector/src/cloud/drain.ts' import { createAuthenticatedTelemetrySender } from '../packages/connector/src/cloud/authenticated-http-telemetry.ts' -if (process.version !== 'v24.22.2') throw new Error('Node 24.22.2 is required') +if (process.version !== 'v24.22.3') throw new Error('Node 24.22.3 is required') const path = process.env.TELEMETRY_HTTP_BUILT_FIXTURE const phase = process.env.TELEMETRY_HTTP_BUILT_PHASE if ( diff --git a/tests/helpers/telemetry-built-harness.ts b/tests/helpers/telemetry-built-harness.ts index 31a84fde..2d97c4de 100644 --- a/tests/helpers/telemetry-built-harness.ts +++ b/tests/helpers/telemetry-built-harness.ts @@ -31,11 +31,11 @@ export async function startBuiltTelemetryFixture(input: { !nodeIdentity || typeof nodeIdentity !== 'object' || !('version' in nodeIdentity) || - nodeIdentity.version !== 'v24.22.2' || + nodeIdentity.version !== 'v24.22.3' || !('execPath' in nodeIdentity) || typeof nodeIdentity.execPath !== 'string' ) - throw new Error('Node 24.22.2 is required') + throw new Error('Node 24.22.3 is required') const nodePath = nodeIdentity.execPath await appendFile( input.ledgerPath, diff --git a/tests/node/pause-control-rtc.test.ts b/tests/node/pause-control-rtc.test.ts index 821024f2..1b20e969 100644 --- a/tests/node/pause-control-rtc.test.ts +++ b/tests/node/pause-control-rtc.test.ts @@ -25,7 +25,7 @@ test( concurrency: false, }, async () => { - assert.equal(process.version, 'v24.22.2', 'Pinned Node24 runtime required') + assert.equal(process.version, 'v24.22.3', 'Pinned Node24 runtime required') const { runPauseControlRtc } = await import('../helpers/pause-control-rtc.ts') // A rejected case stops this sequence; never automatically retry or continue. From 1ca2714834a92a5c0b1f99adf354bd306cd6d549 Mon Sep 17 00:00:00 2001 From: Heitor Ramon Ribeiro Date: Wed, 11 Nov 2026 21:51:00 -0300 Subject: [PATCH 02/24] docs: update status docs to Node 24.22.3 --- docs/IMPLEMENTATION-QUEUE.md | 2 +- docs/PHASE-0.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/IMPLEMENTATION-QUEUE.md b/docs/IMPLEMENTATION-QUEUE.md index 87864dc7..45e81ae4 100644 --- a/docs/IMPLEMENTATION-QUEUE.md +++ b/docs/IMPLEMENTATION-QUEUE.md @@ -4,7 +4,7 @@ This queue tracks the independent MIT project without private deployment configu ## Current checkpoint -The reference head is `36d1198` on `origin/main`. The official migration catalog is contiguous through `0023` (`infra/db/migrations`). The toolchain is pnpm 12.18.0 with Node 24.22.2; the gate is `pnpm run check:all`. No integrated gate has been run on this head. Earlier gate counts in checkpoint records describe their named sources only. Run the gate on the final committed candidate and report PostgreSQL, browser/WebRTC and simulator checks for that same head separately. +The reference head is `36d1198` on `origin/main`. The official migration catalog is contiguous through `0023` (`infra/db/migrations`). The toolchain is pnpm 12.18.0 with Node 24.22.3; the gate is `pnpm run check:all`. No integrated gate has been run on this head. Earlier gate counts in checkpoint records describe their named sources only. Run the gate on the final committed candidate and report PostgreSQL, browser/WebRTC and simulator checks for that same head separately. - **0013 browser-device registry and 0014 credential proof — accepted slices:** see [browser key checkpoint](BROWSER-KEY-CHECKPOINT.md) and [credential acceptance checkpoint](CONNECTOR-CREDENTIAL-ACCEPTANCE-CHECKPOINT.md). The 0014 receipt is point-in-time context, not durable authorization. - **0015 printer ownership — committed and accepted on real PostgreSQL:** eleven synthetic behavior groups passed on a disposable cluster through the official contiguous runner, again after a PostgreSQL restart, with official 0015 down/up. See [printer ownership checkpoint](PRINTER-OWNERSHIP-CHECKPOINT.md). diff --git a/docs/PHASE-0.md b/docs/PHASE-0.md index 184819cb..170445ae 100644 --- a/docs/PHASE-0.md +++ b/docs/PHASE-0.md @@ -63,7 +63,7 @@ Detailed artifacts, limitations and historical failures remain in the [Spoolman service validation](SPOOLMAN-ACTUAL-API-VALIDATION.md). At `origin/main` `36d1198` the official migration catalog is contiguous through -0023 and the toolchain is pnpm 12.18.0 with Node 24.22.2. The table above was +0023 and the toolchain is pnpm 12.18.0 with Node 24.22.3. The table above was recorded earlier and was not re-run on this head; no integrated gate exists for it. The [implementation queue](IMPLEMENTATION-QUEUE.md) lists the remaining work in dependency order. Use this ledger and the exact checkpoint receipts when From e6479f7985a67b1c86a5f604b4851ccd5a69fd82 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 12 Nov 2026 01:31:07 +0000 Subject: [PATCH 03/24] chore(deps): update node.js to v24.22.3 --- .github/workflows/ci.yml | 2 +- .github/workflows/sim.yml | 2 +- .nvmrc | 2 +- apps/farm/Dockerfile | 4 ++-- packages/sim-cams/Dockerfile | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3dc54cb1..2358014f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: version: '12.18.0' - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 with: - node-version: '24.22.2' + node-version: '24.22.3' - run: pnpm install --frozen-lockfile --ignore-scripts - run: bash scripts/test-local-ci.sh - run: pnpm run check:all diff --git a/.github/workflows/sim.yml b/.github/workflows/sim.yml index 95db920d..2e6dfe86 100644 --- a/.github/workflows/sim.yml +++ b/.github/workflows/sim.yml @@ -16,7 +16,7 @@ jobs: version: '12.18.0' - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 with: - node-version: '24.22.2' + node-version: '24.22.3' - run: pnpm install --frozen-lockfile --ignore-scripts - run: docker compose -f infra/sim/docker-compose.yml --profile klipper config --quiet - run: docker compose -f infra/sim/docker-compose.yml --profile klipper up -d diff --git a/.nvmrc b/.nvmrc index b74495a0..229b3ce8 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -24.22.2 +24.22.3 diff --git a/apps/farm/Dockerfile b/apps/farm/Dockerfile index 9e54c33c..832cbec4 100644 --- a/apps/farm/Dockerfile +++ b/apps/farm/Dockerfile @@ -1,4 +1,4 @@ -FROM node:24.22.2-alpine AS build +FROM node:24.22.3-alpine AS build RUN npm install -g pnpm@12.18.0 WORKDIR /app COPY package.json pnpm-workspace.yaml pnpm-lock.yaml ./ @@ -13,7 +13,7 @@ RUN pnpm install --frozen-lockfile --ignore-scripts COPY . . RUN pnpm --dir apps/farm build -FROM node:24.22.2-alpine AS runtime +FROM node:24.22.3-alpine AS runtime WORKDIR /app ENV NODE_ENV=production NITRO_HOST=0.0.0.0 NITRO_PORT=3000 NUXT_DATABASE_MIGRATIONS_DIR=/app/migrations COPY --from=build --chown=10001:10001 /app/apps/farm/.output ./ diff --git a/packages/sim-cams/Dockerfile b/packages/sim-cams/Dockerfile index fb99422f..940bcfae 100644 --- a/packages/sim-cams/Dockerfile +++ b/packages/sim-cams/Dockerfile @@ -1,4 +1,4 @@ -FROM node:24.22.2-alpine +FROM node:24.22.3-alpine WORKDIR /app COPY packages/sim-cams/package.json ./ COPY packages/sim-cams/src ./src From 24eec2eb78405acfd65ae206a08c0da719161eda Mon Sep 17 00:00:00 2001 From: Heitor Ramon Ribeiro Date: Wed, 11 Nov 2026 23:47:26 -0300 Subject: [PATCH 04/24] feat(sim): add opt-in NAT, netem and UDP-block fault harness Two Docker networks with a NAT router that applies faults only inside its own namespace; a probe using the Connector's PeerConnection options runs with the Connector's loopback bind policy and with an all-interfaces bind. --- infra/sim/netfault/docker-compose.yml | 78 ++++++++++++ infra/sim/netfault/router/Dockerfile | 6 + infra/sim/netfault/rtc-probe.mjs | 169 ++++++++++++++++++++++++++ infra/sim/netfault/run.sh | 69 +++++++++++ 4 files changed, 322 insertions(+) create mode 100644 infra/sim/netfault/docker-compose.yml create mode 100644 infra/sim/netfault/router/Dockerfile create mode 100644 infra/sim/netfault/rtc-probe.mjs create mode 100755 infra/sim/netfault/run.sh diff --git a/infra/sim/netfault/docker-compose.yml b/infra/sim/netfault/docker-compose.yml new file mode 100644 index 00000000..ddf5f732 --- /dev/null +++ b/infra/sim/netfault/docker-compose.yml @@ -0,0 +1,78 @@ +# Opt-in network fault harness (issue #2). Run through ./run.sh only. +# Two internal networks with no host egress: "wan" (browser/server side) and +# "lan" (Connector side). The router NATs lan -> wan and applies netem/UDP faults +# inside its own namespace. lan-gw only sets the lan default route; the probes +# run with no capabilities. Nothing here modifies host networking. +name: o3dfm-netfault +x-probe: &probe + image: node@sha256:01d566e8d94d8c619591d78652babfccd3c6992a3dffa9ed5ab39e11cf6c70e9 + platform: linux/amd64 + user: '1000:1000' + read_only: true + cap_drop: [ALL] + security_opt: [no-new-privileges:true] + volumes: + - ../../..:/repo:ro + - ${NETFAULT_NDC:?run through run.sh}:/opt/ndc:ro + working_dir: /repo + cpus: 1.0 + mem_limit: 256m + pids_limit: 64 +services: + router: + build: ./router + cap_drop: [ALL] + cap_add: [NET_ADMIN, NET_RAW] + security_opt: [no-new-privileges:true] + sysctls: + net.ipv4.ip_forward: 1 + networks: + lan: { ipv4_address: 10.231.32.2 } + wan: { ipv4_address: 10.231.31.2 } + cpus: 0.5 + mem_limit: 64m + pids_limit: 32 + lan-gw: + build: ./router + cap_drop: [ALL] + cap_add: [NET_ADMIN] + security_opt: [no-new-privileges:true] + command: + [ + 'sh', + '-c', + 'ip route replace default via 10.231.32.2 && exec sleep infinity', + ] + networks: + lan: { ipv4_address: 10.231.32.10 } + cpus: 0.25 + mem_limit: 32m + pids_limit: 16 + browser: + <<: *probe + command: ['node', 'infra/sim/netfault/rtc-probe.mjs'] + environment: + PROBE_ROLE: answer + networks: + wan: { ipv4_address: 10.231.31.20 } + connector: + <<: *probe + profiles: [probe] + network_mode: service:lan-gw + command: ['node', 'infra/sim/netfault/rtc-probe.mjs'] + environment: + PROBE_ROLE: offer + PROBE_PEER: 10.231.31.20 +networks: + # Not "internal": Docker's internal-network rules drop frames whose + # destination is outside the subnet, which is all routed lan traffic (and + # the isolated gateway mode requires internal). Masquerade is off, so the + # bridge never NATs lan traffic to the host's networks; lan probes route only + # via the router, whose FORWARD policy drops everything except lan -> wan. + lan: + driver_opts: + com.docker.network.bridge.enable_ip_masquerade: 'false' + ipam: { config: [{ subnet: 10.231.32.0/24 }] } + wan: + internal: true + ipam: { config: [{ subnet: 10.231.31.0/24 }] } diff --git a/infra/sim/netfault/router/Dockerfile b/infra/sim/netfault/router/Dockerfile new file mode 100644 index 00000000..2f7ac6f0 --- /dev/null +++ b/infra/sim/netfault/router/Dockerfile @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: MIT +# Test-only NAT router for the network fault harness. Holds NET_ADMIN inside its +# own network namespace only; it never touches host networking. +FROM alpine@sha256:28bd5fe8b56d1bd048e5babf5b10710ebe0bae67db86916198a6eec434943f8b +RUN apk add --no-cache iptables=1.8.13-r0 iproute2=7.0.0-r0 iproute2-tc=7.0.0-r0 +CMD ["sleep", "infinity"] diff --git a/infra/sim/netfault/rtc-probe.mjs b/infra/sim/netfault/rtc-probe.mjs new file mode 100644 index 00000000..8957020d --- /dev/null +++ b/infra/sim/netfault/rtc-probe.mjs @@ -0,0 +1,169 @@ +// SPDX-License-Identifier: MIT +// Test-only WebRTC reachability probe for the network fault harness. +// Uses the Connector's PeerConnection options (no STUN/TURN, no ICE-TCP, +// fingerprint verification on); only the bind address varies. +// PROBE_ROLE=answer "browser" side: HTTP offer endpoint, echoes data. +// PROBE_ROLE=offer "Connector" side: posts an offer, measures the channel. +// Prints one JSON result line. Never contacts anything but PROBE_PEER. +import { createServer } from 'node:http' +import { createRequire } from 'node:module' + +const env = process.env +const role = env.PROBE_ROLE +const bind = env.PROBE_BIND ?? 'any' // 'loopback' = Connector policy, 'any' = all interfaces +const iceTimeoutMs = Number(env.PROBE_ICE_TIMEOUT_MS ?? 20000) +const pings = Number(env.PROBE_PINGS ?? 40) +if (!['offer', 'answer'].includes(role) || !['any', 'loopback'].includes(bind)) + throw new Error( + 'PROBE_ROLE offer|answer and PROBE_BIND any|loopback required', + ) + +const require = createRequire('/opt/ndc/package.json') +const { PeerConnection, cleanup } = ( + await import(require.resolve('node-datachannel')) +).default + +function peer(name) { + return new PeerConnection(name, { + iceServers: [], + enableIceTcp: false, + disableFingerprintVerification: false, + ...(bind === 'loopback' ? { bindAddress: '127.0.0.1' } : {}), + }) +} +// Non-trickle: wait for complete gathering, then hand over the full description. +function gathered(pc) { + return new Promise((resolve, reject) => { + const timer = setTimeout( + () => reject(new Error('gathering timeout')), + 10000, + ) + const check = () => { + if (pc.gatheringState() === 'complete' && pc.localDescription()) { + clearTimeout(timer) + resolve(pc.localDescription()) + return true + } + return false + } + pc.onGatheringStateChange(() => check()) + // Auto-negotiation may finish gathering before this handler is attached. + const poll = setInterval(() => check() && clearInterval(poll), 100) + }) +} +const candidates = (sdp) => + [...sdp.matchAll(/a=candidate:\S+ \d+ (\S+) \d+ (\S+) (\d+) typ (\S+)/g)].map( + (m) => `${m[4]} ${m[1].toLowerCase()} ${m[2]}`, + ) +const done = (result) => { + console.log(JSON.stringify({ role, bind, ...result })) + cleanup() + process.exit(0) +} + +if (role === 'answer') { + const server = createServer((request, response) => { + let body = '' + request.setEncoding('utf8') + request.on('data', (chunk) => { + body += chunk + if (body.length > 65536) request.destroy() + }) + request.on('end', async () => { + try { + const offer = JSON.parse(body) + const pc = peer('probe-browser') + pc.onDataChannel((channel) => { + const pair = pc.getSelectedCandidatePair() + // The remote address seen here is the NAT-mapped source, if any. + console.log( + JSON.stringify({ + role, + event: 'channel', + remote: pair && `${pair.remote.type} ${pair.remote.address}`, + }), + ) + channel.onMessage((message) => channel.sendMessage(String(message))) + }) + const answer = gathered(pc) + pc.setRemoteDescription(offer.sdp, offer.type) + const local = await answer + response.writeHead(200, { 'content-type': 'application/json' }) + response.end(JSON.stringify(local)) + console.log( + JSON.stringify({ + role, + event: 'answered', + remoteCandidates: candidates(offer.sdp), + localCandidates: candidates(local.sdp), + }), + ) + } catch (error) { + response.writeHead(400) + response.end() + console.log( + JSON.stringify({ role, event: 'error', error: String(error) }), + ) + } + }) + }) + server.listen(8000, '0.0.0.0') +} else { + const started = performance.now() + const pc = peer('probe-connector') + const channel = pc.createDataChannel('probe') + const offer = gathered(pc) + pc.setLocalDescription() + const local = await offer + let answer + try { + const response = await fetch(`http://${env.PROBE_PEER}:8000/offer`, { + method: 'POST', + body: JSON.stringify(local), + signal: AbortSignal.timeout(10000), + }) + answer = await response.json() + } catch (error) { + done({ signalling: 'failed', error: String(error), rtc: 'not-attempted' }) + } + const opened = new Promise((resolve) => { + channel.onOpen(() => resolve(true)) + setTimeout(() => resolve(false), iceTimeoutMs) + }) + pc.setRemoteDescription(answer.sdp, answer.type) + const open = await opened + const base = { + signalling: 'ok', + localCandidates: candidates(local.sdp), + remoteCandidates: candidates(answer.sdp), + } + if (!open) + done({ + ...base, + rtc: 'failed', + iceState: pc.iceState(), + elapsedMs: Math.round(performance.now() - started), + }) + const openMs = Math.round(performance.now() - started) + const rtts = [] + channel.onMessage((message) => rtts.push(performance.now() - Number(message))) + for (let i = 0; i < pings; i++) { + channel.sendMessage(String(performance.now())) + await new Promise((resolve) => setTimeout(resolve, 50)) + } + await new Promise((resolve) => setTimeout(resolve, 3000)) + rtts.sort((a, b) => a - b) + const pair = pc.getSelectedCandidatePair() + done({ + ...base, + rtc: 'open', + openMs, + sent: pings, + echoed: rtts.length, + rttMedianMs: rtts.length ? Math.round(rtts[rtts.length >> 1]) : null, + selectedPair: pair && { + local: `${pair.local.type} ${pair.local.address}`, + remote: `${pair.remote.type} ${pair.remote.address}`, + }, + }) +} diff --git a/infra/sim/netfault/run.sh b/infra/sim/netfault/run.sh new file mode 100755 index 00000000..12401821 --- /dev/null +++ b/infra/sim/netfault/run.sh @@ -0,0 +1,69 @@ +#!/usr/bin/env bash +# SPDX-License-Identifier: MIT +# Network fault harness (issue #2). Usage: +# infra/sim/netfault/run.sh [repeats] [out-dir] +# Each repeat starts the topology fresh, applies the fault inside the router's +# namespace, runs the Connector-side probe with the Connector's loopback bind +# policy and with an all-interfaces bind, then removes every resource it made. +set -euo pipefail +scenario=${1:-} +repeats=${2:-3} +out=${3:-$(mktemp -d "${TMPDIR:-/tmp}/o3dfm-netfault.XXXXXX")} +case "$scenario" in nat | netem | udp-block) ;; *) + echo 'Usage: run.sh [repeats] [out-dir]' >&2 + exit 2 + ;; +esac +[[ $repeats =~ ^[1-9][0-9]?$ ]] || { echo 'repeats must be 1-99' >&2; exit 2; } +here=$(cd "$(dirname "$0")" && pwd) +project=${NETFAULT_PROJECT:-o3dfm-netfault} +[[ $project =~ ^o3dfm-[a-z0-9-]{1,40}$ ]] || { echo 'invalid NETFAULT_PROJECT' >&2; exit 2; } +dc() { docker compose -p "$project" -f "$here/docker-compose.yml" "$@"; } +mkdir -p "$out" +if [[ -n $(docker ps -aq --filter "label=com.docker.compose.project=$project") ]]; then + echo "Compose project $project already has containers; refusing to reuse them." >&2 + exit 2 +fi +# node-datachannel and its native prebuild may live in a global pnpm store outside +# the checkout; copy just that package closure (dereferenced) for a read-only mount. +NETFAULT_NDC=$(mktemp -d "${TMPDIR:-/tmp}/o3dfm-netfault-ndc.XXXXXX") +export NETFAULT_NDC +ndc=$(realpath "$here/../../../packages/connector/node_modules/node-datachannel") +mkdir -p "$NETFAULT_NDC/node_modules" +cp -rL "$(dirname "$ndc")/." "$NETFAULT_NDC/node_modules/" +printf '{"private":true}\n' > "$NETFAULT_NDC/package.json" +chmod -R a+rX "$NETFAULT_NDC" +cleanup() { dc --profile probe down --volumes --remove-orphans >/dev/null 2>&1 || true; } +trap 'cleanup; rm -rf "$NETFAULT_NDC"' EXIT + +router() { dc exec -T router sh -euc "$1"; } +apply_fault() { + # Interfaces are found by the fixed addresses from docker-compose.yml. + router ' + lan=$(ip -o -4 addr show | awk "/10\.231\.32\.2\//{print \$2}") + wan=$(ip -o -4 addr show | awk "/10\.231\.31\.2\//{print \$2}") + iptables -t nat -A POSTROUTING -s 10.231.32.0/24 -o "$wan" -j MASQUERADE + iptables -A FORWARD -i "$lan" -o "$wan" -j ACCEPT + iptables -A FORWARD -i "$wan" -o "$lan" -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT + iptables -P FORWARD DROP + case '"$scenario"' in + netem) + tc qdisc add dev "$wan" root netem delay 100ms 10ms loss 5% + tc qdisc add dev "$lan" root netem delay 100ms 10ms loss 5% ;; + udp-block) + iptables -I FORWARD -p udp -j DROP ;; + esac' +} + +for run in $(seq 1 "$repeats"); do + for bind in loopback any; do + cleanup + dc up -d --build --wait router lan-gw browser >/dev/null + apply_fault + result=$(dc --profile probe run --rm -T -e PROBE_BIND="$bind" connector | tail -1) + browser=$(dc logs --no-log-prefix browser | grep '"event":"channel"' | tail -1 || true) + printf '{"scenario":"%s","run":%s,"connector":%s,"browser":%s}\n' \ + "$scenario" "$run" "$result" "${browser:-null}" | tee -a "$out/$scenario.jsonl" + done +done +echo "results: $out/$scenario.jsonl" From dbb118944537e788611e3c9b28493595a80f77b3 Mon Sep 17 00:00:00 2001 From: Heitor Ramon Ribeiro Date: Wed, 11 Nov 2026 23:47:27 -0300 Subject: [PATCH 05/24] test: share enrollment and disposable PostgreSQL helpers Extract the outage runner's real enrollment (now multi-printer) and its disposable PostgreSQL bootstrap so other acceptance runners reuse them. --- scripts/test-connector-outage-recovery.ts | 106 ++++------------ tests/helpers/connector-enrollment.ts | 114 +++++++++++++++++ tests/helpers/connector-outage-scenarios.ts | 101 +++------------ tests/helpers/disposable-postgres.ts | 133 ++++++++++++++++++++ 4 files changed, 282 insertions(+), 172 deletions(-) create mode 100644 tests/helpers/connector-enrollment.ts create mode 100644 tests/helpers/disposable-postgres.ts diff --git a/scripts/test-connector-outage-recovery.ts b/scripts/test-connector-outage-recovery.ts index b6c5f5e7..ed88e740 100644 --- a/scripts/test-connector-outage-recovery.ts +++ b/scripts/test-connector-outage-recovery.ts @@ -11,12 +11,10 @@ import { access, mkdir, rm, statfs, writeFile } from 'node:fs/promises' import { createServer } from 'node:net' import { isAbsolute, join, relative } from 'node:path' import { promisify } from 'node:util' -import postgres from 'postgres' import { - loadMigrationCatalog, - runMigrations, - validateMigrationHistory, -} from './db/migrations.ts' + POSTGRES_IMAGE_PATTERN, + disposablePostgres, +} from '../tests/helpers/disposable-postgres.ts' import { runConnectorOutageScenarios } from '../tests/helpers/connector-outage-scenarios.ts' import { interruption } from '../tests/helpers/connector-outage-fixtures.ts' @@ -29,9 +27,7 @@ if ( process.argv.length !== 2 || env.OUTAGE_TEST_ADMITTED !== 'yes' || !image || - !/^postgres:17(?:\.[0-9]+)?(?:-[a-z0-9.-]+)?@sha256:[a-f0-9]{64}$/.test( - image, - ) || + !POSTGRES_IMAGE_PATTERN.test(image) || !Number.isInteger(base) || base < 1024 || base > 65530 || @@ -62,7 +58,6 @@ const prefix = env.OUTAGE_TEST_NAME_PREFIX ?? 'o3dfm-outage' if (!/^o3dfm-[a-z0-9-]{1,40}$/.test(prefix)) throw new Error('Invalid outage test name prefix') const name = prefix + '-' + id -const label = 'org.open3dfarmmanager.outage-test=' + id const workDir = join(workRoot, id) const ledgerPath = join(workRoot, id + '.ledger.jsonl') const resultPath = join(workRoot, id + '.result.json') @@ -93,106 +88,47 @@ const disk = async () => await statfs(workRoot, { bigint: true }).then((x) => x.bavail * x.bsize), ) const startedAt = performance.now() -let container: string | undefined -let sql: ReturnType | undefined +const database = disposablePostgres({ + docker, + image, + name, + labelKey: 'org.open3dfarmmanager.outage-test', + labelValue: id, + port: ports.db, + ledger, +}) let failure: unknown let cleanupFailure: unknown let report: Awaited> | undefined try { const available = BigInt(await disk()) assert.ok(available >= 2n * 1024n ** 3n, 'At least 2 GiB free required') - // Fails rather than pulling: image ownership and deletion remain with its owner. - await docker('image', 'inspect', image) - ledger({ resource: 'container', name, label, image }) - await docker( - ...['create', '--name', name, '--label', label, '--pull', 'never'], - ...['--cpus', '2', '--memory', '2g', '--read-only', '--cap-drop', 'ALL'], - ...['--security-opt', 'no-new-privileges', '--user', 'postgres'], - ...['--tmpfs', '/var/lib/postgresql/data:rw,mode=1777'], - ...['--tmpfs', '/var/run/postgresql:rw,mode=1777'], - ...['--tmpfs', '/tmp:rw,mode=1777'], - ...['-p', `127.0.0.1:${ports.db}:5432`], - ...['-e', 'POSTGRES_USER=fixture', '-e', 'POSTGRES_DB=fixture'], - ...['-e', 'POSTGRES_HOST_AUTH_METHOD=trust'], - ...['-e', 'PGDATA=/var/lib/postgresql/data/pgdata'], - image, - ) - container = await docker('inspect', '--format', '{{.Id}}', name) - assert.match(container, /^[a-f0-9]{64}$/) - ledger({ resource: 'container-id', id: container }) - await docker('start', container) - // TCP readiness: the image's init-time server listens only on the Unix socket and - // restarts afterwards, so socket readiness can reset the first host connection. - await docker( - ...['exec', container, 'sh', '-c'], - 'n=0; until pg_isready -h 127.0.0.1 -U fixture -d fixture >/dev/null; do n=$((n+1)); [ "$n" -lt 30 ] || exit 1; sleep 1; done', - ) - sql = postgres({ - host: '127.0.0.1', - port: ports.db, - database: 'fixture', - username: 'fixture', - password: '', - ssl: false, - max: 4, - connect_timeout: 3, - connection: { application_name: name, statement_timeout: 10000 }, - }) - assert.equal( - (await sql`SELECT to_regnamespace('farm') AS n`)[0]?.n, - null, - 'fresh task-owned cluster only', - ) - assert.match((await sql`SHOW server_version`)[0]?.server_version, /^17\./) - const catalog = await loadMigrationCatalog() - await runMigrations(sql, catalog, { kind: 'up' }) - const journal = - await sql`SELECT position,id,checksum FROM public.open3dfarm_migrations ORDER BY position` - assert.equal(validateMigrationHistory(catalog, [...journal]), catalog.length) + const sql = await database.start() report = await runConnectorOutageScenarios({ admin: sql, ports, workDir, - container, + container: database.container!, docker, ledger, }) if (interrupted) throw interrupted } catch (error) { failure = interrupted ?? error - if (container) + if (database.container) await writeFile( join(workRoot, id + '.postgres.log'), - await docker('logs', '--tail', '200', container).catch(String), - { mode: 0o600 }, + await database.logs(), + { + mode: 0o600, + }, ) } finally { try { - await sql?.end({ timeout: 3 }) + await database.stop() } catch (error) { cleanupFailure = error } - try { - // Exact owned container only: verified by ID, name and label. - const owned = - container ?? - (await docker('inspect', '--format', '{{.Id}}', name).catch(() => '')) - if (owned) { - assert.equal( - await docker( - ...['inspect', '--format'], - '{{index .Config.Labels "org.open3dfarmmanager.outage-test"}} {{.Name}}', - owned, - ), - `${id} /${name}`, - ) - await docker('rm', '-f', owned) - assert.equal(await docker('ps', '-aq', '--filter', 'id=' + owned), '') - ledger({ removed: 'container', id: owned }) - } - } catch (error) { - cleanupFailure ??= error - } // Secrets (keys, credential, identity) live only in the work directory; logs are kept on failure. if (!failure) try { diff --git a/tests/helpers/connector-enrollment.ts b/tests/helpers/connector-enrollment.ts new file mode 100644 index 00000000..5a640e3b --- /dev/null +++ b/tests/helpers/connector-enrollment.ts @@ -0,0 +1,114 @@ +// Real Connector enrollment against a disposable, migrated PostgreSQL: +// pairing, proof, approval, credential claim and printer assignment. +// Caller owns the database, the role pools and the private work directory. +import assert from 'node:assert/strict' +import { randomUUID } from 'node:crypto' +import { writeFileSync } from 'node:fs' +import { join } from 'node:path' +import type { Sql } from 'postgres' +import { PostgresPairing } from '../../apps/farm/server/storage/postgres-pairing.ts' +import { PostgresPairingProof } from '../../apps/farm/server/storage/postgres-pairing-proof.ts' +import { PostgresPrinterOwnership } from '../../apps/farm/server/storage/postgres-printer-ownership.ts' +import type { loadOrCreateIdentity } from '../../packages/connector/src/identity/store.ts' + +export const ENROLLMENT = { + issuer: 'https://farm.example', + audience: 'open3dfarmmanager:connector', + ttlSeconds: 3600, +} as const + +/** Writes `keys.json` (the server's public key registry) into `workDir`. */ +export async function enrollConnector(input: { + admin: Sql + pairSql: Sql + ownerSql: Sql + identity: ReturnType + origin: string + workDir: string + printerKeys: readonly string[] +}) { + const { admin, identity, origin } = input + const keyFile = join(input.workDir, 'keys.json') + const keys = await crypto.subtle.generateKey('Ed25519', true, [ + 'sign', + 'verify', + ]) + if (!('privateKey' in keys)) throw new Error('Expected key pair') + const spki = Buffer.from( + await crypto.subtle.exportKey('spki', keys.publicKey), + ).toString('base64') + const pem = `-----BEGIN PUBLIC KEY-----\n${spki.match(/.{1,64}/g)?.join('\n')}\n-----END PUBLIC KEY-----\n` + writeFileSync(keyFile, JSON.stringify({ fixture: pem }), { mode: 0o600 }) + + const now = Date.now(), + actor = randomUUID(), + farmId = randomUUID() + await admin`INSERT INTO farm.session_accounts(id) VALUES(${actor})` + await admin`INSERT INTO farm.account_sessions(id,account_id,account_version,created_at,last_seen_at,absolute_expires_at) VALUES(${actor},${actor},0,${now},${now},${now + 3_600_000})` + await admin`INSERT INTO farm.farms(id) VALUES(${farmId}::uuid)` + await admin`INSERT INTO farm.memberships(farm_id,account_id,role) VALUES(${farmId}::uuid,${actor},'owner')` + const binding = { origin, audience: 'open3dfarmmanager:pairing' } + const pairing = new PostgresPairing(input.pairSql, binding) + const proof = new PostgresPairingProof(admin, binding) + const started = await pairing.start({ + public_key_spki: identity.publicKeySpki, + platform: 'linux', + version: '0.0.1', + }) + if (!started.ok) throw new Error('Pairing fixture failed') + const challenge = await proof.issue({ + device_code: started.response.device_code, + }) + if (!challenge.ok) throw new Error('Pairing challenge failed') + const completion = await proof.complete({ + device_code: started.response.device_code, + challenge: challenge.challenge, + signature: identity.signPairingProof({ + challenge: challenge.challenge, + expectedOrigin: origin, + expectedAudience: binding.audience, + now: Date.now(), + }), + }) + assert.equal(completion.ok, true) + const subject = { + sessionRecordId: actor, + policy: { idleTimeoutMs: 3_600_000 }, + farmId, + } + const decision = await pairing.decide({ + ...subject, + decision: 'approve', + request: { + user_code: started.response.user_code, + farm_id: farmId, + expected_fingerprint: identity.fingerprint, + }, + }) + assert.equal(decision.ok, true) + const claimed = await pairing.claim( + { device_code: started.response.device_code }, + { + issuer: ENROLLMENT.issuer, + audience: ENROLLMENT.audience, + kid: 'fixture', + privateKey: keys.privateKey, + ttlSeconds: ENROLLMENT.ttlSeconds, + }, + ) + if (!claimed.ok || claimed.status !== 'approved') + throw new Error('Credential fixture failed') + const { ok: _ok, ...approval } = claimed + const ownership = new PostgresPrinterOwnership(input.ownerSql) + const assignments: { printerKey: string; assignmentId: string }[] = [] + for (const printerKey of input.printerKeys) { + const registered = await ownership.register({ + ...subject, + agentId: claimed.agent_id, + printerKey, + }) + if (!registered.ok) throw new Error('Printer assignment fixture failed') + assignments.push({ printerKey, assignmentId: registered.assignmentId }) + } + return { keyFile, farmId, agentId: claimed.agent_id, approval, assignments } +} diff --git a/tests/helpers/connector-outage-scenarios.ts b/tests/helpers/connector-outage-scenarios.ts index 95e06562..347c2677 100644 --- a/tests/helpers/connector-outage-scenarios.ts +++ b/tests/helpers/connector-outage-scenarios.ts @@ -14,9 +14,7 @@ import { import { join } from 'node:path' import { fileURLToPath } from 'node:url' import type { Sql } from 'postgres' -import { PostgresPairing } from '../../apps/farm/server/storage/postgres-pairing.ts' -import { PostgresPairingProof } from '../../apps/farm/server/storage/postgres-pairing-proof.ts' -import { PostgresPrinterOwnership } from '../../apps/farm/server/storage/postgres-printer-ownership.ts' +import { ENROLLMENT, enrollConnector } from './connector-enrollment.ts' import { loadOrCreateIdentity } from '../../packages/connector/src/identity/store.ts' import { handlerErrors, @@ -83,18 +81,7 @@ export async function runConnectorOutageScenarios(input: { const pairSql = connect(prefix + '_pair'), ownerSql = connect(prefix + '_owner') - // Keys, TLS and Connector identity, all inside the private work directory. - const keyFile = join(workDir, 'keys.json') - const keys = await crypto.subtle.generateKey('Ed25519', true, [ - 'sign', - 'verify', - ]) - if (!('privateKey' in keys)) throw new Error('Expected key pair') - const spki = Buffer.from( - await crypto.subtle.exportKey('spki', keys.publicKey), - ).toString('base64') - const pem = `-----BEGIN PUBLIC KEY-----\n${spki.match(/.{1,64}/g)?.join('\n')}\n-----END PUBLIC KEY-----\n` - writeFileSync(keyFile, JSON.stringify({ fixture: pem }), { mode: 0o600 }) + // TLS and Connector identity, all inside the private work directory. const cert = join(workDir, 'tls-cert.pem'), tlsKey = join(workDir, 'tls-key.pem') execFileSync( @@ -128,79 +115,19 @@ export async function runConnectorOutageScenarios(input: { ledger({ resource: 'loopback-moonraker', port: ports.moonraker }) // Real enrollment: pairing, proof, approval, credential claim and printer assignment. - const issuer = 'https://farm.example', - audience = 'open3dfarmmanager:connector', - ttlSeconds = 3600 - const now = Date.now(), - actor = randomUUID(), - farmId = randomUUID() - await admin`INSERT INTO farm.session_accounts(id) VALUES(${actor})` - await admin`INSERT INTO farm.account_sessions(id,account_id,account_version,created_at,last_seen_at,absolute_expires_at) VALUES(${actor},${actor},0,${now},${now},${now + 3_600_000})` - await admin`INSERT INTO farm.farms(id) VALUES(${farmId}::uuid)` - await admin`INSERT INTO farm.memberships(farm_id,account_id,role) VALUES(${farmId}::uuid,${actor},'owner')` - const binding = { - origin: proxy.origin, - audience: 'open3dfarmmanager:pairing', - } - const pairing = new PostgresPairing(pairSql, binding) - const proof = new PostgresPairingProof(admin, binding) - const started = await pairing.start({ - public_key_spki: identity.publicKeySpki, - platform: 'linux', - version: '0.0.1', - }) - if (!started.ok) throw new Error('Pairing fixture failed') - const challenge = await proof.issue({ - device_code: started.response.device_code, - }) - if (!challenge.ok) throw new Error('Pairing challenge failed') - const completion = await proof.complete({ - device_code: started.response.device_code, - challenge: challenge.challenge, - signature: identity.signPairingProof({ - challenge: challenge.challenge, - expectedOrigin: proxy.origin, - expectedAudience: binding.audience, - now: Date.now(), - }), - }) - assert.equal(completion.ok, true) - const subject = { - sessionRecordId: actor, - policy: { idleTimeoutMs: 3_600_000 }, - farmId, - } - const decision = await pairing.decide({ - ...subject, - decision: 'approve', - request: { - user_code: started.response.user_code, - farm_id: farmId, - expected_fingerprint: identity.fingerprint, - }, - }) - assert.equal(decision.ok, true) - const claimed = await pairing.claim( - { device_code: started.response.device_code }, - { - issuer, - audience, - kid: 'fixture', - privateKey: keys.privateKey, - ttlSeconds, - }, - ) - if (!claimed.ok || claimed.status !== 'approved') - throw new Error('Credential fixture failed') - const { ok: _ok, ...approval } = claimed - const agentId = claimed.agent_id + const { issuer, audience, ttlSeconds } = ENROLLMENT const printerKey = 'outage-printer' - const registered = await new PostgresPrinterOwnership(ownerSql).register({ - ...subject, - agentId: claimed.agent_id, - printerKey, + const enrolled = await enrollConnector({ + admin, + pairSql, + ownerSql, + identity, + origin: proxy.origin, + workDir, + printerKeys: [printerKey], }) - if (!registered.ok) throw new Error('Printer assignment fixture failed') + const { keyFile, farmId, agentId, approval } = enrolled + const registered = enrolled.assignments[0]! const configPath = join(workDir, 'runtime.json'), credentialPath = join(workDir, 'credential.json') @@ -219,7 +146,7 @@ export async function runConnectorOutageScenarios(input: { { assignment_id: registered.assignmentId, farm_id: farmId, - agent_id: claimed.agent_id, + agent_id: agentId, printer_key: printerKey, moonraker_origin: moon.origin, }, diff --git a/tests/helpers/disposable-postgres.ts b/tests/helpers/disposable-postgres.ts new file mode 100644 index 00000000..8c353aab --- /dev/null +++ b/tests/helpers/disposable-postgres.ts @@ -0,0 +1,133 @@ +// Disposable digest-pinned PostgreSQL 17 for explicit test runners: read-only +// root, tmpfs data, all capabilities dropped, loopback port, migrated to the +// current catalog. Never pulls an image and removes only its own container, +// verified by ID, name and label. +import assert from 'node:assert/strict' +import postgres from 'postgres' +import { + loadMigrationCatalog, + runMigrations, + validateMigrationHistory, +} from '../../scripts/db/migrations.ts' + +export const POSTGRES_IMAGE_PATTERN = + /^postgres:17(?:\.[0-9]+)?(?:-[a-z0-9.-]+)?@sha256:[a-f0-9]{64}$/ + +type Docker = (...args: string[]) => Promise + +export function disposablePostgres(input: { + docker: Docker + image: string + name: string + labelKey: string + labelValue: string + port: number + ledger: (value: object) => void +}) { + const { docker, name, ledger } = input + const label = `${input.labelKey}=${input.labelValue}` + let container: string | undefined + let sql: ReturnType | undefined + return { + get container() { + return container + }, + async start() { + // Fails rather than pulling: image ownership and deletion remain with its owner. + await docker('image', 'inspect', input.image) + ledger({ resource: 'container', name, label, image: input.image }) + await docker( + ...['create', '--name', name, '--label', label, '--pull', 'never'], + ...[ + '--cpus', + '2', + '--memory', + '2g', + '--read-only', + '--cap-drop', + 'ALL', + ], + ...['--security-opt', 'no-new-privileges', '--user', 'postgres'], + ...['--tmpfs', '/var/lib/postgresql/data:rw,mode=1777'], + ...['--tmpfs', '/var/run/postgresql:rw,mode=1777'], + ...['--tmpfs', '/tmp:rw,mode=1777'], + ...['-p', `127.0.0.1:${input.port}:5432`], + ...['-e', 'POSTGRES_USER=fixture', '-e', 'POSTGRES_DB=fixture'], + ...['-e', 'POSTGRES_HOST_AUTH_METHOD=trust'], + ...['-e', 'PGDATA=/var/lib/postgresql/data/pgdata'], + input.image, + ) + container = await docker('inspect', '--format', '{{.Id}}', name) + assert.match(container, /^[a-f0-9]{64}$/) + ledger({ resource: 'container-id', id: container }) + await docker('start', container) + // TCP readiness: the image's init-time server listens only on the Unix socket and + // restarts afterwards, so socket readiness can reset the first host connection. + await docker( + ...['exec', container, 'sh', '-c'], + 'n=0; until pg_isready -h 127.0.0.1 -U fixture -d fixture >/dev/null; do n=$((n+1)); [ "$n" -lt 30 ] || exit 1; sleep 1; done', + ) + sql = postgres({ + host: '127.0.0.1', + port: input.port, + database: 'fixture', + username: 'fixture', + password: '', + ssl: false, + max: 4, + connect_timeout: 3, + connection: { application_name: name, statement_timeout: 10000 }, + }) + assert.equal( + (await sql`SELECT to_regnamespace('farm') AS n`)[0]?.n, + null, + 'fresh task-owned cluster only', + ) + assert.match((await sql`SHOW server_version`)[0]?.server_version, /^17\./) + const catalog = await loadMigrationCatalog() + await runMigrations(sql, catalog, { kind: 'up' }) + const journal = + await sql`SELECT position,id,checksum FROM public.open3dfarm_migrations ORDER BY position` + assert.equal( + validateMigrationHistory(catalog, [...journal]), + catalog.length, + ) + return sql + }, + async logs() { + return container + ? await docker('logs', '--tail', '200', container).catch(String) + : '' + }, + /** Closes the admin pool, then removes only the verified owned container. */ + async stop() { + let failure: unknown + try { + await sql?.end({ timeout: 3 }) + } catch (error) { + failure = error + } + try { + const owned = + container ?? + (await docker('inspect', '--format', '{{.Id}}', name).catch(() => '')) + if (owned) { + assert.equal( + await docker( + ...['inspect', '--format'], + `{{index .Config.Labels "${input.labelKey}"}} {{.Name}}`, + owned, + ), + `${input.labelValue} /${name}`, + ) + await docker('rm', '-f', owned) + assert.equal(await docker('ps', '-aq', '--filter', 'id=' + owned), '') + ledger({ removed: 'container', id: owned }) + } + } catch (error) { + failure ??= error + } + if (failure) throw failure + }, + } +} From 11c166adcbb3bfb64a579579e6ebe7e2fa8f8621 Mon Sep 17 00:00:00 2001 From: Heitor Ramon Ribeiro Date: Wed, 11 Nov 2026 23:47:27 -0300 Subject: [PATCH 06/24] test(sim): add two-printer four-tool Spoolman simulator acceptance runner --- scripts/test-sim-farm-acceptance.ts | 174 +++++++++++ tests/helpers/sim-farm-acceptance.ts | 430 +++++++++++++++++++++++++++ 2 files changed, 604 insertions(+) create mode 100644 scripts/test-sim-farm-acceptance.ts create mode 100644 tests/helpers/sim-farm-acceptance.ts diff --git a/scripts/test-sim-farm-acceptance.ts b/scripts/test-sim-farm-acceptance.ts new file mode 100644 index 00000000..4fb3d69b --- /dev/null +++ b/scripts/test-sim-farm-acceptance.ts @@ -0,0 +1,174 @@ +// Explicit test-only runner: two-printer / four-tool / Spoolman simulator +// acceptance (issue #2). Starts the infra/sim Compose stack under its own +// project, a disposable digest-pinned PostgreSQL 17, the built farm server and +// the real Connector CLI. Read-only: never sends a printer command and never +// contacts a physical printer. Needs a built app: pnpm --dir apps/farm build +import assert from 'node:assert/strict' +import { execFile } from 'node:child_process' +import { randomUUID } from 'node:crypto' +import { appendFileSync } from 'node:fs' +import { access, mkdir, rm, statfs, writeFile } from 'node:fs/promises' +import { createServer } from 'node:net' +import { isAbsolute, join, relative } from 'node:path' +import { promisify } from 'node:util' +import { + POSTGRES_IMAGE_PATTERN, + disposablePostgres, +} from '../tests/helpers/disposable-postgres.ts' +import { interruption } from '../tests/helpers/connector-outage-fixtures.ts' +import { + runSimFarmAcceptance, + simPorts, + simulatorStack, +} from '../tests/helpers/sim-farm-acceptance.ts' + +const exec = promisify(execFile) +const env = process.env +const image = env.SIM_ACCEPT_IMAGE +const base = Number(env.SIM_ACCEPT_PORT_BASE) +const workRoot = env.SIM_ACCEPT_WORK_ROOT +const project = env.SIM_ACCEPT_PROJECT ?? 'o3dfm-sim-accept' +if ( + process.argv.length !== 2 || + env.SIM_ACCEPT_ADMITTED !== 'yes' || + !image || + !POSTGRES_IMAGE_PATTERN.test(image) || + !Number.isInteger(base) || + base < 1024 || + base > 65526 || + !workRoot || + !isAbsolute(workRoot) || + !relative(process.cwd(), workRoot).startsWith('..') || + !/^o3dfm-[a-z0-9-]{1,40}$/.test(project) +) + throw new Error( + 'SIM_ACCEPT_ADMITTED=yes, a locally available digest-pinned PostgreSQL 17 SIM_ACCEPT_IMAGE, SIM_ACCEPT_PORT_BASE (uses base..base+8), an absolute SIM_ACCEPT_WORK_ROOT outside the repository and an optional o3dfm-* SIM_ACCEPT_PROJECT are required', + ) +await access(new URL('../apps/farm/.output/server/index.mjs', import.meta.url)) +const ports = simPorts(base) +for (const port of Object.values(ports)) + await new Promise((resolveProbe, reject) => { + const probe = createServer() + probe.once('error', () => + reject( + new Error( + `Port ${port} is in use; choose another SIM_ACCEPT_PORT_BASE`, + ), + ), + ) + probe.listen(port, '127.0.0.1', () => probe.close(() => resolveProbe())) + }) +const docker = async (...args: string[]) => + ( + await exec('docker', args, { timeout: 60000, maxBuffer: 1024 * 1024 }) + ).stdout.trim() +const endpoint = + env.DOCKER_HOST ?? + (await docker('context', 'inspect', '--format', '{{.Endpoints.docker.Host}}')) +assert.match(endpoint, /^unix:\/\//, 'Only a local Docker daemon is allowed') +assert.equal( + await docker( + 'ps', + '-aq', + '--filter', + `label=com.docker.compose.project=${project}`, + ), + '', + `Compose project ${project} already has containers`, +) +const id = randomUUID() +const workDir = join(workRoot, id) +const ledgerPath = join(workRoot, id + '.ledger.jsonl') +const resultPath = join(workRoot, id + '.result.json') +await mkdir(workDir, { recursive: true, mode: 0o700 }) +const ledger = (value: object) => + appendFileSync(ledgerPath, JSON.stringify(value) + '\n', { mode: 0o600 }) +ledger({ resource: 'work-directory', path: workDir, ports }) +let interrupted: unknown +const interrupt = (reason: unknown) => { + interrupted ??= reason + interruption.abort() +} +process.once('SIGINT', () => interrupt(new Error('SIGINT'))) +process.once('SIGTERM', () => interrupt(new Error('SIGTERM'))) +process.on('uncaughtException', interrupt) +process.on('unhandledRejection', interrupt) +const disk = async () => + String( + await statfs(workRoot, { bigint: true }).then((x) => x.bavail * x.bsize), + ) +const startedAt = performance.now() +const database = disposablePostgres({ + docker, + image, + name: `${project}-db-${id}`, + labelKey: 'org.open3dfarmmanager.sim-acceptance', + labelValue: id, + port: ports.db, + ledger, +}) +const stack = simulatorStack({ project, ports, workDir, ledger }) +let failure: unknown +let cleanupFailure: unknown +let report: Awaited> | undefined +try { + assert.ok(BigInt(await disk()) >= 10n * 1024n ** 3n, 'At least 10 GiB free') + await stack.up() + const admin = await database.start() + report = await runSimFarmAcceptance({ admin, ports, workDir, ledger }) + if (interrupted) throw interrupted +} catch (error) { + failure = interrupted ?? error + await writeFile( + join(workRoot, id + '.compose.log'), + await stack.logs().catch(String), + { + mode: 0o600, + }, + ) + if (database.container) + await writeFile( + join(workRoot, id + '.postgres.log'), + await database.logs(), + { + mode: 0o600, + }, + ) +} finally { + try { + await database.stop() + } catch (error) { + cleanupFailure = error + } + try { + await stack.down() + } catch (error) { + cleanupFailure ??= error + } + if (!failure) + try { + await rm(workDir, { recursive: true }) + ledger({ removed: 'work-directory', path: workDir }) + } catch (error) { + cleanupFailure ??= error + } + const result = { + result: failure ? 'failed' : 'passed', + error: + failure instanceof Error + ? failure.stack + : failure + ? String(failure) + : null, + totalMs: Math.round(performance.now() - startedAt), + image, + ...report, + cleanup: cleanupFailure ? String(cleanupFailure) : 'complete', + retainedEvidence: failure ? workDir : null, + diskAvailableBytes: await disk().catch(() => null), + } + await writeFile(resultPath, JSON.stringify(result, null, 2), { mode: 0o600 }) + console.log(JSON.stringify(result, null, 2)) +} +if (failure) throw failure +if (cleanupFailure) throw cleanupFailure diff --git a/tests/helpers/sim-farm-acceptance.ts b/tests/helpers/sim-farm-acceptance.ts new file mode 100644 index 00000000..d714eaad --- /dev/null +++ b/tests/helpers/sim-farm-acceptance.ts @@ -0,0 +1,430 @@ +// Two-printer / four-tool / Spoolman simulator acceptance (issue #2) against +// the real Klipper/Moonraker and Spoolman simulators, the built farm server, +// real enrollment and the real Connector CLI. Read-only: no printer command is +// sent. The caller owns the PostgreSQL container, work directory and ports. +import assert from 'node:assert/strict' +import { execFile, execFileSync } from 'node:child_process' +import { randomUUID } from 'node:crypto' +import { readFileSync, writeFileSync } from 'node:fs' +import { join } from 'node:path' +import { fileURLToPath } from 'node:url' +import { promisify } from 'node:util' +import { Effect } from 'effect' +import type { Sql } from 'postgres' +import { loadOrCreateIdentity } from '../../packages/connector/src/identity/store.ts' +import { discoverMoonraker } from '../../packages/connector/src/moonraker/discovery.ts' +import { createSpoolmanProvider } from '../../packages/connector/src/runtime/spoolman-provider.ts' +import { probePrinter } from '../../packages/sim-tools/src/probe.ts' +import { seedSpoolman } from '../../packages/sim-tools/src/spoolman.ts' +import { ENROLLMENT, enrollConnector } from './connector-enrollment.ts' +import { + startConnector, + startFarmApp, + startFaultProxy, + until, +} from './connector-outage-fixtures.ts' + +const exec = promisify(execFile) +const repo = (path: string) => + fileURLToPath(new URL('../../' + path, import.meta.url)) + +export type SimPorts = { + db: number + app: number + proxy: number + sv06: number + u1: number + spoolman: number + camera: number + sv06Cam: number + u1Cam: number +} +export const simPorts = (base: number): SimPorts => ({ + db: base, + app: base + 1, + proxy: base + 2, + sv06: base + 3, + u1: base + 4, + spoolman: base + 5, + camera: base + 6, + sv06Cam: base + 7, + u1Cam: base + 8, +}) +const PRINTERS = ['sv06', 'u1'] as const +const LIMITS = { + maxMessageBytes: 256 * 1024, + connectTimeoutMs: 3000, + requestTimeoutMs: 3000, + staleAfterMs: 300000, + reconnectMinMs: 500, + reconnectMaxMs: 5000, +} + +/** Simulators from infra/sim with published ports remapped by an override. */ +export function simulatorStack(input: { + project: string + ports: SimPorts + workDir: string + ledger: (value: object) => void +}) { + const { ports } = input + const override = join(input.workDir, 'ports.override.yml') + const publish = (pairs: [number, number][]) => + `ports: !override [${pairs.map(([h, c]) => `'127.0.0.1:${h}:${c}'`).join(', ')}]` + writeFileSync( + override, + [ + 'services:', + ` sv06: { ${publish([ + [ports.sv06, 7125], + [ports.sv06Cam, 8080], + ])} }`, + ` u1: { ${publish([ + [ports.u1, 7125], + [ports.u1Cam, 8080], + ])} }`, + ` spoolman: { ${publish([[ports.spoolman, 8000]])} }`, + ` camera: { ${publish([[ports.camera, 8112]])} }`, + '', + ].join('\n'), + ) + const compose = (...args: string[]) => + exec( + 'docker', + [ + ...['compose', '-p', input.project], + ...['-f', repo('infra/sim/docker-compose.yml'), '-f', override], + ...[ + '--profile', + 'klipper', + '--profile', + 'spoolman', + '--profile', + 'cams', + ], + ...args, + ], + { timeout: 900000, maxBuffer: 4 * 1024 * 1024 }, + ) + return { + origin: (port: number) => `http://127.0.0.1:${port}`, + async up() { + input.ledger({ resource: 'compose-project', project: input.project }) + await compose('up', '-d', '--build') + }, + async down() { + await compose('down', '--volumes', '--remove-orphans', '--rmi', 'local') + input.ledger({ removed: 'compose-project', project: input.project }) + }, + logs: async () => + (await compose('logs', '--no-color', '--tail', '200')).stdout, + } +} + +export async function runSimFarmAcceptance(input: { + admin: Sql + ports: SimPorts + workDir: string + ledger: (value: object) => void +}) { + const { admin, ports, workDir, ledger } = input + const origin = (port: number) => `http://127.0.0.1:${port}` + const timings: Record = {} + const t0 = performance.now() + const mark = (name: string) => + (timings[name] = Math.round(performance.now() - t0)) + + // 1. Both printers connected and ready within the unchanged 90 s budget. + for (const printer of PRINTERS) + await until( + () => + Effect.runPromise(probePrinter(origin(ports[printer]))).then( + () => true, + () => false, + ), + 90000, + `${printer} ready`, + ) + mark('printersReady') + + // 2. Spoolman seed is repeatable (2 vendors, 4 filaments, 6 spools). + const spoolmanOrigin = origin(ports.spoolman) + const seeded = await seedSpoolman(spoolmanOrigin) + assert.deepEqual(await seedSpoolman(spoolmanOrigin), seeded) + + // 3. Connector discovery (PR #106) against the genuine Moonraker instances. + const discovered: Record = {} + for (const printer of PRINTERS) { + const result = await discoverMoonraker({ + origin: origin(ports[printer]), + limits: LIMITS, + signal: AbortSignal.timeout(20000), + client: { + name: 'o3dfm-sim-acceptance', + version: '0.0.1', + url: 'https://example.invalid', + }, + }) + assert.equal(result.server.ready, true, `${printer} discovered ready`) + assert.ok(result.webcams.length >= 1, `${printer} webcam discovered`) + discovered[printer] = { + tools: result.tools.tools.map((tool) => tool.object), + activeTool: result.tools.activeObject, + webcams: result.webcams.map((webcam) => webcam.name), + } + } + assert.deepEqual( + (discovered.u1 as { tools: string[] }).tools, + ['extruder', 'extruder1', 'extruder2', 'extruder3'], + 'u1 exposes four tools', + ) + assert.deepEqual((discovered.sv06 as { tools: string[] }).tools, ['extruder']) + mark('discovered') + + // 4. Connector Spoolman provider observes the seeded inventory. + const farmIdForProvider = randomUUID() + const providerAbort = new AbortController() + let observed: number | null = null + const provider = createSpoolmanProvider({ + config: { + origin: spoolmanOrigin, + farmId: farmIdForProvider, + serviceId: randomUUID(), + limit: 200, + }, + signal: providerAbort.signal, + onSnapshot(snapshot) { + if (snapshot.kind === 'observed' && snapshot.inventory) + observed = snapshot.inventory.items.length + }, + }) + try { + await until(() => observed !== null, 30000, 'spoolman inventory observed') + } finally { + providerAbort.abort() + await provider.done.catch(() => undefined) + } + assert.ok( + observed !== null && observed >= seeded.spools, + 'inventory holds the seeded spools', + ) + mark('inventoryObserved') + + // 5. Real enrollment, built server and Connector CLI for both printers. + const prefix = 'simaccept_' + randomUUID().replaceAll('-', '') + const roles = [ + { name: prefix, group: 'farm_connector_telemetry_writer' }, + { name: prefix + '_pair', group: 'farm_pairing_runtime' }, + { name: prefix + '_owner', group: 'farm_printer_ownership' }, + ] + const created: string[] = [] + const pools: Sql[] = [] + const closers: Array<() => Promise> = [] + try { + for (const role of roles) { + await admin`CREATE ROLE ${admin(role.name)} LOGIN NOSUPERUSER NOCREATEDB NOCREATEROLE NOREPLICATION NOBYPASSRLS IN ROLE ${admin(role.group)}` + created.push(role.name) + ledger({ resource: 'database-role', name: role.name }) + } + const postgresModule = (await import('postgres')).default + const connect = (username: string) => { + const sql = postgresModule({ + host: '127.0.0.1', + port: ports.db, + database: 'fixture', + username, + password: '', + ssl: false, + max: 2, + connect_timeout: 3, + }) + pools.push(sql) + return sql + } + const cert = join(workDir, 'tls-cert.pem'), + tlsKey = join(workDir, 'tls-key.pem') + execFileSync( + 'openssl', + [ + ...['req', '-x509', '-newkey', 'ec', '-pkeyopt'], + ...['ec_paramgen_curve:P-256', '-nodes', '-keyout', tlsKey], + ...['-out', cert, '-days', '1', '-subj', '/CN=127.0.0.1'], + ...['-addext', 'subjectAltName=IP:127.0.0.1'], + ], + { stdio: 'ignore', timeout: 10000 }, + ) + const dataDir = join(workDir, 'connector-data') + const identity = loadOrCreateIdentity(dataDir) + // Pass-through TLS front only; no fault is injected in this acceptance. + const proxy = await startFaultProxy({ + port: ports.proxy, + appPort: ports.app, + cert: readFileSync(cert), + key: readFileSync(tlsKey), + }) + closers.push(() => proxy.close()) + ledger({ resource: 'loopback-proxy', port: ports.proxy }) + const enrolled = await enrollConnector({ + admin, + pairSql: connect(prefix + '_pair'), + ownerSql: connect(prefix + '_owner'), + identity, + origin: proxy.origin, + workDir, + printerKeys: PRINTERS, + }) + const printerOrigins = PRINTERS.map((printer) => origin(ports[printer])) + const configPath = join(workDir, 'runtime.json'), + credentialPath = join(workDir, 'credential.json') + writeFileSync( + configPath, + JSON.stringify({ + version: 1, + collection: { + version: 1, + allowedOrigins: printerOrigins, + printers: PRINTERS.map((printerKey, index) => ({ + printerKey, + origin: printerOrigins[index], + })), + limits: { staleAfterMs: 300000, connectTimeoutMs: 3000 }, + spoolman: { + origin: spoolmanOrigin, + farmId: enrolled.farmId, + serviceId: randomUUID(), + }, + }, + assignments: enrolled.assignments.map((assignment, index) => ({ + assignment_id: assignment.assignmentId, + farm_id: enrolled.farmId, + agent_id: enrolled.agentId, + printer_key: assignment.printerKey, + moonraker_origin: printerOrigins[index], + })), + telemetry: { + endpoint: proxy.origin + '/api/connector/telemetry', + audience: ENROLLMENT.audience, + idleMs: 200, + timeoutMs: 3000, + retryMinMs: 500, + retryMaxMs: 2000, + }, + }), + { mode: 0o600, flag: 'wx' }, + ) + writeFileSync( + credentialPath, + JSON.stringify({ + version: 1, + expected_fingerprint: identity.fingerprint, + approval: enrolled.approval, + }), + { mode: 0o600, flag: 'wx' }, + ) + const databaseUrl = (user: string) => + `postgres://${encodeURIComponent(user)}:synthetic@127.0.0.1:${ports.db}/fixture` + const app = startFarmApp({ + env: { + PATH: process.env.PATH ?? '/usr/bin:/bin', + NODE_ENV: 'production', + NITRO_HOST: '127.0.0.1', + NITRO_PORT: String(ports.app), + NUXT_DATABASE_ENABLED: 'true', + NUXT_DATABASE_DATABASE_URL: databaseUrl('fixture'), + NUXT_DATABASE_MIGRATIONS: 'verify', + NUXT_DATABASE_MIGRATIONS_DIR: repo('infra/db/migrations/'), + NUXT_CONNECTOR_TELEMETRY_ENABLED: 'true', + NUXT_CONNECTOR_TELEMETRY_DATABASE_URL: databaseUrl(prefix), + NUXT_CONNECTOR_TELEMETRY_ORIGIN: proxy.origin, + NUXT_CONNECTOR_TELEMETRY_ISSUER: ENROLLMENT.issuer, + NUXT_CONNECTOR_TELEMETRY_AUDIENCE: ENROLLMENT.audience, + NUXT_CONNECTOR_TELEMETRY_PUBLIC_KEY_REGISTRY_PATH: enrolled.keyFile, + NUXT_CONNECTOR_TELEMETRY_TOKEN_TTL_SECONDS: String( + ENROLLMENT.ttlSeconds, + ), + NUXT_CONNECTOR_TELEMETRY_PROOF_TTL_MS: '30000', + NUXT_CONNECTOR_TELEMETRY_BODY_TIMEOUT_MS: '5000', + }, + logPath: join(workDir, 'app.log'), + onPid: (pid) => ledger({ resource: 'app-process', pid }), + }) + closers.push(() => app.stop()) + await until( + async () => { + if (!app.running) throw new Error('Farm app exited at startup') + return fetch(`http://127.0.0.1:${ports.app}/readyz`, { + signal: AbortSignal.timeout(1000), + }).then( + (response) => response.status === 200, + () => false, + ) + }, + 30000, + 'farm app ready', + ) + mark('appReady') + const connector = startConnector({ + args: [ + ...['--config', configPath, '--credential-file', credentialPath], + ...['--data-dir', dataDir], + ], + env: { + PATH: process.env.PATH ?? '/usr/bin:/bin', + NODE_EXTRA_CA_CERTS: cert, + }, + logPath: join(workDir, 'connector.log'), + onPid: (pid) => ledger({ resource: 'connector-process', pid }), + }) + closers.push(() => connector.stop()) + // 6. Telemetry from both genuine printers is ingested into PostgreSQL. + const perPrinter = async () => + (await admin`SELECT COALESCE(payload#>>'{state,printerKey}', payload#>>'{transition,printerKey}') AS printer, count(*)::int AS n FROM farm.telemetry_events WHERE agent_id=${enrolled.agentId}::uuid AND farm_id=${enrolled.farmId}::uuid GROUP BY 1`) as unknown as { + printer: string + n: number + }[] + await until( + async () => { + if (!connector.running) throw new Error('Connector exited') + const rows = await perPrinter() + return PRINTERS.every((printer) => + rows.some((row) => row.printer === printer && row.n >= 1), + ) + }, + 60000, + 'telemetry rows for both printers', + ) + mark('telemetryIngested') + const rows = await perPrinter() + const states = + (await admin`SELECT DISTINCT payload#>>'{state,state}' AS state FROM farm.telemetry_events WHERE agent_id=${enrolled.agentId}::uuid AND payload ? 'state'`) as unknown as { + state: string + }[] + const unavailable = connector.diagnostics.filter( + (diagnostic) => diagnostic.kind === 'unavailable', + ).length + await connector.stop() + const stopped = await connector.exited + assert.deepEqual(stopped, { code: 0, signal: null }, 'Connector clean exit') + mark('connectorStopped') + return { + timings, + seeded, + discovered, + inventorySpools: observed, + telemetryRows: Object.fromEntries( + rows.map((row) => [row.printer, row.n]), + ), + printerStates: states.map((row) => row.state).sort(), + connectorUnavailableDiagnostics: unavailable, + connectorExit: stopped, + } + } finally { + for (const close of closers.reverse()) await close().catch(() => undefined) + for (const sql of pools) + await sql.end({ timeout: 3 }).catch(() => undefined) + for (const role of created.reverse()) { + await admin`DROP ROLE ${admin(role)}` + ledger({ removed: 'database-role', name: role }) + } + } +} From f28e739442b8f8164b0141635c0d8be5c7711073 Mon Sep 17 00:00:00 2001 From: Heitor Ramon Ribeiro Date: Wed, 11 Nov 2026 23:55:35 -0300 Subject: [PATCH 07/24] docs(sim): document the network fault harness; report unavailable reasons --- infra/sim/netfault/README.md | 47 ++++++++++++++++++++++++++++ tests/helpers/sim-farm-acceptance.ts | 9 +++--- 2 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 infra/sim/netfault/README.md diff --git a/infra/sim/netfault/README.md b/infra/sim/netfault/README.md new file mode 100644 index 00000000..f40c95d8 --- /dev/null +++ b/infra/sim/netfault/README.md @@ -0,0 +1,47 @@ +# Network fault harness + +Opt-in WebRTC reachability checks for issue #2: NAT, latency/loss (netem) and +UDP-block. Results and their meaning for the product are in +[SIMULATOR-NETWORK-FAULTS-CHECKPOINT.md](../../../docs/SIMULATOR-NETWORK-FAULTS-CHECKPOINT.md). + +```sh +pnpm install --frozen-lockfile --ignore-scripts +infra/sim/netfault/run.sh nat 3 /path/to/evidence +infra/sim/netfault/run.sh netem 3 /path/to/evidence +infra/sim/netfault/run.sh udp-block 3 /path/to/evidence +``` + +`NETFAULT_PROJECT` (default `o3dfm-netfault`) names the Compose project. The +script refuses a project that already has containers, starts the topology fresh +for every probe and removes its containers, networks and temporary files on exit. + +## Topology + +| Container | Network | Capabilities | Role | +| ----------- | --------------------- | ---------------------- | ---------------------------------------------------------- | +| `browser` | wan `10.231.31.20` | none | Answering peer and HTTP offer endpoint (TCP signalling) | +| `router` | lan `.2`, wan `.2` | `NET_ADMIN`, `NET_RAW` | NAT (masquerade) lan → wan; applies netem / UDP drop | +| `lan-gw` | lan `10.231.32.10` | `NET_ADMIN` | Holds the lan namespace; sets its default route via router | +| `connector` | shares `lan-gw` netns | none | Offering peer with the Connector's PeerConnection options | + +`NET_ADMIN` is granted only to `router` and `lan-gw`, and only inside their own +network namespaces. Nothing changes host networking or touches other +containers. wan is an internal network. lan is a normal bridge with IP +masquerade disabled: Docker's internal-network rules drop routed frames, and the +isolated gateway mode is allowed only for internal networks. The lan probes route +only via the router, whose `FORWARD` policy drops everything except lan → wan and +established replies. The probes run as UID 1000 with a read-only root, no +capabilities and the repository mounted read-only. `node-datachannel` is copied +(dereferenced) into a temporary directory and mounted read-only, because pnpm may +keep it in a store outside the checkout. + +Faults are applied with `iptables` and `tc` inside the router: + +- `nat`: masquerade only. +- `netem`: `delay 100ms 10ms loss 5%` on both router interfaces (about 200 ms + added round trip, 5 % loss each way). +- `udp-block`: `iptables -I FORWARD -p udp -j DROP`. TCP signalling still passes. + +The probe uses the Connector's ICE configuration (no STUN/TURN, no ICE-TCP, +fingerprint verification on) and runs twice per repeat: with the Connector's +`bindAddress: '127.0.0.1'` policy, and bound to all interfaces. diff --git a/tests/helpers/sim-farm-acceptance.ts b/tests/helpers/sim-farm-acceptance.ts index d714eaad..1bd256d9 100644 --- a/tests/helpers/sim-farm-acceptance.ts +++ b/tests/helpers/sim-farm-acceptance.ts @@ -399,9 +399,10 @@ export async function runSimFarmAcceptance(input: { (await admin`SELECT DISTINCT payload#>>'{state,state}' AS state FROM farm.telemetry_events WHERE agent_id=${enrolled.agentId}::uuid AND payload ? 'state'`) as unknown as { state: string }[] - const unavailable = connector.diagnostics.filter( - (diagnostic) => diagnostic.kind === 'unavailable', - ).length + // Reasons only (fixed labels); a count alone would hide what was unavailable. + const unavailable = connector.diagnostics + .filter((diagnostic) => diagnostic.kind === 'unavailable') + .map((diagnostic) => String(diagnostic.reason)) await connector.stop() const stopped = await connector.exited assert.deepEqual(stopped, { code: 0, signal: null }, 'Connector clean exit') @@ -415,7 +416,7 @@ export async function runSimFarmAcceptance(input: { rows.map((row) => [row.printer, row.n]), ), printerStates: states.map((row) => row.state).sort(), - connectorUnavailableDiagnostics: unavailable, + connectorUnavailable: unavailable, connectorExit: stopped, } } finally { From f7e21b6795090e580b14dd178110e9dcd509ee16 Mon Sep 17 00:00:00 2001 From: Heitor Ramon Ribeiro Date: Thu, 12 Nov 2026 00:00:16 -0300 Subject: [PATCH 08/24] docs(sim): record network fault and simulator acceptance checkpoint --- docs/SIMULATOR-NETWORK-FAULTS-CHECKPOINT.md | 128 ++++++++++++++++++++ infra/sim/netfault/run.sh | 2 +- package.json | 1 + 3 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 docs/SIMULATOR-NETWORK-FAULTS-CHECKPOINT.md diff --git a/docs/SIMULATOR-NETWORK-FAULTS-CHECKPOINT.md b/docs/SIMULATOR-NETWORK-FAULTS-CHECKPOINT.md new file mode 100644 index 00000000..ff7c58b2 --- /dev/null +++ b/docs/SIMULATOR-NETWORK-FAULTS-CHECKPOINT.md @@ -0,0 +1,128 @@ +# Simulator network faults and two-printer acceptance checkpoint + +Issue #2 (E0): "Isolated NAT, latency/loss and UDP-block scenarios" and the +two-printer / four-tool / Spoolman simulator acceptance. Runs on 2026-11-12 UTC +on a shared native x86_64 Docker host (Docker 29, Node 24.22.2, load average 13 +to 25). No physical printer was contacted and no printer command was sent. + +## Network fault harness + +`infra/sim/netfault/run.sh [repeats] [out-dir]`. The +topology, capabilities and isolation are described in +[its README](../infra/sim/netfault/README.md). In short: a Connector-side peer +sits behind a NAT router on its own namespace, and a browser-side peer sits on +a separate internal network. Faults are applied with `iptables`/`tc` inside the +router only (`NET_ADMIN` on the router and the lan namespace holder, nowhere +else). Each repeat starts the topology fresh. + +The probe uses the Connector's `PeerConnection` options: no STUN/TURN, no +ICE-TCP, fingerprint verification on. It runs twice per repeat: + +- `loopback`: the Connector's current `bindAddress: '127.0.0.1'`, set in + `readonly-peer.ts`, `pause-control-peer.ts` and `synthetic-peer.ts`. +- `any`: the same options bound to all interfaces. + +### Results (3 repeats each) + +| Scenario | `loopback` (Connector policy) | `any` | TCP signalling | +| ---------------------------------------------- | ---------------------------------------------------------------- | -------------------------------------------------------------------------------------------------- | -------------- | +| NAT (masquerade) | 3/3 failed: only a `127.0.0.1` candidate, ICE `checking` at 20 s | 3/3 open in 221–232 ms; 40/40 echoed; RTT median 1 ms; both sides see `prflx 10.231.31.2` (router) | 6/6 ok | +| netem 100 ms ± 10 ms, 5 % loss, each direction | 3/3 failed (as above) | 3/3 open in 3.0–4.2 s; 40/40 echoed; RTT median 204–216 ms | 6/6 ok | +| UDP-block (`FORWARD -p udp -j DROP`) | 3/3 failed | 3/3 failed: ICE `checking` at 20 s | 6/6 ok | + +### What this establishes + +- **Finding: the Connector cannot open WebRTC to any browser on another host.** + Every Connector `PeerConnection` binds ICE to `127.0.0.1`. That is the + documented Phase 0 policy ("Native RTC remains restricted to its existing + loopback-only policy", [Connector RTC runtime](CONNECTOR-RTC-RUNTIME-CHECKPOINT.md)). + The only candidate it offers is a loopback address, so even a direct LAN path + fails, not just NAT. Live status, camera and signed commands therefore work + only when browser and Connector share a host. Changing the bind policy is a + product and security decision for the owner and is not made here. +- With an all-interfaces bind, the same ICE configuration crosses a single NAT + without STUN: the browser learns the Connector as a peer-reflexive candidate. + It also survives 200 ms added round trip with 5 % loss each way. Setup is + slower (3–4 s); SCTP retransmission delivered every message. +- With UDP blocked, WebRTC fails as designed (no TURN, no ICE-TCP) while TCP + signalling keeps working. That is the precondition for the read-only degraded + mode. This harness checks the transport only: the farm page's switch to + read-only is covered by the real-RTC runner rows (`farm-page-disconnect`, + [RTC farm acceptance](RTC-FARM-ACCEPTANCE-CHECKPOINT.md)). A UDP-block row on the + real farm page needs a non-loopback Connector bind to be meaningful (above). + +## Two-printer / four-tool / Spoolman acceptance + +`scripts/test-sim-farm-acceptance.ts` (helpers +`tests/helpers/sim-farm-acceptance.ts`, `connector-enrollment.ts`, +`disposable-postgres.ts`): + +```sh +pnpm --dir apps/farm build +SIM_ACCEPT_ADMITTED=yes \ +SIM_ACCEPT_IMAGE='postgres:17@sha256:' \ +SIM_ACCEPT_PORT_BASE= \ +SIM_ACCEPT_WORK_ROOT= \ +SIM_ACCEPT_PROJECT=o3dfm- \ +node scripts/test-sim-farm-acceptance.ts +``` + +It uses ports `base..base+8`, starts the `infra/sim` stack (`klipper`, +`spoolman`, `cams`) under its own Compose project with remapped loopback ports, +and a disposable PostgreSQL 17 (shared helper, same hardening as the outage +runner). Then: + +1. Both genuine Klipper/Moonraker printers become `connected` + `ready` within the + unchanged 90 s budget. +2. The Spoolman seed (2 vendors, 4 filaments, 6 spools) is applied twice with an + identical result. +3. Connector discovery (`discoverMoonraker`, #106) against both printers: ready, + u1 exposes exactly `extruder`..`extruder3`, sv06 exactly `extruder`, and each + reports its webcam. +4. The Connector's Spoolman provider (HTTP traversal plus websocket + invalidation) observes the seeded spools. +5. Real enrollment (pairing, proof, approval, credential claim, two printer + assignments), the built farm server behind a loopback TLS front, and the real + Connector CLI `run` with both printers and the Spoolman section. Telemetry for + both `sv06` and `u1` must be ingested into `farm.telemetry_events`, and the + Connector must exit 0 on SIGTERM. + +It removes its Compose project (containers, volumes, network, built images), the +PostgreSQL container (verified by ID and label), its database roles and its work +directory. Evidence is kept only on failure. + +### Results + +Three consecutive runs plus one earlier run passed (each a fresh Compose project, +fresh volumes, fresh PostgreSQL and fresh enrollment), with +`postgres:17@sha256:266d3c257594e195b309ae9d1805e54c788f1d7b375f56bf6c367aac6c917e7b`: + +| Run | Total | Both ready | Telemetry ingested | Seed (v/f/s) | u1 tools | Webcams | Spools observed | Rows sv06/u1 | Connector exit | Cleanup | +| --- | ------ | ---------- | ------------------ | ------------ | --------------------------- | ------- | --------------- | ------------ | -------------- | -------- | +| 1 | 38.9 s | 14.2 s | 18.2 s | 2/4/6 | `extruder`..`extruder3` (4) | 1 + 1 | 6 | 1 / 1 | 0 | complete | +| 2 | 36.0 s | 13.9 s | 17.9 s | 2/4/6 | 4 | 1 + 1 | 6 | 1 / 1 | 0 | complete | +| 3 | 39.2 s | 13.7 s | 20.4 s | 2/4/6 | 4 | 1 + 1 | 6 | 1 / 1 | 0 | complete | + +Times are from the start of the checks (simulators already started). The +simulators were idle, so each printer produced one `idle` state record. The only +`unavailable` diagnostics were the expected `connecting` events, one per printer +at startup. The simulator images were rebuilt from a warm BuildKit cache. + +The outage runner (`pnpm run test:connector-outage`) now uses the shared +enrollment and PostgreSQL helpers. It passed once after the refactor (89.9 s, all +scenarios, cleanup complete). + +### Not covered yet + +- **Inventory and multi-tool state on the farm page over RTC.** Spoolman snapshots + leave the Connector only through the WebRTC status channel, so the end-to-end + "inventory flows to the browser" check belongs in the real-RTC runner + (#140, now on `main`). A row there needs a `test-signalling-https.ts` opt-in that + points the Connector at the genuine simulators and Spoolman instead of its + synthetic Moonraker, plus farm-page assertions for inventory and tools. That is + the next slice, in a separate scenario file. +- **Discovery is not wired into the Connector runtime (#106 scope).** Tools and + webcams are verified through the Connector's discovery module, not through + telemetry or the farm page. +- **NAT/netem/UDP-block on the real farm page.** Blocked by the loopback bind + policy above until the owner decides on it. diff --git a/infra/sim/netfault/run.sh b/infra/sim/netfault/run.sh index 12401821..13b4d02a 100755 --- a/infra/sim/netfault/run.sh +++ b/infra/sim/netfault/run.sh @@ -34,7 +34,7 @@ cp -rL "$(dirname "$ndc")/." "$NETFAULT_NDC/node_modules/" printf '{"private":true}\n' > "$NETFAULT_NDC/package.json" chmod -R a+rX "$NETFAULT_NDC" cleanup() { dc --profile probe down --volumes --remove-orphans >/dev/null 2>&1 || true; } -trap 'cleanup; rm -rf "$NETFAULT_NDC"' EXIT +trap 'cleanup; dc --profile probe down --rmi local >/dev/null 2>&1 || true; rm -rf "$NETFAULT_NDC"' EXIT router() { dc exec -T router sh -euc "$1"; } apply_fault() { diff --git a/package.json b/package.json index 3417ddce..c6a1d6a5 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "test:e2e:auth-session": "node scripts/test-auth-session-e2e.ts", "test:rtc-farm": "node scripts/test-rtc-farm-acceptance.ts", "test:connector-outage": "node scripts/test-connector-outage-recovery.ts", + "test:sim-farm": "node scripts/test-sim-farm-acceptance.ts", "check:all": "pnpm run lint && pnpm run typecheck && pnpm run test && pnpm run test:node && pnpm run test:rtsp-supervisor && pnpm run test:rtsp-framing && pnpm run build", "sim:smoke": "node packages/sim-tools/src/cli.ts", "lint": "prettier --check .", From cdb2777e4ef8ed8b5e3898bd74258afeaf9d6e08 Mon Sep 17 00:00:00 2001 From: Heitor Ramon Ribeiro Date: Thu, 12 Nov 2026 16:04:14 -0300 Subject: [PATCH 09/24] fix(sim): exactly-once telemetry, webcam frames and netfault isolation - sim acceptance waits for the drain to settle, then requires stored = queued = delivered, distinct event IDs and one idle record per printer; asserts webcam names and fetches one JPEG per camera - netfault: drop lan output to the host gateway, isolate the wan gateway, drop NET_RAW, configurable subnet octet, null on probe crash --- infra/sim/netfault/README.md | 45 +++++++++++------- infra/sim/netfault/docker-compose.yml | 21 +++++---- infra/sim/netfault/rtc-probe.mjs | 6 ++- infra/sim/netfault/run.sh | 23 +++++++-- tests/helpers/sim-farm-acceptance.ts | 68 +++++++++++++++++++++++---- 5 files changed, 122 insertions(+), 41 deletions(-) diff --git a/infra/sim/netfault/README.md b/infra/sim/netfault/README.md index f40c95d8..812ad7d7 100644 --- a/infra/sim/netfault/README.md +++ b/infra/sim/netfault/README.md @@ -17,23 +17,33 @@ for every probe and removes its containers, networks and temporary files on exit ## Topology -| Container | Network | Capabilities | Role | -| ----------- | --------------------- | ---------------------- | ---------------------------------------------------------- | -| `browser` | wan `10.231.31.20` | none | Answering peer and HTTP offer endpoint (TCP signalling) | -| `router` | lan `.2`, wan `.2` | `NET_ADMIN`, `NET_RAW` | NAT (masquerade) lan → wan; applies netem / UDP drop | -| `lan-gw` | lan `10.231.32.10` | `NET_ADMIN` | Holds the lan namespace; sets its default route via router | -| `connector` | shares `lan-gw` netns | none | Offering peer with the Connector's PeerConnection options | +| Container | Network | Capabilities | Role | +| ----------- | ---------------------- | ------------ | ---------------------------------------------------------- | +| `browser` | wan `10..31.20` | none | Answering peer and HTTP offer endpoint (TCP signalling) | +| `router` | lan `.2`, wan `.2` | `NET_ADMIN` | NAT (masquerade) lan → wan; applies netem / UDP drop | +| `lan-gw` | lan `10..32.10` | `NET_ADMIN` | Holds the lan namespace; sets its default route via router | +| `connector` | shares `lan-gw` netns | none | Offering peer with the Connector's ICE options | `NET_ADMIN` is granted only to `router` and `lan-gw`, and only inside their own -network namespaces. Nothing changes host networking or touches other -containers. wan is an internal network. lan is a normal bridge with IP -masquerade disabled: Docker's internal-network rules drop routed frames, and the -isolated gateway mode is allowed only for internal networks. The lan probes route -only via the router, whose `FORWARD` policy drops everything except lan → wan and -established replies. The probes run as UID 1000 with a read-only root, no -capabilities and the repository mounted read-only. `node-datachannel` is copied -(dereferenced) into a temporary directory and mounted read-only, because pnpm may -keep it in a store outside the checkout. +network namespaces. The harness changes no host interface, route or rule itself; +Docker adds the two bridges and their iptables rules, and removes them with the +project. wan is internal with an isolated gateway, so its bridge has no host +address. lan is a normal bridge with IP masquerade disabled: Docker's +internal-network rules drop routed frames, and the isolated gateway mode is +allowed only for internal networks. The lan bridge therefore still holds the +host gateway address `10..32.1`. `lan-gw` drops output to it in the shared +lan namespace (checked before every probe) and the router drops its own. lan +probes otherwise route only via the router, whose `FORWARD` policy drops +everything except lan → wan and established replies. + +Subnets are `10..31.0/24` (wan) and `10..32.0/24` (lan), with +`NETFAULT_OCTET` defaulting to 231. Concurrent projects on one host need distinct +octets; Docker refuses overlapping pools. + +The probes run as UID 1000 with a read-only root, no capabilities and the +repository mounted read-only. `node-datachannel` is copied (dereferenced) into a +temporary directory and mounted read-only, because pnpm may keep it in a store +outside the checkout. A probe that crashes is recorded as `null`. Faults are applied with `iptables` and `tc` inside the router: @@ -42,6 +52,7 @@ Faults are applied with `iptables` and `tc` inside the router: added round trip, 5 % loss each way). - `udp-block`: `iptables -I FORWARD -p udp -j DROP`. TCP signalling still passes. -The probe uses the Connector's ICE configuration (no STUN/TURN, no ICE-TCP, -fingerprint verification on) and runs twice per repeat: with the Connector's +The probe uses the Connector's ICE-relevant options (no STUN/TURN, no ICE-TCP, +fingerprint verification on; it does not mirror `disableAutoNegotiation` or +`maxMessageSize`) and runs twice per repeat: with the Connector's `bindAddress: '127.0.0.1'` policy, and bound to all interfaces. diff --git a/infra/sim/netfault/docker-compose.yml b/infra/sim/netfault/docker-compose.yml index ddf5f732..e8334269 100644 --- a/infra/sim/netfault/docker-compose.yml +++ b/infra/sim/netfault/docker-compose.yml @@ -22,13 +22,13 @@ services: router: build: ./router cap_drop: [ALL] - cap_add: [NET_ADMIN, NET_RAW] + cap_add: [NET_ADMIN] security_opt: [no-new-privileges:true] sysctls: net.ipv4.ip_forward: 1 networks: - lan: { ipv4_address: 10.231.32.2 } - wan: { ipv4_address: 10.231.31.2 } + lan: { ipv4_address: '10.${NETFAULT_OCTET:-231}.32.2' } + wan: { ipv4_address: '10.${NETFAULT_OCTET:-231}.31.2' } cpus: 0.5 mem_limit: 64m pids_limit: 32 @@ -41,10 +41,10 @@ services: [ 'sh', '-c', - 'ip route replace default via 10.231.32.2 && exec sleep infinity', + 'ip route replace default via 10.${NETFAULT_OCTET:-231}.32.2 && iptables -A OUTPUT -d 10.${NETFAULT_OCTET:-231}.32.1 -j DROP && exec sleep infinity', ] networks: - lan: { ipv4_address: 10.231.32.10 } + lan: { ipv4_address: '10.${NETFAULT_OCTET:-231}.32.10' } cpus: 0.25 mem_limit: 32m pids_limit: 16 @@ -54,7 +54,7 @@ services: environment: PROBE_ROLE: answer networks: - wan: { ipv4_address: 10.231.31.20 } + wan: { ipv4_address: '10.${NETFAULT_OCTET:-231}.31.20' } connector: <<: *probe profiles: [probe] @@ -62,7 +62,7 @@ services: command: ['node', 'infra/sim/netfault/rtc-probe.mjs'] environment: PROBE_ROLE: offer - PROBE_PEER: 10.231.31.20 + PROBE_PEER: '10.${NETFAULT_OCTET:-231}.31.20' networks: # Not "internal": Docker's internal-network rules drop frames whose # destination is outside the subnet, which is all routed lan traffic (and @@ -72,7 +72,10 @@ networks: lan: driver_opts: com.docker.network.bridge.enable_ip_masquerade: 'false' - ipam: { config: [{ subnet: 10.231.32.0/24 }] } + ipam: { config: [{ subnet: '10.${NETFAULT_OCTET:-231}.32.0/24' }] } + # Internal with an isolated gateway: the bridge has no host address. wan: internal: true - ipam: { config: [{ subnet: 10.231.31.0/24 }] } + driver_opts: + com.docker.network.bridge.gateway_mode_ipv4: isolated + ipam: { config: [{ subnet: '10.${NETFAULT_OCTET:-231}.31.0/24' }] } diff --git a/infra/sim/netfault/rtc-probe.mjs b/infra/sim/netfault/rtc-probe.mjs index 8957020d..73f654b3 100644 --- a/infra/sim/netfault/rtc-probe.mjs +++ b/infra/sim/netfault/rtc-probe.mjs @@ -1,7 +1,9 @@ // SPDX-License-Identifier: MIT // Test-only WebRTC reachability probe for the network fault harness. -// Uses the Connector's PeerConnection options (no STUN/TURN, no ICE-TCP, -// fingerprint verification on); only the bind address varies. +// Uses the Connector's ICE-relevant PeerConnection options (no STUN/TURN, no +// ICE-TCP, fingerprint verification on); only the bind address varies. It does +// not mirror disableAutoNegotiation or maxMessageSize, which do not affect +// candidate gathering or reachability. // PROBE_ROLE=answer "browser" side: HTTP offer endpoint, echoes data. // PROBE_ROLE=offer "Connector" side: posts an offer, measures the channel. // Prints one JSON result line. Never contacts anything but PROBE_PEER. diff --git a/infra/sim/netfault/run.sh b/infra/sim/netfault/run.sh index 13b4d02a..590fcfd0 100755 --- a/infra/sim/netfault/run.sh +++ b/infra/sim/netfault/run.sh @@ -16,6 +16,14 @@ case "$scenario" in nat | netem | udp-block) ;; *) esac [[ $repeats =~ ^[1-9][0-9]?$ ]] || { echo 'repeats must be 1-99' >&2; exit 2; } here=$(cd "$(dirname "$0")" && pwd) +# Subnets 10..31.0/24 (wan) and 10..32.0/24 (lan). Concurrent +# projects on one host need distinct octets; Docker rejects overlapping pools. +NETFAULT_OCTET=${NETFAULT_OCTET:-231} +[[ $NETFAULT_OCTET =~ ^[0-9]{1,3}$ ]] && ((NETFAULT_OCTET >= 1 && NETFAULT_OCTET <= 254)) || { + echo 'NETFAULT_OCTET must be 1-254' >&2 + exit 2 +} +export NETFAULT_OCTET project=${NETFAULT_PROJECT:-o3dfm-netfault} [[ $project =~ ^o3dfm-[a-z0-9-]{1,40}$ ]] || { echo 'invalid NETFAULT_PROJECT' >&2; exit 2; } dc() { docker compose -p "$project" -f "$here/docker-compose.yml" "$@"; } @@ -36,13 +44,14 @@ chmod -R a+rX "$NETFAULT_NDC" cleanup() { dc --profile probe down --volumes --remove-orphans >/dev/null 2>&1 || true; } trap 'cleanup; dc --profile probe down --rmi local >/dev/null 2>&1 || true; rm -rf "$NETFAULT_NDC"' EXIT -router() { dc exec -T router sh -euc "$1"; } +router() { dc exec -T -e O="$NETFAULT_OCTET" router sh -euc "$1"; } apply_fault() { # Interfaces are found by the fixed addresses from docker-compose.yml. router ' - lan=$(ip -o -4 addr show | awk "/10\.231\.32\.2\//{print \$2}") - wan=$(ip -o -4 addr show | awk "/10\.231\.31\.2\//{print \$2}") - iptables -t nat -A POSTROUTING -s 10.231.32.0/24 -o "$wan" -j MASQUERADE + lan=$(ip -o -4 addr show | awk "/10\.$O\.32\.2\//{print \$2}") + wan=$(ip -o -4 addr show | awk "/10\.$O\.31\.2\//{print \$2}") + iptables -A OUTPUT -d "10.$O.32.1" -j DROP + iptables -t nat -A POSTROUTING -s "10.$O.32.0/24" -o "$wan" -j MASQUERADE iptables -A FORWARD -i "$lan" -o "$wan" -j ACCEPT iptables -A FORWARD -i "$wan" -o "$lan" -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT iptables -P FORWARD DROP @@ -60,7 +69,11 @@ for run in $(seq 1 "$repeats"); do cleanup dc up -d --build --wait router lan-gw browser >/dev/null apply_fault - result=$(dc --profile probe run --rm -T -e PROBE_BIND="$bind" connector | tail -1) + # The lan namespace must not reach the host gateway on the lan bridge. + dc exec -T lan-gw iptables -C OUTPUT -d "10.$NETFAULT_OCTET.32.1" -j DROP + result=$(dc --profile probe run --rm -T -e PROBE_BIND="$bind" connector 2>/dev/null | tail -1 || true) + # A crashed probe prints a stack trace, not a JSON object. + [[ $result == '{'* ]] || result=null browser=$(dc logs --no-log-prefix browser | grep '"event":"channel"' | tail -1 || true) printf '{"scenario":"%s","run":%s,"connector":%s,"browser":%s}\n' \ "$scenario" "$run" "$result" "${browser:-null}" | tee -a "$out/$scenario.jsonl" diff --git a/tests/helpers/sim-farm-acceptance.ts b/tests/helpers/sim-farm-acceptance.ts index 1bd256d9..eba6688e 100644 --- a/tests/helpers/sim-farm-acceptance.ts +++ b/tests/helpers/sim-farm-acceptance.ts @@ -16,6 +16,7 @@ import { discoverMoonraker } from '../../packages/connector/src/moonraker/discov import { createSpoolmanProvider } from '../../packages/connector/src/runtime/spoolman-provider.ts' import { probePrinter } from '../../packages/sim-tools/src/probe.ts' import { seedSpoolman } from '../../packages/sim-tools/src/spoolman.ts' +import { verifyCamera } from '../../packages/sim-tools/src/verify.ts' import { ENROLLMENT, enrollConnector } from './connector-enrollment.ts' import { startConnector, @@ -166,7 +167,11 @@ export async function runSimFarmAcceptance(input: { }, }) assert.equal(result.server.ready, true, `${printer} discovered ready`) - assert.ok(result.webcams.length >= 1, `${printer} webcam discovered`) + assert.deepEqual( + result.webcams.map((webcam) => webcam.name), + [`${printer}-test-pattern`], + `${printer} webcam discovered`, + ) discovered[printer] = { tools: result.tools.tools.map((tool) => tool.object), activeTool: result.tools.activeObject, @@ -179,6 +184,12 @@ export async function runSimFarmAcceptance(input: { 'u1 exposes four tools', ) assert.deepEqual((discovered.sv06 as { tools: string[] }).tools, ['extruder']) + // One JPEG frame from each printer webcam and from the camera service. + const snapshotBytes = { + sv06: await verifyCamera(origin(ports.sv06Cam)), + u1: await verifyCamera(origin(ports.u1Cam)), + camera: await verifyCamera(origin(ports.camera)), + } mark('discovered') // 4. Connector Spoolman provider observes the seeded inventory. @@ -204,10 +215,7 @@ export async function runSimFarmAcceptance(input: { providerAbort.abort() await provider.done.catch(() => undefined) } - assert.ok( - observed !== null && observed >= seeded.spools, - 'inventory holds the seeded spools', - ) + assert.ok(observed === seeded.spools, 'inventory holds the seeded spools') mark('inventoryObserved') // 5. Real enrollment, built server and Connector CLI for both printers. @@ -394,7 +402,47 @@ export async function runSimFarmAcceptance(input: { 'telemetry rows for both printers', ) mark('telemetryIngested') + // Exactly-once: let the drain settle, stop the Connector, then compare what + // the collector queued, what the agent delivered and what was stored. + const delivered = () => + connector.diagnostics + .filter((d) => d.kind === 'delivery' && d.status === 'delivered') + .reduce((sum, d) => sum + Number(d.count), 0) + const stored = async () => + ( + await admin`SELECT count(*)::int AS n FROM farm.telemetry_events WHERE agent_id=${enrolled.agentId}::uuid` + )[0]!.n as number + await until( + async () => + delivered() >= connector.count('queued') && + (await stored()) === delivered(), + 30000, + 'telemetry drain settled', + ) + await connector.stop() + const stopped = await connector.exited + assert.deepEqual(stopped, { code: 0, signal: null }, 'Connector clean exit') + const summary = connector.diagnostics.find((d) => d.kind === 'summary') + const agentSummary = connector.diagnostics.find( + (d) => d.kind === 'agent-summary', + ) + assert.ok(summary && agentSummary, 'Connector summaries present') + assert.equal(summary.expired, 0) + assert.equal(summary.capacity, 0) + const [totals] = + (await admin`SELECT count(*)::int AS n, count(DISTINCT event_id)::int AS d FROM farm.telemetry_events WHERE agent_id=${enrolled.agentId}::uuid AND farm_id=${enrolled.farmId}::uuid`) as unknown as { + n: number + d: number + }[] + assert.equal(totals!.n, totals!.d, 'each event stored exactly once') + assert.equal(totals!.n, summary.queued, 'every queued record stored') + assert.equal(agentSummary.delivered, summary.queued, 'every record acked') const rows = await perPrinter() + // Idle simulators: exactly one baseline state record per printer. + assert.deepEqual( + Object.fromEntries(rows.map((row) => [row.printer, row.n])), + { sv06: 1, u1: 1 }, + ) const states = (await admin`SELECT DISTINCT payload#>>'{state,state}' AS state FROM farm.telemetry_events WHERE agent_id=${enrolled.agentId}::uuid AND payload ? 'state'`) as unknown as { state: string @@ -403,14 +451,18 @@ export async function runSimFarmAcceptance(input: { const unavailable = connector.diagnostics .filter((diagnostic) => diagnostic.kind === 'unavailable') .map((diagnostic) => String(diagnostic.reason)) - await connector.stop() - const stopped = await connector.exited - assert.deepEqual(stopped, { code: 0, signal: null }, 'Connector clean exit') mark('connectorStopped') return { timings, seeded, discovered, + snapshotBytes, + exactlyOnce: { + queued: summary.queued, + delivered: agentSummary.delivered, + stored: totals!.n, + distinct: totals!.d, + }, inventorySpools: observed, telemetryRows: Object.fromEntries( rows.map((row) => [row.printer, row.n]), From d93698f9024464833776a3627f69de295d431bf1 Mon Sep 17 00:00:00 2001 From: Heitor Ramon Ribeiro Date: Thu, 12 Nov 2026 16:14:17 -0300 Subject: [PATCH 10/24] docs(sim): record exactly-once, webcam and isolation checks --- docs/SIMULATOR-NETWORK-FAULTS-CHECKPOINT.md | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/docs/SIMULATOR-NETWORK-FAULTS-CHECKPOINT.md b/docs/SIMULATOR-NETWORK-FAULTS-CHECKPOINT.md index ff7c58b2..4f5c2f2c 100644 --- a/docs/SIMULATOR-NETWORK-FAULTS-CHECKPOINT.md +++ b/docs/SIMULATOR-NETWORK-FAULTS-CHECKPOINT.md @@ -15,8 +15,9 @@ a separate internal network. Faults are applied with `iptables`/`tc` inside the router only (`NET_ADMIN` on the router and the lan namespace holder, nowhere else). Each repeat starts the topology fresh. -The probe uses the Connector's `PeerConnection` options: no STUN/TURN, no -ICE-TCP, fingerprint verification on. It runs twice per repeat: +The probe uses the Connector's ICE-relevant `PeerConnection` options: no +STUN/TURN, no ICE-TCP, fingerprint verification on. It does not mirror +`disableAutoNegotiation` or `maxMessageSize`, which do not affect reachability. It runs twice per repeat: - `loopback`: the Connector's current `bindAddress: '127.0.0.1'`, set in `readonly-peer.ts`, `pause-control-peer.ts` and `synthetic-peer.ts`. @@ -77,15 +78,18 @@ runner). Then: 2. The Spoolman seed (2 vendors, 4 filaments, 6 spools) is applied twice with an identical result. 3. Connector discovery (`discoverMoonraker`, #106) against both printers: ready, - u1 exposes exactly `extruder`..`extruder3`, sv06 exactly `extruder`, and each - reports its webcam. + u1 exposes exactly `extruder`..`extruder3`, sv06 exactly `extruder`, and their + webcams are exactly `sv06-test-pattern` and `u1-test-pattern`. One JPEG frame + is fetched from each printer webcam and from the camera service. 4. The Connector's Spoolman provider (HTTP traversal plus websocket - invalidation) observes the seeded spools. + invalidation) observes exactly the 6 seeded spools. 5. Real enrollment (pairing, proof, approval, credential claim, two printer assignments), the built farm server behind a loopback TLS front, and the real Connector CLI `run` with both printers and the Spoolman section. Telemetry for - both `sv06` and `u1` must be ingested into `farm.telemetry_events`, and the - Connector must exit 0 on SIGTERM. + both `sv06` and `u1` must be ingested into `farm.telemetry_events`. After the + drain settles the Connector is stopped (exit 0), and exactly-once holds: + stored rows = collector `queued` = agent `delivered`, no duplicate event IDs, + no expiry/capacity loss, and exactly one idle state record per printer. It removes its Compose project (containers, volumes, network, built images), the PostgreSQL container (verified by ID and label), its database roles and its work From ad5cddd142709cc8f2a49e1044f5d712605900f4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 15 Nov 2026 09:30:42 +0000 Subject: [PATCH 11/24] chore(deps): update postgres:17 docker digest to 0d938e9 --- infra/app/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/app/docker-compose.yml b/infra/app/docker-compose.yml index 44cf1cf2..bd17040c 100644 --- a/infra/app/docker-compose.yml +++ b/infra/app/docker-compose.yml @@ -6,7 +6,7 @@ name: ${COMPOSE_PROJECT_NAME:-open3dfarmmanager-app} services: postgres: - image: postgres:17@sha256:266d3c257594e195b309ae9d1805e54c788f1d7b375f56bf6c367aac6c917e7b + image: postgres:17@sha256:0d938e975177bef9f1f61f3f9dbcf2e0aa0a139568f66d3415ed8892eb97f6ac restart: unless-stopped security_opt: ['no-new-privileges:true'] stop_grace_period: 30s From 52a1543daeca2e7256f72235b1a1924b366cc4d0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 15 Nov 2026 17:32:24 +0000 Subject: [PATCH 12/24] chore(deps): update bluenviron/mediamtx docker digest to c730bcc --- infra/sim/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/sim/docker-compose.yml b/infra/sim/docker-compose.yml index aa40c780..4d2937ee 100644 --- a/infra/sim/docker-compose.yml +++ b/infra/sim/docker-compose.yml @@ -64,7 +64,7 @@ services: cap_drop: [ALL] security_opt: [no-new-privileges:true] rtsp: - image: bluenviron/mediamtx@sha256:2356620b402c32c0a0e61d2d731af37c9e957ae4a97421b05722580385d92aa3 + image: bluenviron/mediamtx@sha256:c730bccdbc8739f8f0c13cefe9bea8b61926f599b88fa4d0d229baa91846c7bc platform: linux/amd64 profiles: [rtsp] user: '10001:10001' From 69c51fe0d8a769cbc09100e31e9327d53e44953e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 16 Nov 2026 18:54:50 +0000 Subject: [PATCH 13/24] fix(deps): update dependency effect to v4.1.4 --- package.json | 2 +- packages/connector/package.json | 2 +- packages/sim-tools/package.json | 2 +- pnpm-lock.yaml | 18 +++++++++--------- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index b65ac421..2ce81834 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@playwright/test": "1.65.0", "@axe-core/playwright": "4.14.0", "prettier": "3.9.10", - "effect": "4.1.2", + "effect": "4.1.4", "vitest": "5.1.0", "esbuild": "0.28.2" }, diff --git a/packages/connector/package.json b/packages/connector/package.json index 2b8c3839..1b57543f 100644 --- a/packages/connector/package.json +++ b/packages/connector/package.json @@ -13,7 +13,7 @@ "dependencies": { "@open3dfarmmanager/farm-protocol": "workspace:*", "@open3dfarmmanager/shared": "workspace:*", - "effect": "4.1.2", + "effect": "4.1.4", "mqtt": "5.16.1", "node-datachannel": "0.33.6", "ws": "8.22.1", diff --git a/packages/sim-tools/package.json b/packages/sim-tools/package.json index fa7d3ecf..d80dcb20 100644 --- a/packages/sim-tools/package.json +++ b/packages/sim-tools/package.json @@ -7,7 +7,7 @@ ".": "./src/probe.ts" }, "dependencies": { - "effect": "4.1.2", + "effect": "4.1.4", "zod": "4.6.7", "@open3dfarmmanager/farm-protocol": "workspace:*" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ef877a68..0fdc3603 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -189,8 +189,8 @@ importers: specifier: 24.19.2 version: 24.19.2 effect: - specifier: 4.1.2 - version: 4.1.2 + specifier: 4.1.4 + version: 4.1.4 esbuild: specifier: 0.28.2 version: 0.28.2 @@ -250,8 +250,8 @@ importers: specifier: workspace:* version: link:../shared effect: - specifier: 4.1.2 - version: 4.1.2 + specifier: 4.1.4 + version: 4.1.4 mqtt: specifier: 5.16.1 version: 5.16.1(supports-color@10.2.2) @@ -285,8 +285,8 @@ importers: specifier: workspace:* version: link:../farm-protocol effect: - specifier: 4.1.2 - version: 4.1.2 + specifier: 4.1.4 + version: 4.1.4 zod: specifier: 4.6.7 version: 4.6.7 @@ -1960,8 +1960,8 @@ packages: ee-first@1.1.1: resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} - effect@4.1.2: - resolution: {integrity: sha512-d3Oah1WyKxFLFh19yWheS5IXIVaITzxZ71JkE1rkUozq/6EcJSU5nPk5bF2QrSygZ3SQoiNQB8TsxFriyMeMaQ==} + effect@4.1.4: + resolution: {integrity: sha512-Tgrv/9FN+TZYyOn8XSli+fVqAfwDrDAkiX5Uu9vztINb675VTQdhD0gWI5Kzvhlh9QqzjZvw72iugqw5pwoghQ==} electron-to-chromium@1.5.476: resolution: {integrity: sha512-LnPnRZ0esKB9NjsSIaC+mffW+5dAtBui6kbK5f9Qykblj4Q33cn6yIhuCcTVjwpvL3YJPqqQ4IlsNyriGNpyFQ==} @@ -5352,7 +5352,7 @@ snapshots: ee-first@1.1.1: {} - effect@4.1.2: {} + effect@4.1.4: {} electron-to-chromium@1.5.476: {} From b483663de1b01cc057df1fd126153782cc274d40 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 16 Nov 2026 18:54:57 +0000 Subject: [PATCH 14/24] fix(deps): update dependency jose to v6.2.17 --- apps/farm/package.json | 2 +- pnpm-lock.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/farm/package.json b/apps/farm/package.json index b7d857b2..1adae2e2 100644 --- a/apps/farm/package.json +++ b/apps/farm/package.json @@ -12,7 +12,7 @@ "@adonisjs/hash": "10.1.1", "@open3dfarmmanager/farm-protocol": "workspace:*", "@open3dfarmmanager/shared": "workspace:*", - "jose": "6.2.15", + "jose": "6.2.17", "nuxt": "4.6.4", "postgres": "4.1.0", "vue": "3.5.45", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ef877a68..62191ebb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -216,8 +216,8 @@ importers: specifier: workspace:* version: link:../../packages/shared jose: - specifier: 6.2.15 - version: 6.2.15 + specifier: 6.2.17 + version: 6.2.17 nuxt: specifier: 4.6.4 version: 4.6.4(@babel/plugin-syntax-jsx@7.29.7(@babel/core@7.29.13(supports-color@10.2.2)))(@babel/plugin-syntax-typescript@7.29.7(@babel/core@7.29.13(supports-color@10.2.2)))(@oxc-project/types@0.156.0)(@types/node@24.19.2)(@vue/compiler-sfc@3.5.44)(acorn@8.19.0)(bare-buffer@3.7.1)(confbox@0.3.2)(db0@0.3.4)(dotenv@17.4.2)(esbuild@0.28.2)(giget@3.3.1)(ioredis@5.11.1(supports-color@10.2.2))(lightningcss@1.33.0)(mlly@1.8.2)(rolldown@1.2.16)(rollup-plugin-visualizer@7.1.2(rolldown@1.2.16)(rollup@4.67.5))(rollup@4.67.5)(srvx@1.0.8)(supports-color@10.2.2)(terser@5.51.2)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.51.2))(vue-tsc@3.3.14(typescript@6.0.3)) @@ -2307,8 +2307,8 @@ packages: resolution: {integrity: sha512-AC/7JofJvZGrrneWNaEnJeOLUx+JlGt7tNa0wZiRPT4MY1wmfKjt2+6O2p2uz2+skll8OZZmJMNqeke7kKbNgQ==} hasBin: true - jose@6.2.15: - resolution: {integrity: sha512-qdF6ewcZARtef63fJ9AKKZPgxw+t7USH6HLXYcD4CrdmSvDp79rpJSPFEKc90QBeGS63u1KQtN2MZQHC0yDIzA==} + jose@6.2.17: + resolution: {integrity: sha512-wOuK9V1yujQFH5S0ZWmLcDZN7+IKh9bUCC2ZPCf2HDlol3WWHy+PPyNjEI75FXRLMp3vDKQcupP59xhVU95hcg==} js-tokens@10.0.0: resolution: {integrity: sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==} @@ -5692,7 +5692,7 @@ snapshots: jiti@2.7.0: {} - jose@6.2.15: {} + jose@6.2.17: {} js-tokens@10.0.0: {} From d4649a99565f32a809adb5c6e4724751043f4843 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 16 Nov 2026 18:55:03 +0000 Subject: [PATCH 15/24] fix(deps): update dependency postgres to v4.1.1 --- apps/farm/package.json | 2 +- package.json | 2 +- pnpm-lock.yaml | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/farm/package.json b/apps/farm/package.json index b7d857b2..d95ebc7d 100644 --- a/apps/farm/package.json +++ b/apps/farm/package.json @@ -14,7 +14,7 @@ "@open3dfarmmanager/shared": "workspace:*", "jose": "6.2.15", "nuxt": "4.6.4", - "postgres": "4.1.0", + "postgres": "4.1.1", "vue": "3.5.45", "vue-router": "5.4.0", "zod": "4.6.7" diff --git a/package.json b/package.json index b65ac421..ec7ac83c 100644 --- a/package.json +++ b/package.json @@ -48,6 +48,6 @@ "@open3dfarmmanager/farm-protocol": "workspace:*", "@open3dfarmmanager/shared": "workspace:*", "@open3dfarmmanager/sim-tools": "workspace:*", - "postgres": "4.1.0" + "postgres": "4.1.1" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ef877a68..17ebfb9a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -176,8 +176,8 @@ importers: specifier: workspace:* version: link:packages/sim-tools postgres: - specifier: 4.1.0 - version: 4.1.0 + specifier: 4.1.1 + version: 4.1.1 devDependencies: '@axe-core/playwright': specifier: 4.14.0 @@ -222,8 +222,8 @@ importers: specifier: 4.6.4 version: 4.6.4(@babel/plugin-syntax-jsx@7.29.7(@babel/core@7.29.13(supports-color@10.2.2)))(@babel/plugin-syntax-typescript@7.29.7(@babel/core@7.29.13(supports-color@10.2.2)))(@oxc-project/types@0.156.0)(@types/node@24.19.2)(@vue/compiler-sfc@3.5.44)(acorn@8.19.0)(bare-buffer@3.7.1)(confbox@0.3.2)(db0@0.3.4)(dotenv@17.4.2)(esbuild@0.28.2)(giget@3.3.1)(ioredis@5.11.1(supports-color@10.2.2))(lightningcss@1.33.0)(mlly@1.8.2)(rolldown@1.2.16)(rollup-plugin-visualizer@7.1.2(rolldown@1.2.16)(rollup@4.67.5))(rollup@4.67.5)(srvx@1.0.8)(supports-color@10.2.2)(terser@5.51.2)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.51.2))(vue-tsc@3.3.14(typescript@6.0.3)) postgres: - specifier: 4.1.0 - version: 4.1.0 + specifier: 4.1.1 + version: 4.1.1 vue: specifier: 3.5.45 version: 3.5.45(typescript@6.0.3) @@ -2742,8 +2742,8 @@ packages: resolution: {integrity: sha512-LJlKCCAUFKOuZxipUdYw1NzIITEsPcgyOG9LkvRJvuKj/bRzbuRY0ARXvL0pWGpsZvn8jku+LMep2eU0seHp8g==} engines: {node: ^10 || ^12 || >=14} - postgres@4.1.0: - resolution: {integrity: sha512-s+0WH67YAyLdBQUb6XczbziBhY+C9uiQsg9S8R5RHdZhk6sdyK6202E+T2tXpiInSEEjDLRSJ3OpYBe3PN6MsQ==} + postgres@4.1.1: + resolution: {integrity: sha512-1kJDojqNZC+iTHHXh6eif0J98LUtyLAePe/qkW1GK35eh2JixlsAiIKq3FGI+xqI+SUGTNodzf7TScVeIIyUug==} engines: {node: '>=18'} powershell-utils@0.2.1: @@ -6320,7 +6320,7 @@ snapshots: picocolors: 1.1.1 source-map-js: 1.2.2 - postgres@4.1.0: {} + postgres@4.1.1: {} powershell-utils@0.2.1: {} From 7122ddb78f53c5872a33b86f210871c699d21ac1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 16 Nov 2026 18:55:10 +0000 Subject: [PATCH 16/24] chore(deps): update dependency prettier to v3.10.1 --- package.json | 2 +- pnpm-lock.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index b65ac421..460f823b 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "@types/node": "24.19.2", "@playwright/test": "1.65.0", "@axe-core/playwright": "4.14.0", - "prettier": "3.9.10", + "prettier": "3.10.1", "effect": "4.1.2", "vitest": "5.1.0", "esbuild": "0.28.2" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ef877a68..ec1fcb31 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -195,8 +195,8 @@ importers: specifier: 0.28.2 version: 0.28.2 prettier: - specifier: 3.9.10 - version: 3.9.10 + specifier: 3.10.1 + version: 3.10.1 typescript: specifier: 7.0.2 version: 7.0.2 @@ -2750,8 +2750,8 @@ packages: resolution: {integrity: sha512-C+y9x90UElAddDZmV4qOx9W53B61PO7cIqWz2dQsWlwswuq4mr8NEwytdGKboYbQlGZ3awrkTeNvcZiZNHnQ8A==} engines: {node: '>=20'} - prettier@3.9.10: - resolution: {integrity: sha512-skGHTH1Yb9QvaTC4hWnRTzEYtCpApF0UMBPz+t/0ZPzP8ihefo/btKd+QA7pUE0fEwA1SbS/NmhyEcstdXOIdA==} + prettier@3.10.1: + resolution: {integrity: sha512-70vp3ZUYoPlFbF9uiTdXHUUCGEIp7d4+6p+8DYbkm2jP7x/3i/paXVF6dopSI3zd/CEitrZN1rc4i85xWmmXlg==} engines: {node: '>=14'} hasBin: true @@ -6324,7 +6324,7 @@ snapshots: powershell-utils@0.2.1: {} - prettier@3.9.10: {} + prettier@3.10.1: {} pretty-bytes@7.2.0: {} From 2264b52371fd750d13c595bc7ab2c5ada29a44d3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 16 Nov 2026 18:55:16 +0000 Subject: [PATCH 17/24] fix(deps): update dependency vue-router to v5.5.1 --- apps/farm/package.json | 2 +- pnpm-lock.yaml | 41 ++++++++++++++++++++++++++++++++--------- 2 files changed, 33 insertions(+), 10 deletions(-) diff --git a/apps/farm/package.json b/apps/farm/package.json index b7d857b2..8bc2f66f 100644 --- a/apps/farm/package.json +++ b/apps/farm/package.json @@ -16,7 +16,7 @@ "nuxt": "4.6.4", "postgres": "4.1.0", "vue": "3.5.45", - "vue-router": "5.4.0", + "vue-router": "5.5.1", "zod": "4.6.7" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ef877a68..1eb6ce21 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -228,8 +228,8 @@ importers: specifier: 3.5.45 version: 3.5.45(typescript@6.0.3) vue-router: - specifier: 5.4.0 - version: 5.4.0(@vue/compiler-sfc@3.5.44)(esbuild@0.28.2)(rolldown@1.2.16)(rollup@4.67.5)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.51.2))(vue@3.5.45(typescript@6.0.3)) + specifier: 5.5.1 + version: 5.5.1(@vue/compiler-sfc@3.5.44)(esbuild@0.28.2)(rolldown@1.2.16)(rollup@4.67.5)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.51.2))(vue@3.5.45(typescript@6.0.3)) zod: specifier: 4.6.7 version: 4.6.7 @@ -1766,6 +1766,10 @@ packages: resolution: {integrity: sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==} engines: {node: '>= 20.19.0'} + chokidar@6.0.0: + resolution: {integrity: sha512-Ec2Z7wpcKBiMpR7DxteoqS/sq5G5d2A4fpxzPv6+fD7xNNdrTghn7L11YwV5EN1B3i72Erc3XVT5FkWIDx90+A==} + engines: {node: '>= 22.22'} + chownr@3.0.0: resolution: {integrity: sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==} engines: {node: '>=18'} @@ -2435,6 +2439,10 @@ packages: resolution: {integrity: sha512-++gUqRDEvcnN6Zhqrr+y/CkVEHhlrR96vZn3nZZPYzMcBUyBtTKzB9NadClFIsIVSsu+3i9tfk/erqy9kAmt7Q==} engines: {node: '>=14'} + local-pkg@2.0.0: + resolution: {integrity: sha512-xvTNwM27EpU+fkLSpo33Pq/nm8m5zNf0aU/hF4W4ZM9RHQjVZa5KTmmXIzEzVsdI09NOUqj0djHhTv96sUowSQ==} + engines: {node: '>=20.19.0'} + lru-cache@10.4.3: resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==} @@ -2772,6 +2780,9 @@ packages: quansync@0.2.11: resolution: {integrity: sha512-AifT7QEbW9Nri4tAwR5M/uzpBuqfZf+zwaEM/QkzEjj7NBuFD2rBuy0K3dE+8wltbezDV7JMA0WfnCPYRSYbXA==} + quansync@1.0.0: + resolution: {integrity: sha512-5xZacEEufv3HSTPQuchrvV6soaiACMFnq1H8wkVioctoH3TRha9Sz66lOxRwPK/qZj7HPiSveih9yAyh98gvqA==} + queue-microtask@1.2.3: resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} @@ -3515,8 +3526,8 @@ packages: vue-devtools-stub@0.1.0: resolution: {integrity: sha512-RutnB7X8c5hjq39NceArgXg28WZtZpGc3+J16ljMiYnFhKvd8hITxSWQSQ5bvldxMDU6gG5mkxl1MTQLXckVSQ==} - vue-router@5.4.0: - resolution: {integrity: sha512-pFvcYcxinDHjZUlf7AzFBrT8r8Xqvv4uMHoJnjc+EqPawXQvHTkF8S4tfSmQLpriVHUGfkaKlI7Et0KRjTMTdw==} + vue-router@5.5.1: + resolution: {integrity: sha512-lUENd/QIhKd2HWACnXID3us0GWBnuOi3BwkTUzce2+4nfM/b3seV5saNURM9+wt48/qUxviotpcm7yFxC0U4qA==} peerDependencies: '@pinia/colada': '>=0.21.2' '@vue/compiler-sfc': ^3.5.34 || ^4.0.0 @@ -4857,7 +4868,7 @@ snapshots: '@vue-macros/common@3.1.4(vue@3.5.45(typescript@6.0.3))': dependencies: - '@vue/compiler-sfc': 3.5.44 + '@vue/compiler-sfc': 3.5.45 ast-kit: 2.2.0 local-pkg: 1.2.1 magic-string-ast: 1.0.3 @@ -5216,6 +5227,10 @@ snapshots: dependencies: readdirp: 5.1.1 + chokidar@6.0.0: + dependencies: + readdirp: 5.1.1 + chownr@3.0.0: {} citty@0.1.6: @@ -5795,6 +5810,12 @@ snapshots: pkg-types: 2.4.0 quansync: 0.2.11 + local-pkg@2.0.0: + dependencies: + mlly: 1.8.2 + pkg-types: 2.4.0 + quansync: 1.0.0 + lru-cache@10.4.3: {} lru-cache@11.5.3: {} @@ -6137,7 +6158,7 @@ snapshots: vue: 3.5.45(typescript@6.0.3) vue-bundle-renderer: 2.4.0 vue-component-type-helpers: 3.3.14 - vue-router: 5.4.0(@vue/compiler-sfc@3.5.44)(esbuild@0.28.2)(rolldown@1.2.16)(rollup@4.67.5)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.51.2))(vue@3.5.45(typescript@6.0.3)) + vue-router: 5.5.1(@vue/compiler-sfc@3.5.44)(esbuild@0.28.2)(rolldown@1.2.16)(rollup@4.67.5)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.51.2))(vue@3.5.45(typescript@6.0.3)) optionalDependencies: '@types/node': 24.19.2 transitivePeerDependencies: @@ -6340,6 +6361,8 @@ snapshots: quansync@0.2.11: {} + quansync@1.0.0: {} + queue-microtask@1.2.3: {} radix3@1.1.2: {} @@ -7033,14 +7056,14 @@ snapshots: vue-devtools-stub@0.1.0: {} - vue-router@5.4.0(@vue/compiler-sfc@3.5.44)(esbuild@0.28.2)(rolldown@1.2.16)(rollup@4.67.5)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.51.2))(vue@3.5.45(typescript@6.0.3)): + vue-router@5.5.1(@vue/compiler-sfc@3.5.44)(esbuild@0.28.2)(rolldown@1.2.16)(rollup@4.67.5)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.51.2))(vue@3.5.45(typescript@6.0.3)): dependencies: '@vue-macros/common': 3.1.4(vue@3.5.45(typescript@6.0.3)) '@vue/devtools-api': 8.2.1 ast-walker-scope: 0.10.0 - chokidar: 5.0.0 + chokidar: 6.0.0 confbox: 0.3.2 - local-pkg: 1.2.1 + local-pkg: 2.0.0 magic-string: 1.4.5 mlly: 1.8.2 muggle-string: 0.4.1 From eff7a5f8f8ff1a2223f88258b6c55455e68de067 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 16 Nov 2026 18:55:22 +0000 Subject: [PATCH 18/24] fix(deps): update dependency ws to v8.23.0 --- packages/connector/package.json | 2 +- pnpm-lock.yaml | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/connector/package.json b/packages/connector/package.json index 2b8c3839..13eb8572 100644 --- a/packages/connector/package.json +++ b/packages/connector/package.json @@ -16,7 +16,7 @@ "effect": "4.1.2", "mqtt": "5.16.1", "node-datachannel": "0.33.6", - "ws": "8.22.1", + "ws": "8.23.0", "zod": "4.6.7" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ef877a68..218c3799 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -259,8 +259,8 @@ importers: specifier: 0.33.6 version: 0.33.6 ws: - specifier: 8.22.1 - version: 8.22.1 + specifier: 8.23.0 + version: 8.23.0 zod: specifier: 4.6.7 version: 4.6.7 @@ -3587,8 +3587,8 @@ packages: resolution: {integrity: sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==} engines: {node: '>=18'} - ws@8.22.1: - resolution: {integrity: sha512-oyL6OPYme/CmiFvNuGzeoxCJ4nOrZE2O1FwM9MWM1AsGri6nLXB2pg+lNA8aLeXMSav0J6eIVS1j6vUPzUtK9g==} + ws@8.23.0: + resolution: {integrity: sha512-wCkmX8QMOrKjgO8HW2WyDbTSGeqkocxgDzS9iR79rEAexty6/2qzilx3Ag8Tqf9ykop3irLKle0MtVn5qjVnoQ==} engines: {node: '>=10.0.0'} peerDependencies: bufferutil: ^4.0.1 @@ -4136,7 +4136,7 @@ snapshots: vite-plugin-inspect: 11.4.1(@nuxt/kit@4.6.4(@nuxt/schema@4.6.4)(confbox@0.3.2)(dotenv@17.4.2)(giget@3.3.1)(jiti@2.7.0)(magic-string@1.4.5)(mlly@1.8.2)(rolldown@1.2.16)(unplugin@3.7.0(esbuild@0.28.2)(rolldown@1.2.16)(rollup@4.67.5)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.51.2))))(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.51.2)) vite-plugin-vue-tracer: 1.7.0(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.51.2))(vue@3.5.45(typescript@6.0.3)) which: 6.0.1 - ws: 8.22.1 + ws: 8.23.0 transitivePeerDependencies: - '@azure/app-configuration' - '@azure/cosmos' @@ -5887,7 +5887,7 @@ snapshots: socks: 2.8.10 split2: 4.2.0 worker-timers: 8.0.34 - ws: 8.22.1 + ws: 8.23.0 transitivePeerDependencies: - bufferutil - supports-color @@ -7134,7 +7134,7 @@ snapshots: string-width: 7.2.0 strip-ansi: 7.2.0 - ws@8.22.1: {} + ws@8.23.0: {} wsl-utils@1.0.1: dependencies: From e7672a4e843a91e9e4815689ee7a254545e5dc50 Mon Sep 17 00:00:00 2001 From: CortexOS Date: Tue, 17 Nov 2026 00:33:00 +0000 Subject: [PATCH 19/24] style: apply prettier formatting --- apps/farm/app/pages/impressoras.vue | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/apps/farm/app/pages/impressoras.vue b/apps/farm/app/pages/impressoras.vue index 8079c29e..5ee6d5d4 100644 --- a/apps/farm/app/pages/impressoras.vue +++ b/apps/farm/app/pages/impressoras.vue @@ -2572,8 +2572,7 @@ onBeforeRouteLeave(clear)

Operação: - {{ kobraOperation.operationId }}. + {{ kobraOperation.operationId }}. {{ kobraUnknownNotice }}

@@ -2603,8 +2602,8 @@ onBeforeRouteLeave(clear)

Recuperação pendente no Connector

Operação: - {{ kobraOperation.operationId }}. Motivo: {{ describeRecoveryReason(kobraRecoveryReason) }} + {{ kobraOperation.operationId }}. + Motivo: {{ describeRecoveryReason(kobraRecoveryReason) }}

A ativação automática desta impressora foi bloqueada para proteger as @@ -2720,8 +2719,8 @@ onBeforeRouteLeave(clear)

Confirmar revogação permanente

- Chave: {{ revokeTarget.printerKey }}. Connector: {{ revokeTarget.agentId }}. + Chave: {{ revokeTarget.printerKey }}. + Connector: {{ revokeTarget.agentId }}.