tauri-test-cli 0.7.1 → 0.7.2

package/dist/cli.js

@@ -120910,6 +120910,11 @@ async function waitForInteractive(selector, timeout = 5000) {
 // 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;
 }
 
@@ -120988,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, {
@@ -121001,17 +121007,25 @@ 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) {
-  const base64 = await browser3.executeAsync((done) => {
+  await browser3.execute(() => {
+    window.__canvasResult = undefined;
     try {
       const w2 = window.innerWidth || 800;
       const h = window.innerHeight || 600;
@@ -121036,7 +121050,7 @@ async function captureWithCanvas(browser3) {
         ctx.drawImage(img, 0, 0);
         URL.revokeObjectURL(url2);
         const dataUrl = canvas.toDataURL("image/png");
-        done(dataUrl.replace(/^data:image\/png;base64,/, ""));
+        window.__canvasResult = dataUrl.replace(/^data:image\/png;base64,/, "");
       };
       img.onerror = () => {
         URL.revokeObjectURL(url2);
@@ -121049,22 +121063,36 @@ async function captureWithCanvas(browser3) {
           ctx.fillText(lines[i], 10, 20 + i * 20);
         }
         const dataUrl = canvas.toDataURL("image/png");
-        done(dataUrl.replace(/^data:image\/png;base64,/, ""));
+        window.__canvasResult = dataUrl.replace(/^data:image\/png;base64,/, "");
       };
       img.src = url2;
       setTimeout(() => {
-        const dataUrl = canvas.toDataURL("image/png");
-        done(dataUrl.replace(/^data:image\/png;base64,/, ""));
+        if (window.__canvasResult === undefined) {
+          const dataUrl = canvas.toDataURL("image/png");
+          window.__canvasResult = dataUrl.replace(/^data:image\/png;base64,/, "");
+        }
       }, 4000);
     } catch (e) {
-      done("");
+      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";
@@ -121416,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, {
@@ -121429,17 +121458,25 @@ 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) {
-  const base64 = await browser3.executeAsync((done) => {
+  await browser3.execute(() => {
+    window.__canvasResult = undefined;
     try {
       const w2 = window.innerWidth || 800;
       const h = window.innerHeight || 600;
@@ -121464,7 +121501,7 @@ async function captureWithCanvas2(browser3) {
         ctx.drawImage(img, 0, 0);
         URL.revokeObjectURL(url2);
         const dataUrl = canvas.toDataURL("image/png");
-        done(dataUrl.replace(/^data:image\/png;base64,/, ""));
+        window.__canvasResult = dataUrl.replace(/^data:image\/png;base64,/, "");
       };
       img.onerror = () => {
         URL.revokeObjectURL(url2);
@@ -121477,22 +121514,36 @@ async function captureWithCanvas2(browser3) {
           ctx.fillText(lines[i], 10, 20 + i * 20);
         }
         const dataUrl = canvas.toDataURL("image/png");
-        done(dataUrl.replace(/^data:image\/png;base64,/, ""));
+        window.__canvasResult = dataUrl.replace(/^data:image\/png;base64,/, "");
       };
       img.src = url2;
       setTimeout(() => {
-        const dataUrl = canvas.toDataURL("image/png");
-        done(dataUrl.replace(/^data:image\/png;base64,/, ""));
+        if (window.__canvasResult === undefined) {
+          const dataUrl = canvas.toDataURL("image/png");
+          window.__canvasResult = dataUrl.replace(/^data:image\/png;base64,/, "");
+        }
       }, 4000);
     } catch (e) {
-      done("");
+      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";
@@ -122294,6 +122345,7 @@ async function startXvfb() {
   }
   console.error(`Xvfb ready on display ${displayStr}`);
   xvfbDisplay2 = display;
+  process.env.TAURI_TEST_XVFB_DISPLAY = String(display);
   process.env.DISPLAY = displayStr;
   delete process.env.WAYLAND_DISPLAY;
   process.env.GDK_BACKEND = "x11";
@@ -122305,6 +122357,7 @@ function stopXvfb() {
     xvfbProcess.kill("SIGTERM");
     xvfbProcess = null;
     xvfbDisplay2 = null;
+    delete process.env.TAURI_TEST_XVFB_DISPLAY;
   }
 }
 

package/package.json

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