chromium-bidi 0.4.18 → 0.4.20

package/.browser

@@ -1 +1 @@
-chrome@117.0.5900.2
+chrome@117.0.5920.0

package/README.md

@@ -399,3 +399,20 @@ We use [release-please](https://github.com/googleapis/release-please) to automat
 
 1. After the PR is reviewed, [create a GitHub release](https://github.com/GoogleChromeLabs/chromium-bidi/releases/new) specifying the tag name matching the bumped version.
    Our CI then automatically publishes the new release to npm based on the tag name.
+
+#### Roll into Chromium
+
+> Assuming that you already have a Chromium set-up locally, and knowledge on how to submit changes to the repo.
+> Else submit an issue for a project maintainer to do.
+
+1. Create a new branch.
+2. Navigate to `third_party/bidimapper/`.
+3. Then run the following commands:
+
+```bash
+./pull.sh
+./build.sh
+```
+
+4. Submit a CL with bug `chromedriver:4226`
+5. Add appropriate reviewers or comment the CL link on the PR

package/lib/cjs/bidiMapper/BidiServer.d.ts

@@ -18,6 +18,7 @@ import type { ICdpConnection } from '../cdp/cdpConnection.js';
 import type { ChromiumBidi } from '../protocol/protocol.js';
 import { EventEmitter } from '../utils/EventEmitter.js';
 import { type LoggerFn } from '../utils/log.js';
+import type { Result } from '../utils/result.js';
 import type { IBidiParser } from './BidiParser.js';
 import type { IBidiTransport } from './BidiTransport.js';
 import type { OutgoingBidiMessage } from './OutgoingBidiMessage.js';
@@ -29,11 +30,10 @@ export declare class BidiServer extends EventEmitter<BidiServerEvent> {
     #private;
     private constructor();
     static createAndStart(bidiTransport: IBidiTransport, cdpConnection: ICdpConnection, selfTargetId: string, parser?: IBidiParser, logger?: LoggerFn): Promise<BidiServer>;
-    topLevelContextsLoaded(): Promise<void>;
     /**
      * Sends BiDi message.
      */
-    emitOutgoingMessage(messageEntry: Promise<OutgoingBidiMessage>): void;
+    emitOutgoingMessage(messageEntry: Promise<Result<OutgoingBidiMessage>>): void;
     close(): void;
     getBrowsingContextStorage(): BrowsingContextStorage;
 }

package/lib/cjs/bidiMapper/BidiServer.js

@@ -29,7 +29,6 @@ class BidiServer extends EventEmitter_js_1.EventEmitter {
     #transport;
     #commandProcessor;
     #browsingContextStorage = new browsingContextStorage_js_1.BrowsingContextStorage();
-    #realmStorage = new realmStorage_js_1.RealmStorage();
     #logger;
     #handleIncomingMessage = (message) => {
         void this.#commandProcessor.processCommand(message).catch((error) => {
@@ -49,7 +48,7 @@ class BidiServer extends EventEmitter_js_1.EventEmitter {
         this.#messageQueue = new processingQueue_js_1.ProcessingQueue(this.#processOutgoingMessage, this.#logger);
         this.#transport = bidiTransport;
         this.#transport.setOnMessage(this.#handleIncomingMessage);
-        this.#commandProcessor = new CommandProcessor_js_1.CommandProcessor(cdpConnection, new EventManager_js_1.EventManager(this), selfTargetId, parser, this.#browsingContextStorage, this.#realmStorage, this.#logger);
+        this.#commandProcessor = new CommandProcessor_js_1.CommandProcessor(cdpConnection, new EventManager_js_1.EventManager(this), selfTargetId, this.#browsingContextStorage, new realmStorage_js_1.RealmStorage(), parser, this.#logger);
         this.#commandProcessor.on('response', (response) => {
             this.emitOutgoingMessage(response);
         });
@@ -65,14 +64,9 @@ class BidiServer extends EventEmitter_js_1.EventEmitter {
             waitForDebuggerOnStart: true,
             flatten: true,
         });
-        await server.topLevelContextsLoaded();
+        await server.#topLevelContextsLoaded();
         return server;
     }
-    async topLevelContextsLoaded() {
-        await Promise.all(this.#browsingContextStorage
-            .getTopLevelContexts()
-            .map((c) => c.awaitLoaded()));
-    }
     /**
      * Sends BiDi message.
      */
