@validate.qa/runner 1.0.75 → 1.0.77

package/dist/cli.js

@@ -353034,7 +353034,7 @@ var require_package4 = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@validate.qa/runner",
-      version: "1.0.75",
+      version: "1.0.77",
       description: "validate local test runner - execute Playwright tests on your machine, connected to validate.qa cloud.",
       bin: {
         "validate-runner": "dist/cli.js"
@@ -354700,17 +354700,13 @@ async function clickCssInCurrentContext(sessionPath, css) {
 }
 async function clickByVisibleTextInCurrentContext(sessionPath, text) {
   const script = `
+    if (!document.body) { return 0; }
     var t = String(arguments[0]).trim().replace(/\\s+/g, ' ');
-    var norm = function (e) { return (e.textContent || e.value || '').trim().replace(/\\s+/g, ' '); };
+    // String() coercion is load-bearing: e.value is a NUMBER for <progress>/
+    // <meter>/<li value>, and (70).trim() would throw, aborting the whole
+    // script (and thus the fallback) on any page containing one.
+    var norm = function (e) { return String(e.textContent || e.value || '').trim().replace(/\\s+/g, ' '); };
     var vis = function (e) { var r = e.getBoundingClientRect(); return r.width > 0 && r.height > 0; };
-    var all = Array.prototype.slice.call(document.body.getElementsByTagName('*'));
-    var match = all.filter(function (e) { return norm(e) === t && vis(e); });
-    // Deepest-only: drop any match that contains another match (same text).
-    var deepest = match.filter(function (e) {
-      return !match.some(function (o) { return o !== e && e.contains(o); });
-    });
-    if (deepest.length !== 1) { return deepest.length; }
-    var el = deepest[0];
     var interactive = function (e) {
       var tag = e.tagName;
       if (tag === 'BUTTON' || tag === 'A' || tag === 'INPUT' || tag === 'SELECT' || tag === 'SUMMARY') { return true; }
@@ -354719,6 +354715,33 @@ async function clickByVisibleTextInCurrentContext(sessionPath, text) {
       if (e.hasAttribute && (e.hasAttribute('onclick') || (e.hasAttribute('tabindex') && e.getAttribute('tabindex') !== '-1'))) { return true; }
       try { return window.getComputedStyle(e).cursor === 'pointer'; } catch (err) { return false; }
     };
+    // Is this match itself interactive, or wrapped by an interactive ancestor
+    // that contains ONLY this text?
+    var hasInteractiveHost = function (e) {
+      var hop = e;
+      for (var i = 0; i < 5 && hop && hop !== document.body; i++) {
+        if (norm(hop) !== t) { return false; }
+        if (interactive(hop)) { return true; }
+        hop = hop.parentElement;
+      }
+      return false;
+    };
+    var all = Array.prototype.slice.call(document.body.getElementsByTagName('*'));
+    var match = all.filter(function (e) { return norm(e) === t && vis(e); });
+    // Deepest-only: drop any match that contains another match (same text).
+    var deepest = match.filter(function (e) {
+      return !match.some(function (o) { return o !== e && e.contains(o); });
+    });
+    var candidates = deepest;
+    if (candidates.length > 1) {
+      // Disambiguate: a NON-interactive duplicate (page heading, badge, label
+      // echoing a control's caption) must not veto the one real control. Only
+      // when several INTERACTIVE hosts share the text is it truly ambiguous.
+      var interactiveOnly = candidates.filter(hasInteractiveHost);
+      if (interactiveOnly.length >= 1) { candidates = interactiveOnly; }
+    }
+    if (candidates.length !== 1) { return candidates.length; }
+    var el = candidates[0];
     // Prefer the outermost interactive ancestor that wraps ONLY this text.
     var target = el;
     var hop = el;
@@ -354892,6 +354915,7 @@ var QUARANTINE_MAX_MS = (() => {
   return Number.isFinite(raw) && raw > 0 ? raw : 10 * 60 * 1e3;
 })();
 var quarantinedAt = /* @__PURE__ */ new Map();
+var nextQuarantineToken = 1;
 var DeviceQuarantinedError = class extends Error {
   constructor(deviceId) {
     super(
@@ -354901,14 +354925,21 @@ var DeviceQuarantinedError = class extends Error {
   }
 };
 function quarantineDevice(deviceId, now = Date.now()) {
-  quarantinedAt.set(deviceId, now);
+  const token = nextQuarantineToken++;
+  quarantinedAt.set(deviceId, { at: now, token });
+  return token;
 }
-function unquarantineDevice(deviceId) {
-  quarantinedAt.delete(deviceId);
+function unquarantineDevice(deviceId, token) {
+  if (token === void 0) {
+    quarantinedAt.delete(deviceId);
+    return;
+  }
+  const entry = quarantinedAt.get(deviceId);
+  if (entry && entry.token === token) quarantinedAt.delete(deviceId);
 }
 function isDeviceQuarantined(deviceId, now = Date.now()) {
   if (typeof deviceId !== "string") return false;
-  const since = quarantinedAt.get(deviceId);
+  const since = quarantinedAt.get(deviceId)?.at;
   if (since === void 0) return false;
   if (now - since >= QUARANTINE_MAX_MS) {
     quarantinedAt.delete(deviceId);
@@ -357266,7 +357297,8 @@ async function executeTap(sessionId, step, platform3, isCrossPlatform = false) {
   const bounds = boundsForRun(step, platform3, isCrossPlatform);
   if (step.target) {
     try {
-      const elementId = await findElement(sessionId, step.target, isPermissionTap ? Math.min(readStepTimeout(step) ?? DEFAULT_STEP_TIMEOUT_MS, PERMISSION_DIALOG_TIMEOUT_MS) : readStepTimeout(step), {
+      const explicitTimeout = readStepTimeout(step);
+      const elementId = await findElement(sessionId, step.target, isPermissionTap ? explicitTimeout ?? PERMISSION_DIALOG_TIMEOUT_MS : explicitTimeout, {
         platform: platform3,
         recordedBounds: bounds
       });
@@ -358360,9 +358392,15 @@ let timer = null;
 async function post() {
   if (!url || !headers || !body) return; // inert until the first real heartbeat
   try {
+    // The keepalive discards the response body, so it must identify itself:
+    // the server's heartbeat handler destructively drains queued runner
+    // control commands (kill-pid/kill-orphans) into the response, and a
+    // drained command this worker throws away would be lost for a full
+    // re-issue window. The header tells the server to keep the queue intact
+    // and let the main loop (which executes commands) drain it.
     await fetch(url, {
       method: 'POST',
-      headers,
+      headers: { ...headers, 'x-validateqa-keepalive': '1' },
       body,
       signal: AbortSignal.timeout(10000),
     });
@@ -360700,6 +360738,7 @@ var MobileRunWatchdog = class {
   phase = "idle";
   released = false;
   quarantined = false;
+  quarantineToken;
   cancelAbortTimer = null;
   cancelGraceTimer = null;
   /** Current phase (exposed for tests / observability). */
@@ -360728,7 +360767,8 @@ var MobileRunWatchdog = class {
     this.clearAbortTimer();
     if (this.options.deviceId) {
       this.quarantined = true;
-      this.options.callbacks.quarantine(this.options.deviceId);
+      const token = this.options.callbacks.quarantine(this.options.deviceId);
+      this.quarantineToken = typeof token === "number" ? token : void 0;
       this.options.callbacks.abort(this.options.deviceId, this.options.runId, reason);
     } else {
       this.options.callbacks.log("warn", `Run ${this.options.runId} ${reason} \u2014 no leased device to abort; awaiting the run's own settle.`);
@@ -360753,7 +360793,7 @@ var MobileRunWatchdog = class {
     }
     if (this.quarantined && this.options.deviceId) {
       this.quarantined = false;
-      this.options.callbacks.unquarantine(this.options.deviceId);
+      this.options.callbacks.unquarantine(this.options.deviceId, this.quarantineToken);
       if (wasForceReleased) {
         this.options.callbacks.log("info", `Run ${this.options.runId} finally settled \u2014 lifted the quarantine on device ${this.options.deviceId}.`);
       }
@@ -360771,7 +360811,8 @@ var MobileRunWatchdog = class {
     if (this.options.deviceId) {
       if (!this.quarantined) {
         this.quarantined = true;
-        this.options.callbacks.quarantine(this.options.deviceId);
+        const token = this.options.callbacks.quarantine(this.options.deviceId);
+        this.quarantineToken = typeof token === "number" ? token : void 0;
       }
       this.options.callbacks.log(
         "warn",
@@ -364417,11 +364458,9 @@ async function startRunner(opts) {
                   if (sessionId) void deleteAppiumSession(sessionId);
                 },
                 release: applyRelease,
-                quarantine: (deviceId) => {
-                  quarantineDevice(deviceId);
-                },
-                unquarantine: (deviceId) => {
-                  unquarantineDevice(deviceId);
+                quarantine: (deviceId) => quarantineDevice(deviceId),
+                unquarantine: (deviceId, token) => {
+                  unquarantineDevice(deviceId, token);
                 },
                 log: (level, message) => {
                   if (level === "warn") log.warn(message);

package/dist/cli.mjs

@@ -353039,7 +353039,7 @@ var require_package4 = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "@validate.qa/runner",
-      version: "1.0.75",
+      version: "1.0.77",
       description: "validate local test runner - execute Playwright tests on your machine, connected to validate.qa cloud.",
       bin: {
         "validate-runner": "dist/cli.js"
@@ -354705,17 +354705,13 @@ async function clickCssInCurrentContext(sessionPath, css) {
 }
 async function clickByVisibleTextInCurrentContext(sessionPath, text) {
   const script = `
+    if (!document.body) { return 0; }
     var t = String(arguments[0]).trim().replace(/\\s+/g, ' ');
-    var norm = function (e) { return (e.textContent || e.value || '').trim().replace(/\\s+/g, ' '); };
+    // String() coercion is load-bearing: e.value is a NUMBER for <progress>/
+    // <meter>/<li value>, and (70).trim() would throw, aborting the whole
+    // script (and thus the fallback) on any page containing one.
+    var norm = function (e) { return String(e.textContent || e.value || '').trim().replace(/\\s+/g, ' '); };
     var vis = function (e) { var r = e.getBoundingClientRect(); return r.width > 0 && r.height > 0; };
-    var all = Array.prototype.slice.call(document.body.getElementsByTagName('*'));
-    var match = all.filter(function (e) { return norm(e) === t && vis(e); });
-    // Deepest-only: drop any match that contains another match (same text).
-    var deepest = match.filter(function (e) {
-      return !match.some(function (o) { return o !== e && e.contains(o); });
-    });
-    if (deepest.length !== 1) { return deepest.length; }
-    var el = deepest[0];
     var interactive = function (e) {
       var tag = e.tagName;
       if (tag === 'BUTTON' || tag === 'A' || tag === 'INPUT' || tag === 'SELECT' || tag === 'SUMMARY') { return true; }
@@ -354724,6 +354720,33 @@ async function clickByVisibleTextInCurrentContext(sessionPath, text) {
       if (e.hasAttribute && (e.hasAttribute('onclick') || (e.hasAttribute('tabindex') && e.getAttribute('tabindex') !== '-1'))) { return true; }
       try { return window.getComputedStyle(e).cursor === 'pointer'; } catch (err) { return false; }
     };
+    // Is this match itself interactive, or wrapped by an interactive ancestor
+    // that contains ONLY this text?
+    var hasInteractiveHost = function (e) {
+      var hop = e;
+      for (var i = 0; i < 5 && hop && hop !== document.body; i++) {
+        if (norm(hop) !== t) { return false; }
+        if (interactive(hop)) { return true; }
+        hop = hop.parentElement;
+      }
+      return false;
+    };
+    var all = Array.prototype.slice.call(document.body.getElementsByTagName('*'));
+    var match = all.filter(function (e) { return norm(e) === t && vis(e); });
+    // Deepest-only: drop any match that contains another match (same text).
+    var deepest = match.filter(function (e) {
+      return !match.some(function (o) { return o !== e && e.contains(o); });
+    });
+    var candidates = deepest;
+    if (candidates.length > 1) {
+      // Disambiguate: a NON-interactive duplicate (page heading, badge, label
+      // echoing a control's caption) must not veto the one real control. Only
+      // when several INTERACTIVE hosts share the text is it truly ambiguous.
+      var interactiveOnly = candidates.filter(hasInteractiveHost);
+      if (interactiveOnly.length >= 1) { candidates = interactiveOnly; }
+    }
+    if (candidates.length !== 1) { return candidates.length; }
+    var el = candidates[0];
     // Prefer the outermost interactive ancestor that wraps ONLY this text.
     var target = el;
     var hop = el;
@@ -354897,6 +354920,7 @@ var QUARANTINE_MAX_MS = (() => {
   return Number.isFinite(raw) && raw > 0 ? raw : 10 * 60 * 1e3;
 })();
 var quarantinedAt = /* @__PURE__ */ new Map();
+var nextQuarantineToken = 1;
 var DeviceQuarantinedError = class extends Error {
   constructor(deviceId) {
     super(
@@ -354906,14 +354930,21 @@ var DeviceQuarantinedError = class extends Error {
   }
 };
 function quarantineDevice(deviceId, now = Date.now()) {
-  quarantinedAt.set(deviceId, now);
+  const token = nextQuarantineToken++;
+  quarantinedAt.set(deviceId, { at: now, token });
+  return token;
 }
-function unquarantineDevice(deviceId) {
-  quarantinedAt.delete(deviceId);
+function unquarantineDevice(deviceId, token) {
+  if (token === void 0) {
+    quarantinedAt.delete(deviceId);
+    return;
+  }
+  const entry = quarantinedAt.get(deviceId);
+  if (entry && entry.token === token) quarantinedAt.delete(deviceId);
 }
 function isDeviceQuarantined(deviceId, now = Date.now()) {
   if (typeof deviceId !== "string") return false;
-  const since = quarantinedAt.get(deviceId);
+  const since = quarantinedAt.get(deviceId)?.at;
   if (since === void 0) return false;
   if (now - since >= QUARANTINE_MAX_MS) {
     quarantinedAt.delete(deviceId);
@@ -357274,7 +357305,8 @@ async function executeTap(sessionId, step, platform3, isCrossPlatform = false) {
   const bounds = boundsForRun(step, platform3, isCrossPlatform);
   if (step.target) {
     try {
-      const elementId = await findElement(sessionId, step.target, isPermissionTap ? Math.min(readStepTimeout(step) ?? DEFAULT_STEP_TIMEOUT_MS, PERMISSION_DIALOG_TIMEOUT_MS) : readStepTimeout(step), {
+      const explicitTimeout = readStepTimeout(step);
+      const elementId = await findElement(sessionId, step.target, isPermissionTap ? explicitTimeout ?? PERMISSION_DIALOG_TIMEOUT_MS : explicitTimeout, {
         platform: platform3,
         recordedBounds: bounds
       });
@@ -358368,9 +358400,15 @@ let timer = null;
 async function post() {
   if (!url || !headers || !body) return; // inert until the first real heartbeat
   try {
+    // The keepalive discards the response body, so it must identify itself:
+    // the server's heartbeat handler destructively drains queued runner
+    // control commands (kill-pid/kill-orphans) into the response, and a
+    // drained command this worker throws away would be lost for a full
+    // re-issue window. The header tells the server to keep the queue intact
+    // and let the main loop (which executes commands) drain it.
     await fetch(url, {
       method: 'POST',
-      headers,
+      headers: { ...headers, 'x-validateqa-keepalive': '1' },
       body,
       signal: AbortSignal.timeout(10000),
     });
@@ -360708,6 +360746,7 @@ var MobileRunWatchdog = class {
   phase = "idle";
   released = false;
   quarantined = false;
+  quarantineToken;
   cancelAbortTimer = null;
   cancelGraceTimer = null;
   /** Current phase (exposed for tests / observability). */
@@ -360736,7 +360775,8 @@ var MobileRunWatchdog = class {
     this.clearAbortTimer();
     if (this.options.deviceId) {
       this.quarantined = true;
-      this.options.callbacks.quarantine(this.options.deviceId);
+      const token = this.options.callbacks.quarantine(this.options.deviceId);
+      this.quarantineToken = typeof token === "number" ? token : void 0;
       this.options.callbacks.abort(this.options.deviceId, this.options.runId, reason);
     } else {
       this.options.callbacks.log("warn", `Run ${this.options.runId} ${reason} \u2014 no leased device to abort; awaiting the run's own settle.`);
@@ -360761,7 +360801,7 @@ var MobileRunWatchdog = class {
     }
     if (this.quarantined && this.options.deviceId) {
       this.quarantined = false;
-      this.options.callbacks.unquarantine(this.options.deviceId);
+      this.options.callbacks.unquarantine(this.options.deviceId, this.quarantineToken);
       if (wasForceReleased) {
         this.options.callbacks.log("info", `Run ${this.options.runId} finally settled \u2014 lifted the quarantine on device ${this.options.deviceId}.`);
       }
@@ -360779,7 +360819,8 @@ var MobileRunWatchdog = class {
     if (this.options.deviceId) {
       if (!this.quarantined) {
         this.quarantined = true;
-        this.options.callbacks.quarantine(this.options.deviceId);
+        const token = this.options.callbacks.quarantine(this.options.deviceId);
+        this.quarantineToken = typeof token === "number" ? token : void 0;
       }
       this.options.callbacks.log(
         "warn",
@@ -364425,11 +364466,9 @@ async function startRunner(opts) {
                   if (sessionId) void deleteAppiumSession(sessionId);
                 },
                 release: applyRelease,
-                quarantine: (deviceId) => {
-                  quarantineDevice(deviceId);
-                },
-                unquarantine: (deviceId) => {
-                  unquarantineDevice(deviceId);
+                quarantine: (deviceId) => quarantineDevice(deviceId),
+                unquarantine: (deviceId, token) => {
+                  unquarantineDevice(deviceId, token);
                 },
                 log: (level, message) => {
                   if (level === "warn") log.warn(message);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@validate.qa/runner",
-  "version": "1.0.75",
+  "version": "1.0.77",
   "description": "validate local test runner - execute Playwright tests on your machine, connected to validate.qa cloud.",
   "bin": {
     "validate-runner": "dist/cli.js"