@mark1russell7/harness 0.11.0 → 0.11.1

package/image/procedures/Dockerfile

@@ -1,8 +1,9 @@
-# The procedures image of the harness: @procedures/client 0.3.0 and ws 8.22.0 on Node 24.21.0. Its WebSocket
+# The procedures image of the harness: @procedures/client 0.7.0 and ws 8.22.0 on Node 24.21.0. Its WebSocket
 # client runs as a container in the client's network namespace, as the harness's own TCP client
 # does, and prints the same JSON lines (client-ws.mjs). A target runs the same image with the
 # script of the procedures server (server-ws.mjs), thus the client and the server share one
-# release of the package. The digest of the image and an npm lockfile pin them.
+# release of the package. The digest of the image and an npm lockfile pin them. The lockfile
+# holds one copy of ws, thus @procedures/client/node and the scripts use one ws class.
 # lab.ts stages the build context: this folder, under harness/image/procedures. The lockfile is
 # npm-lock.json here, because npm leaves each package-lock.json out of a published tarball.
 FROM node:24.21.0-alpine@sha256:ebfe2f90462722a7a4de65e91990e97fe0d401c70e0e762c5b53302f905ec1c1

package/image/procedures/client-ws.mjs

@@ -4,13 +4,18 @@
 //                               --reconnect-attempts N --reconnect-jitter X]
 //           --request-timeout-ms N --connection-timeout-ms N [--hold-ms N] [--go PATH] [--max-s N]
 //
-// A cell's client: the WebSocket client of @procedures/client 0.3.0 (WebSocketTransport) on Node
-// 24.21.0. Its sockets are of the global WebSocket of Node, which is undici 7.29.1, or of the
-// WebSocket of the ws package (the option `webSocket`): --websocket. Each setting of the transport
-// is a flag, and the client has no default: a missing flag is a failure. 0.3.0 takes each time as a
-// duration, not a number. Both modes call `harness.echo` first; its reply is `ready`. idle: then
-// hold the connection. inflight: then wait for the file --go, and call `harness.echo` (or
-// `harness.hold` for --hold-ms) into the fault.
+// A cell's client: the WebSocket client of @procedures/client 0.7.0 (WebSocketTransport) on Node
+// 24.21.0. --websocket gives the class of its sockets:
+//   global  the WebSocketTransport of the root entry, whose default class is the global WebSocket
+//           of Node: undici 7.29.1.
+//   ws      the WebSocketTransport of the Node entry @procedures/client/node, whose default class
+//           is the WebSocket of the ws package (since 0.4.0). The client gives the transport a
+//           subclass of that class, from the one copy of ws in the image: it stops when the Node
+//           entry resolves another copy.
+// Each setting of the transport is a flag, and the client has no default: a missing flag is a
+// failure. 0.7.0 takes each time as a duration, not a number. Both modes call `harness.echo`
+// first, and its reply is `ready`. idle: then hold the connection. inflight: then wait for the file
+// --go, and call `harness.echo` (or `harness.hold` for --hold-ms) into the fault.
 //
 // The lines are those of the harness's TCP client, on CLOCK_MONOTONIC, and the program's own acts:
 //   dial {conn}            before each new socket of the transport (conn counts from 1)
@@ -27,9 +32,13 @@
 // The client gives the transport a subclass of the class of its sockets. The subclass writes a
 // line, then calls its class: the transport, undici and ws do what they do without it. Its
 // listeners of `open` and `close` are its own, thus the transport cannot remove them. A drop line
-// with no local address is a socket that never opened: a try that failed.
+// with no local address is a socket that never opened: a try that failed. A WebSocket of ws emits
+// no `error` for an error of its socket (lib/websocket.js:1411-1421), thus the subclass reads that
+// error on the socket itself.
 
 import { subscribe } from "node:diagnostics_channel";
+import { createRequire } from "node:module";
+import { fileURLToPath } from "node:url";
 import { WebSocket as WsWebSocket } from "ws";
 import { bootId, commandLine, emit, now, waitFor } from "./lines.mjs";
 
@@ -41,7 +50,7 @@ const mode = line.required("--mode");
 if (mode !== "idle" && mode !== "inflight") line.fail("--mode is idle or inflight");
 const socketClass = line.required("--websocket");
 if (socketClass !== "global" && socketClass !== "ws") line.fail("--websocket is global or ws");
