appium-mac2-driver 3.1.0 → 3.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +14 -0
- package/README.md +1 -0
- package/WebDriverAgentMac/IntegrationTests/AMEditElementTests.m +2 -4
- package/WebDriverAgentMac/WebDriverAgentLib/Categories/XCUIElement+AMAttributes.h +4 -2
- package/WebDriverAgentMac/WebDriverAgentLib/Categories/XCUIElement+AMAttributes.m +30 -15
- package/WebDriverAgentMac/WebDriverAgentLib/Categories/XCUIElementQuery+AMHelpers.h +8 -0
- package/WebDriverAgentMac/WebDriverAgentLib/Categories/XCUIElementQuery+AMHelpers.m +17 -0
- package/WebDriverAgentMac/WebDriverAgentLib/Commands/FBSessionCommands.m +4 -0
- package/WebDriverAgentMac/WebDriverAgentLib/Utilities/AMSettings.h +3 -0
- package/WebDriverAgentMac/WebDriverAgentLib/Utilities/AMSettings.m +1 -1
- package/WebDriverAgentMac/WebDriverAgentLib/Utilities/FBConfiguration.h +3 -0
- package/WebDriverAgentMac/WebDriverAgentLib/Utilities/FBConfiguration.m +11 -0
- package/build/lib/driver.js +2 -2
- package/build/lib/driver.js.map +1 -1
- package/build/lib/wda-mac.d.ts +29 -71
- package/build/lib/wda-mac.d.ts.map +1 -1
- package/build/lib/wda-mac.js +141 -159
- package/build/lib/wda-mac.js.map +1 -1
- package/lib/driver.js +1 -1
- package/lib/{wda-mac.js → wda-mac.ts} +205 -190
- package/npm-shrinkwrap.json +2236 -181
- package/package.json +1 -1
package/build/lib/wda-mac.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.WDAMacServer = exports.WDAMacProxy = void 0;
|
|
6
|
+
exports.WDA_MAC_SERVER = exports.WDAMacServer = exports.WDAMacProxy = void 0;
|
|
7
7
|
const lodash_1 = __importDefault(require("lodash"));
|
|
8
8
|
const path_1 = __importDefault(require("path"));
|
|
9
9
|
const url_1 = __importDefault(require("url"));
|
|
@@ -31,29 +31,8 @@ const DEFAULT_SHOW_SERVER_LOGS = false;
|
|
|
31
31
|
const RUNNING_PROCESS_IDS = [];
|
|
32
32
|
const RECENT_UPGRADE_TIMESTAMP_PATH = path_1.default.join('.appium', 'webdriveragent_mac', 'upgrade.time');
|
|
33
33
|
const RECENT_MODULE_VERSION_ITEM_NAME = 'recentWdaModuleVersion';
|
|
34
|
-
async function cleanupObsoleteProcesses() {
|
|
35
|
-
if (!lodash_1.default.isEmpty(RUNNING_PROCESS_IDS)) {
|
|
36
|
-
log.debug(`Cleaning up ${RUNNING_PROCESS_IDS.length} obsolete ` +
|
|
37
|
-
support_1.util.pluralize('process', RUNNING_PROCESS_IDS.length, false));
|
|
38
|
-
try {
|
|
39
|
-
await (0, teen_process_1.exec)('kill', ['-9', ...RUNNING_PROCESS_IDS]);
|
|
40
|
-
}
|
|
41
|
-
catch { }
|
|
42
|
-
lodash_1.default.pullAll(RUNNING_PROCESS_IDS, RUNNING_PROCESS_IDS);
|
|
43
|
-
}
|
|
44
|
-
}
|
|
45
|
-
process.once('exit', () => {
|
|
46
|
-
if (!lodash_1.default.isEmpty(RUNNING_PROCESS_IDS)) {
|
|
47
|
-
try {
|
|
48
|
-
(0, child_process_1.execSync)(`kill -9 ${RUNNING_PROCESS_IDS.join(' ')}`);
|
|
49
|
-
}
|
|
50
|
-
catch { }
|
|
51
|
-
lodash_1.default.pullAll(RUNNING_PROCESS_IDS, RUNNING_PROCESS_IDS);
|
|
52
|
-
}
|
|
53
|
-
});
|
|
54
34
|
class WDAMacProxy extends driver_1.JWProxy {
|
|
55
|
-
|
|
56
|
-
didProcessExit;
|
|
35
|
+
didProcessExit = false;
|
|
57
36
|
async proxyCommand(url, method, body = null) {
|
|
58
37
|
if (this.didProcessExit) {
|
|
59
38
|
throw new driver_1.errors.InvalidContextError(`'${method} ${url}' cannot be proxied to Mac2 Driver server because ` +
|
|
@@ -64,13 +43,11 @@ class WDAMacProxy extends driver_1.JWProxy {
|
|
|
64
43
|
}
|
|
65
44
|
exports.WDAMacProxy = WDAMacProxy;
|
|
66
45
|
class WDAMacProcess {
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
this.proc = null;
|
|
73
|
-
}
|
|
46
|
+
port = DEFAULT_SYSTEM_PORT;
|
|
47
|
+
host = DEFAULT_SYSTEM_HOST;
|
|
48
|
+
bootstrapRoot = DEFAULT_WDA_ROOT;
|
|
49
|
+
proc = null;
|
|
50
|
+
_showServerLogs = DEFAULT_SHOW_SERVER_LOGS;
|
|
74
51
|
get isRunning() {
|
|
75
52
|
return !!(this.proc?.isRunning);
|
|
76
53
|
}
|
|
@@ -138,31 +115,11 @@ class WDAMacProcess {
|
|
|
138
115
|
log.warn(`Cannot perform project cleanup. Original error: ${e.stderr || e.message}`);
|
|
139
116
|
}
|
|
140
117
|
}
|
|
141
|
-
hasSameOpts({ showServerLogs, systemPort, systemHost, bootstrapRoot }) {
|
|
142
|
-
if (lodash_1.default.isBoolean(showServerLogs) && this.showServerLogs !== showServerLogs
|
|
143
|
-
|| lodash_1.default.isNil(showServerLogs) && this.showServerLogs !== DEFAULT_SHOW_SERVER_LOGS) {
|
|
144
|
-
return false;
|
|
145
|
-
}
|
|
146
|
-
if (systemPort && this.port !== systemPort
|
|
147
|
-
|| !systemPort && this.port !== DEFAULT_SYSTEM_PORT) {
|
|
148
|
-
return false;
|
|
149
|
-
}
|
|
150
|
-
if (systemHost && this.host !== systemHost
|
|
151
|
-
|| !systemHost && this.host !== DEFAULT_SYSTEM_HOST) {
|
|
152
|
-
return false;
|
|
153
|
-
}
|
|
154
|
-
if (bootstrapRoot && this.bootstrapRoot !== bootstrapRoot
|
|
155
|
-
|| !bootstrapRoot && this.bootstrapRoot !== DEFAULT_WDA_ROOT) {
|
|
156
|
-
return false;
|
|
157
|
-
}
|
|
158
|
-
return true;
|
|
159
|
-
}
|
|
160
118
|
async init(opts = {}) {
|
|
161
|
-
// @ts-ignore TODO: Make opts typed
|
|
162
119
|
if (this.isRunning && this.hasSameOpts(opts)) {
|
|
163
120
|
return false;
|
|
164
121
|
}
|
|
165
|
-
this.
|
|
122
|
+
this._showServerLogs = opts.showServerLogs ?? this._showServerLogs;
|
|
166
123
|
this.port = opts.systemPort ?? this.port;
|
|
167
124
|
this.host = opts.systemHost ?? this.host;
|
|
168
125
|
this.bootstrapRoot = opts.bootstrapRoot ?? this.bootstrapRoot;
|
|
@@ -226,13 +183,13 @@ class WDAMacProcess {
|
|
|
226
183
|
cwd: this.bootstrapRoot,
|
|
227
184
|
env,
|
|
228
185
|
});
|
|
229
|
-
if (!this.
|
|
186
|
+
if (!this._showServerLogs) {
|
|
230
187
|
log.info(`Mac2Driver host process logging is disabled. ` +
|
|
231
188
|
`All the ${XCODEBUILD} output is going to be suppressed. ` +
|
|
232
189
|
`Set the 'showServerLogs' capability to 'true' if this is an undesired behavior`);
|
|
233
190
|
}
|
|
234
191
|
this.proc.on('output', (stdout, stderr) => {
|
|
235
|
-
if (!this.
|
|
192
|
+
if (!this._showServerLogs) {
|
|
236
193
|
return;
|
|
237
194
|
}
|
|
238
195
|
const line = lodash_1.default.trim(stdout || stderr);
|
|
@@ -276,101 +233,57 @@ class WDAMacProcess {
|
|
|
276
233
|
}
|
|
277
234
|
catch { }
|
|
278
235
|
}
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
constructor() {
|
|
284
|
-
this.process = null;
|
|
285
|
-
this.serverStartupTimeoutMs = STARTUP_TIMEOUT_MS;
|
|
286
|
-
// @ts-ignore this is ok
|
|
287
|
-
this.proxy = null;
|
|
288
|
-
// To handle if the WDAMac server is proxying requests to a remote WDAMac app instance
|
|
289
|
-
this.isProxyingToRemoteServer = false;
|
|
290
|
-
}
|
|
291
|
-
async isProxyReady(throwOnExit = true) {
|
|
292
|
-
if (!this.proxy) {
|
|
236
|
+
hasSameOpts(opts) {
|
|
237
|
+
const { showServerLogs, systemPort, systemHost, bootstrapRoot } = opts;
|
|
238
|
+
if (lodash_1.default.isBoolean(showServerLogs) && this._showServerLogs !== showServerLogs
|
|
239
|
+
|| lodash_1.default.isNil(showServerLogs) && this._showServerLogs !== DEFAULT_SHOW_SERVER_LOGS) {
|
|
293
240
|
return false;
|
|
294
241
|
}
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
return true;
|
|
298
|
-
}
|
|
299
|
-
catch (err) {
|
|
300
|
-
if (throwOnExit && this.proxy.didProcessExit) {
|
|
301
|
-
throw new Error(err.message);
|
|
302
|
-
}
|
|
242
|
+
if (systemPort && this.port !== systemPort
|
|
243
|
+
|| !systemPort && this.port !== DEFAULT_SYSTEM_PORT) {
|
|
303
244
|
return false;
|
|
304
245
|
}
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
*
|
|
309
|
-
* @property {string} scheme - The scheme proxy to.
|
|
310
|
-
* @property {string} host - The host name proxy to.
|
|
311
|
-
* @property {number} port - The port number proxy to.
|
|
312
|
-
* @property {string} path - The path proxy to.
|
|
313
|
-
*/
|
|
314
|
-
/**
|
|
315
|
-
* Returns proxy information where WDAMacServer proxy to.
|
|
316
|
-
*
|
|
317
|
-
* @param {Object} caps - The capabilities in the session.
|
|
318
|
-
* @return {ProxyProperties}
|
|
319
|
-
* @throws Error if 'webDriverAgentMacUrl' had invalid URL
|
|
320
|
-
*/
|
|
321
|
-
parseProxyProperties(caps) {
|
|
322
|
-
let scheme = 'http';
|
|
323
|
-
if (!caps.webDriverAgentMacUrl) {
|
|
324
|
-
return {
|
|
325
|
-
scheme,
|
|
326
|
-
host: (this.process?.host ?? caps.systemHost) ?? DEFAULT_SYSTEM_HOST,
|
|
327
|
-
port: (this.process?.port ?? caps.systemPort) ?? DEFAULT_SYSTEM_PORT,
|
|
328
|
-
path: ''
|
|
329
|
-
};
|
|
330
|
-
}
|
|
331
|
-
let parsedUrl;
|
|
332
|
-
try {
|
|
333
|
-
parsedUrl = new url_1.default.URL(caps.webDriverAgentMacUrl);
|
|
334
|
-
}
|
|
335
|
-
catch (e) {
|
|
336
|
-
throw new Error(`webDriverAgentMacUrl, '${caps.webDriverAgentMacUrl}', ` +
|
|
337
|
-
`in the capabilities is invalid. ${e.message}`);
|
|
246
|
+
if (systemHost && this.host !== systemHost
|
|
247
|
+
|| !systemHost && this.host !== DEFAULT_SYSTEM_HOST) {
|
|
248
|
+
return false;
|
|
338
249
|
}
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
250
|
+
if (bootstrapRoot && this.bootstrapRoot !== bootstrapRoot
|
|
251
|
+
|| !bootstrapRoot && this.bootstrapRoot !== DEFAULT_WDA_ROOT) {
|
|
252
|
+
return false;
|
|
342
253
|
}
|
|
343
|
-
return
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
254
|
+
return true;
|
|
255
|
+
}
|
|
256
|
+
}
|
|
257
|
+
class WDAMacServer {
|
|
258
|
+
_proxy = null;
|
|
259
|
+
_process = null;
|
|
260
|
+
_serverStartupTimeoutMs = STARTUP_TIMEOUT_MS;
|
|
261
|
+
_isProxyingToRemoteServer = false;
|
|
262
|
+
get proxy() {
|
|
263
|
+
if (!this._proxy) {
|
|
264
|
+
throw new Error('Proxy is not initialized. Did you call startSession()?');
|
|
265
|
+
}
|
|
266
|
+
return this._proxy;
|
|
349
267
|
}
|
|
350
|
-
/**
|
|
351
|
-
*
|
|
352
|
-
* @param {import('@appium/types').StringRecord} caps
|
|
353
|
-
* @param {SessionOptions} [opts={}]
|
|
354
|
-
*/
|
|
355
268
|
async startSession(caps, opts = {}) {
|
|
356
|
-
this.
|
|
357
|
-
this.
|
|
269
|
+
this._serverStartupTimeoutMs = caps.serverStartupTimeout ?? this._serverStartupTimeoutMs;
|
|
270
|
+
this._isProxyingToRemoteServer = !!caps.webDriverAgentMacUrl;
|
|
358
271
|
let wasProcessInitNecessary;
|
|
359
|
-
if (this.
|
|
360
|
-
if (this.
|
|
361
|
-
await this.
|
|
272
|
+
if (this._isProxyingToRemoteServer) {
|
|
273
|
+
if (this._process) {
|
|
274
|
+
await this._process.kill();
|
|
362
275
|
await cleanupObsoleteProcesses();
|
|
363
|
-
this.
|
|
276
|
+
this._process = null;
|
|
364
277
|
}
|
|
365
278
|
wasProcessInitNecessary = false;
|
|
366
279
|
}
|
|
367
280
|
else {
|
|
368
|
-
if (!this.
|
|
369
|
-
this.
|
|
281
|
+
if (!this._process) {
|
|
282
|
+
this._process = new WDAMacProcess();
|
|
370
283
|
}
|
|
371
|
-
wasProcessInitNecessary = await this.
|
|
284
|
+
wasProcessInitNecessary = await this._process.init(caps);
|
|
372
285
|
}
|
|
373
|
-
if (wasProcessInitNecessary || this.
|
|
286
|
+
if (wasProcessInitNecessary || this._isProxyingToRemoteServer || !this._proxy) {
|
|
374
287
|
const { scheme, host, port, path } = this.parseProxyProperties(caps);
|
|
375
288
|
const proxyOpts = {
|
|
376
289
|
scheme,
|
|
@@ -382,50 +295,52 @@ class WDAMacServer {
|
|
|
382
295
|
if (caps.reqBasePath) {
|
|
383
296
|
proxyOpts.reqBasePath = opts.reqBasePath;
|
|
384
297
|
}
|
|
385
|
-
this.
|
|
386
|
-
this.
|
|
387
|
-
if (this.
|
|
388
|
-
this.
|
|
389
|
-
if (this.
|
|
390
|
-
this.
|
|
298
|
+
this._proxy = new WDAMacProxy(proxyOpts);
|
|
299
|
+
this._proxy.didProcessExit = false;
|
|
300
|
+
if (this._process?.proc) {
|
|
301
|
+
this._process.proc.on('exit', () => {
|
|
302
|
+
if (this._proxy) {
|
|
303
|
+
this._proxy.didProcessExit = true;
|
|
391
304
|
}
|
|
392
305
|
});
|
|
393
306
|
}
|
|
394
307
|
const timer = new support_1.timing.Timer().start();
|
|
395
308
|
try {
|
|
396
309
|
await (0, asyncbox_1.waitForCondition)(async () => await this.isProxyReady(), {
|
|
397
|
-
waitMs: this.
|
|
310
|
+
waitMs: this._serverStartupTimeoutMs,
|
|
398
311
|
intervalMs: 1000,
|
|
399
312
|
});
|
|
400
313
|
}
|
|
401
314
|
catch (e) {
|
|
402
|
-
if (this.
|
|
315
|
+
if (this._process?.isRunning) {
|
|
403
316
|
// avoid "frozen" processes,
|
|
404
|
-
await this.
|
|
317
|
+
await this._process.kill();
|
|
405
318
|
}
|
|
406
319
|
if (/Condition unmet/.test(e.message)) {
|
|
407
|
-
const msg = this.
|
|
408
|
-
? `No response from '${scheme}://${host}:${port}${path}' within ${this.
|
|
320
|
+
const msg = this._isProxyingToRemoteServer
|
|
321
|
+
? `No response from '${scheme}://${host}:${port}${path}' within ${this._serverStartupTimeoutMs}ms timeout.` +
|
|
409
322
|
`Please make sure the remote server is running and accessible by Appium`
|
|
410
|
-
: `Mac2Driver server is not listening within ${this.
|
|
323
|
+
: `Mac2Driver server is not listening within ${this._serverStartupTimeoutMs}ms timeout. ` +
|
|
411
324
|
`Try to increase the value of 'serverStartupTimeout' capability, check the server logs ` +
|
|
412
325
|
`and make sure the ${XCODEBUILD} host process could be started manually from a terminal`;
|
|
413
326
|
throw new Error(msg);
|
|
414
327
|
}
|
|
415
328
|
throw e;
|
|
416
329
|
}
|
|
417
|
-
if (this.
|
|
418
|
-
const pid = this.
|
|
419
|
-
const childrenPids = await this.
|
|
420
|
-
|
|
421
|
-
|
|
330
|
+
if (this._process) {
|
|
331
|
+
const pid = this._process.pid;
|
|
332
|
+
const childrenPids = await this._process.listChildrenPids();
|
|
333
|
+
if (pid !== null) {
|
|
334
|
+
RUNNING_PROCESS_IDS.push(...childrenPids, pid);
|
|
335
|
+
this._process.proc?.on('exit', () => void lodash_1.default.pull(RUNNING_PROCESS_IDS, pid));
|
|
336
|
+
}
|
|
422
337
|
log.info(`The host process is ready within ${timer.getDuration().asMilliSeconds.toFixed(0)}ms`);
|
|
423
338
|
}
|
|
424
339
|
}
|
|
425
340
|
else {
|
|
426
341
|
log.info('The host process has already been listening. Proceeding with session creation');
|
|
427
342
|
}
|
|
428
|
-
await this.
|
|
343
|
+
await this._proxy.command('/session', 'POST', {
|
|
429
344
|
capabilities: {
|
|
430
345
|
firstMatch: [{}],
|
|
431
346
|
alwaysMatch: caps,
|
|
@@ -433,25 +348,92 @@ class WDAMacServer {
|
|
|
433
348
|
});
|
|
434
349
|
}
|
|
435
350
|
async stopSession() {
|
|
436
|
-
if (!this.
|
|
351
|
+
if (!this._isProxyingToRemoteServer && !(this._process?.isRunning)) {
|
|
437
352
|
log.info(`Mac2Driver session cannot be stopped, because the server is not running`);
|
|
438
353
|
return;
|
|
439
354
|
}
|
|
440
|
-
if (this.
|
|
355
|
+
if (this._proxy?.sessionId) {
|
|
441
356
|
try {
|
|
442
|
-
await this.
|
|
357
|
+
await this._proxy.command(`/session/${this._proxy.sessionId}`, 'DELETE');
|
|
443
358
|
}
|
|
444
359
|
catch (e) {
|
|
445
360
|
log.info(`Mac2Driver session cannot be deleted. Original error: ${e.message}`);
|
|
446
361
|
}
|
|
447
362
|
}
|
|
448
363
|
}
|
|
364
|
+
async isProxyReady(throwOnExit = true) {
|
|
365
|
+
if (!this._proxy) {
|
|
366
|
+
return false;
|
|
367
|
+
}
|
|
368
|
+
try {
|
|
369
|
+
await this._proxy.command('/status', 'GET');
|
|
370
|
+
return true;
|
|
371
|
+
}
|
|
372
|
+
catch (err) {
|
|
373
|
+
if (throwOnExit && this._proxy.didProcessExit) {
|
|
374
|
+
throw new Error(err.message);
|
|
375
|
+
}
|
|
376
|
+
return false;
|
|
377
|
+
}
|
|
378
|
+
}
|
|
379
|
+
/**
|
|
380
|
+
* Returns proxy information where WDAMacServer proxy to.
|
|
381
|
+
*
|
|
382
|
+
* @param caps - The capabilities in the session.
|
|
383
|
+
* @return ProxyProperties
|
|
384
|
+
* @throws Error if 'webDriverAgentMacUrl' had invalid URL
|
|
385
|
+
*/
|
|
386
|
+
parseProxyProperties(caps) {
|
|
387
|
+
let scheme = 'http';
|
|
388
|
+
if (!caps.webDriverAgentMacUrl) {
|
|
389
|
+
return {
|
|
390
|
+
scheme,
|
|
391
|
+
host: (this._process?.host ?? caps.systemHost) ?? DEFAULT_SYSTEM_HOST,
|
|
392
|
+
port: (this._process?.port ?? caps.systemPort) ?? DEFAULT_SYSTEM_PORT,
|
|
393
|
+
path: ''
|
|
394
|
+
};
|
|
395
|
+
}
|
|
396
|
+
let parsedUrl;
|
|
397
|
+
try {
|
|
398
|
+
parsedUrl = new url_1.default.URL(caps.webDriverAgentMacUrl);
|
|
399
|
+
}
|
|
400
|
+
catch (e) {
|
|
401
|
+
throw new Error(`webDriverAgentMacUrl, '${caps.webDriverAgentMacUrl}', ` +
|
|
402
|
+
`in the capabilities is invalid. ${e.message}`);
|
|
403
|
+
}
|
|
404
|
+
const { protocol, hostname, port, pathname } = parsedUrl;
|
|
405
|
+
if (lodash_1.default.isString(protocol)) {
|
|
406
|
+
scheme = protocol.split(':')[0];
|
|
407
|
+
}
|
|
408
|
+
return {
|
|
409
|
+
scheme,
|
|
410
|
+
host: hostname ?? DEFAULT_SYSTEM_HOST,
|
|
411
|
+
port: lodash_1.default.isEmpty(port) ? DEFAULT_SYSTEM_PORT : lodash_1.default.parseInt(port),
|
|
412
|
+
path: pathname === '/' ? '' : pathname
|
|
413
|
+
};
|
|
414
|
+
}
|
|
449
415
|
}
|
|
450
416
|
exports.WDAMacServer = WDAMacServer;
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
417
|
+
exports.WDA_MAC_SERVER = new WDAMacServer();
|
|
418
|
+
// Private functions
|
|
419
|
+
async function cleanupObsoleteProcesses() {
|
|
420
|
+
if (!lodash_1.default.isEmpty(RUNNING_PROCESS_IDS)) {
|
|
421
|
+
log.debug(`Cleaning up ${RUNNING_PROCESS_IDS.length} obsolete ` +
|
|
422
|
+
support_1.util.pluralize('process', RUNNING_PROCESS_IDS.length, false));
|
|
423
|
+
try {
|
|
424
|
+
await (0, teen_process_1.exec)('kill', ['-9', ...RUNNING_PROCESS_IDS.map(String)]);
|
|
425
|
+
}
|
|
426
|
+
catch { }
|
|
427
|
+
lodash_1.default.pullAll(RUNNING_PROCESS_IDS, RUNNING_PROCESS_IDS);
|
|
428
|
+
}
|
|
429
|
+
}
|
|
430
|
+
process.once('exit', () => {
|
|
431
|
+
if (!lodash_1.default.isEmpty(RUNNING_PROCESS_IDS)) {
|
|
432
|
+
try {
|
|
433
|
+
(0, child_process_1.execSync)(`kill -9 ${RUNNING_PROCESS_IDS.map(String).join(' ')}`);
|
|
434
|
+
}
|
|
435
|
+
catch { }
|
|
436
|
+
lodash_1.default.pullAll(RUNNING_PROCESS_IDS, RUNNING_PROCESS_IDS);
|
|
437
|
+
}
|
|
438
|
+
});
|
|
457
439
|
//# sourceMappingURL=wda-mac.js.map
|
package/build/lib/wda-mac.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wda-mac.js","sourceRoot":"","sources":["../../lib/wda-mac.js"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AACvB,gDAAwB;AACxB,8CAAsB;AACtB,kDAA0B;AAC1B,wDAAyB;AACzB,0CAAgD;AAChD,4CAA0D;AAC1D,iDAA8C;AAC9C,+CAAgD;AAChD,uCAA4C;AAC5C,6CAA8C;AAC9C,iDAAyC;AACzC,mCAAgE;AAEhE,MAAM,GAAG,GAAG,gBAAM,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC;AAElD,MAAM,gBAAgB,GAAG,cAAI,CAAC,OAAO,CAAC,IAAA,qBAAa,GAAE,EAAE,mBAAmB,CAAC,CAAC;AAC5E,MAAM,gBAAgB,GAAG,6BAA6B,CAAC;AACvD,MAAM,WAAW,GAAG,CAAC,OAAO,GAAG,gBAAgB,EAAE,EAAE,CAAC,cAAI,CAAC,OAAO,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;AAC5F,MAAM,aAAa,GAAG,sBAAsB,CAAC;AAC7C,MAAM,iBAAiB,GAAG,gCAAgC,CAAC;AAC3D,MAAM,UAAU,GAAG,YAAY,CAAC;AAChC,MAAM,kBAAkB,GAAG,MAAM,CAAC;AAClC,MAAM,mBAAmB,GAAG,KAAK,CAAC;AAClC,MAAM,mBAAmB,GAAG,WAAW,CAAC;AACxC,MAAM,wBAAwB,GAAG,KAAK,CAAC;AACvC,MAAM,mBAAmB,GAAG,EAAE,CAAC;AAC/B,MAAM,6BAA6B,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,EAAE,cAAc,CAAC,CAAC;AACjG,MAAM,+BAA+B,GAAG,wBAAwB,CAAC;AAGjE,KAAK,UAAU,wBAAwB;IACrC,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE,CAAC;QACpC,GAAG,CAAC,KAAK,CAAC,eAAe,mBAAmB,CAAC,MAAM,YAAY;YAC7D,cAAI,CAAC,SAAS,CAAC,SAAS,EAAE,mBAAmB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;QAChE,IAAI,CAAC;YACH,MAAM,IAAA,mBAAI,EAAC,MAAM,EAAE,CAAC,IAAI,EAAE,GAAG,mBAAmB,CAAC,CAAC,CAAC;QACrD,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;QACV,gBAAC,CAAC,OAAO,CAAC,mBAAmB,EAAE,mBAAmB,CAAC,CAAC;IACtD,CAAC;AACH,CAAC;AAED,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE;IACxB,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE,CAAC;QACpC,IAAI,CAAC;YACH,IAAA,wBAAQ,EAAC,WAAW,mBAAmB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACvD,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;QACV,gBAAC,CAAC,OAAO,CAAC,mBAAmB,EAAE,mBAAmB,CAAC,CAAC;IACtD,CAAC;AACH,CAAC,CAAC,CAAC;AAGH,MAAa,WAAY,SAAQ,gBAAO;IACtC,gCAAgC;IAChC,cAAc,CAAC;IAEf,KAAK,CAAC,YAAY,CAAE,GAAG,EAAE,MAAM,EAAE,IAAI,GAAG,IAAI;QAC1C,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,MAAM,IAAI,eAAM,CAAC,mBAAmB,CAClC,IAAI,MAAM,IAAI,GAAG,oDAAoD;gBACrE,sFAAsF,CAAC,CAAC;QAC5F,CAAC;QACD,OAAO,MAAM,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IACrD,CAAC;CACF;AAZD,kCAYC;AAED,MAAM,aAAa;IACjB;QACE,IAAI,CAAC,cAAc,GAAG,wBAAwB,CAAC;QAC/C,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;QAChC,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;QAChC,IAAI,CAAC,aAAa,GAAG,gBAAgB,CAAC;QACtC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED,IAAI,SAAS;QACX,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAClC,CAAC;IAED,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,gBAAgB;QACpB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,IAAA,8BAAsB,EAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAClE,CAAC;IAED,KAAK,CAAC,qBAAqB;QACzB,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,YAAE,CAAC,QAAQ,CAAC,cAAI,CAAC,IAAI,CAAC,IAAA,qBAAa,GAAE,EAAE,cAAc,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;QACtG,MAAM,GAAG,GAAG,IAAA,qBAAS,EAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACxC,IAAI,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,+BAA+B,CAAC,CAAC;QAC3D,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,aAAa,GAAG,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,EAAE,6BAA6B,CAAC,CAAC;YAC1F,IAAI,MAAM,YAAE,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;gBACnC,yEAAyE;gBACzE,qEAAqE;gBACrE,qEAAqE;gBACrE,IAAI,CAAC;oBACH,OAAO,GAAG,MAAM,GAAG,CAAC,mBAAmB,CAAC,+BAA+B,EAAE,OAAO,CAAC,CAAC;gBACpF,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,GAAG,CAAC,IAAI,CAAC,kDAAkD,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;oBACxE,OAAO;gBACT,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,GAAG,CAAC,IAAI,CAAC,oFAAoF,CAAC,CAAC;gBAC/F,IAAI,CAAC;oBACH,MAAM,GAAG,CAAC,mBAAmB,CAAC,+BAA+B,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;gBACtF,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,GAAG,CAAC,IAAI,CAAC,kDAAkD,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC1E,CAAC;gBACD,OAAO;YACT,CAAC;QACH,CAAC;QAED,IAAI,mBAAmB,GAAG,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;QAC/C,IAAI,CAAC;YACH,mBAAmB,GAAG,cAAI,CAAC,aAAa,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC;QACtE,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,GAAG,CAAC,IAAI,CAAC,yDAAyD,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;YAC/E,GAAG,CAAC,IAAI,CAAC,mBAAmB,WAAW,CAAC,OAAO,8CAA8C,CAAC,CAAC;YAC/F,MAAM,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YACzC,OAAO;QACT,CAAC;QAED,IAAI,cAAI,CAAC,eAAe,CAAC,mBAAmB,EAAE,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC;YACzE,GAAG,CAAC,IAAI,CACN,6EAA6E;gBAC7E,IAAI,mBAAmB,OAAO,WAAW,CAAC,OAAO,GAAG,CACrD,CAAC;YACF,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,GAAG,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;YACvC,MAAM,IAAI,GAAG;gBACX,OAAO;gBACP,UAAU,EAAE,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC;gBAC3C,SAAS,EAAE,aAAa;aACzB,CAAC;YACF,MAAM,IAAA,mBAAI,EAAC,UAAU,EAAE,IAAI,EAAE,EAAC,GAAG,EAAE,IAAI,CAAC,aAAa,EAAC,CAAC,CAAC;YACxD,MAAM,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAC3C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,GAAG,CAAC,IAAI,CAAC,mDAAmD,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QACvF,CAAC;IACH,CAAC;IAED,WAAW,CAAE,EAAE,cAAc,EAAE,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE;QACpE,IAAI,gBAAC,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,IAAI,CAAC,cAAc,KAAK,cAAc;eACpE,gBAAC,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,IAAI,CAAC,cAAc,KAAK,wBAAwB,EAAE,CAAC;YACjF,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,UAAU,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU;eACrC,CAAC,UAAU,IAAI,IAAI,CAAC,IAAI,KAAK,mBAAmB,EAAE,CAAC;YACtD,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,UAAU,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU;eACrC,CAAC,UAAU,IAAI,IAAI,CAAC,IAAI,KAAK,mBAAmB,EAAE,CAAC;YACtD,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,aAAa,IAAI,IAAI,CAAC,aAAa,KAAK,aAAa;eACpD,CAAC,aAAa,IAAI,IAAI,CAAC,aAAa,KAAK,gBAAgB,EAAE,CAAC;YAC/D,OAAO,KAAK,CAAC;QACf,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,IAAI,CAAE,IAAI,GAAG,EAAE;QACnB,mCAAmC;QACnC,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7C,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,cAAc,CAAC;QACjE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,IAAI,CAAC;QACzC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,IAAI,CAAC;QACzC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,aAAa,CAAC;QAE9D,GAAG,CAAC,KAAK,CAAC,yBAAyB,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;QACzD,IAAI,CAAC,MAAM,YAAE,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC;YACtD,MAAM,IAAI,KAAK,CAAC,GAAG,gBAAgB,uBAAuB,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK;gBAC5F,4CAA4C,CAAC,CAAC;QAClD,CAAC;QAED,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,MAAM,wBAAwB,EAAE,CAAC;QAEjC,IAAI,UAAU,CAAC;QACf,IAAI,CAAC;YACH,UAAU,GAAG,MAAM,YAAE,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAC1C,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,KAAK,CAAC,GAAG,UAAU,mCAAmC;gBAC9D,yDAAyD,CAAC,CAAC;QAC/D,CAAC;QACD,GAAG,CAAC,KAAK,CAAC,SAAS,UAAU,eAAe,UAAU,GAAG,CAAC,CAAC;QAE3D,MAAM,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAEnC,GAAG,CAAC,KAAK,CAAC,SAAS,IAAI,CAAC,IAAI,iBAAiB,CAAC,CAAC;QAC/C,GAAG,CAAC,KAAK,CAAC,cAAc,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACrC,MAAM,UAAU,GAAG,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,IAAA,6BAAe,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,MAAM,CAAC;QACxF,IAAI,MAAM,UAAU,EAAE,EAAE,CAAC;YACvB,GAAG,CAAC,IAAI,CAAC,aAAa,IAAI,CAAC,IAAI,OAAO,IAAI,CAAC,IAAI,YAAY;gBACzD,qDAAqD;gBACrD,oDAAoD,CAAC,CAAC;YACxD,MAAM,KAAK,GAAG,IAAI,gBAAM,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,CAAC;YACzC,IAAI,CAAC;gBACH,MAAM,eAAK,CAAC,MAAM,CAAC,UAAU,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,GAAG,EAAE;oBACtD,OAAO,EAAE,IAAI;iBACd,CAAC,CAAC;gBACH,yDAAyD;gBACzD,MAAM,kBAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACnB,MAAM,IAAA,2BAAgB,EAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC,MAAM,UAAU,EAAE,CAAC,EAAE;oBACxD,MAAM,EAAE,IAAI;oBACZ,UAAU,EAAE,GAAG;iBAChB,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,GAAG,CAAC,IAAI,CAAC,gDAAgD,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,CAAC,CAAC,OAAO,IAAI;oBAC/F,6DAA6D,CAAC,CAAC;gBACjE,MAAM,IAAI,KAAK,CAAC,aAAa,IAAI,CAAC,IAAI,OAAO,IAAI,CAAC,IAAI,YAAY;oBAChE,8EAA8E;oBAC9E,+DAA+D,CAAC,CAAC;YACrE,CAAC;YACD,GAAG,CAAC,IAAI,CAAC,2EAA2E;gBAClF,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC3D,CAAC;QAED,MAAM,IAAI,GAAG;YACX,mBAAmB,EAAE,uBAAuB;YAC5C,UAAU,EAAE,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC;YAC3C,SAAS,EAAE,aAAa;YACxB,iBAAiB;SAClB,CAAC;QACF,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,GAAG,EAAE;YACzC,QAAQ,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE;YACxB,QAAQ,EAAE,IAAI,CAAC,IAAI;SACpB,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,GAAG,IAAI,yBAAU,CAAC,UAAU,EAAE,IAAI,EAAE;YAC3C,GAAG,EAAE,IAAI,CAAC,aAAa;YACvB,GAAG;SACJ,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YACzB,GAAG,CAAC,IAAI,CAAC,+CAA+C;gBACtD,WAAW,UAAU,qCAAqC;gBAC1D,gFAAgF,CAAC,CAAC;QACtF,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE;YACxC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;gBACzB,OAAO;YACT,CAAC;YAED,MAAM,IAAI,GAAG,gBAAC,CAAC,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,CAAC;YACtC,IAAI,IAAI,EAAE,CAAC;gBACT,GAAG,CAAC,KAAK,CAAC,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC,CAAC;YACvC,CAAC;QACH,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;YACpC,GAAG,CAAC,IAAI,CAAC,gDAAgD,IAAI,YAAY,MAAM,EAAE,CAAC,CAAC;QACrF,CAAC,CAAC,CAAC;QACH,GAAG,CAAC,IAAI,CAAC,qCAAqC,UAAU,IAAI,cAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAChF,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,IAAI;QACR,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO;QACT,CAAC;QAED,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACnD,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;YAC7B,IAAI,CAAC;gBACH,MAAM,IAAA,mBAAI,EAAC,MAAM,EAAE,YAAY,CAAC,CAAC;YACnC,CAAC;YAAC,MAAM,CAAC,CAAA,CAAC;QACZ,CAAC;QACD,MAAM,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,IAAI;QACR,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO;QACT,CAAC;QAED,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACnD,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;YAC7B,IAAI,CAAC;gBACH,MAAM,IAAA,mBAAI,EAAC,MAAM,EAAE,CAAC,IAAI,EAAE,GAAG,YAAY,CAAC,CAAC,CAAC;YAC9C,CAAC;YAAC,MAAM,CAAC,CAAA,CAAC;QACZ,CAAC;QACD,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACnC,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;IACZ,CAAC;CACF;AAED,MAAa,YAAY;IACvB,0BAA0B;IAC1B,KAAK,CAAC;IAEN;QACE,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC,sBAAsB,GAAG,kBAAkB,CAAC;QACjD,wBAAwB;QACxB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAElB,sFAAsF;QACtF,IAAI,CAAC,wBAAwB,GAAG,KAAK,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,YAAY,CAAE,WAAW,GAAG,IAAI;QACpC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAChB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;YAC3C,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,WAAW,IAAI,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC;gBAC7C,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC/B,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAGD;;;;;;;OAOG;IAEH;;;;;;OAMG;IACH,oBAAoB,CAAE,IAAI;QACxB,IAAI,MAAM,GAAG,MAAM,CAAC;QACpB,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC/B,OAAO;gBACL,MAAM;gBACN,IAAI,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,mBAAmB;gBACpE,IAAI,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,mBAAmB;gBACpE,IAAI,EAAE,EAAE;aACT,CAAC;QACJ,CAAC;QAED,IAAI,SAAS,CAAC;QACd,IAAI,CAAC;YACH,SAAS,GAAG,IAAI,aAAG,CAAC,GAAG,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACrD,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,0BAA0B,IAAI,CAAC,oBAAoB,KAAK;gBACtE,mCAAmC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QACpD,CAAC;QAED,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;QACzD,IAAI,gBAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YACzB,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAClC,CAAC;QACD,OAAO;YACL,MAAM;YACN,IAAI,EAAE,QAAQ,IAAI,mBAAmB;YACrC,IAAI,EAAE,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,gBAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;YAC9D,IAAI,EAAE,QAAQ,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ;SACvC,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,YAAY,CAAE,IAAI,EAAE,IAAI,GAAG,EAAE;QACjC,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,oBAAoB,IAAI,IAAI,CAAC,sBAAsB,CAAC;QAEvF,IAAI,CAAC,wBAAwB,GAAG,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC;QAE5D,IAAI,uBAAuB,CAAC;QAC5B,IAAI,IAAI,CAAC,wBAAwB,EAAE,CAAC;YAClC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;gBACjB,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;gBAC1B,MAAM,wBAAwB,EAAE,CAAC;gBACjC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;YACtB,CAAC;YAED,uBAAuB,GAAG,KAAK,CAAC;QAClC,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBAClB,IAAI,CAAC,OAAO,GAAG,IAAI,aAAa,EAAE,CAAC;YACrC,CAAC;YACD,uBAAuB,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1D,CAAC;QAED,IAAI,uBAAuB,IAAI,IAAI,CAAC,wBAAwB,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAC5E,MAAM,EAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAC,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;YACnE,MAAM,SAAS,GAAG;gBAChB,MAAM;gBACN,MAAM,EAAE,IAAI;gBACZ,IAAI;gBACJ,IAAI,EAAE,IAAI;gBACV,SAAS,EAAE,IAAI;aAChB,CAAC;YACF,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;gBACrB,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;YAC3C,CAAC;YACD,IAAI,CAAC,KAAK,GAAG,IAAI,WAAW,CAAC,SAAS,CAAC,CAAC;YACxC,IAAI,CAAC,KAAK,CAAC,cAAc,GAAG,KAAK,CAAC;YAElC,IAAI,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC;gBACvB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;oBAChC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;wBACf,IAAI,CAAC,KAAK,CAAC,cAAc,GAAG,IAAI,CAAC;oBACnC,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC;YAED,MAAM,KAAK,GAAG,IAAI,gBAAM,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,CAAC;YACzC,IAAI,CAAC;gBACH,MAAM,IAAA,2BAAgB,EAAC,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,YAAY,EAAE,EAAE;oBAC5D,MAAM,EAAE,IAAI,CAAC,sBAAsB;oBACnC,UAAU,EAAE,IAAI;iBACjB,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,IAAI,CAAC,OAAO,EAAE,SAAS,EAAE,CAAC;oBAC5B,4BAA4B;oBAC5B,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;gBAC5B,CAAC;gBACD,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;oBACtC,MAAM,GAAG,GAAG,IAAI,CAAC,wBAAwB;wBACvC,CAAC,CAAC,qBAAqB,MAAM,MAAM,IAAI,IAAI,IAAI,GAAG,IAAI,YAAY,IAAI,CAAC,sBAAsB,aAAa;4BAC1G,wEAAwE;wBACxE,CAAC,CAAC,6CAA6C,IAAI,CAAC,sBAAsB,cAAc;4BACxF,wFAAwF;4BACxF,qBAAqB,UAAU,yDAAyD,CAAC;oBAC3F,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;gBACvB,CAAC;gBACD,MAAM,CAAC,CAAC;YACV,CAAC;YAED,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;gBACjB,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC;gBAC7B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC;gBAC3D,mBAAmB,CAAC,IAAI,CAAC,GAAG,YAAY,EAAE,GAAG,CAAC,CAAC;gBAC/C,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,KAAK,gBAAC,CAAC,IAAI,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC,CAAC;gBAC3E,GAAG,CAAC,IAAI,CAAC,oCAAoC,KAAK,CAAC,WAAW,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAClG,CAAC;QACH,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,IAAI,CAAC,+EAA+E,CAAC,CAAC;QAC5F,CAAC;QAED,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE;YAC3C,YAAY,EAAE;gBACZ,UAAU,EAAE,CAAC,EAAE,CAAC;gBAChB,WAAW,EAAE,IAAI;aAClB;SACF,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,WAAW;QACf,IAAI,CAAC,IAAI,CAAC,wBAAwB,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC;YACjE,GAAG,CAAC,IAAI,CAAC,yEAAyE,CAAC,CAAC;YACpF,OAAO;QACT,CAAC;QAED,IAAI,IAAI,CAAC,KAAK,EAAE,SAAS,EAAE,CAAC;YAC1B,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,EAAE,QAAQ,CAAC,CAAC;YACzE,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,GAAG,CAAC,IAAI,CAAC,yDAAyD,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;YACjF,CAAC;QACH,CAAC;IACH,CAAC;CACF;AAvLD,oCAuLC;AAED,MAAM,cAAc,GAAG,IAAI,YAAY,EAAE,CAAC;AAE1C,kBAAe,cAAc,CAAC;AAE9B;;;GAGG"}
|
|
1
|
+
{"version":3,"file":"wda-mac.js","sourceRoot":"","sources":["../../lib/wda-mac.ts"],"names":[],"mappings":"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"}
|
package/lib/driver.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _ from 'lodash';
|
|
2
2
|
import { BaseDriver, DeviceSettings } from 'appium/driver';
|
|
3
|
-
import WDA_MAC_SERVER from './wda-mac';
|
|
3
|
+
import { WDA_MAC_SERVER } from './wda-mac';
|
|
4
4
|
import { desiredCapConstraints } from './desired-caps';
|
|
5
5
|
import * as appManagemenetCommands from './commands/app-management';
|
|
6
6
|
import * as appleScriptCommands from './commands/applescript';
|