@karmaniverous/jeeves-runner 0.6.0 → 0.7.0

package/dist/cli/jeeves-runner/index.js

@@ -3,6 +3,7 @@ import { mkdirSync, mkdtempSync, writeFileSync, unlinkSync, existsSync, readFile
 import { dirname, join, extname, resolve } from 'node:path';
 import { Command } from 'commander';
 import { DatabaseSync } from 'node:sqlite';
+import { fileURLToPath } from 'node:url';
 import { pino } from 'pino';
 import Fastify from 'fastify';
 import { createConfigQueryHandler } from '@karmaniverous/jeeves';
@@ -608,13 +609,31 @@ function registerStateRoutes(app, deps) {
  * Register all API routes on the Fastify instance.
  */
 function registerRoutes(app, deps) {
-    const { db, scheduler, getConfig } = deps;
-    /** GET /health — Health check. */
-    app.get('/health', () => {
+    const { db, scheduler, getConfig, version } = deps;
+    /** GET /status — Unified status endpoint (single health/metadata entrypoint). */
+    app.get('/status', () => {
+        const totalJobs = db
+            .prepare('SELECT COUNT(*) as count FROM jobs')
+            .get();
+        const runningCount = scheduler.getRunningJobs().length;
+        const failedCount = scheduler.getFailedRegistrations().length;
+        const okLastHour = db
+            .prepare(`SELECT COUNT(*) as count FROM runs 
+         WHERE status = 'ok' AND started_at > datetime('now', '-1 hour')`)
+            .get();
+        const errorsLastHour = db
+            .prepare(`SELECT COUNT(*) as count FROM runs 
+         WHERE status IN ('error', 'timeout') AND started_at > datetime('now', '-1 hour')`)
+            .get();
         return {
-            ok: true,
+            status: 'ok',
+            version,
             uptime: process.uptime(),
-            failedRegistrations: scheduler.getFailedRegistrations().length,
+            totalJobs: totalJobs.count,
+            running: runningCount,
+            failedRegistrations: failedCount,
+            okLastHour: okLastHour.count,
+            errorsLastHour: errorsLastHour.count,
         };
     });
     /** GET /jobs — List all jobs with last run status. */
@@ -657,29 +676,6 @@ function registerRoutes(app, deps) {
             return { error: err instanceof Error ? err.message : 'Unknown error' };
         }
     });
-    /** GET /stats — Aggregate job statistics. */
-    app.get('/stats', () => {
-        const totalJobs = db
-            .prepare('SELECT COUNT(*) as count FROM jobs')
-            .get();
-        const runningCount = scheduler.getRunningJobs().length;
-        const failedCount = scheduler.getFailedRegistrations().length;
-        const okLastHour = db
-            .prepare(`SELECT COUNT(*) as count FROM runs 
-         WHERE status = 'ok' AND started_at > datetime('now', '-1 hour')`)
-            .get();
-        const errorsLastHour = db
-            .prepare(`SELECT COUNT(*) as count FROM runs 
-         WHERE status IN ('error', 'timeout') AND started_at > datetime('now', '-1 hour')`)
-            .get();
-        return {
-            totalJobs: totalJobs.count,
-            running: runningCount,
-            failedRegistrations: failedCount,
-            okLastHour: okLastHour.count,
-            errorsLastHour: errorsLastHour.count,
-        };
-    });
     /** GET /config — Query effective configuration via JSONPath. */
     const configHandler = createConfigQueryHandler(getConfig);
     app.get('/config', async (request, reply) => {
@@ -723,6 +719,7 @@ function createServer(deps) {
         db: deps.db,
         scheduler: deps.scheduler,
         getConfig: deps.getConfig,
+        version: deps.version,
     });
     return app;
 }
@@ -1602,11 +1599,23 @@ function createRunner(config, deps) {
             });
             scheduler.start();
             logger.info('Scheduler started');
+            // Read package version
+            const pkgVersion = (() => {
+                try {
+                    const dir = dirname(fileURLToPath(import.meta.url));
+                    const pkg = JSON.parse(readFileSync(resolve(dir, '..', 'package.json'), 'utf8'));
+                    return pkg.version ?? 'unknown';
+                }
+                catch {
+                    return 'unknown';
+                }
+            })();
             // API server
             server = createServer({
                 db,
                 scheduler,
                 getConfig: () => config,
+                version: pkgVersion,
                 loggerConfig: { level: config.log.level, file: config.log.file },
             });
             await server.listen({ port: config.port, host: config.host });
@@ -1962,7 +1971,7 @@ program
     const config = loadConfig(options.config);
     void (async () => {
         try {
-            const resp = await fetch(`http://127.0.0.1:${String(config.port)}/stats`);
+            const resp = await fetch(`http://127.0.0.1:${String(config.port)}/status`);
             const stats = (await resp.json());
             console.log(JSON.stringify(stats, null, 2));
         }

package/dist/index.d.ts

@@ -102,8 +102,8 @@ type Queue = z.infer<typeof queueSchema>;
 
 /** Run status enumeration schema (pending, running, ok, error, timeout, skipped). */
 declare const runStatusSchema: z.ZodEnum<{
-    error: "error";
     pending: "pending";
+    error: "error";
     running: "running";
     ok: "ok";
     timeout: "timeout";
@@ -120,8 +120,8 @@ declare const runSchema: z.ZodObject<{
     id: z.ZodNumber;
     jobId: z.ZodString;
     status: z.ZodEnum<{
-        error: "error";
         pending: "pending";
+        error: "error";
         running: "running";
         ok: "ok";
         timeout: "timeout";

package/dist/mjs/index.js

@@ -1,12 +1,13 @@
 import { z } from 'zod';
 import { mkdirSync, mkdtempSync, writeFileSync, unlinkSync, existsSync, readFileSync } from 'node:fs';
+import { dirname, join, extname, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
 import { pino } from 'pino';
 import Fastify from 'fastify';
 import { createConfigQueryHandler } from '@karmaniverous/jeeves';
 import { RRStack } from '@karmaniverous/rrstack';
 import { Cron } from 'croner';
 import { JSONPath } from 'jsonpath-plus';
-import { dirname, join, extname } from 'node:path';
 import { DatabaseSync } from 'node:sqlite';
 import { request as request$1 } from 'node:http';
 import { request } from 'node:https';
@@ -562,13 +563,31 @@ function registerStateRoutes(app, deps) {
  * Register all API routes on the Fastify instance.
  */
 function registerRoutes(app, deps) {
-    const { db, scheduler, getConfig } = deps;
-    /** GET /health — Health check. */
-    app.get('/health', () => {
+    const { db, scheduler, getConfig, version } = deps;
+    /** GET /status — Unified status endpoint (single health/metadata entrypoint). */
+    app.get('/status', () => {
+        const totalJobs = db
+            .prepare('SELECT COUNT(*) as count FROM jobs')
+            .get();
+        const runningCount = scheduler.getRunningJobs().length;
+        const failedCount = scheduler.getFailedRegistrations().length;
+        const okLastHour = db
+            .prepare(`SELECT COUNT(*) as count FROM runs 
+         WHERE status = 'ok' AND started_at > datetime('now', '-1 hour')`)
+            .get();
+        const errorsLastHour = db
+            .prepare(`SELECT COUNT(*) as count FROM runs 
+         WHERE status IN ('error', 'timeout') AND started_at > datetime('now', '-1 hour')`)
+            .get();
         return {
-            ok: true,
+            status: 'ok',
+            version,
             uptime: process.uptime(),
-            failedRegistrations: scheduler.getFailedRegistrations().length,
+            totalJobs: totalJobs.count,
+            running: runningCount,
+            failedRegistrations: failedCount,
+            okLastHour: okLastHour.count,
+            errorsLastHour: errorsLastHour.count,
         };
     });
     /** GET /jobs — List all jobs with last run status. */
@@ -611,29 +630,6 @@ function registerRoutes(app, deps) {
             return { error: err instanceof Error ? err.message : 'Unknown error' };
         }
     });
-    /** GET /stats — Aggregate job statistics. */
-    app.get('/stats', () => {
-        const totalJobs = db
-            .prepare('SELECT COUNT(*) as count FROM jobs')
-            .get();
-        const runningCount = scheduler.getRunningJobs().length;
-        const failedCount = scheduler.getFailedRegistrations().length;
-        const okLastHour = db
-            .prepare(`SELECT COUNT(*) as count FROM runs 
-         WHERE status = 'ok' AND started_at > datetime('now', '-1 hour')`)
-            .get();
-        const errorsLastHour = db
-            .prepare(`SELECT COUNT(*) as count FROM runs 
-         WHERE status IN ('error', 'timeout') AND started_at > datetime('now', '-1 hour')`)
-            .get();
-        return {
-            totalJobs: totalJobs.count,
-            running: runningCount,
-            failedRegistrations: failedCount,
-            okLastHour: okLastHour.count,
-            errorsLastHour: errorsLastHour.count,
-        };
-    });
     /** GET /config — Query effective configuration via JSONPath. */
     const configHandler = createConfigQueryHandler(getConfig);
     app.get('/config', async (request, reply) => {
@@ -677,6 +673,7 @@ function createServer(deps) {
         db: deps.db,
         scheduler: deps.scheduler,
         getConfig: deps.getConfig,
+        version: deps.version,
     });
     return app;
 }
@@ -1762,11 +1759,23 @@ function createRunner(config, deps) {
             });
             scheduler.start();
             logger.info('Scheduler started');
+            // Read package version
+            const pkgVersion = (() => {
+                try {
+                    const dir = dirname(fileURLToPath(import.meta.url));
+                    const pkg = JSON.parse(readFileSync(resolve(dir, '..', 'package.json'), 'utf8'));
+                    return pkg.version ?? 'unknown';
+                }
+                catch {
+                    return 'unknown';
+                }
+            })();
             // API server
             server = createServer({
                 db,
                 scheduler,
                 getConfig: () => config,
+                version: pkgVersion,
                 loggerConfig: { level: config.log.level, file: config.log.file },
             });
             await server.listen({ port: config.port, host: config.host });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@karmaniverous/jeeves-runner",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "author": "Jason Williscroft",
   "description": "Graph-aware job execution engine with SQLite state. Part of the Jeeves platform.",
   "license": "BSD-3-Clause",
@@ -46,7 +46,7 @@
     "node": ">=20"
   },
   "dependencies": {
-    "@karmaniverous/jeeves": "^0.2.0",
+    "@karmaniverous/jeeves": "^0.3.0",
     "@karmaniverous/rrstack": "^0.17.0",
     "commander": "^14.0.3",
     "croner": "^10.0.1",