appium-android-driver 9.14.7 → 9.14.9
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/bidi/models.d.ts.map +1 -1
- package/build/lib/commands/bidi/models.js +17 -1
- package/build/lib/commands/bidi/models.js.map +1 -1
- package/build/lib/commands/bidi/types.d.ts +2 -1
- package/build/lib/commands/bidi/types.d.ts.map +1 -1
- package/build/lib/commands/device/common.js +14 -10
- package/build/lib/commands/device/common.js.map +1 -1
- package/build/lib/commands/device/utils.d.ts +0 -5
- package/build/lib/commands/device/utils.d.ts.map +1 -1
- package/build/lib/commands/device/utils.js +0 -19
- package/build/lib/commands/device/utils.js.map +1 -1
- package/lib/commands/bidi/models.ts +16 -2
- package/lib/commands/bidi/types.ts +3 -1
- package/lib/commands/device/common.js +13 -13
- package/lib/commands/device/utils.js +0 -27
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,15 @@
|
|
|
1
|
+
## [9.14.9](https://github.com/appium/appium-android-driver/compare/v9.14.8...v9.14.9) (2024-12-27)
|
|
2
|
+
|
|
3
|
+
### Bug Fixes
|
|
4
|
+
|
|
5
|
+
* Tune retrieval of package launch info ([#975](https://github.com/appium/appium-android-driver/issues/975)) ([bbdcc18](https://github.com/appium/appium-android-driver/commit/bbdcc1806948c63fdb455fdf489c7e6a1d1b5a97))
|
|
6
|
+
|
|
7
|
+
## [9.14.8](https://github.com/appium/appium-android-driver/compare/v9.14.7...v9.14.8) (2024-12-19)
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* Adjust log level for BiDi events ([#974](https://github.com/appium/appium-android-driver/issues/974)) ([3a4e264](https://github.com/appium/appium-android-driver/commit/3a4e264f9337f66fe3a1945755d2bf25b891d99f))
|
|
12
|
+
|
|
1
13
|
## [9.14.7](https://github.com/appium/appium-android-driver/compare/v9.14.6...v9.14.7) (2024-12-14)
|
|
2
14
|
|
|
3
15
|
### Miscellaneous Chores
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../../lib/commands/bidi/models.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../../lib/commands/bidi/models.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAgB,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAOrF,OAAO,KAAK,EAAE,YAAY,IAAI,QAAQ,EAAE,MAAM,YAAY,CAAC;AAa3D,eAAO,MAAM,uBAAuB,gBAAiB,MAAM,UAAU,MAAM,wBAE1E,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,+BAA+B,gBAAiB,MAAM,wBAElE,CAAC;AAEF,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,kBAAkB,CAczG"}
|
|
@@ -1,9 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.makeObsoleteContextUpdatedEvent = exports.makeContextUpdatedEvent = void 0;
|
|
4
7
|
exports.makeLogEntryAddedEvent = makeLogEntryAddedEvent;
|
|
5
8
|
const helpers_1 = require("../context/helpers");
|
|
6
9
|
const constants_1 = require("./constants");
|
|
10
|
+
const lodash_1 = __importDefault(require("lodash"));
|
|
7
11
|
function toContextUpdatedEvent(method, contextName) {
|
|
8
12
|
return {
|
|
9
13
|
method,
|
|
@@ -26,7 +30,7 @@ function makeLogEntryAddedEvent(entry, context, type) {
|
|
|
26
30
|
method: constants_1.LOG_ENTRY_ADDED_EVENT,
|
|
27
31
|
params: {
|
|
28
32
|
type,
|
|
29
|
-
level: entry.level,
|
|
33
|
+
level: adjustLogLevel(entry.level),
|
|
30
34
|
source: {
|
|
31
35
|
realm: '',
|
|
32
36
|
},
|
|
@@ -35,4 +39,16 @@ function makeLogEntryAddedEvent(entry, context, type) {
|
|
|
35
39
|
},
|
|
36
40
|
};
|
|
37
41
|
}
|
|
42
|
+
function adjustLogLevel(originalLevel) {
|
|
43
|
+
const originalLevelLc = lodash_1.default.toLower(originalLevel);
|
|
44
|
+
switch (originalLevelLc) {
|
|
45
|
+
case 'debug':
|
|
46
|
+
case 'info':
|
|
47
|
+
case 'warn':
|
|
48
|
+
case 'error':
|
|
49
|
+
return originalLevelLc;
|
|
50
|
+
default:
|
|
51
|
+
return 'info';
|
|
52
|
+
}
|
|
53
|
+
}
|
|
38
54
|
//# sourceMappingURL=models.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../../lib/commands/bidi/models.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../../lib/commands/bidi/models.ts"],"names":[],"mappings":";;;;;;AA+BA,wDAcC;AA5CD,gDAAgD;AAChD,2CAIqB;AAErB,oDAAuB;AAEvB,SAAS,qBAAqB,CAAC,MAAc,EAAE,WAAmB;IAChE,OAAO;QACL,MAAM;QACN,MAAM,EAAE;YACN,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,WAAW,KAAK,oBAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK;SACpD;KACF,CAAC;AACJ,CAAC;AAEM,MAAM,uBAAuB,GAAG,CAAC,WAAmB,EAAE,MAAc,EAAE,EAAE,CAAC,qBAAqB,CACnG,IAAA,iCAAqB,EAAC,MAAM,CAAC,EAAE,WAAW,CAC3C,CAAC;AAFW,QAAA,uBAAuB,2BAElC;AAEF;;GAEG;AACI,MAAM,+BAA+B,GAAG,CAAC,WAAmB,EAAE,EAAE,CAAC,qBAAqB,CAC3F,0CAA8B,EAAE,WAAW,CAC5C,CAAC;AAFW,QAAA,+BAA+B,mCAE1C;AAEF,SAAgB,sBAAsB,CAAC,KAAe,EAAE,OAAe,EAAE,IAAY;IACnF,OAAO;QACL,OAAO;QACP,MAAM,EAAE,iCAAqB;QAC7B,MAAM,EAAE;YACN,IAAI;YACJ,KAAK,EAAE,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC;YAClC,MAAM,EAAE;gBACN,KAAK,EAAE,EAAE;aACV;YACD,IAAI,EAAE,KAAK,CAAC,OAAO;YACnB,SAAS,EAAE,KAAK,CAAC,SAAS;SAC3B;KACF,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,aAAqB;IAC3C,MAAM,eAAe,GAAG,gBAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACjD,QAAQ,eAAe,EAAE,CAAC;QACxB,KAAK,OAAO,CAAC;QACb,KAAK,MAAM,CAAC;QACZ,KAAK,MAAM,CAAC;QACZ,KAAK,OAAO;YACV,OAAO,eAA+B,CAAC;QACzC;YACE,OAAO,MAAM,CAAC;IAClB,CAAC;AACH,CAAC"}
|
|
@@ -5,9 +5,10 @@ interface BiDiEvent<TParams> {
|
|
|
5
5
|
interface LogEntrySource {
|
|
6
6
|
realm: string;
|
|
7
7
|
}
|
|
8
|
+
export type BiDiLogLevel = 'debug' | 'info' | 'warn' | 'error';
|
|
8
9
|
interface LogEntryAddedEventParams {
|
|
9
10
|
type: string;
|
|
10
|
-
level:
|
|
11
|
+
level: BiDiLogLevel;
|
|
11
12
|
source: LogEntrySource;
|
|
12
13
|
text: string;
|
|
13
14
|
timestamp: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../lib/commands/bidi/types.ts"],"names":[],"mappings":"AAAA,UAAU,SAAS,CAAC,OAAO;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,UAAU,cAAc;IACtB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,UAAU,wBAAwB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../lib/commands/bidi/types.ts"],"names":[],"mappings":"AAAA,UAAU,SAAS,CAAC,OAAO;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,UAAU,cAAc;IACtB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AAE/D,UAAU,wBAAwB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,YAAY,CAAC;IACpB,MAAM,EAAE,cAAc,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB;AAGD,MAAM,WAAW,kBAAmB,SAAQ,SAAS,CAAC,wBAAwB,CAAC;IAC7E,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,oBAAoB;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,QAAQ,GAAG,KAAK,CAAC;CACxB;AAGD,MAAM,WAAW,mBAAoB,SAAQ,SAAS,CAAC,oBAAoB,CAAC;CAAG"}
|
|
@@ -10,6 +10,7 @@ exports.initDevice = initDevice;
|
|
|
10
10
|
const semver_1 = __importDefault(require("semver"));
|
|
11
11
|
const lodash_1 = __importDefault(require("lodash"));
|
|
12
12
|
const bluebird_1 = __importDefault(require("bluebird"));
|
|
13
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
13
14
|
const geolocation_1 = require("../geolocation");
|
|
14
15
|
const io_appium_settings_1 = require("io.appium.settings");
|
|
15
16
|
const keyboard_1 = require("../keyboard");
|
|
@@ -137,31 +138,34 @@ async function createADB() {
|
|
|
137
138
|
* @returns {Promise<import('../types').ADBLaunchInfo | undefined>}
|
|
138
139
|
*/
|
|
139
140
|
async function getLaunchInfo() {
|
|
140
|
-
|
|
141
|
-
|
|
141
|
+
let { appPackage, appActivity, appWaitPackage, appWaitActivity, app } = this.opts;
|
|
142
|
+
if (appPackage && appActivity || (!app && !appPackage)) {
|
|
142
143
|
return;
|
|
143
144
|
}
|
|
144
|
-
let
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
145
|
+
let apkPackage;
|
|
146
|
+
let apkActivity;
|
|
147
|
+
if (app) {
|
|
148
|
+
this.log.debug(`Parsing package and activity from the '${node_path_1.default.basename(app)}' file manifest`);
|
|
149
|
+
({ apkPackage, apkActivity } = await this.adb.packageAndLaunchActivityFromManifest(app));
|
|
150
|
+
}
|
|
151
|
+
else if (appPackage) {
|
|
152
|
+
this.log.debug(`Parsing activity from the installed '${appPackage}' package manifest`);
|
|
153
|
+
apkActivity = await this.adb.resolveLaunchableActivity(appPackage);
|
|
149
154
|
}
|
|
150
|
-
this.log.debug('Parsing package and activity from app manifest');
|
|
151
|
-
const { apkPackage, apkActivity } = await this.adb.packageAndLaunchActivityFromManifest(app);
|
|
152
155
|
if (apkPackage && !appPackage) {
|
|
153
156
|
appPackage = apkPackage;
|
|
154
157
|
}
|
|
155
158
|
if (!appWaitPackage) {
|
|
156
159
|
appWaitPackage = appPackage;
|
|
157
160
|
}
|
|
161
|
+
this.log.debug(`Resolved launch package/activity: ${apkPackage}/${apkActivity}`);
|
|
158
162
|
if (apkActivity && !appActivity) {
|
|
159
163
|
appActivity = apkActivity;
|
|
160
164
|
}
|
|
161
165
|
if (!appWaitActivity) {
|
|
162
166
|
appWaitActivity = appActivity;
|
|
163
167
|
}
|
|
164
|
-
this.log.debug(`
|
|
168
|
+
this.log.debug(`Resolved wait package/activity: ${appWaitPackage}/${appWaitActivity}`);
|
|
165
169
|
return { appPackage, appWaitPackage, appActivity, appWaitActivity };
|
|
166
170
|
}
|
|
167
171
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../lib/commands/device/common.js"],"names":[],"mappings":";;;;;AAuBA,sDA4GC;AAMD,8BASC;AAMD,sCA8BC;AAMD,gCA0GC;AAtSD,oDAA4B;AAC5B,oDAAuB;AACvB,wDAAyB;AACzB,gDAAkD;AAClD,2DAAsD;AACtD,0CAAwE;AACxE,
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../lib/commands/device/common.js"],"names":[],"mappings":";;;;;AAuBA,sDA4GC;AAMD,8BASC;AAMD,sCA8BC;AAMD,gCA0GC;AAtSD,oDAA4B;AAC5B,oDAAuB;AACvB,wDAAyB;AACzB,0DAA6B;AAC7B,gDAAkD;AAClD,2DAAsD;AACtD,0CAAwE;AACxE,mCAIiB;AACjB,kCAAuC;AACvC,uCAAyC;AACzC,uCAGqB;AAErB;;;GAGG;AACI,KAAK,UAAU,qBAAqB;IACzC,yEAAyE;IACzE,+DAA+D;IAC/D,0EAA0E;IAC1E,oCAAoC;IACpC,MAAM,GAAG,GAAG,MAAM,IAAA,qBAAa,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3C,IAAI,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;IAC1B,IAAI,MAAM,CAAC;IAEX,6DAA6D;IAC7D,IAAI,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC;QACnB,MAAM,uBAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;QACtC,IAAI,GAAG,GAAG,CAAC,WAAW,CAAC;QACvB,MAAM,GAAG,GAAG,CAAC,YAAY,CAAC;IAC5B,CAAC;SAAM,CAAC;QACN,iEAAiE;QACjE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QACxC,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,mBAAmB,EAAE,CAAC;QAEhD,oDAAoD;QACpD,IAAI,IAAI,EAAE,CAAC;YACT,IAAI,CAAC,gBAAC,CAAC,QAAQ,CAAC,gBAAC,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;gBAC9C,MAAM,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC,UAAU,IAAI,2CAA2C,CAAC,CAAC;YAC/F,CAAC;YACD,MAAM,GAAG,GAAG,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC;QAC/C,CAAC;aAAM,IAAI,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC;YACrC,IAAI,CAAC,IAAI,CAAC,eAAe,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,IAAI,EAAE,CAAC;YAElE,2EAA2E;YAC3E,MAAM,eAAe,GAAG,gBAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC;YAC9F,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,sCAAsC,eAAe,GAAG,CAAC,CAAC;YAExE,yEAAyE;YACzE,iEAAiE;YACjE,MAAM,YAAY,GAAG,EAAE,CAAC;YACxB,IAAI,qBAAqB,CAAC;YAC1B,sCAAsC;YACtC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC7B,0CAA0C;gBAC1C,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAC7B,qBAAqB;gBACrB,MAAM,WAAW,GAAG,MAAM,GAAG,CAAC,kBAAkB,EAAE,CAAC;gBACnD,qDAAqD;gBACrD,+BAA+B;gBAC/B,YAAY,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,KAAK,WAAW,GAAG,CAAC,CAAC;gBACrD,MAAM,QAAQ,GAAG,gBAAM,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC;gBAC3D,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACd,SAAS;gBACX,CAAC;gBAED,MAAM,QAAQ,GAAG,eAAe,CAAC;gBACjC,MAAM,QAAQ,GAAG,QAAQ,CAAC;gBAE1B,MAAM,wBAAwB,GAAG,gBAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,gBAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;gBACzF,MAAM,sBAAsB,GAAG,gBAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,gBAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;gBACnF,IACE,CAAC,wBAAwB;oBACvB,4BAA4B,CAAC,CAAC,QAAQ,CAAC,CAAC,OAAO;wBAC7C,4BAA4B,CAAC,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC;oBACpD,CAAC,sBAAsB,IAAI,gBAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,gBAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,EAC9E,CAAC;oBACD,2CAA2C;oBAC3C,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;oBACnB,MAAM;gBACR,CAAC;qBAAM,IAAI,CAAC,wBAAwB,EAAE,CAAC;oBACrC,6FAA6F;oBAC7F,SAAS;gBACX,CAAC;gBAED,MAAM,OAAO,GAAG,4BAA4B,CAAC,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC;gBAC9D,MAAM,OAAO,GAAG,4BAA4B,CAAC,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC;gBAC9D,MAAM,OAAO,GAAG,4BAA4B,CAAC,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC;gBAC9D,MAAM,OAAO,GAAG,4BAA4B,CAAC,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC;gBAC9D,IACE,CAAC,CAAC,CAAC,gBAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,GAAG,CAAC,IAAI,OAAO,KAAK,OAAO,CAAC;oBACnE,CAAC,OAAO,KAAK,OAAO,IAAI,OAAO,KAAK,OAAO,CAAC,CAAC;oBAC/C,8DAA8D;oBAC9D,8CAA8C;oBAC9C,CAAC,CAAC,qBAAqB,IAAI,gBAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,gBAAC,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;wBACjF,CAAC,qBAAqB,CAAC,EACzB,CAAC;oBACD,qBAAqB,GAAG,EAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAC,CAAC;gBACpD,CAAC;YACH,CAAC;YACD,IAAI,CAAC,IAAI,IAAI,qBAAqB,EAAE,CAAC;gBACnC,IAAI,GAAG,gBAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC;gBACxC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YACxB,CAAC;YAED,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,kCAAkC;gBAClC,MAAM,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAC/B,8CAA8C;oBAC5C,WAAW,IAAI,CAAC,IAAI,CAAC,eAAe,iCAAiC;oBACrE,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAC1B,CAAC;YACJ,CAAC;YAED,MAAM,GAAG,GAAG,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC;QAC/C,CAAC;aAAM,CAAC;YACN,qDAAqD;YACrD,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YACvB,MAAM,GAAG,GAAG,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;IAED,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC;IACvC,OAAO,EAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,IAAI,KAAK,EAAC,CAAC;AACvD,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,SAAS;IAC7B,2DAA2D;IAC3D,MAAM,EAAC,IAAI,EAAE,MAAM,EAAC,GAAG,IAAI,CAAC,IAAI,CAAC;IACjC,MAAM,GAAG,GAAG,MAAM,IAAA,qBAAa,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3C,GAAG,CAAC,WAAW,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;IAC5B,IAAI,MAAM,EAAE,CAAC;QACX,GAAG,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,aAAa;IACjC,IAAI,EAAC,UAAU,EAAE,WAAW,EAAE,cAAc,EAAE,eAAe,EAAE,GAAG,EAAC,GAAG,IAAI,CAAC,IAAI,CAAC;IAChF,IAAI,UAAU,IAAI,WAAW,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;QACvD,OAAO;IACT,CAAC;IAED,IAAI,UAAU,CAAC;IACf,IAAI,WAAW,CAAC;IAChB,IAAI,GAAG,EAAE,CAAC;QACR,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,0CAA0C,mBAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAC9F,CAAC,EAAC,UAAU,EAAE,WAAW,EAAC,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,oCAAoC,CAAC,GAAG,CAAC,CAAC,CAAC;IACzF,CAAC;SAAM,IAAI,UAAU,EAAE,CAAC;QACtB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,wCAAwC,UAAU,oBAAoB,CAAC,CAAC;QACvF,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,yBAAyB,CAAC,UAAU,CAAC,CAAC;IACrE,CAAC;IACD,IAAI,UAAU,IAAI,CAAC,UAAU,EAAE,CAAC;QAC9B,UAAU,GAAG,UAAU,CAAC;IAC1B,CAAC;IACD,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,cAAc,GAAG,UAAU,CAAC;IAC9B,CAAC;IACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,qCAAqC,UAAU,IAAI,WAAW,EAAE,CAAC,CAAC;IACjF,IAAI,WAAW,IAAI,CAAC,WAAW,EAAE,CAAC;QAChC,WAAW,GAAG,WAAW,CAAC;IAC5B,CAAC;IACD,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,eAAe,GAAG,WAAW,CAAC;IAChC,CAAC;IACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mCAAmC,cAAc,IAAI,eAAe,EAAE,CAAC,CAAC;IACvF,OAAO,EAAC,UAAU,EAAE,cAAc,EAAE,WAAW,EAAE,eAAe,EAAC,CAAC;AACpE,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,UAAU;IAC9B,MAAM,EACJ,wBAAwB,EACxB,MAAM,EACN,QAAQ,EACR,YAAY,EACZ,eAAe,EACf,YAAY,EACZ,sBAAsB,EACtB,UAAU,EACV,eAAe,EACf,iBAAiB,EACjB,YAAY,EACZ,iBAAiB,EACjB,QAAQ,GACT,GAAG,IAAI,CAAC,IAAI,CAAC;IAEd,IAAI,wBAAwB,EAAE,CAAC;QAC7B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,oEAAoE,CAAC,CAAC;IACtF,CAAC;SAAM,CAAC;QACN,IAAI,IAAI,CAAC,UAAU,EAAE,EAAE,CAAC;YACtB,oDAAoD;YACpD,kFAAkF;YAClF,MAAM,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC;QACjC,CAAC;QACD,+EAA+E;QAE/E,sEAAsE;QACtE,0EAA0E;QAC1E,0CAA0C;QAC1C,MAAM,gBAAgB,GAAG,OAAO,CAC9B,QAAQ;YACN,MAAM;YACN,YAAY;YACZ,eAAe;YACf,YAAY;YACZ,sBAAsB;YACtB,CAAC,UAAU,CACd,CAAC;QACF,MAAM,uBAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,gBAAgB,CAAC,CAAC;IACrD,CAAC;IAED,wBAAwB;IACxB,MAAM,aAAa,GAAG,EAAE,CAAC;IACzB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,CAAC;QACvB,aAAa,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,EAAE;YAC7B,IAAI,eAAe,IAAI,gBAAC,CAAC,WAAW,CAAC,eAAe,CAAC,EAAE,CAAC;gBACtD,MAAM,gCAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,eAAe,IAAI,uCAAkB,CAAC,CAAC;YAC7E,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;YACtC,CAAC;QACH,CAAC,CAAC,EAAE,CAAC,CAAC;IACR,CAAC;IACD,IAAI,QAAQ,IAAI,MAAM,EAAE,CAAC;QACvB,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;IAC9E,CAAC;IACD,IAAI,iBAAiB,EAAE,CAAC;QACtB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,+DAA+D,CAAC,CAAC;IACjF,CAAC;SAAM,CAAC;QACN,MAAM,oBAAoB,GAAG,KAAK,IAAI,EAAE;YACtC,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC;gBACzB,MAAM,EAAE,YAAY;gBACpB,WAAW,EAAE,iBAAiB;aAC/B,CAAC,CAAC;YACH,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACzD,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;gBACpB,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE;oBAC1C,IAAI,EAAE,QAAQ;iBACf,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC;QACF,aAAa,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAC;IAC7C,CAAC;IACD,aAAa,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,EAAE;QAC7B,IAAI,YAAY,EAAE,CAAC;YACjB,kDAAkD;YAClD,+CAA+C;YAC/C,kCAAkC;YAClC,MAAM,IAAA,wBAAa,EAAC,CAAC,EAAE,GAAG,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,iCAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACrF,CAAC;aAAM,IAAI,YAAY,KAAK,KAAK,EAAE,CAAC;YAClC,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;QACzC,CAAC;IACH,CAAC,CAAC,EAAE,CAAC,CAAC;IACN,IAAI,eAAe,EAAE,CAAC;QACpB,aAAa,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,EAAE;YAC7B,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,4EAA4E;gBAC1E,gGAAgG,CACnG,CAAC;YACF,MAAM,8BAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACzC,CAAC,CAAC,EAAE,CAAC,CAAC;IACR,CAAC;IACD,IAAI,QAAQ,EAAE,CAAC;QACb,aAAa,CAAC,IAAI,CAAC,qBAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC1D,CAAC;IACD,IAAI,IAAI,CAAC,gBAAgB,CAAC,+BAAuB,CAAC,EAAE,CAAC;QACnD,CAAC,EAAE,IAAI,CAAC,sBAAsB,CAAC,GAAG,IAAI,CAAC,qBAAqB,CAC1D,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE;YACjB,IAAI,EAAE,QAAQ;YACd,YAAY,EAAE,KAAK;YACnB,gBAAgB,EAAE,qCAA6B;SAChD,CACF,CAAC;IACJ,CAAC;IAED,MAAM,kBAAC,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAC7B,CAAC;AAED;;GAEG"}
|
|
@@ -3,11 +3,6 @@
|
|
|
3
3
|
* @param {string} errMsg
|
|
4
4
|
*/
|
|
5
5
|
export function requireEmulator(this: import("../../driver").AndroidDriver, errMsg: string): void;
|
|
6
|
-
/**
|
|
7
|
-
* @this {import('../../driver').AndroidDriver}
|
|
8
|
-
* @returns {void}
|
|
9
|
-
*/
|
|
10
|
-
export function validatePackageActivityNames(this: import("../../driver").AndroidDriver): void;
|
|
11
6
|
/**
|
|
12
7
|
* @this {import('../../driver').AndroidDriver}
|
|
13
8
|
* @param {string} networkSpeed
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../lib/commands/device/utils.js"],"names":[],"mappings":"AAgBA;;;GAGG;AACH,oFAFW,MAAM,QAMhB;AAED
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../lib/commands/device/utils.js"],"names":[],"mappings":"AAgBA;;;GAGG;AACH,oFAFW,MAAM,QAMhB;AAED;;;;GAIG;AACH,6FAHW,MAAM,GACJ,MAAM,CAWlB;AAED;;;GAGG;AACH,4EAFa,MAAM,EAAE,CAmBpB;AAED;;;;GAIG;AACH,iFAHW,GAAG,GACD,OAAO,CAAC,IAAI,CAAC,CA2CzB;AAED;;;GAGG;AACH,qCAHW,OAAO,cAAc,EAAE,iBAAiB,OAAC,GACvC,OAAO,CAAC,GAAG,CAAC,CAqCxB;AAED;;;;GAIG;AACH,0FAHW,OAAO,GACL,OAAO,CAAC,IAAI,CAAC,CA4EzB;AAED;;;;GAIG;AACH,iFAFa,OAAO,CAAC,MAAM,OAAC,CAAC,CAa5B;AAED;;;GAGG;AACH,oFAFa,OAAO,CAAC,IAAI,CAAC,CAMzB;gBAnQe,YAAY"}
|
|
@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.requireEmulator = requireEmulator;
|
|
7
|
-
exports.validatePackageActivityNames = validatePackageActivityNames;
|
|
8
7
|
exports.ensureNetworkSpeed = ensureNetworkSpeed;
|
|
9
8
|
exports.prepareAvdArgs = prepareAvdArgs;
|
|
10
9
|
exports.prepareEmulator = prepareEmulator;
|
|
@@ -30,24 +29,6 @@ function requireEmulator(errMsg) {
|
|
|
30
29
|
throw this.log.errorWithException(errMsg);
|
|
31
30
|
}
|
|
32
31
|
}
|
|
33
|
-
/**
|
|
34
|
-
* @this {import('../../driver').AndroidDriver}
|
|
35
|
-
* @returns {void}
|
|
36
|
-
*/
|
|
37
|
-
function validatePackageActivityNames() {
|
|
38
|
-
for (const key of ['appPackage', 'appActivity', 'appWaitPackage', 'appWaitActivity']) {
|
|
39
|
-
const name = this.opts[key];
|
|
40
|
-
if (!name) {
|
|
41
|
-
continue;
|
|
42
|
-
}
|
|
43
|
-
const match = /([^\w.*,])+/.exec(String(name));
|
|
44
|
-
if (!match) {
|
|
45
|
-
continue;
|
|
46
|
-
}
|
|
47
|
-
this.log.warn(`Capability '${key}' is expected to only include latin letters, digits, underscore, dot, comma and asterisk characters.`);
|
|
48
|
-
this.log.warn(`Current value '${name}' has non-matching character at index ${match.index}: '${String(name).substring(0, match.index + 1)}'`);
|
|
49
|
-
}
|
|
50
|
-
}
|
|
51
32
|
/**
|
|
52
33
|
* @this {import('../../driver').AndroidDriver}
|
|
53
34
|
* @param {string} networkSpeed
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../lib/commands/device/utils.js"],"names":[],"mappings":";;;;;AAoBA,0CAIC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../lib/commands/device/utils.js"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { LogEntryAddedEvent, ContextUpdatedEvent } from './types';
|
|
1
|
+
import type { BiDiLogLevel, LogEntryAddedEvent, ContextUpdatedEvent } from './types';
|
|
2
2
|
import { NATIVE_WIN } from '../context/helpers';
|
|
3
3
|
import {
|
|
4
4
|
CONTEXT_UPDATED_EVENT,
|
|
@@ -6,6 +6,7 @@ import {
|
|
|
6
6
|
CONTEXT_UPDATED_EVENT_OBSOLETE,
|
|
7
7
|
} from './constants';
|
|
8
8
|
import type { LogcatRecord as LogEntry } from 'appium-adb';
|
|
9
|
+
import _ from 'lodash';
|
|
9
10
|
|
|
10
11
|
function toContextUpdatedEvent(method: string, contextName: string): ContextUpdatedEvent {
|
|
11
12
|
return {
|
|
@@ -34,7 +35,7 @@ export function makeLogEntryAddedEvent(entry: LogEntry, context: string, type: s
|
|
|
34
35
|
method: LOG_ENTRY_ADDED_EVENT,
|
|
35
36
|
params: {
|
|
36
37
|
type,
|
|
37
|
-
level: entry.level,
|
|
38
|
+
level: adjustLogLevel(entry.level),
|
|
38
39
|
source: {
|
|
39
40
|
realm: '',
|
|
40
41
|
},
|
|
@@ -43,3 +44,16 @@ export function makeLogEntryAddedEvent(entry: LogEntry, context: string, type: s
|
|
|
43
44
|
},
|
|
44
45
|
};
|
|
45
46
|
}
|
|
47
|
+
|
|
48
|
+
function adjustLogLevel(originalLevel: string): BiDiLogLevel {
|
|
49
|
+
const originalLevelLc = _.toLower(originalLevel);
|
|
50
|
+
switch (originalLevelLc) {
|
|
51
|
+
case 'debug':
|
|
52
|
+
case 'info':
|
|
53
|
+
case 'warn':
|
|
54
|
+
case 'error':
|
|
55
|
+
return originalLevelLc as BiDiLogLevel;
|
|
56
|
+
default:
|
|
57
|
+
return 'info';
|
|
58
|
+
}
|
|
59
|
+
}
|
|
@@ -7,9 +7,11 @@ interface LogEntrySource {
|
|
|
7
7
|
realm: string;
|
|
8
8
|
}
|
|
9
9
|
|
|
10
|
+
export type BiDiLogLevel = 'debug' | 'info' | 'warn' | 'error';
|
|
11
|
+
|
|
10
12
|
interface LogEntryAddedEventParams {
|
|
11
13
|
type: string;
|
|
12
|
-
level:
|
|
14
|
+
level: BiDiLogLevel;
|
|
13
15
|
source: LogEntrySource;
|
|
14
16
|
text: string;
|
|
15
17
|
timestamp: number;
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import semver from 'semver';
|
|
2
2
|
import _ from 'lodash';
|
|
3
3
|
import B from 'bluebird';
|
|
4
|
+
import path from 'node:path';
|
|
4
5
|
import {setMockLocationApp} from '../geolocation';
|
|
5
6
|
import {SETTINGS_HELPER_ID} from 'io.appium.settings';
|
|
6
7
|
import {hideKeyboardCompletely, initUnicodeKeyboard} from '../keyboard';
|
|
7
8
|
import {
|
|
8
9
|
createBaseADB,
|
|
9
10
|
prepareEmulator,
|
|
10
|
-
validatePackageActivityNames,
|
|
11
11
|
pushSettingsApp,
|
|
12
12
|
} from './utils';
|
|
13
13
|
import {adjustTimeZone} from '../time';
|
|
@@ -151,34 +151,34 @@ export async function createADB() {
|
|
|
151
151
|
* @returns {Promise<import('../types').ADBLaunchInfo | undefined>}
|
|
152
152
|
*/
|
|
153
153
|
export async function getLaunchInfo() {
|
|
154
|
-
|
|
155
|
-
|
|
154
|
+
let {appPackage, appActivity, appWaitPackage, appWaitActivity, app} = this.opts;
|
|
155
|
+
if (appPackage && appActivity || (!app && !appPackage)) {
|
|
156
156
|
return;
|
|
157
157
|
}
|
|
158
|
-
let {appPackage, appActivity, appWaitPackage, appWaitActivity} = this.opts;
|
|
159
|
-
const {app} = this.opts;
|
|
160
158
|
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
if (
|
|
164
|
-
|
|
159
|
+
let apkPackage;
|
|
160
|
+
let apkActivity;
|
|
161
|
+
if (app) {
|
|
162
|
+
this.log.debug(`Parsing package and activity from the '${path.basename(app)}' file manifest`);
|
|
163
|
+
({apkPackage, apkActivity} = await this.adb.packageAndLaunchActivityFromManifest(app));
|
|
164
|
+
} else if (appPackage) {
|
|
165
|
+
this.log.debug(`Parsing activity from the installed '${appPackage}' package manifest`);
|
|
166
|
+
apkActivity = await this.adb.resolveLaunchableActivity(appPackage);
|
|
165
167
|
}
|
|
166
|
-
|
|
167
|
-
this.log.debug('Parsing package and activity from app manifest');
|
|
168
|
-
const {apkPackage, apkActivity} = await this.adb.packageAndLaunchActivityFromManifest(app);
|
|
169
168
|
if (apkPackage && !appPackage) {
|
|
170
169
|
appPackage = apkPackage;
|
|
171
170
|
}
|
|
172
171
|
if (!appWaitPackage) {
|
|
173
172
|
appWaitPackage = appPackage;
|
|
174
173
|
}
|
|
174
|
+
this.log.debug(`Resolved launch package/activity: ${apkPackage}/${apkActivity}`);
|
|
175
175
|
if (apkActivity && !appActivity) {
|
|
176
176
|
appActivity = apkActivity;
|
|
177
177
|
}
|
|
178
178
|
if (!appWaitActivity) {
|
|
179
179
|
appWaitActivity = appActivity;
|
|
180
180
|
}
|
|
181
|
-
this.log.debug(`
|
|
181
|
+
this.log.debug(`Resolved wait package/activity: ${appWaitPackage}/${appWaitActivity}`);
|
|
182
182
|
return {appPackage, appWaitPackage, appActivity, appWaitActivity};
|
|
183
183
|
}
|
|
184
184
|
|
|
@@ -24,33 +24,6 @@ export function requireEmulator(errMsg) {
|
|
|
24
24
|
}
|
|
25
25
|
}
|
|
26
26
|
|
|
27
|
-
/**
|
|
28
|
-
* @this {import('../../driver').AndroidDriver}
|
|
29
|
-
* @returns {void}
|
|
30
|
-
*/
|
|
31
|
-
export function validatePackageActivityNames() {
|
|
32
|
-
for (const key of ['appPackage', 'appActivity', 'appWaitPackage', 'appWaitActivity']) {
|
|
33
|
-
const name = this.opts[key];
|
|
34
|
-
if (!name) {
|
|
35
|
-
continue;
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
const match = /([^\w.*,])+/.exec(String(name));
|
|
39
|
-
if (!match) {
|
|
40
|
-
continue;
|
|
41
|
-
}
|
|
42
|
-
|
|
43
|
-
this.log.warn(
|
|
44
|
-
`Capability '${key}' is expected to only include latin letters, digits, underscore, dot, comma and asterisk characters.`,
|
|
45
|
-
);
|
|
46
|
-
this.log.warn(
|
|
47
|
-
`Current value '${name}' has non-matching character at index ${match.index}: '${String(
|
|
48
|
-
name,
|
|
49
|
-
).substring(0, match.index + 1)}'`,
|
|
50
|
-
);
|
|
51
|
-
}
|
|
52
|
-
}
|
|
53
|
-
|
|
54
27
|
/**
|
|
55
28
|
* @this {import('../../driver').AndroidDriver}
|
|
56
29
|
* @param {string} networkSpeed
|