appium-android-driver 12.0.2 → 12.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +6 -0
- package/build/lib/commands/context/exports.d.ts +10 -0
- package/build/lib/commands/context/exports.d.ts.map +1 -1
- package/build/lib/commands/context/exports.js +2 -1
- package/build/lib/commands/context/exports.js.map +1 -1
- package/build/lib/commands/context/helpers.d.ts +2 -1
- package/build/lib/commands/context/helpers.d.ts.map +1 -1
- package/build/lib/commands/context/helpers.js +32 -4
- package/build/lib/commands/context/helpers.js.map +1 -1
- package/build/lib/constraints.d.ts +3 -0
- package/build/lib/constraints.d.ts.map +1 -1
- package/build/lib/constraints.js +3 -0
- package/build/lib/constraints.js.map +1 -1
- package/build/lib/driver.d.ts +4 -0
- package/build/lib/driver.d.ts.map +1 -1
- package/build/lib/driver.js +9 -2
- package/build/lib/driver.js.map +1 -1
- package/lib/commands/context/exports.js +2 -1
- package/lib/commands/context/helpers.js +34 -4
- package/lib/constraints.ts +3 -0
- package/lib/driver.ts +10 -18
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
## [12.1.0](https://github.com/appium/appium-android-driver/compare/v12.0.2...v12.1.0) (2025-10-30)
|
|
2
|
+
|
|
3
|
+
### Features
|
|
4
|
+
|
|
5
|
+
* Add chromedriverForwardBiDi capability ([#1025](https://github.com/appium/appium-android-driver/issues/1025)) ([fa8b92e](https://github.com/appium/appium-android-driver/commit/fa8b92ebe82790496fa8562081fe44e63643396a))
|
|
6
|
+
|
|
1
7
|
## [12.0.2](https://github.com/appium/appium-android-driver/compare/v12.0.1...v12.0.2) (2025-10-28)
|
|
2
8
|
|
|
3
9
|
### Miscellaneous Chores
|
|
@@ -51,6 +51,16 @@ export class assignContexts {
|
|
|
51
51
|
* @returns {Promise<void>}
|
|
52
52
|
*/
|
|
53
53
|
export function switchContext(this: import("../../driver").AndroidDriver, name: string, webviewsMapping: import("../types").WebviewsMapping[]): Promise<void>;
|
|
54
|
+
export class switchContext {
|
|
55
|
+
/**
|
|
56
|
+
* @this {AndroidDriver}
|
|
57
|
+
* @param {string} name
|
|
58
|
+
* @param {import('../types').WebviewsMapping[]} webviewsMapping
|
|
59
|
+
* @returns {Promise<void>}
|
|
60
|
+
*/
|
|
61
|
+
constructor(this: import("../../driver").AndroidDriver, name: string, webviewsMapping: import("../types").WebviewsMapping[]);
|
|
62
|
+
_bidiProxyUrl: any;
|
|
63
|
+
}
|
|
54
64
|
/**
|
|
55
65
|
* @this {AndroidDriver}
|
|
56
66
|
* @returns {string}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exports.d.ts","sourceRoot":"","sources":["../../../../lib/commands/context/exports.js"],"names":[],"mappings":"AAwBA;;;GAGG;AACH,+EAFa,OAAO,CAAC,MAAM,CAAC,CAM3B;AAED;;;GAGG;AACH,yEAFa,OAAO,CAAC,MAAM,EAAE,CAAC,CAK7B;AAED;;;;GAIG;AACH,6EAHW,MAAM,OAAC,GACL,OAAO,CAAC,IAAI,CAAC,CAyBzB;;IA5BD;;;;OAIG;IACH,8DAHW,MAAM,OAAC,EA0BjB;IAFC,mBAA4B;;AAI9B;;;;GAIG;AACH,iGAHW,MAAM,GACJ,OAAO,CAAC,OAAO,UAAU,EAAE,eAAe,EAAE,CAAC,CAWzD;AAED;;;;GAIG;AACH,4FAHW,OAAO,UAAU,EAAE,eAAe,EAAE,GAClC,MAAM,EAAE,CAQpB;;IAXD;;;;OAIG;IACH,yEAHW,OAAO,UAAU,EAAE,eAAe,EAAE,EAS9C;IAHC,gBAAyC;;AAK3C;;;;;GAKG;AACH,gFAJW,MAAM,mBACN,OAAO,UAAU,EAAE,eAAe,EAAE,GAClC,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"exports.d.ts","sourceRoot":"","sources":["../../../../lib/commands/context/exports.js"],"names":[],"mappings":"AAwBA;;;GAGG;AACH,+EAFa,OAAO,CAAC,MAAM,CAAC,CAM3B;AAED;;;GAGG;AACH,yEAFa,OAAO,CAAC,MAAM,EAAE,CAAC,CAK7B;AAED;;;;GAIG;AACH,6EAHW,MAAM,OAAC,GACL,OAAO,CAAC,IAAI,CAAC,CAyBzB;;IA5BD;;;;OAIG;IACH,8DAHW,MAAM,OAAC,EA0BjB;IAFC,mBAA4B;;AAI9B;;;;GAIG;AACH,iGAHW,MAAM,GACJ,OAAO,CAAC,OAAO,UAAU,EAAE,eAAe,EAAE,CAAC,CAWzD;AAED;;;;GAIG;AACH,4FAHW,OAAO,UAAU,EAAE,eAAe,EAAE,GAClC,MAAM,EAAE,CAQpB;;IAXD;;;;OAIG;IACH,yEAHW,OAAO,UAAU,EAAE,eAAe,EAAE,EAS9C;IAHC,gBAAyC;;AAK3C;;;;;GAKG;AACH,gFAJW,MAAM,mBACN,OAAO,UAAU,EAAE,eAAe,EAAE,GAClC,OAAO,CAAC,IAAI,CAAC,CAuBzB;;IA3BD;;;;;OAKG;IACH,8DAJW,MAAM,mBACN,OAAO,UAAU,EAAE,eAAe,EAAE,EAwB9C;IApBC,mBAAyB;;AAsB3B;;;GAGG;AACH,gFAFa,MAAM,CAIlB;AAED;;;GAGG;AACH,gFAFa,MAAM,CAIlB;AAED;;;GAGG;AACH,0EAFa,OAAO,CAInB;AAED;;;GAGG;AACH,6EAFa,OAAO,CAAC,MAAM,CAAC,CAW3B;AAED;;;GAGG;AACH,8EAFa,OAAO,CAAC,MAAM,EAAE,CAAC,CAW7B;AAED;;;;GAIG;AACH,8EAHW,MAAM,GACJ,OAAO,CAAC,IAAI,CAAC,CAWzB;AAED;;;;;;;GAOG;AACH,4FAJW,MAAM,mBACN,OAAO,UAAU,EAAE,eAAe,EAAE,GAClC,OAAO,CAAC,IAAI,CAAC,CAkGzB;;IAxGD;;;;;;;OAOG;IACH,iEAJW,MAAM,mBACN,OAAO,UAAU,EAAE,eAAe,EAAE,EAmG9C;IARC,kBAAsB;IAEtB,iBAAqE;IACrE,gJAGC;IACD,wBAA0B;;AAG5B;;;;;GAKG;AACH,sFAFa,IAAI,CAOhB;;IAJC,kBAA6B;IAC7B,iBAA4B;IAC5B,kBAA6B;IAC7B,wBAA2B;;AAG7B;;;;;;GAMG;AACH,wFAHW,MAAM,GACJ,OAAO,CAAC,IAAI,CAAC,CAiBzB;AAED;;;;;;GAMG;AACH,qFAFa,OAAO,CAAC,IAAI,CAAC,CAgBzB;AAED;;;;GAIG;AACH,4FAHW,MAAM,GACJ,OAAO,CAInB;AAED;;;;;GAKG;AACH,qFAFa,OAAO,CAAC,IAAI,CAAC,CAMzB;AAED;;;GAGG;AACH,gFAFa,OAAO,CAAC,IAAI,CAAC,CAiDzB;;IA7BC,kBAGC;IAWD,mBAA8B;IAI9B,iBAAqE;IACrE,gJAGC;IACD,wBAA0B;;kBASf,OAAO,YAAY,EAAE,GAAG;4BACxB,OAAO,cAAc,EAAE,aAAa"}
|
|
@@ -111,6 +111,7 @@ function assignContexts(webviewsMapping) {
|
|
|
111
111
|
* @returns {Promise<void>}
|
|
112
112
|
*/
|
|
113
113
|
async function switchContext(name, webviewsMapping) {
|
|
114
|
+
this._bidiProxyUrl = null;
|
|
114
115
|
// We have some options when it comes to webviews. If we want a
|
|
115
116
|
// Chromedriver webview, we can only control one at a time.
|
|
116
117
|
if (this.isChromedriverContext(name)) {
|
|
@@ -211,7 +212,7 @@ async function startChromedriverProxy(context, webviewsMapping) {
|
|
|
211
212
|
// we want to reconnect to it, not create a whole new one
|
|
212
213
|
this.log.debug(`Found existing Chromedriver for context '${context}'. Using it.`);
|
|
213
214
|
cd = this.sessionChromedrivers[context];
|
|
214
|
-
await helpers_1.setupExistingChromedriver.bind(this)(cd);
|
|
215
|
+
await helpers_1.setupExistingChromedriver.bind(this)(cd, context);
|
|
215
216
|
}
|
|
216
217
|
else {
|
|
217
218
|
// XXX: this suppresses errors about putting arbitrary stuff on opts
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exports.js","sourceRoot":"","sources":["../../../../lib/commands/context/exports.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"exports.js","sourceRoot":"","sources":["../../../../lib/commands/context/exports.js"],"names":[],"mappings":"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"}
|
|
@@ -64,9 +64,10 @@ export function setupNewChromedriver(this: import("../../driver").AndroidDriver,
|
|
|
64
64
|
* @this {import('../../driver').AndroidDriver}
|
|
65
65
|
* @template {Chromedriver} T
|
|
66
66
|
* @param {T} chromedriver
|
|
67
|
+
* @param {string} context
|
|
67
68
|
* @returns {Promise<T>}
|
|
68
69
|
*/
|
|
69
|
-
export function setupExistingChromedriver<T extends Chromedriver>(this: import("../../driver").AndroidDriver, chromedriver: T): Promise<T>;
|
|
70
|
+
export function setupExistingChromedriver<T extends Chromedriver>(this: import("../../driver").AndroidDriver, chromedriver: T, context: string): Promise<T>;
|
|
70
71
|
/**
|
|
71
72
|
* @this {import('../../driver').AndroidDriver}
|
|
72
73
|
* @returns {boolean}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../lib/commands/context/helpers.js"],"names":[],"mappings":"AAoIA;;;;GAIG;AACH,sCAHW,MAAM;;;;;;;;;;;;;;;;;;;;;EAQhB;
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../lib/commands/context/helpers.js"],"names":[],"mappings":"AAoIA;;;;GAIG;AACH,sCAHW,MAAM;;;;;;;;;;;;;;;;;;;;;EAQhB;AAgHD;;;;;;;GAOG;AACH,+FAJW,OAAO,UAAU,EAAE,eAAe,EAAE,iDACpC,OAAO,UAAU,EAAE,eAAe,GAChC,MAAM,EAAE,CA4BpB;AAqID;;;;;;;;;;;;;;;;GAgBG;AACH,0MAHW,OAAO,UAAU,EAAE,eAAe,GAChC,OAAO,CAAC,OAAO,UAAU,EAAE,eAAe,EAAE,CAAC,CAsEzD;AAwLD;;;;;;GAMG;AACH,uFALW,OAAO,cAAc,EAAE,iBAAiB,eACxC,MAAM,YACN,MAAM,GACJ,OAAO,CAAC,YAAY,CAAC,CA6EjC;AAED;;;;;;GAMG;AACH,0CAL4B,CAAC,SAAf,YAAa,4DAChB,CAAC,WACD,MAAM,GACJ,OAAO,CAAC,CAAC,CAAC,CAgBtB;AAoBD;;;GAGG;AACH,wFAFa,OAAO,CAQnB;AAED;;;GAGG;AACH,kFAFa,OAAO,CAAC,IAAI,CAAC,CAqBzB;AAn0BD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6BG;AACH,kCAAmC,oBAAoB,CAAC;AACxD,kDAKE;AAIF,yBAA0B,YAAY,CAAC;AACvC,0BAA2B,SAAS,CAAC;AACrC,2BAA4B,UAAU,CAAC;AACvC,sCAA8C;AAC9C,6CAAqF;kBAsyBxE,OAAO,YAAY,EAAE,GAAG;6BAv1BV,qBAAqB"}
|
|
@@ -213,6 +213,9 @@ function createChromedriverCaps(opts, deviceId, webViewDetails) {
|
|
|
213
213
|
opts.chromeOptions.args = [...(opts.chromeOptions.args || []), ...opts.chromeOptions.Arguments];
|
|
214
214
|
delete opts.chromeOptions.Arguments;
|
|
215
215
|
}
|
|
216
|
+
if (opts.webSocketUrl && lodash_1.default.isNil(caps.chromeOptions.webSocketUrl)) {
|
|
217
|
+
caps.chromeOptions.webSocketUrl = opts.webSocketUrl;
|
|
218
|
+
}
|
|
216
219
|
this.log.debug('Precalculated Chromedriver capabilities: ' + JSON.stringify(caps.chromeOptions, null, 2));
|
|
217
220
|
/** @type {string[]} */
|
|
218
221
|
const protectedCapNames = [];
|
|
@@ -675,24 +678,49 @@ async function setupNewChromedriver(opts, curDeviceId, context) {
|
|
|
675
678
|
}
|
|
676
679
|
const caps = /** @type {any} */ (createChromedriverCaps.bind(this)(opts, curDeviceId, details));
|
|
677
680
|
this.log.debug(`Before starting chromedriver, androidPackage is '${caps.chromeOptions.androidPackage}'`);
|
|
678
|
-
await chromedriver.start(caps);
|
|
681
|
+
const sessionCaps = await chromedriver.start(caps);
|
|
682
|
+
updateBidiProxyUrl.bind(this)(sessionCaps, context);
|
|
679
683
|
return chromedriver;
|
|
680
684
|
}
|
|
681
685
|
/**
|
|
682
686
|
* @this {import('../../driver').AndroidDriver}
|
|
683
687
|
* @template {Chromedriver} T
|
|
684
688
|
* @param {T} chromedriver
|
|
689
|
+
* @param {string} context
|
|
685
690
|
* @returns {Promise<T>}
|
|
686
691
|
*/
|
|
687
|
-
async function setupExistingChromedriver(chromedriver) {
|
|
692
|
+
async function setupExistingChromedriver(chromedriver, context) {
|
|
688
693
|
// check the status by sending a simple window-based command to ChromeDriver
|
|
689
694
|
// if there is an error, we want to recreate the ChromeDriver session
|
|
690
|
-
if (
|
|
695
|
+
if (await chromedriver.hasWorkingWebview()) {
|
|
696
|
+
const cachedBidiProxyUrl = this._bidiProxyUrlCache.get(context);
|
|
697
|
+
if (cachedBidiProxyUrl) {
|
|
698
|
+
updateBidiProxyUrl.bind(this)({ webSocketUrl: cachedBidiProxyUrl }, context);
|
|
699
|
+
}
|
|
700
|
+
}
|
|
701
|
+
else {
|
|
691
702
|
this.log.debug('ChromeDriver is not associated with a window. Re-initializing the session.');
|
|
692
|
-
await chromedriver.restart();
|
|
703
|
+
const sessionCaps = await chromedriver.restart();
|
|
704
|
+
updateBidiProxyUrl.bind(this)(sessionCaps, context);
|
|
693
705
|
}
|
|
694
706
|
return chromedriver;
|
|
695
707
|
}
|
|
708
|
+
/**
|
|
709
|
+
* @this {import('../../driver').AndroidDriver}
|
|
710
|
+
* @param {Record<string, any>} sessionCaps
|
|
711
|
+
* @param {string} context
|
|
712
|
+
* @returns {void}
|
|
713
|
+
*/
|
|
714
|
+
function updateBidiProxyUrl(sessionCaps, context) {
|
|
715
|
+
if (!this.opts?.chromedriverForwardBiDi || !sessionCaps?.webSocketUrl) {
|
|
716
|
+
return;
|
|
717
|
+
}
|
|
718
|
+
this._bidiProxyUrlCache.set(context, sessionCaps.webSocketUrl);
|
|
719
|
+
if (this._bidiProxyUrl !== sessionCaps.webSocketUrl) {
|
|
720
|
+
this._bidiProxyUrl = sessionCaps.webSocketUrl;
|
|
721
|
+
this.log.debug(`Updated Bidi Proxy URL to ${this._bidiProxyUrl}`);
|
|
722
|
+
}
|
|
723
|
+
}
|
|
696
724
|
/**
|
|
697
725
|
* @this {import('../../driver').AndroidDriver}
|
|
698
726
|
* @returns {boolean}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../lib/commands/context/helpers.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../lib/commands/context/helpers.js"],"names":[],"mappings":"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"}
|
|
@@ -89,6 +89,9 @@ export declare const ANDROID_DRIVER_CONSTRAINTS: {
|
|
|
89
89
|
readonly chromedriverArgs: {
|
|
90
90
|
readonly isObject: true;
|
|
91
91
|
};
|
|
92
|
+
readonly chromedriverForwardBiDi: {
|
|
93
|
+
readonly isBoolean: true;
|
|
94
|
+
};
|
|
92
95
|
readonly chromedriverExecutable: {
|
|
93
96
|
readonly isString: true;
|
|
94
97
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constraints.d.ts","sourceRoot":"","sources":["../../lib/constraints.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,0BAA0B
|
|
1
|
+
{"version":3,"file":"constraints.d.ts","sourceRoot":"","sources":["../../lib/constraints.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAuIrC,2CAA2C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyIb,CAAC;AAEjC,eAAe,0BAA0B,CAAC;AAE1C,MAAM,MAAM,wBAAwB,GAAG,OAAO,0BAA0B,CAAC"}
|
package/build/lib/constraints.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constraints.js","sourceRoot":"","sources":["../../lib/constraints.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"constraints.js","sourceRoot":"","sources":["../../lib/constraints.ts"],"names":[],"mappings":"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"}
|
package/build/lib/driver.d.ts
CHANGED
|
@@ -39,6 +39,7 @@ import { mobileShell } from './commands/shell';
|
|
|
39
39
|
import { mobileStartScreenStreaming, mobileStopScreenStreaming } from './commands/streamscreen';
|
|
40
40
|
import { getSystemBars, mobilePerformStatusBarCommand } from './commands/system-bars';
|
|
41
41
|
import { getDeviceTime, mobileGetDeviceTime } from './commands/time';
|
|
42
|
+
import { LRUCache } from 'lru-cache';
|
|
42
43
|
export type AndroidDriverCaps = DriverCaps<AndroidDriverConstraints>;
|
|
43
44
|
export type W3CAndroidDriverCaps = W3CDriverCaps<AndroidDriverConstraints>;
|
|
44
45
|
export type AndroidDriverOpts = DriverOpts<AndroidDriverConstraints>;
|
|
@@ -797,8 +798,11 @@ declare class AndroidDriver extends BaseDriver<AndroidDriverConstraints, StringR
|
|
|
797
798
|
_screenRecordingProperties?: StringRecord;
|
|
798
799
|
_logcatWebsocketListener?: LogcatListener;
|
|
799
800
|
_bidiServerLogListener?: (...args: any[]) => void;
|
|
801
|
+
_bidiProxyUrl: string | null;
|
|
802
|
+
_bidiProxyUrlCache: LRUCache<string, string>;
|
|
800
803
|
opts: AndroidDriverOpts;
|
|
801
804
|
constructor(opts?: InitialOpts, shouldValidateCaps?: boolean);
|
|
805
|
+
get bidiProxyUrl(): string | null;
|
|
802
806
|
get settingsApp(): SettingsApp;
|
|
803
807
|
isEmulator(): boolean;
|
|
804
808
|
get isChromeSession(): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
|
package/build/lib/driver.js
CHANGED
|
@@ -46,6 +46,7 @@ const streamscreen_1 = require("./commands/streamscreen");
|
|
|
46
46
|
const system_bars_1 = require("./commands/system-bars");
|
|
47
47
|
const time_1 = require("./commands/time");
|
|
48
48
|
const execute_method_map_1 = require("./execute-method-map");
|
|
49
|
+
const lru_cache_1 = require("lru-cache");
|
|
49
50
|
const EMULATOR_PATTERN = /\bemulator\b/i;
|
|
50
51
|
class AndroidDriver extends driver_1.BaseDriver {
|
|
51
52
|
static newMethodMap = method_map_1.newMethodMap;
|
|
@@ -68,6 +69,11 @@ class AndroidDriver extends driver_1.BaseDriver {
|
|
|
68
69
|
_screenRecordingProperties;
|
|
69
70
|
_logcatWebsocketListener;
|
|
70
71
|
_bidiServerLogListener;
|
|
72
|
+
_bidiProxyUrl = null;
|
|
73
|
+
_bidiProxyUrlCache = new lru_cache_1.LRUCache({
|
|
74
|
+
max: 20,
|
|
75
|
+
updateAgeOnGet: true,
|
|
76
|
+
});
|
|
71
77
|
opts;
|
|
72
78
|
constructor(opts = {}, shouldValidateCaps = true) {
|
|
73
79
|
super(opts, shouldValidateCaps);
|
|
@@ -84,8 +90,9 @@ class AndroidDriver extends driver_1.BaseDriver {
|
|
|
84
90
|
this.curContext = this.defaultContextName();
|
|
85
91
|
this.opts = opts;
|
|
86
92
|
this._cachedActivityArgs = {};
|
|
87
|
-
|
|
88
|
-
|
|
93
|
+
}
|
|
94
|
+
get bidiProxyUrl() {
|
|
95
|
+
return this.opts.chromedriverForwardBiDi ? this._bidiProxyUrl : null;
|
|
89
96
|
}
|
|
90
97
|
get settingsApp() {
|
|
91
98
|
if (!this._settingsApp || this._settingsApp.adb !== this.adb) {
|
package/build/lib/driver.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":";;;;;;AASA,oDAAuB;AAIvB,0CAAyC;AACzC,+CAAmF;AACnF,6CAA0C;AAC1C,2DAA+C;AAC/C,mCAAsE;AACtE,wDAA2E;AAC3E,wDAoBoC;AACpC,qDAKkC;AAClC,yEAkB4C;AAC5C,yEAA+E;AAC/E,8DAqBmC;AACnC,sDAAuE;AACvE,sDAAuD;AACvD,oDAAuD;AACvD,gDAgB4B;AAC5B,gDAE4B;AAC5B,0DAKiC;AACjC,0CAAgE;AAChE,wDASgC;AAChC,kDAE6B;AAC7B,wCAMwB;AACxB,8CAM2B;AAC3B,kDAQ6B;AAC7B,qDAA6E;AAC7E,wCAOwB;AACxB,kEAIqC;AACrC,8CAAuD;AACvD,wCAAyC;AACzC,gEAA2E;AAC3E,0CAQyB;AACzB,gDAW4B;AAC5B,wDAIgC;AAChC,8CAI2B;AAC3B,wDAAqF;AACrF,0DAAkF;AAClF,oDAAoE;AACpE,4CAA6C;AAC7C,0DAA8F;AAC9F,wDAAoF;AACpF,0CAAmE;AACnE,6DAAwD;
|
|
1
|
+
{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":";;;;;;AASA,oDAAuB;AAIvB,0CAAyC;AACzC,+CAAmF;AACnF,6CAA0C;AAC1C,2DAA+C;AAC/C,mCAAsE;AACtE,wDAA2E;AAC3E,wDAoBoC;AACpC,qDAKkC;AAClC,yEAkB4C;AAC5C,yEAA+E;AAC/E,8DAqBmC;AACnC,sDAAuE;AACvE,sDAAuD;AACvD,oDAAuD;AACvD,gDAgB4B;AAC5B,gDAE4B;AAC5B,0DAKiC;AACjC,0CAAgE;AAChE,wDASgC;AAChC,kDAE6B;AAC7B,wCAMwB;AACxB,8CAM2B;AAC3B,kDAQ6B;AAC7B,qDAA6E;AAC7E,wCAOwB;AACxB,kEAIqC;AACrC,8CAAuD;AACvD,wCAAyC;AACzC,gEAA2E;AAC3E,0CAQyB;AACzB,gDAW4B;AAC5B,wDAIgC;AAChC,8CAI2B;AAC3B,wDAAqF;AACrF,0DAAkF;AAClF,oDAAoE;AACpE,4CAA6C;AAC7C,0DAA8F;AAC9F,wDAAoF;AACpF,0CAAmE;AACnE,6DAAwD;AACxD,yCAAqC;AAMrC,MAAM,gBAAgB,GAAG,eAAe,CAAC;AAGzC,MAAM,aACJ,SAAQ,mBAAkD;IAG1D,MAAM,CAAC,YAAY,GAAG,yBAAY,CAAC;IACnC,MAAM,CAAC,gBAAgB,GAAG,qCAAgB,CAAC;IAE3C,aAAa,CAAiB;IAC9B,GAAG,CAAM;IACT,YAAY,CAAc;IAC1B,WAAW,CAAyB;IACpC,QAAQ,CAAY;IACpB,oBAAoB,CAAmC;IACvD,YAAY,CAAsB;IAClC,YAAY,CAAyC;IACrD,cAAc,CAAU;IACxB,UAAU,CAAS;IACnB,kBAAkB,CAAW;IAC7B,UAAU,CAAU;IACpB,2BAA2B,CAAW;IACtC,mBAAmB,CAAe;IAClC,qBAAqB,CAAgB;IACrC,0BAA0B,CAAgB;IAC1C,wBAAwB,CAAkB;IAC1C,sBAAsB,CAA4B;IAClD,aAAa,GAAkB,IAAI,CAAC;IACpC,kBAAkB,GAA6B,IAAI,oBAAQ,CAAC;QAC1D,GAAG,EAAE,EAAE;QACP,cAAc,EAAE,IAAI;KACrB,CAAC,CAAC;IACH,IAAI,CAAoB;IAExB,YAAY,OAAoB,EAAiB,EAAE,kBAAkB,GAAG,IAAI;QAC1E,KAAK,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;QAEhC,IAAI,CAAC,iBAAiB,GAAG;YACvB,OAAO;YACP,IAAI;YACJ,YAAY;YACZ,kBAAkB;YAClB,sBAAsB;SACvB,CAAC;QACF,IAAI,CAAC,qBAAqB,GAAG,gBAAC,CAAC,SAAS,CAAC,wCAA0B,CAAC,CAAC;QACrE,IAAI,CAAC,oBAAoB,GAAG,EAAE,CAAC;QAC/B,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;QAE5B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC5C,IAAI,CAAC,IAAI,GAAG,IAAyB,CAAC;QACtC,IAAI,CAAC,mBAAmB,GAAG,EAAE,CAAC;IAChC,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC;IACvE,CAAC;IAED,IAAI,WAAW;QACb,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,KAAK,IAAI,CAAC,GAAG,EAAE,CAAC;YAC7D,IAAI,CAAC,YAAY,GAAG,IAAI,gCAAW,CAAC,EAAC,GAAG,EAAE,IAAI,CAAC,GAAG,EAAC,CAAC,CAAC;QACvD,CAAC;QACD,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED,UAAU;QACR,MAAM,aAAa,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QAC/D,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,IAAI,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACzF,CAAC;IAED,IAAI,eAAe;QACjB,OAAO,gBAAC,CAAC,QAAQ,CACf,MAAM,CAAC,IAAI,CAAC,yCAA+B,CAAC,EAC5C,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAC5C,CAAC;IACJ,CAAC;IAEQ,mBAAmB,CAAC,IAAS;QACpC,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC;YACrC,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;gBACb,oGAAoG;gBACpG,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,yFAAyF,CAC1F,CAAC;YACJ,CAAC;YACD,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBACpB,MAAM,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAC/B,4EAA4E,CAC7E,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAChC,IAAI,CAAC;gBACH,IAAA,kBAAU,EAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;YAC1C,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,MAAM,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAC/B,wDAAyD,CAAW,CAAC,OAAO,EAAE,CAC/E,CAAC;YACJ,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEQ,KAAK,CAAC,aAAa,CAAC,SAAyB;QACpD,MAAM,yCAAiC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QAErD,IAAI,CAAC;YACH,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC;YACvC,MAAM,IAAI,CAAC,GAAG,EAAE,UAAU,EAAE,CAAC;QAC/B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,mDAAmD,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QAChF,CAAC;QAED,IAAI,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAChC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,sBAAsB,CAAC,CAAC;QAC5D,CAAC;QAED,MAAM,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IACvC,CAAC;IAED,WAAW,GAAG,qBAAW,CAAC;IAC1B,iBAAiB,GAAG,2BAAiB,CAAC;IACtC,kBAAkB,GAAG,4BAAkB,CAAC;IACxC,cAAc,GAAG,wBAAc,CAAC;IAChC,aAAa,GAAG,uBAAa,CAAC;IAC9B,kBAAkB,GAAG,4BAAkB,CAAC;IACxC,qBAAqB,GAAG,+BAAqB,CAAC;IAC9C,sBAAsB,GAAG,gCAAsB,CAAC;IAChD,uBAAuB,GAAG,iCAAuB,CAAC;IAClD,wBAAwB,GAAG,kCAAwB,CAAC;IACpD,kBAAkB,GAAG,4BAAkB,CAAC;IACxC,kBAAkB,GAAG,4BAAkB,CAAC;IACxC,YAAY,GAAG,sBAAY,CAAC;IAC5B,iBAAiB,GAAG,2BAAiB,CAAC;IACtC,UAAU,GAAG,oBAA0E,CAAC;IACxF,SAAS,GAAG,mBAAS,CAAC;IACtB,eAAe,GAAG,yBAAe,CAAC;IAClC,gBAAgB,GAAG,0BAAgB,CAAC;IACpC,uBAAuB,GAAG,iCAAuB,CAAC;IAElD,qBAAqB,GAAG,8BAAqB,CAAC;IAC9C,SAAS,GAAG,kBAAS,CAAC;IACtB,aAAa,GAAG,sBAAa,CAAC;IAC9B,UAAU,GAAG,mBAAU,CAAC;IAExB,WAAW,GAAG,8BAAW,CAAC;IAC1B,iBAAiB,GAAG,oCAAiB,CAAC;IACtC,OAAO,GAAG,0BAAO,CAAC;IAClB,aAAa,GAAG,gCAAa,CAAC;IAC9B,OAAO,GAAG,0BAAO,CAAC;IAClB,aAAa,GAAG,gCAAa,CAAC;IAC9B,SAAS,GAAG,4BAAS,CAAC;IACtB,eAAe,GAAG,kCAAe,CAAC;IAClC,QAAQ,GAAG,2BAAQ,CAAC;IACpB,cAAc,GAAG,iCAAc,CAAC;IAChC,OAAO,GAAG,0BAAO,CAAC;IAClB,aAAa,GAAG,gCAAa,CAAC;IAC9B,aAAa,GAAG,gCAAa,CAAC;IAC9B,mBAAmB,GAAG,sCAAmB,CAAC;IAC1C,YAAY,GAAG,+BAAY,CAAC;IAC5B,kBAAkB,GAAG,qCAAkB,CAAC;IACxC,SAAS,GAAG,4BAAS,CAAC;IAEtB,2BAA2B,GAAG,8CAA2B,CAAC;IAE1D,qBAAqB,GAAG,sCAAqB,CAAC;IAC9C,sBAAsB,GAAG,uCAAsB,CAAC;IAChD,gBAAgB,GAAG,iCAAgB,CAAC;IACpC,UAAU,GAAG,2BAAU,CAAC;IACxB,QAAQ,GAAG,yBAAQ,CAAC;IACpB,UAAU,GAAG,2BAAU,CAAC;IACxB,kBAAkB,GAAG,mCAAkB,CAAC;IACxC,iBAAiB,GAAG,kCAAiB,CAAC;IACtC,cAAc,GAAG,+BAAc,CAAC;IAChC,gBAAgB,GAAG,iCAAgB,CAAC;IACpC,UAAU,GAAG,2BAAU,CAAC;IACxB,oBAAoB,GAAG,qCAAoB,CAAC;IAC5C,eAAe,GAAG,gCAAe,CAAC;IAClC,kBAAkB,GAAG,mCAAkB,CAAC;IACxC,YAAY,GAAG,6BAAY,CAAC;IAC5B,SAAS,GAAG,0BAAS,CAAC;IACtB,WAAW,GAAG,4BAAW,CAAC;IAC1B,aAAa,GAAG,8BAAa,CAAC;IAC9B,cAAc,GAAG,+BAAc,CAAC;IAChC,mBAAmB,GAAG,oCAAmB,CAAC;IAE1C,eAAe,GAAG,4BAAe,CAAC;IAClC,eAAe,GAAG,4BAAe,CAAC;IAElC,gBAAgB,GAAG,6BAAgB,CAAC;IAEpC,eAAe,GAAG,2BAAe,CAAC;IAElC,YAAY,GAAG,sBAAY,CAAC;IAC5B,OAAO,GAAG,iBAAO,CAAC;IAClB,gBAAgB,GAAG,0BAAgB,CAAC;IACpC,cAAc,GAAG,wBAAc,CAAC;IAChC,eAAe,GAAG,yBAAe,CAAC;IAClC,eAAe,GAAG,yBAAe,CAAC;IAClC,iBAAiB,GAAG,2BAAiB,CAAC;IACtC,YAAY,GAAG,sBAAY,CAAC;IAC5B,iBAAiB,GAAG,2BAAiB,CAAC;IACtC,QAAQ,GAAG,kBAAQ,CAAC;IACpB,KAAK,GAAG,eAAK,CAAC;IACd,iBAAiB,GAAG,2BAAiB,CAAC;IACtC,OAAO,GAAG,iBAAO,CAAC;IAClB,WAAW,GAAG,qBAAW,CAAC;IAC1B,OAAO,GAAG,iBAAO,CAAC;IAElB,OAAO,GAAG,iBAAO,CAAC;IAElB,QAAQ,GAAG,uBAAQ,CAAC;IACpB,UAAU,GAAG,yBAAU,CAAC;IACxB,QAAQ,GAAG,uBAAQ,CAAC;IACpB,gBAAgB,GAAG,+BAAgB,CAAC;IAEpC,WAAW,GAAG,kBAAW,CAAC;IAC1B,kBAAkB,GAAG,yBAAkB,CAAC;IAExC,cAAc,GAAG,4BAAc,CAAC;IAChC,cAAc,GAAG,4BAAc,CAAC;IAChC,qBAAqB,GAAG,mCAAqB,CAAC;IAC9C,sBAAsB,GAAG,oCAAsB,CAAC;IAChD,yBAAyB,GAAG,uCAAyB,CAAC;IACtD,oBAAoB,GAAG,kCAAoB,CAAC;IAC5C,oBAAoB,GAAG,kCAAoB,CAAC;IAC5C,sBAAsB,GAAG,oCAAsB,CAAC;IAEhD,cAAc,GAAG,yBAAc,CAAC;IAEhC,cAAc,GAAG,oBAAc,CAAC;IAChC,mBAAmB,GAAG,yBAAmB,CAAC;IAC1C,kBAAkB,GAAG,wBAAkB,CAAC;IACxC,iBAAiB,GAAG,uBAAiB,CAAC;IACtC,mBAAmB,GAAG,yBAAmB,CAAC;IAE1C,aAAa,GAAG,sBAUE,CAAC;IACnB,mBAAmB,GAAG,4BAAmB,CAAC;IAC1C,eAAe,GAAG,wBAAe,CAAC;IAClC,kBAAkB,GAAG,2BAAkB,CAAC;IACxC,iBAAiB,GAAG,0BAAiB,CAAC;IAEtC,YAAY,GAAG,uBAAY,CAAC;IAC5B,eAAe,GAAG,0BAAe,CAAC;IAClC,IAAI,GAAG,eAAI,CAAC;IACZ,UAAU,GAAG,qBAAU,CAAC;IACxB,YAAY,GAAG,uBAAY,CAAC;IAC5B,gBAAgB,GAAG,2BAAgB,CAAC;IACpC,yBAAyB,GAAG,oCAAyB,CAAC;IAEtD,IAAI,GAAG,cAAI,CAAC;IACZ,MAAM,GAAG,gBAAM,CAAC;IAChB,YAAY,GAAG,sBAAY,CAAC;IAC5B,QAAQ,GAAG,kBAAQ,CAAC;IAEpB,iBAAiB,GAAG,uBAAiB,CAAC;IACtC,wBAAwB,GAAG,8BAAwB,CAAC;IACpD,uBAAuB,GAAG,6BAAuB,CAAC;IAClD,WAAW,GAAG,iBAAW,CAAC;IAC1B,MAAM,GAAG,YAAM,CAAC;IAChB,qBAAqB,GAAG,2BAAqB,CAAC;IAE9C,uCAAuC,GAAG,0DAAuC,CAAC;IAClF,mCAAmC,GAAG,sDAAmC,CAAC;IAC1E,kCAAkC,GAAG,qDAAkC,CAAC;IAExE,oBAAoB,GAAG,6BAAoB,CAAC;IAE5C,+BAA+B,GAAG,iDAA+B,CAAC;IAElE,aAAa,GAAG,oBAAa,CAAC;IAC9B,aAAa,GAAG,oBAAa,CAAC;IAC9B,iBAAiB,GAAG,wBAAiB,CAAC;IACtC,sBAAsB,GAAG,6BAAsB,CAAC;IAChD,aAAa,GAAG,oBAAa,CAAC;IAC9B,iBAAiB,GAAG,wBAAiB,CAAC;IACtC,MAAM,GAAG,aAAM,CAAC;IAEhB,oBAAoB,GAAG,8BAAoB,CAAC;IAC5C,QAAQ,GAAG,kBAAQ,CAAC;IACpB,qBAAqB,GAAG,+BAAqB,CAAC;IAC9C,qBAAqB,GAAG,+BAAqB,CAAC;IAC9C,oBAAoB,GAAG,8BAAoB,CAAC;IAC5C,YAAY,GAAG,sBAAY,CAAC;IAC5B,YAAY,GAAG,sBAAY,CAAC;IAC5B,UAAU,GAAG,oBAAU,CAAC;IACxB,gBAAgB,GAAG,0BAAgB,CAAC;IACpC,UAAU,GAAG,oBAAU,CAAC;IAExB,kBAAkB,GAAG,gCAAkB,CAAC;IACxC,uBAAuB,GAAG,qCAAuB,CAAC;IAClD,wBAAwB,GAAG,sCAAwB,CAAC;IAEpD,uBAAuB,GAAG,qCAAuB,CAAC;IAClD,oBAAoB,GAAG,kCAAoB,CAAC;IAE5C,oBAAoB,GAAG,mCAAoB,CAAC;IAC5C,mBAAmB,GAAG,kCAAmB,CAAC;IAE1C,UAAU,GAAG,sBAAU,CAAC;IACxB,kBAAkB,GAAG,8BAAkB,CAAC;IAExC,WAAW,GAAG,mBAAW,CAAC;IAE1B,SAAS,GAAG,eAAS,CAAC;IAEtB,0BAA0B,GAAG,yCAA0B,CAAC;IACxD,yBAAyB,GAAG,wCAAyB,CAAC;IAEtD,aAAa,GAAG,2BAAa,CAAC;IAC9B,6BAA6B,GAAG,2CAA6B,CAAC;IAE9D,aAAa,GAAG,oBAAa,CAAC;IAC9B,mBAAmB,GAAG,0BAAmB,CAAC;IAE1C,KAAK,GAAG,cAAK,CAAC;IACd,QAAQ,GAAG,iBAAQ,CAAC;IACpB,SAAS,GAAG,kBAAS,CAAC;;AAGhB,sCAAa"}
|
|
@@ -107,6 +107,7 @@ export function assignContexts(webviewsMapping) {
|
|
|
107
107
|
* @returns {Promise<void>}
|
|
108
108
|
*/
|
|
109
109
|
export async function switchContext(name, webviewsMapping) {
|
|
110
|
+
this._bidiProxyUrl = null;
|
|
110
111
|
// We have some options when it comes to webviews. If we want a
|
|
111
112
|
// Chromedriver webview, we can only control one at a time.
|
|
112
113
|
if (this.isChromedriverContext(name)) {
|
|
@@ -215,7 +216,7 @@ export async function startChromedriverProxy(context, webviewsMapping) {
|
|
|
215
216
|
// we want to reconnect to it, not create a whole new one
|
|
216
217
|
this.log.debug(`Found existing Chromedriver for context '${context}'. Using it.`);
|
|
217
218
|
cd = this.sessionChromedrivers[context];
|
|
218
|
-
await setupExistingChromedriver.bind(this)(cd);
|
|
219
|
+
await setupExistingChromedriver.bind(this)(cd, context);
|
|
219
220
|
} else {
|
|
220
221
|
// XXX: this suppresses errors about putting arbitrary stuff on opts
|
|
221
222
|
const opts = /** @type {any} */ (_.cloneDeep(this.opts));
|
|
@@ -222,6 +222,10 @@ function createChromedriverCaps(opts, deviceId, webViewDetails) {
|
|
|
222
222
|
delete opts.chromeOptions.Arguments;
|
|
223
223
|
}
|
|
224
224
|
|
|
225
|
+
if (opts.webSocketUrl && _.isNil(caps.chromeOptions.webSocketUrl)) {
|
|
226
|
+
caps.chromeOptions.webSocketUrl = opts.webSocketUrl;
|
|
227
|
+
}
|
|
228
|
+
|
|
225
229
|
this.log.debug(
|
|
226
230
|
'Precalculated Chromedriver capabilities: ' + JSON.stringify(caps.chromeOptions, null, 2),
|
|
227
231
|
);
|
|
@@ -763,7 +767,8 @@ export async function setupNewChromedriver(opts, curDeviceId, context) {
|
|
|
763
767
|
this.log.debug(
|
|
764
768
|
`Before starting chromedriver, androidPackage is '${caps.chromeOptions.androidPackage}'`,
|
|
765
769
|
);
|
|
766
|
-
await chromedriver.start(caps);
|
|
770
|
+
const sessionCaps = await chromedriver.start(caps);
|
|
771
|
+
updateBidiProxyUrl.bind(this)(sessionCaps, context);
|
|
767
772
|
return chromedriver;
|
|
768
773
|
}
|
|
769
774
|
|
|
@@ -771,18 +776,43 @@ export async function setupNewChromedriver(opts, curDeviceId, context) {
|
|
|
771
776
|
* @this {import('../../driver').AndroidDriver}
|
|
772
777
|
* @template {Chromedriver} T
|
|
773
778
|
* @param {T} chromedriver
|
|
779
|
+
* @param {string} context
|
|
774
780
|
* @returns {Promise<T>}
|
|
775
781
|
*/
|
|
776
|
-
export async function setupExistingChromedriver(chromedriver) {
|
|
782
|
+
export async function setupExistingChromedriver(chromedriver, context) {
|
|
777
783
|
// check the status by sending a simple window-based command to ChromeDriver
|
|
778
784
|
// if there is an error, we want to recreate the ChromeDriver session
|
|
779
|
-
if (
|
|
785
|
+
if (await chromedriver.hasWorkingWebview()) {
|
|
786
|
+
const cachedBidiProxyUrl = this._bidiProxyUrlCache.get(context);
|
|
787
|
+
if (cachedBidiProxyUrl) {
|
|
788
|
+
updateBidiProxyUrl.bind(this)({webSocketUrl: cachedBidiProxyUrl}, context);
|
|
789
|
+
}
|
|
790
|
+
} else {
|
|
780
791
|
this.log.debug('ChromeDriver is not associated with a window. Re-initializing the session.');
|
|
781
|
-
await chromedriver.restart();
|
|
792
|
+
const sessionCaps = await chromedriver.restart();
|
|
793
|
+
updateBidiProxyUrl.bind(this)(sessionCaps, context);
|
|
782
794
|
}
|
|
783
795
|
return chromedriver;
|
|
784
796
|
}
|
|
785
797
|
|
|
798
|
+
/**
|
|
799
|
+
* @this {import('../../driver').AndroidDriver}
|
|
800
|
+
* @param {Record<string, any>} sessionCaps
|
|
801
|
+
* @param {string} context
|
|
802
|
+
* @returns {void}
|
|
803
|
+
*/
|
|
804
|
+
function updateBidiProxyUrl(sessionCaps, context) {
|
|
805
|
+
if (!this.opts?.chromedriverForwardBiDi || !sessionCaps?.webSocketUrl) {
|
|
806
|
+
return;
|
|
807
|
+
}
|
|
808
|
+
|
|
809
|
+
this._bidiProxyUrlCache.set(context, sessionCaps.webSocketUrl);
|
|
810
|
+
if (this._bidiProxyUrl !== sessionCaps.webSocketUrl) {
|
|
811
|
+
this._bidiProxyUrl = sessionCaps.webSocketUrl;
|
|
812
|
+
this.log.debug(`Updated Bidi Proxy URL to ${this._bidiProxyUrl}`);
|
|
813
|
+
}
|
|
814
|
+
}
|
|
815
|
+
|
|
786
816
|
/**
|
|
787
817
|
* @this {import('../../driver').AndroidDriver}
|
|
788
818
|
* @returns {boolean}
|
package/lib/constraints.ts
CHANGED
package/lib/driver.ts
CHANGED
|
@@ -208,6 +208,7 @@ import {mobileStartScreenStreaming, mobileStopScreenStreaming} from './commands/
|
|
|
208
208
|
import {getSystemBars, mobilePerformStatusBarCommand} from './commands/system-bars';
|
|
209
209
|
import {getDeviceTime, mobileGetDeviceTime} from './commands/time';
|
|
210
210
|
import { executeMethodMap } from './execute-method-map';
|
|
211
|
+
import { LRUCache } from 'lru-cache';
|
|
211
212
|
|
|
212
213
|
export type AndroidDriverCaps = DriverCaps<AndroidDriverConstraints>;
|
|
213
214
|
export type W3CAndroidDriverCaps = W3CDriverCaps<AndroidDriverConstraints>;
|
|
@@ -224,39 +225,28 @@ class AndroidDriver
|
|
|
224
225
|
static executeMethodMap = executeMethodMap;
|
|
225
226
|
|
|
226
227
|
jwpProxyAvoid: RouteMatcher[];
|
|
227
|
-
|
|
228
228
|
adb: ADB;
|
|
229
|
-
|
|
230
229
|
_settingsApp: SettingsApp;
|
|
231
|
-
|
|
232
230
|
proxyReqRes?: (...args: any) => any;
|
|
233
|
-
|
|
234
231
|
contexts?: string[];
|
|
235
|
-
|
|
236
232
|
sessionChromedrivers: StringRecord<AppiumChromedriver>;
|
|
237
|
-
|
|
238
233
|
chromedriver?: AppiumChromedriver;
|
|
239
|
-
|
|
240
234
|
proxyCommand?: AndroidExternalDriver['proxyCommand'];
|
|
241
235
|
jwpProxyActive: boolean;
|
|
242
236
|
curContext: string;
|
|
243
|
-
|
|
244
237
|
useUnlockHelperApp?: boolean;
|
|
245
|
-
|
|
246
238
|
defaultIME?: string;
|
|
247
|
-
|
|
248
239
|
_wasWindowAnimationDisabled?: boolean;
|
|
249
|
-
|
|
250
240
|
_cachedActivityArgs: StringRecord;
|
|
251
|
-
|
|
252
241
|
_screenStreamingProps?: StringRecord;
|
|
253
|
-
|
|
254
242
|
_screenRecordingProperties?: StringRecord;
|
|
255
|
-
|
|
256
243
|
_logcatWebsocketListener?: LogcatListener;
|
|
257
|
-
|
|
258
244
|
_bidiServerLogListener?: (...args: any[]) => void;
|
|
259
|
-
|
|
245
|
+
_bidiProxyUrl: string | null = null;
|
|
246
|
+
_bidiProxyUrlCache: LRUCache<string, string> = new LRUCache({
|
|
247
|
+
max: 20,
|
|
248
|
+
updateAgeOnGet: true,
|
|
249
|
+
});
|
|
260
250
|
opts: AndroidDriverOpts;
|
|
261
251
|
|
|
262
252
|
constructor(opts: InitialOpts = {} as InitialOpts, shouldValidateCaps = true) {
|
|
@@ -276,8 +266,10 @@ class AndroidDriver
|
|
|
276
266
|
this.curContext = this.defaultContextName();
|
|
277
267
|
this.opts = opts as AndroidDriverOpts;
|
|
278
268
|
this._cachedActivityArgs = {};
|
|
279
|
-
|
|
280
|
-
|
|
269
|
+
}
|
|
270
|
+
|
|
271
|
+
get bidiProxyUrl(): string | null {
|
|
272
|
+
return this.opts.chromedriverForwardBiDi ? this._bidiProxyUrl : null;
|
|
281
273
|
}
|
|
282
274
|
|
|
283
275
|
get settingsApp(): SettingsApp {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "appium-android-driver",
|
|
3
|
-
"version": "12.0
|
|
3
|
+
"version": "12.1.0",
|
|
4
4
|
"description": "Android UiAutomator and Chrome support for Appium",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"appium",
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
"@appium/support": "^7.0.0-rc.1",
|
|
52
52
|
"@colors/colors": "^1.6.0",
|
|
53
53
|
"appium-adb": "^14.0.0",
|
|
54
|
-
"appium-chromedriver": "^8.0.
|
|
54
|
+
"appium-chromedriver": "^8.0.18",
|
|
55
55
|
"asyncbox": "^3.0.0",
|
|
56
56
|
"axios": "^1.x",
|
|
57
57
|
"bluebird": "^3.4.7",
|