appium 3.4.2 → 3.5.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.
Files changed (196) hide show
  1. package/build/lib/appium.d.ts +3 -0
  2. package/build/lib/appium.d.ts.map +1 -1
  3. package/build/lib/appium.js +73 -51
  4. package/build/lib/appium.js.map +1 -1
  5. package/build/lib/bidi-commands.d.ts.map +1 -1
  6. package/build/lib/bidi-commands.js +36 -31
  7. package/build/lib/bidi-commands.js.map +1 -1
  8. package/build/lib/bootstrap/appium-initializer.d.ts.map +1 -1
  9. package/build/lib/bootstrap/appium-initializer.js +13 -13
  10. package/build/lib/bootstrap/appium-initializer.js.map +1 -1
  11. package/build/lib/bootstrap/appium-main-runner.d.ts.map +1 -1
  12. package/build/lib/bootstrap/appium-main-runner.js +2 -2
  13. package/build/lib/bootstrap/appium-main-runner.js.map +1 -1
  14. package/build/lib/bootstrap/config-file.d.ts.map +1 -1
  15. package/build/lib/bootstrap/config-file.js +11 -11
  16. package/build/lib/bootstrap/config-file.js.map +1 -1
  17. package/build/lib/bootstrap/grid-v3-register.d.ts.map +1 -1
  18. package/build/lib/bootstrap/grid-v3-register.js +9 -6
  19. package/build/lib/bootstrap/grid-v3-register.js.map +1 -1
  20. package/build/lib/bootstrap/main-helpers.d.ts +1 -1
  21. package/build/lib/bootstrap/main-helpers.d.ts.map +1 -1
  22. package/build/lib/bootstrap/main-helpers.js +19 -20
  23. package/build/lib/bootstrap/main-helpers.js.map +1 -1
  24. package/build/lib/bootstrap/node-helpers.d.ts +1 -1
  25. package/build/lib/bootstrap/node-helpers.d.ts.map +1 -1
  26. package/build/lib/bootstrap/node-helpers.js +8 -16
  27. package/build/lib/bootstrap/node-helpers.js.map +1 -1
  28. package/build/lib/bootstrap/startup-config.d.ts.map +1 -1
  29. package/build/lib/bootstrap/startup-config.js +32 -30
  30. package/build/lib/bootstrap/startup-config.js.map +1 -1
  31. package/build/lib/cli/args.d.ts +3 -2
  32. package/build/lib/cli/args.d.ts.map +1 -1
  33. package/build/lib/cli/args.js +2 -5
  34. package/build/lib/cli/args.js.map +1 -1
  35. package/build/lib/cli/driver-command.d.ts +1 -2
  36. package/build/lib/cli/driver-command.d.ts.map +1 -1
  37. package/build/lib/cli/driver-command.js +7 -8
  38. package/build/lib/cli/driver-command.js.map +1 -1
  39. package/build/lib/cli/extension-command.d.ts +2 -2
  40. package/build/lib/cli/extension-command.d.ts.map +1 -1
  41. package/build/lib/cli/extension-command.js +105 -71
  42. package/build/lib/cli/extension-command.js.map +1 -1
  43. package/build/lib/cli/extension.d.ts.map +1 -1
  44. package/build/lib/cli/extension.js.map +1 -1
  45. package/build/lib/cli/parser.d.ts.map +1 -1
  46. package/build/lib/cli/parser.js +21 -14
  47. package/build/lib/cli/parser.js.map +1 -1
  48. package/build/lib/cli/plugin-command.d.ts +1 -1
  49. package/build/lib/cli/plugin-command.d.ts.map +1 -1
  50. package/build/lib/cli/plugin-command.js +5 -5
  51. package/build/lib/cli/plugin-command.js.map +1 -1
  52. package/build/lib/cli/setup-command.d.ts +1 -1
  53. package/build/lib/cli/setup-command.d.ts.map +1 -1
  54. package/build/lib/cli/setup-command.js +14 -19
  55. package/build/lib/cli/setup-command.js.map +1 -1
  56. package/build/lib/cli/utils.d.ts.map +1 -1
  57. package/build/lib/cli/utils.js +3 -2
  58. package/build/lib/cli/utils.js.map +1 -1
  59. package/build/lib/doctor/doctor.d.ts +0 -1
  60. package/build/lib/doctor/doctor.d.ts.map +1 -1
  61. package/build/lib/doctor/doctor.js +12 -17
  62. package/build/lib/doctor/doctor.js.map +1 -1
  63. package/build/lib/extension/driver-config.d.ts.map +1 -1
  64. package/build/lib/extension/driver-config.js +11 -12
  65. package/build/lib/extension/driver-config.js.map +1 -1
  66. package/build/lib/extension/extension-config.d.ts.map +1 -1
  67. package/build/lib/extension/extension-config.js +30 -30
  68. package/build/lib/extension/extension-config.js.map +1 -1
  69. package/build/lib/extension/index.d.ts.map +1 -1
  70. package/build/lib/extension/index.js +28 -41
  71. package/build/lib/extension/index.js.map +1 -1
  72. package/build/lib/extension/manifest.d.ts +3 -2
  73. package/build/lib/extension/manifest.d.ts.map +1 -1
  74. package/build/lib/extension/manifest.js +20 -24
  75. package/build/lib/extension/manifest.js.map +1 -1
  76. package/build/lib/extension/plugin-config.d.ts.map +1 -1
  77. package/build/lib/extension/plugin-config.js +7 -9
  78. package/build/lib/extension/plugin-config.js.map +1 -1
  79. package/build/lib/helpers/build.d.ts +0 -1
  80. package/build/lib/helpers/build.d.ts.map +1 -1
  81. package/build/lib/helpers/build.js +2 -4
  82. package/build/lib/helpers/build.js.map +1 -1
  83. package/build/lib/helpers/capability.d.ts.map +1 -1
  84. package/build/lib/helpers/capability.js +27 -22
  85. package/build/lib/helpers/capability.js.map +1 -1
  86. package/build/lib/helpers/network.d.ts.map +1 -1
  87. package/build/lib/helpers/network.js +4 -3
  88. package/build/lib/helpers/network.js.map +1 -1
  89. package/build/lib/insecure-features.d.ts.map +1 -1
  90. package/build/lib/insecure-features.js +9 -13
  91. package/build/lib/insecure-features.js.map +1 -1
  92. package/build/lib/inspector-commands.d.ts.map +1 -1
  93. package/build/lib/inspector-commands.js +29 -28
  94. package/build/lib/inspector-commands.js.map +1 -1
  95. package/build/lib/logsink.d.ts.map +1 -1
  96. package/build/lib/logsink.js +8 -7
  97. package/build/lib/logsink.js.map +1 -1
  98. package/build/lib/schema/arg-spec.d.ts.map +1 -1
  99. package/build/lib/schema/arg-spec.js +5 -8
  100. package/build/lib/schema/arg-spec.js.map +1 -1
  101. package/build/lib/schema/cli-args.d.ts.map +1 -1
  102. package/build/lib/schema/cli-args.js +20 -19
  103. package/build/lib/schema/cli-args.js.map +1 -1
  104. package/build/lib/schema/cli-transformers.d.ts.map +1 -1
  105. package/build/lib/schema/cli-transformers.js.map +1 -1
  106. package/build/lib/schema/schema.d.ts.map +1 -1
  107. package/build/lib/schema/schema.js +28 -21
  108. package/build/lib/schema/schema.js.map +1 -1
  109. package/build/lib/utils/hash.d.ts +5 -0
  110. package/build/lib/utils/hash.d.ts.map +1 -0
  111. package/build/lib/{utils.js → utils/hash.js} +3 -21
  112. package/build/lib/utils/hash.js.map +1 -0
  113. package/build/lib/utils/index.d.ts +8 -0
  114. package/build/lib/utils/index.d.ts.map +1 -0
  115. package/build/lib/utils/index.js +31 -0
  116. package/build/lib/utils/index.js.map +1 -0
  117. package/build/lib/utils/is-package-changed.d.ts +16 -0
  118. package/build/lib/utils/is-package-changed.d.ts.map +1 -0
  119. package/build/lib/utils/is-package-changed.js +62 -0
  120. package/build/lib/utils/is-package-changed.js.map +1 -0
  121. package/build/lib/utils/object.d.ts +120 -0
  122. package/build/lib/utils/object.d.ts.map +1 -0
  123. package/build/lib/utils/object.js +288 -0
  124. package/build/lib/utils/object.js.map +1 -0
  125. package/build/lib/{extension → utils}/package-changed.d.ts +0 -1
  126. package/build/lib/utils/package-changed.d.ts.map +1 -0
  127. package/build/lib/{extension → utils}/package-changed.js +3 -4
  128. package/build/lib/utils/package-changed.js.map +1 -0
  129. package/build/lib/utils/package-json.d.ts +9 -0
  130. package/build/lib/utils/package-json.d.ts.map +1 -0
  131. package/build/lib/utils/package-json.js +32 -0
  132. package/build/lib/utils/package-json.js.map +1 -0
  133. package/build/lib/utils/resolve-from.d.ts +11 -0
  134. package/build/lib/utils/resolve-from.d.ts.map +1 -0
  135. package/build/lib/utils/resolve-from.js +41 -0
  136. package/build/lib/utils/resolve-from.js.map +1 -0
  137. package/build/types/cli.d.ts.map +1 -1
  138. package/build/types/index.d.ts.map +1 -1
  139. package/build/types/manifest/base.d.ts.map +1 -1
  140. package/build/types/manifest/v3.d.ts.map +1 -1
  141. package/build/types/manifest/v4.d.ts.map +1 -1
  142. package/lib/appium.ts +96 -61
  143. package/lib/bidi-commands.ts +107 -61
  144. package/lib/bootstrap/appium-initializer.ts +27 -19
  145. package/lib/bootstrap/appium-main-runner.ts +8 -4
  146. package/lib/bootstrap/config-file.ts +33 -16
  147. package/lib/bootstrap/grid-v3-register.ts +26 -19
  148. package/lib/bootstrap/main-helpers.ts +25 -19
  149. package/lib/bootstrap/node-helpers.ts +20 -24
  150. package/lib/bootstrap/startup-config.ts +42 -39
  151. package/lib/cli/args.ts +3 -4
  152. package/lib/cli/driver-command.ts +19 -13
  153. package/lib/cli/extension-command.ts +214 -149
  154. package/lib/cli/extension.ts +4 -6
  155. package/lib/cli/parser.ts +32 -30
  156. package/lib/cli/plugin-command.ts +20 -9
  157. package/lib/cli/setup-command.ts +54 -39
  158. package/lib/cli/utils.ts +4 -3
  159. package/lib/doctor/doctor.ts +15 -17
  160. package/lib/extension/driver-config.ts +22 -17
  161. package/lib/extension/extension-config.ts +76 -69
  162. package/lib/extension/index.ts +60 -51
  163. package/lib/extension/manifest.ts +35 -33
  164. package/lib/extension/plugin-config.ts +15 -10
  165. package/lib/helpers/build.ts +6 -5
  166. package/lib/helpers/capability.ts +40 -35
  167. package/lib/helpers/network.ts +6 -5
  168. package/lib/insecure-features.ts +16 -14
  169. package/lib/inspector-commands.ts +72 -40
  170. package/lib/logsink.ts +22 -26
  171. package/lib/schema/arg-spec.ts +9 -8
  172. package/lib/schema/cli-args-guards.ts +4 -4
  173. package/lib/schema/cli-args.ts +25 -21
  174. package/lib/schema/cli-transformers.ts +6 -2
  175. package/lib/schema/format-errors.ts +1 -1
  176. package/lib/schema/schema.ts +52 -38
  177. package/lib/{utils.ts → utils/hash.ts} +2 -19
  178. package/lib/utils/index.ts +23 -0
  179. package/lib/utils/is-package-changed.ts +78 -0
  180. package/lib/utils/object.ts +312 -0
  181. package/lib/{extension → utils}/package-changed.ts +6 -7
  182. package/lib/utils/package-json.ts +36 -0
  183. package/lib/utils/resolve-from.ts +40 -0
  184. package/package.json +16 -19
  185. package/scripts/autoinstall-extensions.js +8 -13
  186. package/tsconfig.json +8 -2
  187. package/types/cli.ts +18 -18
  188. package/types/index.ts +2 -2
  189. package/types/manifest/base.ts +2 -2
  190. package/types/manifest/v3.ts +2 -2
  191. package/types/manifest/v4.ts +2 -2
  192. package/build/lib/extension/package-changed.d.ts.map +0 -1
  193. package/build/lib/extension/package-changed.js.map +0 -1
  194. package/build/lib/utils.d.ts +0 -13
  195. package/build/lib/utils.d.ts.map +0 -1
  196. package/build/lib/utils.js.map +0 -1
