quoxcli 0.5.0 → 0.6.1

package/lib/commands/offload.js

@@ -2,7 +2,8 @@
  * `quox offload` : run a heavy command on a pool worker VM and behave like running it locally.
  *
  *   quox offload [--dir <path>] [--fresh] [--keep] [--cores N --memory-gb N --disk-gb N] -- <command...>
- *   quox offload status
+ *   quox offload status          every configured worker's lease (EXPIRED / EXPIRING / OK) + the selected worker's dirs
+ *   quox offload leases [--json] the same lease list, machine-readable for a timer
  *   quox offload release
  *
  * Engine: lib/core/offload.js. The worker is leased through the human pool REST API
@@ -11,7 +12,10 @@
 
 import { printInfo } from '../core/output.js';
 import { makePoolRest } from '../core/vm.js';
-import { OffloadError, realDeps, runOffload, releaseWorker, workerStatus, resolveSyncDir, WORKER_NAME_RE } from '../core/offload.js';
+import {
+  OffloadError, realDeps, runOffload, releaseWorker, workerStatus, resolveSyncDir, WORKER_NAME_RE,
+  allLeases, leaseWarnings, describeLease, LEASE_WARN_H, listWorkerNames,
+} from '../core/offload.js';
 
 export function registerOffloadCommands(program, ctx, { deps: injected } = {}) {
   const { client, auth } = ctx;
@@ -26,6 +30,19 @@ export function registerOffloadCommands(program, ctx, { deps: injected } = {}) {
     }
     return name ? Object.assign(Object.create(Object.getPrototypeOf(d)), d, { worker: String(name) }) : d;
   };
+  // Leasing needs a human profile, so an agent can only warn: one stderr line per lease ending within LEASE_WARN_H.
+  const warn = (report) => { for (const l of leaseWarnings(report)) process.stderr.write(`offload: ${l}\n`); };
+  const leaseLines = (report) => {
+    const width = Math.max(7, ...report.leases.map((l) => l.worker.length));
+    const lines = [`offload workers (warn when a lease ends within ${LEASE_WARN_H}h; source: ${report.source})`];
+    for (const l of report.leases) {
+      const head = `  ${l.worker.padEnd(width)}  `;
+      if (l.lease === 'NONE') { lines.push(`${head}no worker leased`); continue; }
+      lines.push(`${head}vm ${l.vmid}  ${l.ip || '?'}  pool ${l.pool_state}  lease ${l.lease_expires_at || '?'}  ${describeLease(l)}`);
+    }
+    if (report.pool_error) lines.push(`  (pool status failed, expiry from the local state: ${report.pool_error})`);
+    return lines;
+  };
   const WORKER_HELP = 'use your own named worker (its own lease and size) instead of the shared one; or set QUOX_OFFLOAD_WORKER';
 
   const off = program
@@ -46,6 +63,7 @@ export function registerOffloadCommands(program, ctx, { deps: injected } = {}) {
       const cwd = process.cwd();
       try {
         const dir = resolveSyncDir(cwd, options.dir);
+        try { warn(await allLeases(base(), { live: false })); } catch { /* the warning never blocks a run */ }
         const code = await runOffload(mk(options), {
           dir, cwd, command, fresh: !!options.fresh, docker: !!options.docker,
           cores: options.cores, memoryGb: options.memoryGb, diskGb: options.diskGb,
@@ -59,16 +77,32 @@ export function registerOffloadCommands(program, ctx, { deps: injected } = {}) {
     });
 
   off.command('status')
-    .description('Show your offload worker: vmid, ip, lease expiry, synced dirs')
+    .description('Show every offload worker lease (EXPIRED / EXPIRING / OK) and your worker: vmid, ip, synced dirs')
     .option('--worker <name>', WORKER_HELP)
     .action(async (options) => {
       auth.requireAuth();
-      const s = await workerStatus(mk(options));
-      if (json()) { console.log(JSON.stringify(s, null, 2)); return; }
-      if (!s.worker) { printInfo('no offload worker leased (it is leased on the next `quox offload -- <command>`)'); return; }
-      const w = s.worker;
-      console.log(`worker ${w.vmid}  ${w.ip || '?'}  ${w.state}  lessee ${w.lessee}  lease expires ${w.lease_expires_at || '?'}`);
-      for (const d of s.dirs) console.log(`  synced ${d.local} -> ${d.remote}  ${d.synced_at || ''}`);
+      // commander hands `status --worker x` to the parent offload command's --worker, so read both.
+      const s = await workerStatus(mk({ worker: options.worker ?? off.opts().worker }));
+      const report = await allLeases(base());
+      warn(report);
+      if (json()) { console.log(JSON.stringify({ ...s, leases: report.leases }, null, 2)); return; }
+      if (!s.worker) printInfo('this worker has no lease (a human profile leases it on the next `quox offload -- <command>`)');
+      else {
+        const w = s.worker;
+        console.log(`worker ${w.vmid}  ${w.ip || '?'}  ${w.state}  lessee ${w.lessee}  lease expires ${w.lease_expires_at || '?'}`);
+        for (const d of s.dirs) console.log(`  synced ${d.local} -> ${d.remote}  ${d.synced_at || ''}`);
+      }
+      for (const line of leaseLines(report)) console.log(line);
+    });
+
+  off.command('leases')
+    .description(`List every configured offload worker lease with EXPIRED / EXPIRING (within ${LEASE_WARN_H}h) / OK and the human renew command (read-only)`)
+    .action(async () => {
+      auth.requireAuth();
+      const report = await allLeases(base());
+      warn(report);
+      if (json()) { console.log(JSON.stringify(report, null, 2)); return; }
+      for (const line of leaseLines(report)) console.log(line);
     });
 
   off.command('release')
@@ -77,7 +111,14 @@ export function registerOffloadCommands(program, ctx, { deps: injected } = {}) {
     .action(async (options) => {
       auth.requireAuth();
       try {
-        const vmid = await releaseWorker(mk(options));
+        // commander hands `release --worker x` to the parent offload command; reading only the subcommand's
+        // options released (destroyed) the SHARED default worker instead of x.
+        const d = mk({ worker: options.worker ?? off.opts().worker });
+        if (d.worker && !listWorkerNames(d).includes(d.worker)) {
+          const known = listWorkerNames(d).map((n) => n || 'default').join(', ') || 'none';
+          throw new OffloadError(`no offload worker named ${JSON.stringify(d.worker)} (configured: ${known}); nothing released`);
+        }
+        const vmid = await releaseWorker(d);
         if (json()) console.log(JSON.stringify({ released: vmid }));
         else printInfo(vmid ? `released worker ${vmid}` : 'no offload worker to release');
       } catch (e) {