try again...

Author: AlCalzone

.claude/settings.local.json

@@ -8,7 +8,8 @@
       "Bash(cat:*)",
       "Bash(git log:*)",
       "Bash(find:*)",
-      "Skill(implement-test-handler)"
+      "Skill(implement-test-handler)",
+      "Bash(grep:*)"
     ],
     "deny": [],
     "ask": []

CTT-Remote.md

@@ -5,8 +5,8 @@
     <NetworkKey Class="0" Value="CE07372267DCB354DB216761B6E9C378" />
     <NetworkKey Class="1" Value="30B5CCF3F482A92E2F63A5C5E218149A" />
     <NetworkKey Class="2" Value="21A29A69145E38C1601DFF55E2658521" />
-    <NetworkKey Class="3" Value="3D54A7E5DE9D444B28B479CF13B4CA70" />
-    <NetworkKey Class="4" Value="C2B0A8CE070B71F409A889BCCC54A49B" />
+    <NetworkKey Class="3" Value="0F4F7E178A4207A0BBEFBF991C66F814" />
+    <NetworkKey Class="4" Value="72D42391F7ECE63BE1B38B25D085ECD4" />
   </SecuritySettings>
   <Node Id="1" NodeInfo="D39603020100" RoleType="0" NodeType="255" CommandClasses="5E989F556C568F74">
     <SecurityExtension Keys="0x87" CommandClasses="85595A7A87728E7386" />

ctt/project/Config/Saved Items/002_E6D68AF7.xml

@@ -470,21 +470,31 @@ async function main(): Promise<void> {
     process.exit(1);
   });
 