@@ -8,8 +8,9 @@ exports.onBidiConnection = onBidiConnection;
8
8
  exports.onBidiMessage = onBidiMessage;
9
9
  exports.onBidiServerError = onBidiServerError;
10
10
  exports.cleanupBidiSockets = cleanupBidiSockets;
11
- const lodash_1 = __importDefault(require("lodash"));
12
- const bluebird_1 = __importDefault(require("bluebird"));
11
+ const support_1 = require("@appium/support");
12
+ const node_util_1 = require("node:util");
13
+ const utils_1 = require("./utils");
13
14
  const base_driver_1 = require("@appium/base-driver");
14
15
  const constants_1 = require("./constants");
15
16
  const ws_1 = __importDefault(require("ws"));
@@ -32,8 +33,7 @@ function determineBiDiHost(address) {
32
33
  if (!(0, network_1.isBroadcastIp)(address)) {
33
34
  return address;
34
35
  }
35
- const nonLocalInterfaces = (0, network_1.fetchInterfaces)(address === network_1.V4_BROADCAST_IP ? 4 : 6)
36
- .filter((iface) => !iface.internal);
36
+ const nonLocalInterfaces = (0, network_1.fetchInterfaces)(address === network_1.V4_BROADCAST_IP ? 4 : 6).filter((iface) => !iface.internal);
37
37
  return nonLocalInterfaces.length === 1 ? nonLocalInterfaces[0].address : node_os_1.default.hostname();
38
38
  }