@@ -85,6 +79,11 @@ class BidiServer extends EventEmitter_js_1.EventEmitter {
     getBrowsingContextStorage() {
         return this.#browsingContextStorage;
     }
+    async #topLevelContextsLoaded() {
+        await Promise.all(this.#browsingContextStorage
+            .getTopLevelContexts()
+            .map((c) => c.lifecycleLoaded()));
+    }
 }
 exports.BidiServer = BidiServer;
 //# sourceMappingURL=BidiServer.js.map

package/lib/cjs/bidiMapper/BidiServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"BidiServer.js","sourceRoot":"","sources":["../../../src/bidiMapper/BidiServer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BidiServer.js","sourceRoot":"","sources":["../../../src/bidiMapper/BidiServer.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;;AAIH,8DAAsD;AACtD,4CAAuD;AACvD,oEAA4D;AAK5D,+DAAuD;AAEvD,2FAAmF;AACnF,sEAA8D;AAC9D,sEAA8D;AAM9D,MAAa,UAAW,SAAQ,8BAA6B;IAC3D,aAAa,CAAuC;IACpD,UAAU,CAAiB;IAC3B,iBAAiB,CAAmB;IACpC,uBAAuB,GAAG,IAAI,kDAAsB,EAAE,CAAC;IACvD,OAAO,CAAY;IAEnB,sBAAsB,GAAG,CAAC,OAA6B,EAAE,EAAE;QACzD,KAAK,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YAClE,IAAI,CAAC,OAAO,EAAE,CAAC,gBAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,uBAAuB,GAAG,KAAK,EAAE,YAAiC,EAAE,EAAE;QACpE,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC;QAErC,IAAI,YAAY,CAAC,OAAO,KAAK,IAAI,EAAE;YACjC,OAAO,CAAC,SAAS,CAAC,GAAG,YAAY,CAAC,OAAO,CAAC;SAC3C;QAED,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAC7C,CAAC,CAAC;IAEF,YACE,aAA6B,EAC7B,aAA6B,EAC7B,YAAoB,EACpB,MAAoB,EACpB,MAAiB;QAEjB,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,aAAa,GAAG,IAAI,oCAAe,CACtC,IAAI,CAAC,uBAAuB,EAC5B,IAAI,CAAC,OAAO,CACb,CAAC;QACF,IAAI,CAAC,UAAU,GAAG,aAAa,CAAC;QAChC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QAC1D,IAAI,CAAC,iBAAiB,GAAG,IAAI,sCAAgB,CAC3C,aAAa,EACb,IAAI,8BAAY,CAAC,IAAI,CAAC,EACtB,YAAY,EACZ,IAAI,CAAC,uBAAuB,EAC5B,IAAI,8BAAY,EAAE,EAClB,MAAM,EACN,IAAI,CAAC,OAAO,CACb,CAAC;QACF,IAAI,CAAC,iBAAiB,CAAC,EAAE,CACvB,UAAU,EACV,CAAC,QAA8C,EAAE,EAAE;YACjD,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QACrC,CAAC,CACF,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,cAAc,CACzB,aAA6B,EAC7B,aAA6B,EAC7B,YAAoB,EACpB,MAAoB,EACpB,MAAiB;QAEjB,MAAM,MAAM,GAAG,IAAI,UAAU,CAC3B,aAAa,EACb,aAAa,EACb,YAAY,EACZ,MAAM,EACN,MAAM,CACP,CAAC;QACF,MAAM,SAAS,GAAG,aAAa,CAAC,aAAa,EAAE,CAAC;QAEhD,0CAA0C;QAC1C,MAAM,SAAS,CAAC,WAAW,CAAC,2BAA2B,EAAE,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC,CAAC;QAE3E,iDAAiD;QACjD,MAAM,SAAS,CAAC,WAAW,CAAC,sBAAsB,EAAE;YAClD,UAAU,EAAE,IAAI;YAChB,sBAAsB,EAAE,IAAI;YAC5B,OAAO,EAAE,IAAI;SACd,CAAC,CAAC;QAEH,MAAM,MAAM,CAAC,uBAAuB,EAAE,CAAC;QACvC,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;OAEG;IACH,mBAAmB,CACjB,YAAkD;QAElD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IACvC,CAAC;IAED,KAAK;QACH,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;IAC1B,CAAC;IAED,yBAAyB;QACvB,OAAO,IAAI,CAAC,uBAAuB,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,uBAAuB;QAC3B,MAAM,OAAO,CAAC,GAAG,CACf,IAAI,CAAC,uBAAuB;aACzB,mBAAmB,EAAE;aACrB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC,CACnC,CAAC;IACJ,CAAC;CACF;AA7GD,gCA6GC"}

package/lib/cjs/bidiMapper/CommandProcessor.d.ts

@@ -18,17 +18,18 @@ import type { ICdpConnection } from '../cdp/cdpConnection.js';
 import { type ChromiumBidi } from '../protocol/protocol.js';
 import { EventEmitter } from '../utils/EventEmitter.js';
 import { type LoggerFn } from '../utils/log.js';
+import type { Result } from '../utils/result.js';
 import type { IBidiParser } from './BidiParser.js';
 import { OutgoingBidiMessage } from './OutgoingBidiMessage.js';
 import type { BrowsingContextStorage } from './domains/context/browsingContextStorage.js';
 import type { IEventManager } from './domains/events/EventManager.js';
 import type { RealmStorage } from './domains/script/realmStorage.js';
 type CommandProcessorEvents = {
-    response: Promise<OutgoingBidiMessage>;
+    response: Promise<Result<OutgoingBidiMessage>>;
 };
 export declare class CommandProcessor extends EventEmitter<CommandProcessorEvents> {
     #private;
-    constructor(cdpConnection: ICdpConnection, eventManager: IEventManager, selfTargetId: string, parser: IBidiParser | undefined, browsingContextStorage: BrowsingContextStorage, realmStorage: RealmStorage, logger?: LoggerFn);
+    constructor(cdpConnection: ICdpConnection, eventManager: IEventManager, selfTargetId: string, browsingContextStorage: BrowsingContextStorage, realmStorage: RealmStorage, parser?: IBidiParser, logger?: LoggerFn);
     processCommand(command: ChromiumBidi.Command): Promise<void>;
 }
 export {};

package/lib/cjs/bidiMapper/CommandProcessor.js

@@ -22,74 +22,74 @@ const EventEmitter_js_1 = require("../utils/EventEmitter.js");
 const log_js_1 = require("../utils/log.js");
 const BidiNoOpParser_js_1 = require("./BidiNoOpParser.js");
 const OutgoingBidiMessage_js_1 = require("./OutgoingBidiMessage.js");
+const BrowserProcessor_js_1 = require("./domains/browser/BrowserProcessor.js");
+const CdpProcessor_js_1 = require("./domains/cdp/CdpProcessor.js");
 const browsingContextProcessor_js_1 = require("./domains/context/browsingContextProcessor.js");
 const InputProcessor_js_1 = require("./domains/input/InputProcessor.js");
 const PreloadScriptStorage_js_1 = require("./domains/script/PreloadScriptStorage.js");
 const ScriptProcessor_js_1 = require("./domains/script/ScriptProcessor.js");
+const SessionProcessor_js_1 = require("./domains/session/SessionProcessor.js");
 class CommandProcessor extends EventEmitter_js_1.EventEmitter {
+    #browserProcessor;
     #browsingContextProcessor;
     #inputProcessor;
     #scriptProcessor;
-    #eventManager;
+    #sessionProcessor;
+    #cdpProcessor;
     #parser;
     #logger;
-    constructor(cdpConnection, eventManager, selfTargetId, parser = new BidiNoOpParser_js_1.BidiNoOpParser(), browsingContextStorage, realmStorage, logger) {
+    constructor(cdpConnection, eventManager, selfTargetId, browsingContextStorage, realmStorage, parser = new BidiNoOpParser_js_1.BidiNoOpParser(), logger) {
         super();
-        this.#eventManager = eventManager;
         this.#parser = parser;
         this.#logger = logger;
         const preloadScriptStorage = new PreloadScriptStorage_js_1.PreloadScriptStorage();
+        this.#browserProcessor = new BrowserProcessor_js_1.BrowserProcessor(cdpConnection);
         this.#browsingContextProcessor = new browsingContextProcessor_js_1.BrowsingContextProcessor(cdpConnection, selfTargetId, eventManager, browsingContextStorage, realmStorage, preloadScriptStorage, logger);
         this.#inputProcessor = InputProcessor_js_1.InputProcessor.create(browsingContextStorage);
         this.#scriptProcessor = new ScriptProcessor_js_1.ScriptProcessor(browsingContextStorage, realmStorage, preloadScriptStorage);
-    }
-    static #process_session_status() {
-        return { ready: false, message: 'already connected' };
-    }
-    async #process_session_subscribe(params, channel) {
-        await this.#eventManager.subscribe(params.events, params.contexts ?? [null], channel);
-        return {};
-    }
-    async #process_session_unsubscribe(params, channel) {
-        await this.#eventManager.unsubscribe(params.events, params.contexts ?? [null], channel);
-        return {};
+        this.#sessionProcessor = new SessionProcessor_js_1.SessionProcessor(eventManager);
+        this.#cdpProcessor = new CdpProcessor_js_1.CdpProcessor(browsingContextStorage, cdpConnection);
     }
     async #processCommand(command) {
         switch (command.method) {
-            case 'browser.close':
             case 'session.end':
             case 'session.new':
                 // TODO: Implement.
                 break;
+            // Browser domain
+            // keep-sorted start block=yes
+            case 'browser.close':
+                return this.#browserProcessor.close();
+            // keep-sorted end
             // Browsing Context domain
             // keep-sorted start block=yes
             case 'browsingContext.activate':
-                return this.#browsingContextProcessor.process_browsingContext_activate(this.#parser.parseActivateParams(command.params));
+                return this.#browsingContextProcessor.activate(this.#parser.parseActivateParams(command.params));
             case 'browsingContext.captureScreenshot':
-                return this.#browsingContextProcessor.process_browsingContext_captureScreenshot(this.#parser.parseCaptureScreenshotParams(command.params));
+                return this.#browsingContextProcessor.captureScreenshot(this.#parser.parseCaptureScreenshotParams(command.params));
             case 'browsingContext.close':
-                return this.#browsingContextProcessor.process_browsingContext_close(this.#parser.parseCloseParams(command.params));
+                return this.#browsingContextProcessor.close(this.#parser.parseCloseParams(command.params));
             case 'browsingContext.create':
-                return this.#browsingContextProcessor.process_browsingContext_create(this.#parser.parseCreateParams(command.params));
+                return this.#browsingContextProcessor.create(this.#parser.parseCreateParams(command.params));
             case 'browsingContext.getTree':
-                return this.#browsingContextProcessor.process_browsingContext_getTree(this.#parser.parseGetTreeParams(command.params));
+                return this.#browsingContextProcessor.getTree(this.#parser.parseGetTreeParams(command.params));
             case 'browsingContext.handleUserPrompt':
-                return this.#browsingContextProcessor.process_browsingContext_handleUserPrompt(this.#parser.parseHandleUserPromptParams(command.params));
+                return this.#browsingContextProcessor.handleUserPrompt(this.#parser.parseHandleUserPromptParams(command.params));
             case 'browsingContext.navigate':
-                return this.#browsingContextProcessor.process_browsingContext_navigate(this.#parser.parseNavigateParams(command.params));
+                return this.#browsingContextProcessor.navigate(this.#parser.parseNavigateParams(command.params));
             case 'browsingContext.print':
-                return this.#browsingContextProcessor.process_browsingContext_print(this.#parser.parsePrintParams(command.params));
+                return this.#browsingContextProcessor.print(this.#parser.parsePrintParams(command.params));
             case 'browsingContext.reload':
-                return this.#browsingContextProcessor.process_browsingContext_reload(this.#parser.parseReloadParams(command.params));
+                return this.#browsingContextProcessor.reload(this.#parser.parseReloadParams(command.params));
             case 'browsingContext.setViewport':
-                return this.#browsingContextProcessor.process_browsingContext_setViewport(this.#parser.parseSetViewportParams(command.params));
+                return this.#browsingContextProcessor.setViewport(this.#parser.parseSetViewportParams(command.params));
             // keep-sorted end
             // CDP domain
             // keep-sorted start block=yes
             case 'cdp.getSession':
-                return this.#browsingContextProcessor.process_cdp_getSession(this.#parser.parseGetSessionParams(command.params));
+                return this.#cdpProcessor.getSession(this.#parser.parseGetSessionParams(command.params));
             case 'cdp.sendCommand':
-                return this.#browsingContextProcessor.process_cdp_sendCommand(this.#parser.parseSendCommandParams(command.params));
+                return this.#cdpProcessor.sendCommand(this.#parser.parseSendCommandParams(command.params));
             // keep-sorted end
             // Input domain
             // keep-sorted start block=yes
@@ -116,11 +116,11 @@ class CommandProcessor extends EventEmitter_js_1.EventEmitter {
             // Session domain
             // keep-sorted start block=yes
             case 'session.status':
-                return CommandProcessor.#process_session_status();
+                return this.#sessionProcessor.status();
             case 'session.subscribe':
-                return this.#process_session_subscribe(this.#parser.parseSubscribeParams(command.params), command.channel ?? null);
+                return this.#sessionProcessor.subscribe(this.#parser.parseSubscribeParams(command.params), command.channel);
             case 'session.unsubscribe':
-                return this.#process_session_unsubscribe(this.#parser.parseSubscribeParams(command.params), command.channel ?? null);
+                return this.#sessionProcessor.unsubscribe(this.#parser.parseSubscribeParams(command.params), command.channel);
             // keep-sorted end
         }
         // Intentionally kept outside of the switch statement to ensure that
@@ -136,17 +136,17 @@ class CommandProcessor extends EventEmitter_js_1.EventEmitter {
                 id: command.id,
                 result,
             };
-            this.emit('response', OutgoingBidiMessage_js_1.OutgoingBidiMessage.createResolved(response, command.channel ?? null));
+            this.emit('response', OutgoingBidiMessage_js_1.OutgoingBidiMessage.createResolved(response, command.channel));
         }
         catch (e) {
             if (e instanceof protocol_js_1.Exception) {
                 const errorResponse = e;
-                this.emit('response', OutgoingBidiMessage_js_1.OutgoingBidiMessage.createResolved(errorResponse.toErrorResponse(command.id), command.channel ?? null));
+                this.emit('response', OutgoingBidiMessage_js_1.OutgoingBidiMessage.createResolved(errorResponse.toErrorResponse(command.id), command.channel));
             }
             else {
                 const error = e;
                 this.#logger?.(log_js_1.LogType.bidi, error);
-                this.emit('response', OutgoingBidiMessage_js_1.OutgoingBidiMessage.createResolved(new protocol_js_1.UnknownErrorException(error.message, error.stack).toErrorResponse(command.id), command.channel ?? null));
+                this.emit('response', OutgoingBidiMessage_js_1.OutgoingBidiMessage.createResolved(new protocol_js_1.UnknownErrorException(error.message, error.stack).toErrorResponse(command.id), command.channel));
             }
         }
     }

