appium-android-driver 8.1.4 → 8.1.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 +14 -0
- package/build/lib/commands/device/common.d.ts +1 -2
- package/build/lib/commands/device/common.d.ts.map +1 -1
- package/build/lib/commands/device/common.js +3 -4
- package/build/lib/commands/device/common.js.map +1 -1
- package/build/lib/commands/resources.d.ts.map +1 -1
- package/build/lib/commands/resources.js +21 -25
- package/build/lib/commands/resources.js.map +1 -1
- package/build/lib/driver.d.ts +0 -1
- package/build/lib/driver.d.ts.map +1 -1
- package/build/lib/driver.js +0 -1
- package/build/lib/driver.js.map +1 -1
- package/lib/commands/device/common.js +3 -4
- package/lib/commands/resources.js +23 -29
- package/lib/driver.ts +0 -3
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,17 @@
|
|
|
1
|
+
## [8.1.6](https://github.com/appium/appium-android-driver/compare/v8.1.5...v8.1.6) (2024-01-26)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* calls this.opts for createBaseADB ([#908](https://github.com/appium/appium-android-driver/issues/908)) ([8ed666a](https://github.com/appium/appium-android-driver/commit/8ed666a4407a063dc5e9fda66d633d7680202e97))
|
|
7
|
+
|
|
8
|
+
## [8.1.5](https://github.com/appium/appium-android-driver/compare/v8.1.4...v8.1.5) (2024-01-25)
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Miscellaneous Chores
|
|
12
|
+
|
|
13
|
+
* Update getStrings implementation to avoid FS usage ([#907](https://github.com/appium/appium-android-driver/issues/907)) ([f6b6188](https://github.com/appium/appium-android-driver/commit/f6b6188eafc30e5b23129577eee686c7d948a207))
|
|
14
|
+
|
|
1
15
|
## [8.1.4](https://github.com/appium/appium-android-driver/compare/v8.1.3...v8.1.4) (2024-01-25)
|
|
2
16
|
|
|
3
17
|
|
|
@@ -5,10 +5,9 @@
|
|
|
5
5
|
export function getDeviceInfoFromCaps(this: import("../../driver").AndroidDriver): Promise<import('../types').ADBDeviceInfo>;
|
|
6
6
|
/**
|
|
7
7
|
* @this {AndroidDriver}
|
|
8
|
-
* @property {(AndroidDriverOpts & {emPort?: number})?} [opts=null]
|
|
9
8
|
* @returns {Promise<import('appium-adb').ADB>}
|
|
10
9
|
*/
|
|
11
|
-
export function createADB(this: import("../../driver").AndroidDriver
|
|
10
|
+
export function createADB(this: import("../../driver").AndroidDriver): Promise<import('appium-adb').ADB>;
|
|
12
11
|
/**
|
|
13
12
|
* @this {AndroidDriver}
|
|
14
13
|
* @returns {Promise<import('../types').ADBLaunchInfo | undefined>}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../lib/commands/device/common.js"],"names":[],"mappings":"AAYA;;;GAGG;AACH,mFAFa,QAAQ,OAAO,UAAU,EAAE,aAAa,CAAC,CA+GrD;AAED
|
|
1
|
+
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../lib/commands/device/common.js"],"names":[],"mappings":"AAYA;;;GAGG;AACH,mFAFa,QAAQ,OAAO,UAAU,EAAE,aAAa,CAAC,CA+GrD;AAED;;;GAGG;AACH,uEAFa,QAAQ,OAAO,YAAY,EAAE,GAAG,CAAC,CAW7C;AAED;;;GAGG;AACH,2EAFa,QAAQ,OAAO,UAAU,EAAE,aAAa,GAAG,SAAS,CAAC,CAgCjE;AAED;;;GAGG;AACH,qFA2EC;4BAGY,OAAO,cAAc,EAAE,aAAa"}
|
|
@@ -115,13 +115,12 @@ async function getDeviceInfoFromCaps() {
|
|
|
115
115
|
exports.getDeviceInfoFromCaps = getDeviceInfoFromCaps;
|
|
116
116
|
/**
|
|
117
117
|
* @this {AndroidDriver}
|
|
118
|
-
* @property {(AndroidDriverOpts & {emPort?: number})?} [opts=null]
|
|
119
118
|
* @returns {Promise<import('appium-adb').ADB>}
|
|
120
119
|
*/
|
|
121
|
-
async function createADB(
|
|
120
|
+
async function createADB() {
|
|
122
121
|
// @ts-expect-error do not put arbitrary properties on opts
|
|
123
|
-
const { udid, emPort } = opts
|
|
124
|
-
const adb = await (0, utils_1.createBaseADB)(opts);
|
|
122
|
+
const { udid, emPort } = this.opts;
|
|
123
|
+
const adb = await (0, utils_1.createBaseADB)(this.opts);
|
|
125
124
|
adb.setDeviceId(udid ?? '');
|
|
126
125
|
if (emPort) {
|
|
127
126
|
adb.setEmulatorPort(emPort);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../lib/commands/device/common.js"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../lib/commands/device/common.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resources.d.ts","sourceRoot":"","sources":["../../../lib/commands/resources.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"resources.d.ts","sourceRoot":"","sources":["../../../lib/commands/resources.js"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,2GAFa,QAAQ,OAAO,eAAe,EAAE,YAAY,CAAC,CAqBzD;AAED;;;;;;GAMG;AACH,sFALW,MAAM,WACN,MAAM,gCAEJ,QAAQ,IAAI,CAAC,CAWzB;kBA2CY,OAAO,YAAY,EAAE,GAAG"}
|
|
@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.ensureDeviceLocale = exports.getStrings = void 0;
|
|
7
|
-
const node_path_1 = __importDefault(require("node:path"));
|
|
8
7
|
const lodash_1 = __importDefault(require("lodash"));
|
|
9
8
|
const support_1 = require("@appium/support");
|
|
10
9
|
/**
|
|
@@ -28,11 +27,7 @@ async function getStrings(language = null) {
|
|
|
28
27
|
}
|
|
29
28
|
return result;
|
|
30
29
|
};
|
|
31
|
-
|
|
32
|
-
this.apkStrings[language] = await extractStringsFromResources.bind(this)(language);
|
|
33
|
-
}
|
|
34
|
-
const mapping = JSON.parse(await support_1.fs.readFile(this.apkStrings[language], 'utf-8'));
|
|
35
|
-
return preprocessStringsMap(mapping);
|
|
30
|
+
return preprocessStringsMap(await extractStringsFromResources.bind(this)(language));
|
|
36
31
|
}
|
|
37
32
|
exports.getStrings = getStrings;
|
|
38
33
|
/**
|
|
@@ -57,31 +52,32 @@ exports.ensureDeviceLocale = ensureDeviceLocale;
|
|
|
57
52
|
* @this {import('../driver').AndroidDriver}
|
|
58
53
|
* @param {string?} [language]
|
|
59
54
|
* @param {import('../driver').AndroidDriverOpts?} [opts=null]
|
|
60
|
-
* @returns {Promise<
|
|
55
|
+
* @returns {Promise<import('@appium/types').StringRecord>};
|
|
61
56
|
*/
|
|
62
57
|
async function extractStringsFromResources(language, opts = null) {
|
|
63
58
|
const caps = opts ?? this.opts;
|
|
64
59
|
/** @type {string|undefined} */
|
|
65
|
-
let app;
|
|
66
|
-
|
|
67
|
-
app =
|
|
68
|
-
caps.app ||
|
|
69
|
-
(caps.appPackage && caps.tmpDir && (await this.adb.pullApk(caps.appPackage, caps.tmpDir)));
|
|
70
|
-
}
|
|
71
|
-
catch (err) {
|
|
72
|
-
throw new Error(`Failed to pull an apk from '${caps.appPackage}' to '${caps.tmpDir}'. Original error: ${err.message}`);
|
|
73
|
-
}
|
|
74
|
-
if (!app || !(await support_1.fs.exists(app))) {
|
|
75
|
-
throw new Error(`Could not extract app strings, no app or package specified`);
|
|
76
|
-
}
|
|
77
|
-
const stringsTmpDir = node_path_1.default.resolve(String(caps.tmpDir), support_1.util.uuidV4());
|
|
60
|
+
let app = caps.app;
|
|
61
|
+
let tmpRoot;
|
|
78
62
|
try {
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
63
|
+
if (!app && caps.appPackage) {
|
|
64
|
+
tmpRoot = await support_1.tempDir.openDir();
|
|
65
|
+
try {
|
|
66
|
+
app = await this.adb.pullApk(caps.appPackage, tmpRoot);
|
|
67
|
+
}
|
|
68
|
+
catch (e) {
|
|
69
|
+
throw new Error(`Could not extract app strings, failed to pull an apk from '${caps.appPackage}'. Original error: ${e.message}`);
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
if (!app || !(await support_1.fs.exists(app))) {
|
|
73
|
+
throw new Error(`Could not extract app strings, no app or package specified`);
|
|
74
|
+
}
|
|
75
|
+
return (await this.adb.extractStringsFromApk(app, language ?? null)).apkStrings;
|
|
82
76
|
}
|
|
83
|
-
|
|
84
|
-
|
|
77
|
+
finally {
|
|
78
|
+
if (tmpRoot) {
|
|
79
|
+
await support_1.fs.rimraf(tmpRoot);
|
|
80
|
+
}
|
|
85
81
|
}
|
|
86
82
|
}
|
|
87
83
|
// #endregion
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resources.js","sourceRoot":"","sources":["../../../lib/commands/resources.js"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"resources.js","sourceRoot":"","sources":["../../../lib/commands/resources.js"],"names":[],"mappings":"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"}
|
package/build/lib/driver.d.ts
CHANGED
|
@@ -400,7 +400,6 @@ declare class AndroidDriver extends BaseDriver<AndroidDriverConstraints, StringR
|
|
|
400
400
|
jwpProxyAvoid: RouteMatcher[];
|
|
401
401
|
adb: ADB;
|
|
402
402
|
_settingsApp: SettingsApp;
|
|
403
|
-
apkStrings: StringRecord;
|
|
404
403
|
proxyReqRes?: (...args: any) => any;
|
|
405
404
|
contexts?: string[];
|
|
406
405
|
sessionChromedrivers: StringRecord<AppiumChromedriver>;
|
|
@@ -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
|
@@ -222,7 +222,6 @@ class AndroidDriver extends driver_1.BaseDriver {
|
|
|
222
222
|
this.desiredCapConstraints = lodash_1.default.cloneDeep(constraints_1.default);
|
|
223
223
|
this.sessionChromedrivers = {};
|
|
224
224
|
this.jwpProxyActive = false;
|
|
225
|
-
this.apkStrings = {};
|
|
226
225
|
this.curContext = this.defaultContextName();
|
|
227
226
|
this.opts = opts;
|
|
228
227
|
this._cachedActivityArgs = {};
|
package/build/lib/driver.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":";AAAA,6DAA6D;;;;;;AAW7D,oDAAuB;AAIvB,0CAAyC;AACzC,gEAAmF;AACnF,6CAA0C;AAC1C,2DAA+C;AAC/C,mCAAsE;AACtE,wDAA2E;AAC3E,wDAgBoC;AACpC,qDAKkC;AAClC,yEAkB4C;AAC5C,yEAA+E;AAC/E,8DAsBmC;AACnC,sDAAuE;AACvE,sDAAuD;AACvD,gDAgB4B;AAC5B,gDAA0D;AAC1D,0DAQiC;AACjC,0CAAgE;AAChE,wDAMgC;AAChC,wCAMwB;AACxB,8CAK2B;AAC3B,kDAQ6B;AAC7B,qDAAyF;AACzF,wCAMwB;AACxB,kEAIqC;AACrC,8CAAuD;AACvD,0CAQyB;AACzB,gDAW4B;AAC5B,wDAIgC;AAChC,wDAAqF;AACrF,0DAAkF;AAClF,oDAAoE;AACpE,4CAA6C;AAC7C,0DAA8F;AAC9F,wDAAoF;AACpF,0CAAmE;AACnE,4CAY0B;AAM1B,MAAM,gBAAgB,GAAG,eAAe,CAAC;AAGzC,MAAM,aACJ,SAAQ,mBAAkD;
|
|
1
|
+
{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
|
|
@@ -127,13 +127,12 @@ export async function getDeviceInfoFromCaps() {
|
|
|
127
127
|
|
|
128
128
|
/**
|
|
129
129
|
* @this {AndroidDriver}
|
|
130
|
-
* @property {(AndroidDriverOpts & {emPort?: number})?} [opts=null]
|
|
131
130
|
* @returns {Promise<import('appium-adb').ADB>}
|
|
132
131
|
*/
|
|
133
|
-
export async function createADB(
|
|
132
|
+
export async function createADB() {
|
|
134
133
|
// @ts-expect-error do not put arbitrary properties on opts
|
|
135
|
-
const {udid, emPort} = opts
|
|
136
|
-
const adb = await createBaseADB(opts);
|
|
134
|
+
const {udid, emPort} = this.opts;
|
|
135
|
+
const adb = await createBaseADB(this.opts);
|
|
137
136
|
adb.setDeviceId(udid ?? '');
|
|
138
137
|
if (emPort) {
|
|
139
138
|
adb.setEmulatorPort(emPort);
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import path from 'node:path';
|
|
2
1
|
import _ from 'lodash';
|
|
3
|
-
import {fs,
|
|
2
|
+
import {fs, tempDir} from '@appium/support';
|
|
4
3
|
|
|
5
4
|
/**
|
|
6
5
|
* @this {import('../driver').AndroidDriver}
|
|
@@ -25,11 +24,7 @@ export async function getStrings(language = null) {
|
|
|
25
24
|
return result;
|
|
26
25
|
};
|
|
27
26
|
|
|
28
|
-
|
|
29
|
-
this.apkStrings[language] = await extractStringsFromResources.bind(this)(language);
|
|
30
|
-
}
|
|
31
|
-
const mapping = JSON.parse(await fs.readFile(this.apkStrings[language], 'utf-8'));
|
|
32
|
-
return preprocessStringsMap(mapping);
|
|
27
|
+
return preprocessStringsMap(await extractStringsFromResources.bind(this)(language));
|
|
33
28
|
}
|
|
34
29
|
|
|
35
30
|
/**
|
|
@@ -56,36 +51,35 @@ export async function ensureDeviceLocale(language, country, script) {
|
|
|
56
51
|
* @this {import('../driver').AndroidDriver}
|
|
57
52
|
* @param {string?} [language]
|
|
58
53
|
* @param {import('../driver').AndroidDriverOpts?} [opts=null]
|
|
59
|
-
* @returns {Promise<
|
|
54
|
+
* @returns {Promise<import('@appium/types').StringRecord>};
|
|
60
55
|
*/
|
|
61
56
|
async function extractStringsFromResources(language, opts = null) {
|
|
62
57
|
const caps = opts ?? this.opts;
|
|
63
58
|
|
|
64
59
|
/** @type {string|undefined} */
|
|
65
|
-
let app;
|
|
60
|
+
let app = caps.app;
|
|
61
|
+
let tmpRoot;
|
|
66
62
|
try {
|
|
67
|
-
app
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
63
|
+
if (!app && caps.appPackage) {
|
|
64
|
+
tmpRoot = await tempDir.openDir();
|
|
65
|
+
try {
|
|
66
|
+
app = await this.adb.pullApk(caps.appPackage, tmpRoot);
|
|
67
|
+
} catch (e) {
|
|
68
|
+
throw new Error(
|
|
69
|
+
`Could not extract app strings, failed to pull an apk from '${caps.appPackage}'. Original error: ${e.message}`
|
|
70
|
+
);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
75
73
|
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
74
|
+
if (!app || !(await fs.exists(app))) {
|
|
75
|
+
throw new Error(`Could not extract app strings, no app or package specified`);
|
|
76
|
+
}
|
|
79
77
|
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
const {localPath} = await this.adb.extractStringsFromApk(app, language ?? null, stringsTmpDir);
|
|
86
|
-
return localPath;
|
|
87
|
-
} catch (err) {
|
|
88
|
-
throw new Error(`Could not extract app strings. Original error: ${err.message}`);
|
|
78
|
+
return (await this.adb.extractStringsFromApk(app, language ?? null)).apkStrings;
|
|
79
|
+
} finally {
|
|
80
|
+
if (tmpRoot) {
|
|
81
|
+
await fs.rimraf(tmpRoot);
|
|
82
|
+
}
|
|
89
83
|
}
|
|
90
84
|
}
|
|
91
85
|
|
package/lib/driver.ts
CHANGED
|
@@ -223,8 +223,6 @@ class AndroidDriver
|
|
|
223
223
|
|
|
224
224
|
_settingsApp: SettingsApp;
|
|
225
225
|
|
|
226
|
-
apkStrings: StringRecord;
|
|
227
|
-
|
|
228
226
|
proxyReqRes?: (...args: any) => any;
|
|
229
227
|
|
|
230
228
|
contexts?: string[];
|
|
@@ -266,7 +264,6 @@ class AndroidDriver
|
|
|
266
264
|
this.desiredCapConstraints = _.cloneDeep(ANDROID_DRIVER_CONSTRAINTS);
|
|
267
265
|
this.sessionChromedrivers = {};
|
|
268
266
|
this.jwpProxyActive = false;
|
|
269
|
-
this.apkStrings = {};
|
|
270
267
|
|
|
271
268
|
this.curContext = this.defaultContextName();
|
|
272
269
|
this.opts = opts as AndroidDriverOpts;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "appium-android-driver",
|
|
3
|
-
"version": "8.1.
|
|
3
|
+
"version": "8.1.6",
|
|
4
4
|
"description": "Android UiAutomator and Chrome support for Appium",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"appium",
|
|
@@ -57,7 +57,7 @@
|
|
|
57
57
|
"dependencies": {
|
|
58
58
|
"@appium/support": "^4.2.0",
|
|
59
59
|
"@colors/colors": "^1.6.0",
|
|
60
|
-
"appium-adb": "^12.0.
|
|
60
|
+
"appium-adb": "^12.0.2",
|
|
61
61
|
"appium-chromedriver": "^5.5.1",
|
|
62
62
|
"asyncbox": "^3.0.0",
|
|
63
63
|
"axios": "^1.x",
|