appium-espresso-driver 8.6.2 → 9.0.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.
Files changed (123) hide show
  1. package/CHANGELOG.md +10 -0
  2. package/build/lib/commands/actions.d.ts +1 -1
  3. package/build/lib/commands/actions.d.ts.map +1 -1
  4. package/build/lib/commands/actions.js +1 -4
  5. package/build/lib/commands/actions.js.map +1 -1
  6. package/build/lib/commands/app-install.d.ts +1 -1
  7. package/build/lib/commands/app-install.d.ts.map +1 -1
  8. package/build/lib/commands/app-install.js +31 -41
  9. package/build/lib/commands/app-install.js.map +1 -1
  10. package/build/lib/commands/app-management.d.ts +1 -1
  11. package/build/lib/commands/app-management.d.ts.map +1 -1
  12. package/build/lib/commands/app-management.js +8 -12
  13. package/build/lib/commands/app-management.js.map +1 -1
  14. package/build/lib/commands/clipboard.d.ts +1 -1
  15. package/build/lib/commands/clipboard.d.ts.map +1 -1
  16. package/build/lib/commands/clipboard.js +2 -6
  17. package/build/lib/commands/clipboard.js.map +1 -1
  18. package/build/lib/commands/context.d.ts +1 -1
  19. package/build/lib/commands/context.d.ts.map +1 -1
  20. package/build/lib/commands/context.js +2 -6
  21. package/build/lib/commands/context.js.map +1 -1
  22. package/build/lib/commands/element.d.ts +1 -1
  23. package/build/lib/commands/element.d.ts.map +1 -1
  24. package/build/lib/commands/element.js +17 -30
  25. package/build/lib/commands/element.js.map +1 -1
  26. package/build/lib/commands/idling-resources.d.ts +1 -1
  27. package/build/lib/commands/idling-resources.d.ts.map +1 -1
  28. package/build/lib/commands/idling-resources.js +4 -10
  29. package/build/lib/commands/idling-resources.js.map +1 -1
  30. package/build/lib/commands/misc.d.ts +2 -2
  31. package/build/lib/commands/misc.d.ts.map +1 -1
  32. package/build/lib/commands/misc.js +14 -25
  33. package/build/lib/commands/misc.js.map +1 -1
  34. package/build/lib/commands/screenshot.d.ts +2 -2
  35. package/build/lib/commands/screenshot.d.ts.map +1 -1
  36. package/build/lib/commands/screenshot.js +2 -6
  37. package/build/lib/commands/screenshot.js.map +1 -1
  38. package/build/lib/commands/server/builder.js +24 -33
  39. package/build/lib/commands/server/builder.js.map +1 -1
  40. package/build/lib/commands/server/constants.js +5 -8
  41. package/build/lib/commands/server/constants.js.map +1 -1
  42. package/build/lib/commands/server/index.d.ts +4 -4
  43. package/build/lib/commands/server/index.d.ts.map +1 -1
  44. package/build/lib/commands/server/index.js +4 -16
  45. package/build/lib/commands/server/index.js.map +1 -1
  46. package/build/lib/commands/server/runner.d.ts +2 -2
  47. package/build/lib/commands/server/runner.d.ts.map +1 -1
  48. package/build/lib/commands/server/runner.js +59 -98
  49. package/build/lib/commands/server/runner.js.map +1 -1
  50. package/build/lib/commands/server/startup.d.ts +1 -1
  51. package/build/lib/commands/server/startup.d.ts.map +1 -1
  52. package/build/lib/commands/server/startup.js +16 -22
  53. package/build/lib/commands/server/startup.js.map +1 -1
  54. package/build/lib/commands/services.d.ts +1 -1
  55. package/build/lib/commands/services.d.ts.map +1 -1
  56. package/build/lib/commands/services.js +2 -6
  57. package/build/lib/commands/services.js.map +1 -1
  58. package/build/lib/commands/types.js +1 -2
  59. package/build/lib/constraints.js +3 -6
  60. package/build/lib/constraints.js.map +1 -1
  61. package/build/lib/doctor/optional-checks.js +3 -6
  62. package/build/lib/doctor/optional-checks.js.map +1 -1
  63. package/build/lib/doctor/required-checks.js +18 -25
  64. package/build/lib/doctor/required-checks.js.map +1 -1
  65. package/build/lib/driver.d.ts +12 -12
  66. package/build/lib/driver.d.ts.map +1 -1
  67. package/build/lib/driver.js +36 -73
  68. package/build/lib/driver.js.map +1 -1
  69. package/build/lib/execute-method-map.js +3 -6
  70. package/build/lib/execute-method-map.js.map +1 -1
  71. package/build/lib/index.d.ts +1 -1
  72. package/build/lib/index.d.ts.map +1 -1
  73. package/build/lib/index.js +3 -6
  74. package/build/lib/index.js.map +1 -1
  75. package/build/lib/logger.js +2 -5
  76. package/build/lib/logger.js.map +1 -1
  77. package/build/lib/method-map.js +3 -6
  78. package/build/lib/method-map.js.map +1 -1
  79. package/build/lib/types.d.ts +1 -1
  80. package/build/lib/types.d.ts.map +1 -1
  81. package/build/lib/types.js +1 -2
  82. package/build/lib/utils/app.js +1 -4
  83. package/build/lib/utils/app.js.map +1 -1
  84. package/build/lib/utils/index.d.ts +3 -3
  85. package/build/lib/utils/index.d.ts.map +1 -1
  86. package/build/lib/utils/index.js +3 -12
  87. package/build/lib/utils/index.js.map +1 -1
  88. package/build/lib/utils/package.d.ts.map +1 -1
  89. package/build/lib/utils/package.js +19 -24
  90. package/build/lib/utils/package.js.map +1 -1
  91. package/build/lib/utils/predicates.js +3 -8
  92. package/build/lib/utils/predicates.js.map +1 -1
  93. package/espresso-server/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk +0 -0
  94. package/espresso-server/buildSrc/.gradle/9.6.0/executionHistory/executionHistory.bin +0 -0
  95. package/espresso-server/buildSrc/.gradle/9.6.0/executionHistory/executionHistory.lock +0 -0
  96. package/espresso-server/buildSrc/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
  97. package/espresso-server/buildSrc/.gradle/buildOutputCleanup/cache.properties +1 -1
  98. package/espresso-server/buildSrc/.gradle/file-system.probe +0 -0
  99. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/last-build.bin +0 -0
  100. package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/helpers/Version.kt +1 -1
  101. package/lib/commands/actions.ts +1 -1
  102. package/lib/commands/app-install.ts +4 -4
  103. package/lib/commands/app-management.ts +3 -3
  104. package/lib/commands/clipboard.ts +1 -1
  105. package/lib/commands/context.ts +1 -1
  106. package/lib/commands/element.ts +3 -3
  107. package/lib/commands/idling-resources.ts +1 -1
  108. package/lib/commands/misc.ts +4 -4
  109. package/lib/commands/screenshot.ts +2 -2
  110. package/lib/commands/server/builder.ts +2 -2
  111. package/lib/commands/server/index.ts +4 -4
  112. package/lib/commands/server/runner.ts +8 -6
  113. package/lib/commands/server/startup.ts +4 -4
  114. package/lib/commands/services.ts +1 -1
  115. package/lib/doctor/required-checks.ts +1 -1
  116. package/lib/driver.ts +19 -19
  117. package/lib/index.ts +1 -1
  118. package/lib/logger.ts +1 -1
  119. package/lib/types.ts +1 -1
  120. package/lib/utils/index.ts +3 -3
  121. package/lib/utils/package.ts +5 -3
  122. package/npm-shrinkwrap.json +33 -54
  123. package/package.json +14 -7
