@browserless.io/browserless 2.24.0-beta-5 → 2.24.1

package/static/function/client.js

@@ -1998,50 +1998,64 @@
           createDebug.namespaces = namespaces;
           createDebug.names = [];
           createDebug.skips = [];
-          let i;
-          const split = (typeof namespaces === "string" ? namespaces : "").split(/[\s,]+/);
-          const len = split.length;
-          for (i = 0; i < len; i++) {
-            if (!split[i]) {
-              continue;
+          const split = (typeof namespaces === "string" ? namespaces : "").trim().replace(" ", ",").split(",").filter(Boolean);
+          for (const ns of split) {
+            if (ns[0] === "-") {
+              createDebug.skips.push(ns.slice(1));
+            } else {
+              createDebug.names.push(ns);
             }
-            namespaces = split[i].replace(/\*/g, ".*?");
-            if (namespaces[0] === "-") {
-              createDebug.skips.push(new RegExp("^" + namespaces.slice(1) + "$"));
+          }
+        }
+        function matchesTemplate(search, template) {
+          let searchIndex = 0;
+          let templateIndex = 0;
+          let starIndex = -1;
+          let matchIndex = 0;
+          while (searchIndex < search.length) {
+            if (templateIndex < template.length && (template[templateIndex] === search[searchIndex] || template[templateIndex] === "*")) {
+              if (template[templateIndex] === "*") {
+                starIndex = templateIndex;
+                matchIndex = searchIndex;
+                templateIndex++;
+              } else {
+                searchIndex++;
+                templateIndex++;
+              }
+            } else if (starIndex !== -1) {
+              templateIndex = starIndex + 1;
+              matchIndex++;
+              searchIndex = matchIndex;
             } else {
-              createDebug.names.push(new RegExp("^" + namespaces + "$"));
+              return false;
             }
           }
+          while (templateIndex < template.length && template[templateIndex] === "*") {
+            templateIndex++;
+          }
+          return templateIndex === template.length;
         }
         function disable() {
           const namespaces = [
-            ...createDebug.names.map(toNamespace),
-            ...createDebug.skips.map(toNamespace).map((namespace) => "-" + namespace)
+            ...createDebug.names,
+            ...createDebug.skips.map((namespace) => "-" + namespace)
           ].join(",");
           createDebug.enable("");
           return namespaces;
         }
         function enabled(name) {
-          if (name[name.length - 1] === "*") {
-            return true;
-          }
-          let i;
-          let len;
-          for (i = 0, len = createDebug.skips.length; i < len; i++) {
-            if (createDebug.skips[i].test(name)) {
+          for (const skip of createDebug.skips) {
+            if (matchesTemplate(name, skip)) {
               return false;
             }
           }
-          for (i = 0, len = createDebug.names.length; i < len; i++) {
-            if (createDebug.names[i].test(name)) {
+          for (const ns of createDebug.names) {
+            if (matchesTemplate(name, ns)) {
               return true;
             }
           }
           return false;
         }
-        function toNamespace(regexp) {
-          return regexp.toString().substring(2, regexp.toString().length - 2).replace(/\.\*\?$/, "*");
-        }
         function coerce(val) {
           if (val instanceof Error) {
             return val.stack || val.message;
@@ -4379,7 +4393,7 @@
   // node_modules/puppeteer-core/lib/esm/puppeteer/generated/version.js
   init_dirname();
   init_buffer2();
-  var packageVersion = "23.10.0";
+  var packageVersion = "23.11.1";
 
   // node_modules/puppeteer-core/lib/esm/puppeteer/util/assert.js
   init_dirname();
@@ -9512,6 +9526,7 @@
           "blurredVision",
           "deuteranopia",
           "protanopia",
+          "reducedContrast",
           "tritanopia"
         ]);
         assert(!type || visionDeficiencies.has(type), `Unsupported vision deficiency: ${type}`);
@@ -13861,13 +13876,73 @@ ${sourceUrlComment}
   // node_modules/puppeteer-core/lib/esm/puppeteer/cdp/Accessibility.js
   init_dirname();
   init_buffer2();
+  var __addDisposableResource11 = function(env, value, async2) {
+    if (value !== null && value !== void 0) {
+      if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
+      var dispose, inner;
+      if (async2) {
+        if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
+        dispose = value[Symbol.asyncDispose];
+      }
+      if (dispose === void 0) {
+        if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
+        dispose = value[Symbol.dispose];
+        if (async2) inner = dispose;
+      }
+      if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
+      if (inner) dispose = function() {
+        try {
+          inner.call(this);
+        } catch (e) {
+          return Promise.reject(e);
+        }
+      };
+      env.stack.push({ value, dispose, async: async2 });
+    } else if (async2) {
+      env.stack.push({ async: true });
+    }
+    return value;
+  };
+  var __disposeResources11 = /* @__PURE__ */ function(SuppressedError2) {
+    return function(env) {
+      function fail(e) {
+        env.error = env.hasError ? new SuppressedError2(e, env.error, "An error was suppressed during disposal.") : e;
+        env.hasError = true;
+      }
+      var r, s = 0;
+      function next() {
+        while (r = env.stack.pop()) {
+          try {
+            if (!r.async && s === 1) return s = 0, env.stack.push(r), Promise.resolve().then(next);
+            if (r.dispose) {
+              var result = r.dispose.call(r.value);
+              if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) {
+                fail(e);
+                return next();
+              });
+            } else s |= 1;
+          } catch (e) {
+            fail(e);
+          }
+        }
+        if (s === 1) return env.hasError ? Promise.reject(env.error) : Promise.resolve();
+        if (env.hasError) throw env.error;
+      }
+      return next();
+    };
+  }(typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+  });
   var Accessibility = class {
     #realm;
+    #frameId;
     /**
      * @internal
      */
-    constructor(realm) {
+    constructor(realm, frameId = "") {
       this.#realm = realm;
+      this.#frameId = frameId;
     }
     /**
      * Captures the current state of the accessibility tree.
@@ -13909,8 +13984,10 @@ ${sourceUrlComment}
      * @returns An AXNode object representing the snapshot.
      */
     async snapshot(options = {}) {
-      const { interestingOnly = true, root = null } = options;
-      const { nodes } = await this.#realm.environment.client.send("Accessibility.getFullAXTree");
+      const { interestingOnly = true, root = null, includeIframes = false } = options;
+      const { nodes } = await this.#realm.environment.client.send("Accessibility.getFullAXTree", {
+        frameId: this.#frameId
+      });
       let backendNodeId;
       if (root) {
         const { node } = await this.#realm.environment.client.send("DOM.describeNode", {
@@ -13919,10 +13996,41 @@ ${sourceUrlComment}
         backendNodeId = node.backendNodeId;
       }
       const defaultRoot = AXNode.createTree(this.#realm, nodes);
+      const populateIframes = async (root2) => {
+        if (root2.payload.role?.value === "Iframe") {
+          const env_1 = { stack: [], error: void 0, hasError: false };
+          try {
+            if (!root2.payload.backendDOMNodeId) {
+              return;
+            }
+            const handle = __addDisposableResource11(env_1, await this.#realm.adoptBackendNode(root2.payload.backendDOMNodeId), false);
+            if (!handle || !("contentFrame" in handle)) {
+              return;
+            }
+            const frame = await handle.contentFrame();
+            if (!frame) {
+              return;
+            }
+            const iframeSnapshot = await frame.accessibility.snapshot(options);
+            root2.iframeSnapshot = iframeSnapshot ?? void 0;
+          } catch (e_1) {
+            env_1.error = e_1;
+            env_1.hasError = true;
+          } finally {
+            __disposeResources11(env_1);
+          }
+        }
+        for (const child of root2.children) {
+          await populateIframes(child);
+        }
+      };
       let needle = defaultRoot;
       if (!defaultRoot) {
         return null;
       }
+      if (includeIframes) {
+        await populateIframes(defaultRoot);
+      }
       if (backendNodeId) {
         needle = defaultRoot.find((node) => {
           return node.payload.backendDOMNodeId === backendNodeId;
@@ -13953,10 +14061,16 @@ ${sourceUrlComment}
       if (children.length) {
         serializedNode.children = children;
       }
+      if (node.iframeSnapshot) {
+        if (!serializedNode.children) {
+          serializedNode.children = [];
+        }
+        serializedNode.children.push(node.iframeSnapshot);
+      }
       return [serializedNode];
     }
     collectInterestingNodes(collection, node, insideControl) {
-      if (node.isInteresting(insideControl)) {
+      if (node.isInteresting(insideControl) || node.iframeSnapshot) {
         collection.add(node);
       }
       if (node.isLeafNode()) {
@@ -13971,6 +14085,7 @@ ${sourceUrlComment}
   var AXNode = class _AXNode {
     payload;
     children = [];
+    iframeSnapshot;
     #richlyEditable = false;
     #editable = false;
     #focusable = false;
@@ -14831,7 +14946,7 @@ ${sourceUrlComment}
           [MAIN_WORLD]: new IsolatedWorld(this, this._frameManager.timeoutSettings),
           [PUPPETEER_WORLD]: new IsolatedWorld(this, this._frameManager.timeoutSettings)
         };
-        this.accessibility = new Accessibility(this.worlds[MAIN_WORLD]);
+        this.accessibility = new Accessibility(this.worlds[MAIN_WORLD], frameId);
         this.on(FrameEvent.FrameSwappedByActivation, () => {
           this._onLoadingStarted();
           this._onLoadingStopped();
@@ -18081,7 +18196,7 @@ ${sourceUrlComment}
   };
 
   // node_modules/puppeteer-core/lib/esm/puppeteer/cdp/Page.js
-  var __addDisposableResource11 = function(env, value, async2) {
+  var __addDisposableResource12 = function(env, value, async2) {
     if (value !== null && value !== void 0) {
       if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
       var dispose, inner;
@@ -18108,7 +18223,7 @@ ${sourceUrlComment}
     }
     return value;
   };
-  var __disposeResources11 = /* @__PURE__ */ function(SuppressedError2) {
+  var __disposeResources12 = /* @__PURE__ */ function(SuppressedError2) {
     return function(env) {
       function fail(e) {
         env.error = env.hasError ? new SuppressedError2(e, env.error, "An error was suppressed during disposal.") : e;
@@ -18350,7 +18465,7 @@ ${sourceUrlComment}
         }
         const frame = this.#frameManager.frame(event.frameId);
         assert(frame, "This should never happen.");
-        const handle = __addDisposableResource11(env_1, await frame.worlds[MAIN_WORLD].adoptBackendNode(event.backendNodeId), false);
+        const handle = __addDisposableResource12(env_1, await frame.worlds[MAIN_WORLD].adoptBackendNode(event.backendNodeId), false);
         const fileChooser = new FileChooser(handle.move(), event);
         for (const promise of this.#fileChooserDeferreds) {
           promise.resolve(fileChooser);
@@ -18360,7 +18475,7 @@ ${sourceUrlComment}
         env_1.error = e_1;
         env_1.hasError = true;
       } finally {
-        __disposeResources11(env_1);
+        __disposeResources12(env_1);
       }
     }
     _client() {
@@ -18769,7 +18884,7 @@ ${sourceUrlComment}
       try {
         const { fromSurface, omitBackground, optimizeForSpeed, quality, clip: userClip, type, captureBeyondViewport } = options;
         const isFirefox = this.target()._targetManager() instanceof FirefoxTargetManager;
-        const stack = __addDisposableResource11(env_2, new AsyncDisposableStack(), true);
+        const stack = __addDisposableResource12(env_2, new AsyncDisposableStack(), true);
         if (!isFirefox && omitBackground && (type === "png" || type === "webp")) {
           await this.#emulationManager.setTransparentBackgroundColor();
           stack.defer(async () => {
@@ -18797,7 +18912,7 @@ ${sourceUrlComment}
         env_2.error = e_2;
         env_2.hasError = true;
       } finally {
-        const result_1 = __disposeResources11(env_2);
+        const result_1 = __disposeResources12(env_2);
         if (result_1)
           await result_1;
       }
@@ -18849,7 +18964,7 @@ ${sourceUrlComment}
     async close(options = { runBeforeUnload: void 0 }) {
       const env_3 = { stack: [], error: void 0, hasError: false };
       try {
-        const _guard = __addDisposableResource11(env_3, await this.browserContext().waitForScreenshotOperations(), false);
+        const _guard = __addDisposableResource12(env_3, await this.browserContext().waitForScreenshotOperations(), false);
         const connection = this.#primaryTargetClient.connection();
         assert(connection, "Protocol error: Connection closed. Most likely the page has been closed.");
         const runBeforeUnload = !!options.runBeforeUnload;
@@ -18865,7 +18980,7 @@ ${sourceUrlComment}
         env_3.error = e_3;
         env_3.hasError = true;
       } finally {
-        __disposeResources11(env_3);
+        __disposeResources12(env_3);
       }
     }
     isClosed() {
@@ -18943,7 +19058,7 @@ ${sourceUrlComment}
   }
 
   // node_modules/puppeteer-core/lib/esm/puppeteer/cdp/BrowserContext.js
-  var __addDisposableResource12 = function(env, value, async2) {
+  var __addDisposableResource13 = function(env, value, async2) {
     if (value !== null && value !== void 0) {
       if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
       var dispose, inner;
@@ -18970,7 +19085,7 @@ ${sourceUrlComment}
     }
     return value;
   };
-  var __disposeResources12 = /* @__PURE__ */ function(SuppressedError2) {
+  var __disposeResources13 = /* @__PURE__ */ function(SuppressedError2) {
     return function(env) {
       function fail(e) {
         env.error = env.hasError ? new SuppressedError2(e, env.error, "An error was suppressed during disposal.") : e;
@@ -19051,13 +19166,13 @@ ${sourceUrlComment}
     async newPage() {
       const env_1 = { stack: [], error: void 0, hasError: false };
       try {
-        const _guard = __addDisposableResource12(env_1, await this.waitForScreenshotOperations(), false);
+        const _guard = __addDisposableResource13(env_1, await this.waitForScreenshotOperations(), false);
         return await this.#browser._createPageInContext(this.#id);
       } catch (e_1) {
         env_1.error = e_1;
         env_1.hasError = true;
       } finally {
-        __disposeResources12(env_1);
+        __disposeResources13(env_1);
       }
     }
     browser() {