tauri-test-cli 0.7.0 → 0.7.2

package/dist/cli.js

@@ -120707,7 +120707,9 @@ async function connect(options) {
 }
 async function disconnect() {
   if (browser) {
-    await browser.deleteSession();
+    try {
+      await browser.deleteSession();
+    } catch {}
     browser = null;
   }
   stopDriver();
@@ -120905,6 +120907,17 @@ async function waitForInteractive(selector, timeout = 5000) {
   await element.waitForClickable({ timeout });
 }
 
+// src/commands/utils.ts
+var xvfbDisplay = null;
+function getXvfbDisplay() {
+  const envVal = process.env.TAURI_TEST_XVFB_DISPLAY;
+  if (envVal !== undefined) {
+    const n = Number(envVal);
+    return Number.isFinite(n) ? n : null;
+  }
+  return xvfbDisplay;
+}
+
 // src/commands/screenshot.ts
 var HTML2CANVAS_CDN = "https://cdn.jsdelivr.net/npm/html2canvas@1.4.1/dist/html2canvas.min.js";
 async function screenshot(options = {}) {
@@ -120921,12 +120934,21 @@ async function screenshot(options = {}) {
     data2 = await withTimeout(captureWithHtml2Canvas(browser3), timeout, "html2canvas timed out");
     method = "html2canvas";
   } catch (err) {
-    console.error(`html2canvas failed: ${err}, trying native...`);
+    console.error(`html2canvas failed: ${err}, trying canvas fallback...`);
     try {
-      data2 = await withTimeout(browser3.takeScreenshot(), timeout, `Native screenshot timed out after ${timeout}ms`);
-      method = "native";
-    } catch (nativeErr) {
-      throw new Error(`All screenshot methods failed: ${err}, ${nativeErr}`);
+      data2 = await withTimeout(captureWithCanvas(browser3), timeout, "Canvas screenshot timed out");
+      method = "canvas";
+    } catch (canvasErr) {
+      if (getXvfbDisplay() !== null) {
+        throw new Error(`All screenshot methods failed in Xvfb: html2canvas: ${err}, canvas: ${canvasErr}`);
+      }
+      console.error(`Canvas failed: ${canvasErr}, trying native...`);
+      try {
+        data2 = await withTimeout(browser3.takeScreenshot(), timeout, `Native screenshot timed out after ${timeout}ms`);
+        method = "native";
+      } catch (nativeErr) {
+        throw new Error(`All screenshot methods failed: html2canvas: ${err}, canvas: ${canvasErr}, native: ${nativeErr}`);
+      }
     }
   }
   if (options.output) {
@@ -120971,10 +120993,11 @@ async function captureWithHtml2Canvas(browser3) {
     throw new Error("Failed to load html2canvas from CDN");
   }
   await new Promise((r) => setTimeout(r, 50));
-  const base64 = await browser3.executeAsync((done) => {
+  await browser3.execute(() => {
+    window.__h2cResult = undefined;
     const h2c = window.html2canvas;
     if (!h2c) {
-      done("");
+      window.__h2cResult = "";
       return;
     }
     h2c(document.body, {
@@ -120984,15 +121007,92 @@ async function captureWithHtml2Canvas(browser3) {
       backgroundColor: "#ffffff"
     }).then((canvas) => {
       const dataUrl = canvas.toDataURL("image/png");
-      done(dataUrl.replace(/^data:image\/png;base64,/, ""));
-    }).catch(() => done(""));
-    setTimeout(() => done(""), 4000);
+      window.__h2cResult = dataUrl.replace(/^data:image\/png;base64,/, "");
+    }).catch(() => {
+      window.__h2cResult = "";
+    });
+    setTimeout(() => {
+      if (window.__h2cResult === undefined) {
+        window.__h2cResult = "";
+      }
+    }, 4000);
   });
+  const base64 = await pollForResult(browser3, "__h2cResult");
   if (!base64) {
     throw new Error("html2canvas capture returned empty");
   }
   return base64;
 }
+async function captureWithCanvas(browser3) {
+  await browser3.execute(() => {
+    window.__canvasResult = undefined;
+    try {
+      const w2 = window.innerWidth || 800;
+      const h = window.innerHeight || 600;
+      const canvas = document.createElement("canvas");
+      canvas.width = w2;
+      canvas.height = h;
+      const ctx = canvas.getContext("2d");
+      ctx.fillStyle = "#ffffff";
+      ctx.fillRect(0, 0, w2, h);
+      const serializer = new XMLSerializer;
+      const cloned = document.documentElement.cloneNode(true);
+      const html3 = serializer.serializeToString(cloned);
+      const svg = `<svg xmlns="http://www.w3.org/2000/svg" width="${w2}" height="${h}">
+        <foreignObject width="100%" height="100%">
+          ${html3}
+        </foreignObject>
+      </svg>`;
+      const blob = new Blob([svg], { type: "image/svg+xml;charset=utf-8" });
+      const url2 = URL.createObjectURL(blob);
+      const img = new Image;
+      img.onload = () => {
+        ctx.drawImage(img, 0, 0);
+        URL.revokeObjectURL(url2);
+        const dataUrl = canvas.toDataURL("image/png");
+        window.__canvasResult = dataUrl.replace(/^data:image\/png;base64,/, "");
+      };
+      img.onerror = () => {
+        URL.revokeObjectURL(url2);
+        ctx.fillStyle = "#000000";
+        ctx.font = "16px monospace";
+        const text3 = document.body.innerText || "";
+        const lines = text3.split(`
+`);
+        for (let i = 0;i < lines.length && i < 40; i++) {
+          ctx.fillText(lines[i], 10, 20 + i * 20);
+        }
+        const dataUrl = canvas.toDataURL("image/png");
+        window.__canvasResult = dataUrl.replace(/^data:image\/png;base64,/, "");
+      };
+      img.src = url2;
+      setTimeout(() => {
+        if (window.__canvasResult === undefined) {
+          const dataUrl = canvas.toDataURL("image/png");
+          window.__canvasResult = dataUrl.replace(/^data:image\/png;base64,/, "");
+        }
+      }, 4000);
+    } catch (e) {
+      window.__canvasResult = "";
+    }
+  });
+  const base64 = await pollForResult(browser3, "__canvasResult");
+  if (!base64) {
+    throw new Error("Canvas screenshot capture returned empty");
+  }
+  return base64;
+}
+async function pollForResult(browser3, key, intervalMs = 100, maxMs = 5000) {
+  const start = Date.now();
+  while (Date.now() - start < maxMs) {
+    const val3 = await browser3.execute((k) => window[k], key);
+    if (val3 !== undefined)
+      return val3;
+    await new Promise((r) => setTimeout(r, intervalMs));
+  }
+  const val2 = await browser3.execute((k) => window[k], key);
+  return val2 ?? "";
+}
 
 // src/commands/snapshot.ts
 import { writeFile as writeFile2 } from "fs/promises";
@@ -121285,12 +121385,21 @@ async function screenshot2(options = {}) {
     data2 = await withTimeout2(captureWithHtml2Canvas2(browser3), timeout, "html2canvas timed out");
     method = "html2canvas";
   } catch (err) {
-    console.error(`html2canvas failed: ${err}, trying native...`);
+    console.error(`html2canvas failed: ${err}, trying canvas fallback...`);
     try {
-      data2 = await withTimeout2(browser3.takeScreenshot(), timeout, `Native screenshot timed out after ${timeout}ms`);
-      method = "native";
-    } catch (nativeErr) {
-      throw new Error(`All screenshot methods failed: ${err}, ${nativeErr}`);
+      data2 = await withTimeout2(captureWithCanvas2(browser3), timeout, "Canvas screenshot timed out");
+      method = "canvas";
+    } catch (canvasErr) {
+      if (getXvfbDisplay() !== null) {
+        throw new Error(`All screenshot methods failed in Xvfb: html2canvas: ${err}, canvas: ${canvasErr}`);
+      }
+      console.error(`Canvas failed: ${canvasErr}, trying native...`);
+      try {
+        data2 = await withTimeout2(browser3.takeScreenshot(), timeout, `Native screenshot timed out after ${timeout}ms`);
+        method = "native";
+      } catch (nativeErr) {
+        throw new Error(`All screenshot methods failed: html2canvas: ${err}, canvas: ${canvasErr}, native: ${nativeErr}`);
+      }
     }
   }
   if (options.output) {
@@ -121335,10 +121444,11 @@ async function captureWithHtml2Canvas2(browser3) {
     throw new Error("Failed to load html2canvas from CDN");
   }
   await new Promise((r) => setTimeout(r, 50));
-  const base64 = await browser3.executeAsync((done) => {
+  await browser3.execute(() => {
+    window.__h2cResult = undefined;
     const h2c = window.html2canvas;
     if (!h2c) {
-      done("");
+      window.__h2cResult = "";
       return;
     }
     h2c(document.body, {
@@ -121348,15 +121458,92 @@ async function captureWithHtml2Canvas2(browser3) {
       backgroundColor: "#ffffff"
     }).then((canvas) => {
       const dataUrl = canvas.toDataURL("image/png");
-      done(dataUrl.replace(/^data:image\/png;base64,/, ""));
-    }).catch(() => done(""));
-    setTimeout(() => done(""), 4000);
+      window.__h2cResult = dataUrl.replace(/^data:image\/png;base64,/, "");
+    }).catch(() => {
+      window.__h2cResult = "";
+    });
+    setTimeout(() => {
+      if (window.__h2cResult === undefined) {
+        window.__h2cResult = "";
+      }
+    }, 4000);
   });
+  const base64 = await pollForResult2(browser3, "__h2cResult");
   if (!base64) {
     throw new Error("html2canvas capture returned empty");
   }
   return base64;
 }
+async function captureWithCanvas2(browser3) {
+  await browser3.execute(() => {
+    window.__canvasResult = undefined;
+    try {
+      const w2 = window.innerWidth || 800;
+      const h = window.innerHeight || 600;
+      const canvas = document.createElement("canvas");
+      canvas.width = w2;
+      canvas.height = h;
+      const ctx = canvas.getContext("2d");
+      ctx.fillStyle = "#ffffff";
+      ctx.fillRect(0, 0, w2, h);
+      const serializer = new XMLSerializer;
+      const cloned = document.documentElement.cloneNode(true);
+      const html3 = serializer.serializeToString(cloned);
+      const svg = `<svg xmlns="http://www.w3.org/2000/svg" width="${w2}" height="${h}">
+        <foreignObject width="100%" height="100%">
+          ${html3}
+        </foreignObject>
+      </svg>`;
+      const blob = new Blob([svg], { type: "image/svg+xml;charset=utf-8" });
+      const url2 = URL.createObjectURL(blob);
+      const img = new Image;
+      img.onload = () => {
+        ctx.drawImage(img, 0, 0);
+        URL.revokeObjectURL(url2);
+        const dataUrl = canvas.toDataURL("image/png");
+        window.__canvasResult = dataUrl.replace(/^data:image\/png;base64,/, "");
+      };
+      img.onerror = () => {
+        URL.revokeObjectURL(url2);
+        ctx.fillStyle = "#000000";
+        ctx.font = "16px monospace";
+        const text3 = document.body.innerText || "";
+        const lines = text3.split(`
+`);
+        for (let i = 0;i < lines.length && i < 40; i++) {
+          ctx.fillText(lines[i], 10, 20 + i * 20);
+        }
+        const dataUrl = canvas.toDataURL("image/png");
+        window.__canvasResult = dataUrl.replace(/^data:image\/png;base64,/, "");
+      };
+      img.src = url2;
+      setTimeout(() => {
+        if (window.__canvasResult === undefined) {
+          const dataUrl = canvas.toDataURL("image/png");
+          window.__canvasResult = dataUrl.replace(/^data:image\/png;base64,/, "");
+        }
+      }, 4000);
+    } catch (e) {
+      window.__canvasResult = "";
+    }
+  });
+  const base64 = await pollForResult2(browser3, "__canvasResult");
+  if (!base64) {
+    throw new Error("Canvas screenshot capture returned empty");
+  }
+  return base64;
+}
+async function pollForResult2(browser3, key, intervalMs = 100, maxMs = 5000) {
+  const start = Date.now();
+  while (Date.now() - start < maxMs) {
+    const val3 = await browser3.execute((k) => window[k], key);
+    if (val3 !== undefined)
+      return val3;
+    await new Promise((r) => setTimeout(r, intervalMs));
+  }
+  const val2 = await browser3.execute((k) => window[k], key);
+  return val2 ?? "";
+}
 
 // src/commands/snapshot.ts
 import { writeFile as writeFile4 } from "fs/promises";
@@ -121649,6 +121836,9 @@ async function executeCommand(cmd, globalAutoWait) {
   console.error(`[${new Date().toISOString()}] activateWindow took ${Date.now() - activateStart}ms`);
   const cmdStart = Date.now();
   let result;
+  if (cmd.cmd === "screenshot" || cmd.cmd === "snapshot") {
+    await injectKeepAlive();
+  }
   switch (cmd.cmd) {
     case "screenshot":
       result = await screenshot2({
@@ -122124,7 +122314,7 @@ async function waitForDisplay(display, timeoutMs = 1e4) {
   return false;
 }
 var xvfbProcess = null;
-var xvfbDisplay = null;
+var xvfbDisplay2 = null;
 async function startXvfb() {
   const display = findAvailableDisplay();
   const displayStr = `:${display}`;
@@ -122154,7 +122344,8 @@ async function startXvfb() {
     throw new Error(`Xvfb display ${displayStr} failed to start within timeout`);
   }
   console.error(`Xvfb ready on display ${displayStr}`);
-  xvfbDisplay = display;
+  xvfbDisplay2 = display;
+  process.env.TAURI_TEST_XVFB_DISPLAY = String(display);
   process.env.DISPLAY = displayStr;
   delete process.env.WAYLAND_DISPLAY;
   process.env.GDK_BACKEND = "x11";
@@ -122165,7 +122356,8 @@ function stopXvfb() {
     console.error("Stopping Xvfb...");
     xvfbProcess.kill("SIGTERM");
     xvfbProcess = null;
-    xvfbDisplay = null;
+    xvfbDisplay2 = null;
+    delete process.env.TAURI_TEST_XVFB_DISPLAY;
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tauri-test-cli",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "description": "CLI for testing Tauri applications with screenshot capture, DOM inspection, and user interaction simulation",
   "type": "module",
   "bin": {