@andrian.yablonskyy/thub-coordinator 1.0.34 → 1.0.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@andrian.yablonskyy/thub-coordinator",
-  "version": "1.0.34",
+  "version": "1.0.36",
   "description": "TestHub Coordinator — job queue, resource registry, scheduler, heartbeat monitor, log/artifact store and web dashboard",
   "main": "src/server.js",
   "engines": {
@@ -19,7 +19,7 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@andrian.yablonskyy/thub-common": "^1.0.29",
+    "@andrian.yablonskyy/thub-common": "^1.0.30",
     "better-sqlite3": "^12.4.1",
     "express": "^5.1.0",
     "express-session": "^1.18.2",

package/src/services/registry.js

@@ -81,6 +81,13 @@ function sanitizeCapabilities(caps){
   return typed
     ? {
       ...typed,
+      // Whether a job's command can use Docker on the host; unknown (null)
+      // for older Clients.
+      docker: caps.docker && typeof caps.docker === 'object'
+        ? caps.docker.available === true
+          ? { available: true, version: str(caps.docker.version, 64) }
+          : { available: false, reason: str(caps.docker.reason, 300) }
+        : null,
       // Whether the host has the root reboot helper (thub-client-reboot.path)
       // a scheduled reboot needs; unknown (null) for older Clients.
       rebootSupported: typeof caps.rebootSupported === 'boolean' ? caps.rebootSupported : null

package/systemd/thub-coordinator-update.service

@@ -13,4 +13,6 @@ Wants=network-online.target
 Type=oneshot
 Environment=PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 ExecStart=/usr/bin/node /usr/lib/node_modules/@andrian.yablonskyy/thub-coordinator/scripts/self-update-helper.js /var/lib/thub/.thub/update-request.json thub
-TimeoutStartSec=15min
+# Room for npm's retries while a just-published version isn't downloadable
+# yet (thub-common npmInstallGlobal: up to ~7.5 min of waiting).
+TimeoutStartSec=30min

package/test/scheduler.test.js

@@ -725,6 +725,17 @@ test('HW capabilities: no power control — reported relays/power dropped, and r
   assert.throws(() => registry.setClientConfig(resourceId, { power: null }), /must NOT have additional properties/);
 });
 
+test('Docker availability from registration is kept (and sanitized) for the resource card', () => {
+  const { registry } = buildTestServices(),
+    reg = (docker) => registry.get(registry.registerAuto({
+      clientId: `c-${Math.random()}`, name: `n${Math.random()}`.slice(0, 12), type: 'hw', labels: [],
+      capabilities: { hw: {}, ...(docker === undefined ? {} : { docker }) }
+    }).resourceId).capabilities.docker;
+  assert.deepEqual(reg({ available: true, version: '27.1.1', extra: 'x' }), { available: true, version: '27.1.1' });
+  assert.deepEqual(reg({ available: false, reason: 'docker isn\'t installed' }), { available: false, reason: 'docker isn\'t installed' });
+  assert.equal(reg(undefined), null); // an older Client
+});
+
 test('rename from the dashboard: kept across re-registration, unique, and resettable to the Client\'s own name', () => {
   const { registry } = buildTestServices(),
     reg = (name) => registry.get(registry.registerAuto({ clientId: 'c-ren', name, type: 'sw', labels: [] }).resourceId),

package/views/mixins/resource.pug

@@ -150,6 +150,14 @@ mixin capabilitiesList(caps)
         ul.list-unstyled.mb-0.ms-2
           each d in caps.hw[pair[0]]
             +capDevice(d, pair[0] === 'uarts' && d.baudRate ? `${d.baudRate} baud` : null)
+  if caps && caps.docker
+    .small.text-body-secondary.mt-1 Docker
+    .ms-2
+      if caps.docker.available
+        span= caps.docker.version ? `available (${caps.docker.version})` : 'available'
+      else
+        span.badge.text-bg-warning(data-bs-toggle="tooltip" data-bs-title=caps.docker.reason || 'unknown reason') not available
+        span.small.text-body-secondary.ms-2 jobs can't run docker here
 
 //- Host uptime and the Client's current task/status with its duration,
 //- both from the last heartbeat. Measured up to now — or, for a Client