extension 3.12.1 → 3.12.2

package/dist/{859.cjs → 728.cjs}

@@ -1,19 +1,19 @@
 "use strict";
 exports.ids = [
-    "859"
+    "728"
 ];
 exports.modules = {
-    "../browser/run-chromium/chromium-launch/setup-cdp-after-launch.ts" (__unused_rspack_module, __webpack_exports__, __webpack_require__) {
+    "./browsers/run-chromium/chromium-launch/setup-cdp-after-launch.ts" (__unused_rspack_module, __webpack_exports__, __webpack_require__) {
         __webpack_require__.d(__webpack_exports__, {
             setupCdpAfterLaunch: ()=>setupCdpAfterLaunch
         });
-        var messages = __webpack_require__("../browser/browsers-lib/messages.ts");
-        var shared_utils = __webpack_require__("../browser/browsers-lib/shared-utils.ts");
-        var banner = __webpack_require__("../browser/browsers-lib/banner.ts");
+        var messages = __webpack_require__("./browsers/browsers-lib/messages.ts");
+        var shared_utils = __webpack_require__("./browsers/browsers-lib/shared-utils.ts");
+        var banner = __webpack_require__("./browsers/browsers-lib/banner.ts");
         var external_path_ = __webpack_require__("path");
         var external_fs_ = __webpack_require__("fs");
-        var content_script_targets = __webpack_require__("../browser/browsers-lib/content-script-targets.ts");
-        var content_script_contracts = __webpack_require__("../browser/browsers-lib/content-script-contracts.ts");
+        var content_script_targets = __webpack_require__("./browsers/browsers-lib/content-script-targets.ts");
+        var content_script_contracts = __webpack_require__("./browsers/browsers-lib/content-script-contracts.ts");
         async function deriveExtensionIdFromTargetsHelper(cdp, outPath, maxRetries = 6, backoffMs = 150, profilePath, extensionPaths) {
             let expectedName;
             let expectedVersion;
@@ -161,78 +161,10 @@ exports.modules = {
             }
             return deriveFromProfile() || deferredFirstEvalId || deferredUrlDerivedId;
         }
-        var wrapper = __webpack_require__("../../node_modules/.pnpm/ws@8.19.0/node_modules/ws/wrapper.mjs");
-        var external_http_ = __webpack_require__("http");
-        var external_net_ = __webpack_require__("net");
-        const CDP_HTTP_REQUEST_TIMEOUT_MS = 1200;
-        async function getJson(host, port, path) {
-            return new Promise((resolve, reject)=>{
-                const req = external_http_.request({
-                    hostname: host,
-                    port,
-                    path,
-                    method: 'GET'
-                }, (res)=>{
-                    let data = '';
-                    res.on('data', (chunk)=>data += chunk);
-                    res.on('end', ()=>{
-                        try {
-                            resolve(JSON.parse(data));
-                        } catch (e) {
-                            reject(new Error(`Failed to parse ${path}: ${e}`));
-                        }
-                    });
-                });
-                req.on('error', (err)=>reject(err));
-                req.setTimeout(CDP_HTTP_REQUEST_TIMEOUT_MS, ()=>{
-                    req.destroy(new Error(`CDP endpoint timed out: ${path}`));
-                });
-                req.end();
-            });
-        }
-        async function discoverWebSocketDebuggerUrl(host, port, isDev) {
-            try {
-                const version = await getJson(host, port, '/json/version');
-                const wsUrl = 'string' == typeof version?.webSocketDebuggerUrl ? version.webSocketDebuggerUrl : void 0;
-                if (wsUrl) {
-                    if (isDev) console.log(messages.Ter());
-                    return wsUrl;
-                }
-            } catch (error) {
-                if (isDev) console.warn('[CDP] Failed to read /json/version:', String(error?.message || error));
-            }
-            const targets = await getJson(host, port, '/json');
-            if (isDev) console.log(messages.FFz((targets || []).length || 0));
-            const pageTarget = (targets || []).find((target)=>{
-                const type = String(target?.type || '');
-                const ws = 'string' == typeof target?.webSocketDebuggerUrl ? target.webSocketDebuggerUrl : '';
-                return 'page' === type && ws;
-            });
-            const pageWs = 'string' == typeof pageTarget?.webSocketDebuggerUrl ? pageTarget.webSocketDebuggerUrl : '';
-            if (pageWs) {
-                if (isDev) console.log(messages.Ter());
-                return pageWs;
-            }
-            throw new Error('No CDP WebSocket URL available');
-        }
-        async function checkChromeRemoteDebugging(port = 9222) {
-            return new Promise((resolve)=>{
-                const socket = new external_net_.Socket();
-                socket.on('connect', ()=>{
-                    socket.destroy();
-                    resolve(true);
-                });
-                socket.on('error', ()=>{
-                    resolve(false);
-                });
-                socket.on('timeout', ()=>{
-                    socket.destroy();
-                    resolve(false);
-                });
-                socket.setTimeout(2000);
-                socket.connect(port, 'localhost');
-            });
-        }
+        var external_ws_ = __webpack_require__("ws");
+        var external_ws_default = /*#__PURE__*/ __webpack_require__.n(external_ws_);
+        var constants = __webpack_require__("./browsers/browsers-lib/constants.ts");
+        var discovery = __webpack_require__("./browsers/run-chromium/chromium-source-inspection/discovery.ts");
         async function getExtensionInfo(cdp, extensionId) {
             return await cdp.sendCommand('Extensions.getExtensionInfo', {
                 extensionId
@@ -687,7 +619,7 @@ exports.modules = {
         }
         function establishBrowserConnection(url, isDev, onMessage, onRejectPending) {
             return new Promise((resolve, reject)=>{
-                const ws = new wrapper.Ay(url);
+                const ws = new (external_ws_default())(url);
                 ws.on('open', ()=>{
                     if (isDev) console.log(messages.F1E());
                     resolve(ws);
@@ -723,8 +655,11 @@ exports.modules = {
             async connect() {
                 return new Promise(async (resolve, reject)=>{
                     try {
-                        this.targetWebSocketUrl = await discoverWebSocketDebuggerUrl(this.host, this.port, this.isDev());
+                        this.targetWebSocketUrl = await (0, discovery.N)(this.host, this.port, this.isDev());
+                        let pendingRejected = false;
                         this.ws = await establishBrowserConnection(this.targetWebSocketUrl, this.isDev(), (data)=>this.handleMessage(data), (reason)=>{
+                            if (pendingRejected) return;
+                            pendingRejected = true;
                             this.pendingRequests.forEach(({ reject, timeout }, id)=>{
                                 try {
                                     reject(new Error(reason));
@@ -737,7 +672,9 @@ exports.modules = {
                                 if (timeout) clearTimeout(timeout);
                                 this.pendingRequests.delete(id);
                             });
+                            this.ws = null;
                         });
+                        this.startHeartbeat();
                         if (this.isDev()) console.log(messages.M3V(this.host, this.port));
                         resolve();
                     } catch (error) {
@@ -747,6 +684,7 @@ exports.modules = {
                 });
             }
             disconnect() {
+                this.stopHeartbeat();
                 if (this.ws) {
                     try {
                         this.ws.close();
@@ -754,8 +692,27 @@ exports.modules = {
                     this.ws = null;
                 }
             }
+            startHeartbeat() {
+                this.stopHeartbeat();
+                this.heartbeatTimer = setInterval(async ()=>{
+                    if (!this.isConnected()) return void this.stopHeartbeat();
+                    try {
+                        await this.getBrowserVersion();
+                    } catch  {
+                        if (this.isDev()) console.warn('[CDP] Heartbeat failed, connection appears dead');
+                        this.disconnect();
+                    }
+                }, constants.Y$);
+                if ('function' == typeof this.heartbeatTimer.unref) this.heartbeatTimer.unref();
+            }
+            stopHeartbeat() {
+                if (this.heartbeatTimer) {
+                    clearInterval(this.heartbeatTimer);
+                    this.heartbeatTimer = null;
+                }
+            }
             isConnected() {
-                return !!this.ws && this.ws.readyState === wrapper.Ay.OPEN;
+                return !!this.ws && this.ws.readyState === external_ws_default().OPEN;
             }
             onProtocolEvent(handler) {
                 this.eventCallbacks.add(handler);
@@ -788,9 +745,9 @@ exports.modules = {
                     }
                 }
             }
-            async sendCommand(method, params = {}, sessionId, timeoutMs = 12000) {
+            async sendCommand(method, params = {}, sessionId, timeoutMs = constants.Ns) {
                 return new Promise((resolve, reject)=>{
-                    if (!this.ws || this.ws.readyState !== wrapper.Ay.OPEN) return reject(new Error('WebSocket is not open'));
+                    if (!this.ws || this.ws.readyState !== external_ws_default().OPEN) return reject(new Error('WebSocket is not open'));
                     const id = ++this.messageId;
                     const message = {
                         id,
@@ -985,6 +942,7 @@ exports.modules = {
                 _define_property(this, "eventCallbacks", new Set());
                 _define_property(this, "messageId", 0);
                 _define_property(this, "pendingRequests", new Map());
+                _define_property(this, "heartbeatTimer", null);
                 this.port = port;
                 this.host = host;
             }
@@ -998,7 +956,7 @@ exports.modules = {
             const maxRetries = 60;
             const backoffMs = 250;
             while(retries < maxRetries){
-                const ready = await checkChromeRemoteDebugging(cdpPort);
+                const ready = await (0, discovery.z)(cdpPort);
                 if (ready) break;
                 retries++;
                 await new Promise((r)=>setTimeout(r, backoffMs));
@@ -1815,7 +1773,7 @@ exports.modules = {
                 this.extensionPaths = args.extensionPaths;
             }
         }
-        var extension_output_path = __webpack_require__("../browser/run-chromium/chromium-launch/extension-output-path.ts");
+        var extension_output_path = __webpack_require__("./browsers/run-chromium/chromium-launch/extension-output-path.ts");
         async function setupCdpAfterLaunch(compilation, plugin, chromiumArgs) {
             const loadExtensionFlag = chromiumArgs.find((flag)=>flag.startsWith('--load-extension='));
             const extensionOutputPath = (0, extension_output_path.W)(compilation, loadExtensionFlag);