conductor-oss 0.60.20 → 0.61.1

package/web/.next/standalone/node_modules/puppeteer-core/lib/cjs/puppeteer/cdp/Page.js

@@ -63,6 +63,7 @@ exports.convertCookiesPartitionKeyFromPuppeteerToCdp = convertCookiesPartitionKe
 const rxjs_js_1 = require("../../third_party/rxjs/rxjs.js");
 const CDPSession_js_1 = require("../api/CDPSession.js");
 const Page_js_1 = require("../api/Page.js");
+const WebWorker_js_1 = require("../api/WebWorker.js");
 const ConsoleMessage_js_1 = require("../common/ConsoleMessage.js");
 const Errors_js_1 = require("../common/Errors.js");
 const EventEmitter_js_1 = require("../common/EventEmitter.js");
@@ -88,15 +89,8 @@ const IsolatedWorlds_js_1 = require("./IsolatedWorlds.js");
 const JSHandle_js_1 = require("./JSHandle.js");
 const Tracing_js_1 = require("./Tracing.js");
 const utils_js_1 = require("./utils.js");
-const WebWorker_js_1 = require("./WebWorker.js");
-function convertConsoleMessageLevel(method) {
-    switch (method) {
-        case 'warning':
-            return 'warn';
-        default:
-            return method;
-    }
-}
+const WebMCP_js_1 = require("./WebMCP.js");
+const WebWorker_js_2 = require("./WebWorker.js");
 /**
  * @internal
  */