-  // Handle shutdown signals
-  process.on("SIGINT", async () => {
-    console.log("Received SIGINT, shutting down...");
+  async function shutdown(code: number): Promise<never> {
     if (server) await server.destroy().catch(() => {});
     if (driver) await driver.destroy().catch(() => {});
     ws?.close();
-    process.exit(0);
+    process.exit(code);
+  }
+
+  process.on("SIGINT", () => {
+    console.log("Received SIGINT, shutting down...");
+    shutdown(0);
   });
 
-  process.on("SIGTERM", async () => {
+  process.on("SIGTERM", () => {
     console.log("Received SIGTERM, shutting down...");
-    if (server) await server.destroy().catch(() => {});
-    if (driver) await driver.destroy().catch(() => {});
-    ws?.close();
-    process.exit(0);
+    shutdown(0);
+  });
+
+  process.on("uncaughtException", (error) => {
+    console.error("Uncaught exception in runner:", error);
+    shutdown(1);
+  });
+
+  process.on("unhandledRejection", (reason) => {
+    console.error("Unhandled rejection in runner:", reason);
+    shutdown(1);
   });
 }
 

ctt/project/Root Device/Root Device.cttproj

@@ -0,0 +1,13 @@
+PI_CertificationData_Rev01
+
+# TODO:
+## Wrong data reported by zwave-js:
+* DD_ManufacturerSpecificCCData_Rev01
+* DD_VersionCCData_Rev01
+
+## Bug in Z-Wave JS:
+* CCR_UserCodeCC_Rev04
+
+## Requires Wiki/Web browser access - filter out
+* CCT_CRC16EncapsulationCmdClassV1_Rev02
+* PI_CertificationData_Rev01

dut/zwave-js/run.ts

@@ -33,12 +33,15 @@ export interface RunnerHostOptions {
   ipcPort?: number;
   /** Timeout for runner to connect and send ready (ms, default: 30000) */
   readyTimeout?: number;
+  /** Callback when runner process exits unexpectedly */
+  onUnexpectedExit?: () => void;
 }
 
 export class RunnerHost {
   private runnerPath: string;
   private ipcPort: number;
   private readyTimeout: number;
+  private onUnexpectedExit?: () => void;
 
   private wss?: WebSocketServer;
   private runnerProcess?: ChildProcess;
@@ -65,6 +68,7 @@ export class RunnerHost {
     this.runnerPath = path.resolve(options.runnerPath);
     this.ipcPort = options.ipcPort ?? DEFAULT_IPC_PORT;
     this.readyTimeout = options.readyTimeout ?? 30000;
+    this.onUnexpectedExit = options.onUnexpectedExit;
 
     // Create readline interface for user prompts
     this.rl = readline.createInterface({
@@ -316,10 +320,13 @@ export class RunnerHost {
 
     this.runnerProcess.on("exit", (code, signal) => {
       if (code !== null) {
-        console.log(c.dim(`Runner exited with code ${code}`));
+        console.error(`Runner exited with code ${code}`);
       } else if (signal) {
         console.log(c.dim(`Runner killed by signal ${signal}`));
       }
+      if (this.onUnexpectedExit) {
+        this.onUnexpectedExit();
+      }
     });
   }
 

interactive-tests.txt

@@ -4,7 +4,7 @@ import * as fs from "fs";
 import { fileURLToPath } from "url";
 import { createWebSocketServer } from "./ws-server.ts";
 import type { ManagedWebSocketServer } from "./ws-server.ts";
-import { runTestCases, closeCTT, getTestCases } from "./ctt-client.ts";
+import { runTestCases, closeCTT, getTestCases, cancelTestRun } from "./ctt-client.ts";
 import { RunnerHost } from "./runner-host.ts";
 import { CTTDeviceProxy, type FrameHandler } from "./ctt-device-proxy.ts";
 import c from "ansi-colors";
@@ -96,6 +96,7 @@ class ProcessManager {
   private wsServer?: ManagedWebSocketServer;
   private runnerHost?: RunnerHost;
   private deviceProxy?: CTTDeviceProxy;
+  private isCleaningUp = false;
 
   /**
    * Load PID file data if it exists
@@ -242,7 +243,8 @@ class ProcessManager {
     });
 
     proc.on("exit", (code) => {
-      console.log(`Z-Wave stack WSL process exited with code ${code}`);
+      console.error(`Z-Wave stack WSL process exited with code ${code}, aborting...`);
+      this.cleanup();
     });
 
     this.processes.push({
@@ -359,6 +361,7 @@ class ProcessManager {
 
     this.runnerHost = new RunnerHost({
       runnerPath: DUT_PATH,
+      onUnexpectedExit: () => this.cleanup(),
     });
 
     // Initialize the runner (spawns process, waits for ready)
@@ -415,7 +418,8 @@ class ProcessManager {
     });
 
     cttProcess.on("exit", (code) => {
-      console.log(`CTT-Remote exited with code ${code}`);
+      console.error(`CTT-Remote exited with code ${code}, aborting...`);
+      this.cleanup();
     });
 
     const managedProcess: ManagedProcess = {
@@ -670,8 +674,30 @@ class ProcessManager {
   }
 
   async cleanup(): Promise<void> {
+    if (this.isCleaningUp) return;
+    this.isCleaningUp = true;
+
     console.log("Shutting down...");
 
+    // Cancel any running test and close CTT gracefully first
+    try {
+      await cancelTestRun();
+      // Wait for test to actually stop before trying to close
+      await setTimeout(2000);
+    } catch {
+      // Ignore - test may not be running
+    }
+    try {
+      await closeCTT();
+    } catch {
+      // Ignore - CTT may already be closed
+    }
+
+    // Close WebSocket server to stop incoming CTT messages
+    if (this.wsServer) {
+      await this.wsServer.close();
+    }
+
     // Stop DUT runner
     await this.stopRunner();
 
@@ -692,11 +718,6 @@ class ProcessManager {
       // Ignore
     }
 
-    // Close WebSocket server
-    if (this.wsServer) {
-      await this.wsServer.close();
-    }
-
     // Clean up PID file on successful shutdown
     this.deletePidFile();
 

src/runner-host.ts

@@ -8,7 +8,7 @@ echo "Starting Z-Wave Stack..."
 run_with_prefix() {
   local prefix="$1"
   shift
-  "$@" 2>&1 | while IFS= read -r line; do echo "[$prefix] $line"; done
+  stdbuf -oL -eL "$@" 2>&1 | sed -u "s/^/[$prefix] /"
 }
 
 # Start 3 controllers