@andrian.yablonskyy/thub-coordinator 1.0.30 → 1.0.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@andrian.yablonskyy/thub-coordinator",
-  "version": "1.0.30",
+  "version": "1.0.31",
   "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": "*",
+    "@andrian.yablonskyy/thub-common": "^1.0.26",
     "better-sqlite3": "^12.4.1",
     "express": "^5.1.0",
     "express-session": "^1.18.2",

package/src/server.js

@@ -90,6 +90,14 @@ function buildServices(config){
   };
 }
 
+function commonPath(){
+  return path.dirname(require.resolve('@andrian.yablonskyy/thub-common/package.json'));
+}
+
+function commonVersion(){
+  return require('@andrian.yablonskyy/thub-common/package.json').version;
+}
+
 function createApp(config, services){
   const app = express();
   app.set('view engine', 'pug');
@@ -98,6 +106,10 @@ function createApp(config, services){
   app.locals.services = services;
   // Shown in every dashboard page's footer (layout.pug).
   app.locals.coordinatorVersion = require('../package.json').version;
+  // The thub-common this process actually loaded (it validates job specs):
+  // installs keep the one they got, so it can lag behind — shown on the
+  // dashboard and logged at startup to make that visible.
+  app.locals.commonVersion = commonVersion();
 
   app.use(express.json({ limit: '2mb' }));
   app.use(express.urlencoded({ extended: true }));
@@ -162,6 +174,7 @@ function start(configPath){
   const server = app.listen(config.port, config.host, () => {
     console.log(`Config: ${config.configPath || '(built-in defaults)'}; data: ${config.dataDir}`);
     console.log(`TestHub Coordinator listening on http://${config.host}:${config.port}`);
+    console.log(`Coordinator v${require('../package.json').version}, thub-common v${commonVersion()} (${commonPath()})`);
   });
 
   return { app, server, services, config };

package/src/services/jobs.js

@@ -14,7 +14,11 @@
 'use strict';
 
 const { validateJobSpec, JOB_STATES, ACTIVE_JOB_STATES, TERMINAL_JOB_STATES, RESOURCE_STATES } = require('@andrian.yablonskyy/thub-common'),
-  { paginate } = require('./list-prefs');
+  { paginate } = require('./list-prefs'),
+  // Named in spec errors: a field the Agent sends but this thub-common
+  // doesn't know means the Coordinator needs an update.
+  VERSIONS = `Coordinator v${require('../../package.json').version}, ` +
+    `thub-common v${require('@andrian.yablonskyy/thub-common/package.json').version}`;
 
 function rowToJob(row){
   if (!row){
@@ -131,7 +135,7 @@ function createJobsService(db, { bus, events, registry, artifacts, config }){
       rawSpec?.priority === undefined ? { ...rawSpec, priority: DEFAULT_PRIORITY[source] } : rawSpec
     );
     if (!valid){
-      throw Object.assign(new Error(`Invalid job spec: ${errors.join('; ')}`), { status: 400 });
+      throw Object.assign(new Error(`Invalid job spec (${VERSIONS}): ${errors.join('; ')}`), { status: 400 });
     }
     spec.source = source;
 

package/views/layout.pug

@@ -12,7 +12,12 @@ html(lang="en" data-bs-theme=(user && user.theme) || "auto")
       .container-fluid
         a.navbar-brand.d-flex.flex-column.lh-1.py-1(href="/")
           span TestHub
-          small.text-body-secondary.fw-normal.mt-1(style="font-size: .7rem;")
+          small.text-body-secondary.fw-normal.mt-1(
+            style="font-size: .7rem;"
+            data-bs-toggle="tooltip"
+            data-bs-placement="bottom"
+            data-bs-title=`Coordinator v${coordinatorVersion} · thub-common v${commonVersion} (validates job specs)`
+          )
             | ver. #{coordinatorVersion}
             if user && user.role !== 'admin' && updates.coordinatorUpdate
               span.badge.text-bg-warning.ms-1(