@craftspace/cli 0.6.0 → 0.8.0

package/dist/index.js

@@ -19898,7 +19898,7 @@ var SaveWorkstationBodySchema = external_exports.object({
 var WorkstationResponseSchema = external_exports.object({ workstation: WorkstationSchema });
 
 // ../../shared/dist/machines/machine.js
-var CLI_VERSION = "0.6.0";
+var CLI_VERSION = "0.8.0";
 var CLI_PACKAGE = "@craftspace/cli";
 var CLI_INSTALL = `npm i -g ${CLI_PACKAGE}`;
 var MACHINE_BEAT_INTERVAL_MS = 15e3;
@@ -23247,6 +23247,8 @@ ${ui.ok(`Signed in as ${signed.ownerName}. This machine is ${ui.name(signed.name
       },
       schema: MachineBeatResponseSchema
     });
+    if (answer.cli !== null && isNewer(answer.cli.version))
+      updateWanted = answer.cli.version;
     await writeAuthorizedKeys(answer.authorizedKeys);
     const building2 = buildEnvironment(answer.environment, say);
     if (say === void 0)
@@ -23266,8 +23268,10 @@ ${ui.ok(`Signed in as ${signed.ownerName}. This machine is ${ui.name(signed.name
     let busy = false;
     let checkedAt = 0;
     for (; ; ) {
-      if (!busy && (failures > 2 || Date.now() - checkedAt > UPDATE_EVERY_MS)) {
+      const asked = updateWanted !== null && Date.now() - checkedAt > UPDATE_AFTER_BEAT_MS;
+      if (!busy && (asked || failures > 2 || Date.now() - checkedAt > UPDATE_EVERY_MS)) {
         checkedAt = Date.now();
+        updateWanted = null;
         const moved = await update.toLatest();
         if (moved !== null) {
           process.stderr.write(`craftspace ${CLI_VERSION} -> ${moved}, restarting
@@ -23776,6 +23780,7 @@ var MAX_BACKOFF_MS = 12e4;
 var KEYS_BEGIN = "# craftspace begin";
 var KEYS_END = "# craftspace end";
 var UPDATE_EVERY_MS = 6 * 60 * 60 * 1e3;
+var UPDATE_AFTER_BEAT_MS = 5 * 60 * 1e3;
 var BEATING = "beating every 15s, outbound only, and keeps this set up";
 var PORTABLE_TERMS = /* @__PURE__ */ new Set([
   "ansi",
@@ -23796,6 +23801,7 @@ var LINGER_LINE = `sudo loginctl enable-linger ${os5.userInfo().username}`;
 var DEFAULT_URL = process.env.CRAFTSPACE_URL ?? "https://craftspace.app";
 var PROBE_EVERY_MS = 3e5;
 var REBUILD_AFTER_MS = 216e5;
+var updateWanted = null;
 var probed = null;
 var building = false;
 var reports = /* @__PURE__ */ new Map();

package/dist/machine.js

@@ -10,7 +10,7 @@ import { probe } from './probe.js';
 import { runner } from './run.js';
 import { setup } from './setup.js';
 import { ui } from './ui.js';
-import { update } from './update.js';
+import { isNewer, update } from './update.js';
 const run = promisify(execFile);
 export const machine = {
     home() {
@@ -95,6 +95,8 @@ export const machine = {
             },
             schema: MachineBeatResponseSchema,
         });
+        if (answer.cli !== null && isNewer(answer.cli.version))
+            updateWanted = answer.cli.version;
         await writeAuthorizedKeys(answer.authorizedKeys);
         const building = buildEnvironment(answer.environment, say);
         if (say === undefined)
@@ -118,8 +120,10 @@ export const machine = {
         let busy = false;
         let checkedAt = 0;
         for (;;) {
-            if (!busy && (failures > 2 || Date.now() - checkedAt > UPDATE_EVERY_MS)) {
+            const asked = updateWanted !== null && Date.now() - checkedAt > UPDATE_AFTER_BEAT_MS;
+            if (!busy && (asked || failures > 2 || Date.now() - checkedAt > UPDATE_EVERY_MS)) {
                 checkedAt = Date.now();
+                updateWanted = null;
                 const moved = await update.toLatest();
                 if (moved !== null) {
                     process.stderr.write(`craftspace ${CLI_VERSION} -> ${moved}, restarting\n`);
@@ -618,6 +622,7 @@ const MAX_BACKOFF_MS = 120_000;
 const KEYS_BEGIN = '# craftspace begin';
 const KEYS_END = '# craftspace end';
 const UPDATE_EVERY_MS = 6 * 60 * 60 * 1_000;
+const UPDATE_AFTER_BEAT_MS = 5 * 60 * 1_000;
 const BEATING = 'beating every 15s, outbound only, and keeps this set up';
 const PORTABLE_TERMS = new Set([
     'ansi',
@@ -638,6 +643,7 @@ const LINGER_LINE = `sudo loginctl enable-linger ${os.userInfo().username}`;
 const DEFAULT_URL = process.env.CRAFTSPACE_URL ?? 'https://craftspace.app';
 const PROBE_EVERY_MS = 300_000;
 const REBUILD_AFTER_MS = 21_600_000;
+let updateWanted = null;
 let probed = null;
 let building = false;
 const reports = new Map();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@craftspace/cli",
-  "version": "0.6.0",
+  "version": "0.8.0",
   "type": "module",
   "description": "Sign a Mac or Linux machine into Craftspace and keep its agent setup in step.",
   "license": "MIT",