@midscene/cli 1.5.7 → 1.5.8-beta-20260324073120.0

package/dist/lib/index.js

@@ -3015,9 +3015,7 @@ var __webpack_modules__ = {
         var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
         var main = __webpack_require__("../../node_modules/.pnpm/dotenv@16.4.5/node_modules/dotenv/lib/main.js");
         var main_default = /*#__PURE__*/ __webpack_require__.n(main);
-        var package_namespaceObject = {
-            rE: "1.5.7"
-        };
+        var package_namespaceObject = JSON.parse('{"rE":"1.5.8-beta-20260324073120.0"}');
         const yaml_namespaceObject = require("@midscene/core/yaml");
         const common_namespaceObject = require("@midscene/shared/common");
         const puppeteer_agent_launcher_namespaceObject = require("@midscene/web/puppeteer-agent-launcher");
@@ -3212,6 +3210,28 @@ var __webpack_modules__ = {
                         urlToVisit = webTarget.url.startsWith('/') ? `http://${serverAddress?.address}:${serverAddress?.port}${webTarget.url}` : `http://${serverAddress?.address}:${serverAddress?.port}/${webTarget.url}`;
                         webTarget.url = urlToVisit;
                     }
+                    if (webTarget.cdpEndpoint && webTarget.bridgeMode) throw new Error('cdpEndpoint and bridgeMode are mutually exclusive. Please specify only one.');
+                    if (webTarget.cdpEndpoint) {
+                        const cdpBrowser = options?.browser ?? await external_puppeteer_default().connect({
+                            browserWSEndpoint: webTarget.cdpEndpoint,
+                            defaultViewport: null
+                        });
+                        if (webTarget.chromeArgs) console.warn('chromeArgs are not supported in CDP mode (browser is already running). They will be ignored.');
+                        const { agent, freeFn: newFreeFn } = await (0, puppeteer_agent_launcher_namespaceObject.puppeteerAgentForTarget)(webTarget, {
+                            ...preference,
+                            ...buildAgentOptions(clonedYamlScript.agent, preference.testId, fileName)
+                        }, cdpBrowser, options?.page);
+                        const cleanFreeFn = newFreeFn.filter((f)=>'puppeteer_browser' !== f.name);
+                        if (!options?.browser) cleanFreeFn.push({
+                            name: 'cdp_browser_disconnect',
+                            fn: ()=>cdpBrowser.disconnect()
+                        });
+                        freeFn.push(...cleanFreeFn);
+                        return {
+                            agent,
+                            freeFn
+                        };
+                    }
                     if (!webTarget.bridgeMode) {
                         const { agent, freeFn: newFreeFn } = await (0, puppeteer_agent_launcher_namespaceObject.puppeteerAgentForTarget)(webTarget, {
                             ...preference,
@@ -3783,25 +3803,31 @@ var __webpack_modules__ = {
                     const needsBrowser = fileContextList.some((ctx)=>Object.keys(ctx.executionConfig.web || ctx.executionConfig.target || {}).length > 0);
                     if (needsBrowser && this.config.shareBrowserContext) {
                         const globalWebConfig = this.config.globalConfig?.web;
-                        const width = globalWebConfig?.viewportWidth ?? puppeteer_agent_launcher_namespaceObject.defaultViewportWidth;
-                        const height = globalWebConfig?.viewportHeight ?? puppeteer_agent_launcher_namespaceObject.defaultViewportHeight;
-                        const args = (0, puppeteer_agent_launcher_namespaceObject.buildChromeArgs)({
-                            userAgent: globalWebConfig?.userAgent,
-                            windowSize: headed ? {
-                                width,
-                                height
-                            } : void 0,
-                            chromeArgs: globalWebConfig?.chromeArgs
-                        });
-                        browser = await external_puppeteer_default().launch({
-                            headless: !headed,
-                            defaultViewport: headed ? null : {
-                                width,
-                                height
-                            },
-                            args,
-                            acceptInsecureCerts: globalWebConfig?.acceptInsecureCerts
+                        if (globalWebConfig?.cdpEndpoint) browser = await external_puppeteer_default().connect({
+                            browserWSEndpoint: globalWebConfig.cdpEndpoint,
+                            defaultViewport: null
                         });
+                        else {
+                            const width = globalWebConfig?.viewportWidth ?? puppeteer_agent_launcher_namespaceObject.defaultViewportWidth;
+                            const height = globalWebConfig?.viewportHeight ?? puppeteer_agent_launcher_namespaceObject.defaultViewportHeight;
+                            const args = (0, puppeteer_agent_launcher_namespaceObject.buildChromeArgs)({
+                                userAgent: globalWebConfig?.userAgent,
+                                windowSize: headed ? {
+                                    width,
+                                    height
+                                } : void 0,
+                                chromeArgs: globalWebConfig?.chromeArgs
+                            });
+                            browser = await external_puppeteer_default().launch({
+                                headless: !headed,
+                                defaultViewport: headed ? null : {
+                                    width,
+                                    height
+                                },
+                                args,
+                                acceptInsecureCerts: globalWebConfig?.acceptInsecureCerts
+                            });
+                        }
                         sharedPage = await browser.newPage();
                         for (const context of fileContextList){
                             context.options.browser = browser;
@@ -3811,7 +3837,11 @@ var __webpack_modules__ = {
                     const { executedResults, notExecutedContexts } = await this.executeFiles(fileContextList);
                     this.results = await this.processResults(executedResults, notExecutedContexts);
                 } finally{
-                    if (browser && !this.config.keepWindow) await browser.close();
+                    if (browser && !this.config.keepWindow) {
+                        const isCdp = !!this.config.globalConfig?.web?.cdpEndpoint;
+                        if (isCdp) browser.disconnect();
+                        else await browser.close();
+                    }
                     await this.generateOutputIndex();
                 }
                 return this.results;
@@ -11940,7 +11970,7 @@ Usage:
                     type: 'boolean',
                     description: `Turn on logging to help debug why certain keys or values are not being set as you expect, default is ${config_factory_defaultConfig.dotenvDebug}`
                 }
-            }).version('version', 'Show version number', "1.5.7").help().epilogue(`For complete list of configuration options, please visit:
+            }).version('version', 'Show version number', "1.5.8-beta-20260324073120.0").help().epilogue(`For complete list of configuration options, please visit:
   • Web options: https://midscenejs.com/automate-with-scripts-in-yaml#the-web-part
   • Android options: https://midscenejs.com/automate-with-scripts-in-yaml#the-android-part
   • iOS options: https://midscenejs.com/automate-with-scripts-in-yaml#the-ios-part