appium-android-driver 14.0.4 → 14.0.6
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/resources.d.ts +2 -1
- package/build/lib/commands/resources.d.ts.map +1 -1
- package/build/lib/commands/resources.js +11 -9
- package/build/lib/commands/resources.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/resources.ts +16 -9
- package/lib/execute-method-map.ts +1 -1
- package/package.json +2 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,15 @@
|
|
|
1
|
+
## [14.0.6](https://github.com/appium/appium-android-driver/compare/v14.0.5...v14.0.6) (2026-08-08)
|
|
2
|
+
|
|
3
|
+
### Bug Fixes
|
|
4
|
+
|
|
5
|
+
* add missing 'stringFile' parameter to 'mobile: getAppStrings' ([#1094](https://github.com/appium/appium-android-driver/issues/1094)) ([b9a8917](https://github.com/appium/appium-android-driver/commit/b9a891766d9343693f96cdf600b026191d20f332))
|
|
6
|
+
|
|
7
|
+
## [14.0.5](https://github.com/appium/appium-android-driver/compare/v14.0.4...v14.0.5) (2026-08-01)
|
|
8
|
+
|
|
9
|
+
### Miscellaneous Chores
|
|
10
|
+
|
|
11
|
+
* Drop esmock ([#1093](https://github.com/appium/appium-android-driver/issues/1093)) ([2051564](https://github.com/appium/appium-android-driver/commit/2051564d38106ef56aca710b1d5d03e46bebf26c))
|
|
12
|
+
|
|
1
13
|
## [14.0.4](https://github.com/appium/appium-android-driver/compare/v14.0.3...v14.0.4) (2026-07-28)
|
|
2
14
|
|
|
3
15
|
### Miscellaneous Chores
|
|
@@ -5,9 +5,10 @@ import type { AndroidDriver } from '../driver.js';
|
|
|
5
5
|
*
|
|
6
6
|
* @param language The language code to retrieve strings for. If not provided,
|
|
7
7
|
* the device's current language will be used.
|
|
8
|
+
* @param stringFile path to APK to extract string resources from
|
|
8
9
|
* @returns Promise that resolves to a mapping of string keys to their localized values.
|
|
9
10
|
*/
|
|
10
|
-
export declare function getStrings(this: AndroidDriver, language?: string | null): Promise<StringRecord>;
|
|
11
|
+
export declare function getStrings(this: AndroidDriver, language?: string | null, stringFile?: string | null): Promise<StringRecord>;
|
|
11
12
|
/**
|
|
12
13
|
* Ensures the device locale is set to the specified language, country, and optional script.
|
|
13
14
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resources.d.ts","sourceRoot":"","sources":["../../../lib/commands/resources.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAEhD,OAAO,KAAK,EAAC,aAAa,EAAoB,MAAM,cAAc,CAAC;AAGnE
|
|
1
|
+
{"version":3,"file":"resources.d.ts","sourceRoot":"","sources":["../../../lib/commands/resources.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAEhD,OAAO,KAAK,EAAC,aAAa,EAAoB,MAAM,cAAc,CAAC;AAGnE;;;;;;;GAOG;AACH,wBAAsB,UAAU,CAC9B,IAAI,EAAE,aAAa,EACnB,QAAQ,GAAE,MAAM,GAAG,IAAW,EAC9B,UAAU,GAAE,MAAM,GAAG,IAAW,GAC/B,OAAO,CAAC,YAAY,CAAC,CAmBvB;AAED;;;;;;;;GAQG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,aAAa,EACnB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC,CAqBf"}
|
|
@@ -4,9 +4,10 @@ import { fs, tempDir, util } from '@appium/support';
|
|
|
4
4
|
*
|
|
5
5
|
* @param language The language code to retrieve strings for. If not provided,
|
|
6
6
|
* the device's current language will be used.
|
|
7
|
+
* @param stringFile path to APK to extract string resources from
|
|
7
8
|
* @returns Promise that resolves to a mapping of string keys to their localized values.
|
|
8
9
|
*/
|
|
9
|
-
export async function getStrings(language = null) {
|
|
10
|
+
export async function getStrings(language = null, stringFile = null) {
|
|
10
11
|
if (!language) {
|
|
11
12
|
language = await this.adb.getDeviceLanguage();
|
|
12
13
|
this.log.info(`No language specified, returning strings for: ${language}`);
|
|
@@ -20,7 +21,8 @@ export async function getStrings(language = null) {
|
|
|
20
21
|
}
|
|
21
22
|
return result;
|
|
22
23
|
};
|
|
23
|
-
|
|
24
|
+
const options = stringFile ? { ...this.opts, app: stringFile } : this.opts;
|
|
25
|
+
return preprocessStringsMap(await extractStringsFromResources(this, language, options));
|
|
24
26
|
}
|
|
25
27
|
/**
|
|
26
28
|
* Ensures the device locale is set to the specified language, country, and optional script.
|
|
@@ -43,7 +45,7 @@ export async function ensureDeviceLocale(language, country, script) {
|
|
|
43
45
|
let errMsg = `Cannot set the device locale to '${toLocaleAbbr({ language, country, script })}'.`;
|
|
44
46
|
let suggestions = [];
|
|
45
47
|
try {
|
|
46
|
-
suggestions = (await fetchLocaleSuggestions
|
|
48
|
+
suggestions = (await fetchLocaleSuggestions(this, language, country)).map(toLocaleAbbr);
|
|
47
49
|
}
|
|
48
50
|
catch (e1) {
|
|
49
51
|
this.log.debug(e1.stack);
|
|
@@ -55,15 +57,15 @@ export async function ensureDeviceLocale(language, country, script) {
|
|
|
55
57
|
}
|
|
56
58
|
}
|
|
57
59
|
// #region Internal helpers
|
|
58
|
-
async function extractStringsFromResources(language, opts = null) {
|
|
59
|
-
const caps = opts ??
|
|
60
|
+
async function extractStringsFromResources(driver, language, opts = null) {
|
|
61
|
+
const caps = opts ?? driver.opts;
|
|
60
62
|
let app = caps.app;
|
|
61
63
|
let tmpRoot;
|
|
62
64
|
try {
|
|
63
65
|
if (!app && caps.appPackage) {
|
|
64
66
|
tmpRoot = await tempDir.openDir();
|
|
65
67
|
try {
|
|
66
|
-
app = await
|
|
68
|
+
app = await driver.adb.pullApk(caps.appPackage, tmpRoot);
|
|
67
69
|
}
|
|
68
70
|
catch (e) {
|
|
69
71
|
throw new Error(`Could not extract app strings, failed to pull an apk from '${caps.appPackage}'. Original error: ${e.message}`, { cause: e });
|
|
@@ -72,7 +74,7 @@ async function extractStringsFromResources(language, opts = null) {
|
|
|
72
74
|
if (!app || !(await fs.exists(app))) {
|
|
73
75
|
throw new Error(`Could not extract app strings, no app or package specified`);
|
|
74
76
|
}
|
|
75
|
-
return (await
|
|
77
|
+
return (await driver.adb.extractStringsFromApk(app, language ?? null)).apkStrings;
|
|
76
78
|
}
|
|
77
79
|
finally {
|
|
78
80
|
if (tmpRoot) {
|
|
@@ -80,8 +82,8 @@ async function extractStringsFromResources(language, opts = null) {
|
|
|
80
82
|
}
|
|
81
83
|
}
|
|
82
84
|
}
|
|
83
|
-
async function fetchLocaleSuggestions(language, country) {
|
|
84
|
-
const supportedLocales = await
|
|
85
|
+
async function fetchLocaleSuggestions(driver, language, country) {
|
|
86
|
+
const supportedLocales = await driver.settingsApp.listSupportedLocales();
|
|
85
87
|
const suggestedLocales = supportedLocales.filter((locale) => language?.toLowerCase() === locale.language?.toLowerCase() ||
|
|
86
88
|
country?.toLowerCase() === locale.country?.toLowerCase());
|
|
87
89
|
return util.isEmpty(suggestedLocales) ? supportedLocales : suggestedLocales;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resources.js","sourceRoot":"","sources":["../../../lib/commands/resources.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAC,MAAM,iBAAiB,CAAC;AAMlD
|
|
1
|
+
{"version":3,"file":"resources.js","sourceRoot":"","sources":["../../../lib/commands/resources.ts"],"names":[],"mappings":"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"}
|
package/build/lib/driver.d.ts
CHANGED
|
@@ -791,7 +791,7 @@ declare class AndroidDriver extends BaseDriver<AndroidDriverConstraints, StringR
|
|
|
791
791
|
readonly 'mobile: getAppStrings': {
|
|
792
792
|
readonly command: "getStrings";
|
|
793
793
|
readonly params: {
|
|
794
|
-
readonly optional: readonly ["language"];
|
|
794
|
+
readonly optional: readonly ["language", "stringFile"];
|
|
795
795
|
};
|
|
796
796
|
};
|
|
797
797
|
};
|
|
@@ -381,7 +381,7 @@ export declare const executeMethodMap: {
|
|
|
381
381
|
readonly 'mobile: getAppStrings': {
|
|
382
382
|
readonly command: "getStrings";
|
|
383
383
|
readonly params: {
|
|
384
|
-
readonly optional: readonly ["language"];
|
|
384
|
+
readonly optional: readonly ["language", "stringFile"];
|
|
385
385
|
};
|
|
386
386
|
};
|
|
387
387
|
};
|
|
@@ -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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"}
|
|
@@ -9,9 +9,14 @@ import type {Locale} from './types.js';
|
|
|
9
9
|
*
|
|
10
10
|
* @param language The language code to retrieve strings for. If not provided,
|
|
11
11
|
* the device's current language will be used.
|
|
12
|
+
* @param stringFile path to APK to extract string resources from
|
|
12
13
|
* @returns Promise that resolves to a mapping of string keys to their localized values.
|
|
13
14
|
*/
|
|
14
|
-
export async function getStrings(
|
|
15
|
+
export async function getStrings(
|
|
16
|
+
this: AndroidDriver,
|
|
17
|
+
language: string | null = null,
|
|
18
|
+
stringFile: string | null = null,
|
|
19
|
+
): Promise<StringRecord> {
|
|
15
20
|
if (!language) {
|
|
16
21
|
language = await this.adb.getDeviceLanguage();
|
|
17
22
|
this.log.info(`No language specified, returning strings for: ${language}`);
|
|
@@ -27,7 +32,9 @@ export async function getStrings(this: AndroidDriver, language: string | null =
|
|
|
27
32
|
return result;
|
|
28
33
|
};
|
|
29
34
|
|
|
30
|
-
|
|
35
|
+
const options: AndroidDriverOpts = stringFile ? {...this.opts, app: stringFile} : this.opts;
|
|
36
|
+
|
|
37
|
+
return preprocessStringsMap(await extractStringsFromResources(this, language, options));
|
|
31
38
|
}
|
|
32
39
|
|
|
33
40
|
/**
|
|
@@ -56,7 +63,7 @@ export async function ensureDeviceLocale(
|
|
|
56
63
|
let errMsg = `Cannot set the device locale to '${toLocaleAbbr({language, country, script})}'.`;
|
|
57
64
|
let suggestions: string[] = [];
|
|
58
65
|
try {
|
|
59
|
-
suggestions = (await fetchLocaleSuggestions
|
|
66
|
+
suggestions = (await fetchLocaleSuggestions(this, language, country)).map(toLocaleAbbr);
|
|
60
67
|
} catch (e1) {
|
|
61
68
|
this.log.debug((e1 as Error).stack);
|
|
62
69
|
}
|
|
@@ -70,11 +77,11 @@ export async function ensureDeviceLocale(
|
|
|
70
77
|
// #region Internal helpers
|
|
71
78
|
|
|
72
79
|
async function extractStringsFromResources(
|
|
73
|
-
|
|
80
|
+
driver: AndroidDriver,
|
|
74
81
|
language: string | null,
|
|
75
82
|
opts: AndroidDriverOpts | null = null,
|
|
76
83
|
): Promise<StringRecord> {
|
|
77
|
-
const caps = opts ??
|
|
84
|
+
const caps = opts ?? driver.opts;
|
|
78
85
|
|
|
79
86
|
let app: string | undefined = caps.app;
|
|
80
87
|
let tmpRoot: string | undefined;
|
|
@@ -82,7 +89,7 @@ async function extractStringsFromResources(
|
|
|
82
89
|
if (!app && caps.appPackage) {
|
|
83
90
|
tmpRoot = await tempDir.openDir();
|
|
84
91
|
try {
|
|
85
|
-
app = await
|
|
92
|
+
app = await driver.adb.pullApk(caps.appPackage, tmpRoot);
|
|
86
93
|
} catch (e) {
|
|
87
94
|
throw new Error(
|
|
88
95
|
`Could not extract app strings, failed to pull an apk from '${caps.appPackage}'. Original error: ${(e as Error).message}`,
|
|
@@ -95,7 +102,7 @@ async function extractStringsFromResources(
|
|
|
95
102
|
throw new Error(`Could not extract app strings, no app or package specified`);
|
|
96
103
|
}
|
|
97
104
|
|
|
98
|
-
return (await
|
|
105
|
+
return (await driver.adb.extractStringsFromApk(app, language ?? null)).apkStrings;
|
|
99
106
|
} finally {
|
|
100
107
|
if (tmpRoot) {
|
|
101
108
|
await fs.rimraf(tmpRoot);
|
|
@@ -103,8 +110,8 @@ async function extractStringsFromResources(
|
|
|
103
110
|
}
|
|
104
111
|
}
|
|
105
112
|
|
|
106
|
-
async function fetchLocaleSuggestions(
|
|
107
|
-
const supportedLocales = await
|
|
113
|
+
async function fetchLocaleSuggestions(driver: AndroidDriver, language?: string, country?: string): Promise<Locale[]> {
|
|
114
|
+
const supportedLocales = await driver.settingsApp.listSupportedLocales();
|
|
108
115
|
const suggestedLocales = supportedLocales.filter(
|
|
109
116
|
(locale) =>
|
|
110
117
|
language?.toLowerCase() === locale.language?.toLowerCase() ||
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "appium-android-driver",
|
|
3
|
-
"version": "14.0.
|
|
3
|
+
"version": "14.0.6",
|
|
4
4
|
"description": "Android UiAutomator and Chrome support for Appium",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"android",
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
"rebuild": "npm run clean; npm run build",
|
|
49
49
|
"format": "oxfmt -c oxfmt.config.mjs .",
|
|
50
50
|
"format:check": "oxfmt -c oxfmt.config.mjs --check .",
|
|
51
|
-
"test": "node --enable-source-maps --test --test-force-exit --test-timeout=60000 \"./build/test/unit/**/*.spec.js\""
|
|
51
|
+
"test": "node --enable-source-maps --experimental-test-module-mocks --test --test-force-exit --test-timeout=60000 \"./build/test/unit/**/*.spec.js\""
|
|
52
52
|
},
|
|
53
53
|
"dependencies": {
|
|
54
54
|
"@appium/support": "^7.2.5",
|
|
@@ -74,7 +74,6 @@
|
|
|
74
74
|
"@types/semver": "^7.5.0",
|
|
75
75
|
"@types/sinon": "^22.0.0",
|
|
76
76
|
"@types/ws": "^8.5.4",
|
|
77
|
-
"esmock": "^2.7.6",
|
|
78
77
|
"sinon": "^22.0.0"
|
|
79
78
|
},
|
|
80
79
|
"peerDependencies": {
|