hypha-debugger 0.1.5 → 0.1.7

package/dist/debugger.d.ts

@@ -46,6 +46,7 @@ export declare class HyphaDebugger {
     private server;
     private serviceInfo;
     private boundBeforeUnload;
+    private cleanupInterceptor;
     constructor(config: DebuggerConfig);
     start(): Promise<DebugSession>;
     destroy(): Promise<void>;

package/dist/hypha-debugger.js

@@ -10614,8 +10614,6 @@
   }
   /**
    * Inject the debugger loader script into HTML before </body> (or append).
-   * Also injects a tiny inline script that reads sessionStorage and passes
-   * config to the debugger via a global, so autoStart() picks it up.
    */
   function injectLoader(html, scriptUrl) {
       const loader = `<script src="${scriptUrl}"><\/script>`;
@@ -10629,8 +10627,8 @@
   }
   /**
    * Perform a soft page replacement: fetch HTML, inject debugger script,
-   * replace the document. Returns false if it can't be done (caller should
-   * fall back to hard navigation).
+   * replace the document via document.write(). If the fetch or write fails,
+   * falls back to hard navigation.
    */
   function softReplace(url, pushState) {
       const scriptUrl = getScriptUrl();
@@ -10668,6 +10666,133 @@
           }
       });
   }
