testplane 8.42.5 → 8.43.0

package/build/package.json

@@ -1,6 +1,6 @@
 {
     "name": "testplane",
-    "version": "8.42.5",
+    "version": "8.43.0",
     "description": "Tests framework based on mocha and wdio",
     "main": "build/src/index.js",
     "files": [
@@ -72,7 +72,7 @@
         "@testplane/devtools": "8.32.5",
         "@testplane/wdio-protocols": "9.4.7",
         "@testplane/wdio-utils": "9.5.4",
-        "@testplane/webdriverio": "9.5.24",
+        "@testplane/webdriverio": "9.5.25",
         "@vitest/spy": "2.1.4",
         "buffer-crc32": "1.0.0",
         "chalk": "2.4.2",
@@ -125,7 +125,7 @@
         "@rrweb/record": "2.0.0-alpha.18",
         "@sinonjs/fake-timers": "10.3.0",
         "@swc/core": "1.13.3",
-        "@testplane/wdio-types": "9.5.4",
+        "@testplane/wdio-types": "9.5.5",
         "@types/babel__code-frame": "7.0.6",
         "@types/browserify": "12.0.40",
         "@types/chai": "4.3.4",
@@ -139,7 +139,7 @@
         "@types/lodash": "4.14.191",
         "@types/micromatch": "4.0.9",
         "@types/mocha": "10.0.1",
-        "@types/node": "18.19.3",
+        "@types/node": "20.19.39",
         "@types/proper-lockfile": "4.1.4",
         "@types/proxyquire": "1.3.28",
         "@types/set-cookie-parser": "2.4.10",

package/build/src/browser/browser.js

@@ -109,11 +109,12 @@ class Browser {
                     if (!lodash_1.default.isNull(this._config[optName])) {
                         req = this._config[optName](req);
                     }
-                    if (!req.headers["X-Request-ID"]) {
-                        req.headers["X-Request-ID"] = `${this.state.testXReqId}${browser_1.X_REQUEST_ID_DELIMITER}${crypto_1.default.randomUUID()}`;
+                    const requestHeaders = req.headers;
+                    if (!requestHeaders["X-Request-ID"]) {
+                        requestHeaders["X-Request-ID"] = `${this.state.testXReqId}${browser_1.X_REQUEST_ID_DELIMITER}${crypto_1.default.randomUUID()}`;
                     }
-                    if (!req.headers["traceparent"] && this.state.traceparent) {
-                        req.headers["traceparent"] = this.state.traceparent;
+                    if (!requestHeaders["traceparent"] && this.state.traceparent) {
+                        requestHeaders["traceparent"] = this.state.traceparent;
                     }
                     return req;
                 };

package/build/src/browser/browser.js.map

@@ -1 +1 @@
-{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../../src/browser/browser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../../src/browser/browser.ts"],"names":[],"mappings":"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"}

package/build/src/browser/cdp/connection.d.ts

@@ -3,50 +3,13 @@ import type { Browser } from "../types";
 type OnEventMessageFn = (cdpEventMessage: CDPEvent) => unknown;
 export declare class CDPConnection {
     onEventMessage: OnEventMessageFn | null;
-    private readonly _cdpWsEndpoint;
-    private readonly _headers?;
-    private _onPong;
-    private _pingInterval;
-    private _pingSubsequentFails;
-    private _onConnectionCloseFn;
-    private _wsConnectionStatus;
-    private _wsConnection;
-    private _wsConnectionPromise;
-    private _requestId;
-    private _pendingRequests;
+    private readonly _wsConnection;
     private constructor();
     /** @description Creates CDPConnection without establishing it */
     static create(browser: Browser): Promise<CDPConnection>;
-    /** @description Tries to establish ws connection with timeout */
-    private _tryToEstablishWsConnection;
-    /**
-     * @description creates ws connection with retries or returns existing one
-     * @note Concurrent requests with same params produce same ws connection
-     */
-    private _getWsConnection;
-    /** @description Handles websocket incoming messages, resolving pending requests */
+    close(): void;
     private _onMessage;
-    /**
-     * @description Produces connection-"uniq" request ids
-     * @note Theoretically, it can collide, but given "CDP_MAX_REQUEST_ID" is INT32_MAX, it wont
-     */
-    private _getRequestId;
-    /** @description establishes ws connection, sends request with timeout and waits for response */
-    private _tryToSendRequest;
     /** @description Performs high-level CDP request with retries and timeouts */
     request<T = void>(method: CDPRequest["method"], { params, sessionId }?: Omit<CDPRequest, "id" | "method">): Promise<T>;
-    private _closeWsConnection;
-    /**
-     * @description Tries to re-establish connection after network drops
-     * @note Silently gives up after failed "CDP_CONNECTION_RETRIES" attempts
-     */
-    private _tryToReconnect;
-    /** @description Used to abort all pending requests when connection is closed */
-    private _abortPendingRequests;
-    /** @description Closes websocket connection, terminating all pending requests */
-    close(): void;
-    private _pingHealthCheckStop;
-    private _isWebSocketActive;
-    private _pingHealthCheckStart;
 }
 export {};

package/build/src/browser/cdp/connection.js

@@ -1,45 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CDPConnection = void 0;
-const ws_1 = require("ws");
+const node_util_1 = require("node:util");
 const debug_1 = require("./debug");
 const ws_endpoint_1 = require("./ws-endpoint");
 const utils_1 = require("./utils");
 const error_1 = require("./error");
 const constants_1 = require("./constants");
-var WsConnectionStatus;
-(function (WsConnectionStatus) {
-    WsConnectionStatus[WsConnectionStatus["DISCONNECTED"] = 0] = "DISCONNECTED";
-    WsConnectionStatus[WsConnectionStatus["CONNECTING"] = 1] = "CONNECTING";
-    WsConnectionStatus[WsConnectionStatus["CONNECTED"] = 2] = "CONNECTED";
-    WsConnectionStatus[WsConnectionStatus["CLOSED"] = 3] = "CLOSED";
-})(WsConnectionStatus || (WsConnectionStatus = {}));
-// Closing WS when its still not connected produces error:
-// https://github.com/websockets/ws/blob/86eac5b44ac2bff9087ec40c9bd06bc7b4f0da07/lib/websocket.js#L297-L301
-const closeWsConnection = (ws) => {
-    if (ws.readyState !== ws.CONNECTING) {
-        ws.close();
-    }
-    else {
-        ws.once("open", () => {
-            ws.close();
-        });
-    }
-};
+const ws_connection_1 = require("../../ws-connection");
+const constants_2 = require("../../ws-connection/constants");
+const error_2 = require("../../ws-connection/error");
+const utils_2 = require("../../ws-connection/utils");
 class CDPConnection {
     constructor(cdpWsEndpoint, headers) {
         this.onEventMessage = null;
-        this._onPong = null;
-        this._pingInterval = null;
-        this._pingSubsequentFails = 0;
-        this._onConnectionCloseFn = null; // Defined, if there is connection attempt at the moment
-        this._wsConnectionStatus = WsConnectionStatus.DISCONNECTED;
-        this._wsConnection = null;
-        this._wsConnectionPromise = null;
-        this._requestId = 0;
-        this._pendingRequests = {};
-        this._cdpWsEndpoint = cdpWsEndpoint;
-        this._headers = headers;
+        this._wsConnection = new ws_connection_1.WsConnection(cdpWsEndpoint, {
+            headers,
+            debugFn: debug_1.debugCdp,
+            retries: {
+                count: constants_1.CDP_CONNECTION_RETRIES,
+                baseDelay: constants_1.CDP_CONNECTION_RETRY_BASE_DELAY,
+            },
+            timeouts: {
+                request: constants_1.CDP_REQUEST_TIMEOUT,
+                createSession: constants_1.CDP_CONNECTION_TIMEOUT,
+            },
+            errors: {
+                ConnectionEstablishment: error_1.CDPConnectionEstablishmentError,
+                ConnectionBreak: error_1.CDPConnectionBreakError,
+                ConnectionTerminated: error_1.CDPConnectionTerminatedError,
+                ConnectionTimeout: error_1.CDPConnectionTimeoutError,
+                RequestTimeout: error_1.CDPRequestError,
+            },
+            onMessage: this._onMessage.bind(this),
+        });
     }
     /** @description Creates CDPConnection without establishing it */
     static async create(browser) {
@@ -51,156 +45,21 @@ class CDPConnection {
         }
         return new this(cdpWsEndpoint, headers);
     }
-    /** @description Tries to establish ws connection with timeout */
-    async _tryToEstablishWsConnection(endpoint) {
-        return new Promise(resolve => {
-            try {
-                const onConnectionCloseFn = () => done(new error_1.CDPConnectionTerminatedError());
-                if (this._wsConnectionStatus === WsConnectionStatus.CLOSED) {
-                    onConnectionCloseFn();
-                }
-                else {
-                    this._onConnectionCloseFn = onConnectionCloseFn;
-                }
-                // eslint-disable-next-line
-                const cdpConnectionInstance = this;
-                const ws = new ws_1.WebSocket(endpoint, { headers: this._headers });
-                let isSettled = false;
-                const timeoutId = setTimeout(() => {
-                    closeWsConnection(ws);
-                    done(new error_1.CDPTimeoutError({
-                        message: `Couldn't establish CDP connection to "${endpoint}" in ${constants_1.CDP_CONNECTION_TIMEOUT}ms`,
-                    }));
-                }, constants_1.CDP_CONNECTION_TIMEOUT).unref();
-                const onOpen = () => {
-                    done(ws);
-                };
-                const onError = (error) => {
-                    closeWsConnection(ws);
-                    done(new error_1.CDPError({
-                        message: `Couldn't establish CDP connection to "${endpoint}": ${error}`,
-                    }));
-                };
-                const onClose = () => {
-                    done(new error_1.CDPError({
-                        message: `CDP connection to "${endpoint}" unexpectedly closed while establishing`,
-                    }));
-                };
-                ws.on("open", onOpen);
-                ws.on("error", onError);
-                ws.on("close", onClose);
-                // eslint-disable-next-line no-inner-declarations
-                function done(result) {
-                    if (isSettled) {
-                        return;
-                    }
-                    cdpConnectionInstance._onConnectionCloseFn = null;
-                    isSettled = true;
-                    clearTimeout(timeoutId);
-                    ws.off("open", onOpen);
-                    ws.off("error", onError);
-                    ws.off("close", onClose);
-                    resolve(result);
-                }
-            }
-            catch (err) {
-                resolve(err);
-            }
-        });
-    }
-    /**
-     * @description creates ws connection with retries or returns existing one
-     * @note Concurrent requests with same params produce same ws connection
-     */
-    async _getWsConnection() {
-        const ws = this._wsConnection;
-        if (this._wsConnectionStatus === WsConnectionStatus.CLOSED) {
-            throw new error_1.CDPConnectionTerminatedError({ message: `Session to ${this._cdpWsEndpoint} was closed` });
-        }
-        if (this._wsConnectionStatus === WsConnectionStatus.CONNECTING && this._wsConnectionPromise) {
-            return this._wsConnectionPromise;
-        }
-        if (this._wsConnectionStatus === WsConnectionStatus.CONNECTED && ws && ws.readyState === ws.OPEN) {
-            return ws;
-        }
-        if (this._wsConnectionStatus === WsConnectionStatus.CONNECTED && ws && ws.readyState !== ws.OPEN) {
-            this._closeWsConnection("CDP connection was in invalid state", WsConnectionStatus.DISCONNECTED);
-        }
-        this._wsConnectionStatus = WsConnectionStatus.CONNECTING;
-        this._wsConnectionPromise = (async () => {
-            try {
-                for (let retriesLeft = constants_1.CDP_CONNECTION_RETRIES; retriesLeft >= 0; retriesLeft--) {
-                    const result = await this._tryToEstablishWsConnection(this._cdpWsEndpoint);
-                    if (this._wsConnectionStatus === WsConnectionStatus.CLOSED) {
-                        if (result instanceof ws_1.WebSocket) {
-                            closeWsConnection(result);
-                        }
-                        throw new error_1.CDPConnectionTerminatedError();
-                    }
-                    if (result instanceof ws_1.WebSocket) {
-                        (0, debug_1.debugCdp)(`Established CDP connection to ${this._cdpWsEndpoint}`);
-                        this._wsConnection = result;
-                        this._wsConnectionStatus = WsConnectionStatus.CONNECTED;
-                        this._pingHealthCheckStart();
-                        const onPing = () => result.pong();
-                        const onMessage = (data) => this._onMessage(data);
-                        const onError = (err) => {
-                            if (result === this._wsConnection) {
-                                this._closeWsConnection(`An error occured in CDP connection: ${err}`, WsConnectionStatus.DISCONNECTED);
-                                this._tryToReconnect();
-                            }
-                        };
-                        result.on("ping", onPing);
-                        result.on("message", onMessage);
-                        result.on("error", onError);
-                        result.once("close", () => {
-                            result.off("ping", onPing);
-                            result.off("message", onMessage);
-                            result.off("error", onError);
-                            if (result === this._wsConnection) {
-                                this._closeWsConnection("CDP connection was closed unexpectedly", WsConnectionStatus.DISCONNECTED);
-                                this._tryToReconnect();
-                            }
-                        });
-                        return result;
-                    }
-                    if (!(result instanceof error_1.CDPError) || result instanceof error_1.CDPConnectionTerminatedError) {
-                        throw result;
-                    }
-                    (0, debug_1.debugCdp)(`${result.message}; retries left: ${retriesLeft}`);
-                    // Intentionally avoiding wait after timeout
-                    if (result instanceof error_1.CDPError && !(result instanceof error_1.CDPTimeoutError)) {
-                        await (0, utils_1.exponentiallyWait)({
-                            baseDelay: constants_1.CDP_CONNECTION_RETRY_BASE_DELAY,
-                            attempt: constants_1.CDP_CONNECTION_RETRIES - retriesLeft,
-                        });
-                    }
-                }
-                throw new error_1.CDPError({
-                    message: `Couldn't establish CDP connection to ${this._cdpWsEndpoint} in ${constants_1.CDP_CONNECTION_RETRIES} retries`,
-                });
-            }
-            catch (err) {
-                if (this._wsConnectionStatus === WsConnectionStatus.CONNECTING) {
-                    this._wsConnectionStatus = WsConnectionStatus.DISCONNECTED;
-                    this._wsConnectionPromise = null;
-                }
-                throw err;
-            }
-            finally {
-                if (this._wsConnectionStatus !== WsConnectionStatus.CONNECTING) {
-                    this._wsConnectionPromise = null;
-                }
-            }
-        })();
-        return this._wsConnectionPromise;
+    close() {
+        this._wsConnection.close();
     }
-    /** @description Handles websocket incoming messages, resolving pending requests */
     _onMessage(data) {
         const message = data.toString("utf8");
-        (0, debug_1.debugCdp)(`< ${message}`);
         try {
             const jsonParsedMessage = JSON.parse(message);
+            if (debug_1.debugCdp.enabled) {
+                (0, debug_1.debugCdp)(`< ${(0, node_util_1.inspect)(jsonParsedMessage, {
+                    depth: 3,
+                    maxStringLength: 150,
+                    breakLength: Infinity,
+                    compact: true,
+                })}`);
+            }
             if (!("id" in jsonParsedMessage)) {
                 if (this.onEventMessage) {
                     this.onEventMessage(jsonParsedMessage);
@@ -208,218 +67,79 @@ class CDPConnection {
                 return;
             }
             const requestId = jsonParsedMessage.id;
-            if (!this._pendingRequests[requestId]) {
-                (0, debug_1.debugCdp)(`Received response to request ${requestId}, which is probably timed out already`);
-                return;
-            }
             if ("result" in jsonParsedMessage) {
-                this._pendingRequests[requestId](jsonParsedMessage.result);
+                this._wsConnection.provideResponseFor(requestId, jsonParsedMessage.result);
             }
             else if ("error" in jsonParsedMessage) {
-                this._pendingRequests[requestId](new error_1.CDPError({
+                this._wsConnection.provideResponseFor(requestId, new error_1.CDPRequestError({
                     message: jsonParsedMessage.error.message,
                     code: jsonParsedMessage.error.code,
-                    requestId: requestId,
+                    requestId,
                 }));
             }
             else {
-                this._pendingRequests[requestId](new error_1.CDPError({
+                this._wsConnection.provideResponseFor(requestId, new error_1.CDPRequestError({
                     message: "Received malformed response without result",
-                    code: constants_1.CDP_ERROR_CODE.MALFORMED_RESPONSE,
-                    requestId: requestId,
+                    code: constants_2.WS_ERROR_CODE.MALFORMED_RESPONSE,
+                    requestId,
                 }));
             }
         }
         catch (err) {
-            (0, debug_1.debugCdp)(`Couldn't process CDP message.\n\tError: ${err}\n\tMessage: "${message}"`);
+            if (debug_1.debugCdp.enabled) {
+                (0, debug_1.debugCdp)(`\u2718 Couldn't process CDP message\n\tError: ${err}\n\tMessage: "${message}"`);
+            }
             const requestId = (0, utils_1.extractRequestIdFromBrokenResponse)(message);
-            if (requestId && this._pendingRequests[requestId]) {
-                this._pendingRequests[requestId](new error_1.CDPError({
+            if (requestId) {
+                this._wsConnection.provideResponseFor(requestId, new error_1.CDPRequestError({
                     message: "Received malformed response: response is invalid JSON",
-                    code: constants_1.CDP_ERROR_CODE.MALFORMED_RESPONSE,
-                    requestId: requestId,
+                    code: constants_2.WS_ERROR_CODE.MALFORMED_RESPONSE,
+                    requestId,
                 }));
             }
         }
     }
-    /**
-     * @description Produces connection-"uniq" request ids
-     * @note Theoretically, it can collide, but given "CDP_MAX_REQUEST_ID" is INT32_MAX, it wont
-     */
-    _getRequestId() {
-        const id = ++this._requestId;
-        if (this._requestId >= constants_1.CDP_MAX_REQUEST_ID) {
-            this._requestId = 0;
-        }
-        return id;
-    }
-    /** @description establishes ws connection, sends request with timeout and waits for response */
-    async _tryToSendRequest(method, { params, sessionId }) {
-        const id = this._getRequestId();
-        const ws = await this._getWsConnection();
-        const requestMessage = JSON.stringify({ id, sessionId, method, params });
-        if (this._wsConnectionStatus === WsConnectionStatus.CLOSED) {
-            throw new error_1.CDPConnectionTerminatedError({
-                message: `Couldn't send "${requestMessage}" because CDP connection was manually closed`,
-            });
-        }
-        (0, debug_1.debugCdp)(`> ${requestMessage}`);
-        return new Promise(resolve => {
-            const pendingRequests = this._pendingRequests;
-            let isSettled = false;
-            const onTimeout = setTimeout(() => {
-                const err = new error_1.CDPTimeoutError({
-                    message: `Timed out while waiting for ${method} for ${constants_1.CDP_REQUEST_TIMEOUT}ms`,
-                    requestId: id,
-                });
-                done(err);
-            }, constants_1.CDP_REQUEST_TIMEOUT).unref();
-            function done(response) {
-                if (isSettled) {
-                    return;
-                }
-                isSettled = true;
-                delete pendingRequests[id];
-                clearTimeout(onTimeout);
-                resolve(response);
-            }
-            pendingRequests[id] = done;
-            ws.send(requestMessage, error => {
-                if (!error) {
-                    return;
-                }
-                done(new error_1.CDPError({
-                    message: `Couldn't send CDP request "${method}": ${error.message}`,
-                    code: constants_1.CDP_ERROR_CODE.SEND_FAILED,
-                    requestId: id,
-                }));
-                // Proactively closing connection as "send error" is marker that something bad with connection happened
-                if (ws === this._wsConnection) {
-                    this._closeWsConnection("CDP connection was considered broken as 'send' failed", WsConnectionStatus.DISCONNECTED);
-                    this._tryToReconnect();
-                }
-            });
-        });
-    }
     /** @description Performs high-level CDP request with retries and timeouts */
     async request(method, { params, sessionId } = {}) {
         let result;
         for (let retriesLeft = constants_1.CDP_REQUEST_RETRIES; retriesLeft >= 0; retriesLeft--) {
-            result = (await this._tryToSendRequest(method, { params, sessionId }));
-            const noRetriesLeft = retriesLeft <= 0;
-            const connectionIsClosed = this._wsConnectionStatus === WsConnectionStatus.CLOSED;
-            if (!(result instanceof error_1.CDPError) || result.isNonRetryable() || noRetriesLeft || connectionIsClosed) {
+            const id = this._wsConnection.getRequestId();
+            const requestMessage = JSON.stringify({ id, sessionId, method, params });
+            if (debug_1.debugCdp.enabled) {
+                (0, debug_1.debugCdp)(`> ${(0, node_util_1.inspect)(requestMessage, {
+                    depth: 3,
+                    maxStringLength: 150,
+                    breakLength: Infinity,
+                    compact: true,
+                })}`);
+            }
+            result = (await this._wsConnection.makeRequest(id, requestMessage));
+            if (!(result instanceof error_2.WsError) || !result.isRetryable() || retriesLeft <= 0) {
                 break;
             }
-            (0, debug_1.debugCdp)(`${result.message}; retries left: ${retriesLeft}`);
+            if (debug_1.debugCdp.enabled) {
+                (0, debug_1.debugCdp)(`⟳ ${(0, node_util_1.inspect)({
+                    id,
+                    sessionId,
+                    method,
+                    params,
+                    errorMessage: result.message,
+                    retriesLeft: retriesLeft,
+                })}`);
+            }
             // Intentionally avoiding wait after timeout
-            if (result instanceof error_1.CDPError && !(result instanceof error_1.CDPTimeoutError)) {
-                await (0, utils_1.exponentiallyWait)({
+            if (!(result instanceof error_1.CDPRequestTimeoutError)) {
+                await (0, utils_2.exponentiallyWait)({
                     baseDelay: constants_1.CDP_REQUEST_RETRY_BASE_DELAY,
                     attempt: constants_1.CDP_REQUEST_RETRIES - retriesLeft,
                 });
             }
         }
-        if (result instanceof Error) {
+        if (result instanceof error_2.WsError) {
             throw result;
         }
         return result;
     }
-    _closeWsConnection(sessionAbortMessage, status) {
-        const ws = this._wsConnection;
-        if (!ws || this._wsConnectionStatus === WsConnectionStatus.CLOSED) {
-            this._wsConnection = null;
-            return;
-        }
-        (0, debug_1.debugCdp)(`${sessionAbortMessage}; endpoint: "${this._cdpWsEndpoint}"`);
-        if (status === WsConnectionStatus.CLOSED && this._onConnectionCloseFn) {
-            this._onConnectionCloseFn();
-        }
-        this._wsConnection = null;
-        this._wsConnectionStatus = status;
-        this._abortPendingRequests(`Request was aborted because ${sessionAbortMessage}`);
-        this._pingHealthCheckStop();
-        closeWsConnection(ws);
-    }
-    /**
-     * @description Tries to re-establish connection after network drops
-     * @note Silently gives up after failed "CDP_CONNECTION_RETRIES" attempts
-     */
-    _tryToReconnect() {
-        (0, debug_1.debugCdp)(`Trying to reconnect; endpoint: "${this._cdpWsEndpoint}"`);
-        this._getWsConnection()
-            .then(() => (0, debug_1.debugCdp)(`Successfully reconnected to session; endpoint: "${this._cdpWsEndpoint}"`))
-            .catch(() => (0, debug_1.debugCdp)(`Couldn't reconnect to session automatically; endpoint: "${this._cdpWsEndpoint}"`));
-    }
-    /** @description Used to abort all pending requests when connection is closed */
-    _abortPendingRequests(message) {
-        const pendingRequests = this._pendingRequests;
-        const pendingRequestIds = Object.keys(pendingRequests).map(Number);
-        this._pendingRequests = {};
-        for (const requestId of pendingRequestIds) {
-            if (pendingRequests[requestId]) {
-                pendingRequests[requestId](new error_1.CDPConnectionTerminatedError({
-                    message,
-                    requestId,
-                }));
-            }
-        }
-    }
-    /** @description Closes websocket connection, terminating all pending requests */
-    close() {
-        this._closeWsConnection("Connection was closed manually", WsConnectionStatus.CLOSED);
-    }
-    _pingHealthCheckStop() {
-        this._pingSubsequentFails = 0;
-        if (this._pingInterval) {
-            clearInterval(this._pingInterval);
-        }
-        if (this._wsConnection && this._onPong) {
-            this._wsConnection.off("pong", this._onPong);
-        }
-    }
-    _isWebSocketActive(ws) {
-        return Boolean(ws.readyState !== ws.CLOSED && ws.readyState !== ws.CLOSING && ws === this._wsConnection);
-    }
-    _pingHealthCheckStart() {
-        this._pingHealthCheckStop();
-        const ws = this._wsConnection;
-        if (!ws || !this._isWebSocketActive(ws)) {
-            return;
-        }
-        this._pingHealthCheckStop();
-        let isWaitingForPong = false;
-        let pongTimeout;
-        const onPong = (this._onPong = () => {
-            if (isWaitingForPong && this._isWebSocketActive(ws)) {
-                isWaitingForPong = false;
-                (0, debug_1.debugCdp)("< PONG");
-                clearTimeout(pongTimeout);
-                this._pingSubsequentFails = 0;
-            }
-        });
-        ws.on("pong", onPong);
-        const pingInterval = (this._pingInterval = setInterval(() => {
-            if (!this._isWebSocketActive(ws)) {
-                clearInterval(pingInterval);
-                return;
-            }
-            pongTimeout = setTimeout(() => {
-                if (isWaitingForPong && this._isWebSocketActive(ws)) {
-                    isWaitingForPong = false;
-                    this._pingSubsequentFails++;
-                    (0, debug_1.debugCdp)(`Ping failed(${this._pingSubsequentFails} in a row) in ${constants_1.CDP_PING_TIMEOUT}ms`);
-                    if (this._pingSubsequentFails >= constants_1.CDP_PING_MAX_SUBSEQUENT_FAILS) {
-                        this._closeWsConnection(`CDP connection was considered broken as ${this._pingSubsequentFails} pings failed in a row`, WsConnectionStatus.DISCONNECTED);
-                        this._tryToReconnect();
-                    }
-                }
-            }, constants_1.CDP_PING_TIMEOUT).unref();
-            ws.ping();
-            (0, debug_1.debugCdp)("> PING");
-            isWaitingForPong = true;
-        }, constants_1.CDP_PING_INTERVAL).unref());
-    }
 }
 exports.CDPConnection = CDPConnection;
 //# sourceMappingURL=connection.js.map