package/lib/cjs/bidiMapper/CommandProcessor.js.map

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

package/lib/cjs/bidiMapper/OutgoingBidiMessage.d.ts

@@ -15,11 +15,12 @@
  * limitations under the License.
  */
 import type { ChromiumBidi } from '../protocol/protocol.js';
+import type { Result } from '../utils/result.js';
 export declare class OutgoingBidiMessage {
     #private;
     private constructor();
-    static createFromPromise(messagePromise: Promise<ChromiumBidi.Message>, channel: string | null): Promise<OutgoingBidiMessage>;
-    static createResolved(message: ChromiumBidi.Message, channel: string | null): Promise<OutgoingBidiMessage>;
+    static createFromPromise(messagePromise: Promise<Result<ChromiumBidi.Message>>, channel: string | null): Promise<Result<OutgoingBidiMessage>>;
+    static createResolved(message: ChromiumBidi.Message, channel?: string | null): Promise<Result<OutgoingBidiMessage>>;
     get message(): ChromiumBidi.Message;
     get channel(): string | null;
 }

package/lib/cjs/bidiMapper/OutgoingBidiMessage.js

@@ -20,15 +20,26 @@ exports.OutgoingBidiMessage = void 0;
 class OutgoingBidiMessage {
     #message;
     #channel;
-    constructor(message, channel) {
+    constructor(message, channel = null) {
         this.#message = message;
         this.#channel = channel;
     }
-    static async createFromPromise(messagePromise, channel) {
-        return messagePromise.then((message) => new OutgoingBidiMessage(message, channel));
+    static createFromPromise(messagePromise, channel) {
+        return messagePromise.then((message) => {
+            if (message.kind === 'success') {
+                return {
+                    kind: 'success',
+                    value: new OutgoingBidiMessage(message.value, channel),
+                };
+            }
+            return message;
+        });
     }
     static createResolved(message, channel) {
-        return Promise.resolve(new OutgoingBidiMessage(message, channel));
+        return Promise.resolve({
+            kind: 'success',
+            value: new OutgoingBidiMessage(message, channel),
+        });
     }
     get message() {
         return this.#message;

package/lib/cjs/bidiMapper/OutgoingBidiMessage.js.map

@@ -1 +1 @@
-{"version":3,"file":"OutgoingBidiMessage.js","sourceRoot":"","sources":["../../../src/bidiMapper/OutgoingBidiMessage.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;;AAIH,MAAa,mBAAmB;IACrB,QAAQ,CAAuB;IAC/B,QAAQ,CAAgB;IAEjC,YAAoB,OAA6B,EAAE,OAAsB;QACvE,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAC5B,cAA6C,EAC7C,OAAsB;QAEtB,OAAO,cAAc,CAAC,IAAI,CACxB,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CACvD,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,cAAc,CACnB,OAA6B,EAC7B,OAAsB;QAEtB,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IACpE,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF;AAhCD,kDAgCC"}
+{"version":3,"file":"OutgoingBidiMessage.js","sourceRoot":"","sources":["../../../src/bidiMapper/OutgoingBidiMessage.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;;AAKH,MAAa,mBAAmB;IACrB,QAAQ,CAAuB;IAC/B,QAAQ,CAAgB;IAEjC,YACE,OAA6B,EAC7B,UAAyB,IAAI;QAE7B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;IAED,MAAM,CAAC,iBAAiB,CACtB,cAAqD,EACrD,OAAsB;QAEtB,OAAO,cAAc,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;YACrC,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE;gBAC9B,OAAO;oBACL,IAAI,EAAE,SAAS;oBACf,KAAK,EAAE,IAAI,mBAAmB,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC;iBACvD,CAAC;aACH;YACD,OAAO,OAAO,CAAC;QACjB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,cAAc,CACnB,OAA6B,EAC7B,OAAuB;QAEvB,OAAO,OAAO,CAAC,OAAO,CAAC;YACrB,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,IAAI,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC;SACjD,CAAC,CAAC;IACL,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF;AA5CD,kDA4CC"}

package/lib/cjs/bidiMapper/domains/browser/BrowserProcessor.d.ts

@@ -0,0 +1,23 @@
+/**
+ * Copyright 2023 Google LLC.
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import type { EmptyResult } from '../../../protocol/protocol.js';
+import type { ICdpConnection } from '../../bidiMapper';
+export declare class BrowserProcessor {
+    #private;
+    constructor(cdpConnection: ICdpConnection);
+    close(): EmptyResult;
+}

package/lib/cjs/bidiMapper/domains/browser/BrowserProcessor.js

@@ -0,0 +1,34 @@
+"use strict";
+/**
+ * Copyright 2023 Google LLC.
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BrowserProcessor = void 0;
+class BrowserProcessor {
+    #cdpConnection;
+    constructor(cdpConnection) {
+        this.#cdpConnection = cdpConnection;
+    }
+    close() {
+        const client = this.#cdpConnection.browserClient();
+        // Insure that its put at the last place in the event loop
+        // That way we send back the response before closing in tab
+        setTimeout(() => client.sendCommand('Browser.close'), 0);
+        return {};
+    }
+}
+exports.BrowserProcessor = BrowserProcessor;
+//# sourceMappingURL=BrowserProcessor.js.map

package/lib/cjs/bidiMapper/domains/browser/BrowserProcessor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"BrowserProcessor.js","sourceRoot":"","sources":["../../../../../src/bidiMapper/domains/browser/BrowserProcessor.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;;AAKH,MAAa,gBAAgB;IAC3B,cAAc,CAAiB;IAE/B,YAAY,aAA6B;QACvC,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;IACtC,CAAC;IAED,KAAK;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC;QAEnD,0DAA0D;QAC1D,2DAA2D;QAC3D,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,CAAC;QAEzD,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AAhBD,4CAgBC"}

package/lib/cjs/bidiMapper/domains/cdp/CdpProcessor.d.ts

@@ -0,0 +1,25 @@
+/**
+ * Copyright 2023 Google LLC.
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import type { Cdp } from '../../../protocol/protocol.js';
+import type { ICdpConnection } from '../../bidiMapper.js';
+import type { BrowsingContextStorage } from '../context/browsingContextStorage.js';
+export declare class CdpProcessor {
+    #private;
+    constructor(browsingContextStorage: BrowsingContextStorage, cdpConnection: ICdpConnection);
+    getSession(params: Cdp.GetSessionParameters): Cdp.GetSessionResult;
+    sendCommand(params: Cdp.SendCommandParameters): Promise<Cdp.SendCommandResult>;
+}

package/lib/cjs/bidiMapper/domains/cdp/CdpProcessor.js

@@ -0,0 +1,47 @@
+"use strict";
+/**
+ * Copyright 2023 Google LLC.
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CdpProcessor = void 0;
+class CdpProcessor {
+    #browsingContextStorage;
+    #cdpConnection;
+    constructor(browsingContextStorage, cdpConnection) {
+        this.#browsingContextStorage = browsingContextStorage;
+        this.#cdpConnection = cdpConnection;
+    }
+    getSession(params) {
+        const context = params.context;
+        const sessionId = this.#browsingContextStorage.getContext(context).cdpTarget.cdpSessionId;
+        if (sessionId === undefined) {
+            return {};
+        }
+        return { session: sessionId };
+    }
+    async sendCommand(params) {
+        const client = params.session
+            ? this.#cdpConnection.getCdpClient(params.session)
+            : this.#cdpConnection.browserClient();
+        const result = await client.sendCommand(params.method, params.params);
+        return {
+            result,
+            session: params.session,
+        };
+    }
+}
+exports.CdpProcessor = CdpProcessor;
+//# sourceMappingURL=CdpProcessor.js.map

package/lib/cjs/bidiMapper/domains/cdp/CdpProcessor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"CdpProcessor.js","sourceRoot":"","sources":["../../../../../src/bidiMapper/domains/cdp/CdpProcessor.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;;AAMH,MAAa,YAAY;IACvB,uBAAuB,CAAyB;IAChD,cAAc,CAAiB;IAE/B,YACE,sBAA8C,EAC9C,aAA6B;QAE7B,IAAI,CAAC,uBAAuB,GAAG,sBAAsB,CAAC;QACtD,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;IACtC,CAAC;IAED,UAAU,CAAC,MAAgC;QACzC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAC/B,MAAM,SAAS,GACb,IAAI,CAAC,uBAAuB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC;QAC1E,IAAI,SAAS,KAAK,SAAS,EAAE;YAC3B,OAAO,EAAE,CAAC;SACX;QACD,OAAO,EAAC,OAAO,EAAE,SAAS,EAAC,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,WAAW,CACf,MAAiC;QAEjC,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO;YAC3B,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC;YAClD,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC;QACxC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QACtE,OAAO;YACL,MAAM;YACN,OAAO,EAAE,MAAM,CAAC,OAAO;SACxB,CAAC;IACJ,CAAC;CACF;AAlCD,oCAkCC"}

package/lib/cjs/bidiMapper/domains/context/browsingContextImpl.d.ts

@@ -20,6 +20,7 @@ import { type LoggerFn } from '../../../utils/log.js';
 import type { IEventManager } from '../events/EventManager.js';
 import { Realm } from '../script/realm.js';
 import type { RealmStorage } from '../script/realmStorage.js';
+import type { Result } from '../../../utils/result.js';
 import type { BrowsingContextStorage } from './browsingContextStorage.js';
 import type { CdpTarget } from './cdpTarget.js';
 export declare class BrowsingContextImpl {
@@ -52,8 +53,8 @@ export declare class BrowsingContextImpl {
     get cdpTarget(): CdpTarget;
     updateCdpTarget(cdpTarget: CdpTarget): void;
     get url(): string;
-    awaitLoaded(): Promise<void>;
-    awaitUnblocked(): Promise<void>;
+    lifecycleLoaded(): Promise<void>;
+    targetUnblocked(): Promise<Result<void>>;
     getOrCreateSandbox(sandbox: string | undefined): Promise<Realm>;
     serializeToBidiValue(maxDepth?: number, addParentField?: boolean): BrowsingContext.Info;
     onTargetInfoChanged(params: Protocol.Target.TargetInfoChangedEvent): void;

package/lib/cjs/bidiMapper/domains/context/browsingContextImpl.js

@@ -34,7 +34,6 @@ class BrowsingContextImpl {
     #children = new Set();
     #browsingContextStorage;
     #deferreds = {
-        documentInitialized: new deferred_js_1.Deferred(),
         Page: {
             navigatedWithinDocument: new deferred_js_1.Deferred(),
             lifecycleEvent: {
@@ -165,10 +164,10 @@ class BrowsingContextImpl {
     get url() {
         return this.#url;
     }
-    async awaitLoaded() {
+    async lifecycleLoaded() {
         await this.#deferreds.Page.lifecycleEvent.load;
     }
-    awaitUnblocked() {
+    targetUnblocked() {
         return this.#cdpTarget.targetUnblocked;
     }
     async getOrCreateSandbox(sandbox) {
@@ -259,7 +258,6 @@ class BrowsingContextImpl {
             }
             if (params.name === 'init') {
                 this.#documentChanged(params.loaderId);
-                this.#deferreds.documentInitialized.resolve();
                 return;
             }
             if (params.name === 'commit') {
@@ -273,7 +271,6 @@ class BrowsingContextImpl {
             const timestamp = BrowsingContextImpl.getTimestamp();
             switch (params.name) {
                 case 'DOMContentLoaded':
-                    this.#deferreds.Page.lifecycleEvent.DOMContentLoaded.resolve(params);
                     this.#eventManager.registerEvent({
                         type: 'event',
                         method: protocol_js_1.ChromiumBidi.BrowsingContext.EventNames.DomContentLoadedEvent,
@@ -284,9 +281,9 @@ class BrowsingContextImpl {
                             url: this.#url,
                         },
                     }, this.id);
+                    this.#deferreds.Page.lifecycleEvent.DOMContentLoaded.resolve(params);
                     break;
                 case 'load':
-                    this.#deferreds.Page.lifecycleEvent.load.resolve(params);
                     this.#eventManager.registerEvent({
                         type: 'event',
                         method: protocol_js_1.ChromiumBidi.BrowsingContext.EventNames.LoadEvent,
@@ -297,6 +294,7 @@ class BrowsingContextImpl {
                             url: this.#url,
                         },
                     }, this.id);
+                    this.#deferreds.Page.lifecycleEvent.load.resolve(params);
                     break;
             }
         });
@@ -387,12 +385,6 @@ class BrowsingContextImpl {
         this.#loaderId = loaderId;
     }
     #resetDeferredsIfFinished() {
-        if (this.#deferreds.documentInitialized.isFinished) {
-            this.#deferreds.documentInitialized = new deferred_js_1.Deferred();
-        }
-        else {
-            this.#logger?.(log_js_1.LogType.browsingContexts, 'Document changed (document initialized)');
-        }
         if (this.#deferreds.Page.lifecycleEvent.DOMContentLoaded.isFinished) {
             this.#deferreds.Page.lifecycleEvent.DOMContentLoaded =
                 new deferred_js_1.Deferred();
@@ -415,7 +407,7 @@ class BrowsingContextImpl {
         catch {
             throw new protocol_js_1.InvalidArgumentException(`Invalid URL: ${url}`);
         }
-        await this.awaitUnblocked();
+        await this.targetUnblocked();
         // TODO: handle loading errors.
         const cdpNavigateResult = await this.#cdpTarget.cdpClient.sendCommand('Page.navigate', {
             url,
@@ -443,7 +435,7 @@ class BrowsingContextImpl {
                     await this.#deferreds.Page.navigatedWithinDocument;
                 }
                 else {
-                    await this.awaitLoaded();
+                    await this.lifecycleLoaded();
                 }
                 break;
         }
@@ -453,7 +445,7 @@ class BrowsingContextImpl {
         };
     }
     async reload(ignoreCache, wait) {
-        await this.awaitUnblocked();
+        await this.targetUnblocked();
         await this.#cdpTarget.cdpClient.sendCommand('Page.reload', {
             ignoreCache,
         });
@@ -465,7 +457,7 @@ class BrowsingContextImpl {
                 await this.#deferreds.Page.lifecycleEvent.DOMContentLoaded;
                 break;
             case "complete" /* BrowsingContext.ReadinessState.Complete */:
-                await this.awaitLoaded();
+                await this.lifecycleLoaded();
                 break;
         }
         return {};