39
39
  /**
@@ -45,16 +45,13 @@ function onBidiConnection(ws, req) {
45
45
  try {
46
46
  const initBiDiSocketFunc = initBidiSocket.bind(this);
47
47
  const { bidiHandlerDriver, bidiHandlerPlugins, proxyClient, send, sendToProxy, logSocketErr } = initBiDiSocketFunc(ws, req);
48
- const initBidiSocketHandlersFunc = initBidiSocketHandlers
49
- .bind(this);
48
+ const initBidiSocketHandlersFunc = initBidiSocketHandlers.bind(this);
50
49
  initBidiSocketHandlersFunc(ws, proxyClient, send, sendToProxy, bidiHandlerDriver, bidiHandlerPlugins, logSocketErr);
51
50
  if (proxyClient) {
52
- const initBidiProxyHandlersFunc = initBidiProxyHandlers
53
- .bind(bidiHandlerDriver);
51
+ const initBidiProxyHandlersFunc = initBidiProxyHandlers.bind(bidiHandlerDriver);
54
52
  initBidiProxyHandlersFunc(proxyClient, ws, send);
55
53
  }
56
- const initBidiEventListenersFunc = initBidiEventListeners
57
- .bind(this);
54
+ const initBidiEventListenersFunc = initBidiEventListeners.bind(this);
58
55
  initBidiEventListenersFunc(ws, bidiHandlerDriver, bidiHandlerPlugins, send);
59
56
  }
60
57
  catch (err) {
@@ -74,7 +71,7 @@ async function onBidiMessage(data, driver, plugins) {
74
71
  let resMessage;
75
72
  let id = 0;
76
73
  const driverLog = driver.log;
77
- const dataTruncated = lodash_1.default.truncate(data.toString(), { length: MAX_LOGGED_DATA_LENGTH });
74
+ const dataTruncated = support_1.util.truncateString(data.toString(), { length: MAX_LOGGED_DATA_LENGTH });
78
75
  try {
79
76
  let method;
80
77
  let params;
@@ -82,7 +79,8 @@ async function onBidiMessage(data, driver, plugins) {
82
79
  ({ id, method, params } = JSON.parse(data.toString('utf8')));
83
80
  }
84
81
  catch (err) {
85
- throw new base_driver_1.errors.InvalidArgumentError(`Could not parse Bidi command '${dataTruncated}': ${err.message}`);
82
+ const message = err instanceof Error ? err.message : String(err);
83
+ throw new base_driver_1.errors.InvalidArgumentError(`Could not parse Bidi command '${dataTruncated}': ${message}`);
86
84
  }
87
85
  driverLog.info(`--> BIDI message #${id}`);
88
86
  if (!method) {
@@ -100,15 +98,21 @@ async function onBidiMessage(data, driver, plugins) {
100
98
  };
101
99
  }
102
100
  catch (err) {
103
- resMessage = lodash_1.default.has(err, 'bidiErrObject')
104
- ? err.bidiErrObject(id)
105
- : {
101
+ if (err !== null &&
102
+ typeof err === 'object' &&
103
+ 'bidiErrObject' in err &&
104
+ typeof err.bidiErrObject === 'function') {
105
+ resMessage = err.bidiErrObject(id);
106
+ }
107
+ else {
108
+ resMessage = {
106
109
  id,
107
110
  type: 'error',
108
111
  error: base_driver_1.errors.UnknownError.error(),
109
- message: err.message,
110
- stacktrace: err.stack,
112
+ message: err instanceof Error ? err.message : String(err),
113
+ stacktrace: err instanceof Error ? err.stack : undefined,
111
114
  };
115
+ }
112
116
  }
113
117
  driverLog.info(`<-- BIDI message #${id}`);
114
118
  return resMessage;
@@ -234,14 +238,14 @@ function initBidiSocket(ws, req) {
234
238
  // 1. Make it async-await friendly
235
239
  // 2. Do some logging if there's a send error
236
240
  const sendFactory = (socket) => {
237
- const socketSend = bluebird_1.default.promisify(socket.send, { context: socket });
241
+ const socketSend = (0, node_util_1.promisify)(socket.send.bind(socket));
238
242
  return async (data) => {
239
243
  try {
240
244
  await assertIsOpen(socket);
241
245
  await socketSend(data);
242
246
  }
243
247
  catch (err) {
244
- logSocketErr(err);
248
+ logSocketErr(err instanceof Error ? err : new Error(String(err)));
245
249
  }
246
250
  };
247
251
  };
@@ -273,8 +277,8 @@ function initBidiProxyHandlers(proxyClient, ws, send) {
273
277
  proxyClient.on('close', (code, reason) => {
274
278
  driverLog.debug(`Upstream bidi socket closed connection (code ${code}, reason: '${reason}'). ` +
275
279
  `Closing proxy connection to client`);
276
- const intCode = lodash_1.default.isNumber(code) ? code : parseInt(code, 10);
277
- if (lodash_1.default.isNaN(intCode) || intCode < MIN_WS_CODE_VAL || intCode > MAX_WS_CODE_VAL) {
280
+ const intCode = typeof code === 'number' ? code : parseInt(code, 10);
281
+ if (Number.isNaN(intCode) || intCode < MIN_WS_CODE_VAL || intCode > MAX_WS_CODE_VAL) {
278
282
  driverLog.warn(`Received code ${code} from upstream socket, but this is not a valid ` +
279
283
  `websocket code. Rewriting to ${WS_FALLBACK_CODE} for ws compatibility`);
280
284
  code = WS_FALLBACK_CODE;
@@ -335,7 +339,7 @@ function initBidiSocketHandlers(ws, proxyClient, send, sendToProxy, bidiHandlerD
335
339
  proxyClient.close(code, reason);
336
340
  }
337
341
  const eventLogCounts = BIDI_EVENTS_MAP.get(bidiHandlerDriver);
338
- if (!lodash_1.default.isEmpty(eventLogCounts)) {
342
+ if (!support_1.util.isEmpty(eventLogCounts)) {
339
343
  driverLog.debug(`BiDi events statistics: ${JSON.stringify(eventLogCounts, null, 2)}`);
340
344
  }
341
345
  });
@@ -355,15 +359,16 @@ function initBidiEventListeners(ws, bidiHandlerDriver, bidiHandlerPlugins, send)
355
359
  const eventLogCounts = BIDI_EVENTS_MAP.get(bidiHandlerDriver) ?? {};
356
360
  BIDI_EVENTS_MAP.set(bidiHandlerDriver, eventLogCounts);
357
361
  const eventListenerFactory = (extType, ext) => {
358
- const eventListener = async ({ context, method, params = {} }) => {
362
+ const eventListener = async ({ context, method, params = {}, }) => {
359
363
  // if the driver didn't specify a context, use the empty context
360
364
  if (!context) {
361
365
  context = '';
362
366
  }
363
367
  if (!method || !params) {
364
- ext.log?.warn(// some old plugins might not have the `log` property
365
- `${lodash_1.default.capitalize(extType)} emitted a bidi event that was malformed. Require method and params keys ` +
366
- `(with optional context). But instead received: ${lodash_1.default.truncate(JSON.stringify({
368
+ ext.log?.warn(
369
+ // some old plugins might not have the `log` property
370
+ `${(0, utils_1.capitalize)(extType)} emitted a bidi event that was malformed. Require method and params keys ` +
371
+ `(with optional context). But instead received: ${support_1.util.truncateString(JSON.stringify({
367
372
  context,
368
373
  method,
369
374
  params,
@@ -381,14 +386,15 @@ function initBidiEventListeners(ws, bidiHandlerDriver, bidiHandlerPlugins, send)
381
386
  return;
382
387
  }
383
388
  const eventSubs = bidiHandlerDriver.bidiEventSubs[method];
384
- if (lodash_1.default.isArray(eventSubs) && eventSubs.includes(context)) {
389
+ if (Array.isArray(eventSubs) && eventSubs.includes(context)) {
385
390
  if (method in eventLogCounts) {
386
391
  ++eventLogCounts[method];
387
392
  }
388
393
  else {
389
- ext.log?.debug(// some old plugins might not have the `log` property
394
+ ext.log?.debug(
395
+ // some old plugins might not have the `log` property
390
396
  `<-- BIDI EVENT ${method} (context: '${context}', ` +
391
- `params: ${lodash_1.default.truncate(JSON.stringify(params), { length: MAX_LOGGED_DATA_LENGTH })}). ` +
397
+ `params: ${support_1.util.truncateString(JSON.stringify(params), { length: MAX_LOGGED_DATA_LENGTH })}). ` +
392
398
  `All further similar events won't be logged.`);
393
399
  eventLogCounts[method] = 1;
394
400
  }
@@ -417,8 +423,7 @@ async function assertIsOpen(ws, timeoutMs = 5000) {
417
423
  // The socket is in CONNECTING state. Wait up to `timeoutMs` until it is open
418
424
  try {
419
425
  await new Promise((resolve, reject) => {
420
- setTimeout(() => reject(new Error(`The BiDi web socket at ${ws.url} did not ` +
421
- `open after ${timeoutMs}ms timeout`)), timeoutMs);
426
+ setTimeout(() => reject(new Error(`The BiDi web socket at ${ws.url} did not ` + `open after ${timeoutMs}ms timeout`)), timeoutMs);
422
427
  ws.once('error', reject);
423
428
  errorListener = reject;
424
429
  ws.once('open', resolve);
@@ -1 +1 @@
1
- {"version":3,"file":"bidi-commands.js","sourceRoot":"","sources":["../../lib/bidi-commands.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"bidi-commands.js","sourceRoot":"","sources":["../../lib/bidi-commands.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"appium-initializer.d.ts","sourceRoot":"","sources":["../../../lib/bootstrap/appium-initializer.ts"],"names":[],"mappings":"AAuBA,OAAO,KAAK,EACV,IAAI,EACJ,UAAU,EACV,gBAAgB,EAChB,yBAAyB,EACzB,sBAAsB,EAEvB,MAAM,cAAc,CAAC;AAEtB,OAAO,KAAK,EAAC,UAAU,EAAgB,MAAM,cAAc,CAAC;AAE5D;;GAEG;AACH,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,kBAAkB,CAAS;IAEnC;;;;;OAKG;IACG,IAAI,CACR,GAAG,SAAS,UAAU,GAAG,gBAAgB,EACzC,MAAM,SAAS,sBAAsB,GAAG,yBAAyB,GAAG,IAAI,GAAG,IAAI,EAC/E,IAAI,CAAC,EAAE,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YAsCvC,kBAAkB;IAoBhC,OAAO,CAAC,kBAAkB;YAQZ,gBAAgB;YAkDhB,eAAe;YAsBf,uBAAuB;CAwBtC"}
1
+ {"version":3,"file":"appium-initializer.d.ts","sourceRoot":"","sources":["../../../lib/bootstrap/appium-initializer.ts"],"names":[],"mappings":"AAuBA,OAAO,KAAK,EACV,IAAI,EACJ,UAAU,EACV,gBAAgB,EAChB,yBAAyB,EACzB,sBAAsB,EAEvB,MAAM,cAAc,CAAC;AAEtB,OAAO,KAAK,EAAC,UAAU,EAAgB,MAAM,cAAc,CAAC;AAE5D;;GAEG;AACH,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,kBAAkB,CAAS;IAEnC;;;;;OAKG;IACG,IAAI,CACR,GAAG,SAAS,UAAU,GAAG,gBAAgB,EACzC,MAAM,SAAS,sBAAsB,GAAG,yBAAyB,GAAG,IAAI,GAAG,IAAI,EAC/E,IAAI,CAAC,EAAE,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YAsCvC,kBAAkB;IAyBhC,OAAO,CAAC,kBAAkB;YAQZ,gBAAgB;YAuDhB,eAAe;YAoBf,uBAAuB;CAwBtC"}
@@ -1,13 +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.AppiumInitializer = void 0;
7
4
  const logsink_1 = require("../logsink");
8
5
  const logger_1 = require("../logger");
9
6
  const support_1 = require("@appium/support");
10
- const lodash_1 = __importDefault(require("lodash"));
7
+ const utils_1 = require("../utils");
11
8
  const appium_1 = require("../appium");
12
9
  const extension_1 = require("../cli/extension");
13
10
  const setup_command_1 = require("../cli/setup-command");
@@ -62,20 +59,23 @@ class AppiumInitializer {
62
59
  throwInsteadOfExit = true;
63
60
  delete args.throwInsteadOfExit;
64
61
  }
65
- const preConfigArgs = { ...args, subcommand: args.subcommand ?? constants_1.SERVER_SUBCOMMAND };
62
+ const preConfigArgs = {
63
+ ...args,
64
+ subcommand: args.subcommand ?? constants_1.SERVER_SUBCOMMAND,
65
+ };
66
66
  parser_1.ArgParser.normalizeServerArgs(preConfigArgs);
67
67
  return { preConfigArgs, throwInsteadOfExit };
68
68
  }
69
69
  return { preConfigArgs: parser.parseArgs(), throwInsteadOfExit };
70
70
  }
71
71
  assertConfigFileOk(configResult) {
72
- if (!lodash_1.default.isEmpty(configResult.errors)) {
72
+ if (!support_1.util.isEmpty(configResult.errors)) {
73
73
  throw new Error(`Errors in config file ${configResult.filepath}:\n ${configResult.reason ?? configResult.errors}`);
74
74
  }
75
75
  }
76
76
  async finishServerInit(preConfigArgs, configResult, driverConfig, pluginConfig, appiumHome, appiumHomeSourceName) {
77
77
  const defaults = (0, schema_1.getDefaultsForSchema)(false);
78
- const serverArgs = lodash_1.default.defaultsDeep({}, preConfigArgs, configResult.config?.server, defaults);
78
+ const serverArgs = (0, utils_1.defaultsDeep)({}, preConfigArgs, configResult.config?.server, defaults);
79
79
  if (preConfigArgs.showConfig) {
80
80
  (0, startup_config_1.showConfig)((0, startup_config_1.getNonDefaultServerArgs)(preConfigArgs), configResult, defaults, serverArgs);
81
81
  return {};
@@ -108,14 +108,14 @@ class AppiumInitializer {
108
108
  if (!serverArgs.logFilters) {
109
109
  return;
110
110
  }
111
- const { issues, rules } = await logger_1.log.unwrap().loadSecureValuesPreprocessingRules(serverArgs.logFilters);
112
- const argToLog = lodash_1.default.truncate(JSON.stringify(serverArgs.logFilters), {
113
- length: 150,
114
- });
115
- if (!lodash_1.default.isEmpty(issues)) {
111
+ const { issues, rules } = await logger_1.log
112
+ .unwrap()
113
+ .loadSecureValuesPreprocessingRules(serverArgs.logFilters);
114
+ const argToLog = support_1.util.truncateString(JSON.stringify(serverArgs.logFilters), { length: 150 });
115
+ if (!support_1.util.isEmpty(issues)) {
116
116
  throw new Error(`The log filtering rules config ${argToLog} has issues: ` + JSON.stringify(issues, null, 2));
117
117
  }
118
- if (lodash_1.default.isEmpty(rules)) {
118
+ if (support_1.util.isEmpty(rules)) {
119
119
  logger_1.log.warn(`Found no log filtering rules in the ${argToLog} config. ` + `Is that expected?`);
120
120
  }
121
121
  else {
@@ -1 +1 @@
1
- {"version":3,"file":"appium-initializer.js","sourceRoot":"","sources":["../../../lib/bootstrap/appium-initializer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"appium-initializer.js","sourceRoot":"","sources":["../../../lib/bootstrap/appium-initializer.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"appium-main-runner.d.ts","sourceRoot":"","sources":["../../../lib/bootstrap/appium-main-runner.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAUhD,OAAO,KAAK,EAAC,UAAU,EAAiB,MAAM,cAAc,CAAC;AAC7D,OAAO,KAAK,EACV,IAAI,EACJ,UAAU,EACV,gBAAgB,EAChB,yBAAyB,EACzB,sBAAsB,EACvB,MAAM,cAAc,CAAC;AAMtB;;GAEG;AACH,qBAAa,gBAAgB;IAC3B;;;;;;OAMG;IACG,GAAG,CACP,GAAG,SAAS,UAAU,GAAG,gBAAgB,EACzC,MAAM,SAAS,sBAAsB,GAAG,yBAAyB,GAAG,IAAI,GAAG,IAAI,EAC/E,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,GAAG,SAAS,gBAAgB,GAAG,YAAY,GAAG,IAAI,CAAC;YAqDvG,eAAe;IAoB7B,OAAO,CAAC,iBAAiB;YAUX,mBAAmB;IAoBjC,OAAO,CAAC,oBAAoB;IAoB5B,OAAO,CAAC,eAAe;CASxB"}
1
+ {"version":3,"file":"appium-main-runner.d.ts","sourceRoot":"","sources":["../../../lib/bootstrap/appium-main-runner.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAUhD,OAAO,KAAK,EAAC,UAAU,EAAiB,MAAM,cAAc,CAAC;AAC7D,OAAO,KAAK,EACV,IAAI,EACJ,UAAU,EACV,gBAAgB,EAChB,yBAAyB,EACzB,sBAAsB,EACvB,MAAM,cAAc,CAAC;AAMtB;;GAEG;AACH,qBAAa,gBAAgB;IAC3B;;;;;;OAMG;IACG,GAAG,CACP,GAAG,SAAS,UAAU,GAAG,gBAAgB,EACzC,MAAM,SAAS,sBAAsB,GAAG,yBAAyB,GAAG,IAAI,GAAG,IAAI,EAE/E,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,EAC3B,IAAI,CAAC,EAAE,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,GACvB,OAAO,CAAC,GAAG,SAAS,gBAAgB,GAAG,YAAY,GAAG,IAAI,CAAC;YAsDhD,eAAe;IAoB7B,OAAO,CAAC,iBAAiB;YAUX,mBAAmB;IAoBjC,OAAO,CAAC,oBAAoB;IAoB5B,OAAO,CAAC,eAAe;CASxB"}
@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.AppiumMainRunner = void 0;
7
7
  const logger_1 = require("../logger");
8
- const lodash_1 = __importDefault(require("lodash"));
8
+ const support_1 = require("@appium/support");
9
9
  const extension_1 = require("../extension");
10
10
  const grid_v3_register_1 = __importDefault(require("./grid-v3-register"));
11
11
  const main_helpers_1 = require("./main-helpers");
@@ -23,7 +23,7 @@ class AppiumMainRunner {
23
23
  * @param args - Original args (used to describe `appiumHome` source in logs)
24
24
  */