@@ -145,6 +139,7 @@ class CdpPage extends Page_js_1.Page {
     #frameManager;
     #emulationManager;
     #tracing;
+    #webmcp;
     #bindings = new Map();
     #exposedFunctions = new Map();
     #coverage;
@@ -170,6 +165,7 @@ class CdpPage extends Page_js_1.Page {
         this.#frameManager = new FrameManager_js_1.FrameManager(client, this, this._timeoutSettings);
         this.#emulationManager = new EmulationManager_js_1.EmulationManager(client);
         this.#tracing = new Tracing_js_1.Tracing(client);
+        this.#webmcp = new WebMCP_js_1.WebMCP(client, this.#frameManager);
         this.#coverage = new Coverage_js_1.Coverage(client);
         this.#viewport = null;
         // Use browser context's connection, as current Bluetooth emulation in Chromium is
@@ -250,6 +246,7 @@ class CdpPage extends Page_js_1.Page {
         this.#touchscreen.updateClient(newSession);
         this.#emulationManager.updateClient(newSession);
         this.#tracing.updateClient(newSession);
+        this.#webmcp.updateClient(newSession);
         this.#coverage.updateClient(newSession);
         await this.#frameManager.swapFrameTree(newSession);
         this.#setupPrimaryTargetListeners();
@@ -300,8 +297,23 @@ class CdpPage extends Page_js_1.Page {
         (0, assert_js_1.assert)(session instanceof CdpSession_js_1.CdpCDPSession);
         this.#frameManager.onAttachedToTarget(session.target());
         if (session.target()._getTargetInfo().type === 'worker') {
-            const worker = new WebWorker_js_1.CdpWebWorker(session, session.target().url(), session.target()._targetId, session.target().type(), this.#onConsoleAPI.bind(this), this.#handleException.bind(this), this.#frameManager.networkManager);
+            const worker = new WebWorker_js_2.CdpWebWorker(session, session.target().url(), session.target()._targetId, session.target().type(), this.#handleException.bind(this), this.#frameManager.networkManager);
             this.#workers.set(session.id(), worker);
+            worker.internalEmitter.on(WebWorker_js_1.WebWorkerEvent.Console, message => {
+                const noListenersForConsoleOnPage = this.listenerCount("console" /* PageEvent.Console */) === 0;
+                const noListenersForConsoleOnWorker = worker.listenerCount(WebWorker_js_1.WebWorkerEvent.Console) === 0;
+                if (noListenersForConsoleOnPage && noListenersForConsoleOnWorker) {
+                    // eslint-disable-next-line max-len -- The comment is long.
+                    // eslint-disable-next-line @puppeteer/use-using -- These are not owned by this function.
+                    for (const arg of message.args()) {
+                        void arg.dispose().catch(util_js_1.debugError);
+                    }
+                    return;
+                }
+                if (!noListenersForConsoleOnPage) {
+                    this.emit("console" /* PageEvent.Console */, message);
+                }
+            });
             this.emit("workercreated" /* PageEvent.WorkerCreated */, worker);
         }
         session.on(CDPSession_js_1.CDPSessionEvent.Ready, this.#onAttachedToTarget);
@@ -312,6 +324,7 @@ class CdpPage extends Page_js_1.Page {
                 this.#frameManager.initialize(this.#primaryTargetClient),
                 this.#primaryTargetClient.send('Performance.enable'),
                 this.#primaryTargetClient.send('Log.enable'),
+                this.#webmcp.initialize(),
             ]);
         }
         catch (err) {
@@ -362,6 +375,9 @@ class CdpPage extends Page_js_1.Page {
     _client() {
         return this.#primaryTargetClient;
     }
+    _isUrlAllowed(url) {
+        return this.#targetManager.isUrlAllowed(url);
+    }
     isServiceWorkerBypassed() {
         return this.#serviceWorkerBypassed;
     }
@@ -374,9 +390,18 @@ class CdpPage extends Page_js_1.Page {
     async openDevTools() {
         const pageTargetId = this.target()._targetId;
         const browser = this.browser();
+        const devtoolsTargetId = await browser._hasDevToolsTarget(this.target()._targetId);
+        if (devtoolsTargetId) {
+            return await browser._getDevToolsTargetPage(devtoolsTargetId);
+        }
         const devtoolsPage = await browser._createDevToolsPage(pageTargetId);
         return devtoolsPage;
     }
+    async hasDevTools() {
+        const browser = this.browser();
+        const targetId = await browser._hasDevToolsTarget(this.target()._targetId);
+        return Boolean(targetId);
+    }
     async waitForFileChooser(options = {}) {
         const needsEnable = this.#fileChooserDeferreds.size === 0;
         const { timeout = this._timeoutSettings.timeout() } = options;
@@ -431,7 +456,7 @@ class CdpPage extends Page_js_1.Page {
             });
         }
         if (source !== 'worker') {
-            this.emit("console" /* PageEvent.Console */, new ConsoleMessage_js_1.ConsoleMessage(convertConsoleMessageLevel(level), text, [], [{ url, lineNumber }], undefined, stackTrace, this.#primaryTarget._targetId));
+            this.emit("console" /* PageEvent.Console */, new ConsoleMessage_js_1.ConsoleMessage((0, utils_js_1.convertConsoleMessageLevel)(level), text, [], [{ url, lineNumber }], undefined, stackTrace, this.#primaryTarget._targetId));
         }
     }
     mainFrame() {
@@ -449,6 +474,9 @@ class CdpPage extends Page_js_1.Page {
     get tracing() {
         return this.#tracing;
     }
+    get webmcp() {
+        return this.#webmcp;
+    }
     frames() {
         return this.#frameManager.frames();
     }
@@ -672,38 +700,30 @@ class CdpPage extends Page_js_1.Page {
     #handleException(exception) {
         this.emit("pageerror" /* PageEvent.PageError */, (0, utils_js_1.createClientError)(exception.exceptionDetails));
     }
-    #onConsoleAPI(world, event) {
-        const values = event.args.map(arg => {
-            return world.createCdpHandle(arg);
-        });
-        if (!this.listenerCount("console" /* PageEvent.Console */)) {
-            values.forEach(arg => {
-                return arg.dispose();
+    #onConsoleAPI(world, event, values) {
+        if (!values) {
+            values = event.args.map(arg => {
+                return world.createCdpHandle(arg);
             });
-            return;
         }
-        const textTokens = [];
-        // eslint-disable-next-line max-len -- The comment is long.
-        // eslint-disable-next-line @puppeteer/use-using -- These are not owned by this function.
-        for (const arg of values) {
-            textTokens.push((0, utils_js_1.valueFromJSHandle)(arg));
-        }
-        const stackTraceLocations = [];
-        if (event.stackTrace) {
-            for (const callFrame of event.stackTrace.callFrames) {
-                stackTraceLocations.push({
-                    url: callFrame.url,
-                    lineNumber: callFrame.lineNumber,
-                    columnNumber: callFrame.columnNumber,
-                });
+        const hasPageConsoleListeners = this.listenerCount("console" /* PageEvent.Console */) > 0;
+        const hasWorkerConsoleListeners = world.environment instanceof WebWorker_js_1.WebWorker &&
+            world.environment.listenerCount(WebWorker_js_1.WebWorkerEvent.Console) > 0;
+        if (!hasPageConsoleListeners) {
+            if (!hasWorkerConsoleListeners) {
+                // eslint-disable-next-line max-len -- The comment is long.
+                // eslint-disable-next-line @puppeteer/use-using -- These are not owned by this function.
+                for (const value of values) {
+                    void value.dispose().catch(util_js_1.debugError);
+                }
             }
+            return;
         }
         let targetId;
         if (world.environment.client instanceof CdpSession_js_1.CdpCDPSession) {
             targetId = world.environment.client.target()._targetId;
         }
-        const message = new ConsoleMessage_js_1.ConsoleMessage(convertConsoleMessageLevel(event.type), textTokens.join(' '), values, stackTraceLocations, undefined, event.stackTrace, targetId);
-        this.emit("console" /* PageEvent.Console */, message);
+        this.emit("console" /* PageEvent.Console */, (0, utils_js_1.createConsoleMessage)(event, values, targetId));
     }
     async #onBindingCalled(world, event) {
         let payload;
@@ -775,6 +795,9 @@ class CdpPage extends Page_js_1.Page {
     async setBypassCSP(enabled) {
         await this.#primaryTargetClient.send('Page.setBypassCSP', { enabled });
     }
+    async triggerExtensionAction(extension) {
+        return await extension.triggerAction(this);
+    }
     async emulateMediaType(type) {
         return await this.#emulationManager.emulateMediaType(type);
     }
@@ -962,6 +985,9 @@ class CdpPage extends Page_js_1.Page {
     get bluetooth() {
         return this.#cdpBluetoothEmulation;
     }
+    extensionRealms() {
+        return this.mainFrame().extensionRealms();
+    }
 }
 exports.CdpPage = CdpPage;
 const supportedMetrics = new Set([

package/web/.next/standalone/node_modules/puppeteer-core/lib/cjs/puppeteer/cdp/Target.js

@@ -32,6 +32,9 @@ class CdpTarget extends Target_js_1.Target {
     _initializedDeferred = Deferred_js_1.Deferred.create();
     _isClosedDeferred = Deferred_js_1.Deferred.create();
     _targetId;
+    _asPagePromise;
+    /** @internal */
+    pagePromise;
     /**
      * To initialize the target for use, call initialize.
      *
@@ -50,13 +53,21 @@ class CdpTarget extends Target_js_1.Target {
         }
     }
     async asPage() {
-        const session = this._session();
-        if (!session) {
-            return await this.createCDPSession().then(client => {
+        if (this.pagePromise) {
+            const page = await this.pagePromise;
+            if (page) {
+                return page;
+            }
+        }
+        if (!this._asPagePromise) {
+            const session = this._session();
+            this._asPagePromise = (session
+                ? Promise.resolve(session)
+                : this._sessionFactory()(/* isAutoAttachEmulated=*/ false)).then(client => {
                 return Page_js_1.CdpPage._create(client, this, null);
             });
         }
-        return await Page_js_1.CdpPage._create(session, this, null);
+        return (await this._asPagePromise) ?? null;
     }
     _subtype() {
         return this.#targetInfo.subtype;
@@ -166,7 +177,6 @@ exports.CdpTarget = CdpTarget;
  */
 class PageTarget extends CdpTarget {
     #defaultViewport;
-    pagePromise;
     constructor(targetInfo, session, browserContext, targetManager, sessionFactory, defaultViewport) {
         super(targetInfo, session, browserContext, targetManager, sessionFactory);
         this.#defaultViewport = defaultViewport ?? undefined;
@@ -231,11 +241,10 @@ class WorkerTarget extends CdpTarget {
     async worker() {
         if (!this.#workerPromise) {
             const session = this._session();
-            // TODO(einbinder): Make workers send their console logs.
             this.#workerPromise = (session
                 ? Promise.resolve(session)
                 : this._sessionFactory()(/* isAutoAttachEmulated=*/ false)).then(client => {
-                return new WebWorker_js_1.CdpWebWorker(client, this._getTargetInfo().url, this._targetId, this.type(), () => { } /* consoleAPICalled */, () => { } /* exceptionThrown */, undefined /* networkManager */);
+                return new WebWorker_js_1.CdpWebWorker(client, this._getTargetInfo().url, this._targetId, this.type(), () => { } /* exceptionThrown */, undefined /* networkManager */);
             });
         }
         return await this.#workerPromise;

package/web/.next/standalone/node_modules/puppeteer-core/lib/cjs/puppeteer/cdp/TargetManager.js

@@ -6,6 +6,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TargetManager = void 0;
+const urlpattern_polyfill_js_1 = require("../../third_party/urlpattern-polyfill/urlpattern-polyfill.js");
 const CDPSession_js_1 = require("../api/CDPSession.js");
 const EventEmitter_js_1 = require("../common/EventEmitter.js");
 const util_js_1 = require("../common/util.js");
@@ -73,12 +74,19 @@ class TargetManager extends EventEmitter_js_1.EventEmitter {
     // done. It indicates whethere we are running the initial auto-attach step or
     // if we are handling targets after that.
     #initialAttachDone = false;
-    constructor(connection, targetFactory, targetFilterCallback, waitForInitiallyDiscoveredTargets = true) {
+    #blocklist = [];
+    #allowlist = [];
+    constructor(connection, targetFactory, targetFilterCallback, waitForInitiallyDiscoveredTargets = true, blocklist, allowlist) {
         super();
+        if (blocklist && allowlist) {
+            throw new Error('Cannot specify both blockList and allowList');
+        }
         this.#connection = connection;
         this.#targetFilterCallback = targetFilterCallback;
         this.#targetFactory = targetFactory;
         this.#waitForInitiallyDiscoveredTargets = waitForInitiallyDiscoveredTargets;
+        this.#blocklist = this.#mapPatterns(blocklist);
+        this.#allowlist = this.#mapPatterns(allowlist);
         this.#connection.on('Target.targetCreated', this.#onTargetCreated);
         this.#connection.on('Target.targetDestroyed', this.#onTargetDestroyed);
         this.#connection.on('Target.targetInfoChanged', this.#onTargetInfoChanged);
@@ -106,6 +114,9 @@ class TargetManager extends EventEmitter_js_1.EventEmitter {
         this.#finishInitializationIfReady();
         await this.#initializeDeferred.valueOrThrow();
     }
+    addToIgnoreTarget(targetId) {
+        this.#ignoredTargets.add(targetId);
+    }
     getChildTargets(target) {
         return target._childTargets();
     }
@@ -119,6 +130,9 @@ class TargetManager extends EventEmitter_js_1.EventEmitter {
     getAvailableTargets() {
         return this.#attachedTargetsByTargetId;
     }
+    getDiscoveredTargetInfos() {
+        return this.#discoveredTargetsByTargetId;
+    }
     #setupAttachmentListeners(session) {
         const listener = (event) => {
             void this.#onAttachedToTarget(session, event);
@@ -227,6 +241,12 @@ class TargetManager extends EventEmitter_js_1.EventEmitter {
         if (!this.#connection.isAutoAttached(targetInfo.targetId)) {
             return;
         }
+        // If we connect to a browser that is already open,
+        // immediately detach from any tab that is on the blocklist.
+        if (!this.#initialAttachDone && !this.isUrlAllowed(targetInfo.url)) {
+            await this.#silentDetach(session, parentSession);
+            return;
+        }
         // Special case for service workers: being attached to service workers will
         // prevent them from ever being destroyed. Therefore, we silently detach
         // from service workers unless the connection was manually created via
@@ -236,7 +256,9 @@ class TargetManager extends EventEmitter_js_1.EventEmitter {
         // CDP.
         if (targetInfo.type === 'service_worker') {
             await this.#silentDetach(session, parentSession);
-            if (this.#attachedTargetsByTargetId.has(targetInfo.targetId)) {
+            if (this.#attachedTargetsByTargetId.has(targetInfo.targetId) ||
+                this.#ignoredTargets.has(targetInfo.targetId) ||
+                !this.#discoveredTargetsByTargetId.has(targetInfo.targetId)) {
                 return;
             }
             const target = this.#targetFactory(targetInfo);
@@ -291,6 +313,7 @@ class TargetManager extends EventEmitter_js_1.EventEmitter {
                 autoAttach: true,
                 filter: this.#discoveryFilter,
             }),
+            this.#maybeSetupNetworkConditions(session),
             session.send('Runtime.runIfWaitingForDebugger'),
         ]).catch(util_js_1.debugError);
     };
@@ -319,6 +342,77 @@ class TargetManager extends EventEmitter_js_1.EventEmitter {
         this.#attachedTargetsByTargetId.delete(target._targetId);
         this.emit("targetGone" /* TargetManagerEvent.TargetGone */, target);
     };
+    /**
+     * Helper to validate URL against blocklist patterns
+     */
+    isUrlAllowed = (url) => {
+        if (this.#blocklist.length === 0 && this.#allowlist.length === 0) {
+            return true;
+        }
+        // Always allow internal or setup pages
+        if (!url || url === 'about:blank') {
+            return true;
+        }
+        for (const item of this.#blocklist) {
+            if (item.pattern.test(url)) {
+                return false;
+            }
+        }
+        if (this.#allowlist.length > 0) {
+            for (const item of this.#allowlist) {
+                if (item.pattern.test(url)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        return true;
+    };
+    #mapPatterns(rules) {
+        const result = [];
+        for (const rule of rules ?? []) {
+            result.push({ pattern: new urlpattern_polyfill_js_1.URLPattern(rule), rule });
+        }
+        return result;
+    }
+    #maybeSetupNetworkConditions = async (session) => {
+        if (this.#blocklist.length === 0 && this.#allowlist.length === 0) {
+            return;
+        }
+        const matchedNetworkConditions = [];
+        for (const item of this.#blocklist) {
+            matchedNetworkConditions.push({
+                urlPattern: item.rule,
+                offline: true,
+                latency: 0,
+                downloadThroughput: -1,
+                uploadThroughput: -1,
+            });
+        }
+        if (this.#allowlist.length > 0) {
+            for (const item of this.#allowlist) {
+                matchedNetworkConditions.push({
+                    urlPattern: item.rule,
+                    offline: false,
+                    latency: 0,
+                    downloadThroughput: -1,
+                    uploadThroughput: -1,
+                });
+            }
+            matchedNetworkConditions.push({
+                urlPattern: '',
+                offline: true,
+                latency: 0,
+                downloadThroughput: -1,
+                uploadThroughput: -1,
+            });
+        }
+        await session.send('Network.emulateNetworkConditionsByRule', {
+            // @ts-expect-error offline cannot be undefined before M149.
+            offline: this.#blocklist.length > 0 ? true : undefined,
+            matchedNetworkConditions,
+        });
+    };
 }
 exports.TargetManager = TargetManager;
 //# sourceMappingURL=TargetManager.js.map