@andrian.yablonskyy/thub-coordinator 1.0.24 → 1.0.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@andrian.yablonskyy/thub-coordinator",
-  "version": "1.0.24",
+  "version": "1.0.26",
   "description": "TestHub Coordinator — job queue, resource registry, scheduler, heartbeat monitor, log/artifact store and web dashboard",
   "main": "src/server.js",
   "engines": {

package/public/css/thub.css

@@ -53,3 +53,11 @@
   font-size: 0.55em;
   vertical-align: middle;
 }
+
+/* Toast text (layout.pug): "\n" in a flash message is a line break, and a
+   long unbroken token/URL wraps instead of overflowing the toast. */
+.thub-toast-text {
+  white-space: pre-line;
+  overflow-wrap: anywhere;
+  min-width: 0;
+}

package/src/api/admin.js

@@ -37,6 +37,15 @@ function createAdminRouter({ services }){
     }
   });
 
+  router.post('/agents/:id', (req, res, next) => {
+    try {
+      res.json(services.agents.rename(req.params.id, req.body?.name));
+    }
+    catch (err){
+      next(err);
+    }
+  });
+
   router.delete('/agents/:id', (req, res) => {
     services.agents.revoke(req.params.id);
     res.status(204).end();

package/src/services/agents.js

@@ -42,6 +42,24 @@ function createAgentsService(db, { events }){
     return { agent: get(id), token };
   }
 
+  // Dashboard "Edit": the name is only a label (the token is what
+  // authenticates), so renaming never affects anything using the agent.
+  function rename(id, name){
+    const agent = get(id),
+      trimmed = typeof name === 'string' ? name.trim() : '';
+    if (!agent){
+      throw Object.assign(new Error('Unknown agent'), { status: 404 });
+    }
+    if (!trimmed || trimmed.length > 100){
+      throw Object.assign(new Error('Agent name must be 1-100 characters'), { status: 400 });
+    }
+    if (trimmed !== agent.name){
+      db.prepare('UPDATE agents SET name = ? WHERE id = ?').run(trimmed, id);
+      events.record('agent', id, 'agent.renamed', { from: agent.name, to: trimmed });
+    }
+    return get(id);
+  }
+
   function revoke(id){
     db.prepare('UPDATE agents SET revoked_at = ? WHERE id = ?').run(new Date().toISOString(), id);
     events.record('agent', id, 'agent.revoked', {});
@@ -79,7 +97,7 @@ function createAgentsService(db, { events }){
     return ids.length;
   }
 
-  return { get, getByTokenHash, list, create, revoke, touchLastUsed, setUpdateTo, requestUpdateAll };
+  return { get, getByTokenHash, list, create, rename, revoke, touchLastUsed, setUpdateTo, requestUpdateAll };
 }
 
 module.exports = { createAgentsService };

package/src/services/jobs.js

@@ -145,15 +145,22 @@ function createJobsService(db, { bus, events, registry, artifacts, config }){
       spec.target.client = resource.id;
     }
 
-    // A job-supplied Docker image needs an SW Client that opted in — say so
-    // specifically rather than the generic "no resource can satisfy".
-    const needs = { jobImage: Boolean(spec.firmware.image) },
+    // A job-supplied Docker image or command needs a Client that opted in —
+    // say which, rather than the generic "no resource can satisfy".
+    const needs = { jobImage: Boolean(spec.firmware.image), jobCommand: Boolean(spec.tests.command) },
       { type, labels, group, client } = spec.target;
-    if (needs.jobImage && registry.everSatisfiable(type, labels, group, client) && !registry.everSatisfiable(type, labels, group, client, needs)){
+    if ((needs.jobImage || needs.jobCommand) && registry.everSatisfiable(type, labels, group, client) &&
+      !registry.everSatisfiable(type, labels, group, client, needs)){
+      const missing = [
+        needs.jobImage && !registry.everSatisfiable(type, labels, group, client, { jobImage: true }) &&
+          `job-supplied Docker images (${spec.firmware.image}) — "sw": { "allowJobImages": true }`,
+        needs.jobCommand && !registry.everSatisfiable(type, labels, group, client, { jobCommand: true }) &&
+          'job-supplied commands (--run) — "allowJobCommands": true'
+      ].filter(Boolean);
       throw Object.assign(
         new Error(
-          `No matching SW Client runs job-supplied Docker images (${spec.firmware.image}) — enable it on a Client ` +
-            'with "sw": { "allowJobImages": true } in its config, or pass a firmware URL instead'
+          `No matching Client runs ${missing.length ? missing.join(', nor ') : 'both a job-supplied Docker image and command together'}` +
+            ' — enable it in a Client\'s config'
         ),
         { status: 422 }
       );

package/src/services/registry.js

@@ -67,10 +67,16 @@ const MAX_DEVICES = 8,
     present: typeof d?.present === 'boolean' ? d.present : null
   });
 
+// Plus `allowJobCommands` (either type): runs a job's own `tests.command`.
 function sanitizeCapabilities(caps){
   if (!caps || typeof caps !== 'object'){
     return null;
   }
+  const typed = sanitizeTypedCapabilities(caps);
+  return typed ? { ...typed, allowJobCommands: caps.allowJobCommands === true } : null;
+}
+
+function sanitizeTypedCapabilities(caps){
   if (caps.sw && typeof caps.sw === 'object'){
     const sw = caps.sw;
     return {
@@ -469,13 +475,15 @@ function createRegistryService(db, { bus, events }){
     );
   }
 
-  // `needs.jobImage`: the job brings its own Docker image (firmware.image),
-  // which only SW Clients that opted in (sw.allowJobImages) will run.
+  // `needs`: what a job brings that a Client must have opted in to run —
+  // jobImage (firmware.image; sw.allowJobImages) and jobCommand
+  // (tests.command; allowJobCommands).
   function matchesTarget(r, labels, groupId, resourceId, needs = {}){
     return labels.every((l) => r.labels.includes(l)) &&
       (!groupId || r.group_ids.includes(groupId)) &&
       (!resourceId || r.id === resourceId) &&
-      (!needs.jobImage || r.capabilities?.sw?.allowJobImages === true);
+      (!needs.jobImage || r.capabilities?.sw?.allowJobImages === true) &&
+      (!needs.jobCommand || r.capabilities?.allowJobCommands === true);
   }
 
   // Admin: remove a resource from the registry (dashboard "Remove"). Refused

package/src/services/scheduler.js

@@ -15,6 +15,11 @@
 
 const { JOB_STATES, BUSY_SOURCES } = require('@andrian.yablonskyy/thub-common');
 
+// What a job needs a Client to have opted in to (registry matchesTarget).
+function jobNeeds(spec){
+  return { jobImage: Boolean(spec.firmware?.image), jobCommand: Boolean(spec.tests?.command) };
+}
+
 function rowToJob(row){
   return { ...row, spec: JSON.parse(row.spec) };
 }
@@ -43,7 +48,7 @@ function createScheduler(db, { bus, events, registry, config }){
         for (const job of queued){
           const { type, labels = [], group, client } = job.spec.target,
             candidates = registry
-              .findIdleCandidates(type, labels, group, client, { jobImage: Boolean(job.spec.firmware?.image) })
+              .findIdleCandidates(type, labels, group, client, jobNeeds(job.spec))
               .filter((r) => !claimedResourceIds.has(r.id));
           if (candidates.length === 0){
             continue;

package/src/web/routes.js

@@ -125,6 +125,14 @@ function createWebRouter({ services, config }){
     return resources.map((r) => ({ ...r, activeJob: services.jobs.activeForResource(r.id) }));
   }
 
+  // Express 5 leaves req.body undefined for a POST without a form body (a
+  // browser always sends one; curl or a script may not) — treat it as an
+  // empty form rather than crashing every handler that reads a field.
+  router.use((req, res, next) => {
+    req.body ??= {};
+    next();
+  });
+
   router.use((req, res, next) => {
     const user = req.session?.user || null;
     res.locals.user = user;
@@ -388,7 +396,7 @@ function createWebRouter({ services, config }){
         'warning',
         pending
           ? `Stopped job ${stoppedJob} on ${r.name}; ${r.name} is removed as soon as its Client confirms the job ended.`
-          : `Removed ${r.name}.` + (canceledJobs.length ? ` Canceled job(s) queued for it: ${canceledJobs.join(', ')}.` : '')
+          : `Removed ${r.name}.` + (canceledJobs.length ? `\nCanceled job(s) queued for it: ${canceledJobs.join(', ')}.` : '')
       );
     }
     catch (err){
@@ -403,7 +411,7 @@ function createWebRouter({ services, config }){
     services.db.prepare('UPDATE resources SET token_hash = ? WHERE id = ?').run(hashToken(token), req.params.id);
     services.events.record('resource', req.params.id, 'resource.token_rotated', {});
     // Sticky: shown only once, so it mustn't close before it's copied.
-    flash(req, 'warning', `New resource token (copy it now): ${token}`, { sticky: true });
+    flash(req, 'warning', `New resource token (copy it now):\n${token}`, { sticky: true });
     res.redirect(returnTo(req, '/resources'));
   });
 
@@ -491,8 +499,20 @@ function createWebRouter({ services, config }){
   }));
 
   router.post('/resources/:id/update', requireAdminRole, updateAction(async (req) => {
+    // Cancel (next to the version): withdraw the request and, if the host is
+    // already holding for the update, abort that too (the Client's next
+    // heartbeat) — the one control for canceling a Client update.
     if (req.body.cancel === '1'){
-      services.registry.setUpdateTo(req.params.id, null);
+      const r = services.registry.get(req.params.id);
+      if (!r){
+        throw Object.assign(new Error('Unknown resource'), { status: 404 });
+      }
+      services.registry.setUpdateTo(r.id, null);
+      if (r.activity?.state === 'update-hold'){
+        services.commands.push(r.id, { command: 'cancel-update' });
+        services.events.record('resource', r.id, 'resource.activity_canceled', { activity: 'update-hold', by: req.session.user.username });
+        return { type: 'warning', text: `Canceling the self-update on ${r.name}'s host (on its next heartbeat).` };
+      }
       return 'Update request canceled.';
     }
     const version = await services.updates.targetVersion('client');
@@ -568,7 +588,7 @@ function createWebRouter({ services, config }){
         req,
         'warning',
         `Deleted ${r.jobs} finished job(s) and ${r.events} history record(s) from before ` +
-          `${formatDateTime(r.before, { timeZone: tz })}. Database: ${mb(r.bytesBefore)} → ${mb(r.bytesAfter)}.`
+          `${formatDateTime(r.before, { timeZone: tz })}.\nDatabase: ${mb(r.bytesBefore)} → ${mb(r.bytesAfter)}.`
       );
     }
     catch (err){
@@ -661,6 +681,20 @@ function createWebRouter({ services, config }){
     res.render('admin/agents', { title: 'Agents', active: 'agents', agents: services.agents.list(), newToken: token });
   });
 
+  router.post('/admin/agents/:id/rename', requireAdminRole, (req, res) => {
+    try {
+      const before = services.agents.get(req.params.id)?.name,
+        agent = services.agents.rename(req.params.id, req.body.name);
+      if (before !== agent.name){
+        flash(req, 'success', `Renamed agent "${before}" to "${agent.name}".`);
+      }
+    }
+    catch (err){
+      flash(req, 'danger', err.message);
+    }
+    res.redirect('/admin/agents');
+  });
+
   router.post('/admin/agents/:id/revoke', requireAdminRole, (req, res) => {
     services.agents.revoke(req.params.id);
     res.redirect('/admin/agents');

package/test/agents.test.js

@@ -0,0 +1,38 @@
+/**
+ * @file        packages/coordinator/test/agents.test.js
+ * @description Tests: agent rename (dashboard Edit) — a label only; the token keeps working
+ *
+ * @author      Andrian Yablonskyy
+ * @copyright   Copyright (c) 2026 Andrian Yablonskyy. All rights reserved.
+ *
+ * This file is part of TestHub and is proprietary and confidential.
+ * Unauthorized copying, modification, distribution, or use of this file,
+ * via any medium, is strictly prohibited without prior written permission
+ * from AdSystem.PRO.
+ */
+
+'use strict';
+
+const test = require('node:test'),
+  assert = require('node:assert/strict'),
+  { openDb } = require('../src/db'),
+  { createEventsService } = require('../src/services/events'),
+  { createAgentsService } = require('../src/services/agents'),
+  { hashToken } = require('../src/services/tokens');
+
+test('renaming an agent changes only its name; its token keeps authenticating', () => {
+  const db = openDb(':memory:'),
+    agents = createAgentsService(db, { events: createEventsService(db) }),
+    { agent, token } = agents.create({ name: 'ci-old', kind: 'ci' });
+
+  assert.equal(agents.rename(agent.id, '  ci-firmware  ').name, 'ci-firmware');
+  assert.equal(agents.getByTokenHash(hashToken(token)).id, agent.id);
+  assert.equal(db.prepare('SELECT COUNT(*) AS n FROM events WHERE type = \'agent.renamed\'').get().n, 1);
+
+  agents.rename(agent.id, 'ci-firmware'); // unchanged: no new event
+  assert.equal(db.prepare('SELECT COUNT(*) AS n FROM events WHERE type = \'agent.renamed\'').get().n, 1);
+
+  assert.throws(() => agents.rename(agent.id, '   '), /1-100 characters/);
+  assert.throws(() => agents.rename(agent.id, 'x'.repeat(101)), /1-100 characters/);
+  assert.throws(() => agents.rename('agt_nope', 'x'), /Unknown agent/);
+});

package/test/scheduler.test.js

@@ -547,6 +547,24 @@ test('a job-supplied Docker image only goes to SW Clients that allow it; otherwi
   assert.equal(jobs.get(fileJob.id).resource_id, strict.id); // firmware URLs still go anywhere
 });
 
+test('a job-supplied command only goes to Clients with allowJobCommands; otherwise 422 naming it', () => {
+  const { registry, agents, jobs, scheduler } = buildTestServices(),
+    { agent } = agents.create({ name: 'dev', kind: 'cli' }),
+    commandJob = makeSpec({ tests: { url: 'https://x/t.tar.gz', command: 'make test' } }),
+    plain = registerResource(registry, { name: 'sw-plain', type: 'sw' });
+  registry.heartbeat(plain.id, { state: 'idle' });
+
+  assert.throws(() => jobs.create({ agentId: agent.id, source: 'cli', spec: commandJob }), /allowJobCommands/);
+
+  const { resourceId } = registry.registerAuto({
+    clientId: 'c-cmd', name: 'sw-cmd', type: 'sw', labels: [], capabilities: { sw: { image: 'emu' }, allowJobCommands: true }
+  });
+  registry.heartbeat(resourceId, { state: 'idle' });
+  const job = jobs.create({ agentId: agent.id, source: 'cli', spec: commandJob });
+  scheduler.runPass();
+  assert.equal(jobs.get(job.id).resource_id, resourceId);
+});
+
 test('a resource can belong to several groups at once', () => {
   const { registry, groups } = buildTestServices(),
     g1 = groups.create({ name: 'g1' }),

package/views/admin/agents.pug

@@ -29,14 +29,20 @@ block content
         tr(class=a.revoked_at ? 'opacity-50' : '')
           td= a.name
           td.text-uppercase= a.kind
-          td: +versionCell(a.version, updates.latest.agent, a.update_to)
+          //- A revoked token can't pick an update up: no button.
+          td: +versionWithUpdate(a.version, updates.latest.agent, a.update_to, `/admin/agents/${a.id}/update`, '/admin/agents', !a.revoked_at)
           td= fmtDate(a.created_at)
           td= fmtDate(a.last_used_at, 'never')
           td= a.revoked_at ? 'revoked' : 'active'
           td
-            if !a.revoked_at
-              .d-flex.justify-content-end
-                +updateButton(`/admin/agents/${a.id}/update`, a.update_to, '/admin/agents')
+            .d-flex.justify-content-end
+              button.btn.btn-sm.btn-outline-secondary(
+                type="button"
+                data-bs-toggle="modal"
+                data-bs-target=`#editAgentModal-${a.id}`
+                aria-label=`Edit agent ${a.name}`
+              ) Edit
+              if !a.revoked_at
                 form.ms-1(
                   method="post"
                   action=`/admin/agents/${a.id}/revoke`
@@ -46,6 +52,21 @@ block content
                 )
                   button.btn.btn-sm.btn-outline-danger(type="submit") Revoke
 
+            .modal(tabindex="-1" id=`editAgentModal-${a.id}` aria-labelledby=`editAgentTitle-${a.id}`)
+              .modal-dialog
+                .modal-content
+                  form(method="post" action=`/admin/agents/${a.id}/rename`)
+                    .modal-header
+                      h5.modal-title(id=`editAgentTitle-${a.id}`) Edit agent
+                      button.btn-close(type="button" data-bs-dismiss="modal" aria-label="Close")
+                    .modal-body
+                      label.form-label(for=`agentName-${a.id}`) Name
+                      input.form-control(id=`agentName-${a.id}` type="text" name="name" value=a.name required maxlength="100")
+                      .form-text Only a label — the agent's token, and everything using it, keep working.
+                    .modal-footer
+                      button.btn.btn-secondary(type="button" data-bs-dismiss="modal") Cancel
+                      button.btn.btn-primary(type="submit") Save
+
   .modal(tabindex="-1" id="addAgentModal")
     .modal-dialog
       .modal-content

package/views/layout.pug

@@ -134,9 +134,10 @@ html(lang="en" data-bs-theme=(user && user.theme) || "auto")
             data-sticky=m.sticky ? '1' : false
           )
             .d-flex
-              .toast-body.d-flex.gap-2
-                i.bi(class=`bi-${icon}`)
-                span= m.text
+              //- Multi-line: "\n" in a message is a line break (thub.css).
+              .toast-body.d-flex.align-items-start.gap-2
+                i.bi.flex-shrink-0(class=`bi-${icon}`)
+                span.thub-toast-text= m.text
               button.btn-close.me-2.m-auto(
                 type="button"
                 class=type === 'danger' || type === 'success' ? 'btn-close-white' : ''

package/views/mixins/resource.pug

@@ -2,9 +2,8 @@
 //- Overview and Resources pages. `returnTo` is the page the action forms
 //- redirect back to.
 
-//- `opts.update: false` leaves out the Update button — the resource card
-//- shows it on its Client version line instead.
-mixin resourceActions(r, returnTo, opts = {})
+//- Update isn't here: it sits next to the version (+versionWithUpdate).
+mixin resourceActions(r, returnTo)
   form.d-inline(method="post" action=`/resources/${r.id}/maintenance`)
     input(type="hidden" name="enabled" value=r.status === 'MAINTENANCE' ? '0' : '1')
     input(type="hidden" name="returnTo" value=returnTo)
@@ -40,8 +39,6 @@ mixin resourceActions(r, returnTo, opts = {})
       data-bs-title="Invalidate the current resource token and issue a new one — the Client won't reconnect until it has it"
     )
       i.bi.bi-arrow-repeat
-  if opts.update !== false
-    +updateButton(`/resources/${r.id}/update`, r.update_to, returnTo)
   +removeResourceButton(r, returnTo)
 
 //- Remove: a plain confirm when the resource is idle; with a running job,
@@ -208,12 +205,12 @@ mixin uptimeRows(r, returnTo)
     if user.role === 'admin'
       +cancelActivityButton(r, returnTo)
 
-//- Cancel the Client's current activity (its job, a local lock or a
-//- self-update hold) — icon only, on the card's Task / status line, and
-//- only while there's something to cancel.
+//- Cancel the Client's current job or local lock — icon only, on the card's
+//- Task / status line, and only while there's one. A self-update hold is
+//- canceled from the version line instead (+versionWithUpdate).
 mixin cancelActivityButton(r, returnTo)
   - const state = r.activity && r.activity.state
-  - const what = r.activeJob ? `job ${r.activeJob.id}` : state === 'locked' ? 'the local lock' : state === 'update-hold' ? 'the self-update' : null
+  - const what = r.activeJob ? `job ${r.activeJob.id}` : state === 'locked' ? 'the local lock' : null
   if what
     form.d-inline.ms-2(
       method="post"
@@ -252,13 +249,7 @@ mixin resourceCard(r, groupsById, returnTo)
             dd.col-sm-8: +resourceBadge(r.status, r.remove_requested_at)
             +uptimeRows(r, returnTo)
             dt.col-sm-4 Client version
-            dd.col-sm-8
-              +versionCell(r.client_version, updates.latest.client, r.update_to)
-              //- Admins: Update only when a newer Client is published (or
-              //- Cancel, while one is requested). An unknown version (too
-              //- old to report it) can't be compared, so no button.
-              if user.role === 'admin' && (r.update_to || (r.client_version && isNewer(updates.latest.client, r.client_version)))
-                +updateButton(`/resources/${r.id}/update`, r.update_to, returnTo)
+            dd.col-sm-8: +versionWithUpdate(r.client_version, updates.latest.client, r.update_to, `/resources/${r.id}/update`, returnTo, true, r.activity && r.activity.state === 'update-hold')
             dt.col-sm-4 IP addresses
             dd.col-sm-8
               if !local.length && !external
@@ -299,4 +290,4 @@ mixin resourceCard(r, groupsById, returnTo)
             if user.role === 'admin'
               dt.col-sm-4 Actions
               dd.col-sm-8.mb-0
-                +resourceActions(r, returnTo, { update: false })
+                +resourceActions(r, returnTo)

package/views/mixins/updates.pug

@@ -16,6 +16,18 @@ mixin versionCell(current, latest, updateTo)
       data-bs-title=`v${latest} is available`
     ) update available
 
+//- A version cell with its Update button right next to it — shown only to
+//- admins, and only when a newer version is published (or as Cancel while
+//- an update is requested). An unknown version (too old to report it)
+//- can't be compared, so no button; `canUpdate: false` (e.g. a revoked
+//- agent) hides it too. `holding`: a Client's host is already holding for
+//- a self-update — Cancel then also aborts that (the one cancel control for
+//- an update). Agents table, Resources table, resource card.
+mixin versionWithUpdate(current, latest, updateTo, action, returnTo, canUpdate = true, holding = false)
+  +versionCell(current, latest, updateTo)
+  if user.role === 'admin' && canUpdate && (updateTo || holding || (current && isNewer(latest, current)))
+    +updateButton(action, updateTo || (holding ? true : null), returnTo)
+
 //- Latest published version of `app` (agent | client), "check now" and,
 //- for admins, "update all".
 mixin updatesToolbar(app, label, returnTo)
@@ -47,7 +59,8 @@ mixin updatesToolbar(app, label, returnTo)
           i.bi.bi-cloud-download.me-1
           = `Update all ${label}`
 
-//- Per-item "Update" / "Cancel update" button.
+//- Per-item "Update" / "Cancel update" button. `pending`: the requested
+//- version, or true for an update already under way without one.
 mixin updateButton(action, pending, returnTo)
   form.d-inline.ms-1(method="post" action=action)
     input(type="hidden" name="returnTo" value=returnTo)
@@ -57,7 +70,7 @@ mixin updateButton(action, pending, returnTo)
         type="submit"
         aria-label="Cancel update"
         data-bs-toggle="tooltip"
-        data-bs-title=`Cancel the pending self-update to v${pending}`
+        data-bs-title=pending === true ? 'Cancel the self-update in progress on this host' : `Cancel the pending self-update to v${pending}`
       )
         i.bi.bi-x-circle
     else

package/views/resources/list.pug

@@ -34,7 +34,7 @@ block content
         tr(role="button" tabindex="0" data-resource-card=`resource-card-${r.id}`)
           td= r.name
           td.text-uppercase= r.type
-          td: +versionCell(r.client_version, updates.latest.client, r.update_to)
+          td: +versionWithUpdate(r.client_version, updates.latest.client, r.update_to, `/resources/${r.id}/update`, list.pageUrl(), true, r.activity && r.activity.state === 'update-hold')
           td: +resourceBadge(r.status, r.remove_requested_at)
           td
             each l in r.labels