appium-android-driver 10.1.1 → 10.2.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 +12 -0
- package/build/lib/commands/context/helpers.d.ts.map +1 -1
- package/build/lib/commands/context/helpers.js +10 -5
- package/build/lib/commands/context/helpers.js.map +1 -1
- package/build/lib/commands/geolocation.d.ts +14 -4
- package/build/lib/commands/geolocation.d.ts.map +1 -1
- package/build/lib/commands/geolocation.js +18 -4
- package/build/lib/commands/geolocation.js.map +1 -1
- package/build/lib/driver.d.ts +1 -1
- package/build/lib/execute-method-map.d.ts +1 -1
- package/build/lib/execute-method-map.js +1 -1
- package/build/lib/execute-method-map.js.map +1 -1
- package/lib/commands/context/helpers.js +10 -6
- package/lib/commands/geolocation.js +26 -4
- package/lib/execute-method-map.ts +1 -1
- package/package.json +3 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,15 @@
|
|
|
1
|
+
## [10.2.0](https://github.com/appium/appium-android-driver/compare/v10.1.2...v10.2.0) (2025-02-25)
|
|
2
|
+
|
|
3
|
+
### Features
|
|
4
|
+
|
|
5
|
+
* extend mobile: setGeoLocation ([#986](https://github.com/appium/appium-android-driver/issues/986)) ([c1c6f67](https://github.com/appium/appium-android-driver/commit/c1c6f67051849c4a982fb97634c5e2cfb70f5b05))
|
|
6
|
+
|
|
7
|
+
## [10.1.2](https://github.com/appium/appium-android-driver/compare/v10.1.1...v10.1.2) (2025-02-22)
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* Pass reqBasePath option to chromedriver ([#985](https://github.com/appium/appium-android-driver/issues/985)) ([d59cb28](https://github.com/appium/appium-android-driver/commit/d59cb28eec262b6fd03bc99771d120224a756483))
|
|
12
|
+
|
|
1
13
|
## [10.1.1](https://github.com/appium/appium-android-driver/compare/v10.1.0...v10.1.1) (2025-02-18)
|
|
2
14
|
|
|
3
15
|
### Miscellaneous Chores
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../lib/commands/context/helpers.js"],"names":[],"mappings":"AAoIA;;;;GAIG;AACH,sCAHW,MAAM,GACJ,OAAO,WAAW,EAAE,OAAO,CAAC,OAAO,+BAA+B,CAAC,CAO/E;AA4GD;;;;;;;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,
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../lib/commands/context/helpers.js"],"names":[],"mappings":"AAoIA;;;;GAIG;AACH,sCAHW,MAAM,GACJ,OAAO,WAAW,EAAE,OAAO,CAAC,OAAO,+BAA+B,CAAC,CAO/E;AA4GD;;;;;;;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,CA4EjC;AAED;;;;;GAKG;AACH,0CAJ4B,CAAC,SAAf,YAAa,4DAChB,CAAC,GACC,OAAO,CAAC,CAAC,CAAC,CAUtB;AAED;;;GAGG;AACH,wFAFa,OAAO,CAQnB;AAED;;;GAGG;AACH,kFAFa,OAAO,CAAC,IAAI,CAAC,CAqBzB;AAryBD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6BG;AACH,kCAAmC,oBAAoB,CAAC;AACxD,kDAKE;AAIF,yBAA0B,YAAY,CAAC;AACvC,0BAA2B,SAAS,CAAC;AACrC,2BAA4B,UAAU,CAAC;AACvC,sCAA8C;AAC9C,6CAAqF;kBAwwBxE,OAAO,YAAY,EAAE,GAAG;6BAzzBV,qBAAqB"}
|
|
@@ -633,11 +633,12 @@ async function setupNewChromedriver(opts, curDeviceId, context) {
|
|
|
633
633
|
this.log.debug('Passing web view details to the Chromedriver constructor: ' +
|
|
634
634
|
JSON.stringify(details, null, 2));
|
|
635
635
|
}
|
|
636
|
-
|
|
637
|
-
|
|
636
|
+
/** @type {import('appium-chromedriver').ChromedriverOpts} */
|
|
637
|
+
const chromedriverOpts = {
|
|
638
|
+
port: lodash_1.default.isNil(opts.chromedriverPort) ? undefined : String(opts.chromedriverPort),
|
|
638
639
|
executable: opts.chromedriverExecutable,
|
|
639
|
-
adb:
|
|
640
|
-
cmdArgs: /** @type {string[]} */ (opts.chromedriverArgs),
|
|
640
|
+
adb: this.adb,
|
|
641
|
+
cmdArgs: /** @type {string[] | undefined} */ (opts.chromedriverArgs),
|
|
641
642
|
verbose: !!opts.showChromedriverLog,
|
|
642
643
|
executableDir: opts.chromedriverExecutableDir,
|
|
643
644
|
mappingPath: opts.chromedriverChromeMappingFile,
|
|
@@ -648,7 +649,11 @@ async function setupNewChromedriver(opts, curDeviceId, context) {
|
|
|
648
649
|
// @ts-ignore this is ok
|
|
649
650
|
details,
|
|
650
651
|
isAutodownloadEnabled: isChromedriverAutodownloadEnabled.bind(this)(),
|
|
651
|
-
}
|
|
652
|
+
};
|
|
653
|
+
if (this.basePath) {
|
|
654
|
+
chromedriverOpts.reqBasePath = this.basePath;
|
|
655
|
+
}
|
|
656
|
+
const chromedriver = new appium_chromedriver_1.Chromedriver(chromedriverOpts);
|
|
652
657
|
// make sure there are chromeOptions
|
|
653
658
|
opts.chromeOptions = opts.chromeOptions || {};
|
|
654
659
|
// try out any prefixed chromeOptions,
|
|
@@ -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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"}
|
|
@@ -5,12 +5,22 @@
|
|
|
5
5
|
*/
|
|
6
6
|
export function setGeoLocation(this: import("../driver").AndroidDriver, location: import("@appium/types").Location): Promise<import("@appium/types").Location>;
|
|
7
7
|
/**
|
|
8
|
+
* Set the device geolocation.
|
|
9
|
+
*
|
|
8
10
|
* @this {import('../driver').AndroidDriver}
|
|
9
|
-
* @param {number} latitude
|
|
10
|
-
* @param {number} longitude
|
|
11
|
-
* @param {number} [altitude]
|
|
11
|
+
* @param {number} latitude Valid latitude value.
|
|
12
|
+
* @param {number} longitude Valid longitude value.
|
|
13
|
+
* @param {number} [altitude] Valid altitude value.
|
|
14
|
+
* @param {number} [satellites] Number of satellites being tracked (1-12). Available for emulators.
|
|
15
|
+
* @param {number} [speed] Valid speed value.
|
|
16
|
+
* https://developer.android.com/reference/android/location/Location#setSpeed(float)
|
|
17
|
+
* @param {number} [bearing] Valid bearing value. Available for real devices.
|
|
18
|
+
* https://developer.android.com/reference/android/location/Location#setBearing(float)
|
|
19
|
+
* @param {number} [accuracy] Valid accuracy value. Available for real devices.
|
|
20
|
+
* https://developer.android.com/reference/android/location/Location#setAccuracy(float),
|
|
21
|
+
* https://developer.android.com/reference/android/location/Criteria
|
|
12
22
|
*/
|
|
13
|
-
export function mobileSetGeolocation(this: import("../driver").AndroidDriver, latitude: number, longitude: number, altitude?: number): Promise<void>;
|
|
23
|
+
export function mobileSetGeolocation(this: import("../driver").AndroidDriver, latitude: number, longitude: number, altitude?: number, satellites?: number, speed?: number, bearing?: number, accuracy?: number): Promise<void>;
|
|
14
24
|
/**
|
|
15
25
|
* Sends an async request to refresh the GPS cache.
|
|
16
26
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"geolocation.d.ts","sourceRoot":"","sources":["../../../lib/commands/geolocation.js"],"names":[],"mappings":"AAeA;;;;GAIG;AACH,kFAHW,OAAO,eAAe,EAAE,QAAQ,GAC9B,OAAO,CAAC,OAAO,eAAe,EAAE,QAAQ,CAAC,CAiBrD;AAED
|
|
1
|
+
{"version":3,"file":"geolocation.d.ts","sourceRoot":"","sources":["../../../lib/commands/geolocation.js"],"names":[],"mappings":"AAeA;;;;GAIG;AACH,kFAHW,OAAO,eAAe,EAAE,QAAQ,GAC9B,OAAO,CAAC,OAAO,eAAe,EAAE,QAAQ,CAAC,CAiBrD;AAED;;;;;;;;;;;;;;;GAeG;AACH,wFAZW,MAAM,aACN,MAAM,aACN,MAAM,eACN,MAAM,UACN,MAAM,YAEN,MAAM,aAEN,MAAM,iBAsBhB;AAED;;;;;;;;;;;;;GAaG;AACH,2FANW,MAAM,GAIJ,OAAO,CAAC,IAAI,CAAC,CAIzB;AAED;;;GAGG;AACH,yEAFa,OAAO,CAAC,OAAO,eAAe,EAAE,QAAQ,CAAC,CASrD;AAED;;;GAGG;AACH,+EAFa,OAAO,CAAC,OAAO,eAAe,EAAE,QAAQ,CAAC,CAIrD;AAED;;;GAGG;AACH,oFAFa,OAAO,CAAC,OAAO,CAAC,CAI5B;AAED;;;GAGG;AACH,iFAFa,OAAO,CAAC,IAAI,CAAC,CAUzB;AAED;;;GAGG;AACH,iFAFa,OAAO,CAAC,IAAI,CAAC,CAOzB;AAID;;;;GAIG;AACH,mFAHW,MAAM,GACJ,OAAO,CAAC,IAAI,CAAC,CAoCzB"}
|
|
@@ -46,16 +46,30 @@ async function setGeoLocation(location) {
|
|
|
46
46
|
}
|
|
47
47
|
}
|
|
48
48
|
/**
|
|
49
|
+
* Set the device geolocation.
|
|
50
|
+
*
|
|
49
51
|
* @this {import('../driver').AndroidDriver}
|
|
50
|
-
* @param {number} latitude
|
|
51
|
-
* @param {number} longitude
|
|
52
|
-
* @param {number} [altitude]
|
|
52
|
+
* @param {number} latitude Valid latitude value.
|
|
53
|
+
* @param {number} longitude Valid longitude value.
|
|
54
|
+
* @param {number} [altitude] Valid altitude value.
|
|
55
|
+
* @param {number} [satellites] Number of satellites being tracked (1-12). Available for emulators.
|
|
56
|
+
* @param {number} [speed] Valid speed value.
|
|
57
|
+
* https://developer.android.com/reference/android/location/Location#setSpeed(float)
|
|
58
|
+
* @param {number} [bearing] Valid bearing value. Available for real devices.
|
|
59
|
+
* https://developer.android.com/reference/android/location/Location#setBearing(float)
|
|
60
|
+
* @param {number} [accuracy] Valid accuracy value. Available for real devices.
|
|
61
|
+
* https://developer.android.com/reference/android/location/Location#setAccuracy(float),
|
|
62
|
+
* https://developer.android.com/reference/android/location/Criteria
|
|
53
63
|
*/
|
|
54
|
-
async function mobileSetGeolocation(latitude, longitude, altitude) {
|
|
64
|
+
async function mobileSetGeolocation(latitude, longitude, altitude, satellites, speed, bearing, accuracy) {
|
|
55
65
|
await this.settingsApp.setGeoLocation({
|
|
56
66
|
latitude,
|
|
57
67
|
longitude,
|
|
58
68
|
altitude,
|
|
69
|
+
satellites,
|
|
70
|
+
speed,
|
|
71
|
+
bearing,
|
|
72
|
+
accuracy
|
|
59
73
|
}, this.isEmulator());
|
|
60
74
|
}
|
|
61
75
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"geolocation.js","sourceRoot":"","sources":["../../../lib/commands/geolocation.js"],"names":[],"mappings":";;;;;AAoBA,wCAeC;
|
|
1
|
+
{"version":3,"file":"geolocation.js","sourceRoot":"","sources":["../../../lib/commands/geolocation.js"],"names":[],"mappings":"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"}
|
package/build/lib/driver.d.ts
CHANGED
|
@@ -693,7 +693,7 @@ declare class AndroidDriver extends BaseDriver<AndroidDriverConstraints, StringR
|
|
|
693
693
|
readonly command: "mobileSetGeolocation";
|
|
694
694
|
readonly params: {
|
|
695
695
|
readonly required: readonly ["latitude", "longitude"];
|
|
696
|
-
readonly optional: readonly ["altitude"];
|
|
696
|
+
readonly optional: readonly ["altitude", "satellites", "speed", "bearing", "accuracy"];
|
|
697
697
|
};
|
|
698
698
|
};
|
|
699
699
|
readonly 'mobile: getGeolocation': {
|
|
@@ -348,7 +348,7 @@ export declare const executeMethodMap: {
|
|
|
348
348
|
readonly command: "mobileSetGeolocation";
|
|
349
349
|
readonly params: {
|
|
350
350
|
readonly required: readonly ["latitude", "longitude"];
|
|
351
|
-
readonly optional: readonly ["altitude"];
|
|
351
|
+
readonly optional: readonly ["altitude", "satellites", "speed", "bearing", "accuracy"];
|
|
352
352
|
};
|
|
353
353
|
};
|
|
354
354
|
readonly 'mobile: getGeolocation': {
|
|
@@ -424,7 +424,7 @@ exports.executeMethodMap = {
|
|
|
424
424
|
command: 'mobileSetGeolocation',
|
|
425
425
|
params: {
|
|
426
426
|
required: ['latitude', 'longitude'],
|
|
427
|
-
optional: ['altitude'],
|
|
427
|
+
optional: ['altitude', 'satellites', 'speed', 'bearing', 'accuracy'],
|
|
428
428
|
}
|
|
429
429
|
},
|
|
430
430
|
'mobile: getGeolocation': {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute-method-map.js","sourceRoot":"","sources":["../../lib/execute-method-map.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"execute-method-map.js","sourceRoot":"","sources":["../../lib/execute-method-map.ts"],"names":[],"mappings":"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"}
|
|
@@ -716,11 +716,12 @@ export async function setupNewChromedriver(opts, curDeviceId, context) {
|
|
|
716
716
|
);
|
|
717
717
|
}
|
|
718
718
|
|
|
719
|
-
|
|
720
|
-
|
|
719
|
+
/** @type {import('appium-chromedriver').ChromedriverOpts} */
|
|
720
|
+
const chromedriverOpts = {
|
|
721
|
+
port: _.isNil(opts.chromedriverPort) ? undefined : String(opts.chromedriverPort),
|
|
721
722
|
executable: opts.chromedriverExecutable,
|
|
722
|
-
adb:
|
|
723
|
-
cmdArgs: /** @type {string[]} */ (opts.chromedriverArgs),
|
|
723
|
+
adb: this.adb,
|
|
724
|
+
cmdArgs: /** @type {string[] | undefined} */ (opts.chromedriverArgs),
|
|
724
725
|
verbose: !!opts.showChromedriverLog,
|
|
725
726
|
executableDir: opts.chromedriverExecutableDir,
|
|
726
727
|
mappingPath: opts.chromedriverChromeMappingFile,
|
|
@@ -731,8 +732,11 @@ export async function setupNewChromedriver(opts, curDeviceId, context) {
|
|
|
731
732
|
// @ts-ignore this is ok
|
|
732
733
|
details,
|
|
733
734
|
isAutodownloadEnabled: isChromedriverAutodownloadEnabled.bind(this)(),
|
|
734
|
-
}
|
|
735
|
-
|
|
735
|
+
};
|
|
736
|
+
if (this.basePath) {
|
|
737
|
+
chromedriverOpts.reqBasePath = this.basePath;
|
|
738
|
+
}
|
|
739
|
+
const chromedriver = new Chromedriver(chromedriverOpts);
|
|
736
740
|
// make sure there are chromeOptions
|
|
737
741
|
opts.chromeOptions = opts.chromeOptions || {};
|
|
738
742
|
// try out any prefixed chromeOptions,
|
|
@@ -36,16 +36,38 @@ export async function setGeoLocation(location) {
|
|
|
36
36
|
}
|
|
37
37
|
|
|
38
38
|
/**
|
|
39
|
+
* Set the device geolocation.
|
|
40
|
+
*
|
|
39
41
|
* @this {import('../driver').AndroidDriver}
|
|
40
|
-
* @param {number} latitude
|
|
41
|
-
* @param {number} longitude
|
|
42
|
-
* @param {number} [altitude]
|
|
42
|
+
* @param {number} latitude Valid latitude value.
|
|
43
|
+
* @param {number} longitude Valid longitude value.
|
|
44
|
+
* @param {number} [altitude] Valid altitude value.
|
|
45
|
+
* @param {number} [satellites] Number of satellites being tracked (1-12). Available for emulators.
|
|
46
|
+
* @param {number} [speed] Valid speed value.
|
|
47
|
+
* https://developer.android.com/reference/android/location/Location#setSpeed(float)
|
|
48
|
+
* @param {number} [bearing] Valid bearing value. Available for real devices.
|
|
49
|
+
* https://developer.android.com/reference/android/location/Location#setBearing(float)
|
|
50
|
+
* @param {number} [accuracy] Valid accuracy value. Available for real devices.
|
|
51
|
+
* https://developer.android.com/reference/android/location/Location#setAccuracy(float),
|
|
52
|
+
* https://developer.android.com/reference/android/location/Criteria
|
|
43
53
|
*/
|
|
44
|
-
export async function mobileSetGeolocation(
|
|
54
|
+
export async function mobileSetGeolocation(
|
|
55
|
+
latitude,
|
|
56
|
+
longitude,
|
|
57
|
+
altitude,
|
|
58
|
+
satellites,
|
|
59
|
+
speed,
|
|
60
|
+
bearing,
|
|
61
|
+
accuracy
|
|
62
|
+
) {
|
|
45
63
|
await this.settingsApp.setGeoLocation({
|
|
46
64
|
latitude,
|
|
47
65
|
longitude,
|
|
48
66
|
altitude,
|
|
67
|
+
satellites,
|
|
68
|
+
speed,
|
|
69
|
+
bearing,
|
|
70
|
+
accuracy
|
|
49
71
|
}, this.isEmulator());
|
|
50
72
|
}
|
|
51
73
|
|
|
@@ -452,7 +452,7 @@ export const executeMethodMap = {
|
|
|
452
452
|
command: 'mobileSetGeolocation',
|
|
453
453
|
params: {
|
|
454
454
|
required: ['latitude', 'longitude'],
|
|
455
|
-
optional: ['altitude'],
|
|
455
|
+
optional: ['altitude', 'satellites', 'speed', 'bearing', 'accuracy'],
|
|
456
456
|
}
|
|
457
457
|
},
|
|
458
458
|
'mobile: getGeolocation': {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "appium-android-driver",
|
|
3
|
-
"version": "10.
|
|
3
|
+
"version": "10.2.0",
|
|
4
4
|
"description": "Android UiAutomator and Chrome support for Appium",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"appium",
|
|
@@ -51,11 +51,11 @@
|
|
|
51
51
|
"@appium/support": "^6.0.0",
|
|
52
52
|
"@colors/colors": "^1.6.0",
|
|
53
53
|
"appium-adb": "^12.12.0",
|
|
54
|
-
"appium-chromedriver": "^7.0.
|
|
54
|
+
"appium-chromedriver": "^7.0.6",
|
|
55
55
|
"asyncbox": "^3.0.0",
|
|
56
56
|
"axios": "^1.x",
|
|
57
57
|
"bluebird": "^3.4.7",
|
|
58
|
-
"io.appium.settings": "^5.
|
|
58
|
+
"io.appium.settings": "^5.14.0",
|
|
59
59
|
"lodash": "^4.17.4",
|
|
60
60
|
"lru-cache": "^10.0.1",
|
|
61
61
|
"moment": "^2.24.0",
|