bdy 1.23.9-stage → 1.23.11-dev

package/distTs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.23.9-stage",
+  "version": "1.23.11-dev",
   "type": "commonjs",
   "license": "MIT",
   "homepage": "https://buddy.works/docs/cli",

package/distTs/src/agent/agent.js

@@ -139,6 +139,7 @@ class Agent extends events_1.default {
         try {
             if (data.agent.action)
                 await this.makeAction(data.agent.action);
+            this.reclearLostUpdateStatus(data.agent.action);
             const filtered = (data.tunnels || []).filter((t) => !!t.domain);
             this.refreshTunnels(filtered);
         }
@@ -290,12 +291,50 @@ class Agent extends events_1.default {
             return;
         this.updateStatusExpiry = setTimeout(() => {
             this.updateStatusExpiry = null;
-            this.ackAction();
+            this.queueUpdateStatusClear();
         }, utils_1.AGENT_UPDATE_STATUS_TTL_MS);
         // A foreground tunnel reporting UNSUPPORTED exits as soon as it has acked, and must
         // not be held open for the rest of the window just to tidy up after itself
         this.updateStatusExpiry.unref();
     }
+    // Queued rather than sent, because a fetch of our own here would go out within
+    // milliseconds of refreshIn15's tick: this expiry and that interval are both armed when
+    // the process starts, and the ttl is a multiple of the interval. The backend writes the
+    // whole agent row per request, so the tick - which carries no action at all - rewrites
+    // the field this clear just emptied, and the outcome is back with nobody left to remove
+    // it. Riding the next scheduled fetch keeps it to one write per tick.
+    queueUpdateStatusClear() {
+        if (!this.socket)
+            return;
+        // An outcome reported in the meantime is the newer truth and has a window of its own
+        if (this.socket.pendingAction !== null)
+            return;
+        this.socket.setPendingAction('');
+    }
+    // An outcome still on the record after its window is one whose clear did not survive -
+    // see queueUpdateStatusClear for how that happens, and note it can equally be a status
+    // left behind by a process that died before its expiry ever fired. Either way nothing
+    // dates the value, so it would sit there until the next update request: queue the clear
+    // again and let the fetch after this one carry it.
+    reclearLostUpdateStatus(action) {
+        if (typeof action !== 'string')
+            return;
+        const statuses = Object.values(tunnel_1.TUNNEL_AGENT_UPDATE_STATUS);
+        if (!statuses.includes(action))
+            return;
+        // Never an outcome, and the one value the front reads as an unknown result
+        if (action === tunnel_1.TUNNEL_AGENT_UPDATE_STATUS.STARTED)
+            return;
+        // Still inside the window this status is being shown for
+        if (this.updateStatusExpiry)
+            return;
+        this.queueUpdateStatusClear();
+        // Sent from here rather than left for the next scheduled fetch, unlike the expiry above:
+        // this runs on a fetch response, which is as far from the next refresh tick as the
+        // schedule ever gets, so there is nothing to collide with. Waiting for two more fetches
+        // would leave a confirmation standing for a minute and a half.
+        this.ackAction();
+    }
     // For a status with no ack to ride on - STARTED, reported while the download is still
     // running. Passes null so that if the status has somehow already gone out, this does
     // not overwrite it with an empty action.

package/distTs/src/command/sandbox/create.js

@@ -178,6 +178,8 @@ commandSandboxCreate.action(async (options) => {
     output_1.default.cyan(result.identifier);
     output_1.default.dim('SSH:          ', false);
     output_1.default.cyan(`ssh ${result.ssh_host} -p ${result.ssh_port}`);
+    output_1.default.dim('SSH via CLI:  ', false);
+    output_1.default.cyan(`bdy sb ssh ${result.identifier}`);
     output_1.default.dim('Web terminal: ', false);
     output_1.default.cyan(result.html_url);
     output_1.default.green(texts_1.TXT_SANDBOX_CREATED);

package/distTs/src/command/sandbox/get.js

@@ -44,6 +44,7 @@ commandSandboxGet.action(async (identifier, options) => {
                     ? `ssh ${sandbox.ssh_host} -p ${sandbox.ssh_port}`
                     : '-',
             ],
+            ['SSH via CLI', sandbox.identifier ? `bdy sb ssh ${sandbox.identifier}` : '-']
         ];
         if (sandbox.endpoints && sandbox.endpoints.length > 0) {
             data.push([

package/distTs/src/utils.js

@@ -121,11 +121,17 @@ exports.AGENT_UPDATE_MAX_ATTEMPTS = 3;
 // only has to be read. Generous on purpose: it is only ever reached when the counter
 // cannot be persisted, so it must not fire on an agent that is merely slow to come up.
 exports.AGENT_UPDATE_PROBATION_MS = 30 * 60 * 1000;
-// How long a reported update outcome stays on the agent record before the agent clears it
-// again. An outcome is a confirmation for whoever is watching the update, not a property of
+// How long a reported update outcome stays on the agent record before the agent queues its
+// clear. An outcome is a confirmation for whoever is watching the update, not a property of
 // the agent: nothing re-evaluates it, so one left in place would still claim a machine is
 // missing admin rights long after that was fixed. The agent log keeps the durable record.
-exports.AGENT_UPDATE_STATUS_TTL_MS = 30 * 1000;
+//
+// Shorter than the refresh interval on purpose. The clear does not go out on this timer - it
+// rides the next scheduled fetch (see queueUpdateStatusClear) - and those are 15s apart at
+// first and 45s apart after that. Expiring inside the first interval catches the fetch at
+// 15s; anything past it waits for the one at 60s, so a longer ttl here shows the outcome for
+// four times as long as it says.
+exports.AGENT_UPDATE_STATUS_TTL_MS = 10 * 1000;
 exports.SUGGESTED_BROWSER_VERSION = '130.0.6723.69';
 exports.ARTIFACT_DEFAULT_VERSION = 'latest';
 exports.DEFAULT_SANDBOX_CP_USER = 'buddy';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.23.9-stage",
+  "version": "1.23.11-dev",
   "type": "commonjs",
   "license": "MIT",
   "homepage": "https://buddy.works/docs/cli",