@@ -1,65 +1,26 @@
1
- "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || (function () {
19
- var ownKeys = function(o) {
20
- ownKeys = Object.getOwnPropertyNames || function (o) {
21
- var ar = [];
22
- for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23
- return ar;
24
- };
25
- return ownKeys(o);
26
- };
27
- return function (mod) {
28
- if (mod && mod.__esModule) return mod;
29
- var result = {};
30
- if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31
- __setModuleDefault(result, mod);
32
- return result;
33
- };
34
- })();
35
- var __importDefault = (this && this.__importDefault) || function (mod) {
36
- return (mod && mod.__esModule) ? mod : { "default": mod };
37
- };
38
- Object.defineProperty(exports, "__esModule", { value: true });
39
- exports.EspressoRunner = void 0;
40
- exports.copyGradleProjectRecursively = copyGradleProjectRecursively;
41
- const driver_1 = require("appium/driver");
42
- const asyncbox_1 = require("asyncbox");
43
- const node_path_1 = __importDefault(require("node:path"));
44
- const support_1 = require("appium/support");
45
- const utils_1 = require("../../utils");
46
- const builder_1 = require("./builder");
47
- const constants_1 = require("./constants");
48
- const axios_1 = __importDefault(require("axios"));
49
- const semver = __importStar(require("semver"));
50
- class EspressoProxy extends driver_1.JWProxy {
1
+ import { JWProxy, errors } from 'appium/driver.js';
2
+ import { sleep, waitForCondition } from 'asyncbox';
3
+ import path from 'node:path';
4
+ import { fileURLToPath } from 'node:url';
5
+ import { fs, node, util, timing } from 'appium/support.js';
6
+ import { getPackageInfoSync, getPackageInfo, isPlainObject } from '../../utils/index.js';
7
+ import { ServerBuilder, buildServerSigningConfig } from './builder.js';
8
+ import { ESPRESSO_SERVER_LAUNCH_TIMEOUT_MS, TARGET_PACKAGE_CONTAINER, TEST_APK_PKG, } from './constants.js';
9
+ import axios from 'axios';
10
+ import * as semver from 'semver';
11
+ class EspressoProxy extends JWProxy {
51
12
  instrumentationState;
52
13
  async proxyCommand(url, method, body = null) {
53
14
  const { crashed, exited } = this.instrumentationState;
54
15
  if (exited) {
55
- throw new driver_1.errors.InvalidContextError(`'${method} ${url}' cannot be proxied to Espresso server because ` +
16
+ throw new errors.InvalidContextError(`'${method} ${url}' cannot be proxied to Espresso server because ` +
56
17
  `the instrumentation process has ${crashed ? 'crashed' : 'been unexpectedly terminated'}. ` +
57
18
  `Check the Appium server log and the logcat output for more details`);
58
19
  }
59
20
  return await super.proxyCommand(url, method, body);
60
21
  }
61
22
  }
62
- class EspressoRunner {
23
+ export class EspressoRunner {
63
24
  host;
64
25
  systemPort;
65
26
  appPackage;
@@ -104,12 +65,12 @@ class EspressoRunner {
104
65
  exited: false,
105
66
  crashed: false,
106
67
  };
107
- const { manifestPayload } = (0, utils_1.getPackageInfoSync)();
108
- const modServerName = support_1.fs.sanitizeName(`${constants_1.TEST_APK_PKG}_${manifestPayload.version}_${this.appPackage}_${this.adb.curDeviceId}.apk`, { replacement: '-' });
109
- this.modServerPath = node_path_1.default.resolve(this.tmpDir, modServerName);
68
+ const { manifestPayload } = getPackageInfoSync();
69
+ const modServerName = fs.sanitizeName(`${TEST_APK_PKG}_${manifestPayload.version}_${this.appPackage}_${this.adb.curDeviceId}.apk`, { replacement: '-' });
70
+ this.modServerPath = path.resolve(this.tmpDir, modServerName);
110
71
  this.showGradleLog = opts.showGradleLog;
111
72
  this.espressoBuildConfig = opts.espressoBuildConfig;
112
- this.serverLaunchTimeout = opts.serverLaunchTimeout || constants_1.ESPRESSO_SERVER_LAUNCH_TIMEOUT_MS;
73
+ this.serverLaunchTimeout = opts.serverLaunchTimeout || ESPRESSO_SERVER_LAUNCH_TIMEOUT_MS;
113
74
  this.androidInstallTimeout = opts.androidInstallTimeout;
114
75
  this.disableSuppressAccessibilityService = opts.disableSuppressAccessibilityService;
115
76
  // Espresso Server app needs to be signed with same keyStore as appPackage
@@ -118,7 +79,7 @@ class EspressoRunner {
118
79
  opts.keystorePassword &&
119
80
  opts.keyAlias &&
120
81
  opts.keyPassword) {
121
- this.signingConfig = (0, builder_1.buildServerSigningConfig)({
82
+ this.signingConfig = buildServerSigningConfig({
122
83
  keystoreFile: opts.keystorePath,
123
84
  keystorePassword: opts.keystorePassword,
124
85
  keyAlias: opts.keyAlias,
@@ -130,11 +91,11 @@ class EspressoRunner {
130
91
  }
131
92
  }
132
93
  async isAppPackageChanged() {
133
- if (!(await this.adb.fileExists(constants_1.TARGET_PACKAGE_CONTAINER))) {
94
+ if (!(await this.adb.fileExists(TARGET_PACKAGE_CONTAINER))) {
134
95
  this.log.debug('The previous target application package is unknown');
135
96
  return true;
136
97
  }
137
- const previousAppPackage = (await this.adb.shell(['cat', constants_1.TARGET_PACKAGE_CONTAINER])).trim();
98
+ const previousAppPackage = (await this.adb.shell(['cat', TARGET_PACKAGE_CONTAINER])).trim();
138
99
  this.log.debug(`The previous target application package was '${previousAppPackage}'. ` +
139
100
  `The current package is '${this.appPackage}'`);
140
101
  return previousAppPackage !== this.appPackage;
@@ -144,19 +105,19 @@ class EspressoRunner {
144
105
  * Each adb command uses default timeout by them.
145
106
  */
146
107
  async installServer() {
147
- const appState = await this.adb.getApplicationInstallState(this.modServerPath, constants_1.TEST_APK_PKG);
108
+ const appState = await this.adb.getApplicationInstallState(this.modServerPath, TEST_APK_PKG);
148
109
  const shouldUninstallApp = [
149
110
  this.adb.APP_INSTALL_STATE.OLDER_VERSION_INSTALLED,
150
111
  this.adb.APP_INSTALL_STATE.NEWER_VERSION_INSTALLED,
151
112
  ].includes(appState);
152
113
  const shouldInstallApp = shouldUninstallApp || [this.adb.APP_INSTALL_STATE.NOT_INSTALLED].includes(appState);
153
114
  if (shouldUninstallApp) {
154
- this.log.info(`Uninstalling Espresso Test Server apk from the target device (pkg: '${constants_1.TEST_APK_PKG}')`);
115
+ this.log.info(`Uninstalling Espresso Test Server apk from the target device (pkg: '${TEST_APK_PKG}')`);
155
116
  try {
156
- await this.adb.uninstallApk(constants_1.TEST_APK_PKG);
117
+ await this.adb.uninstallApk(TEST_APK_PKG);
157
118
  }
158
119
  catch (err) {
159
- this.log.warn(`Error uninstalling '${constants_1.TEST_APK_PKG}': ${err.message}`);
120
+ this.log.warn(`Error uninstalling '${TEST_APK_PKG}': ${err.message}`);
160
121
  }
161
122
  }
162
123
  if (shouldInstallApp) {
@@ -166,7 +127,7 @@ class EspressoRunner {
166
127
  replace: false,
167
128
  timeout: this.androidInstallTimeout,
168
129
  });
169
- this.log.info(`Installed Espresso Test Server apk '${this.modServerPath}' (pkg: '${constants_1.TEST_APK_PKG}')`);
130
+ this.log.info(`Installed Espresso Test Server apk '${this.modServerPath}' (pkg: '${TEST_APK_PKG}')`);
170
131
  }
171
132
  catch (err) {
172
133
  throw this.log.errorWithException(`Cannot install '${this.modServerPath}' because of '${err.message}'`);
@@ -182,18 +143,18 @@ class EspressoRunner {
182
143
  this.log.info(`Forcing Espresso server rebuild because of changed application package`);
183
144
  rebuild = true;
184
145
  }
185
- if (rebuild && (await support_1.fs.exists(this.modServerPath))) {
146
+ if (rebuild && (await fs.exists(this.modServerPath))) {
186
147
  this.log.debug(`Deleting the obsolete Espresso server package '${this.modServerPath}'`);
187
- await support_1.fs.unlink(this.modServerPath);
148
+ await fs.unlink(this.modServerPath);
188
149
  }
189
- if (!(await support_1.fs.exists(this.modServerPath))) {
150
+ if (!(await fs.exists(this.modServerPath))) {
190
151
  await this.buildNewModServer();
191
152
  }
192
153
  const wasSigned = await this.adb.checkApkCert(this.modServerPath);
193
154
  if (!wasSigned) {
194
155
  await this.adb.sign(this.modServerPath);
195
156
  }
196
- if ((rebuild || !wasSigned) && (await this.adb.uninstallApk(constants_1.TEST_APK_PKG))) {
157
+ if ((rebuild || !wasSigned) && (await this.adb.uninstallApk(TEST_APK_PKG))) {
197
158
  this.log.info('Uninstalled the obsolete Espresso server package from the device under test');
198
159
  }
199
160
  await this.installServer();
@@ -202,9 +163,9 @@ class EspressoRunner {
202
163
  let buildConfiguration = {};
203
164
  if (this.espressoBuildConfig) {
204
165
  let buildConfigurationStr;
205
- if (await support_1.fs.exists(this.espressoBuildConfig)) {
166
+ if (await fs.exists(this.espressoBuildConfig)) {
206
167
  this.log.info(`Loading the build configuration from '${this.espressoBuildConfig}'`);
207
- buildConfigurationStr = await support_1.fs.readFile(this.espressoBuildConfig, 'utf8');
168
+ buildConfigurationStr = await fs.readFile(this.espressoBuildConfig, 'utf8');
208
169
  }
209
170
  else {
210
171
  this.log.info(`Loading the build configuration from 'espressoBuildConfig' capability`);
@@ -218,27 +179,27 @@ class EspressoRunner {
218
179
  throw e;
219
180
  }
220
181
  }
221
- const dirName = support_1.fs.sanitizeName(`espresso-server-${this.adb.curDeviceId}`, {
182
+ const dirName = fs.sanitizeName(`espresso-server-${this.adb.curDeviceId}`, {
222
183
  replacement: '-',
223
184
  });
224
- const serverPath = node_path_1.default.resolve(this.tmpDir, dirName);
185
+ const serverPath = path.resolve(this.tmpDir, dirName);
225
186
  this.log.info(`Building espresso server in '${serverPath}'`);
226
187
  this.log.debug(`The build folder root could be customized by changing the 'tmpDir' capability`);
227
- await support_1.fs.rimraf(serverPath);
228
- await support_1.fs.mkdirp(serverPath);
188
+ await fs.rimraf(serverPath);
189
+ await fs.mkdirp(serverPath);
229
190
  this.log.debug(`Copying espresso server template from ('${getTestServerRoot()}' to '${serverPath}')`);
230
191
  await copyGradleProjectRecursively(getTestServerRoot(), serverPath);
231
192
  this.log.debug('Bulding espresso server');
232
- await new builder_1.ServerBuilder(this.log, {
193
+ await new ServerBuilder(this.log, {
233
194
  serverPath,
234
195
  buildConfiguration,
235
196
  showGradleLog: this.showGradleLog,
236
197
  testAppPackage: this.appPackage,
237
198
  signingConfig: this.signingConfig,
238
199
  }).build();
239
- const apkPath = node_path_1.default.resolve(serverPath, 'app', 'build', 'outputs', 'apk', 'androidTest', 'debug', 'app-debug-androidTest.apk');
200
+ const apkPath = path.resolve(serverPath, 'app', 'build', 'outputs', 'apk', 'androidTest', 'debug', 'app-debug-androidTest.apk');
240
201
  this.log.debug(`Copying built apk from '${apkPath}' to '${this.modServerPath}'`);
241
- await support_1.fs.copyFile(apkPath, this.modServerPath);
202
+ await fs.copyFile(apkPath, this.modServerPath);
242
203
  }
243
204
  async startSession(caps) {
244
205
  await this.cleanupSessionLeftovers();
@@ -257,8 +218,8 @@ class EspressoRunner {
257
218
  if (typeof this.disableSuppressAccessibilityService === 'boolean') {
258
219
  cmd.push('-e', 'DISABLE_SUPPRESS_ACCESSIBILITY_SERVICES', String(this.disableSuppressAccessibilityService));
259
220
  }
260
- cmd.push(`${constants_1.TEST_APK_PKG}/androidx.test.runner.AndroidJUnitRunner`);
261
- const { manifestPayload } = await (0, utils_1.getPackageInfo)();
221
+ cmd.push(`${TEST_APK_PKG}/androidx.test.runner.AndroidJUnitRunner`);
222
+ const { manifestPayload } = await getPackageInfo();
262
223
  this.log.info(`Starting Espresso Server v${manifestPayload.version} with cmd: adb ${cmd.join(' ')}`);
263
224
  let hasSocketError = false;
264
225
  // start the instrumentation process
@@ -287,11 +248,11 @@ class EspressoRunner {
287
248
  this.jwproxy.instrumentationState.crashed = true;
288
249
  }
289
250
  });
290
- const timer = new support_1.timing.Timer().start();
251
+ const timer = new timing.Timer().start();
291
252
  await this.instProcess.start(0);
292
253
  this.log.info(`Waiting up to ${this.serverLaunchTimeout}ms for Espresso server to be online`);
293
254
  try {
294
- await (0, asyncbox_1.waitForCondition)(async () => {
255
+ await waitForCondition(async () => {
295
256
  if (hasSocketError) {
296
257
  throw this.log.errorWithException(`Espresso server has failed to start due to an unexpected exception. ` +
297
258
  `Make sure the 'INTERNET' permission is requested in the Android manifest of your ` +
@@ -350,7 +311,7 @@ class EspressoRunner {
350
311
  async cleanupSessionLeftovers() {
351
312
  this.log.debug('Performing cleanup of automation leftovers');
352
313
  try {
353
- const { value } = (await (0, axios_1.default)({
314
+ const { value } = (await axios({
354
315
  url: `http://${this.host}:${this.systemPort}/sessions`,
355
316
  timeout: 500,
356
317
  })).data;
@@ -358,12 +319,12 @@ class EspressoRunner {
358
319
  if (activeSessionIds.length) {
359
320
  this.log.debug(`The following obsolete sessions are still running: ${JSON.stringify(activeSessionIds)}`);
360
321
  this.log.debug('Cleaning up the obsolete sessions');
361
- await Promise.all(activeSessionIds.map((id) => (0, axios_1.default)({
322
+ await Promise.all(activeSessionIds.map((id) => axios({
362
323
  url: `http://${this.host}:${this.systemPort}/session/${id}`,
363
324
  method: 'DELETE',
364
325
  })));
365
326
  // Let all sessions to be properly terminated before continuing
366
- await (0, asyncbox_1.sleep)(1000);
327
+ await sleep(1000);
367
328
  }
368
329
  else {
369
330
  this.log.debug('No obsolete sessions have been detected');
@@ -374,11 +335,11 @@ class EspressoRunner {
374
335
  }
375
336
  }
376
337
  async recordTargetAppPackage() {
377
- await this.adb.shell([`echo "${this.appPackage}" > "${constants_1.TARGET_PACKAGE_CONTAINER}"`]);
378
- this.log.info(`Recorded the target application package '${this.appPackage}' to ${constants_1.TARGET_PACKAGE_CONTAINER}`);
338
+ await this.adb.shell([`echo "${this.appPackage}" > "${TARGET_PACKAGE_CONTAINER}"`]);
339
+ this.log.info(`Recorded the target application package '${this.appPackage}' to ${TARGET_PACKAGE_CONTAINER}`);
379
340
  }
380
341
  async _verifyServerStatus(driverVersion, serverStatus) {
381
- if (!(0, utils_1.isPlainObject)(serverStatus) || !(0, utils_1.isPlainObject)(serverStatus.build)) {
342
+ if (!isPlainObject(serverStatus) || !isPlainObject(serverStatus.build)) {
382
343
  throw this.log.errorWithException(`The Espresso server version integrated with the application under test is not compatible ` +
383
344
  `with the current driver version '${driverVersion}'.`);
384
345
  }
@@ -415,34 +376,34 @@ class EspressoRunner {
415
376
  return true;
416
377
  }
417
378
  }
418
- exports.EspressoRunner = EspressoRunner;
419
379
  function requireOption(opts, key) {
420
- if (!support_1.util.hasValue(opts[key])) {
380
+ if (!util.hasValue(opts[key])) {
421
381
  throw new Error(`Option '${key}' is required!`);
422
382
  }
423
383
  return opts[key];
424
384
  }
425
385
  const MODULE_NAME = 'appium-espresso-driver';
386
+ const FILENAME = fileURLToPath(import.meta.url);
426
387
  let testServerRoot;
427
388
  /**
428
389
  * Recursively copy all files except build directories contents
429
390
  * @param sourceBaseDir directory to copy files from
430
391
  * @param targetBaseDir directory to copy files to
431
392
  */
432
- async function copyGradleProjectRecursively(sourceBaseDir, targetBaseDir) {
393
+ export async function copyGradleProjectRecursively(sourceBaseDir, targetBaseDir) {
433
394
  // @ts-ignore it is ok to have the async callback
434
- await support_1.fs.walkDir(sourceBaseDir, true, async (itemPath, isDirectory) => {
435
- const relativePath = node_path_1.default.relative(sourceBaseDir, itemPath);
436
- const targetPath = node_path_1.default.resolve(targetBaseDir, relativePath);
437
- const isInGradleBuildDir = `${node_path_1.default.sep}${itemPath}`.includes(`${node_path_1.default.sep}build${node_path_1.default.sep}`);
395
+ await fs.walkDir(sourceBaseDir, true, async (itemPath, isDirectory) => {
396
+ const relativePath = path.relative(sourceBaseDir, itemPath);
397
+ const targetPath = path.resolve(targetBaseDir, relativePath);
398
+ const isInGradleBuildDir = `${path.sep}${itemPath}`.includes(`${path.sep}build${path.sep}`);
438
399
  if (isInGradleBuildDir) {
439
400
  return false;
440
401
  }
441
402
  if (isDirectory) {
442
- await support_1.fs.mkdirp(targetPath);
403
+ await fs.mkdirp(targetPath);
443
404
  }
444
405
  else {
445
- await support_1.fs.copyFile(itemPath, targetPath);
406
+ await fs.copyFile(itemPath, targetPath);
446
407
  }
447
408
  return false;
448
409
  });
@@ -450,11 +411,11 @@ async function copyGradleProjectRecursively(sourceBaseDir, targetBaseDir) {
450
411
  /** Root path of the bundled Espresso server Gradle project. */
451
412
  function getTestServerRoot() {
452
413
  if (testServerRoot === undefined) {
453
- const moduleRoot = support_1.node.getModuleRootSync(MODULE_NAME, __filename);
414
+ const moduleRoot = node.getModuleRootSync(MODULE_NAME, FILENAME);
454
415
  if (!moduleRoot) {
455
416
  throw new Error(`Cannot find the root folder of the ${MODULE_NAME} Node.js module`);
456
417
  }
457
- testServerRoot = node_path_1.default.join(moduleRoot, 'espresso-server');
418
+ testServerRoot = path.join(moduleRoot, 'espresso-server');
458
419
  }
459
420
  return testServerRoot;
460
421
  }
@@ -1 +1 @@
1
- {"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../../lib/commands/server/runner.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgiBA,oEAqBC;AArjBD,0CAA8C;AAC9C,uCAAiD;AACjD,0DAA6B;AAC7B,4CAAsD;AACtD,uCAA8E;AAC9E,uCAA4F;AAC5F,2CAIqB;AACrB,kDAA0B;AAC1B,+CAAiC;AAqDjC,MAAM,aAAc,SAAQ,gBAAO;IACjC,oBAAoB,CAAwB;IAEnC,KAAK,CAAC,YAAY,CACzB,GAAW,EACX,MAAkB,EAClB,OAAiB,IAAI;QAErB,MAAM,EAAC,OAAO,EAAE,MAAM,EAAC,GAAG,IAAI,CAAC,oBAAoB,CAAC;QACpD,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,IAAI,eAAM,CAAC,mBAAmB,CAClC,IAAI,MAAM,IAAI,GAAG,iDAAiD;gBAChE,mCAAmC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,8BAA8B,IAAI;gBAC3F,oEAAoE,CACvE,CAAC;QACJ,CAAC;QACD,OAAO,MAAM,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IACrD,CAAC;CACF;AAED,MAAa,cAAc;IACT,IAAI,CAAS;IACb,UAAU,CAAS;IACnB,UAAU,CAAS;IACnB,GAAG,CAAM;IACT,MAAM,CAAS;IACf,oBAAoB,CAAU;IAC9B,UAAU,CAAS;IACnB,OAAO,CAAgB;IACvB,WAAW,CAA6C;IACxD,YAAY,CAAyC;IACrD,aAAa,CAAS;IACtB,aAAa,CAAW;IACxB,mBAAmB,CAAU;IAC7B,mBAAmB,CAAS;IAC5B,qBAAqB,CAAU;IAC/B,mCAAmC,CAAW;IAC9C,aAAa,CAA6B;IACnD,WAAW,GAAsB,IAAI,CAAC;IAC5B,GAAG,CAAe;IAEnC,YAAY,GAAiB,EAAE,IAA2B;QACxD,IAAI,CAAC,GAAG,GAAG,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACtC,IAAI,CAAC,MAAM,GAAG,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAC5C,IAAI,CAAC,IAAI,GAAG,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACxC,IAAI,CAAC,UAAU,GAAG,aAAa,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QACpD,IAAI,CAAC,UAAU,GAAG,aAAa,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QACpD,IAAI,CAAC,UAAU,GAAG,aAAa,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QACpD,IAAI,CAAC,oBAAoB,GAAG,aAAa,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;QACxE,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,MAAM,SAAS,GAAiB;YAC9B,GAAG;YACH,MAAM,EAAE,IAAI,CAAC,IAAI;YACjB,IAAI,EAAE,IAAI,CAAC,UAAU;YACrB,SAAS,EAAE,IAAI;SAChB,CAAC;QACF,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QAC3C,CAAC;QACD,IAAI,CAAC,OAAO,GAAG,IAAI,aAAa,CAAC,SAAS,CAAC,CAAC;QAC5C,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC/D,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5D,IAAI,CAAC,OAAO,CAAC,oBAAoB,GAAG;YAClC,MAAM,EAAE,KAAK;YACb,OAAO,EAAE,KAAK;SACf,CAAC;QAEF,MAAM,EAAC,eAAe,EAAC,GAAG,IAAA,0BAAkB,GAAE,CAAC;QAC/C,MAAM,aAAa,GAAG,YAAE,CAAC,YAAY,CACnC,GAAG,wBAAY,IAAI,eAAe,CAAC,OAAO,IAAI,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,GAAG,CAAC,WAAW,MAAM,EAC3F,EAAC,WAAW,EAAE,GAAG,EAAC,CACnB,CAAC;QACF,IAAI,CAAC,aAAa,GAAG,mBAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;QAC9D,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC;QACxC,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,mBAAmB,CAAC;QAEpD,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,mBAAmB,IAAI,6CAAiC,CAAC;QACzF,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,CAAC;QAExD,IAAI,CAAC,mCAAmC,GAAG,IAAI,CAAC,mCAAmC,CAAC;QAEpF,0EAA0E;QAC1E,IACE,IAAI,CAAC,WAAW;YAChB,IAAI,CAAC,YAAY;YACjB,IAAI,CAAC,gBAAgB;YACrB,IAAI,CAAC,QAAQ;YACb,IAAI,CAAC,WAAW,EAChB,CAAC;YACD,IAAI,CAAC,aAAa,GAAG,IAAA,kCAAwB,EAAC;gBAC5C,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;gBACvC,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,WAAW,EAAE,IAAI,CAAC,WAAW;aAC9B,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC5B,CAAC;IACH,CAAC;IAED,KAAK,CAAC,mBAAmB;QACvB,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,oCAAwB,CAAC,CAAC,EAAE,CAAC;YAC3D,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,oDAAoD,CAAC,CAAC;YACrE,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,kBAAkB,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,oCAAwB,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC5F,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,gDAAgD,kBAAkB,KAAK;YACrE,2BAA2B,IAAI,CAAC,UAAU,GAAG,CAChD,CAAC;QACF,OAAO,kBAAkB,KAAK,IAAI,CAAC,UAAU,CAAC;IAChD,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,aAAa;QACjB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,0BAA0B,CAAC,IAAI,CAAC,aAAa,EAAE,wBAAY,CAAC,CAAC;QAE7F,MAAM,kBAAkB,GAAG;YACzB,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,uBAAuB;YAClD,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,uBAAuB;SACnD,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACrB,MAAM,gBAAgB,GACpB,kBAAkB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAEtF,IAAI,kBAAkB,EAAE,CAAC;YACvB,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,uEAAuE,wBAAY,IAAI,CACxF,CAAC;YACF,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,wBAAY,CAAC,CAAC;YAC5C,CAAC;YAAC,OAAO,GAAQ,EAAE,CAAC;gBAClB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,uBAAuB,wBAAY,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YACxE,CAAC;QACH,CAAC;QAED,IAAI,gBAAgB,EAAE,CAAC;YACrB,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,sEAAsE,IAAI,CAAC,aAAa,IAAI,CAC7F,CAAC;YACF,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE;oBACzC,OAAO,EAAE,KAAK;oBACd,OAAO,EAAE,IAAI,CAAC,qBAAqB;iBACpC,CAAC,CAAC;gBACH,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,uCAAuC,IAAI,CAAC,aAAa,YAAY,wBAAY,IAAI,CACtF,CAAC;YACJ,CAAC;YAAC,OAAO,GAAQ,EAAE,CAAC;gBAClB,MAAM,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAC/B,mBAAmB,IAAI,CAAC,aAAa,iBAAiB,GAAG,CAAC,OAAO,GAAG,CACrE,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,IAAI,OAAO,GAAG,IAAI,CAAC,oBAAoB,CAAC;QACxC,IAAI,OAAO,EAAE,CAAC;YACZ,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,8CAA8C,CAAC,CAAC;QACjE,CAAC;aAAM,IAAI,MAAM,IAAI,CAAC,mBAAmB,EAAE,EAAE,CAAC;YAC5C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,wEAAwE,CAAC,CAAC;YACxF,OAAO,GAAG,IAAI,CAAC;QACjB,CAAC;QAED,IAAI,OAAO,IAAI,CAAC,MAAM,YAAE,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC;YACrD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,kDAAkD,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;YACxF,MAAM,YAAE,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACtC,CAAC;QACD,IAAI,CAAC,CAAC,MAAM,YAAE,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC;YAC3C,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACjC,CAAC;QACD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAClE,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC1C,CAAC;QACD,IAAI,CAAC,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,wBAAY,CAAC,CAAC,EAAE,CAAC;YAC3E,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,6EAA6E,CAAC,CAAC;QAC/F,CAAC;QAED,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,iBAAiB;QACrB,IAAI,kBAAkB,GAAwB,EAAE,CAAC;QACjD,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC7B,IAAI,qBAA6B,CAAC;YAClC,IAAI,MAAM,YAAE,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC;gBAC9C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,yCAAyC,IAAI,CAAC,mBAAmB,GAAG,CAAC,CAAC;gBACpF,qBAAqB,GAAG,MAAM,YAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC;YAC9E,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,uEAAuE,CAAC,CAAC;gBACvF,qBAAqB,GAAG,IAAI,CAAC,mBAAmB,CAAC;YACnD,CAAC;YACD,IAAI,CAAC;gBACH,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;YACzD,CAAC;YAAC,OAAO,CAAM,EAAE,CAAC;gBAChB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,2CAA2C,EAAE,CAAC,CAAC,CAAC;gBAC/D,MAAM,CAAC,CAAC;YACV,CAAC;QACH,CAAC;QACD,MAAM,OAAO,GAAG,YAAE,CAAC,YAAY,CAAC,mBAAmB,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE;YACzE,WAAW,EAAE,GAAG;SACjB,CAAC,CAAC;QACH,MAAM,UAAU,GAAG,mBAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACtD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,gCAAgC,UAAU,GAAG,CAAC,CAAC;QAC7D,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,+EAA+E,CAAC,CAAC;QAChG,MAAM,YAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAC5B,MAAM,YAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAC5B,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,2CAA2C,iBAAiB,EAAE,SAAS,UAAU,IAAI,CACtF,CAAC;QACF,MAAM,4BAA4B,CAAC,iBAAiB,EAAE,EAAE,UAAU,CAAC,CAAC;QACpE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;QAC1C,MAAM,IAAI,uBAAa,CAAC,IAAI,CAAC,GAAG,EAAE;YAChC,UAAU;YACV,kBAAkB;YAClB,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,cAAc,EAAE,IAAI,CAAC,UAAU;YAC/B,aAAa,EAAE,IAAI,CAAC,aAAa;SAClC,CAAC,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,OAAO,GAAG,mBAAI,CAAC,OAAO,CAC1B,UAAU,EACV,KAAK,EACL,OAAO,EACP,SAAS,EACT,KAAK,EACL,aAAa,EACb,OAAO,EACP,2BAA2B,CAC5B,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,2BAA2B,OAAO,SAAS,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;QACjF,MAAM,YAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,IAAkB;QACnC,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAErC,MAAM,GAAG,GAAa;YACpB,OAAO;YACP,IAAI;YACJ,YAAY;YACZ,IAAI;YACJ,IAAI;YACJ,OAAO;YACP,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,KAAK,MAAM,CAAC;YAClD,IAAI;YACJ,kBAAkB;YAClB,MAAM,EAAE,gDAAgD;SACzD,CAAC;QAEF,IAAI,OAAO,IAAI,CAAC,mCAAmC,KAAK,SAAS,EAAE,CAAC;YAClE,GAAG,CAAC,IAAI,CACN,IAAI,EACJ,yCAAyC,EACzC,MAAM,CAAC,IAAI,CAAC,mCAAmC,CAAC,CACjD,CAAC;QACJ,CAAC;QAED,GAAG,CAAC,IAAI,CAAC,GAAG,wBAAY,0CAA0C,CAAC,CAAC;QAEpE,MAAM,EAAC,eAAe,EAAC,GAAG,MAAM,IAAA,sBAAc,GAAE,CAAC;QACjD,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,6BAA6B,eAAe,CAAC,OAAO,kBAAkB,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CACtF,CAAC;QAEF,IAAI,cAAc,GAAG,KAAK,CAAC;QAC3B,oCAAoC;QACpC,IAAI,CAAC,OAAO,CAAC,oBAAoB,GAAG;YAClC,MAAM,EAAE,KAAK;YACb,OAAO,EAAE,KAAK;SACf,CAAC;QACF,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;QAClD,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAmB,EAAE,MAAqB,EAAE,EAAE;YACzE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,4CAA4C,IAAI,gBAAgB,MAAM,EAAE,CAAC,CAAC;YACxF,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,MAAM,GAAG,IAAI,CAAC;QAClD,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAc,EAAE,MAAc,EAAE,EAAE;YAC/D,MAAM,IAAI,GAAG,MAAM,IAAI,MAAM,CAAC;YAC9B,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;gBACjB,+CAA+C;gBAC/C,OAAO;YACT,CAAC;YAED,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,qBAAqB,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACnD,iFAAiF;YACjF,6CAA6C;YAC7C,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,0BAA0B,CAAC,EAAE,CAAC;gBAC5D,cAAc,GAAG,IAAI,CAAC;YACxB,CAAC;iBAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC;gBAC5C,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,OAAO,GAAG,IAAI,CAAC;YACnD,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,IAAI,gBAAM,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,CAAC;QACzC,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAChC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iBAAiB,IAAI,CAAC,mBAAmB,qCAAqC,CAAC,CAAC;QAC9F,IAAI,CAAC;YACH,MAAM,IAAA,2BAAgB,EACpB,KAAK,IAAI,EAAE;gBACT,IAAI,cAAc,EAAE,CAAC;oBACnB,MAAM,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAC/B,sEAAsE;wBACpE,mFAAmF;wBACnF,yFAAyF,CAC5F,CAAC;gBACJ,CAAC;qBAAM,IAAI,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,MAAM,EAAE,CAAC;oBACpD,MAAM,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAC/B,4DAA4D;wBAC1D,oEAAoE,CACvE,CAAC;gBACJ,CAAC;gBACD,IAAI,YAA0B,CAAC;gBAC/B,IAAI,CAAC;oBACH,YAAY,GAAG,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,CAAiB,CAAC;gBAChF,CAAC;gBAAC,MAAM,CAAC;oBACP,OAAO,KAAK,CAAC;gBACf,CAAC;gBACD,OAAO,MAAM,IAAI,CAAC,mBAAmB,CAAC,eAAe,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YAC/E,CAAC,EACD;gBACE,MAAM,EAAE,IAAI,CAAC,mBAAmB;gBAChC,UAAU,EAAE,GAAG;aAChB,CACF,CAAC;QACJ,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAChB,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;gBACtC,MAAM,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAC/B,8CAA8C;oBAC5C,iBAAiB,IAAI,CAAC,mBAAmB,iCAAiC;oBAC1E,2DAA2D,CAC9D,CAAC;YACJ,CAAC;YACD,MAAM,CAAC,CAAC;QACV,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,6BAA6B;YAC3B,mCAAmC,KAAK,CAAC,WAAW,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CACvF,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QAEtC,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE;YAC7C,YAAY,EAAE;gBACZ,UAAU,EAAE,CAAC,IAAI,CAAC;gBAClB,WAAW,EAAE,EAAE;aAChB;SACF,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACnD,sEAAsE;QACtE,6BAA6B;QAC7B,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAC5C,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,0DAA0D,GAAG,cAAc,GAAG,EAAE,CACjF,CAAC;QACJ,CAAC;QAED,IAAI,IAAI,CAAC,WAAW,EAAE,SAAS,EAAE,CAAC;YAChC,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QAChC,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,uBAAuB;QACnC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;QAE7D,IAAI,CAAC;YACH,MAAM,EAAC,KAAK,EAAC,GAAG,CACd,MAAM,IAAA,eAAK,EAAC;gBACV,GAAG,EAAE,UAAU,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,WAAW;gBACtD,OAAO,EAAE,GAAG;aACb,CAAC,CACH,CAAC,IAAwB,CAAC;YAC3B,MAAM,gBAAgB,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACtD,IAAI,gBAAgB,CAAC,MAAM,EAAE,CAAC;gBAC5B,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,sDAAsD,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,EAAE,CACzF,CAAC;gBACF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;gBACpD,MAAM,OAAO,CAAC,GAAG,CACf,gBAAgB,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAC1B,IAAA,eAAK,EAAC;oBACJ,GAAG,EAAE,UAAU,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,YAAY,EAAE,EAAE;oBAC3D,MAAM,EAAE,QAAQ;iBACjB,CAAC,CACH,CACF,CAAC;gBACF,+DAA+D;gBAC/D,MAAM,IAAA,gBAAK,EAAC,IAAI,CAAC,CAAC;YACpB,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;YAC5D,CAAC;QACH,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAChB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,sBAAsB;QAClC,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,SAAS,IAAI,CAAC,UAAU,QAAQ,oCAAwB,GAAG,CAAC,CAAC,CAAC;QACpF,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,4CAA4C,IAAI,CAAC,UAAU,QAAQ,oCAAwB,EAAE,CAC9F,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAC/B,aAAqB,EACrB,YAA0B;QAE1B,IAAI,CAAC,IAAA,qBAAa,EAAC,YAAY,CAAC,IAAI,CAAC,IAAA,qBAAa,EAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;YACvE,MAAM,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAC/B,2FAA2F;gBACzF,oCAAoC,aAAa,IAAI,CACxD,CAAC;QACJ,CAAC;QACD,MAAM,EACJ,KAAK,EAAE,EAAC,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,iBAAiB,EAAC,GAChE,GAAG,YAAY,CAAC;QACjB,MAAM,QAAQ,GAAG,iBAAiB;YAChC,CAAC,CAAC,IAAI,iBAAiB,eAAe;YACtC,CAAC,CAAC,wBAAwB,CAAC;QAC7B,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QACzD,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QACzD,IAAI,mBAAmB,IAAI,mBAAmB,EAAE,CAAC;YAC/C,IAAI,mBAAmB,CAAC,KAAK,KAAK,mBAAmB,CAAC,KAAK,EAAE,CAAC;gBAC5D,MAAM,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAC/B,gCAAgC,aAAa,yBAAyB,QAAQ,qBAAqB;oBACjG,oCAAoC,aAAa,IAAI,CACxD,CAAC;YACJ,CAAC;iBAAM,IAAI,mBAAmB,CAAC,KAAK,GAAG,mBAAmB,CAAC,KAAK,EAAE,CAAC;gBACjE,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,mDAAmD,QAAQ,2BAA2B;oBACpF,oCAAoC,aAAa,MAAM,aAAa,KAAK,CAC5E,CAAC;YACJ,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,WAAW,GAAG,mBAAmB;gBACrC,CAAC,CAAC,gCAAgC,aAAa,IAAI;oBACjD,uEAAuE,aAAa,IAAI;oBACxF,uBAAuB,QAAQ,GAAG;gBACpC,CAAC,CAAC,gCAAgC,aAAa,yBAAyB,QAAQ,GAAG;oBACjF,qEAAqE;oBACrE,YAAY,aAAa,IAAI,CAAC;YAClC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC7B,CAAC;QACD,IAAI,IAAI,CAAC,UAAU,IAAI,iBAAiB,IAAI,IAAI,CAAC,UAAU,KAAK,iBAAiB,EAAE,CAAC;YAClF,MAAM,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAC/B,2FAA2F;gBACzF,wBAAwB,iBAAiB,QAAQ,IAAI,CAAC,UAAU,IAAI,CACvE,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAtbD,wCAsbC;AAED,SAAS,aAAa,CACpB,IAA2B,EAC3B,GAAM;IAEN,IAAI,CAAC,cAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CAAC,WAAW,GAAG,gBAAgB,CAAC,CAAC;IAClD,CAAC;IACD,OAAO,IAAI,CAAC,GAAG,CAA0C,CAAC;AAC5D,CAAC;AAED,MAAM,WAAW,GAAG,wBAAwB,CAAC;AAE7C,IAAI,cAAkC,CAAC;AAEvC;;;;GAIG;AACI,KAAK,UAAU,4BAA4B,CAChD,aAAqB,EACrB,aAAqB;IAErB,iDAAiD;IACjD,MAAM,YAAE,CAAC,OAAO,CAAC,aAAa,EAAE,IAAI,EAAE,KAAK,EAAE,QAAgB,EAAE,WAAoB,EAAE,EAAE;QACrF,MAAM,YAAY,GAAG,mBAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;QAC5D,MAAM,UAAU,GAAG,mBAAI,CAAC,OAAO,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;QAE7D,MAAM,kBAAkB,GAAG,GAAG,mBAAI,CAAC,GAAG,GAAG,QAAQ,EAAE,CAAC,QAAQ,CAAC,GAAG,mBAAI,CAAC,GAAG,QAAQ,mBAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QAC5F,IAAI,kBAAkB,EAAE,CAAC;YACvB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,YAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAC9B,CAAC;aAAM,CAAC;YACN,MAAM,YAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QAC1C,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;AACL,CAAC;AAED,+DAA+D;AAC/D,SAAS,iBAAiB;IACxB,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;QACjC,MAAM,UAAU,GAAG,cAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QACnE,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,sCAAsC,WAAW,iBAAiB,CAAC,CAAC;QACtF,CAAC;QACD,cAAc,GAAG,mBAAI,CAAC,IAAI,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;IAC5D,CAAC;IACD,OAAO,cAAc,CAAC;AACxB,CAAC"}
1
+ {"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../../lib/commands/server/runner.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import type { EspressoDriver } from '../../driver';
1
+ import type { EspressoDriver } from '../../driver.js';
2
2
  /**
3
3
  * Start an Espresso session: device setup, server install, and session launch.
4
4
  */
@@ -1 +1 @@
1
- {"version":3,"file":"startup.d.ts","sourceRoot":"","sources":["../../../../lib/commands/server/startup.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,cAAc,CAAC;AAKjD;;GAEG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAkHtE;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI,CAoCrD;AAED;;GAEG;AACH,wBAAsB,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAQpE;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAW7E"}
1
+ {"version":3,"file":"startup.d.ts","sourceRoot":"","sources":["../../../../lib/commands/server/startup.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,iBAAiB,CAAC;AAKpD;;GAEG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAkHtE;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI,CAoCrD;AAED;;GAEG;AACH,wBAAsB,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAQpE;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAW7E"}
@@ -1,17 +1,11 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.startSession = startSession;
4
- exports.initServer = initServer;
5
- exports.teardown = teardown;
6
- exports.removePortForward = removePortForward;
7
- const utils_1 = require("../../utils");
8
- const constants_1 = require("./constants");
9
- const runner_1 = require("./runner");
1
+ import { qualifyActivityName, getPackageInfo } from '../../utils/index.js';
2
+ import { DEVICE_PORT } from './constants.js';
3
+ import { EspressoRunner } from './runner.js';
10
4
  /**
11
5
  * Start an Espresso session: device setup, server install, and session launch.
12
6
  */
13
- async function startSession() {
14
- const { manifestPayload } = await (0, utils_1.getPackageInfo)();
7
+ export async function startSession() {
8
+ const { manifestPayload } = await getPackageInfo();
15
9
  this.log.info(`EspressoDriver version: ${manifestPayload.version}`);
16
10
  // Read https://github.com/appium/appium-android-driver/pull/461 what happens if there is no setHiddenApiPolicy for Android P+
17
11
  if ((await this.adb.getApiLevel()) >= 28) {
@@ -48,8 +42,8 @@ async function startSession() {
48
42
  // set up the modified espresso server etc
49
43
  this.initEspressoServer();
50
44
  // Further prepare the device by forwarding the espresso port
51
- this.log.debug(`Forwarding Espresso Server port ${constants_1.DEVICE_PORT} to ${systemPort}`);
52
- await this.adb.forwardPort(systemPort, constants_1.DEVICE_PORT);
45
+ this.log.debug(`Forwarding Espresso Server port ${DEVICE_PORT} to ${systemPort}`);
46
+ await this.adb.forwardPort(systemPort, DEVICE_PORT);
53
47
  if (!this.opts.skipUnlock) {
54
48
  // unlock the device to prepare it for testing
55
49
  await this.unlock();
@@ -76,20 +70,20 @@ async function startSession() {
76
70
  throw this.log.errorWithException('appWaitPackage is required');
77
71
  }
78
72
  if (this.caps.appActivity) {
79
- this.caps.appActivity = (0, utils_1.qualifyActivityName)(this.caps.appActivity, appPackage);
73
+ this.caps.appActivity = qualifyActivityName(this.caps.appActivity, appPackage);
80
74
  }
81
75
  else {
82
76
  const appActivity = appInfo.appActivity;
83
77
  if (!appActivity) {
84
78
  throw this.log.errorWithException('appActivity is required');
85
79
  }
86
- this.caps.appActivity = (0, utils_1.qualifyActivityName)(appActivity, appPackage);
80
+ this.caps.appActivity = qualifyActivityName(appActivity, appPackage);
87
81
  }
88
82
  if (this.caps.appWaitActivity) {
89
- this.caps.appWaitActivity = (0, utils_1.qualifyActivityName)(this.caps.appWaitActivity, appWaitPackage);
83
+ this.caps.appWaitActivity = qualifyActivityName(this.caps.appWaitActivity, appWaitPackage);
90
84
  }
91
85
  else {
92
- this.caps.appWaitActivity = (0, utils_1.qualifyActivityName)(appInfo.appWaitActivity || appInfo.appActivity || this.caps.appActivity, appWaitPackage);
86
+ this.caps.appWaitActivity = qualifyActivityName(appInfo.appWaitActivity || appInfo.appActivity || this.caps.appActivity, appWaitPackage);
93
87
  }
94
88
  // launch espresso and wait till its online and we have a session
95
89
  await this.espresso.startSession(this.caps);
@@ -112,7 +106,7 @@ async function startSession() {
112
106
  /**
113
107
  * Create the Espresso runner and wire proxy handlers on the driver.
114
108
  */
115
- function initServer() {
109
+ export function initServer() {
116
110
  const { systemPort, tmpDir, appPackage } = this.opts;
117
111
  if (systemPort == null) {
118
112
  throw this.log.errorWithException('systemPort is required');
@@ -125,10 +119,10 @@ function initServer() {
125
119
  }
126
120
  // now that we have package and activity, we can create an instance of
127
121
  // espresso with the appropriate data
128
- this.espresso = new runner_1.EspressoRunner(this.log, {
122
+ this.espresso = new EspressoRunner(this.log, {
129
123
  host: this.opts.remoteAdbHost || '127.0.0.1',
130
124
  systemPort,
131
- devicePort: constants_1.DEVICE_PORT,
125
+ devicePort: DEVICE_PORT,
132
126
  adb: this.adb,
133
127
  tmpDir,
134
128
  appPackage,
@@ -151,7 +145,7 @@ function initServer() {
151
145
  /**
152
146
  * Tear down the Espresso server session and clear the runner reference.
153
147
  */
154
- async function teardown(driver) {
148
+ export async function teardown(driver) {
155
149
  if (driver.espresso) {
156
150
  if (driver.jwpProxyActive) {
157
151
  await driver.espresso.deleteSession();
@@ -163,7 +157,7 @@ async function teardown(driver) {
163
157
  /**
164
158
  * Remove the ADB port forward for the Espresso server system port.
165
159
  */
166
- async function removePortForward(driver) {
160
+ export async function removePortForward(driver) {
167
161
  if (driver.opts.systemPort) {
168
162
  try {
169
163
  await driver.adb.removePortForward(driver.opts.systemPort);
@@ -1 +1 @@
1
- {"version":3,"file":"startup.js","sourceRoot":"","sources":["../../../../lib/commands/server/startup.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"startup.js","sourceRoot":"","sources":["../../../../lib/commands/server/startup.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import type { EspressoDriver } from '../driver';
1
+ import type { EspressoDriver } from '../driver.js';
2
2
  /**
3
3
  * Starts the given service intent.
4
4
  *
@@ -1 +1 @@
1
- {"version":3,"file":"services.d.ts","sourceRoot":"","sources":["../../../lib/commands/services.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,WAAW,CAAC;AAE9C;;;;;;;;;;;;;GAaG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,OAAO,EACpB,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,GACrB,OAAO,CAAC,MAAM,CAAC,CAMjB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,GACrB,OAAO,CAAC,MAAM,CAAC,CAKjB"}
1
+ {"version":3,"file":"services.d.ts","sourceRoot":"","sources":["../../../lib/commands/services.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,cAAc,CAAC;AAEjD;;;;;;;;;;;;;GAaG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,OAAO,EACpB,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,GACrB,OAAO,CAAC,MAAM,CAAC,CAMjB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,GACrB,OAAO,CAAC,MAAM,CAAC,CAKjB"}
@@ -1,7 +1,3 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.mobileStartService = mobileStartService;
4
- exports.mobileStopService = mobileStopService;
5
1
  /**
6
2
  * Starts the given service intent.
7
3
  *
@@ -16,7 +12,7 @@ exports.mobileStopService = mobileStopService;
16
12
  * @throws {Error} If there was a failure while starting the service
17
13
  * or required options are missing
18
14
  */
19
- async function mobileStartService(intent, foreground, user) {
15
+ export async function mobileStartService(intent, foreground, user) {
20
16
  return (await this.espresso.jwproxy.command('/appium/execute_mobile/start_service', 'POST', {
21
17
  intent,
22
18
  foreground,
@@ -35,7 +31,7 @@ async function mobileStartService(intent, foreground, user) {
35
31
  * @throws {Error} If there was a failure while stopping the service
36
32
  * or required options are missing
37
33
  */
38
- async function mobileStopService(intent, user) {
34
+ export async function mobileStopService(intent, user) {
39
35
  return (await this.espresso.jwproxy.command('/appium/execute_mobile/stop_service', 'POST', {
40
36
  intent,
41
37
  user,
@@ -1 +1 @@
1
- {"version":3,"file":"services.js","sourceRoot":"","sources":["../../../lib/commands/services.ts"],"names":[],"mappings":";;AAgBA,gDAWC;AAcD,8CASC;AAhDD;;;;;;;;;;;;;GAaG;AACI,KAAK,UAAU,kBAAkB,CAEtC,MAAc,EACd,UAAoB,EACpB,IAAsB;IAEtB,OAAO,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,sCAAsC,EAAE,MAAM,EAAE;QAC1F,MAAM;QACN,UAAU;QACV,IAAI;KACL,CAAC,CAAW,CAAC;AAChB,CAAC;AAED;;;;;;;;;;;GAWG;AACI,KAAK,UAAU,iBAAiB,CAErC,MAAc,EACd,IAAsB;IAEtB,OAAO,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,qCAAqC,EAAE,MAAM,EAAE;QACzF,MAAM;QACN,IAAI;KACL,CAAC,CAAW,CAAC;AAChB,CAAC"}
1
+ {"version":3,"file":"services.js","sourceRoot":"","sources":["../../../lib/commands/services.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAEtC,MAAc,EACd,UAAoB,EACpB,IAAsB;IAEtB,OAAO,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,sCAAsC,EAAE,MAAM,EAAE;QAC1F,MAAM;QACN,UAAU;QACV,IAAI;KACL,CAAC,CAAW,CAAC;AAChB,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAErC,MAAc,EACd,IAAsB;IAEtB,OAAO,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,qCAAqC,EAAE,MAAM,EAAE;QACzF,MAAM;QACN,IAAI;KACL,CAAC,CAAW,CAAC;AAChB,CAAC"}
@@ -1,3 +1,2 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
1
+ export {};
3
2
  //# sourceMappingURL=types.js.map
@@ -1,8 +1,5 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.ESPRESSO_CONSTRAINTS = void 0;
4
- const appium_android_driver_1 = require("appium-android-driver");
5
- exports.ESPRESSO_CONSTRAINTS = {
1
+ import { commonCapConstraints } from 'appium-android-driver';
2
+ export const ESPRESSO_CONSTRAINTS = {
6
3
  systemPort: {
7
4
  isNumber: true,
8
5
  },
@@ -36,6 +33,6 @@ exports.ESPRESSO_CONSTRAINTS = {
36
33
  appLocale: {
37
34
  isObject: true,
38
35
  },
39
- ...appium_android_driver_1.commonCapConstraints,
36
+ ...commonCapConstraints,
40
37
  };
41
38
  //# sourceMappingURL=constraints.js.map