From 7019cc8b977783d3c0de1c0a57c4bd6d55660eb7 Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <aslushnikov@gmail.com>
Date: Thu, 15 Sep 2022 20:38:28 -0700
Subject: [PATCH] feat(docker): `closeAllBrowsers` command for reuseController
 (#17383)

---
 packages/playwright-core/src/cli/driver.ts                    | 4 ++++
 packages/playwright-core/src/protocol/channels.ts             | 4 ++++
 packages/playwright-core/src/protocol/protocol.yml            | 2 ++
 packages/playwright-core/src/protocol/validator.ts            | 2 ++
 .../src/server/dispatchers/reuseControllerDispatcher.ts       | 4 ++++
 packages/playwright-core/src/server/reuseController.ts        | 4 ++++
 6 files changed, 20 insertions(+)

diff --git a/packages/playwright-core/src/cli/driver.ts b/packages/playwright-core/src/cli/driver.ts
index 9c306ca7a6..67e4c2d08f 100644
--- a/packages/playwright-core/src/cli/driver.ts
+++ b/packages/playwright-core/src/cli/driver.ts
@@ -119,6 +119,10 @@ class ProtocolHandler {
     await this._controller.hideHighlightAll();
   }
 
+  async closeAllBrowsers() {
+    await this._controller.closeAllBrowsers();
+  }
+
   async kill() {
     await this._controller.kill();
   }
diff --git a/packages/playwright-core/src/protocol/channels.ts b/packages/playwright-core/src/protocol/channels.ts
index 0e74ff3be0..463e0a56e2 100644
--- a/packages/playwright-core/src/protocol/channels.ts
+++ b/packages/playwright-core/src/protocol/channels.ts
@@ -575,6 +575,7 @@ export interface ReuseControllerChannel extends ReuseControllerEventTarget, Chan
   highlightAll(params: ReuseControllerHighlightAllParams, metadata?: Metadata): Promise<ReuseControllerHighlightAllResult>;
   hideHighlightAll(params?: ReuseControllerHideHighlightAllParams, metadata?: Metadata): Promise<ReuseControllerHideHighlightAllResult>;
   kill(params?: ReuseControllerKillParams, metadata?: Metadata): Promise<ReuseControllerKillResult>;
+  closeAllBrowsers(params?: ReuseControllerCloseAllBrowsersParams, metadata?: Metadata): Promise<ReuseControllerCloseAllBrowsersResult>;
 }
 export type ReuseControllerInspectRequestedEvent = {
   selector: string,
@@ -640,6 +641,9 @@ export type ReuseControllerHideHighlightAllResult = void;
 export type ReuseControllerKillParams = {};
 export type ReuseControllerKillOptions = {};
 export type ReuseControllerKillResult = void;
+export type ReuseControllerCloseAllBrowsersParams = {};
+export type ReuseControllerCloseAllBrowsersOptions = {};
+export type ReuseControllerCloseAllBrowsersResult = void;
 
 export interface ReuseControllerEvents {
   'inspectRequested': ReuseControllerInspectRequestedEvent;
diff --git a/packages/playwright-core/src/protocol/protocol.yml b/packages/playwright-core/src/protocol/protocol.yml
index 3ed1dbc889..285653c25a 100644
--- a/packages/playwright-core/src/protocol/protocol.yml
+++ b/packages/playwright-core/src/protocol/protocol.yml
@@ -663,6 +663,8 @@ ReuseController:
 
     kill:
 
+    closeAllBrowsers:
+
   events:
     inspectRequested:
       parameters:
diff --git a/packages/playwright-core/src/protocol/validator.ts b/packages/playwright-core/src/protocol/validator.ts
index cf40dedfd8..7ed51dca8e 100644
--- a/packages/playwright-core/src/protocol/validator.ts
+++ b/packages/playwright-core/src/protocol/validator.ts
@@ -351,6 +351,8 @@ scheme.ReuseControllerHideHighlightAllParams = tOptional(tObject({}));
 scheme.ReuseControllerHideHighlightAllResult = tOptional(tObject({}));
 scheme.ReuseControllerKillParams = tOptional(tObject({}));
 scheme.ReuseControllerKillResult = tOptional(tObject({}));
+scheme.ReuseControllerCloseAllBrowsersParams = tOptional(tObject({}));
+scheme.ReuseControllerCloseAllBrowsersResult = tOptional(tObject({}));
 scheme.SocksSupportInitializer = tOptional(tObject({}));
 scheme.SocksSupportSocksRequestedEvent = tObject({
   uid: tString,
diff --git a/packages/playwright-core/src/server/dispatchers/reuseControllerDispatcher.ts b/packages/playwright-core/src/server/dispatchers/reuseControllerDispatcher.ts
index 6b98475678..38ab0acb30 100644
--- a/packages/playwright-core/src/server/dispatchers/reuseControllerDispatcher.ts
+++ b/packages/playwright-core/src/server/dispatchers/reuseControllerDispatcher.ts
@@ -69,6 +69,10 @@ export class ReuseControllerDispatcher extends Dispatcher<ReuseController, chann
     await this._object.kill();
   }
 
+  async closeAllBrowsers() {
+    await this._object.closeAllBrowsers();
+  }
+
   override _dispose() {
     super._dispose();
     this._object.dispose();
diff --git a/packages/playwright-core/src/server/reuseController.ts b/packages/playwright-core/src/server/reuseController.ts
index 1f1f5b30bb..ef8e2bce83 100644
--- a/packages/playwright-core/src/server/reuseController.ts
+++ b/packages/playwright-core/src/server/reuseController.ts
@@ -153,6 +153,10 @@ export class ReuseController extends SdkObject {
     selfDestruct();
   }
 
+  async closeAllBrowsers() {
+    await Promise.all(this.allBrowsers().map(browser => browser.close()));
+  }
+
   private _emitSnapshot() {
     const browsers = [];
     for (const browser of this._playwright.allBrowsers()) {