@remotion/renderer 4.0.404 → 4.0.406

package/dist/browser/HTTPRequest.js

@@ -1,39 +1,28 @@
 "use strict";
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _HTTPRequest_isNavigationRequest, _HTTPRequest_frame;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HTTPRequest = void 0;
 class HTTPRequest {
+    _requestId;
+    _response = null;
+    _url = null;
+    _fromMemoryCache = false;
+    #isNavigationRequest;
+    #frame;
     constructor(frame, event) {
-        this._response = null;
-        this._url = null;
-        this._fromMemoryCache = false;
-        _HTTPRequest_isNavigationRequest.set(this, void 0);
-        _HTTPRequest_frame.set(this, void 0);
         this._requestId = event.requestId;
-        __classPrivateFieldSet(this, _HTTPRequest_isNavigationRequest, event.requestId === event.loaderId && event.type === 'Document', "f");
-        __classPrivateFieldSet(this, _HTTPRequest_frame, frame, "f");
+        this.#isNavigationRequest =
+            event.requestId === event.loaderId && event.type === 'Document';
+        this.#frame = frame;
         this._url = event.request.url;
     }
     response() {
         return this._response;
     }
     frame() {
-        return __classPrivateFieldGet(this, _HTTPRequest_frame, "f");
+        return this.#frame;
     }
     isNavigationRequest() {
-        return __classPrivateFieldGet(this, _HTTPRequest_isNavigationRequest, "f");
+        return this.#isNavigationRequest;
     }
 }
 exports.HTTPRequest = HTTPRequest;
-_HTTPRequest_isNavigationRequest = new WeakMap(), _HTTPRequest_frame = new WeakMap();

package/dist/browser/HTTPResponse.js

@@ -14,28 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _HTTPResponse_status;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HTTPResponse = void 0;
 class HTTPResponse {
+    #status;
     constructor(responsePayload, extraInfo) {
-        _HTTPResponse_status.set(this, void 0);
-        __classPrivateFieldSet(this, _HTTPResponse_status, extraInfo ? extraInfo.statusCode : responsePayload.status, "f");
+        this.#status = extraInfo ? extraInfo.statusCode : responsePayload.status;
     }
     status() {
-        return __classPrivateFieldGet(this, _HTTPResponse_status, "f");
+        return this.#status;
     }
 }
 exports.HTTPResponse = HTTPResponse;
-_HTTPResponse_status = new WeakMap();

package/dist/browser/JSHandle.js

@@ -14,18 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var _JSHandle_client, _JSHandle_disposed, _JSHandle_context, _JSHandle_remoteObject;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ElementHandle = exports.JSHandle = void 0;
 exports._createJSHandle = _createJSHandle;
