tauri-test-cli 0.4.1 → 0.6.0

package/dist/cli.js

@@ -11320,7 +11320,7 @@ var require_async = __commonJS((exports, module) => {
       return awaitable;
     }
     function applyEach$1(eachfn) {
-      return function applyEach(fns, ...callArgs) {
+      return function applyEach2(fns, ...callArgs) {
         const go = awaitify(function(callback) {
           var that = this;
           return eachfn(fns, (fn, cb) => {
@@ -13720,9 +13720,9 @@ GFS4: `);
     function readdir(path, options, cb) {
       if (typeof options === "function")
         cb = options, options = null;
-      var go$readdir = noReaddirOptionVersions.test(process.version) ? function go$readdir(path2, options2, cb2, startTime) {
+      var go$readdir = noReaddirOptionVersions.test(process.version) ? function go$readdir2(path2, options2, cb2, startTime) {
         return fs$readdir(path2, fs$readdirCallback(path2, options2, cb2, startTime));
-      } : function go$readdir(path2, options2, cb2, startTime) {
+      } : function go$readdir2(path2, options2, cb2, startTime) {
         return fs$readdir(path2, options2, fs$readdirCallback(path2, options2, cb2, startTime));
       };
       return go$readdir(path, options, cb);
@@ -17462,9 +17462,9 @@ var require_util3 = __commonJS((exports, module) => {
   var AbortController2 = globalThis.AbortController || require_abort_controller().AbortController;
   var AsyncFunction = Object.getPrototypeOf(async function() {}).constructor;
   var Blob2 = globalThis.Blob || bufferModule.Blob;
-  var isBlob = typeof Blob2 !== "undefined" ? function isBlob(b) {
+  var isBlob = typeof Blob2 !== "undefined" ? function isBlob2(b) {
     return b instanceof Blob2;
-  } : function isBlob(b) {
+  } : function isBlob2(b) {
     return false;
   };
   var validateAbortSignal = (signal, name) => {
@@ -20945,9 +20945,9 @@ var require_duplexify = __commonJS((exports, module) => {
   var { createDeferredPromise } = require_util3();
   var from = require_from();
   var Blob2 = globalThis.Blob || bufferModule.Blob;
-  var isBlob = typeof Blob2 !== "undefined" ? function isBlob(b) {
+  var isBlob = typeof Blob2 !== "undefined" ? function isBlob2(b) {
     return b instanceof Blob2;
-  } : function isBlob(b) {
+  } : function isBlob2(b) {
     return false;
   };
   var AbortController2 = globalThis.AbortController || require_abort_controller().AbortController;
@@ -22123,7 +22123,7 @@ var require_operators = __commonJS((exports, module) => {
     validateInteger(concurrency, "options.concurrency", 1);
     validateInteger(highWaterMark, "options.highWaterMark", 0);
     highWaterMark += concurrency;
-    return async function* map() {
+    return async function* map2() {
       const signal = require_util3().AbortSignalAny([options === null || options === undefined ? undefined : options.signal].filter(Boolean2));
       const stream = this;
       const queue = [];
@@ -22229,7 +22229,7 @@ var require_operators = __commonJS((exports, module) => {
     if ((options === null || options === undefined ? undefined : options.signal) != null) {
       validateAbortSignal(options.signal, "options.signal");
     }
-    return async function* asIndexedPairs() {
+    return async function* asIndexedPairs2() {
       let index = 0;
       for await (const val of this) {
         var _options$signal;
@@ -22368,7 +22368,7 @@ var require_operators = __commonJS((exports, module) => {
   }
   function flatMap(fn, options) {
     const values = map.call(this, fn, options);
-    return async function* flatMap() {
+    return async function* flatMap2() {
       for await (const val of values) {
         yield* val;
       }
@@ -22392,7 +22392,7 @@ var require_operators = __commonJS((exports, module) => {
       validateAbortSignal(options.signal, "options.signal");
     }
     number = toIntegerOrInfinity(number);
-    return async function* drop() {
+    return async function* drop2() {
       var _options$signal5;
       if (options !== null && options !== undefined && (_options$signal5 = options.signal) !== null && _options$signal5 !== undefined && _options$signal5.aborted) {
         throw new AbortError;
@@ -22416,7 +22416,7 @@ var require_operators = __commonJS((exports, module) => {
       validateAbortSignal(options.signal, "options.signal");
     }
     number = toIntegerOrInfinity(number);
-    return async function* take() {
+    return async function* take2() {
       var _options$signal7;
       if (options !== null && options !== undefined && (_options$signal7 = options.signal) !== null && _options$signal7 !== undefined && _options$signal7.aborted) {
         throw new AbortError;
@@ -40369,7 +40369,7 @@ var require_util7 = __commonJS((exports, module) => {
         writable: true,
         enumerable: true,
         configurable: true,
-        value: function forEach(callbackfn, thisArg = globalThis) {
+        value: function forEach2(callbackfn, thisArg = globalThis) {
           webidl.brandCheck(this, object);
           webidl.argumentLengthCheck(arguments, 1, `${name}.forEach`);
           if (typeof callbackfn !== "function") {
@@ -55307,7 +55307,7 @@ var require_css_value = __commonJS((exports, module) => {
 
 // node_modules/rgb2hex/index.js
 var require_rgb2hex = __commonJS((exports, module) => {
-  var rgb2hex = module.exports = function rgb2hex(color) {
+  var rgb2hex = module.exports = function rgb2hex2(color) {
     if (typeof color !== "string") {
       throw new Error("color has to be type of `string`");
     } else if (color.substr(0, 1) === "#") {
@@ -55882,7 +55882,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
     entries: function entries() {
       return properties;
     },
-    forEach: function forEach(fn) {
+    forEach: function forEach2(fn) {
       var thisArg = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
       for (var _i = 0, _properties = properties;_i < _properties.length; _i++) {
         var _properties$_i = _slicedToArray(_properties[_i], 2), key = _properties$_i[0], values = _properties$_i[1];
@@ -55906,8 +55906,8 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
     },
     values: function values() {
       return properties.map(function(_ref3) {
-        var _ref4 = _slicedToArray(_ref3, 2), values = _ref4[1];
-        return values;
+        var _ref4 = _slicedToArray(_ref3, 2), values2 = _ref4[1];
+        return values2;
       });
     }
   };
@@ -56238,7 +56238,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
     entries: function entries() {
       return dom;
     },
-    forEach: function forEach(fn) {
+    forEach: function forEach2(fn) {
       var thisArg = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
       for (var _i = 0, _dom = dom;_i < _dom.length; _i++) {
         var _dom$_i = _slicedToArray(_dom[_i], 2), key = _dom$_i[0], values = _dom$_i[1];
@@ -56262,8 +56262,8 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
     },
     values: function values() {
       return dom.map(function(_ref3) {
-        var _ref4 = _slicedToArray(_ref3, 2), values = _ref4[1];
-        return values;
+        var _ref4 = _slicedToArray(_ref3, 2), values2 = _ref4[1];
+        return values2;
       });
     }
   };
@@ -61489,10 +61489,10 @@ var require_rolesMap = __commonJS((exports) => {
     if (!t) {
       if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && typeof r.length == "number") {
         t && (r = t);
-        var _n = 0, F2 = function F() {};
+        var _n = 0, F2 = function F3() {};
         return { s: F2, n: function n() {
           return _n >= r.length ? { done: true } : { done: false, value: r[_n++] };
-        }, e: function e(r2) {
+        }, e: function e2(r2) {
           throw r2;
         }, f: F2 };
       }
@@ -61505,7 +61505,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
     }, n: function n() {
       var r2 = t.next();
       return a2 = r2.done, r2;
-    }, e: function e(r2) {
+    }, e: function e2(r2) {
       u = true, o = r2;
     }, f: function f() {
       try {
@@ -61576,7 +61576,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
         var superClassIter = _step.value;
         var _iterator2 = _createForOfIteratorHelper(superClassIter), _step2;
         try {
-          var _loop = function _loop() {
+          var _loop = function _loop2() {
             var superClassName = _step2.value;
             var superClassRoleTuple = roles.filter(function(_ref3) {
               var _ref4 = _slicedToArray(_ref3, 1), name = _ref4[0];
@@ -61611,7 +61611,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
     entries: function entries() {
       return roles;
     },
-    forEach: function forEach(fn) {
+    forEach: function forEach2(fn) {
       var thisArg = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
       var _iterator3 = _createForOfIteratorHelper(roles), _step3;
       try {
@@ -61642,8 +61642,8 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
     },
     values: function values() {
       return roles.map(function(_ref7) {
-        var _ref8 = _slicedToArray(_ref7, 2), values = _ref8[1];
-        return values;
+        var _ref8 = _slicedToArray(_ref7, 2), values2 = _ref8[1];
+        return values2;
       });
     }
   };
@@ -61719,7 +61719,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
     role = _rolesMap.default.get(key);
     if (role) {
       concepts = [].concat(role.baseConcepts, role.relatedConcepts);
-      _loop = function _loop() {
+      _loop = function _loop2() {
         var relation = concepts[k];
         if (relation.module === "HTML") {
           var concept = relation.concept;
@@ -61764,7 +61764,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
     entries: function entries() {
       return elementRoles;
     },
-    forEach: function forEach(fn) {
+    forEach: function forEach2(fn) {
       var thisArg = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
       for (var _i2 = 0, _elementRoles = elementRoles;_i2 < _elementRoles.length; _i2++) {
         var _elementRoles$_i = _slicedToArray(_elementRoles[_i2], 2), _key = _elementRoles$_i[0], values = _elementRoles$_i[1];
@@ -61780,7 +61780,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
     has: function has(key2) {
       return !!elementRoleMap.get(key2);
     },
-    keys: function keys() {
+    keys: function keys2() {
       return elementRoles.map(function(_ref) {
         var _ref2 = _slicedToArray(_ref, 1), key2 = _ref2[0];
         return key2;
@@ -61788,8 +61788,8 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
     },
     values: function values() {
       return elementRoles.map(function(_ref3) {
-        var _ref4 = _slicedToArray(_ref3, 2), values = _ref4[1];
-        return values;
+        var _ref4 = _slicedToArray(_ref3, 2), values2 = _ref4[1];
+        return values2;
       });
     }
   };
@@ -61949,7 +61949,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
     entries: function entries() {
       return roleElement;
     },
-    forEach: function forEach(fn) {
+    forEach: function forEach2(fn) {
       var thisArg = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
       for (var _i = 0, _roleElement = roleElement;_i < _roleElement.length; _i++) {
         var _roleElement$_i = _slicedToArray(_roleElement[_i], 2), _key = _roleElement$_i[0], values = _roleElement$_i[1];
@@ -61965,7 +61965,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
     has: function has(key2) {
       return !!roleElementMap.get(key2);
     },
-    keys: function keys() {
+    keys: function keys2() {
       return roleElement.map(function(_ref) {
         var _ref2 = _slicedToArray(_ref, 1), key2 = _ref2[0];
         return key2;
@@ -61973,8 +61973,8 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
     },
     values: function values() {
       return roleElement.map(function(_ref3) {
-        var _ref4 = _slicedToArray(_ref3, 2), values = _ref4[1];
-        return values;
+        var _ref4 = _slicedToArray(_ref3, 2), values2 = _ref4[1];
+        return values2;
       });
     }
   };
@@ -66247,7 +66247,7 @@ var init_filters = __esm(() => {
   import_boolbase3 = __toESM(require_boolbase(), 1);
   filters = {
     contains(next, text2, { adapter }) {
-      return function contains(elem) {
+      return function contains2(elem) {
         return next(elem) && adapter.getText(elem).includes(text2);
       };
     },
@@ -67381,7 +67381,7 @@ var init_traversing = __esm(() => {
 
 // node_modules/cheerio/dist/esm/parse.js
 function getParse(parser) {
-  return function parse(content, options, isDocument2, context) {
+  return function parse5(content, options, isDocument2, context) {
     if (typeof Buffer !== "undefined" && Buffer.isBuffer(content)) {
       content = content.toString();
     }
@@ -75540,7 +75540,7 @@ var init_parser = __esm(() => {
 
 // node_modules/parse5/node_modules/entities/dist/esm/escape.js
 function getEscaper2(regex2, map3) {
-  return function escape(data2) {
+  return function escape2(data2) {
     let match;
     let lastIndex = 0;
     let result = "";
@@ -85512,7 +85512,7 @@ var require_util15 = __commonJS((exports, module) => {
         writable: true,
         enumerable: true,
         configurable: true,
-        value: function forEach(callbackfn, thisArg = globalThis) {
+        value: function forEach2(callbackfn, thisArg = globalThis) {
           webidl.brandCheck(this, object);
           webidl.argumentLengthCheck(arguments, 1, `${name}.forEach`);
           if (typeof callbackfn !== "function") {
@@ -99816,7 +99816,7 @@ var require_frame2 = __commonJS((exports, module) => {
   var BUFFER_SIZE = 8 * 1024;
   var buffer = null;
   var bufIdx = BUFFER_SIZE;
-  var randomFillSync = runtimeFeatures.has("crypto") ? __require("node:crypto").randomFillSync : function randomFillSync(buffer2, _offset, _size) {
+  var randomFillSync = runtimeFeatures.has("crypto") ? __require("node:crypto").randomFillSync : function randomFillSync2(buffer2, _offset, _size) {
     for (let i = 0;i < buffer2.length; ++i) {
       buffer2[i] = Math.random() * 255 | 0;
     }
@@ -102311,8 +102311,11 @@ var init_esm11 = __esm(() => {
   };
 });
 
+// src/cli.ts
+import { resolve } from "path";
+
 // src/driver.ts
-import { spawn } from "child_process";
+import { spawn, execSync } from "child_process";
 
 // node_modules/webdriverio/build/node.js
 var import_jszip = __toESM(require_lib3(), 1);
@@ -120571,17 +120574,78 @@ import { homedir } from "os";
 import { join } from "path";
 var driverProcess = null;
 var browser = null;
+var exitHandlerRegistered = false;
 var DRIVER_PORT = 4444;
 var DRIVER_HOST = "127.0.0.1";
+function getDescendantPids(pid) {
+  try {
+    const children2 = execSync(`pgrep -P ${pid} 2>/dev/null`, { encoding: "utf8" }).trim().split(`
+`).filter(Boolean).map(Number);
+    const descendants = [];
+    for (const child of children2) {
+      descendants.push(child, ...getDescendantPids(child));
+    }
+    return descendants;
+  } catch {
+    return [];
+  }
+}
+function killProcessTree(pid, signal = "SIGKILL") {
+  const descendants = getDescendantPids(pid);
+  for (const child of descendants.reverse()) {
+    try {
+      process.kill(child, signal);
+    } catch {}
+  }
+  try {
+    process.kill(pid, signal);
+  } catch {}
+}
+function forceKillDriver() {
+  if (driverProcess?.pid) {
+    killProcessTree(driverProcess.pid);
+    driverProcess = null;
+  }
+}
+function killStaleDriver() {
+  let killed = false;
+  for (const port of [DRIVER_PORT, DRIVER_PORT + 1]) {
+    try {
+      const pids = execSync(`lsof -ti:${port} 2>/dev/null`, { encoding: "utf8" }).trim();
+      if (pids) {
+        for (const pidStr of pids.split(`
+`)) {
+          const pid = parseInt(pidStr);
+          if (pid) {
+            killProcessTree(pid);
+            killed = true;
+          }
+        }
+      }
+    } catch {}
+  }
+  if (killed) {
+    execSync("sleep 0.5");
+  }
+}
 async function startDriver() {
   if (driverProcess) {
     return;
   }
+  killStaleDriver();
   const tauriDriverPath = join(homedir(), ".cargo", "bin", "tauri-driver");
   return new Promise((resolve, reject) => {
-    driverProcess = spawn(tauriDriverPath, [], {
-      stdio: ["ignore", "pipe", "pipe"]
+    driverProcess = spawn("setsid", [
+      "sh",
+      "-c",
+      `"${tauriDriverPath}" & PID=$!; trap "kill 0 2>/dev/null" EXIT; read; exit`
+    ], {
+      stdio: ["pipe", "pipe", "pipe"]
     });
+    if (!exitHandlerRegistered) {
+      exitHandlerRegistered = true;
+      process.on("exit", forceKillDriver);
+    }
     driverProcess.on("error", (err) => {
       reject(new Error(`Failed to start tauri-driver: ${err.message}`));
     });
@@ -120602,8 +120666,8 @@ async function startDriver() {
   });
 }
 function stopDriver() {
-  if (driverProcess) {
-    driverProcess.kill();
+  if (driverProcess?.pid) {
+    killProcessTree(driverProcess.pid);
     driverProcess = null;
   }
 }
@@ -120653,22 +120717,83 @@ async function disconnect() {
 import { writeFile } from "fs/promises";
 
 // src/driver.ts
-import { spawn as spawn2 } from "child_process";
+import { spawn as spawn2, execSync as execSync2 } from "child_process";
 import { homedir as homedir2 } from "os";
 import { join as join2 } from "path";
 var driverProcess2 = null;
 var browser2 = null;
+var exitHandlerRegistered2 = false;
 var DRIVER_PORT2 = 4444;
 var DRIVER_HOST2 = "127.0.0.1";
+function getDescendantPids2(pid) {
+  try {
+    const children2 = execSync2(`pgrep -P ${pid} 2>/dev/null`, { encoding: "utf8" }).trim().split(`
+`).filter(Boolean).map(Number);
+    const descendants = [];
+    for (const child of children2) {
+      descendants.push(child, ...getDescendantPids2(child));
+    }
+    return descendants;
+  } catch {
+    return [];
+  }
+}
+function killProcessTree2(pid, signal = "SIGKILL") {
+  const descendants = getDescendantPids2(pid);
+  for (const child of descendants.reverse()) {
+    try {
+      process.kill(child, signal);
+    } catch {}
+  }
+  try {
+    process.kill(pid, signal);
+  } catch {}
+}
+function forceKillDriver2() {
+  if (driverProcess2?.pid) {
+    killProcessTree2(driverProcess2.pid);
+    driverProcess2 = null;
+  }
+}
+function killStaleDriver2() {
+  let killed = false;
+  for (const port of [DRIVER_PORT2, DRIVER_PORT2 + 1]) {
+    try {
+      const pids = execSync2(`lsof -ti:${port} 2>/dev/null`, { encoding: "utf8" }).trim();
+      if (pids) {
+        for (const pidStr of pids.split(`
+`)) {
+          const pid = parseInt(pidStr);
+          if (pid) {
+            killProcessTree2(pid);
+            killed = true;
+          }
+        }
+      }
+    } catch {}
+  }
+  if (killed) {
+    execSync2("sleep 0.5");
+  }
+}
 async function startDriver2() {
   if (driverProcess2) {
     return;
   }
+  killStaleDriver2();
   const tauriDriverPath = join2(homedir2(), ".cargo", "bin", "tauri-driver");
   return new Promise((resolve, reject) => {
-    driverProcess2 = spawn2(tauriDriverPath, [], {
-      stdio: ["ignore", "pipe", "pipe"]
+    driverProcess2 = spawn2("setsid", [
+      "sh",
+      "-c",
+      `"${tauriDriverPath}" & PID=$!; trap "kill 0 2>/dev/null" EXIT; read; exit`
+    ], {
+      stdio: ["pipe", "pipe", "pipe"]
     });
+    if (!exitHandlerRegistered2) {
+      exitHandlerRegistered2 = true;
+      process.on("exit", forceKillDriver2);
+    }
     driverProcess2.on("error", (err) => {
       reject(new Error(`Failed to start tauri-driver: ${err.message}`));
     });
@@ -120688,12 +120813,6 @@ async function startDriver2() {
     setTimeout(() => resolve(), 1000);
   });
 }
-function stopDriver2() {
-  if (driverProcess2) {
-    driverProcess2.kill();
-    driverProcess2 = null;
-  }
-}
 async function waitForPageLoad2(browser3, timeout = 1e4) {
   const start = Date.now();
   while (Date.now() - start < timeout) {
@@ -120731,13 +120850,6 @@ async function connect2(options) {
 function getBrowser() {
   return browser2;
 }
-async function disconnect2() {
-  if (browser2) {
-    await browser2.deleteSession();
-    browser2 = null;
-  }
-  stopDriver2();
-}
 function requireBrowser() {
   if (!browser2) {
     throw new Error("Not connected. Run 'tauri-test-cli connect' first.");
@@ -121158,6 +121270,7 @@ async function evaluate(script) {
 
 // src/server.ts
 import { createServer } from "http";
+import { readFileSync } from "fs";
 
 // src/commands/screenshot.ts
 import { writeFile as writeFile3 } from "fs/promises";
@@ -121675,12 +121788,10 @@ async function shutdown() {
     return;
   isShuttingDown = true;
   console.error("Shutting down...");
+  forceKillDriver2();
   if (serverInstance) {
     serverInstance.close();
   }
-  try {
-    await disconnect2();
-  } catch {}
   process.exit(0);
 }
 async function injectKeepAlive() {
@@ -121714,6 +121825,36 @@ async function startServer(options) {
   const { port, appPath, waitTimeout, autoWait } = options;
   process.on("SIGINT", shutdown);
   process.on("SIGTERM", shutdown);
+  const getAncestorPids = () => {
+    const pids = [];
+    let pid = process.pid;
+    while (pid > 1) {
+      try {
+        const stat = readFileSync(`/proc/${pid}/stat`, "utf8");
+        const ppid = parseInt(stat.split(") ")[1].split(" ")[1]);
+        if (ppid <= 1)
+          break;
+        pids.push(ppid);
+        pid = ppid;
+      } catch {
+        break;
+      }
+    }
+    return pids;
+  };
+  const ancestorPids = getAncestorPids();
+  if (ancestorPids.length > 0) {
+    setInterval(() => {
+      for (const pid of ancestorPids) {
+        try {
+          process.kill(pid, 0);
+        } catch {
+          shutdown();
+          return;
+        }
+      }
+    }, 500);
+  }
   console.error(`Launching app and waiting for load (timeout: ${waitTimeout}ms)...`);
   await connect2({ appPath, waitTimeout });
   console.error("App loaded successfully.");
@@ -121740,7 +121881,7 @@ async function startServer(options) {
 }
 
 // src/checks.ts
-import { execSync } from "child_process";
+import { execSync as execSync3 } from "child_process";
 import os4 from "os";
 var reset = "\x1B[0m";
 var bold = "\x1B[1m";
@@ -121751,7 +121892,7 @@ var dim = "\x1B[2m";
 function commandExists(cmd) {
   try {
     const checkCmd = os4.platform() === "win32" ? `where ${cmd} 2>nul` : `which ${cmd} 2>/dev/null`;
-    execSync(checkCmd, { stdio: "ignore" });
+    execSync3(checkCmd, { stdio: "ignore" });
     return true;
   } catch {
     return false;
@@ -121759,7 +121900,7 @@ function commandExists(cmd) {
 }
 function pkgConfigExists(pkg) {
   try {
-    execSync(`pkg-config --modversion ${pkg}`, { stdio: "ignore" });
+    execSync3(`pkg-config --modversion ${pkg}`, { stdio: "ignore" });
     return true;
   } catch {
     return false;
@@ -121848,7 +121989,7 @@ function printDependencyStatus() {
 }
 
 // src/commands/utils.ts
-import { execSync as execSync2, spawn as spawn3 } from "child_process";
+import { execSync as execSync4, spawn as spawn3 } from "child_process";
 import os5 from "os";
 var reset2 = "\x1B[0m";
 var bold2 = "\x1B[1m";
@@ -121862,7 +122003,7 @@ async function setup() {
   console.log();
   try {
     try {
-      execSync2("cargo --version", { stdio: "ignore" });
+      execSync4("cargo --version", { stdio: "ignore" });
     } catch {
       return {
         success: false,
@@ -121925,7 +122066,7 @@ async function cleanup() {
   if (platform === "win32") {
     for (const pattern of processPatterns) {
       try {
-        execSync2(`taskkill /F /IM ${pattern}.exe 2>nul`, { stdio: "ignore" });
+        execSync4(`taskkill /F /IM ${pattern}.exe 2>nul`, { stdio: "ignore" });
         killed.push(pattern);
         console.log(`  ${green2}✓${reset2} Killed ${pattern}`);
       } catch {
@@ -121935,7 +122076,7 @@ async function cleanup() {
   } else {
     for (const pattern of processPatterns) {
       try {
-        execSync2(`pkill -f "${pattern}"`, { stdio: "ignore" });
+        execSync4(`pkill -f "${pattern}"`, { stdio: "ignore" });
         killed.push(pattern);
         console.log(`  ${green2}✓${reset2} Killed ${pattern}`);
       } catch {
@@ -121956,7 +122097,7 @@ function checkXvfb() {
     return false;
   }
   try {
-    execSync2("which Xvfb", { stdio: "ignore" });
+    execSync4("which Xvfb", { stdio: "ignore" });
     return true;
   } catch {
     return false;
@@ -121967,7 +122108,7 @@ function findAvailableDisplay() {
     const lockFile = `/tmp/.X${display}-lock`;
     const socketFile = `/tmp/.X11-unix/X${display}`;
     try {
-      execSync2(`test -e ${lockFile} || test -e ${socketFile}`, { stdio: "ignore" });
+      execSync4(`test -e ${lockFile} || test -e ${socketFile}`, { stdio: "ignore" });
     } catch {
       return display;
     }
@@ -121980,7 +122121,7 @@ async function waitForDisplay(display, timeoutMs = 1e4) {
   const pollInterval = 100;
   while (Date.now() - startTime < timeoutMs) {
     try {
-      execSync2(`DISPLAY=${displayStr} xdpyinfo`, { stdio: "ignore", timeout: 1000 });
+      execSync4(`DISPLAY=${displayStr} xdpyinfo`, { stdio: "ignore", timeout: 1000 });
       return true;
     } catch {
       await new Promise((resolve) => setTimeout(resolve, pollInterval));
@@ -122021,6 +122162,8 @@ async function startXvfb() {
   console.error(`Xvfb ready on display ${displayStr}`);
   xvfbDisplay = display;
   process.env.DISPLAY = displayStr;
+  delete process.env.WAYLAND_DISPLAY;
+  process.env.GDK_BACKEND = "x11";
   return display;
 }
 function stopXvfb() {
@@ -122268,7 +122411,7 @@ async function executeCommand2(cmd, globalAutoWait) {
       }
       return await evaluate(cmd.script);
     case "sleep":
-      await new Promise((resolve) => setTimeout(resolve, cmd.ms ?? 1000));
+      await new Promise((resolve2) => setTimeout(resolve2, cmd.ms ?? 1000));
       return { slept: cmd.ms ?? 1000 };
     default:
       throw new Error(`Unknown command: ${cmd.cmd}`);
@@ -122340,7 +122483,7 @@ async function main() {
       process.exit(1);
     }
   }
-  const appPath = options.app;
+  const appPath = options.app ? resolve(options.app) : undefined;
   const jsonOutput = !!options.json;
   const port = options.port ? parseInt(options.port) : 9222;
   const clientModeCommands = ["screenshot", "snapshot", "click", "type", "wait", "eval"];

package/package.json

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

package/scripts/publish.sh

@@ -81,29 +81,34 @@ MINOR_VERSION="${major}.$((minor + 1)).0"
 MAJOR_VERSION="$((major + 1)).0.0"
 
 echo -e "${CYAN}Select version bump type:${NC}"
-echo "  1) patch  (${CURRENT_VERSION} -> ${PATCH_VERSION})"
-echo "  2) minor  (${CURRENT_VERSION} -> ${MINOR_VERSION})"
-echo "  3) major  (${CURRENT_VERSION} -> ${MAJOR_VERSION})"
-echo "  4) cancel"
+echo "  1) none   (keep ${CURRENT_VERSION})"
+echo "  2) patch  (${CURRENT_VERSION} -> ${PATCH_VERSION})"
+echo "  3) minor  (${CURRENT_VERSION} -> ${MINOR_VERSION})"
+echo "  4) major  (${CURRENT_VERSION} -> ${MAJOR_VERSION})"
+echo "  5) cancel"
 echo ""
 
-read -p "Enter choice [1-4]: " -n 1 -r CHOICE
+read -p "Enter choice [1-5]: " -n 1 -r CHOICE
 echo ""
 
 case $CHOICE in
     1)
+        BUMP_TYPE=""
+        NEW_VERSION="$CURRENT_VERSION"
+        ;;
+    2)
         BUMP_TYPE="patch"
         NEW_VERSION="$PATCH_VERSION"
         ;;
-    2)
+    3)
         BUMP_TYPE="minor"
         NEW_VERSION="$MINOR_VERSION"
         ;;
-    3)
+    4)
         BUMP_TYPE="major"
         NEW_VERSION="$MAJOR_VERSION"
         ;;
-    4|*)
+    5|*)
         echo -e "${YELLOW}Publish cancelled.${NC}"
         exit 0
         ;;
@@ -115,33 +120,39 @@ echo ""
 # STEP 3: Bump version
 # ============================================================================
 
-echo -e "${CYAN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
-echo -e "${GREEN}▶ Step 3: Bumping version to ${NEW_VERSION}...${NC}"
-echo -e "${CYAN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
-echo ""
+if [[ -n "$BUMP_TYPE" ]]; then
+    echo -e "${CYAN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
+    echo -e "${GREEN}▶ Step 3: Bumping version to ${NEW_VERSION}...${NC}"
+    echo -e "${CYAN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
+    echo ""
 
-./scripts/bump-version.sh "$BUMP_TYPE"
+    ./scripts/bump-version.sh "$BUMP_TYPE"
 
-# ============================================================================
-# STEP 4: Commit, tag, and push to GitHub
-# ============================================================================
+    # ============================================================================
+    # STEP 4: Commit, tag, and push to GitHub
+    # ============================================================================
 
-echo ""
-echo -e "${CYAN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
-echo -e "${GREEN}▶ Step 4: Pushing to GitHub...${NC}"
-echo -e "${CYAN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
-echo ""
+    echo ""
+    echo -e "${CYAN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
+    echo -e "${GREEN}▶ Step 4: Pushing to GitHub...${NC}"
+    echo -e "${CYAN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
+    echo ""
 
-echo -e "${BLUE}Committing changes...${NC}"
-git add pixi.toml package.json .claude-plugin/plugin.json
-git commit -m "Bump version to $NEW_VERSION"
+    echo -e "${BLUE}Committing changes...${NC}"
+    git add pixi.toml package.json .claude-plugin/plugin.json
+    git commit -m "Bump version to $NEW_VERSION"
 
-echo -e "${BLUE}Creating git tag v${NEW_VERSION}...${NC}"
-git tag "v${NEW_VERSION}"
+    echo -e "${BLUE}Creating git tag v${NEW_VERSION}...${NC}"
+    git tag "v${NEW_VERSION}"
 
-echo -e "${BLUE}Pushing to remote...${NC}"
-git push
-git push --tags
+    echo -e "${BLUE}Pushing to remote...${NC}"
+    git push
+    git push --tags
+else
+    echo -e "${CYAN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
+    echo -e "${GREEN}▶ Skipping version bump, keeping ${CURRENT_VERSION}${NC}"
+    echo -e "${CYAN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
+fi
 
 echo -e "${GREEN}✓ Pushed to GitHub${NC}"