25
25
  async run(initResult, args) {
26
- if (lodash_1.default.isEmpty(initResult)) {
26
+ if (support_1.util.isEmpty(initResult)) {
27
27
  return undefined;
28
28
  }
29
29
  const { appiumDriver, pluginConfig, driverConfig, parsedArgs, appiumHome } = initResult;
@@ -1 +1 @@
1
- {"version":3,"file":"appium-main-runner.js","sourceRoot":"","sources":["../../../lib/bootstrap/appium-main-runner.ts"],"names":[],"mappings":";;;;;;AAAA,sCAAwC;AACxC,oDAAuB;AAEvB,4CAAgE;AAChE,0EAA8C;AAC9C,iDAMwB;AAUxB,wDAA2B;AAE3B,MAAM,4BAA4B,GAAG,GAAG,CAAC;AAEzC;;GAEG;AACH,MAAa,gBAAgB;IAC3B;;;;;;OAMG;IACH,KAAK,CAAC,GAAG,CAGP,UAA2B,EAAE,IAAwB;QACrD,IAAI,gBAAC,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;YAC1B,OAAO,SAA+D,CAAC;QACzE,CAAC;QAED,MAAM,EAAC,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAC,GAAG,UAA4B,CAAC;QAExG,MAAM,aAAa,GAAG,MAAM,IAAA,4BAAgB,EAC1C,YAAY,EACZ,UAAU,CAAC,sBAAsB,EACjC,UAAU,CAAC,UAAU,CACtB,CAAC;QACF,KAAK,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,aAAa,EAAE,CAAC;YAChD,YAAY,CAAC,aAAa,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QACpD,CAAC;QAED,MAAM,IAAA,6BAAc,EAAC,UAAU,CAAC,CAAC;QAEjC,YAAY,CAAC,uBAAuB,EAAE,CAAC;QAEvC,MAAM,oBAAoB,GAAG,IAAA,wCAAyB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACzE,YAAM,CAAC,KAAK,CAAC,OAAO,oBAAoB,KAAK,UAAU,EAAE,CAAC,CAAC;QAE3D,MAAM,aAAa,GAAG,MAAM,IAAA,4BAAgB,EAC1C,YAAY,EACZ,UAAU,CAAC,sBAAsB,EACjC,UAAU,CAAC,UAAU,CACtB,CAAC;QACF,MAAM,EAAC,UAAU,EAAE,kBAAkB,EAAC,GAAG,IAAA,8BAAe,EACtD,YAAY,EACZ,UAAU,EACV,aAAa,EACb,aAAa,CACd,CAAC;QAEF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,YAAY,EAAE,kBAAkB,CAAC,CAAC;QACxF,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,SAA+D,CAAC;QACzE,CAAC;QAED,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;QACnC,YAAY,CAAC,MAAM,GAAG,MAAM,CAAC;QAE7B,MAAM,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,UAAU,EAAE,kBAAkB,CAAC,CAAC;QACvE,IAAI,CAAC,oBAAoB,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QAChD,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,UAAU,EAAE,kBAAkB,CAAC,CAAC;QAE7D,YAAY,CAAC,KAAK,EAAE,CAAC;QACrB,YAAY,CAAC,KAAK,CAAC,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAEhD,OAAO,MAA4D,CAAC;IACtE,CAAC;IAEO,KAAK,CAAC,eAAe,CAC3B,UAAsB,EACtB,YAA4C,EAC5C,kBAA0B;QAE1B,IAAI,CAAC;YACH,OAAO,MAAM,IAAA,iCAAkB,EAAC,UAAU,EAAE,YAAY,EAAE,kBAAkB,CAAC,CAAC;QAChF,CAAC;QAAC,OAAO,GAAY,EAAE,CAAC;YACtB,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACjE,MAAM,KAAK,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;YAC3D,YAAM,CAAC,KAAK,CACV,iFAAiF;gBAC/E,oDAAoD,OAAO,EAAE,CAChE,CAAC;YACF,YAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACpB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAChB,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;IAEO,iBAAiB,CAAC,UAAwC;QAChE,IAAI,UAAU,CAAC,SAAS,EAAE,CAAC;YACzB,YAAM,CAAC,IAAI,CACT,+DAA+D;gBAC7D,6DAA6D;gBAC7D,0BAA0B,CAC7B,CAAC;QACJ,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAC/B,MAAoB,EACpB,UAAwC,EACxC,kBAA0B;QAE1B,IAAI,CAAC;YACH,IAAI,UAAU,CAAC,UAAU,EAAE,CAAC;gBAC1B,MAAM,IAAA,0BAAY,EAChB,UAAU,CAAC,UAAU,EACrB,UAAU,CAAC,OAAO,EAClB,UAAU,CAAC,IAAI,EACf,kBAAkB,CACnB,CAAC;YACJ,CAAC;QACH,CAAC;QAAC,OAAO,GAAY,EAAE,CAAC;YACtB,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;YACrB,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC;IAEO,oBAAoB,CAC1B,YAA4C,EAC5C,MAAoB;QAEpB,OAAO,CAAC,eAAe,CAAC,4BAA4B,CAAC,CAAC;QACtD,KAAK,MAAM,MAAM,IAAI,CAAC,QAAQ,EAAE,SAAS,CAAU,EAAE,CAAC;YACpD,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,UAAU,QAAQ;gBAC1C,YAAM,CAAC,IAAI,CAAC,YAAY,MAAM,kBAAkB,CAAC,CAAC;gBAClD,IAAI,CAAC;oBACH,MAAM,YAAY,CAAC,QAAQ,CAAC,4BAA4B,MAAM,SAAS,CAAC,CAAC;oBACzE,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;oBACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAClB,CAAC;gBAAC,OAAO,CAAU,EAAE,CAAC;oBACpB,YAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;oBACf,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAClB,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAEO,eAAe,CACrB,MAAoB,EACpB,UAAwC,EACxC,kBAA0B;QAE1B,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;QACtD,MAAM,OAAO,GAAG,kBAAG,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,UAAU,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC;QAChG,IAAA,+BAAgB,EAAC,GAAG,QAAQ,MAAM,OAAO,IAAI,UAAU,CAAC,IAAI,GAAG,kBAAkB,EAAE,CAAC,CAAC;IACvF,CAAC;CACF;AA/ID,4CA+IC"}
1
+ {"version":3,"file":"appium-main-runner.js","sourceRoot":"","sources":["../../../lib/bootstrap/appium-main-runner.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"config-file.d.ts","sourceRoot":"","sources":["../../../lib/bootstrap/config-file.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AAC7D,OAAO,KAAK,EAAC,WAAW,EAAe,MAAM,KAAK,CAAC;AAInD,OAAO,KAAK,EAAC,YAAY,EAAE,sBAAsB,EAAC,MAAM,eAAe,CAAC;AAWxE;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,MAAM,CAAC,EAAE,WAAW,EAAE,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,sBAAsB,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,GAAG,YAAY,EAAE,CAAC;CAClC;AAED;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAOD;;;;;;;;GAQG;AACH,wBAAsB,cAAc,CAClC,QAAQ,CAAC,EAAE,MAAM,EACjB,IAAI,GAAE,qBAA0B,GAC/B,OAAO,CAAC,oBAAoB,CAAC,CAsC/B;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,YAAY,GAAG,sBAAsB,CAwB5E"}
1
+ {"version":3,"file":"config-file.d.ts","sourceRoot":"","sources":["../../../lib/bootstrap/config-file.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AAC7D,OAAO,KAAK,EAAC,WAAW,EAAe,MAAM,KAAK,CAAC;AAKnD,OAAO,KAAK,EAAC,YAAY,EAAE,sBAAsB,EAAC,MAAM,eAAe,CAAC;AAWxE;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,MAAM,CAAC,EAAE,WAAW,EAAE,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,sBAAsB,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,GAAG,YAAY,EAAE,CAAC;CAClC;AAED;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAOD;;;;;;;;GAQG;AACH,wBAAsB,cAAc,CAClC,QAAQ,CAAC,EAAE,MAAM,EACjB,IAAI,GAAE,qBAA0B,GAC/B,OAAO,CAAC,oBAAoB,CAAC,CAsC/B;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,YAAY,GAAG,sBAAsB,CAoC5E"}
@@ -32,15 +32,13 @@ var __importStar = (this && this.__importStar) || (function () {
32
32
  return result;
33
33
  };
34
34
  })();
35
- var __importDefault = (this && this.__importDefault) || function (mod) {
36
- return (mod && mod.__esModule) ? mod : { "default": mod };
37
- };
38
35
  Object.defineProperty(exports, "__esModule", { value: true });
39
36
  exports.readConfigFile = readConfigFile;
40
37
  exports.normalizeConfig = normalizeConfig;
41
38
  const lilconfig_1 = require("lilconfig");
42
- const lodash_1 = __importDefault(require("lodash"));
39
+ const support_1 = require("@appium/support");
43
40
  const yaml = __importStar(require("yaml"));
41
+ const utils_1 = require("../utils");
44
42
  const schema_1 = require("../schema/schema");
45
43
  const format_errors_1 = require("../schema/format-errors");
46
44
  /**
@@ -74,7 +72,7 @@ async function readConfigFile(filepath, opts = {}) {
74
72
  try {
75
73
  let configResult;
76
74
  const errors = (0, schema_1.validate)(result.config);
77
- if (lodash_1.default.isEmpty(errors)) {
75
+ if (support_1.util.isEmpty(errors)) {
78
76
  configResult = { ...result, errors };
79
77
  }
80
78
  else {
@@ -103,13 +101,14 @@ async function readConfigFile(filepath, opts = {}) {
103
101
  */
104
102
  function normalizeConfig(config) {
105
103
  const schema = (0, schema_1.getSchema)();
106
- const isSchemaTypeObject = (schemaObj) => Boolean(schemaObj?.properties || schemaObj?.type === 'object');
104
+ const isSchemaTypeObject = (schemaObj) => Boolean(schemaObj?.properties ||
105
+ schemaObj?.type === 'object');
107
106
  const normalize = (rootConfig, section) => {
108
- const obj = lodash_1.default.isUndefined(section)
107
+ const obj = section === undefined
109
108
  ? rootConfig
110
- : lodash_1.default.get(rootConfig, section, rootConfig);
111
- const mappedObj = lodash_1.default.mapKeys(obj, (_v, prop) => lodash_1.default.get(schema, `properties.server.properties[${prop}].appiumCliDest`, lodash_1.default.camelCase(prop)));
112
- return lodash_1.default.mapValues(mappedObj, (value, property) => {
109
+ : (0, utils_1.getPath)(rootConfig, section, rootConfig);
110
+ const mappedObj = (0, utils_1.mapKeys)(obj, (_v, prop) => String((0, utils_1.getPath)(schema, `properties.server.properties.${prop}.appiumCliDest`, (0, utils_1.camelCase)(String(prop)))));
111
+ return (0, utils_1.mapValues)(mappedObj, (value, property) => {
113
112
  const nextSection = section ? `${section}.${property}` : property;
114
113
  return isSchemaTypeObject(schema.properties?.[property])
115
114
  ? normalize(rootConfig, nextSection)
@@ -153,7 +152,8 @@ async function loadConfigFile(lc, filepath) {
153
152
  }
154
153
  catch (err) {
155
154
  if (err.code === 'ENOENT') {
156
- err.message = `Config file not found at user-provided path: ${filepath}`;
155
+ err.message =
156
+ `Config file not found at user-provided path: ${filepath}`;
157
157
  throw err;
158
158
  }
159
159
  else if (err instanceof SyntaxError) {
@@ -1 +1 @@
1
- {"version":3,"file":"config-file.js","sourceRoot":"","sources":["../../../lib/bootstrap/config-file.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"config-file.js","sourceRoot":"","sources":["../../../lib/bootstrap/config-file.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"grid-v3-register.d.ts","sourceRoot":"","sources":["../../../lib/bootstrap/grid-v3-register.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAkBhD,UAAU,qBAAqB;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,UAAU,eAAgB,SAAQ,YAAY;IAC5C,aAAa,CAAC,EAAE,qBAAqB,CAAC;IACtC,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAOD,wBAA8B,YAAY,CACxC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC,CAAC;AACjB,wBAA8B,YAAY,CACxC,IAAI,EAAE,eAAe,EACrB,IAAI,CAAC,EAAE,MAAM,EACb,IAAI,CAAC,EAAE,MAAM,EACb,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CAAC"}
1
+ {"version":3,"file":"grid-v3-register.d.ts","sourceRoot":"","sources":["../../../lib/bootstrap/grid-v3-register.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAiBhD,UAAU,qBAAqB;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,UAAU,eAAgB,SAAQ,YAAY;IAC5C,aAAa,CAAC,EAAE,qBAAqB,CAAC;IACtC,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAOD,wBAA8B,YAAY,CACxC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC,CAAC;AACjB,wBAA8B,YAAY,CACxC,IAAI,EAAE,eAAe,EACrB,IAAI,CAAC,EAAE,MAAM,EACb,IAAI,CAAC,EAAE,MAAM,EACb,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CAAC"}
@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.default = registerNode;
7
7
  const axios_1 = __importDefault(require("axios"));
8
8
  const support_1 = require("@appium/support");
9
- const lodash_1 = __importDefault(require("lodash"));
10
9
  const logger_1 = require("../logger");
11
10
  /**
12
11
  * Selenium **Grid 3** (legacy hub) node integration.
@@ -46,7 +45,7 @@ async function registerNode(data, addr, port, basePath) {
46
45
  }
47
46
  }
48
47
  let configHolder;
49
- if (lodash_1.default.isString(data)) {
48
+ if (typeof data === 'string') {
50
49
  const configFilePath = data;
51
50
  let fileContent;
52
51
  try {
@@ -95,11 +94,13 @@ async function registerToGrid(postOptions, configHolder) {
95
94
  }
96
95
  function postRequest(configHolder, addr, port, basePath) {
97
96
  // Move Selenium Grid 3 (flat) configuration properties into `configuration`
98
- if (!lodash_1.default.has(configHolder, 'configuration')) {
97
+ if (configHolder != null &&
98
+ typeof configHolder === 'object' &&
99
+ !Object.hasOwn(configHolder, 'configuration')) {
99
100
  const configuration = {};
100
101
  const holder = configHolder;
101
- for (const property in holder) {
102
- if (lodash_1.default.has(holder, property) && property !== 'capabilities') {
102
+ for (const property of Object.keys(holder)) {
103
+ if (property !== 'capabilities') {
103
104
  configuration[property] = holder[property];
104
105
  delete holder[property];
105
106
  }
@@ -135,7 +136,9 @@ function postRequest(configHolder, addr, port, basePath) {
135
136
  return;
136
137
  }
137
138
  const registerCycleInterval = cfg.registerCycle;
138
- if (registerCycleInterval === undefined || isNaN(registerCycleInterval) || registerCycleInterval <= 0) {
139
+ if (registerCycleInterval === undefined ||
140
+ isNaN(registerCycleInterval) ||
141
+ registerCycleInterval <= 0) {
139
142
  logger_1.log.warn(`'registerCycle' is not a valid positive number. ` +
140
143
  `No registration request will be sent to the Selenium Grid 3 hub.`);
141
144
  return;
@@ -1 +1 @@
1
- {"version":3,"file":"grid-v3-register.js","sourceRoot":"","sources":["../../../lib/bootstrap/grid-v3-register.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"grid-v3-register.js","sourceRoot":"","sources":["../../../lib/bootstrap/grid-v3-register.ts"],"names":[],"mappings":"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"}
@@ -6,7 +6,7 @@ import type { DriverNameMap, PluginNameMap } from '../extension';
6
6
  /**
7
7
  * Logs a value to the console using the info logger (with util.inspect formatting).
8
8
  */
9
- export declare const inspect: (t1: unknown) => void;
9
+ export declare function inspect(value: unknown): void;
10
10
  /**
11
11
  * Prints the current build info JSON to stdout.
12
12
  *
@@ -1 +1 @@
1
- {"version":3,"file":"main-helpers.d.ts","sourceRoot":"","sources":["../../../lib/bootstrap/main-helpers.ts"],"names":[],"mappings":"AAEA,OAAO,EAIL,KAAK,UAAU,EAChB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAC,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,oBAAoB,EAAC,MAAM,eAAe,CAAC;AAGzF,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,WAAW,CAAC;AAO5C,OAAO,KAAK,EAAO,UAAU,EAAE,gBAAgB,EAAC,MAAM,cAAc,CAAC;AACrE,OAAO,KAAK,EAAC,aAAa,EAAE,aAAa,EAAC,MAAM,cAAc,CAAC;AAI/D;;GAEG;AACH,eAAO,MAAM,OAAO,uBASnB,CAAC;AAEF;;;;;GAKG;AACH,wBAAsB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CAInD;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAQpF;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAiBlD;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,UAAU,CAAC,gBAAgB,CAAC,EAClC,kBAAkB,UAAQ,GACzB,OAAO,CAAC,IAAI,CAAC,CAyBf;AAED;;GAEG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,UAAU,CAAC,gBAAgB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAetF;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,aAAa,GAC3B,oBAAoB,EAAE,CAExB;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,aAAa,EAAE,aAAa,EAAE,aAAa,EAAE,aAAa,GAAG,SAAS,CAAC,MAAM,CAAC,CAQ/G;AAED;;GAEG;AACH,wBAAgB,eAAe,CAC7B,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,UAAU,CAAC,gBAAgB,CAAC,EACxC,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,aAAa,GAC3B;IAAC,UAAU,EAAE,UAAU,CAAC;IAAC,kBAAkB,EAAE,MAAM,CAAA;CAAC,CAmBtD;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,YAAY,EAC1B,kBAAkB,EAAE,MAAM,GACzB,OAAO,CAAC,YAAY,CAAC,CASvB"}
1
+ {"version":3,"file":"main-helpers.d.ts","sourceRoot":"","sources":["../../../lib/bootstrap/main-helpers.ts"],"names":[],"mappings":"AAEA,OAAO,EAIL,KAAK,UAAU,EAChB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAC,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,oBAAoB,EAAC,MAAM,eAAe,CAAC;AAGzF,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,WAAW,CAAC;AAO5C,OAAO,KAAK,EAAO,UAAU,EAAE,gBAAgB,EAAC,MAAM,cAAc,CAAC;AACrE,OAAO,KAAK,EAAC,aAAa,EAAE,aAAa,EAAC,MAAM,cAAc,CAAC;AAI/D;;GAEG;AACH,wBAAgB,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI,CAQ5C;AAED;;;;;GAKG;AACH,wBAAsB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CAInD;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAQpF;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAiBlD;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,UAAU,CAAC,gBAAgB,CAAC,EAClC,kBAAkB,UAAQ,GACzB,OAAO,CAAC,IAAI,CAAC,CAyBf;AAED;;GAEG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,UAAU,CAAC,gBAAgB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAetF;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,aAAa,GAC3B,oBAAoB,EAAE,CAIxB;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,aAAa,GAC3B,SAAS,CAAC,MAAM,CAAC,CAQnB;AAED;;GAEG;AACH,wBAAgB,eAAe,CAC7B,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,UAAU,CAAC,gBAAgB,CAAC,EACxC,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,aAAa,GAC3B;IAAC,UAAU,EAAE,UAAU,CAAC;IAAC,kBAAkB,EAAE,MAAM,CAAA;CAAC,CAmBtD;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,YAAY,EAC1B,kBAAkB,EAAE,MAAM,GACzB,OAAO,CAAC,YAAY,CAAC,CASvB"}