@browserless.io/browserless 2.24.1 → 2.24.3

package/static/function/index.html

@@ -4401,7 +4401,7 @@
   // node_modules/puppeteer-core/lib/esm/puppeteer/generated/version.js
   init_dirname();
   init_buffer2();
-  var packageVersion = "23.11.1";
+  var packageVersion = "24.1.1";
 
   // node_modules/puppeteer-core/lib/esm/puppeteer/util/assert.js
   init_dirname();
@@ -4546,17 +4546,50 @@
   init_dirname();
   init_buffer2();
   var paperFormats = {
-    letter: { width: 8.5, height: 11 },
-    legal: { width: 8.5, height: 14 },
-    tabloid: { width: 11, height: 17 },
-    ledger: { width: 17, height: 11 },
-    a0: { width: 33.1102, height: 46.811 },
-    a1: { width: 23.3858, height: 33.1102 },
-    a2: { width: 16.5354, height: 23.3858 },
-    a3: { width: 11.6929, height: 16.5354 },
-    a4: { width: 8.2677, height: 11.6929 },
-    a5: { width: 5.8268, height: 8.2677 },
-    a6: { width: 4.1339, height: 5.8268 }
+    letter: {
+      cm: { width: 21.59, height: 27.94 },
+      in: { width: 8.5, height: 11 }
+    },
+    legal: {
+      cm: { width: 21.59, height: 35.56 },
+      in: { width: 8.5, height: 14 }
+    },
+    tabloid: {
+      cm: { width: 27.94, height: 43.18 },
+      in: { width: 11, height: 17 }
+    },
+    ledger: {
+      cm: { width: 43.18, height: 27.94 },
+      in: { width: 17, height: 11 }
+    },
+    a0: {
+      cm: { width: 84.1, height: 118.9 },
+      in: { width: 33.1102, height: 46.811 }
+    },
+    a1: {
+      cm: { width: 59.4, height: 84.1 },
+      in: { width: 23.3858, height: 33.1102 }
+    },
+    a2: {
+      cm: { width: 42, height: 59.4 },
+      in: { width: 16.5354, height: 23.3858 }
+    },
+    a3: {
+      cm: { width: 29.7, height: 42 },
+      in: { width: 11.6929, height: 16.5354 }
+    },
+    a4: {
+      cm: { width: 21, height: 29.7 },
+      in: { width: 8.2677, height: 11.6929 }
+    },
+    a5: {
+      cm: { width: 14.8, height: 21 },
+      in: { width: 5.8268, height: 8.2677 }
+    },
+    a6: {
+      cm: { width: 10.5, height: 14.8 },
+      in: { width: 4.1339, height: 5.8268 }
+    }
   };
 
   // node_modules/puppeteer-core/lib/esm/puppeteer/common/util.js
@@ -4739,7 +4772,7 @@
     let width = 8.5;
     let height = 11;
     if (options.format) {
-      const format = paperFormats[options.format.toLowerCase()];
+      const format = paperFormats[options.format.toLowerCase()][lengthUnit];
       assert(format, "Unknown paper format: " + options.format);
       width = format.width;
       height = format.height;
@@ -9634,136 +9667,6 @@
     };
   })();
 
