appium-adb 14.3.5 → 14.4.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 +6 -0
- package/build/lib/adb.d.ts +9 -4
- package/build/lib/adb.d.ts.map +1 -1
- package/build/lib/adb.js +8 -9
- package/build/lib/adb.js.map +1 -1
- package/build/lib/index.d.ts +1 -1
- package/build/lib/index.d.ts.map +1 -1
- package/build/lib/index.js +2 -2
- package/build/lib/index.js.map +1 -1
- package/build/lib/logcat.d.ts.map +1 -1
- package/build/lib/logcat.js +6 -14
- package/build/lib/logcat.js.map +1 -1
- package/build/lib/tools/aab-utils.d.ts.map +1 -1
- package/build/lib/tools/aab-utils.js +2 -2
- package/build/lib/tools/aab-utils.js.map +1 -1
- package/build/lib/tools/android-manifest.d.ts.map +1 -1
- package/build/lib/tools/android-manifest.js +11 -12
- package/build/lib/tools/android-manifest.js.map +1 -1
- package/build/lib/tools/apk-signing.d.ts.map +1 -1
- package/build/lib/tools/apk-signing.js +18 -19
- package/build/lib/tools/apk-signing.js.map +1 -1
- package/build/lib/tools/apk-utils.d.ts.map +1 -1
- package/build/lib/tools/apk-utils.js +39 -40
- package/build/lib/tools/apk-utils.js.map +1 -1
- package/build/lib/tools/apks-utils.d.ts.map +1 -1
- package/build/lib/tools/apks-utils.js +8 -9
- package/build/lib/tools/apks-utils.js.map +1 -1
- package/build/lib/tools/app-commands.d.ts.map +1 -1
- package/build/lib/tools/app-commands.js +37 -36
- package/build/lib/tools/app-commands.js.map +1 -1
- package/build/lib/tools/device-settings.d.ts.map +1 -1
- package/build/lib/tools/device-settings.js +17 -18
- package/build/lib/tools/device-settings.js.map +1 -1
- package/build/lib/tools/emulator-commands.d.ts.map +1 -1
- package/build/lib/tools/emulator-commands.js +22 -23
- package/build/lib/tools/emulator-commands.js.map +1 -1
- package/build/lib/tools/fs-commands.d.ts.map +1 -1
- package/build/lib/tools/fs-commands.js +5 -4
- package/build/lib/tools/fs-commands.js.map +1 -1
- package/build/lib/tools/general-commands.d.ts.map +1 -1
- package/build/lib/tools/general-commands.js +29 -29
- package/build/lib/tools/general-commands.js.map +1 -1
- package/build/lib/tools/keyboard-commands.d.ts.map +1 -1
- package/build/lib/tools/keyboard-commands.js +6 -4
- package/build/lib/tools/keyboard-commands.js.map +1 -1
- package/build/lib/tools/lockmgmt.d.ts.map +1 -1
- package/build/lib/tools/lockmgmt.js +17 -20
- package/build/lib/tools/lockmgmt.js.map +1 -1
- package/build/lib/tools/logcat-commands.d.ts.map +1 -1
- package/build/lib/tools/logcat-commands.js +5 -9
- package/build/lib/tools/logcat-commands.js.map +1 -1
- package/build/lib/tools/network-commands.d.ts.map +1 -1
- package/build/lib/tools/network-commands.js +1 -5
- package/build/lib/tools/network-commands.js.map +1 -1
- package/build/lib/tools/process-commands.d.ts.map +1 -1
- package/build/lib/tools/process-commands.js +11 -12
- package/build/lib/tools/process-commands.js.map +1 -1
- package/build/lib/tools/system-calls.d.ts +12 -5
- package/build/lib/tools/system-calls.d.ts.map +1 -1
- package/build/lib/tools/system-calls.js +56 -50
- package/build/lib/tools/system-calls.js.map +1 -1
- package/build/lib/tools/types.d.ts +1 -1
- package/build/lib/tools/types.d.ts.map +1 -1
- package/build/lib/utils/helpers/constants.d.ts +6 -0
- package/build/lib/utils/helpers/constants.d.ts.map +1 -0
- package/build/lib/utils/helpers/constants.js +9 -0
- package/build/lib/utils/helpers/constants.js.map +1 -0
- package/build/lib/utils/helpers/index.d.ts +6 -0
- package/build/lib/utils/helpers/index.d.ts.map +1 -0
- package/build/lib/utils/helpers/index.js +21 -0
- package/build/lib/utils/helpers/index.js.map +1 -0
- package/build/lib/utils/helpers/install.d.ts +16 -0
- package/build/lib/utils/helpers/install.d.ts.map +1 -0
- package/build/lib/utils/helpers/install.js +39 -0
- package/build/lib/utils/helpers/install.js.map +1 -0
- package/build/lib/utils/helpers/manifest.d.ts +10 -0
- package/build/lib/utils/helpers/manifest.d.ts.map +1 -0
- package/build/lib/utils/helpers/manifest.js +124 -0
- package/build/lib/utils/helpers/manifest.js.map +1 -0
- package/build/lib/utils/helpers/resource.d.ts +11 -0
- package/build/lib/utils/helpers/resource.d.ts.map +1 -0
- package/build/lib/utils/helpers/resource.js +59 -0
- package/build/lib/utils/helpers/resource.js.map +1 -0
- package/build/lib/utils/helpers/sdk.d.ts +20 -0
- package/build/lib/utils/helpers/sdk.d.ts.map +1 -0
- package/build/lib/utils/helpers/sdk.js +80 -0
- package/build/lib/utils/helpers/sdk.js.map +1 -0
- package/build/lib/utils/index.d.ts +40 -0
- package/build/lib/utils/index.d.ts.map +1 -0
- package/build/lib/utils/index.js +58 -0
- package/build/lib/utils/index.js.map +1 -0
- package/build/lib/utils/lodash/core.d.ts +9 -0
- package/build/lib/utils/lodash/core.d.ts.map +1 -0
- package/build/lib/utils/lodash/core.js +60 -0
- package/build/lib/utils/lodash/core.js.map +1 -0
- package/build/lib/utils/lodash/index.d.ts +2 -0
- package/build/lib/utils/lodash/index.d.ts.map +1 -0
- package/build/lib/utils/lodash/index.js +18 -0
- package/build/lib/utils/lodash/index.js.map +1 -0
- package/lib/adb.ts +14 -6
- package/lib/index.ts +1 -1
- package/lib/logcat.ts +6 -11
- package/lib/tools/aab-utils.ts +1 -1
- package/lib/tools/android-manifest.ts +4 -4
- package/lib/tools/apk-signing.ts +11 -7
- package/lib/tools/apk-utils.ts +41 -42
- package/lib/tools/apks-utils.ts +4 -5
- package/lib/tools/app-commands.ts +40 -34
- package/lib/tools/device-settings.ts +17 -15
- package/lib/tools/emulator-commands.ts +22 -23
- package/lib/tools/fs-commands.ts +5 -4
- package/lib/tools/general-commands.ts +32 -27
- package/lib/tools/keyboard-commands.ts +6 -4
- package/lib/tools/lockmgmt.ts +17 -13
- package/lib/tools/logcat-commands.ts +5 -6
- package/lib/tools/network-commands.ts +1 -2
- package/lib/tools/process-commands.ts +11 -9
- package/lib/tools/system-calls.ts +54 -46
- package/lib/tools/types.ts +1 -1
- package/lib/utils/helpers/constants.ts +6 -0
- package/lib/utils/helpers/index.ts +10 -0
- package/lib/utils/helpers/install.ts +50 -0
- package/lib/utils/helpers/manifest.ts +127 -0
- package/lib/utils/helpers/resource.ts +63 -0
- package/lib/utils/helpers/sdk.ts +81 -0
- package/lib/utils/index.ts +25 -0
- package/lib/utils/lodash/core.ts +65 -0
- package/lib/utils/lodash/index.ts +1 -0
- package/package.json +2 -4
- package/build/lib/helpers.d.ts +0 -47
- package/build/lib/helpers.d.ts.map +0 -1
- package/build/lib/helpers.js +0 -283
- package/build/lib/helpers.js.map +0 -1
- package/lib/helpers.ts +0 -323
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"general-commands.js","sourceRoot":"","sources":["../../../lib/tools/general-commands.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"general-commands.js","sourceRoot":"","sources":["../../../lib/tools/general-commands.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keyboard-commands.d.ts","sourceRoot":"","sources":["../../../lib/tools/keyboard-commands.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,SAAS,CAAC;AAK3C;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE,SAAS,GAAE,MAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CAwBxF;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,aAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"keyboard-commands.d.ts","sourceRoot":"","sources":["../../../lib/tools/keyboard-commands.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,SAAS,CAAC;AAK3C;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE,SAAS,GAAE,MAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CAwBxF;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,aAAa,CAAC,CAc7E;AAED;;;;GAIG;AACH,wBAAsB,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAIjF;AAED;;;;GAIG;AACH,wBAAsB,aAAa,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAOhE;AAED;;;;GAIG;AACH,wBAAsB,WAAW,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAO9D;AAED;;;;GAIG;AACH,wBAAsB,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEvE;AAED;;;;GAIG;AACH,wBAAsB,UAAU,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAExE;AAED;;;;GAIG;AACH,wBAAsB,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEpE;AAED;;;;GAIG;AACH,wBAAsB,UAAU,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAWlE;AAED;;;;;;GAMG;AACH,wBAAsB,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAa/E;AAED;;;;;;;GAOG;AACH,wBAAsB,eAAe,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CA6BjG"}
|
|
@@ -63,7 +63,9 @@ async function isSoftKeyboardPresent() {
|
|
|
63
63
|
};
|
|
64
64
|
}
|
|
65
65
|
catch (e) {
|
|
66
|
-
throw new Error(`Error finding softkeyboard. Original error: ${e.message}
|
|
66
|
+
throw new Error(`Error finding softkeyboard. Original error: ${e.message}`, {
|
|
67
|
+
cause: e,
|
|
68
|
+
});
|
|
67
69
|
}
|
|
68
70
|
}
|
|
69
71
|
/**
|
|
@@ -87,7 +89,7 @@ async function availableIMEs() {
|
|
|
87
89
|
}
|
|
88
90
|
catch (e) {
|
|
89
91
|
const err = e;
|
|
90
|
-
throw new Error(`Error getting available IME's. Original error: ${err.message}
|
|
92
|
+
throw new Error(`Error getting available IME's. Original error: ${err.message}`, { cause: e });
|
|
91
93
|
}
|
|
92
94
|
}
|
|
93
95
|
/**
|
|
@@ -101,7 +103,7 @@ async function enabledIMEs() {
|
|
|
101
103
|
}
|
|
102
104
|
catch (e) {
|
|
103
105
|
const err = e;
|
|
104
|
-
throw new Error(`Error getting enabled IME's. Original error: ${err.message}
|
|
106
|
+
throw new Error(`Error getting enabled IME's. Original error: ${err.message}`, { cause: e });
|
|
105
107
|
}
|
|
106
108
|
}
|
|
107
109
|
/**
|
|
@@ -143,7 +145,7 @@ async function defaultIME() {
|
|
|
143
145
|
}
|
|
144
146
|
catch (e) {
|
|
145
147
|
const err = e;
|
|
146
|
-
throw new Error(`Error getting default IME. Original error: ${err.message}
|
|
148
|
+
throw new Error(`Error getting default IME. Original error: ${err.message}`, { cause: e });
|
|
147
149
|
}
|
|
148
150
|
}
|
|
149
151
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keyboard-commands.js","sourceRoot":"","sources":["../../../lib/tools/keyboard-commands.ts"],"names":[],"mappings":";;AAiBA,oCAwBC;AAOD,
|
|
1
|
+
{"version":3,"file":"keyboard-commands.js","sourceRoot":"","sources":["../../../lib/tools/keyboard-commands.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lockmgmt.d.ts","sourceRoot":"","sources":["../../../lib/tools/lockmgmt.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"lockmgmt.d.ts","sourceRoot":"","sources":["../../../lib/tools/lockmgmt.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,QAAQ,CAAC;AAUhC;;;;;GAKG;AACH,wBAAsB,yBAAyB,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAc3E;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,GAAG,EACT,UAAU,GAAE,MAAM,GAAG,IAAW,GAC/B,OAAO,CAAC,OAAO,CAAC,CA2BlB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,GAAG,EACT,UAAU,GAAE,MAAM,GAAG,IAAW,GAC/B,OAAO,CAAC,IAAI,CAAC,CAuBf;AAED;;;;;;GAMG;AACH,wBAAsB,aAAa,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAuB/D;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,GAAG,EACT,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,aAAa,GAAE,MAAM,GAAG,IAAW,GAClC,OAAO,CAAC,IAAI,CAAC,CA6Bf;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAYhE;AAED;;GAEG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAyB9D;AAED;;;GAGG;AACH,wBAAsB,WAAW,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAG1D;AAED;;GAEG;AACH,wBAAsB,IAAI,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBnD;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAQ5D;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAEzD"}
|
|
@@ -1,7 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.isLockManagementSupported = isLockManagementSupported;
|
|
7
4
|
exports.verifyLockCredential = verifyLockCredential;
|
|
@@ -15,8 +12,8 @@ exports.lock = lock;
|
|
|
15
12
|
exports.isShowingLockscreen = isShowingLockscreen;
|
|
16
13
|
exports.isScreenStateOff = isScreenStateOff;
|
|
17
14
|
const logger_1 = require("../logger");
|
|
18
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
19
15
|
const asyncbox_1 = require("asyncbox");
|
|
16
|
+
const support_1 = require("@appium/support");
|
|
20
17
|
const CREDENTIAL_CANNOT_BE_NULL_OR_EMPTY_ERROR = `Credential can't be null or empty`;
|
|
21
18
|
const CREDENTIAL_DID_NOT_MATCH_ERROR = `didn't match`;
|
|
22
19
|
const SUPPORTED_LOCK_CREDENTIAL_TYPES = ['password', 'pin', 'pattern'];
|
|
@@ -30,14 +27,14 @@ const HIDE_KEYBOARD_WAIT_TIME = 100;
|
|
|
30
27
|
* @return True if the management is supported. The result is cached per ADB instance
|
|
31
28
|
*/
|
|
32
29
|
async function isLockManagementSupported() {
|
|
33
|
-
if (
|
|
30
|
+
if (typeof this._isLockManagementSupported !== 'boolean') {
|
|
34
31
|
const passFlag = '__PASS__';
|
|
35
32
|
let output = '';
|
|
36
33
|
try {
|
|
37
34
|
output = await this.shell([`locksettings help && echo ${passFlag}`]);
|
|
38
35
|
}
|
|
39
36
|
catch { }
|
|
40
|
-
this._isLockManagementSupported =
|
|
37
|
+
this._isLockManagementSupported = output.includes(passFlag);
|
|
41
38
|
logger_1.log.debug(`Extended lock settings management is ` +
|
|
42
39
|
`${this._isLockManagementSupported ? '' : 'not '}supported`);
|
|
43
40
|
}
|
|
@@ -60,10 +57,10 @@ async function verifyLockCredential(credential = null) {
|
|
|
60
57
|
const { stdout, stderr } = await this.shell(buildCommand('verify', credential), {
|
|
61
58
|
outputFormat: this.EXEC_OUTPUT_FORMAT.FULL,
|
|
62
59
|
});
|
|
63
|
-
if (
|
|
60
|
+
if (stdout?.includes('verified successfully')) {
|
|
64
61
|
return true;
|
|
65
62
|
}
|
|
66
|
-
if ([`didn't match`, CREDENTIAL_CANNOT_BE_NULL_OR_EMPTY_ERROR].some((x) =>
|
|
63
|
+
if ([`didn't match`, CREDENTIAL_CANNOT_BE_NULL_OR_EMPTY_ERROR].some((x) => (stderr || stdout)?.includes(x))) {
|
|
67
64
|
return false;
|
|
68
65
|
}
|
|
69
66
|
throw new Error(stderr || stdout);
|
|
@@ -72,7 +69,7 @@ async function verifyLockCredential(credential = null) {
|
|
|
72
69
|
throw new Error(`Device lock credential verification failed. ` +
|
|
73
70
|
`Original error: ${e.stderr ||
|
|
74
71
|
e.stdout ||
|
|
75
|
-
e.message}
|
|
72
|
+
e.message}`, { cause: e });
|
|
76
73
|
}
|
|
77
74
|
}
|
|
78
75
|
/**
|
|
@@ -92,7 +89,7 @@ async function clearLockCredential(credential = null) {
|
|
|
92
89
|
const { stdout, stderr } = await this.shell(buildCommand('clear', credential), {
|
|
93
90
|
outputFormat: this.EXEC_OUTPUT_FORMAT.FULL,
|
|
94
91
|
});
|
|
95
|
-
if (!['user has no password', 'Lock credential cleared'].some((x) =>
|
|
92
|
+
if (!['user has no password', 'Lock credential cleared'].some((x) => (stderr || stdout)?.includes(x))) {
|
|
96
93
|
throw new Error(stderr || stdout);
|
|
97
94
|
}
|
|
98
95
|
}
|
|
@@ -100,7 +97,7 @@ async function clearLockCredential(credential = null) {
|
|
|
100
97
|
throw new Error(`Cannot clear device lock credential. ` +
|
|
101
98
|
`Original error: ${e.stderr ||
|
|
102
99
|
e.stdout ||
|
|
103
|
-
e.message}
|
|
100
|
+
e.message}`, { cause: e });
|
|
104
101
|
}
|
|
105
102
|
}
|
|
106
103
|
/**
|
|
@@ -116,7 +113,7 @@ async function isLockEnabled() {
|
|
|
116
113
|
outputFormat: this.EXEC_OUTPUT_FORMAT.FULL,
|
|
117
114
|
});
|
|
118
115
|
if (/\bfalse\b/.test(stdout) ||
|
|
119
|
-
[CREDENTIAL_DID_NOT_MATCH_ERROR, CREDENTIAL_CANNOT_BE_NULL_OR_EMPTY_ERROR].some((x) =>
|
|
116
|
+
[CREDENTIAL_DID_NOT_MATCH_ERROR, CREDENTIAL_CANNOT_BE_NULL_OR_EMPTY_ERROR].some((x) => (stderr || stdout)?.includes(x))) {
|
|
120
117
|
return true;
|
|
121
118
|
}
|
|
122
119
|
if (/\btrue\b/.test(stdout)) {
|
|
@@ -125,7 +122,7 @@ async function isLockEnabled() {
|
|
|
125
122
|
throw new Error(stderr || stdout);
|
|
126
123
|
}
|
|
127
124
|
catch (e) {
|
|
128
|
-
throw new Error(`Cannot check if device lock is enabled. Original error: ${e.message}
|
|
125
|
+
throw new Error(`Cannot check if device lock is enabled. Original error: ${e.message}`, { cause: e });
|
|
129
126
|
}
|
|
130
127
|
}
|
|
131
128
|
/**
|
|
@@ -150,7 +147,7 @@ async function setLockCredential(credentialType, credential, oldCredential = nul
|
|
|
150
147
|
throw new Error(`Device lock credential type '${credentialType}' is unknown. ` +
|
|
151
148
|
`Only the following credential types are supported: ${SUPPORTED_LOCK_CREDENTIAL_TYPES}`);
|
|
152
149
|
}
|
|
153
|
-
if (
|
|
150
|
+
if (support_1.util.isEmpty(credential) && !Number.isInteger(credential)) {
|
|
154
151
|
throw new Error('Device lock credential cannot be empty');
|
|
155
152
|
}
|
|
156
153
|
const cmd = buildCommand(`set-${credentialType}`, oldCredential, credential);
|
|
@@ -158,7 +155,7 @@ async function setLockCredential(credentialType, credential, oldCredential = nul
|
|
|
158
155
|
const { stdout, stderr } = await this.shell(cmd, {
|
|
159
156
|
outputFormat: this.EXEC_OUTPUT_FORMAT.FULL,
|
|
160
157
|
});
|
|
161
|
-
if (!
|
|
158
|
+
if (!stdout?.includes('set to')) {
|
|
162
159
|
throw new Error(stderr || stdout);
|
|
163
160
|
}
|
|
164
161
|
}
|
|
@@ -166,7 +163,7 @@ async function setLockCredential(credentialType, credential, oldCredential = nul
|
|
|
166
163
|
throw new Error(`Setting of device lock ${credentialType} credential failed. ` +
|
|
167
164
|
`Original error: ${e.stderr ||
|
|
168
165
|
e.stdout ||
|
|
169
|
-
e.message}
|
|
166
|
+
e.message}`, { cause: e });
|
|
170
167
|
}
|
|
171
168
|
}
|
|
172
169
|
/**
|
|
@@ -257,9 +254,9 @@ async function lock() {
|
|
|
257
254
|
* @return True if lock screen is showing.
|
|
258
255
|
*/
|
|
259
256
|
function isShowingLockscreen(dumpsys) {
|
|
260
|
-
return (
|
|
257
|
+
return (['mShowingLockscreen=true', 'mDreamingLockscreen=true'].some((x) => dumpsys.includes(x)) ||
|
|
261
258
|
// `mIsShowing` and `mInputRestricted` are `true` in lock condition. `false` is unlock condition.
|
|
262
|
-
|
|
259
|
+
[/KeyguardStateMonitor[\n\s]+mIsShowing=true/, /\s+mInputRestricted=true/].every((x) => x.test(dumpsys)));
|
|
263
260
|
}
|
|
264
261
|
/**
|
|
265
262
|
* Checks screenState has SCREEN_STATE_OFF in dumpsys output to determine
|
|
@@ -279,10 +276,10 @@ function isScreenStateOff(dumpsys) {
|
|
|
279
276
|
*/
|
|
280
277
|
function buildCommand(verb, oldCredential = null, ...args) {
|
|
281
278
|
const cmd = ['locksettings', verb];
|
|
282
|
-
if (oldCredential && !
|
|
279
|
+
if (oldCredential && !support_1.util.isEmpty(oldCredential)) {
|
|
283
280
|
cmd.push('--old', oldCredential);
|
|
284
281
|
}
|
|
285
|
-
if (
|
|
282
|
+
if (args.length > 0) {
|
|
286
283
|
cmd.push(...args);
|
|
287
284
|
}
|
|
288
285
|
return cmd;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lockmgmt.js","sourceRoot":"","sources":["../../../lib/tools/lockmgmt.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"lockmgmt.js","sourceRoot":"","sources":["../../../lib/tools/lockmgmt.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logcat-commands.d.ts","sourceRoot":"","sources":["../../../lib/tools/logcat-commands.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"logcat-commands.d.ts","sourceRoot":"","sources":["../../../lib/tools/logcat-commands.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EAAC,UAAU,EAAE,QAAQ,EAAE,cAAc,EAAC,MAAM,SAAS,CAAC;AAElE;;;;;GAKG;AACH,wBAAsB,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,GAAE,UAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAajF;AAED;;;GAGG;AACH,wBAAsB,UAAU,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAUzD;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,GAAG,GAAG,QAAQ,EAAE,CAMnD;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,cAAc,GAAG,IAAI,CAM3E;AAED;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,cAAc,GAAG,IAAI,CAM9E"}
|
|
@@ -1,14 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.startLogcat = startLogcat;
|
|
7
4
|
exports.stopLogcat = stopLogcat;
|
|
8
5
|
exports.getLogcatLogs = getLogcatLogs;
|
|
9
6
|
exports.setLogcatListener = setLogcatListener;
|
|
10
7
|
exports.removeLogcatListener = removeLogcatListener;
|
|
11
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
12
8
|
const logcat_1 = require("../logcat");
|
|
13
9
|
/**
|
|
14
10
|
* Start the logcat process to gather logs.
|
|
@@ -17,7 +13,7 @@ const logcat_1 = require("../logcat");
|
|
|
17
13
|
* @throws {Error} If restart fails.
|
|
18
14
|
*/
|
|
19
15
|
async function startLogcat(opts = {}) {
|
|
20
|
-
if (
|
|
16
|
+
if (this.logcat) {
|
|
21
17
|
throw new Error("Trying to start logcat capture but it's already started!");
|
|
22
18
|
}
|
|
23
19
|
this.logcat = new logcat_1.Logcat({
|
|
@@ -35,7 +31,7 @@ async function startLogcat(opts = {}) {
|
|
|
35
31
|
*/
|
|
36
32
|
async function stopLogcat() {
|
|
37
33
|
const logcat = this.logcat;
|
|
38
|
-
if (!logcat
|
|
34
|
+
if (!logcat) {
|
|
39
35
|
return;
|
|
40
36
|
}
|
|
41
37
|
try {
|
|
@@ -54,7 +50,7 @@ async function stopLogcat() {
|
|
|
54
50
|
*/
|
|
55
51
|
function getLogcatLogs() {
|
|
56
52
|
const logcat = this.logcat;
|
|
57
|
-
if (!logcat
|
|
53
|
+
if (!logcat) {
|
|
58
54
|
throw new Error(`Can't get logcat logs since logcat hasn't started`);
|
|
59
55
|
}
|
|
60
56
|
return logcat.getLogs();
|
|
@@ -67,7 +63,7 @@ function getLogcatLogs() {
|
|
|
67
63
|
*/
|
|
68
64
|
function setLogcatListener(listener) {
|
|
69
65
|
const logcat = this.logcat;
|
|
70
|
-
if (!logcat
|
|
66
|
+
if (!logcat) {
|
|
71
67
|
throw new Error("Logcat process hasn't been started");
|
|
72
68
|
}
|
|
73
69
|
logcat.on('output', listener);
|
|
@@ -82,7 +78,7 @@ function setLogcatListener(listener) {
|
|
|
82
78
|
*/
|
|
83
79
|
function removeLogcatListener(listener) {
|
|
84
80
|
const logcat = this.logcat;
|
|
85
|
-
if (!logcat
|
|
81
|
+
if (!logcat) {
|
|
86
82
|
throw new Error("Logcat process hasn't been started");
|
|
87
83
|
}
|
|
88
84
|
logcat.removeListener('output', listener);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logcat-commands.js","sourceRoot":"","sources":["../../../lib/tools/logcat-commands.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"logcat-commands.js","sourceRoot":"","sources":["../../../lib/tools/logcat-commands.ts"],"names":[],"mappings":";;AAUA,kCAaC;AAMD,gCAUC;AASD,sCAMC;AAQD,8CAMC;AAUD,oDAMC;AApFD,sCAAiC;AAIjC;;;;;GAKG;AACI,KAAK,UAAU,WAAW,CAAY,OAAmB,EAAE;IAChE,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;IAC9E,CAAC;IAED,IAAI,CAAC,MAAM,GAAG,IAAI,eAAM,CAAC;QACvB,GAAG,EAAE,IAAI,CAAC,UAAU;QACpB,KAAK,EAAE,KAAK;QACZ,UAAU,EAAE,KAAK;QACjB,sBAAsB,EAAE,CAAC,CAAC,IAAI,CAAC,sBAAsB;KACtD,CAAC,CAAC;IACH,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACrC,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC;AACnC,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,UAAU;IAC9B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IAC3B,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;IACT,CAAC;IACD,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,WAAW,EAAE,CAAC;IAC7B,CAAC;YAAS,CAAC;QACT,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;IAC1B,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,aAAa;IAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IAC3B,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;IACvE,CAAC;IACD,OAAO,MAAM,CAAC,OAAO,EAAE,CAAC;AAC1B,CAAC;AAED;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAY,QAAwB;IACnE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IAC3B,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IACxD,CAAC;IACD,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAChC,CAAC;AAED;;;;;;;GAOG;AACH,SAAgB,oBAAoB,CAAY,QAAwB;IACtE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IAC3B,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IACxD,CAAC;IACD,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAC5C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network-commands.d.ts","sourceRoot":"","sources":["../../../lib/tools/network-commands.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"network-commands.d.ts","sourceRoot":"","sources":["../../../lib/tools/network-commands.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EAAC,UAAU,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;AAElD;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAIjE;AAED;;;;;GAKG;AACH,wBAAsB,WAAW,CAC/B,IAAI,EAAE,GAAG,EACT,UAAU,EAAE,MAAM,GAAG,MAAM,EAC3B,UAAU,EAAE,MAAM,GAAG,MAAM,GAC1B,OAAO,CAAC,IAAI,CAAC,CAGf;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG7F;AAED;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAIjE;AAED;;;;;;GAMG;AACH,wBAAsB,WAAW,CAC/B,IAAI,EAAE,GAAG,EACT,UAAU,EAAE,MAAM,GAAG,MAAM,EAC3B,UAAU,EAAE,MAAM,GAAG,MAAM,GAC1B,OAAO,CAAC,IAAI,CAAC,CAGf;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG7F;AAED;;;;;;;GAOG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,GAAG,EACT,UAAU,EAAE,MAAM,GAAG,MAAM,EAC3B,UAAU,EAAE,MAAM,GAAG,MAAM,GAC1B,OAAO,CAAC,IAAI,CAAC,CAGf;AAED;;;;;;GAMG;AACH,wBAAsB,IAAI,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAMtD;AAED;;;;;;GAMG;AACH,wBAAsB,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,GAAE,UAAgB,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAgCxF"}
|
|
@@ -1,7 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.getForwardList = getForwardList;
|
|
7
4
|
exports.forwardPort = forwardPort;
|
|
@@ -13,7 +10,6 @@ exports.forwardAbstractPort = forwardAbstractPort;
|
|
|
13
10
|
exports.ping = ping;
|
|
14
11
|
exports.listPorts = listPorts;
|
|
15
12
|
const node_os_1 = require("node:os");
|
|
16
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
17
13
|
const logger_1 = require("../logger");
|
|
18
14
|
/**
|
|
19
15
|
* Get TCP port forwarding with adb on the device under test.
|
|
@@ -117,7 +113,7 @@ async function listPorts(family = '4') {
|
|
|
117
113
|
const sourceProcName = `/proc/net/tcp${family === '6' ? '6' : ''}`;
|
|
118
114
|
const output = await this.shell(['cat', sourceProcName]);
|
|
119
115
|
const lines = output.split('\n');
|
|
120
|
-
if (
|
|
116
|
+
if (!lines.length) {
|
|
121
117
|
logger_1.log.debug(output);
|
|
122
118
|
throw new Error(`Cannot parse the payload of ${sourceProcName}`);
|
|
123
119
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network-commands.js","sourceRoot":"","sources":["../../../lib/tools/network-commands.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"network-commands.js","sourceRoot":"","sources":["../../../lib/tools/network-commands.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-commands.d.ts","sourceRoot":"","sources":["../../../lib/tools/process-commands.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,QAAQ,CAAC;AAShC;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,CAWlE;AAED;;;;;;;GAOG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CA8BzF;AAED;;;;;GAKG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAgCpF;AAED;;;;;;GAMG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,GAAG,EACT,IAAI,EAAE,MAAM,EACZ,MAAM,GAAE,MAAkB,GACzB,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"process-commands.d.ts","sourceRoot":"","sources":["../../../lib/tools/process-commands.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,QAAQ,CAAC;AAShC;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,CAWlE;AAED;;;;;;;GAOG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CA8BzF;AAED;;;;;GAKG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAgCpF;AAED;;;;;;GAMG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,GAAG,EACT,IAAI,EAAE,MAAM,EACZ,MAAM,GAAE,MAAkB,GACzB,OAAO,CAAC,IAAI,CAAC,CAef;AAED;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,GAAG,EACT,GAAG,EAAE,MAAM,GAAG,MAAM,EACpB,MAAM,GAAE,MAAkB,GACzB,OAAO,CAAC,IAAI,CAAC,CA2Bf;AAED;;;;;;;GAOG;AACH,wBAAsB,aAAa,CAAC,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAEpF"}
|
|
@@ -1,7 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.listProcessStatus = listProcessStatus;
|
|
7
4
|
exports.getProcessNameById = getProcessNameById;
|
|
@@ -9,8 +6,8 @@ exports.getProcessIdsByName = getProcessIdsByName;
|
|
|
9
6
|
exports.killProcessesByName = killProcessesByName;
|
|
10
7
|
exports.killProcessByPID = killProcessByPID;
|
|
11
8
|
exports.processExists = processExists;
|
|
12
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
13
9
|
const logger_1 = require("../logger");
|
|
10
|
+
const support_1 = require("@appium/support");
|
|
14
11
|
const PID_COLUMN_TITLE = 'PID';
|
|
15
12
|
const PROCESS_NAME_COLUMN_TITLE = 'NAME';
|
|
16
13
|
const PS_TITLE_PATTERN = new RegExp(`^(.*\\b${PID_COLUMN_TITLE}\\b.*\\b${PROCESS_NAME_COLUMN_TITLE}\\b.*)$`, 'm');
|
|
@@ -23,7 +20,7 @@ const PS_TITLE_PATTERN = new RegExp(`^(.*\\b${PID_COLUMN_TITLE}\\b.*\\b${PROCESS
|
|
|
23
20
|
* @returns the output of `ps` command where all processes are included
|
|
24
21
|
*/
|
|
25
22
|
async function listProcessStatus() {
|
|
26
|
-
if (
|
|
23
|
+
if (typeof this._doesPsSupportAOption !== 'boolean') {
|
|
27
24
|
try {
|
|
28
25
|
this._doesPsSupportAOption = /^-A\b/m.test(await this.shell(['ps', '--help']));
|
|
29
26
|
}
|
|
@@ -104,7 +101,7 @@ async function getProcessIdsByName(name) {
|
|
|
104
101
|
}
|
|
105
102
|
}
|
|
106
103
|
}
|
|
107
|
-
return
|
|
104
|
+
return support_1.util.uniq(pids);
|
|
108
105
|
}
|
|
109
106
|
/**
|
|
110
107
|
* Kill all processes with the given name on the device under test.
|
|
@@ -117,7 +114,7 @@ async function killProcessesByName(name, signal = 'SIGTERM') {
|
|
|
117
114
|
try {
|
|
118
115
|
logger_1.log.debug(`Attempting to kill all ${name} processes`);
|
|
119
116
|
const pids = await this.getProcessIdsByName(name);
|
|
120
|
-
if (
|
|
117
|
+
if (pids.length === 0) {
|
|
121
118
|
logger_1.log.info(`No '${name}' process has been found`);
|
|
122
119
|
}
|
|
123
120
|
else {
|
|
@@ -126,7 +123,9 @@ async function killProcessesByName(name, signal = 'SIGTERM') {
|
|
|
126
123
|
}
|
|
127
124
|
catch (e) {
|
|
128
125
|
const err = e;
|
|
129
|
-
throw new Error(`Unable to kill ${name} processes. Original error: ${err.message}
|
|
126
|
+
throw new Error(`Unable to kill ${name} processes. Original error: ${err.message}`, {
|
|
127
|
+
cause: e,
|
|
128
|
+
});
|
|
130
129
|
}
|
|
131
130
|
}
|
|
132
131
|
/**
|
|
@@ -147,10 +146,10 @@ async function killProcessByPID(pid, signal = 'SIGTERM') {
|
|
|
147
146
|
}
|
|
148
147
|
catch (e) {
|
|
149
148
|
const err = e;
|
|
150
|
-
if (
|
|
149
|
+
if ((err.stderr ?? '').includes(noProcessFlag)) {
|
|
151
150
|
return;
|
|
152
151
|
}
|
|
153
|
-
if (!
|
|
152
|
+
if (!(err.stderr ?? '').includes('Operation not permitted')) {
|
|
154
153
|
throw err;
|
|
155
154
|
}
|
|
156
155
|
logger_1.log.info(`Cannot kill PID ${pid} due to insufficient permissions. Retrying as root`);
|
|
@@ -161,7 +160,7 @@ async function killProcessByPID(pid, signal = 'SIGTERM') {
|
|
|
161
160
|
}
|
|
162
161
|
catch (e1) {
|
|
163
162
|
const err1 = e1;
|
|
164
|
-
if (
|
|
163
|
+
if ((err1.stderr ?? '').includes(noProcessFlag)) {
|
|
165
164
|
return;
|
|
166
165
|
}
|
|
167
166
|
throw err1;
|
|
@@ -177,6 +176,6 @@ async function killProcessByPID(pid, signal = 'SIGTERM') {
|
|
|
177
176
|
* @throws {Error} If the given process name is not a valid class name.
|
|
178
177
|
*/
|
|
179
178
|
async function processExists(processName) {
|
|
180
|
-
return
|
|
179
|
+
return (await this.getProcessIdsByName(processName)).length > 0;
|
|
181
180
|
}
|
|
182
181
|
//# sourceMappingURL=process-commands.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-commands.js","sourceRoot":"","sources":["../../../lib/tools/process-commands.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"process-commands.js","sourceRoot":"","sources":["../../../lib/tools/process-commands.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { SubProcess } from 'teen_process';
|
|
2
|
-
import _ from 'lodash';
|
|
3
2
|
import type { ADB } from '../adb';
|
|
4
3
|
import type { ConnectedDevicesOptions, Device, AvdLaunchOptions, Version, RootResult, ShellExecOptions, SpecialAdbExecOptions, TFullOutputOption, ExecResult } from './types';
|
|
5
4
|
/**
|
|
@@ -16,7 +15,9 @@ export declare function getSdkBinaryPath(this: ADB, binaryName: string): Promise
|
|
|
16
15
|
* @returns The binary name with appropriate extension for the current OS
|
|
17
16
|
*/
|
|
18
17
|
declare function _getBinaryNameForOS(binaryName: string): string;
|
|
19
|
-
export declare const getBinaryNameForOS: typeof _getBinaryNameForOS &
|
|
18
|
+
export declare const getBinaryNameForOS: typeof _getBinaryNameForOS & {
|
|
19
|
+
cache: Map<unknown, string>;
|
|
20
|
+
};
|
|
20
21
|
/**
|
|
21
22
|
* Retrieve full path to the given binary and caches it into `binaries`
|
|
22
23
|
* property of the current ADB instance.
|
|
@@ -80,7 +81,9 @@ export declare function killServer(this: ADB): Promise<void>;
|
|
|
80
81
|
*
|
|
81
82
|
* @returns True if token was reset successfully, false otherwise
|
|
82
83
|
*/
|
|
83
|
-
export declare const resetTelnetAuthToken: (() => Promise<boolean>) &
|
|
84
|
+
export declare const resetTelnetAuthToken: (() => Promise<boolean>) & {
|
|
85
|
+
cache: Map<unknown, Promise<boolean>>;
|
|
86
|
+
};
|
|
84
87
|
/**
|
|
85
88
|
* Execute the given emulator command using _adb emu_ tool.
|
|
86
89
|
*
|
|
@@ -216,7 +219,9 @@ export declare function launchAVD(this: ADB, avdName: string, opts?: AvdLaunchOp
|
|
|
216
219
|
* @returns Version information object
|
|
217
220
|
* @throws {Error} If error occurs while getting adb version
|
|
218
221
|
*/
|
|
219
|
-
export declare const getVersion: ((this: ADB) => Promise<Version>) &
|
|
222
|
+
export declare const getVersion: ((this: ADB) => Promise<Version>) & {
|
|
223
|
+
cache: Map<unknown, Promise<Version>>;
|
|
224
|
+
};
|
|
220
225
|
/**
|
|
221
226
|
* Check if the current emulator is ready to accept further commands (booting completed).
|
|
222
227
|
*
|
|
@@ -311,6 +316,8 @@ export declare function toAvdLocaleArgs(language: string | null, country: string
|
|
|
311
316
|
* @param sdkRoot - The Android SDK root directory path
|
|
312
317
|
* @returns Array of build-tools directory paths (newest first)
|
|
313
318
|
*/
|
|
314
|
-
export declare const getBuildToolsDirs: ((sdkRoot: string) => Promise<string[]>) &
|
|
319
|
+
export declare const getBuildToolsDirs: ((sdkRoot: string) => Promise<string[]>) & {
|
|
320
|
+
cache: Map<unknown, Promise<string[]>>;
|
|
321
|
+
};
|
|
315
322
|
export {};
|
|
316
323
|
//# sourceMappingURL=system-calls.d.ts.map
|