npm - bloby-bot - Versions diffs - 0.68.2 → 0.68.3 - Mend

bloby-bot 0.68.2 → 0.68.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/package.json +1 -1
package/supervisor/shell.ts +91 -0
package/supervisor/workspace-guard.js +14 -1

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "bloby-bot",
-  "version": "0.68.2",
+  "version": "0.68.3",
   "releaseNotes": [
     "1. Fix: agent self-update ",
     "1",

package/supervisor/shell.ts CHANGED Viewed

@@ -97,6 +97,97 @@ export const SHELL_HTML = `<!DOCTYPE html>
         var s = document.getElementById('splash');
         if (s && s.style.display !== 'none') s.style.display = 'none';
       }, 10000);
+      /* ── Workspace watchdog ──────────────────────────────────────────────
+         The iframe can land on a document with NO Bloby code in it: cloudflared's raw
+         "502 Bad Gateway" while the supervisor restarts during a self-update, a relay
+         hiccup, or the browser's own network-error page. Nothing inside the frame can
+         recover from those — so the shell owns recovery: poll the supervisor, show a
+         branded "restarting" overlay while it's unreachable, and reload the frame once
+         it's back (then verify the frame really shows one of our documents again). */
+      var overlay = document.createElement('div');
+      overlay.id = 'bloby-ws-restarting';
+      // z-index 9997: above the workspace iframe, below the splash (9998), the bubble
+      // canvas (9999+) and the chat panel (99999) — the chat stays usable on top.
+      overlay.style.cssText = 'display:none;position:fixed;inset:0;z-index:9997;background:#0a0a0b;color:#e4e4e7;align-items:center;justify-content:center;padding:1.5rem;font-family:system-ui,-apple-system,sans-serif';
+      overlay.innerHTML =
+        '<div style="text-align:center;max-width:460px;width:100%">' +
+          '<div style="position:relative;width:160px;height:160px;margin:0 auto 1.2rem">' +
+            '<div style="position:absolute;inset:-18px;background:radial-gradient(circle,rgba(1,102,255,.18) 0%,transparent 60%);filter:blur(18px)"></div>' +
+            // preload=auto so the clip is fetched (and SW-cached) while the supervisor is
+            // still up — by the time we show this, the origin is unreachable.
+            '<video autoplay loop muted playsinline preload="auto" style="position:relative;width:100%;height:100%;object-fit:contain;border-radius:50%">' +
+              '<source src="/what-happened.webm" type="video/webm"><source src="/what-happened.mp4" type="video/mp4">' +
+            '</video>' +
+          '</div>' +
+          '<h1 style="font-size:1.5rem;font-weight:700;margin:0 0 .6rem;background:linear-gradient(135deg,#0166FF,#009AFE,#4AEEFF);-webkit-background-clip:text;-webkit-text-fill-color:transparent;background-clip:text">Workspace is restarting&hellip;</h1>' +
+          '<p style="color:#e4e4e7;font-size:1rem;line-height:1.6;margin:0 0 .4rem">Your app is coming back online &mdash; this usually happens right after an update or a restart.</p>' +
+          '<p style="color:#a1a1aa;font-size:.93rem;line-height:1.6;margin:0">No action needed. Your chat stays online the whole time &mdash; ask your agent anything.</p>' +
+          '<div style="font-size:.82rem;color:#71717a;display:inline-flex;align-items:center;gap:.5rem;background:#18181b;border:1px solid #27272a;border-radius:9999px;padding:.35rem .9rem;margin-top:1.1rem"><span style="width:8px;height:8px;border-radius:50%;background:linear-gradient(135deg,#0166FF,#009AFE);box-shadow:0 0 8px rgba(1,102,255,.6)"></span><span>Watching for recovery&hellip;</span></div>' +
+        '</div>';
+      document.body.appendChild(overlay);
+      function refreshFrame() {
+        var u = target.pathname + target.search + target.hash;
+        try { frame.contentWindow.location.replace(u); }
+        catch (e) { frame.src = u; } // error pages are opaque — reassigning src re-navigates
+      }
+      function frameLooksBroken() {
+        try {
+          var d = frame.contentDocument;
+          if (!d) return true; // browser error pages are opaque to the same-origin parent
+          if (d.readyState === 'loading') return false; // still navigating — don't judge
+          // Every document WE can legitimately serve into the frame: the workspace app
+          // (#root / #splash), the supervisor interstitials (.video-wrap), and the relay's
+          // branded pages ("Powered by Bloby" — those self-recover, leave them alone).
+          if (d.getElementById('root') || d.getElementById('splash')) return false;
+          if (d.querySelector('.video-wrap')) return false;
+          var txt = String((d.body && d.body.textContent) || '');
+          if (txt.indexOf('Powered by Bloby') !== -1) return false;
+          // Only short, clearly error-shaped documents count as broken — NEVER judge a real
+          // app by the absence of our markers (an agent-rebuilt app may have none of them).
+          return txt.length < 600 && /bad gateway|gateway time|stream to the origin|cloudflare|connection refused|50[234]/i.test(txt);
+        } catch (e) {
+          return true; // cross-origin contentDocument → browser error page → broken
+        }
+      }
+      var downCount = 0, upCount = 0, isDown = false, brokenRetries = 0;
+      function watchTick() {
+        fetch('/__bloby/backend-status', { cache: 'no-store' })
+          .then(function (r) { if (!r.ok) throw new Error('status ' + r.status); return r.json(); })
+          .then(function () {
+            downCount = 0;
+            if (isDown) {
+              // Two consecutive healthy polls before reloading the frame — right after a
+              // restart the tunnel still drops the odd request, and reloading into that
+              // window is exactly how the frame lands on cloudflared's raw 502.
+              upCount++;
+              if (upCount >= 2) {
+                isDown = false; upCount = 0; brokenRetries = 0;
+                overlay.style.display = 'none';
+                refreshFrame();
+              }
+            } else if (frameLooksBroken()) {
+              // Supervisor healthy but the frame shows a foreign error page (e.g. it
+              // reloaded itself into a tunnel blip the watchdog never saw). Capped so an
+              // exotic-but-working document can never be refresh-looped forever.
+              if (brokenRetries < 5) { brokenRetries++; refreshFrame(); }
+            } else {
+              brokenRetries = 0;
+            }
+          })
+          .catch(function () {
+            upCount = 0;
+            downCount++;
+            if (downCount >= 2 && !isDown) { // ~8s of failures = real outage, not a blip
+              isDown = true;
+              overlay.style.display = 'flex';
+            }
+          });
+      }
+      setInterval(watchTick, 4000);
     })();
     </script>

package/supervisor/workspace-guard.js CHANGED Viewed

@@ -155,20 +155,33 @@
       // Single instance so rapid disconnects don't stack timers; paused while hidden
       // (mirrors Vite's own visibility-aware ping) and kicked on visibility/online.
       var recoveryTimer = null;
+      var stalePending = false;
       function recoveryTick() {
         if (document.visibilityState === 'hidden') return;
         fetchStamp().then(function (s) {
           if (s === null || recoveryTimer === null) return;
           if (lastStamp === null) { lastStamp = s; return; } // no baseline — adopt and watch
           if (s !== lastStamp) {
+            // Stamp moved, but require a SECOND consecutive healthy fetch before reloading:
+            // right after a supervisor restart (self-update) the tunnel still drops the odd
+            // request — reloading into that window is how the iframe used to land on
+            // cloudflared's raw 502 page, which has no Bloby code in it to recover.
+            if (!stalePending) {
+              stalePending = true;
+              flog('stale-after-disconnect', 'stamp ' + lastStamp + '→' + s + ' (confirming next tick)');
+              return;
+            }
             flog('stale-after-disconnect', 'stamp ' + lastStamp + '→' + s);
             stopRecoveryPoll();
             location.reload(); // goes through the forensics wrapper: logged + splash
+          } else {
+            stalePending = false;
           }
-        }).catch(function () {});
+        }).catch(function () { stalePending = false; }); // consecutive = no failures in between
       }
       function startRecoveryPoll() {
         if (recoveryTimer !== null) return;
+        stalePending = false;
         flog('recovery-poll', 'started');
         recoveryTimer = setInterval(recoveryTick, 3000);
         recoveryTick();