-  // node_modules/puppeteer-core/lib/esm/puppeteer/cdp/FirefoxTargetManager.js
-  init_dirname();
-  init_buffer2();
-  var FirefoxTargetManager = class extends EventEmitter {
-    #connection;
-    /**
-     * Keeps track of the following events: 'Target.targetCreated',
-     * 'Target.targetDestroyed'.
-     *
-     * A target becomes discovered when 'Target.targetCreated' is received.
-     * A target is removed from this map once 'Target.targetDestroyed' is
-     * received.
-     *
-     * `targetFilterCallback` has no effect on this map.
-     */
-    #discoveredTargetsByTargetId = /* @__PURE__ */ new Map();
-    /**
-     * Keeps track of targets that were created via 'Target.targetCreated'
-     * and which one are not filtered out by `targetFilterCallback`.
-     *
-     * The target is removed from here once it's been destroyed.
-     */
-    #availableTargetsByTargetId = /* @__PURE__ */ new Map();
-    /**
-     * Tracks which sessions attach to which target.
-     */
-    #availableTargetsBySessionId = /* @__PURE__ */ new Map();
-    #targetFilterCallback;
-    #targetFactory;
-    #attachedToTargetListenersBySession = /* @__PURE__ */ new WeakMap();
-    #initializeDeferred = Deferred.create();
-    #targetsIdsForInit = /* @__PURE__ */ new Set();
-    constructor(connection, targetFactory, targetFilterCallback) {
-      super();
-      this.#connection = connection;
-      this.#targetFilterCallback = targetFilterCallback;
-      this.#targetFactory = targetFactory;
-      this.#connection.on("Target.targetCreated", this.#onTargetCreated);
-      this.#connection.on("Target.targetDestroyed", this.#onTargetDestroyed);
-      this.#connection.on(CDPSessionEvent.SessionDetached, this.#onSessionDetached);
-      this.setupAttachmentListeners(this.#connection);
-    }
-    setupAttachmentListeners(session) {
-      const listener = (event) => {
-        return this.#onAttachedToTarget(session, event);
-      };
-      assert(!this.#attachedToTargetListenersBySession.has(session));
-      this.#attachedToTargetListenersBySession.set(session, listener);
-      session.on("Target.attachedToTarget", listener);
-    }
-    #onSessionDetached = (session) => {
-      this.removeSessionListeners(session);
-      this.#availableTargetsBySessionId.delete(session.id());
-    };
-    removeSessionListeners(session) {
-      if (this.#attachedToTargetListenersBySession.has(session)) {
-        session.off("Target.attachedToTarget", this.#attachedToTargetListenersBySession.get(session));
-        this.#attachedToTargetListenersBySession.delete(session);
-      }
-    }
-    getAvailableTargets() {
-      return this.#availableTargetsByTargetId;
-    }
-    getChildTargets(_target) {
-      return /* @__PURE__ */ new Set();
-    }
-    dispose() {
-      this.#connection.off("Target.targetCreated", this.#onTargetCreated);
-      this.#connection.off("Target.targetDestroyed", this.#onTargetDestroyed);
-    }
-    async initialize() {
-      await this.#connection.send("Target.setDiscoverTargets", {
-        discover: true,
-        filter: [{}]
-      });
-      this.#targetsIdsForInit = new Set(this.#discoveredTargetsByTargetId.keys());
-      await this.#initializeDeferred.valueOrThrow();
-    }
-    #onTargetCreated = async (event) => {
-      if (this.#discoveredTargetsByTargetId.has(event.targetInfo.targetId)) {
-        return;
-      }
-      this.#discoveredTargetsByTargetId.set(event.targetInfo.targetId, event.targetInfo);
-      if (event.targetInfo.type === "browser" && event.targetInfo.attached) {
-        const target2 = this.#targetFactory(event.targetInfo, void 0);
-        target2._initialize();
-        this.#availableTargetsByTargetId.set(event.targetInfo.targetId, target2);
-        this.#finishInitializationIfReady(target2._targetId);
-        return;
-      }
-      const target = this.#targetFactory(event.targetInfo, void 0);
-      if (this.#targetFilterCallback && !this.#targetFilterCallback(target)) {
-        this.#finishInitializationIfReady(event.targetInfo.targetId);
-        return;
-      }
-      target._initialize();
-      this.#availableTargetsByTargetId.set(event.targetInfo.targetId, target);
-      this.emit("targetAvailable", target);
-      this.#finishInitializationIfReady(target._targetId);
-    };
-    #onTargetDestroyed = (event) => {
-      this.#discoveredTargetsByTargetId.delete(event.targetId);
-      this.#finishInitializationIfReady(event.targetId);
-      const target = this.#availableTargetsByTargetId.get(event.targetId);
-      if (target) {
-        this.emit("targetGone", target);
-        this.#availableTargetsByTargetId.delete(event.targetId);
-      }
-    };
-    #onAttachedToTarget = async (parentSession, event) => {
-      const targetInfo = event.targetInfo;
-      const session = this.#connection.session(event.sessionId);
-      if (!session) {
-        throw new Error(`Session ${event.sessionId} was not created.`);
-      }
-      const target = this.#availableTargetsByTargetId.get(targetInfo.targetId);
-      assert(target, `Target ${targetInfo.targetId} is missing`);
-      session._setTarget(target);
-      this.setupAttachmentListeners(session);
-      this.#availableTargetsBySessionId.set(session.id(), this.#availableTargetsByTargetId.get(targetInfo.targetId));
-      parentSession.emit(CDPSessionEvent.Ready, session);
-    };
-    #finishInitializationIfReady(targetId) {
-      this.#targetsIdsForInit.delete(targetId);
-      if (this.#targetsIdsForInit.size === 0) {
-        this.#initializeDeferred.resolve();
-      }
-    }
-  };
-
   // node_modules/puppeteer-core/lib/esm/puppeteer/cdp/FrameManager.js
   init_dirname();
   init_buffer2();