+  /** Check if a URL is same-origin as the current page. */
+  function isSameOrigin(url) {
+      try {
+          const target = new URL(url, location.href);
+          return target.origin === location.origin;
+      }
+      catch {
+          return false;
+      }
+  }
+  // ── Global navigation interception ────────────────────────────────────
+  let _interceptInstalled = false;
+  /**
+   * Install global listeners that intercept same-origin link clicks and
+   * form submissions, routing them through soft navigation so the debugger
+   * stays connected.
+   *
+   * Called once from HyphaDebugger.start().
+   */
+  function installNavigationInterceptor() {
+      if (_interceptInstalled)
+          return () => { };
+      _interceptInstalled = true;
+      /**
+       * Click handler: intercept <a> clicks that would navigate to a
+       * same-origin HTML page.
+       */
+      const onClick = (e) => {
+          // Skip if modifier keys (new tab, etc.) or not left-click
+          if (e.defaultPrevented || e.button !== 0)
+              return;
+          if (e.metaKey || e.ctrlKey || e.shiftKey || e.altKey)
+              return;
+          // Walk up from target to find the nearest <a>
+          let anchor = null;
+          let el = e.target;
+          while (el) {
+              if (el.tagName === "A") {
+                  anchor = el;
+                  break;
+              }
+              el = el.parentElement;
+          }
+          if (!anchor)
+              return;
+          const href = anchor.href;
+          if (!href)
+              return;
+          // Skip non-http(s), download links, target=_blank, javascript:, #hash-only
+          if (anchor.target && anchor.target !== "_self")
+              return;
+          if (anchor.hasAttribute("download"))
+              return;
+          if (href.startsWith("javascript:") || href.startsWith("mailto:") || href.startsWith("tel:"))
+              return;
+          // Skip hash-only links (same page anchor)
+          try {
+              const target = new URL(href, location.href);
+              if (target.origin === location.origin &&
+                  target.pathname === location.pathname &&
+                  target.search === location.search &&
+                  target.hash !== location.hash) {
+                  return; // Just a hash change, let browser handle it
+              }
+          }
+          catch {
+              return;
+          }
+          // Skip cross-origin
+          if (!isSameOrigin(href))
+              return;
+          // Intercept: prevent default navigation and do soft replace
+          e.preventDefault();
+          const targetUrl = new URL(href, location.href).href;
+          softReplace(targetUrl, targetUrl);
+      };
+      /**
+       * Submit handler: intercept form submissions to same-origin action URLs.
+       * Only handles GET forms (POST forms need the request body which is harder
+       * to replicate via fetch).
+       */
+      const onSubmit = (e) => {
+          if (e.defaultPrevented)
+              return;
+          const form = e.target;
+          const method = (form.method || "GET").toUpperCase();
+          // Only intercept GET forms — POST forms are too complex to replicate
+          if (method !== "GET")
+              return;
+          const action = form.action || location.href;
+          if (!isSameOrigin(action))
+              return;
+          // Build the URL with form data as query params
+          const formData = new FormData(form);
+          const url = new URL(action, location.href);
+          for (const [key, value] of formData.entries()) {
+              if (typeof value === "string") {
+                  url.searchParams.set(key, value);
+              }
+          }
+          // Skip if target is _blank or similar
+          if (form.target && form.target !== "_self")
+              return;
+          e.preventDefault();
+          softReplace(url.href, url.href);
+      };
+      /**
+       * Popstate handler: intercept browser back/forward (bfcache miss).
+       * When the browser navigates via back/forward and there's no bfcache,
+       * we can catch it via popstate and do a soft load of the target URL.
+       */
+      const onPopState = () => {
+          // The URL has already changed when popstate fires.
+          // Do a soft load of the current URL (which is the target of back/forward).
+          softReplace(location.href);
+      };
+      document.addEventListener("click", onClick, true); // capture phase
+      document.addEventListener("submit", onSubmit, true);
+      window.addEventListener("popstate", onPopState);
+      // Return cleanup function
+      return () => {
+          document.removeEventListener("click", onClick, true);
+          document.removeEventListener("submit", onSubmit, true);
+          window.removeEventListener("popstate", onPopState);
+          _interceptInstalled = false;
+      };
+  }
   // ── navigate ──────────────────────────────────────────────────────────
   function navigate(url) {
       try {
@@ -10718,7 +10843,7 @@
           window.history.back();
           return {
               success: true,
-              message: "Navigated back (re-click bookmarklet to reconnect if needed)",
+              message: "Navigated back (debugger will auto-reconnect via popstate)",
           };
       }
       catch (err) {
@@ -10730,7 +10855,7 @@
   }
   goBack.__schema__ = {
       name: "goBack",
-      description: "Navigate back in browser history. The debugger may disconnect — re-click the bookmarklet to reconnect.",
+      description: "Navigate back in browser history. The debugger auto-reconnects for same-origin pages.",
       parameters: {
           type: "object",
           properties: {},
@@ -10741,7 +10866,7 @@
           window.history.forward();
           return {
               success: true,
-              message: "Navigated forward (re-click bookmarklet to reconnect if needed)",
+              message: "Navigated forward (debugger will auto-reconnect via popstate)",
           };
       }
       catch (err) {
@@ -10753,7 +10878,7 @@
   }
   goForward.__schema__ = {
       name: "goForward",
-      description: "Navigate forward in browser history. The debugger may disconnect — re-click the bookmarklet to reconnect.",
+      description: "Navigate forward in browser history. The debugger auto-reconnects for same-origin pages.",
       parameters: {
           type: "object",
           properties: {},
@@ -13895,6 +14020,7 @@
           this.server = null;
           this.serviceInfo = null;
           this.boundBeforeUnload = null;
+          this.cleanupInterceptor = null;
           const requireToken = config.require_token ?? false;
           // Always append random suffix unless user provided a custom id.
           let serviceId = config.service_id ?? "web-debugger";
@@ -13943,7 +14069,20 @@
                   connectConfig.workspace = this.config.workspace;
               if (this.config.token)
                   connectConfig.token = this.config.token;
-              this.server = await connect(connectConfig);
+              try {
+                  this.server = await connect(connectConfig);
+              }
+              catch (connErr) {
+                  // If connecting to a saved workspace fails (e.g. expired/garbage-collected),
+                  // retry without the workspace to get a fresh one.
+                  if (this.config.workspace) {
+                      console.warn(`[hypha-debugger] Failed to rejoin workspace "${this.config.workspace}", getting a fresh one:`, connErr.message ?? connErr);
+                      this.server = await connect({ server_url: this.config.server_url });
+                  }
+                  else {
+                      throw connErr;
+                  }
+              }
               // Register debug service
               this.serviceInfo = await this.server.registerService(this.buildServiceDefinition());
               // Update overlay and build session
@@ -13958,6 +14097,9 @@
               this.saveConfigToStorage();
               this.boundBeforeUnload = () => this.saveConfigToStorage();
               window.addEventListener("beforeunload", this.boundBeforeUnload);
+              // Intercept same-origin link clicks, form submits, and popstate
+              // so the debugger survives user-initiated navigation
+              this.cleanupInterceptor = installNavigationInterceptor();
               return session;
           }
           catch (err) {
@@ -13973,11 +14115,15 @@
           }
       }
       async destroy() {
-          // Remove beforeunload listener
+          // Remove event listeners
           if (this.boundBeforeUnload) {
               window.removeEventListener("beforeunload", this.boundBeforeUnload);
               this.boundBeforeUnload = null;
           }
+          if (this.cleanupInterceptor) {
+              this.cleanupInterceptor();
+              this.cleanupInterceptor = null;
+          }
           try {
               if (this.serviceInfo && this.server) {
                   await this.server.unregisterService(this.serviceInfo.id);
@@ -14011,10 +14157,14 @@
        */
       saveConfigToStorage() {
           try {
+              // Save workspace so we can rejoin the same one (keeps URL stable),
+              // but never save the token — anonymous workspace tokens expire and
+              // cause "Permission denied" on reconnect. For anonymous workspaces
+              // no token is needed to rejoin; for authenticated workspaces the
+              // user must provide a fresh token via data attributes or config.
               const data = {
                   server_url: this.config.server_url,
                   workspace: this.server?.config?.workspace ?? this.config.workspace,
-                  token: this.config.token,
                   service_id: this.config.service_id,
                   service_name: this.config.service_name,
                   show_ui: this.config.show_ui,
@@ -14386,6 +14536,7 @@
   exports.goForward = goForward;
   exports.inputText = inputText;
   exports.installConsoleCapture = installConsoleCapture;
+  exports.installNavigationInterceptor = installNavigationInterceptor;
   exports.navigate = navigate;
   exports.queryDom = queryDom;
   exports.reload = reload;
@@ -14393,6 +14544,7 @@
   exports.scroll = scroll;
   exports.scrollTo = scrollTo;
   exports.selectOption = selectOption;
+  exports.softReplace = softReplace;
   exports.startDebugger = startDebugger;
   exports.takeScreenshot = takeScreenshot;
   exports.wrapFn = wrapFn;