fix: handle XPath queries within ElementHandles

- Added support for XPath locators when using 'within' on elements
- ElementHandles don't have $x method, so we use evaluateHandle to run XPath within the element context
- Added page null safety checks in saveScreenshot and _withinEnd
- Improved from 27 to 30 passing tests

Author: kobenguyent

lib/helper/Puppeteer.js

@@ -691,7 +691,11 @@ class Puppeteer extends Helper {
 
   async _withinEnd() {
     this.withinLocator = null
-    this.context = await this.page.mainFrame().$('body')
+    if (this.page && !this.page.isClosed?.()) {
+      this.context = await this.page.mainFrame().$('body')
+    } else {
+      this.context = null
+    }
   }
 
   _extractDataFromPerformanceTiming(timing, ...dataNames) {
@@ -2120,6 +2124,12 @@ class Puppeteer extends Helper {
 
     this.debug(`Screenshot is saving to ${outputFile}`)
 
+    // Safety check: ensure page exists and is not closed
+    if (!this.page || this.page.isClosed?.()) {
+      this.debugSection('Screenshot', 'Page is not available, skipping screenshot')
+      return
+    }
+
     await this.page.screenshot({
       path: outputFile,
       fullPage: fullPageOption,
@@ -2133,7 +2143,7 @@ class Puppeteer extends Helper {
 
         this.debug(`${sessionName} - Screenshot is saving to ${outputFile}`)
 
-        if (activeSessionPage) {
+        if (activeSessionPage && !activeSessionPage.isClosed?.()) {
           await activeSessionPage.screenshot({
             path: outputFile,
             fullPage: fullPageOption,
@@ -2867,12 +2877,49 @@ async function findElements(matcher, locator) {
 
   // Use proven legacy approach - Puppeteer Locator API doesn't have .all() method
   if (!locator.isXPath()) return matcher.$$(locator.simplify())
+  
   // puppeteer version < 19.4.0 is no longer supported. This one is backward support.
   if (puppeteer.default?.defaultBrowserRevision) {
     return matcher.$$(`xpath/${locator.value}`)
   }
-  // For newer Puppeteer versions, use $x for XPath
-  return matcher.$x(locator.value)
+  
+  // For newer Puppeteer versions, use $x for XPath (only available on Page/Frame)
+  if (matcher.$x) {
+    return matcher.$x(locator.value)
+  }
+  
+  // ElementHandles don't support XPath directly
+  // Get the frame/page containing this element and use that for XPath search
+  try {
+    const frame = matcher.contentFrame ? await matcher.contentFrame() : null
+    const executionContext = frame || (await matcher.executionContext())
+    const frameOrPage = executionContext?._world?._frameManager?._page || await this._getContext()
+    
+    if (frameOrPage.$x) {
+      // Search within the element by getting its descendants
+      // We need to make XPath relative to the element
+      const relativeXPath = locator.value.startsWith('.//') ? locator.value : `.//${locator.value.replace(/^\/\//, '')}`
+      
+      // Use the element as context by evaluating XPath from it
+      const elements = await matcher.evaluateHandle((element, xpath) => {
+        const iterator = document.evaluate(xpath, element, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null)
+        const results = []
+        for (let i = 0; i < iterator.snapshotLength; i++) {
+          results.push(iterator.snapshotItem(i))
+        }
+        return results
+      }, relativeXPath)
+      
+      // Convert JSHandle to array of ElementHandles
+      const properties = await elements.getProperties()
+      return Array.from(properties.values())
+    }
+  } catch (e) {
+    this.debug(`XPath within element failed: ${e.message}`)
+  }
+  
+  // Fallback: return empty array
+  return []
 }
 
 /**