@@ -38,26 +26,26 @@ function _createJSHandle(context, remoteObject) {
     return new JSHandle(context, context._client, remoteObject);
 }
 class JSHandle {
+    #client;
+    #disposed = false;
+    #context;
+    #remoteObject;
     get _disposed() {
-        return __classPrivateFieldGet(this, _JSHandle_disposed, "f");
+        return this.#disposed;
     }
     get _remoteObject() {
-        return __classPrivateFieldGet(this, _JSHandle_remoteObject, "f");
+        return this.#remoteObject;
     }
     get _context() {
-        return __classPrivateFieldGet(this, _JSHandle_context, "f");
+        return this.#context;
     }
     constructor(context, client, remoteObject) {
-        _JSHandle_client.set(this, void 0);
-        _JSHandle_disposed.set(this, false);
-        _JSHandle_context.set(this, void 0);
-        _JSHandle_remoteObject.set(this, void 0);
-        __classPrivateFieldSet(this, _JSHandle_context, context, "f");
-        __classPrivateFieldSet(this, _JSHandle_client, client, "f");
-        __classPrivateFieldSet(this, _JSHandle_remoteObject, remoteObject, "f");
+        this.#context = context;
+        this.#client = client;
+        this.#remoteObject = remoteObject;
     }
     executionContext() {
-        return __classPrivateFieldGet(this, _JSHandle_context, "f");
+        return this.#context;
     }
     evaluateHandle(pageFunction, ...args) {
         return this.executionContext().evaluateHandle(pageFunction, this, ...args);
@@ -66,22 +54,21 @@ class JSHandle {
         return null;
     }
     async dispose() {
-        if (__classPrivateFieldGet(this, _JSHandle_disposed, "f")) {
+        if (this.#disposed) {
             return;
         }
-        __classPrivateFieldSet(this, _JSHandle_disposed, true, "f");
-        await (0, util_1.releaseObject)(__classPrivateFieldGet(this, _JSHandle_client, "f"), __classPrivateFieldGet(this, _JSHandle_remoteObject, "f"));
+        this.#disposed = true;
+        await (0, util_1.releaseObject)(this.#client, this.#remoteObject);
     }
     toString() {
-        if (__classPrivateFieldGet(this, _JSHandle_remoteObject, "f").objectId) {
-            const type = __classPrivateFieldGet(this, _JSHandle_remoteObject, "f").subtype || __classPrivateFieldGet(this, _JSHandle_remoteObject, "f").type;
+        if (this.#remoteObject.objectId) {
+            const type = this.#remoteObject.subtype || this.#remoteObject.type;
             return 'JSHandle@' + type;
         }
-        return (0, util_1.valueFromRemoteObject)(__classPrivateFieldGet(this, _JSHandle_remoteObject, "f"));
+        return (0, util_1.valueFromRemoteObject)(this.#remoteObject);
     }
 }
 exports.JSHandle = JSHandle;
-_JSHandle_client = new WeakMap(), _JSHandle_disposed = new WeakMap(), _JSHandle_context = new WeakMap(), _JSHandle_remoteObject = new WeakMap();
 class ElementHandle extends JSHandle {
     asElement() {
         return this;

package/dist/browser/LifecycleWatcher.js

@@ -14,18 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _LifecycleWatcher_instances, _LifecycleWatcher_expectedLifecycle, _LifecycleWatcher_frameManager, _LifecycleWatcher_frame, _LifecycleWatcher_timeout, _LifecycleWatcher_navigationRequest, _LifecycleWatcher_eventListeners, _LifecycleWatcher_sameDocumentNavigationCompleteCallback, _LifecycleWatcher_sameDocumentNavigationPromise, _LifecycleWatcher_lifecycleCallback, _LifecycleWatcher_lifecyclePromise, _LifecycleWatcher_newDocumentNavigationCompleteCallback, _LifecycleWatcher_newDocumentNavigationPromise, _LifecycleWatcher_terminationCallback, _LifecycleWatcher_terminationPromise, _LifecycleWatcher_timeoutPromise, _LifecycleWatcher_maximumTimer, _LifecycleWatcher_hasSameDocumentNavigation, _LifecycleWatcher_newDocumentNavigation, _LifecycleWatcher_swapped, _LifecycleWatcher_onRequest, _LifecycleWatcher_onFrameDetached, _LifecycleWatcher_terminate, _LifecycleWatcher_createTimeoutPromise, _LifecycleWatcher_navigatedWithinDocument, _LifecycleWatcher_navigated, _LifecycleWatcher_frameSwapped, _LifecycleWatcher_checkLifecycleComplete;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LifecycleWatcher = void 0;
 const assert_1 = require("./assert");
@@ -37,144 +25,150 @@ const util_1 = require("./util");
 const puppeteerToProtocolLifecycle = new Map([['load', 'load']]);
 const noop = () => undefined;
 class LifecycleWatcher {
+    #expectedLifecycle;
+    #frameManager;
+    #frame;
+    #timeout;
+    #navigationRequest = null;
+    #eventListeners;
+    #sameDocumentNavigationCompleteCallback = noop;
+    #sameDocumentNavigationPromise = new Promise((fulfill) => {
+        this.#sameDocumentNavigationCompleteCallback = fulfill;
+    });
+    #lifecycleCallback = noop;
+    #lifecyclePromise = new Promise((fulfill) => {
+        this.#lifecycleCallback = fulfill;
+    });
+    #newDocumentNavigationCompleteCallback = noop;
+    #newDocumentNavigationPromise = new Promise((fulfill) => {
+        this.#newDocumentNavigationCompleteCallback = fulfill;
+    });
+    #terminationCallback = noop;
+    #terminationPromise = new Promise((fulfill) => {
+        this.#terminationCallback = fulfill;
+    });
+    #timeoutPromise;
+    #maximumTimer;
+    #hasSameDocumentNavigation;
+    #newDocumentNavigation;
+    #swapped;
     constructor(frameManager, frame, waitUntil, timeout) {
-        _LifecycleWatcher_instances.add(this);
-        _LifecycleWatcher_expectedLifecycle.set(this, void 0);
-        _LifecycleWatcher_frameManager.set(this, void 0);
-        _LifecycleWatcher_frame.set(this, void 0);
-        _LifecycleWatcher_timeout.set(this, void 0);
-        _LifecycleWatcher_navigationRequest.set(this, null);
-        _LifecycleWatcher_eventListeners.set(this, void 0);
-        _LifecycleWatcher_sameDocumentNavigationCompleteCallback.set(this, noop);
-        _LifecycleWatcher_sameDocumentNavigationPromise.set(this, new Promise((fulfill) => {
-            __classPrivateFieldSet(this, _LifecycleWatcher_sameDocumentNavigationCompleteCallback, fulfill, "f");
-        }));
-        _LifecycleWatcher_lifecycleCallback.set(this, noop);
-        _LifecycleWatcher_lifecyclePromise.set(this, new Promise((fulfill) => {
-            __classPrivateFieldSet(this, _LifecycleWatcher_lifecycleCallback, fulfill, "f");
-        }));
-        _LifecycleWatcher_newDocumentNavigationCompleteCallback.set(this, noop);
-        _LifecycleWatcher_newDocumentNavigationPromise.set(this, new Promise((fulfill) => {
-            __classPrivateFieldSet(this, _LifecycleWatcher_newDocumentNavigationCompleteCallback, fulfill, "f");
-        }));
-        _LifecycleWatcher_terminationCallback.set(this, noop);
-        _LifecycleWatcher_terminationPromise.set(this, new Promise((fulfill) => {
-            __classPrivateFieldSet(this, _LifecycleWatcher_terminationCallback, fulfill, "f");
-        }));
-        _LifecycleWatcher_timeoutPromise.set(this, void 0);
-        _LifecycleWatcher_maximumTimer.set(this, void 0);
-        _LifecycleWatcher_hasSameDocumentNavigation.set(this, void 0);
-        _LifecycleWatcher_newDocumentNavigation.set(this, void 0);
-        _LifecycleWatcher_swapped.set(this, void 0);
         const protocolEvent = puppeteerToProtocolLifecycle.get(waitUntil);
         (0, assert_1.assert)(protocolEvent, 'Unknown value for options.waitUntil: ' + waitUntil);
-        __classPrivateFieldSet(this, _LifecycleWatcher_expectedLifecycle, [waitUntil], "f");
-        __classPrivateFieldSet(this, _LifecycleWatcher_frameManager, frameManager, "f");
-        __classPrivateFieldSet(this, _LifecycleWatcher_frame, frame, "f");
-        __classPrivateFieldSet(this, _LifecycleWatcher_timeout, timeout, "f");
-        __classPrivateFieldSet(this, _LifecycleWatcher_eventListeners, [
-            (0, util_1.addEventListener)(frameManager._client, Connection_1.CDPSessionEmittedEvents.Disconnected, __classPrivateFieldGet(this, _LifecycleWatcher_instances, "m", _LifecycleWatcher_terminate).bind(this, new Error('Navigation failed because browser has disconnected!'))),
-            (0, util_1.addEventListener)(__classPrivateFieldGet(this, _LifecycleWatcher_frameManager, "f"), FrameManager_1.FrameManagerEmittedEvents.LifecycleEvent, __classPrivateFieldGet(this, _LifecycleWatcher_instances, "m", _LifecycleWatcher_checkLifecycleComplete).bind(this)),
-            (0, util_1.addEventListener)(__classPrivateFieldGet(this, _LifecycleWatcher_frameManager, "f"), FrameManager_1.FrameManagerEmittedEvents.FrameNavigatedWithinDocument, __classPrivateFieldGet(this, _LifecycleWatcher_instances, "m", _LifecycleWatcher_navigatedWithinDocument).bind(this)),
-            (0, util_1.addEventListener)(__classPrivateFieldGet(this, _LifecycleWatcher_frameManager, "f"), FrameManager_1.FrameManagerEmittedEvents.FrameNavigated, __classPrivateFieldGet(this, _LifecycleWatcher_instances, "m", _LifecycleWatcher_navigated).bind(this)),
-            (0, util_1.addEventListener)(__classPrivateFieldGet(this, _LifecycleWatcher_frameManager, "f"), FrameManager_1.FrameManagerEmittedEvents.FrameSwapped, __classPrivateFieldGet(this, _LifecycleWatcher_instances, "m", _LifecycleWatcher_frameSwapped).bind(this)),
-            (0, util_1.addEventListener)(__classPrivateFieldGet(this, _LifecycleWatcher_frameManager, "f"), FrameManager_1.FrameManagerEmittedEvents.FrameDetached, __classPrivateFieldGet(this, _LifecycleWatcher_instances, "m", _LifecycleWatcher_onFrameDetached).bind(this)),
-            (0, util_1.addEventListener)(__classPrivateFieldGet(this, _LifecycleWatcher_frameManager, "f").networkManager(), NetworkManager_1.NetworkManagerEmittedEvents.Request, __classPrivateFieldGet(this, _LifecycleWatcher_instances, "m", _LifecycleWatcher_onRequest).bind(this)),
-        ], "f");
-        __classPrivateFieldSet(this, _LifecycleWatcher_timeoutPromise, __classPrivateFieldGet(this, _LifecycleWatcher_instances, "m", _LifecycleWatcher_createTimeoutPromise).call(this), "f");
-        __classPrivateFieldGet(this, _LifecycleWatcher_instances, "m", _LifecycleWatcher_checkLifecycleComplete).call(this);
+        this.#expectedLifecycle = [waitUntil];
+        this.#frameManager = frameManager;
+        this.#frame = frame;
+        this.#timeout = timeout;
+        this.#eventListeners = [
+            (0, util_1.addEventListener)(frameManager._client, Connection_1.CDPSessionEmittedEvents.Disconnected, this.#terminate.bind(this, new Error('Navigation failed because browser has disconnected!'))),
+            (0, util_1.addEventListener)(this.#frameManager, FrameManager_1.FrameManagerEmittedEvents.LifecycleEvent, this.#checkLifecycleComplete.bind(this)),
+            (0, util_1.addEventListener)(this.#frameManager, FrameManager_1.FrameManagerEmittedEvents.FrameNavigatedWithinDocument, this.#navigatedWithinDocument.bind(this)),
+            (0, util_1.addEventListener)(this.#frameManager, FrameManager_1.FrameManagerEmittedEvents.FrameNavigated, this.#navigated.bind(this)),
+            (0, util_1.addEventListener)(this.#frameManager, FrameManager_1.FrameManagerEmittedEvents.FrameSwapped, this.#frameSwapped.bind(this)),
+            (0, util_1.addEventListener)(this.#frameManager, FrameManager_1.FrameManagerEmittedEvents.FrameDetached, this.#onFrameDetached.bind(this)),
+            (0, util_1.addEventListener)(this.#frameManager.networkManager(), NetworkManager_1.NetworkManagerEmittedEvents.Request, this.#onRequest.bind(this)),
+        ];
+        this.#timeoutPromise = this.#createTimeoutPromise();
+        this.#checkLifecycleComplete();
+    }
+    #onRequest(request) {
+        if (request.frame() !== this.#frame || !request.isNavigationRequest()) {
+            return;
+        }
+        this.#navigationRequest = request;
+    }
+    #onFrameDetached(frame) {
+        if (this.#frame === frame) {
+            this.#terminationCallback.call(null, new Error('Navigating frame was detached'));
+            return;
+        }
+        this.#checkLifecycleComplete();
     }
     navigationResponse() {
-        if (!__classPrivateFieldGet(this, _LifecycleWatcher_navigationRequest, "f")) {
+        if (!this.#navigationRequest) {
             return null;
         }
-        const res = __classPrivateFieldGet(this, _LifecycleWatcher_navigationRequest, "f").response();
+        const res = this.#navigationRequest.response();
         return res;
     }
+    #terminate(error) {
+        this.#terminationCallback.call(null, error);
+    }
     sameDocumentNavigationPromise() {
-        return __classPrivateFieldGet(this, _LifecycleWatcher_sameDocumentNavigationPromise, "f");
+        return this.#sameDocumentNavigationPromise;
     }
     newDocumentNavigationPromise() {
-        return __classPrivateFieldGet(this, _LifecycleWatcher_newDocumentNavigationPromise, "f");
+        return this.#newDocumentNavigationPromise;
     }
     lifecyclePromise() {
-        return __classPrivateFieldGet(this, _LifecycleWatcher_lifecyclePromise, "f");
+        return this.#lifecyclePromise;
     }
     timeoutOrTerminationPromise() {
-        return Promise.race([__classPrivateFieldGet(this, _LifecycleWatcher_timeoutPromise, "f"), __classPrivateFieldGet(this, _LifecycleWatcher_terminationPromise, "f")]);
+        return Promise.race([this.#timeoutPromise, this.#terminationPromise]);
     }
-    dispose() {
-        (0, util_1.removeEventListeners)(__classPrivateFieldGet(this, _LifecycleWatcher_eventListeners, "f"));
-        if (__classPrivateFieldGet(this, _LifecycleWatcher_maximumTimer, "f") !== undefined) {
-            clearTimeout(__classPrivateFieldGet(this, _LifecycleWatcher_maximumTimer, "f"));
+    async #createTimeoutPromise() {
+        if (!this.#timeout) {
+            return new Promise(noop);
         }
+        const errorMessage = 'Navigation timeout of ' + this.#timeout + ' ms exceeded';
+        await new Promise((fulfill) => {
+            this.#maximumTimer = setTimeout(fulfill, this.#timeout);
+        });
+        return new Errors_1.TimeoutError(errorMessage);
+    }
+    #navigatedWithinDocument(frame) {
+        if (frame !== this.#frame) {
+            return;
+        }
+        this.#hasSameDocumentNavigation = true;
+        this.#checkLifecycleComplete();
     }
-}
-exports.LifecycleWatcher = LifecycleWatcher;
-_LifecycleWatcher_expectedLifecycle = new WeakMap(), _LifecycleWatcher_frameManager = new WeakMap(), _LifecycleWatcher_frame = new WeakMap(), _LifecycleWatcher_timeout = new WeakMap(), _LifecycleWatcher_navigationRequest = new WeakMap(), _LifecycleWatcher_eventListeners = new WeakMap(), _LifecycleWatcher_sameDocumentNavigationCompleteCallback = new WeakMap(), _LifecycleWatcher_sameDocumentNavigationPromise = new WeakMap(), _LifecycleWatcher_lifecycleCallback = new WeakMap(), _LifecycleWatcher_lifecyclePromise = new WeakMap(), _LifecycleWatcher_newDocumentNavigationCompleteCallback = new WeakMap(), _LifecycleWatcher_newDocumentNavigationPromise = new WeakMap(), _LifecycleWatcher_terminationCallback = new WeakMap(), _LifecycleWatcher_terminationPromise = new WeakMap(), _LifecycleWatcher_timeoutPromise = new WeakMap(), _LifecycleWatcher_maximumTimer = new WeakMap(), _LifecycleWatcher_hasSameDocumentNavigation = new WeakMap(), _LifecycleWatcher_newDocumentNavigation = new WeakMap(), _LifecycleWatcher_swapped = new WeakMap(), _LifecycleWatcher_instances = new WeakSet(), _LifecycleWatcher_onRequest = function _LifecycleWatcher_onRequest(request) {
-    if (request.frame() !== __classPrivateFieldGet(this, _LifecycleWatcher_frame, "f") || !request.isNavigationRequest()) {
-        return;
-    }
-    __classPrivateFieldSet(this, _LifecycleWatcher_navigationRequest, request, "f");
-}, _LifecycleWatcher_onFrameDetached = function _LifecycleWatcher_onFrameDetached(frame) {
-    if (__classPrivateFieldGet(this, _LifecycleWatcher_frame, "f") === frame) {
-        __classPrivateFieldGet(this, _LifecycleWatcher_terminationCallback, "f").call(null, new Error('Navigating frame was detached'));
-        return;
-    }
-    __classPrivateFieldGet(this, _LifecycleWatcher_instances, "m", _LifecycleWatcher_checkLifecycleComplete).call(this);
-}, _LifecycleWatcher_terminate = function _LifecycleWatcher_terminate(error) {
-    __classPrivateFieldGet(this, _LifecycleWatcher_terminationCallback, "f").call(null, error);
-}, _LifecycleWatcher_createTimeoutPromise = async function _LifecycleWatcher_createTimeoutPromise() {
-    if (!__classPrivateFieldGet(this, _LifecycleWatcher_timeout, "f")) {
-        return new Promise(noop);
-    }
-    const errorMessage = 'Navigation timeout of ' + __classPrivateFieldGet(this, _LifecycleWatcher_timeout, "f") + ' ms exceeded';
-    await new Promise((fulfill) => {
-        __classPrivateFieldSet(this, _LifecycleWatcher_maximumTimer, setTimeout(fulfill, __classPrivateFieldGet(this, _LifecycleWatcher_timeout, "f")), "f");
-    });
-    return new Errors_1.TimeoutError(errorMessage);
-}, _LifecycleWatcher_navigatedWithinDocument = function _LifecycleWatcher_navigatedWithinDocument(frame) {
-    if (frame !== __classPrivateFieldGet(this, _LifecycleWatcher_frame, "f")) {
-        return;
-    }
-    __classPrivateFieldSet(this, _LifecycleWatcher_hasSameDocumentNavigation, true, "f");
-    __classPrivateFieldGet(this, _LifecycleWatcher_instances, "m", _LifecycleWatcher_checkLifecycleComplete).call(this);
-}, _LifecycleWatcher_navigated = function _LifecycleWatcher_navigated(frame) {
-    if (frame !== __classPrivateFieldGet(this, _LifecycleWatcher_frame, "f")) {
-        return;
-    }
-    __classPrivateFieldSet(this, _LifecycleWatcher_newDocumentNavigation, true, "f");
-    __classPrivateFieldGet(this, _LifecycleWatcher_instances, "m", _LifecycleWatcher_checkLifecycleComplete).call(this);
-}, _LifecycleWatcher_frameSwapped = function _LifecycleWatcher_frameSwapped(frame) {
-    if (frame !== __classPrivateFieldGet(this, _LifecycleWatcher_frame, "f")) {
-        return;
-    }
-    __classPrivateFieldSet(this, _LifecycleWatcher_swapped, true, "f");
-    __classPrivateFieldGet(this, _LifecycleWatcher_instances, "m", _LifecycleWatcher_checkLifecycleComplete).call(this);
-}, _LifecycleWatcher_checkLifecycleComplete = function _LifecycleWatcher_checkLifecycleComplete() {
-    // We expect navigation to commit.
-    if (!checkLifecycle(__classPrivateFieldGet(this, _LifecycleWatcher_frame, "f"), __classPrivateFieldGet(this, _LifecycleWatcher_expectedLifecycle, "f"))) {
-        return;
-    }
-    __classPrivateFieldGet(this, _LifecycleWatcher_lifecycleCallback, "f").call(this);
-    if (__classPrivateFieldGet(this, _LifecycleWatcher_hasSameDocumentNavigation, "f")) {
-        __classPrivateFieldGet(this, _LifecycleWatcher_sameDocumentNavigationCompleteCallback, "f").call(this);
+    #navigated(frame) {
+        if (frame !== this.#frame) {
+            return;
+        }
+        this.#newDocumentNavigation = true;
+        this.#checkLifecycleComplete();
     }
-    if (__classPrivateFieldGet(this, _LifecycleWatcher_swapped, "f") || __classPrivateFieldGet(this, _LifecycleWatcher_newDocumentNavigation, "f")) {
-        __classPrivateFieldGet(this, _LifecycleWatcher_newDocumentNavigationCompleteCallback, "f").call(this);
+    #frameSwapped(frame) {
+        if (frame !== this.#frame) {
+            return;
+        }
+        this.#swapped = true;
+        this.#checkLifecycleComplete();
     }
-    function checkLifecycle(frame, expectedLifecycle) {
-        for (const event of expectedLifecycle) {
-            if (!frame._lifecycleEvents.has(event)) {
-                return false;
-            }
+    #checkLifecycleComplete() {
+        // We expect navigation to commit.
+        if (!checkLifecycle(this.#frame, this.#expectedLifecycle)) {
+            return;
+        }
+        this.#lifecycleCallback();
+        if (this.#hasSameDocumentNavigation) {
+            this.#sameDocumentNavigationCompleteCallback();
         }
-        for (const child of frame.childFrames()) {
-            if (child._hasStartedLoading &&
-                !checkLifecycle(child, expectedLifecycle)) {
-                return false;
+        if (this.#swapped || this.#newDocumentNavigation) {
+            this.#newDocumentNavigationCompleteCallback();
+        }
+        function checkLifecycle(frame, expectedLifecycle) {
+            for (const event of expectedLifecycle) {
+                if (!frame._lifecycleEvents.has(event)) {
+                    return false;
+                }
+            }
+            for (const child of frame.childFrames()) {
+                if (child._hasStartedLoading &&
+                    !checkLifecycle(child, expectedLifecycle)) {
+                    return false;
+                }
             }
+            return true;
         }
-        return true;
     }
-};
+    dispose() {
+        (0, util_1.removeEventListeners)(this.#eventListeners);
+        if (this.#maximumTimer !== undefined) {
+            clearTimeout(this.#maximumTimer);
+        }
+    }
+}
+exports.LifecycleWatcher = LifecycleWatcher;

package/dist/browser/NetworkEventManager.js

@@ -1,48 +1,40 @@
 "use strict";
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _NetworkEventManager_requestWillBeSentMap, _NetworkEventManager_requestPausedMap, _NetworkEventManager_httpRequestsMap, _NetworkEventManager_responseReceivedExtraInfoMap, _NetworkEventManager_queuedRedirectInfoMap, _NetworkEventManager_queuedEventGroupMap, _NetworkEventManager_failedLoadInfoMap;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NetworkEventManager = void 0;
 class NetworkEventManager {
-    constructor() {
-        _NetworkEventManager_requestWillBeSentMap.set(this, new Map());
-        _NetworkEventManager_requestPausedMap.set(this, new Map());
-        _NetworkEventManager_httpRequestsMap.set(this, new Map());
-        _NetworkEventManager_responseReceivedExtraInfoMap.set(this, new Map());
-        _NetworkEventManager_queuedRedirectInfoMap.set(this, new Map());
-        _NetworkEventManager_queuedEventGroupMap.set(this, new Map());
-        _NetworkEventManager_failedLoadInfoMap.set(this, new Map());
-    }
+    #requestWillBeSentMap = new Map();
+    #requestPausedMap = new Map();
+    #httpRequestsMap = new Map();
+    #responseReceivedExtraInfoMap = new Map();
+    #queuedRedirectInfoMap = new Map();
+    #queuedEventGroupMap = new Map();
+    #failedLoadInfoMap = new Map();
     forget(networkRequestId) {
-        __classPrivateFieldGet(this, _NetworkEventManager_requestWillBeSentMap, "f").delete(networkRequestId);
-        __classPrivateFieldGet(this, _NetworkEventManager_requestPausedMap, "f").delete(networkRequestId);
-        __classPrivateFieldGet(this, _NetworkEventManager_queuedEventGroupMap, "f").delete(networkRequestId);
-        __classPrivateFieldGet(this, _NetworkEventManager_queuedRedirectInfoMap, "f").delete(networkRequestId);
-        __classPrivateFieldGet(this, _NetworkEventManager_responseReceivedExtraInfoMap, "f").delete(networkRequestId);
-        __classPrivateFieldGet(this, _NetworkEventManager_failedLoadInfoMap, "f").delete(networkRequestId);
+        this.#requestWillBeSentMap.delete(networkRequestId);
+        this.#requestPausedMap.delete(networkRequestId);
+        this.#queuedEventGroupMap.delete(networkRequestId);
+        this.#queuedRedirectInfoMap.delete(networkRequestId);
+        this.#responseReceivedExtraInfoMap.delete(networkRequestId);
+        this.#failedLoadInfoMap.delete(networkRequestId);
     }
     queueFailedLoadInfo(networkRequestId, event) {
-        __classPrivateFieldGet(this, _NetworkEventManager_failedLoadInfoMap, "f").set(networkRequestId, { event });
+        this.#failedLoadInfoMap.set(networkRequestId, { event });
     }
     getFailedLoadInfo(networkRequestId) {
         var _a;
-        return (_a = __classPrivateFieldGet(this, _NetworkEventManager_failedLoadInfoMap, "f").get(networkRequestId)) === null || _a === void 0 ? void 0 : _a.event;
+        return (_a = this.#failedLoadInfoMap.get(networkRequestId)) === null || _a === void 0 ? void 0 : _a.event;
     }
     getResponseExtraInfo(networkRequestId) {
-        if (!__classPrivateFieldGet(this, _NetworkEventManager_responseReceivedExtraInfoMap, "f").has(networkRequestId)) {
-            __classPrivateFieldGet(this, _NetworkEventManager_responseReceivedExtraInfoMap, "f").set(networkRequestId, []);
+        if (!this.#responseReceivedExtraInfoMap.has(networkRequestId)) {
+            this.#responseReceivedExtraInfoMap.set(networkRequestId, []);
         }
-        return __classPrivateFieldGet(this, _NetworkEventManager_responseReceivedExtraInfoMap, "f").get(networkRequestId);
+        return this.#responseReceivedExtraInfoMap.get(networkRequestId);
     }
     queuedRedirectInfo(fetchRequestId) {
-        if (!__classPrivateFieldGet(this, _NetworkEventManager_queuedRedirectInfoMap, "f").has(fetchRequestId)) {
-            __classPrivateFieldGet(this, _NetworkEventManager_queuedRedirectInfoMap, "f").set(fetchRequestId, []);
+        if (!this.#queuedRedirectInfoMap.has(fetchRequestId)) {
+            this.#queuedRedirectInfoMap.set(fetchRequestId, []);
         }
-        return __classPrivateFieldGet(this, _NetworkEventManager_queuedRedirectInfoMap, "f").get(fetchRequestId);
+        return this.#queuedRedirectInfoMap.get(fetchRequestId);
     }
     queueRedirectInfo(fetchRequestId, redirectInfo) {
         this.queuedRedirectInfo(fetchRequestId).push(redirectInfo);
@@ -51,35 +43,34 @@ class NetworkEventManager {
         return this.queuedRedirectInfo(fetchRequestId).shift();
     }
     storeRequestWillBeSent(networkRequestId, event) {
-        __classPrivateFieldGet(this, _NetworkEventManager_requestWillBeSentMap, "f").set(networkRequestId, event);
+        this.#requestWillBeSentMap.set(networkRequestId, event);
     }
     getRequestWillBeSent(networkRequestId) {
-        return __classPrivateFieldGet(this, _NetworkEventManager_requestWillBeSentMap, "f").get(networkRequestId);
+        return this.#requestWillBeSentMap.get(networkRequestId);
     }
     forgetRequestWillBeSent(networkRequestId) {
-        __classPrivateFieldGet(this, _NetworkEventManager_requestWillBeSentMap, "f").delete(networkRequestId);
+        this.#requestWillBeSentMap.delete(networkRequestId);
     }
     storeRequestPaused(networkRequestId, event) {
-        __classPrivateFieldGet(this, _NetworkEventManager_requestPausedMap, "f").set(networkRequestId, event);
+        this.#requestPausedMap.set(networkRequestId, event);
     }
     getRequest(networkRequestId) {
-        return __classPrivateFieldGet(this, _NetworkEventManager_httpRequestsMap, "f").get(networkRequestId);
+        return this.#httpRequestsMap.get(networkRequestId);
     }
     storeRequest(networkRequestId, request) {
-        __classPrivateFieldGet(this, _NetworkEventManager_httpRequestsMap, "f").set(networkRequestId, request);
+        this.#httpRequestsMap.set(networkRequestId, request);
     }
     forgetRequest(networkRequestId) {
-        __classPrivateFieldGet(this, _NetworkEventManager_httpRequestsMap, "f").delete(networkRequestId);
+        this.#httpRequestsMap.delete(networkRequestId);
     }
     getQueuedEventGroup(networkRequestId) {
-        return __classPrivateFieldGet(this, _NetworkEventManager_queuedEventGroupMap, "f").get(networkRequestId);
+        return this.#queuedEventGroupMap.get(networkRequestId);
     }
     queueEventGroup(networkRequestId, event) {
-        __classPrivateFieldGet(this, _NetworkEventManager_queuedEventGroupMap, "f").set(networkRequestId, event);
+        this.#queuedEventGroupMap.set(networkRequestId, event);
     }
     forgetQueuedEventGroup(networkRequestId) {
-        __classPrivateFieldGet(this, _NetworkEventManager_queuedEventGroupMap, "f").delete(networkRequestId);
+        this.#queuedEventGroupMap.delete(networkRequestId);
     }
 }
 exports.NetworkEventManager = NetworkEventManager;
-_NetworkEventManager_requestWillBeSentMap = new WeakMap(), _NetworkEventManager_requestPausedMap = new WeakMap(), _NetworkEventManager_httpRequestsMap = new WeakMap(), _NetworkEventManager_responseReceivedExtraInfoMap = new WeakMap(), _NetworkEventManager_queuedRedirectInfoMap = new WeakMap(), _NetworkEventManager_queuedEventGroupMap = new WeakMap(), _NetworkEventManager_failedLoadInfoMap = new WeakMap();