@@ -12111,8 +12014,8 @@
       /**
        * @internal
        */
-      dispose() {
-        return this.handle.dispose();
+      async dispose() {
+        await Promise.all([this.handle.dispose(), this.isolatedHandle?.dispose()]);
       }
       /**
        * @internal
@@ -14490,7 +14393,7 @@ ${sourceUrlComment}
       }
       if (this.#poller) {
         try {
-          await this.#poller.evaluateHandle(async (poller) => {
+          await this.#poller.evaluate(async (poller) => {
             await poller.stop();
           });
           if (this.#poller) {
@@ -14515,7 +14418,7 @@ ${sourceUrlComment}
         if (error.message.includes("Cannot find context with specified id")) {
           return;
         }
-        if (error.message.includes("AbortError: Actor 'MessageHandlerFrame' destroyed")) {
+        if (error.message.includes("DiscardedBrowsingContextError")) {
           return;
         }
         return error;
@@ -15169,10 +15072,6 @@ ${sourceUrlComment}
         throw new UnsupportedOperation();
       }
       async frameElement() {
-        const isFirefox = this.page().target()._targetManager() instanceof FirefoxTargetManager;
-        if (isFirefox) {
-          return await super.frameElement();
-        }
         const parent = this.parentFrame();
         if (!parent) {
           return null;
@@ -15688,7 +15587,7 @@ ${sourceUrlComment}
       this.id = data.requestId;
       this.#isNavigationRequest = data.requestId === data.loaderId && data.type === "Document";
       this._interceptionId = interceptionId;
-      this.#url = data.request.url;
+      this.#url = data.request.url + (data.request.urlFragment ?? "");
       this.#resourceType = (data.type || "other").toLowerCase();
       this.#method = data.request.method;
       this.#postData = data.request.postData;
@@ -15939,7 +15838,6 @@ ${sourceUrlComment}
     #remoteAddress;
     #status;
     #statusText;
-    #url;
     #fromDiskCache;
     #fromServiceWorker;
     #headers = {};
@@ -15953,7 +15851,6 @@ ${sourceUrlComment}
         port: responsePayload.remotePort
       };
       this.#statusText = this.#parseStatusTextFromExtraInfo(extraInfo) || responsePayload.statusText;
-      this.#url = request.url();
       this.#fromDiskCache = !!responsePayload.fromDiskCache;
       this.#fromServiceWorker = !!responsePayload.fromServiceWorker;
       this.#status = extraInfo ? extraInfo.statusCode : responsePayload.status;
@@ -15992,7 +15889,7 @@ ${sourceUrlComment}
       return this.#remoteAddress;
     }
     url() {
-      return this.#url;
+      return this.#request.url();
     }
     status() {
       return this.#status;
@@ -18891,9 +18788,8 @@ ${sourceUrlComment}
       const env_2 = { stack: [], error: void 0, hasError: false };
       try {
         const { fromSurface, omitBackground, optimizeForSpeed, quality, clip: userClip, type, captureBeyondViewport } = options;
-        const isFirefox = this.target()._targetManager() instanceof FirefoxTargetManager;
         const stack = __addDisposableResource12(env_2, new AsyncDisposableStack(), true);
-        if (!isFirefox && omitBackground && (type === "png" || type === "webp")) {
+        if (omitBackground && (type === "png" || type === "webp")) {
           await this.#emulationManager.setTransparentBackgroundColor();
           stack.defer(async () => {
             await this.#emulationManager.resetDefaultBackgroundColor().catch(debugError);
@@ -18909,10 +18805,10 @@ ${sourceUrlComment}
         }
         const { data } = await this.#primaryTargetClient.send("Page.captureScreenshot", {
           format: type,
-          ...optimizeForSpeed ? { optimizeForSpeed } : {},
+          optimizeForSpeed,
+          fromSurface,
           ...quality !== void 0 ? { quality: Math.round(quality) } : {},
           ...clip ? { clip: { ...clip, scale: clip.scale ?? 1 } } : {},
-          ...!fromSurface ? { fromSurface } : {},
           captureBeyondViewport
         });
         return data;
@@ -19224,10 +19120,6 @@ ${sourceUrlComment}
     }
   };
 
-  // node_modules/puppeteer-core/lib/esm/puppeteer/cdp/ChromeTargetManager.js
-  init_dirname();
-  init_buffer2();
-
   // node_modules/puppeteer-core/lib/esm/puppeteer/cdp/Target.js
   init_dirname();
   init_buffer2();
@@ -19455,11 +19347,13 @@ ${sourceUrlComment}
   var OtherTarget = class extends CdpTarget {
   };
 
-  // node_modules/puppeteer-core/lib/esm/puppeteer/cdp/ChromeTargetManager.js
+  // node_modules/puppeteer-core/lib/esm/puppeteer/cdp/TargetManager.js
+  init_dirname();
+  init_buffer2();
   function isPageTargetBecomingPrimary(target, newTargetInfo) {
     return Boolean(target._subtype()) && !newTargetInfo.subtype;
   }
-  var ChromeTargetManager = class extends EventEmitter {
+  var TargetManager = class extends EventEmitter {
     #connection;
     /**
      * Keeps track of the following events: 'Target.targetCreated',
@@ -19473,7 +19367,7 @@ ${sourceUrlComment}
      */
     #discoveredTargetsByTargetId = /* @__PURE__ */ new Map();
     /**
-     * A target is added to this map once ChromeTargetManager has created
+     * A target is added to this map once TargetManager has created
      * a Target and attached at least once to it.
      */
     #attachedTargetsByTargetId = /* @__PURE__ */ new Map();
@@ -19717,8 +19611,8 @@ ${sourceUrlComment}
   // node_modules/puppeteer-core/lib/esm/puppeteer/cdp/Browser.js
   var CdpBrowser = class _CdpBrowser extends Browser {
     protocol = "cdp";
-    static async _create(product, connection, contextIds, acceptInsecureCerts, defaultViewport, downloadBehavior, process3, closeCallback, targetFilterCallback, isPageTargetCallback, waitForInitiallyDiscoveredTargets = true) {
-      const browser = new _CdpBrowser(product, connection, contextIds, defaultViewport, process3, closeCallback, targetFilterCallback, isPageTargetCallback, waitForInitiallyDiscoveredTargets);
+    static async _create(connection, contextIds, acceptInsecureCerts, defaultViewport, downloadBehavior, process3, closeCallback, targetFilterCallback, isPageTargetCallback, waitForInitiallyDiscoveredTargets = true) {
+      const browser = new _CdpBrowser(connection, contextIds, defaultViewport, process3, closeCallback, targetFilterCallback, isPageTargetCallback, waitForInitiallyDiscoveredTargets);
       if (acceptInsecureCerts) {
         await connection.send("Security.setIgnoreCertificateErrors", {
           ignore: true
@@ -19736,9 +19630,8 @@ ${sourceUrlComment}
     #defaultContext;
     #contexts = /* @__PURE__ */ new Map();
     #targetManager;
-    constructor(product, connection, contextIds, defaultViewport, process3, closeCallback, targetFilterCallback, isPageTargetCallback, waitForInitiallyDiscoveredTargets = true) {
+    constructor(connection, contextIds, defaultViewport, process3, closeCallback, targetFilterCallback, isPageTargetCallback, waitForInitiallyDiscoveredTargets = true) {
       super();
-      product = product || "chrome";
       this.#defaultViewport = defaultViewport;
       this.#process = process3;
       this.#connection = connection;
@@ -19748,11 +19641,7 @@ ${sourceUrlComment}
         return true;
       });
       this.#setIsPageTargetCallback(isPageTargetCallback);
-      if (product === "firefox") {
-        this.#targetManager = new FirefoxTargetManager(connection, this.#createTarget, this.#targetFilterCallback);
-      } else {
-        this.#targetManager = new ChromeTargetManager(connection, this.#createTarget, this.#targetFilterCallback, waitForInitiallyDiscoveredTargets);
-      }
+      this.#targetManager = new TargetManager(connection, this.#createTarget, this.#targetFilterCallback, waitForInitiallyDiscoveredTargets);
       this.#defaultContext = new CdpBrowserContext(this.#connection, this);
       for (const contextId of contextIds) {
         this.#contexts.set(contextId, new CdpBrowserContext(this.#connection, this, contextId));
@@ -19939,10 +19828,8 @@ ${sourceUrlComment}
   async function _connectToCdpBrowser(connectionTransport, url, options) {
     const { acceptInsecureCerts = false, defaultViewport = DEFAULT_VIEWPORT, downloadBehavior, targetFilter, _isPageTarget: isPageTarget, slowMo = 0, protocolTimeout } = options;
     const connection = new Connection(url, connectionTransport, slowMo, protocolTimeout);
-    const version = await connection.send("Browser.getVersion");
-    const product = version.product.toLowerCase().includes("firefox") ? "firefox" : "chrome";
     const { browserContextIds } = await connection.send("Target.getBrowserContexts");
-    const browser = await CdpBrowser._create(product || "chrome", connection, browserContextIds, acceptInsecureCerts, defaultViewport, downloadBehavior, void 0, () => {
+    const browser = await CdpBrowser._create(connection, browserContextIds, acceptInsecureCerts, defaultViewport, downloadBehavior, void 0, () => {
       return connection.send("Browser.close").catch(debugError);
     }, targetFilter, isPageTarget);
     return browser;
@@ -20225,13 +20112,6 @@ puppeteer-core/lib/esm/puppeteer/cdp/Dialog.js:
    * SPDX-License-Identifier: Apache-2.0
    *)
 
-puppeteer-core/lib/esm/puppeteer/cdp/FirefoxTargetManager.js:
-  (**
-   * @license
-   * Copyright 2022 Google Inc.
-   * SPDX-License-Identifier: Apache-2.0
-   *)
-
 puppeteer-core/lib/esm/puppeteer/api/ElementHandleSymbol.js:
   (**
    * @license
@@ -20547,7 +20427,7 @@ puppeteer-core/lib/esm/puppeteer/cdp/Target.js:
    * SPDX-License-Identifier: Apache-2.0
    *)
 
-puppeteer-core/lib/esm/puppeteer/cdp/ChromeTargetManager.js:
+puppeteer-core/lib/esm/puppeteer/cdp/TargetManager.js:
   (**
    * @license
    * Copyright 2022 Google Inc.