Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix(playwright-core): async android close method in connect flow

Browse source
This commit is contained in:
Kamalpreet Kaur 2024-03-01 00:08:51 +05:30
parent d9a00342c8
commit 11e9e83f88
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
packages/playwright-core/src/client/android.ts
View file

@ -118,6 +118,7 @@ export class AndroidDevice extends ChannelOwner<channels.AndroidDeviceChannel> i
readonly _timeoutSettings: TimeoutSettings; readonly _timeoutSettings: TimeoutSettings;
private _webViews = new Map<string, AndroidWebView>(); private _webViews = new Map<string, AndroidWebView>();
_shouldCloseConnectionOnClose = false; _shouldCloseConnectionOnClose = false;
private _closedPromise: Promise<void>;
static from(androidDevice: channels.AndroidDeviceChannel): AndroidDevice { static from(androidDevice: channels.AndroidDeviceChannel): AndroidDevice {
return (androidDevice as any)._object; return (androidDevice as any)._object;
@ -129,6 +130,7 @@ export class AndroidDevice extends ChannelOwner<channels.AndroidDeviceChannel> i
super(parent, type, guid, initializer); super(parent, type, guid, initializer);
this.input = new AndroidInput(this); this.input = new AndroidInput(this);
this._timeoutSettings = new TimeoutSettings((parent as Android)._timeoutSettings); this._timeoutSettings = new TimeoutSettings((parent as Android)._timeoutSettings);
this._closedPromise = new Promise(f => this.once(Events.Browser.Disconnected, f));
this._channel.on('webViewAdded', ({ webView }) => this._onWebViewAdded(webView)); this._channel.on('webViewAdded', ({ webView }) => this._onWebViewAdded(webView));
this._channel.on('webViewRemoved', ({ socketName }) => this._onWebViewRemoved(socketName)); this._channel.on('webViewRemoved', ({ socketName }) => this._onWebViewRemoved(socketName));
this._channel.on('close', () => this._didClose()); this._channel.on('close', () => this._didClose());
@ -244,6 +246,7 @@ export class AndroidDevice extends ChannelOwner<channels.AndroidDeviceChannel> i
this._connection.close(); this._connection.close();
else else
await this._channel.close(); await this._channel.close();
await this._closedPromise;
} catch (e) { } catch (e) {
if (isTargetClosedError(e)) if (isTargetClosedError(e))
return; return;