appium-android-driver 13.3.1 → 13.3.2
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/media-projection.js +2 -2
- package/build/lib/commands/media-projection.js.map +1 -1
- package/build/lib/commands/time.d.ts.map +1 -1
- package/build/lib/commands/time.js +23 -8
- package/build/lib/commands/time.js.map +1 -1
- package/build/lib/logger.d.ts +2 -1
- package/build/lib/logger.d.ts.map +1 -1
- package/build/lib/logger.js.map +1 -1
- package/lib/commands/media-projection.ts +2 -2
- package/lib/commands/time.ts +26 -8
- package/lib/logger.ts +2 -1
- package/package.json +2 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
## [13.3.2](https://github.com/appium/appium-android-driver/compare/v13.3.1...v13.3.2) (2026-07-08)
|
|
2
|
+
|
|
3
|
+
### Miscellaneous Chores
|
|
4
|
+
|
|
5
|
+
* Replace moment with dayjs ([#1078](https://github.com/appium/appium-android-driver/issues/1078)) ([8bdea5d](https://github.com/appium/appium-android-driver/commit/8bdea5d5b6eec3304eac81dc2e56672f0de2e6d4))
|
|
6
|
+
|
|
1
7
|
## [13.3.1](https://github.com/appium/appium-android-driver/compare/v13.3.0...v13.3.1) (2026-07-08)
|
|
2
8
|
|
|
3
9
|
### Miscellaneous Chores
|
|
@@ -8,7 +8,7 @@ exports.mobileIsMediaProjectionRecordingRunning = mobileIsMediaProjectionRecordi
|
|
|
8
8
|
exports.mobileStopMediaProjectionRecording = mobileStopMediaProjectionRecording;
|
|
9
9
|
const support_1 = require("@appium/support");
|
|
10
10
|
const lodash_1 = __importDefault(require("lodash"));
|
|
11
|
-
const
|
|
11
|
+
const dayjs_1 = __importDefault(require("dayjs"));
|
|
12
12
|
const node_path_1 = __importDefault(require("node:path"));
|
|
13
13
|
// https://github.com/appium/io.appium.settings#internal-audio--video-recording
|
|
14
14
|
const DEFAULT_EXT = '.mp4';
|
|
@@ -35,7 +35,7 @@ const DEFAULT_FILENAME_FORMAT = 'YYYY-MM-DDTHH-mm-ss';
|
|
|
35
35
|
async function mobileStartMediaProjectionRecording(resolution, priority, maxDurationSec, filename) {
|
|
36
36
|
await verifyMediaProjectionRecordingIsSupported(this.adb);
|
|
37
37
|
const recorder = this.settingsApp.makeMediaProjectionRecorder();
|
|
38
|
-
const fname = adjustMediaExtension(filename || (0,
|
|
38
|
+
const fname = adjustMediaExtension(filename || (0, dayjs_1.default)().format(DEFAULT_FILENAME_FORMAT));
|
|
39
39
|
const didStart = await recorder.start({
|
|
40
40
|
resolution,
|
|
41
41
|
priority,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media-projection.js","sourceRoot":"","sources":["../../../lib/commands/media-projection.ts"],"names":[],"mappings":";;;;;AA2CA,kFAyBC;AAOD,0FAOC;AAwBD,gFA2CC;AArJD,6CAA8C;AAE9C,oDAAuB;AACvB,
|
|
1
|
+
{"version":3,"file":"media-projection.js","sourceRoot":"","sources":["../../../lib/commands/media-projection.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"time.d.ts","sourceRoot":"","sources":["../../../lib/commands/time.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"time.d.ts","sourceRoot":"","sources":["../../../lib/commands/time.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,WAAW,CAAC;AAO7C;;;;;GAKG;AACH,wBAAsB,aAAa,CACjC,IAAI,EAAE,aAAa,EACnB,MAAM,GAAE,MAAgC,GACvC,OAAO,CAAC,MAAM,CAAC,CAajB;AAED;;;;;GAKG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAE/F;AAED;;;;;;GAMG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAczF"}
|
|
@@ -6,25 +6,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.getDeviceTime = getDeviceTime;
|
|
7
7
|
exports.mobileGetDeviceTime = mobileGetDeviceTime;
|
|
8
8
|
exports.adjustTimeZone = adjustTimeZone;
|
|
9
|
-
const
|
|
10
|
-
const
|
|
9
|
+
const dayjs_1 = __importDefault(require("dayjs"));
|
|
10
|
+
const utc_1 = __importDefault(require("dayjs/plugin/utc"));
|
|
11
|
+
const customParseFormat_1 = __importDefault(require("dayjs/plugin/customParseFormat"));
|
|
12
|
+
dayjs_1.default.extend(utc_1.default);
|
|
13
|
+
dayjs_1.default.extend(customParseFormat_1.default);
|
|
14
|
+
const DATETIME_FORMAT_ISO8601 = 'YYYY-MM-DDTHH:mm:ssZ';
|
|
11
15
|
/**
|
|
12
16
|
* Gets the current device time.
|
|
13
17
|
*
|
|
14
18
|
* @param format The format string for the time. Defaults to ISO8601 format.
|
|
15
19
|
* @returns Promise that resolves to the formatted device time string.
|
|
16
20
|
*/
|
|
17
|
-
async function getDeviceTime(format =
|
|
18
|
-
this.log.debug(
|
|
21
|
+
async function getDeviceTime(format = DATETIME_FORMAT_ISO8601) {
|
|
22
|
+
this.log.debug(`Attempting to capture Android device date and time. The format specifier is '${format}'`);
|
|
19
23
|
const deviceTimestamp = (await this.adb.shell(['date', '+%Y-%m-%dT%T%z'])).trim();
|
|
20
24
|
this.log.debug(`Got device timestamp: ${deviceTimestamp}`);
|
|
21
|
-
const parsedTimestamp =
|
|
25
|
+
const parsedTimestamp = dayjs_1.default.utc(deviceTimestamp, 'YYYY-MM-DDTHH:mm:ssZZ');
|
|
22
26
|
if (!parsedTimestamp.isValid()) {
|
|
23
27
|
this.log.warn('Cannot parse the returned timestamp. Returning as is');
|
|
24
28
|
return deviceTimestamp;
|
|
25
29
|
}
|
|
26
|
-
|
|
27
|
-
return parsedTimestamp.utcOffset(
|
|
30
|
+
const offset = parseOffset(deviceTimestamp);
|
|
31
|
+
return parsedTimestamp.utcOffset(offset).format(format);
|
|
28
32
|
}
|
|
29
33
|
/**
|
|
30
34
|
* Gets the current device time.
|
|
@@ -43,7 +47,7 @@ async function mobileGetDeviceTime(format) {
|
|
|
43
47
|
* @throws {Error} If the time zone identifier is not known.
|
|
44
48
|
*/
|
|
45
49
|
async function adjustTimeZone(zoneName) {
|
|
46
|
-
if (!
|
|
50
|
+
if (!isValidTimeZone(zoneName)) {
|
|
47
51
|
throw new Error(`The provided time zone identifier '${zoneName}' is not known. ` +
|
|
48
52
|
`Please choose a valid TZ identifier from https://en.wikipedia.org/wiki/List_of_tz_database_time_zones`);
|
|
49
53
|
}
|
|
@@ -55,4 +59,15 @@ async function adjustTimeZone(zoneName) {
|
|
|
55
59
|
// https://cs.android.com/android/platform/superproject/+/master:frameworks/base/apex/jobscheduler/framework/java/android/app/IAlarmManager.aidl;l=1?q=IAlarmManager
|
|
56
60
|
await this.adb.shell(['service', 'call', 'alarm', '3', 's16', zoneName]);
|
|
57
61
|
}
|
|
62
|
+
function parseOffset(timestamp) {
|
|
63
|
+
const m = timestamp.match(/([+-])(\d{2})(\d{2})$/);
|
|
64
|
+
if (!m) {
|
|
65
|
+
return 0;
|
|
66
|
+
}
|
|
67
|
+
const sign = m[1] === '+' ? 1 : -1;
|
|
68
|
+
return sign * (Number(m[2]) * 60 + Number(m[3]));
|
|
69
|
+
}
|
|
70
|
+
function isValidTimeZone(zoneName) {
|
|
71
|
+
return Intl.supportedValuesOf('timeZone').includes(zoneName);
|
|
72
|
+
}
|
|
58
73
|
//# sourceMappingURL=time.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"time.js","sourceRoot":"","sources":["../../../lib/commands/time.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"time.js","sourceRoot":"","sources":["../../../lib/commands/time.ts"],"names":[],"mappings":";;;;;AAgBA,sCAgBC;AAQD,kDAEC;AASD,wCAcC;AAjED,kDAA0B;AAC1B,2DAAmC;AACnC,uFAA+D;AAG/D,eAAK,CAAC,MAAM,CAAC,aAAG,CAAC,CAAC;AAClB,eAAK,CAAC,MAAM,CAAC,2BAAiB,CAAC,CAAC;AAEhC,MAAM,uBAAuB,GAAG,sBAAsB,CAAC;AAEvD;;;;;GAKG;AACI,KAAK,UAAU,aAAa,CAEjC,SAAiB,uBAAuB;IAExC,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,gFAAgF,MAAM,GAAG,CAC1F,CAAC;IACF,MAAM,eAAe,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAClF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yBAAyB,eAAe,EAAE,CAAC,CAAC;IAC3D,MAAM,eAAe,GAAG,eAAK,CAAC,GAAG,CAAC,eAAe,EAAE,uBAAuB,CAAC,CAAC;IAC5E,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,EAAE,CAAC;QAC/B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,sDAAsD,CAAC,CAAC;QACtE,OAAO,eAAe,CAAC;IACzB,CAAC;IACD,MAAM,MAAM,GAAG,WAAW,CAAC,eAAe,CAAC,CAAC;IAC5C,OAAO,eAAe,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AAC1D,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,mBAAmB,CAAsB,MAAe;IAC5E,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;AAC1C,CAAC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,cAAc,CAAsB,QAAgB;IACxE,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CACb,sCAAsC,QAAQ,kBAAkB;YAC9D,uGAAuG,CAC1G,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,oCAAoC,QAAQ,GAAG,CAAC,CAAC;IAC/D,oEAAoE;IACpE,uEAAuE;IACvE,kCAAkC;IAClC,oBAAoB;IACpB,oKAAoK;IACpK,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;AAC3E,CAAC;AAED,SAAS,WAAW,CAAC,SAAiB;IACpC,MAAM,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;IACnD,IAAI,CAAC,CAAC,EAAE,CAAC;QACP,OAAO,CAAC,CAAC;IACX,CAAC;IACD,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACnC,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACnD,CAAC;AAED,SAAS,eAAe,CAAC,QAAgB;IACvC,OAAO,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAC/D,CAAC"}
|
package/build/lib/logger.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../lib/logger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../lib/logger.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAEhD,eAAO,MAAM,GAAG,EAAE,YAAgD,CAAC"}
|
package/build/lib/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../lib/logger.ts"],"names":[],"mappings":";;;AAAA,6CAAuC;
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../lib/logger.ts"],"names":[],"mappings":";;;AAAA,6CAAuC;AAG1B,QAAA,GAAG,GAAiB,gBAAM,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import {fs, net, util} from '@appium/support';
|
|
2
2
|
import type {NetOptions, HttpUploadOptions} from '@appium/support';
|
|
3
3
|
import _ from 'lodash';
|
|
4
|
-
import
|
|
4
|
+
import dayjs from 'dayjs';
|
|
5
5
|
import path from 'node:path';
|
|
6
6
|
import type {HTTPMethod, StringRecord} from '@appium/types';
|
|
7
7
|
import type {AndroidDriver} from '../driver';
|
|
@@ -51,7 +51,7 @@ export async function mobileStartMediaProjectionRecording(
|
|
|
51
51
|
await verifyMediaProjectionRecordingIsSupported(this.adb);
|
|
52
52
|
|
|
53
53
|
const recorder = this.settingsApp.makeMediaProjectionRecorder();
|
|
54
|
-
const fname = adjustMediaExtension(filename ||
|
|
54
|
+
const fname = adjustMediaExtension(filename || dayjs().format(DEFAULT_FILENAME_FORMAT));
|
|
55
55
|
const didStart = await recorder.start({
|
|
56
56
|
resolution,
|
|
57
57
|
priority,
|
package/lib/commands/time.ts
CHANGED
|
@@ -1,7 +1,12 @@
|
|
|
1
|
-
import
|
|
1
|
+
import dayjs from 'dayjs';
|
|
2
|
+
import utc from 'dayjs/plugin/utc';
|
|
3
|
+
import customParseFormat from 'dayjs/plugin/customParseFormat';
|
|
2
4
|
import type {AndroidDriver} from '../driver';
|
|
3
5
|
|
|
4
|
-
|
|
6
|
+
dayjs.extend(utc);
|
|
7
|
+
dayjs.extend(customParseFormat);
|
|
8
|
+
|
|
9
|
+
const DATETIME_FORMAT_ISO8601 = 'YYYY-MM-DDTHH:mm:ssZ';
|
|
5
10
|
|
|
6
11
|
/**
|
|
7
12
|
* Gets the current device time.
|
|
@@ -11,20 +16,20 @@ const MOMENT_FORMAT_ISO8601 = 'YYYY-MM-DDTHH:mm:ssZ';
|
|
|
11
16
|
*/
|
|
12
17
|
export async function getDeviceTime(
|
|
13
18
|
this: AndroidDriver,
|
|
14
|
-
format: string =
|
|
19
|
+
format: string = DATETIME_FORMAT_ISO8601,
|
|
15
20
|
): Promise<string> {
|
|
16
21
|
this.log.debug(
|
|
17
|
-
|
|
22
|
+
`Attempting to capture Android device date and time. The format specifier is '${format}'`,
|
|
18
23
|
);
|
|
19
24
|
const deviceTimestamp = (await this.adb.shell(['date', '+%Y-%m-%dT%T%z'])).trim();
|
|
20
25
|
this.log.debug(`Got device timestamp: ${deviceTimestamp}`);
|
|
21
|
-
const parsedTimestamp =
|
|
26
|
+
const parsedTimestamp = dayjs.utc(deviceTimestamp, 'YYYY-MM-DDTHH:mm:ssZZ');
|
|
22
27
|
if (!parsedTimestamp.isValid()) {
|
|
23
28
|
this.log.warn('Cannot parse the returned timestamp. Returning as is');
|
|
24
29
|
return deviceTimestamp;
|
|
25
30
|
}
|
|
26
|
-
|
|
27
|
-
return parsedTimestamp.utcOffset(
|
|
31
|
+
const offset = parseOffset(deviceTimestamp);
|
|
32
|
+
return parsedTimestamp.utcOffset(offset).format(format);
|
|
28
33
|
}
|
|
29
34
|
|
|
30
35
|
/**
|
|
@@ -45,7 +50,7 @@ export async function mobileGetDeviceTime(this: AndroidDriver, format?: string):
|
|
|
45
50
|
* @throws {Error} If the time zone identifier is not known.
|
|
46
51
|
*/
|
|
47
52
|
export async function adjustTimeZone(this: AndroidDriver, zoneName: string): Promise<void> {
|
|
48
|
-
if (!
|
|
53
|
+
if (!isValidTimeZone(zoneName)) {
|
|
49
54
|
throw new Error(
|
|
50
55
|
`The provided time zone identifier '${zoneName}' is not known. ` +
|
|
51
56
|
`Please choose a valid TZ identifier from https://en.wikipedia.org/wiki/List_of_tz_database_time_zones`,
|
|
@@ -59,3 +64,16 @@ export async function adjustTimeZone(this: AndroidDriver, zoneName: string): Pro
|
|
|
59
64
|
// https://cs.android.com/android/platform/superproject/+/master:frameworks/base/apex/jobscheduler/framework/java/android/app/IAlarmManager.aidl;l=1?q=IAlarmManager
|
|
60
65
|
await this.adb.shell(['service', 'call', 'alarm', '3', 's16', zoneName]);
|
|
61
66
|
}
|
|
67
|
+
|
|
68
|
+
function parseOffset(timestamp: string): number {
|
|
69
|
+
const m = timestamp.match(/([+-])(\d{2})(\d{2})$/);
|
|
70
|
+
if (!m) {
|
|
71
|
+
return 0;
|
|
72
|
+
}
|
|
73
|
+
const sign = m[1] === '+' ? 1 : -1;
|
|
74
|
+
return sign * (Number(m[2]) * 60 + Number(m[3]));
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
function isValidTimeZone(zoneName: string): boolean {
|
|
78
|
+
return Intl.supportedValuesOf('timeZone').includes(zoneName);
|
|
79
|
+
}
|
package/lib/logger.ts
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "appium-android-driver",
|
|
3
|
-
"version": "13.3.
|
|
3
|
+
"version": "13.3.2",
|
|
4
4
|
"description": "Android UiAutomator and Chrome support for Appium",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"appium",
|
|
@@ -52,11 +52,10 @@
|
|
|
52
52
|
"appium-chromedriver": "^8.4.4",
|
|
53
53
|
"asyncbox": "^6.1.0",
|
|
54
54
|
"axios": "^1.16.0",
|
|
55
|
+
"dayjs": "^1.11.21",
|
|
55
56
|
"io.appium.settings": "^7.1.3",
|
|
56
57
|
"lodash": "^4.17.4",
|
|
57
58
|
"lru-cache": "^11.1.0",
|
|
58
|
-
"moment": "^2.24.0",
|
|
59
|
-
"moment-timezone": "^0.x",
|
|
60
59
|
"portscanner": "^2.2.0",
|
|
61
60
|
"semver": "^7.0.0",
|
|
62
61
|
"teen_process": "^4.0.7",
|