-/** This function gives a duration of milliseconds, as 0.3.0 takes each time. */
+/** This function gives a duration of milliseconds, as 0.7.0 takes each time. */
 const ms = (value) => ({ value, unit: "ms" });
 const heartbeat = line.toggle("--heartbeat")
   ? {
@@ -67,11 +76,22 @@ const hold = line.flag("--hold-ms") === undefined ? undefined : line.number("--h
 const go = line.flag("--go") ?? "/tmp/go";
 const max = Number(line.flag("--max-s") ?? 60) * 1000;
 
+/** The entry of the transport for each class: the root for the global WebSocket, the Node entry for ws. */
+const ENTRY = socketClass === "ws" ? "@procedures/client/node" : "@procedures/client";
+// the class of the Node entry is the class of the ws that it resolves: it must be the ws of this client
+if (socketClass === "ws") {
+  const nodeEntry = fileURLToPath(import.meta.resolve(ENTRY));
+  const theirs = createRequire(nodeEntry).resolve("ws");
+  const ours = createRequire(import.meta.url).resolve("ws");
+  if (theirs !== ours) line.fail(`${ENTRY} resolves ws at ${theirs}, and this client at ${ours}`);
+}
+
 emit("start", {
   boot_id: bootId(),
   mode,
   client: "procedures-ws",
-  package: "@procedures/client 0.3.0",
+  package: "@procedures/client 0.7.0",
+  entry: ENTRY,
   websocket: socketClass,
   node: process.version,
   undici: process.versions.undici ?? null,
@@ -120,10 +140,14 @@ const stamped = (Base) => {
       super(...args);
       const socket = { conn, local: undefined, dropped: false };
       sockets.set(this, socket);
-      // a socket of ws gives its local address at its open; undici gives it in a diagnostics channel
+      // a socket of ws gives its local address at its open, and undici gives it in a diagnostics
+      // channel. ws keeps the error of its socket to itself, thus the client reads it there
       this.addEventListener("open", () => {
         const raw = this._socket;
         if (raw?.localAddress !== undefined) opened(socket, `${raw.localAddress}:${raw.localPort}`);
+        raw?.on?.("error", (error) => {
+          pending = { errno: error?.code ?? error?.name ?? "unknown", at: now() };
+        });
       });
       this.addEventListener("error", (event) => {
         const code = event?.error?.code;
@@ -174,7 +198,8 @@ setTimeout(() => {
   process.exit(0);
 }, max);
 
-const { Client, WebSocketTransport } = await import("@procedures/client");
+const { Client } = await import("@procedures/client");
+const { WebSocketTransport } = await import(ENTRY);
 
 let first;
 const firstOpen = new Promise((resolve) => {

package/image/procedures/npm-lock.json

@@ -6,14 +6,14 @@
     "": {
       "name": "loom-harness-procedures",
       "dependencies": {
-        "@procedures/client": "0.3.0",
+        "@procedures/client": "0.7.0",
         "ws": "8.22.0"
       }
     },
     "node_modules/@mark1russell7/algebra": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/@mark1russell7/algebra/-/algebra-0.5.0.tgz",
-      "integrity": "sha512-rNKCWvZBGDUYtA1BOPftPY7+zG6LWdISWrjkZwsHf3IS4bfz6JCeWVpJ0LV/vEvNRz1OnVjh9WgwoEUn1Y4cCQ==",
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/@mark1russell7/algebra/-/algebra-0.7.1.tgz",
+      "integrity": "sha512-+nimxDO9pEOwNxVJ7/F4vOAba8CnytN/DbRJKN7FxF/Q+g5Yy2u6e+3bbjiuq0eH9vCWwc3WlIuyDJhSFfuNow==",
       "license": "MIT",
       "dependencies": {
         "@mark1russell7/quantity": "^0.2.0"
@@ -43,12 +43,12 @@
       }
     },
     "node_modules/@mark1russell7/service": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/@mark1russell7/service/-/service-0.4.0.tgz",
-      "integrity": "sha512-Zby/XIGWTWax927/pkQgeY9ljlzLmBkUnTlDcpGDKnNpEmXhM0WpnK948hnDqvUd2bwXM3/CcM2cYQDAaTA+2A==",
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@mark1russell7/service/-/service-0.4.1.tgz",
+      "integrity": "sha512-9lxVPWJ/oZ1wfyl0NhZ7WX0w53L2HwG++78XmWr3gh0IhCiMZSJi3cuvgiRfF/uS2uf3u7TGXmb2MctEZDtF3g==",
       "license": "MIT",
       "dependencies": {
-        "@mark1russell7/algebra": "^0.5.0",
+        "@mark1russell7/algebra": "^0.7.0",
         "@mark1russell7/quantity": "^0.2.0"
       },
       "engines": {
@@ -65,20 +65,17 @@
       }
     },
     "node_modules/@procedures/client": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@procedures/client/-/client-0.3.0.tgz",
-      "integrity": "sha512-DzOOZIhv1DH87zv3Je/D4gg+Jou386i69hPkQU5bz8Gs1vRzZoTrBcb0kojNMS4Ex1cwDxXYr0GDxVmlpVuEnA==",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/@procedures/client/-/client-0.7.0.tgz",
+      "integrity": "sha512-eBsvnfEYBJ7yrNpeX3Wi847Q9VlZMc8K92ydFfYIoZDwdfmj/Fxzu/IWQMfpCq7Fvof7Xt0m0Wk6YbcFZx8Frg==",
       "license": "MIT",
       "dependencies": {
-        "@mark1russell7/algebra": "^0.5.0",
+        "@mark1russell7/algebra": "^0.7.0",
         "@mark1russell7/quantity": "^0.2.0",
-        "@mark1russell7/service": "^0.4.0",
+        "@mark1russell7/service": "^0.4.1",
         "ws": "^8.18.3",
         "zod": "^4.6.5"
       },
-      "bin": {
-        "client-registry": "dist/procedures/cli/index.js"
-      },
       "engines": {
         "node": ">=22"
       },

package/image/procedures/package.json

@@ -3,7 +3,7 @@
   "private": true,
   "type": "module",
   "dependencies": {
-    "@procedures/client": "0.3.0",
+    "@procedures/client": "0.7.0",
     "ws": "8.22.0"
   }
 }

package/image/procedures/server-ws.mjs

@@ -1,6 +1,6 @@
 // server-ws --port N --tcp-keepalive off|N --heartbeat off|on [--heartbeat-interval-ms N --heartbeat-misses N]
 //
-// A cell's target: the procedures server of @procedures/client 0.3.0 (Server and
+// A cell's target: the procedures server of @procedures/client 0.7.0 (Server and
 // WebSocketServerTransport) on the http.Server of Node 24.21.0, at the path /ws. It has two
 // procedures: `harness.echo` answers at once, and `harness.hold` answers after `ms` milliseconds
 // (a held reply, as BLPOP is for Redis).
@@ -10,7 +10,9 @@
 //
 // --heartbeat is the heartbeat of the server (roadmap R3): a WebSocket ping to each connection at
 // each interval, and terminate() for a connection that missed `misses` pongs. Each setting is a
-// flag, and the server has no default. 0.3.0 takes each time as a duration, not a number.
+// flag, and the server has no default. 0.7.0 takes each time as a duration, not a number. One
+// setInterval of the transport, from its start, beats for all connections: the first ping of a
+// connection comes at the next beat after its accept (transport.js:94-112, :147-151).
 //
 // Each event is a JSON line on the clock of the clients: a connection (`accepted`), a request,
 // a reply, and the close of a connection. The `ws` package does the WebSocket of the server. Its
@@ -87,7 +89,7 @@ httpServer.listen(port, "0.0.0.0", () =>
     port,
     boot_id: bootId(),
     node: process.version,
-    package: "@procedures/client 0.3.0",
+    package: "@procedures/client 0.7.0",
     tcpKeepalive: keepAliveMs,
     heartbeat,
   }),

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@mark1russell7/harness",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "description": "A fault-injection harness for connection timers: a cell runs a client against a stock target in Docker, through a topology of routers and proxies, a replicated group under Sentinels or a replica set, injects a fault, measures the kernel's own records and judges a prediction. HTTP clients of Go, Node and undici race the keep-alive of a Node server, and the MongoDB driver meets the faults of a replica set. The WebSocket client of @procedures/client drops a silent connection on its own heartbeat, and the harness times that detection and the reconnect from the program's lines and the kernel's stamps.",
   "keywords": [
     "fault-injection",