@andrian.yablonskyy/thub-agent 1.1.20 → 1.1.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@andrian.yablonskyy/thub-agent",
-  "version": "1.1.20",
+  "version": "1.1.22",
   "description": "TestHub Agent CLI — the single entry point CI/CD and developers use to submit and follow test jobs",
   "license": "SEE LICENSE IN LICENSE.md",
   "author": "Andrian Yablonskyy <andrian.yablonskyy@gmail.com>",

package/src/cli.js

@@ -514,10 +514,19 @@ program
       session.on('status', (s) => {
         until = s.until;
       });
+      // The camera's state on the Client (README §5.7): said when it changes.
+      const cameraState = (c) => (c ? (c.streaming ? 'streaming' : c.error ? `not streaming — ${c.error}` : 'starting…') : null);
+      let lastCamera = null;
       session.on('devices', (devices) => {
+        const camera = cameraState(devices.camera);
         if (listening){
+          if (camera && camera !== lastCamera){
+            log(`Video: ${camera}`);
+          }
+          lastCamera = camera;
           return;
         }
+        lastCamera = camera;
         listening = (async () => {
           const local = await listenLocal(session, devices, {
               host: opts.bind, uartBase: opts.uartPort, gdbBase: opts.gdbPort, target: opts.target, log
@@ -579,7 +588,9 @@ function printConnection(name, link, until, ports, devices, opts, video){
     }
   }
   if (video){
-    lines.push(`Video   ${devices.camera.name}  H.264 (MPEG-TS)  ${video.url}`,
+    const c = devices.camera,
+      state = c.streaming === false && c.error ? `  (not streaming — ${c.error})` : c.streaming === false ? '  (starting…)' : '';
+    lines.push(`Video   ${c.name}  H.264 (MPEG-TS)  ${video.url}${state}`,
       `        vlc ${video.url}  ·  ffplay -fflags nobuffer ${video.url}` +
       (video.udp ? `\n        UDP: ${video.udp}  (ffplay -fflags nobuffer ${video.udp})` : '  ·  UDP too: --video-udp 5600'));
   }

package/src/remote.js

@@ -23,8 +23,13 @@ const net = require('node:net'),
 // Without a ping from the Coordinator (every 30 s) for this long, the
 // connection is taken for dead and made again.
 const PING_TIMEOUT_MS = 75_000,
-  // HTTP answers to the upgrade that won't change by trying again.
-  FINAL_STATUSES = new Set([401, 403, 404, 409]);
+  // HTTP answers to the upgrade that won't change by trying again: a
+  // refusal, or — a redirect, 426 — a reverse proxy that doesn't pass
+  // WebSocket upgrades on to the Coordinator.
+  FINAL_STATUSES = new Set([401, 403, 404, 409, 426]),
+  isFinal = (status) => FINAL_STATUSES.has(status) || (status >= 300 && status < 400),
+  PROXY_HINT = 'a reverse proxy in front of the Coordinator isn\'t passing WebSocket upgrades on to it ' +
+    '(Help → Reserved boards → Client host setup)';
 
 // One WebSocket to the reservation's own link (/api/v1/remote/<reservation>,
 // from GET /resources), made again whenever it drops (1 s, 2 s, 4 s … 30 s
@@ -99,7 +104,14 @@ class RemoteSession extends EventEmitter{
         catch {
           error = null;
         }
-        refused = { status: res.statusCode, error: error || `HTTP ${res.statusCode}` };
+        const status = res.statusCode,
+          location = res.headers.location ? ` → ${res.headers.location}` : '';
+        refused = {
+          status,
+          error: error || (status >= 300 && status < 400
+            ? `The Coordinator answered HTTP ${status}${location} instead of opening a WebSocket: ${PROXY_HINT}`
+            : `HTTP ${status}`)
+        };
         ws.terminate();
       });
     });
@@ -116,7 +128,7 @@ class RemoteSession extends EventEmitter{
       if (this.stopped){
         return;
       }
-      if ((refused && FINAL_STATUSES.has(refused.status)) || code === REMOTE_CLOSE.RESERVATION_ENDED || code === REMOTE_CLOSE.REPLACED){
+      if ((refused && isFinal(refused.status)) || code === REMOTE_CLOSE.RESERVATION_ENDED || code === REMOTE_CLOSE.REPLACED){
         this.stopped = true;
         const message = reason || 'The Coordinator ended the connection';
         for (const ch of [...this.channels.keys()]){