nativescript 8.9.0-alpha.3 → 8.9.0-dev.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 (342) hide show
  1. package/config/test-deps-versions-generated.json +1 -1
  2. package/lib/android-tools-info.js +9 -20
  3. package/lib/base-package-manager.js +47 -64
  4. package/lib/bun-package-manager.js +65 -88
  5. package/lib/color.js +2 -2
  6. package/lib/commands/add-platform.js +14 -30
  7. package/lib/commands/apple-login.js +18 -29
  8. package/lib/commands/appstore-list.js +34 -45
  9. package/lib/commands/appstore-upload.js +52 -65
  10. package/lib/commands/build.js +55 -87
  11. package/lib/commands/clean.js +161 -176
  12. package/lib/commands/command-base.js +14 -27
  13. package/lib/commands/config.js +48 -67
  14. package/lib/commands/create-project.js +210 -229
  15. package/lib/commands/debug.js +66 -88
  16. package/lib/commands/deploy.js +28 -44
  17. package/lib/commands/embedding/embed.js +33 -52
  18. package/lib/commands/extensibility/install-extension.js +5 -16
  19. package/lib/commands/extensibility/list-extensions.js +13 -24
  20. package/lib/commands/extensibility/uninstall-extension.js +4 -15
  21. package/lib/commands/fonts.js +30 -41
  22. package/lib/commands/generate-assets.js +13 -28
  23. package/lib/commands/generate-help.js +2 -13
  24. package/lib/commands/generate.js +12 -60
  25. package/lib/commands/info.js +2 -13
  26. package/lib/commands/install.js +34 -49
  27. package/lib/commands/list-platforms.js +14 -25
  28. package/lib/commands/migrate.js +15 -26
  29. package/lib/commands/native-add.js +23 -46
  30. package/lib/commands/platform-clean.js +19 -32
  31. package/lib/commands/plugin/add-plugin.js +12 -25
  32. package/lib/commands/plugin/build-plugin.js +31 -44
  33. package/lib/commands/plugin/create-plugin.js +110 -133
  34. package/lib/commands/plugin/list-plugins.js +22 -33
  35. package/lib/commands/plugin/remove-plugin.js +20 -33
  36. package/lib/commands/plugin/update-plugin.js +20 -33
  37. package/lib/commands/post-install.js +20 -33
  38. package/lib/commands/prepare.js +19 -35
  39. package/lib/commands/preview.js +49 -62
  40. package/lib/commands/remove-platform.js +7 -18
  41. package/lib/commands/resources/resources-update.js +13 -26
  42. package/lib/commands/run.js +55 -76
  43. package/lib/commands/start.js +6 -19
  44. package/lib/commands/test-init.js +123 -134
  45. package/lib/commands/test.js +66 -89
  46. package/lib/commands/typings.js +126 -142
  47. package/lib/commands/update-platform.js +22 -35
  48. package/lib/commands/update.js +30 -43
  49. package/lib/common/child-process.js +53 -72
  50. package/lib/common/codeGeneration/code-entity.js +1 -1
  51. package/lib/common/codeGeneration/code-printer.js +1 -1
  52. package/lib/common/command-params.js +7 -18
  53. package/lib/common/commands/analytics.js +27 -40
  54. package/lib/common/commands/autocompletion.js +39 -56
  55. package/lib/common/commands/device/device-log-stream.js +12 -23
  56. package/lib/common/commands/device/get-file.js +22 -33
  57. package/lib/common/commands/device/list-applications.js +12 -23
  58. package/lib/common/commands/device/list-devices.js +72 -87
  59. package/lib/common/commands/device/list-files.js +23 -34
  60. package/lib/common/commands/device/put-file.js +22 -33
  61. package/lib/common/commands/device/run-application.js +12 -25
  62. package/lib/common/commands/device/stop-application.js +11 -22
  63. package/lib/common/commands/device/uninstall-application.js +6 -17
  64. package/lib/common/commands/generate-messages.js +17 -28
  65. package/lib/common/commands/help.js +20 -33
  66. package/lib/common/commands/package-manager-get.js +6 -17
  67. package/lib/common/commands/package-manager-set.js +9 -20
  68. package/lib/common/commands/post-install.js +2 -13
  69. package/lib/common/commands/preuninstall.js +23 -38
  70. package/lib/common/commands/proxy/proxy-base.js +8 -19
  71. package/lib/common/commands/proxy/proxy-clear.js +4 -15
  72. package/lib/common/commands/proxy/proxy-get.js +3 -14
  73. package/lib/common/commands/proxy/proxy-set.js +87 -100
  74. package/lib/common/constants.js +11 -11
  75. package/lib/common/decorators.js +10 -22
  76. package/lib/common/dispatchers.js +79 -96
  77. package/lib/common/errors.js +89 -104
  78. package/lib/common/file-system.js +108 -130
  79. package/lib/common/header.js +1 -2
  80. package/lib/common/helpers.js +149 -178
  81. package/lib/common/host-info.js +37 -50
  82. package/lib/common/http-client.js +93 -108
  83. package/lib/common/logger/appenders/cli-appender.js +1 -2
  84. package/lib/common/logger/appenders/emit-appender.js +1 -2
  85. package/lib/common/logger/layouts/cli-layout.js +1 -2
  86. package/lib/common/logger/logger.js +4 -4
  87. package/lib/common/mobile/android/android-application-manager.js +121 -142
  88. package/lib/common/mobile/android/android-debug-bridge-result-handler.js +1 -1
  89. package/lib/common/mobile/android/android-debug-bridge.js +87 -112
  90. package/lib/common/mobile/android/android-device-file-system.js +98 -131
  91. package/lib/common/mobile/android/android-device-hash-service.js +50 -75
  92. package/lib/common/mobile/android/android-device.js +68 -85
  93. package/lib/common/mobile/android/android-emulator-services.js +105 -130
  94. package/lib/common/mobile/android/android-ini-file-parser.js +8 -6
  95. package/lib/common/mobile/android/android-log-filter.js +1 -1
  96. package/lib/common/mobile/android/android-virtual-device-service.js +76 -97
  97. package/lib/common/mobile/android/device-android-debug-bridge.js +13 -29
  98. package/lib/common/mobile/android/genymotion/genymotion-service.js +91 -118
  99. package/lib/common/mobile/android/genymotion/virtualbox-service.js +64 -81
  100. package/lib/common/mobile/android/logcat-helper.js +108 -127
  101. package/lib/common/mobile/application-manager-base.js +84 -107
  102. package/lib/common/mobile/device-log-provider-base.js +7 -18
  103. package/lib/common/mobile/ios/device/ios-application-manager.js +79 -108
  104. package/lib/common/mobile/ios/device/ios-device-file-system.js +78 -105
  105. package/lib/common/mobile/ios/device/ios-device-operations.js +105 -142
  106. package/lib/common/mobile/ios/device/ios-device.js +20 -36
  107. package/lib/common/mobile/ios/ios-device-base.js +58 -81
  108. package/lib/common/mobile/ios/simulator/ios-emulator-services.js +63 -92
  109. package/lib/common/mobile/ios/simulator/ios-sim-resolver.js +1 -1
  110. package/lib/common/mobile/ios/simulator/ios-simulator-application-manager.js +60 -89
  111. package/lib/common/mobile/ios/simulator/ios-simulator-device.js +27 -43
  112. package/lib/common/mobile/ios/simulator/ios-simulator-file-system.js +37 -62
  113. package/lib/common/mobile/ios/simulator/ios-simulator-log-provider.js +24 -35
  114. package/lib/common/mobile/mobile-core/android-device-discovery.js +43 -62
  115. package/lib/common/mobile/mobile-core/android-emulator-discovery.js +21 -32
  116. package/lib/common/mobile/mobile-core/android-process-service.js +143 -182
  117. package/lib/common/mobile/mobile-core/device-discovery.js +2 -13
  118. package/lib/common/mobile/mobile-core/devices-service.js +386 -436
  119. package/lib/common/mobile/mobile-core/ios-device-discovery.js +24 -35
  120. package/lib/common/mobile/mobile-core/ios-simulator-discovery.js +47 -62
  121. package/lib/common/mobile/mobile-helper.js +15 -26
  122. package/lib/common/mobile/wp8/wp8-emulator-services.js +25 -52
  123. package/lib/common/opener.js +2 -2
  124. package/lib/common/prompter.js +90 -105
  125. package/lib/common/queue.js +9 -20
  126. package/lib/common/services/auto-completion-service.js +39 -52
  127. package/lib/common/services/cancellation.js +17 -28
  128. package/lib/common/services/commands-service.js +146 -169
  129. package/lib/common/services/help-service.js +132 -157
  130. package/lib/common/services/hooks-service.js +93 -108
  131. package/lib/common/services/ios-notification-service.js +21 -34
  132. package/lib/common/services/json-file-settings-service.js +52 -71
  133. package/lib/common/services/lock-service.js +35 -52
  134. package/lib/common/services/message-contract-generator.js +35 -46
  135. package/lib/common/services/micro-templating-service.js +4 -15
  136. package/lib/common/services/net-service.js +90 -107
  137. package/lib/common/services/project-files-manager.js +10 -23
  138. package/lib/common/services/proxy-service.js +13 -24
  139. package/lib/common/services/qr.js +13 -24
  140. package/lib/common/services/settings-service.js +1 -1
  141. package/lib/common/services/xcode-select-service.js +20 -35
  142. package/lib/common/utils.js +2 -2
  143. package/lib/common/validators/project-name-validator.js +1 -1
  144. package/lib/common/validators/validation-result.js +1 -1
  145. package/lib/common/verify-node-version.js +2 -3
  146. package/lib/common/yok.js +23 -36
  147. package/lib/config.js +36 -51
  148. package/lib/constants.js +24 -24
  149. package/lib/controllers/build-controller.js +82 -99
  150. package/lib/controllers/debug-controller.js +107 -128
  151. package/lib/controllers/deploy-controller.js +15 -23
  152. package/lib/controllers/migrate-controller.js +722 -795
  153. package/lib/controllers/platform-controller.js +70 -85
  154. package/lib/controllers/prepare-controller.js +232 -261
  155. package/lib/controllers/run-controller.js +397 -411
  156. package/lib/controllers/update-controller-base.js +16 -29
  157. package/lib/controllers/update-controller.js +94 -119
  158. package/lib/data/prepare-data.js +4 -1
  159. package/lib/definitions/ios.d.ts +9 -1
  160. package/lib/detached-processes/cleanup-js-subprocess.js +3 -12
  161. package/lib/detached-processes/cleanup-process.js +16 -25
  162. package/lib/device-path-provider.js +23 -34
  163. package/lib/device-sockets/ios/app-debug-socket-proxy-factory.js +149 -164
  164. package/lib/device-sockets/ios/notification.js +1 -1
  165. package/lib/device-sockets/ios/socket-request-executor.js +24 -39
  166. package/lib/helpers/android-bundle-validator-helper.js +1 -1
  167. package/lib/helpers/deploy-command-helper.js +44 -49
  168. package/lib/helpers/key-command-helper.js +4 -13
  169. package/lib/helpers/livesync-command-helper.js +137 -152
  170. package/lib/helpers/network-connectivity-validator.js +6 -17
  171. package/lib/helpers/options-track-helper.js +6 -17
  172. package/lib/helpers/platform-command-helper.js +99 -120
  173. package/lib/key-commands/index.js +150 -200
  174. package/lib/nativescript-cli.js +5 -14
  175. package/lib/node-package-manager.js +81 -104
  176. package/lib/options.js +3 -12
  177. package/lib/package-installation-manager.js +130 -165
  178. package/lib/package-manager.js +63 -86
  179. package/lib/platform-command-param.js +4 -15
  180. package/lib/pnpm-package-manager.js +59 -78
  181. package/lib/project-data.js +1 -1
  182. package/lib/providers/project-files-provider.js +1 -1
  183. package/lib/services/analytics/analytics-broker-process.js +13 -22
  184. package/lib/services/analytics/analytics-broker.js +17 -30
  185. package/lib/services/analytics/analytics-service.js +163 -199
  186. package/lib/services/analytics/google-analytics-provider.js +41 -56
  187. package/lib/services/analytics-settings-service.js +15 -32
  188. package/lib/services/android/android-bundle-tool-service.js +43 -60
  189. package/lib/services/android/gradle-build-args-service.js +9 -20
  190. package/lib/services/android/gradle-build-service.js +22 -35
  191. package/lib/services/android/gradle-command-service.js +22 -35
  192. package/lib/services/android-device-debug-service.js +90 -117
  193. package/lib/services/android-plugin-build-service.js +205 -231
  194. package/lib/services/android-project-service.js +126 -171
  195. package/lib/services/android-resources-migration-service.js +51 -64
  196. package/lib/services/apple-portal/apple-portal-application-service.js +46 -63
  197. package/lib/services/apple-portal/apple-portal-session-service.js +195 -214
  198. package/lib/services/apple-portal/srp/srp-wrapper.js +43 -58
  199. package/lib/services/assets-generation/assets-generation-service.js +103 -117
  200. package/lib/services/build-artifacts-service.js +9 -20
  201. package/lib/services/build-info-file-service.js +20 -35
  202. package/lib/services/cleanup-service.js +47 -76
  203. package/lib/services/cocoapods-service.js +111 -132
  204. package/lib/services/device/device-install-app-service.js +54 -71
  205. package/lib/services/doctor-service.js +99 -118
  206. package/lib/services/extensibility-service.js +81 -100
  207. package/lib/services/files-hash-service.js +26 -43
  208. package/lib/services/hmr-status-service.js +1 -1
  209. package/lib/services/initialize-service.js +37 -50
  210. package/lib/services/ios/export-options-plist-service.js +38 -51
  211. package/lib/services/ios/ios-signing-service.js +168 -187
  212. package/lib/services/ios/spm-service.js +43 -53
  213. package/lib/services/ios/xcodebuild-args-service.js +77 -94
  214. package/lib/services/ios/xcodebuild-command-service.js +14 -25
  215. package/lib/services/ios/xcodebuild-service.js +52 -71
  216. package/lib/services/ios-debugger-port-service.js +24 -37
  217. package/lib/services/ios-device-debug-service.js +75 -102
  218. package/lib/services/ios-entitlements-service.js +31 -42
  219. package/lib/services/ios-extensions-service.js +18 -29
  220. package/lib/services/ios-project-service.js +419 -460
  221. package/lib/services/ios-provision-service.js +108 -129
  222. package/lib/services/ios-watch-app-service.js +21 -32
  223. package/lib/services/ip-service.js +38 -53
  224. package/lib/services/itmstransporter-service.js +129 -152
  225. package/lib/services/livesync/android-device-livesync-service-base.js +31 -48
  226. package/lib/services/livesync/android-device-livesync-service.js +120 -149
  227. package/lib/services/livesync/android-device-livesync-sockets-service.js +121 -152
  228. package/lib/services/livesync/android-livesync-service.js +14 -35
  229. package/lib/services/livesync/android-livesync-tool.js +90 -113
  230. package/lib/services/livesync/device-livesync-service-base.js +15 -28
  231. package/lib/services/livesync/ios-device-livesync-service.js +114 -143
  232. package/lib/services/livesync/ios-livesync-service.js +42 -58
  233. package/lib/services/livesync/platform-livesync-service-base.js +94 -119
  234. package/lib/services/log-parser-service.js +1 -1
  235. package/lib/services/log-source-map-service.js +30 -41
  236. package/lib/services/marking-mode-service.js +15 -28
  237. package/lib/services/npm-config-service.js +1 -1
  238. package/lib/services/pacote-service.js +51 -66
  239. package/lib/services/performance-service.js +1 -1
  240. package/lib/services/platform/add-platform-service.js +50 -71
  241. package/lib/services/platform/platform-validation-service.js +22 -33
  242. package/lib/services/platform/prepare-native-platform-service.js +49 -62
  243. package/lib/services/platform-environment-requirements.js +26 -37
  244. package/lib/services/plugins-service.js +122 -147
  245. package/lib/services/project-backup-service.js +1 -1
  246. package/lib/services/project-changes-service.js +124 -141
  247. package/lib/services/project-cleanup-service.js +64 -77
  248. package/lib/services/project-config-service.js +71 -80
  249. package/lib/services/project-data-service.js +101 -118
  250. package/lib/services/project-name-service.js +28 -43
  251. package/lib/services/project-service.js +84 -103
  252. package/lib/services/project-templates-service.js +52 -67
  253. package/lib/services/start-service.js +41 -59
  254. package/lib/services/temp-service.js +8 -21
  255. package/lib/services/terminal-spinner-service.js +15 -26
  256. package/lib/services/test-execution-service.js +59 -72
  257. package/lib/services/test-initialization-service.js +2 -2
  258. package/lib/services/timeline-profiler-service.js +1 -1
  259. package/lib/services/versions-service.js +119 -138
  260. package/lib/services/webpack/webpack-compiler-service.js +214 -234
  261. package/lib/services/xcconfig-service.js +8 -19
  262. package/lib/sys-info.js +45 -62
  263. package/lib/tools/node-modules/node-modules-builder.js +16 -27
  264. package/lib/yarn-package-manager.js +59 -78
  265. package/lib/yarn2-package-manager.js +60 -79
  266. package/package.json +66 -81
  267. package/node_modules/@npmcli/move-file/LICENSE.md +0 -22
  268. package/node_modules/@npmcli/move-file/README.md +0 -69
  269. package/node_modules/@npmcli/move-file/lib/index.js +0 -185
  270. package/node_modules/@npmcli/move-file/node_modules/mkdirp/LICENSE +0 -21
  271. package/node_modules/@npmcli/move-file/node_modules/mkdirp/bin/cmd.js +0 -68
  272. package/node_modules/@npmcli/move-file/node_modules/mkdirp/index.js +0 -31
  273. package/node_modules/@npmcli/move-file/node_modules/mkdirp/lib/find-made.js +0 -29
  274. package/node_modules/@npmcli/move-file/node_modules/mkdirp/lib/mkdirp-manual.js +0 -64
  275. package/node_modules/@npmcli/move-file/node_modules/mkdirp/lib/mkdirp-native.js +0 -39
  276. package/node_modules/@npmcli/move-file/node_modules/mkdirp/lib/opts-arg.js +0 -23
  277. package/node_modules/@npmcli/move-file/node_modules/mkdirp/lib/path-arg.js +0 -29
  278. package/node_modules/@npmcli/move-file/node_modules/mkdirp/lib/use-native.js +0 -10
  279. package/node_modules/@npmcli/move-file/node_modules/mkdirp/package.json +0 -44
  280. package/node_modules/@npmcli/move-file/node_modules/mkdirp/readme.markdown +0 -266
  281. package/node_modules/@npmcli/move-file/package.json +0 -47
  282. package/node_modules/balanced-match/.github/FUNDING.yml +0 -2
  283. package/node_modules/balanced-match/LICENSE.md +0 -21
  284. package/node_modules/balanced-match/README.md +0 -97
  285. package/node_modules/balanced-match/index.js +0 -62
  286. package/node_modules/balanced-match/package.json +0 -48
  287. package/node_modules/concat-map/.travis.yml +0 -4
  288. package/node_modules/concat-map/LICENSE +0 -18
  289. package/node_modules/concat-map/README.markdown +0 -62
  290. package/node_modules/concat-map/example/map.js +0 -6
  291. package/node_modules/concat-map/index.js +0 -13
  292. package/node_modules/concat-map/package.json +0 -43
  293. package/node_modules/concat-map/test/map.js +0 -39
  294. package/node_modules/fs.realpath/LICENSE +0 -43
  295. package/node_modules/fs.realpath/README.md +0 -33
  296. package/node_modules/fs.realpath/index.js +0 -66
  297. package/node_modules/fs.realpath/old.js +0 -303
  298. package/node_modules/fs.realpath/package.json +0 -26
  299. package/node_modules/inflight/LICENSE +0 -15
  300. package/node_modules/inflight/README.md +0 -37
  301. package/node_modules/inflight/inflight.js +0 -54
  302. package/node_modules/inflight/package.json +0 -29
  303. package/node_modules/inherits/LICENSE +0 -16
  304. package/node_modules/inherits/README.md +0 -42
  305. package/node_modules/inherits/inherits.js +0 -9
  306. package/node_modules/inherits/inherits_browser.js +0 -27
  307. package/node_modules/inherits/package.json +0 -29
  308. package/node_modules/once/LICENSE +0 -15
  309. package/node_modules/once/README.md +0 -79
  310. package/node_modules/once/once.js +0 -42
  311. package/node_modules/once/package.json +0 -33
  312. package/node_modules/path-is-absolute/index.js +0 -20
  313. package/node_modules/path-is-absolute/license +0 -21
  314. package/node_modules/path-is-absolute/package.json +0 -43
  315. package/node_modules/path-is-absolute/readme.md +0 -59
  316. package/node_modules/rimraf/LICENSE +0 -15
  317. package/node_modules/rimraf/README.md +0 -101
  318. package/node_modules/rimraf/bin.js +0 -68
  319. package/node_modules/rimraf/node_modules/brace-expansion/LICENSE +0 -21
  320. package/node_modules/rimraf/node_modules/brace-expansion/README.md +0 -129
  321. package/node_modules/rimraf/node_modules/brace-expansion/index.js +0 -201
  322. package/node_modules/rimraf/node_modules/brace-expansion/package.json +0 -47
  323. package/node_modules/rimraf/node_modules/glob/LICENSE +0 -21
  324. package/node_modules/rimraf/node_modules/glob/README.md +0 -378
  325. package/node_modules/rimraf/node_modules/glob/common.js +0 -238
  326. package/node_modules/rimraf/node_modules/glob/glob.js +0 -790
  327. package/node_modules/rimraf/node_modules/glob/package.json +0 -55
  328. package/node_modules/rimraf/node_modules/glob/sync.js +0 -486
  329. package/node_modules/rimraf/node_modules/minimatch/LICENSE +0 -15
  330. package/node_modules/rimraf/node_modules/minimatch/README.md +0 -230
  331. package/node_modules/rimraf/node_modules/minimatch/minimatch.js +0 -947
  332. package/node_modules/rimraf/node_modules/minimatch/package.json +0 -33
  333. package/node_modules/rimraf/package.json +0 -32
  334. package/node_modules/rimraf/rimraf.js +0 -360
  335. package/node_modules/stringify-package/LICENSE +0 -13
  336. package/node_modules/stringify-package/README.md +0 -55
  337. package/node_modules/stringify-package/index.js +0 -18
  338. package/node_modules/stringify-package/package.json +0 -38
  339. package/node_modules/wrappy/LICENSE +0 -15
  340. package/node_modules/wrappy/README.md +0 -36
  341. package/node_modules/wrappy/package.json +0 -29
  342. package/node_modules/wrappy/wrappy.js +0 -33
@@ -1,13 +1,4 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  Object.defineProperty(exports, "__esModule", { value: true });
12
3
  exports.AndroidDeviceDiscovery = void 0;
13
4
  const device_discovery_1 = require("./device-discovery");
@@ -22,69 +13,59 @@ class AndroidDeviceDiscovery extends device_discovery_1.DeviceDiscovery {
22
13
  this.$mobileHelper = $mobileHelper;
23
14
  this._devices = [];
24
15
  }
25
- createAndAddDevice(adbDeviceInfo) {
26
- return __awaiter(this, void 0, void 0, function* () {
27
- this._devices.push(adbDeviceInfo);
28
- const device = this.$injector.resolve(android_device_1.AndroidDevice, { identifier: adbDeviceInfo.identifier, status: adbDeviceInfo.status });
29
- yield device.init();
30
- this.addDevice(device);
31
- });
16
+ async createAndAddDevice(adbDeviceInfo) {
17
+ this._devices.push(adbDeviceInfo);
18
+ const device = this.$injector.resolve(android_device_1.AndroidDevice, { identifier: adbDeviceInfo.identifier, status: adbDeviceInfo.status });
19
+ await device.init();
20
+ this.addDevice(device);
32
21
  }
33
22
  deleteAndRemoveDevice(deviceIdentifier) {
34
23
  _.remove(this._devices, (d) => d.identifier === deviceIdentifier);
35
24
  this.removeDevice(deviceIdentifier);
36
25
  }
37
- startLookingForDevices(options) {
38
- return __awaiter(this, void 0, void 0, function* () {
39
- if (options &&
40
- options.platform &&
41
- !this.$mobileHelper.isAndroidPlatform(options.platform)) {
42
- return;
43
- }
44
- yield this.ensureAdbServerStarted();
45
- yield this.checkForDevices();
46
- });
26
+ async startLookingForDevices(options) {
27
+ if (options &&
28
+ options.platform &&
29
+ !this.$mobileHelper.isAndroidPlatform(options.platform)) {
30
+ return;
31
+ }
32
+ await this.ensureAdbServerStarted();
33
+ await this.checkForDevices();
47
34
  }
48
- checkForDevices() {
49
- return __awaiter(this, void 0, void 0, function* () {
50
- const devices = yield this.$adb.getDevices();
51
- yield this.checkCurrentData(devices);
52
- });
35
+ async checkForDevices() {
36
+ const devices = await this.$adb.getDevices();
37
+ await this.checkCurrentData(devices);
53
38
  }
54
- checkCurrentData(result) {
55
- return __awaiter(this, void 0, void 0, function* () {
56
- const currentDevices = result.map((element) => {
57
- const data = element.split("\t");
58
- const identifier = data[0];
59
- const status = data[1];
60
- return {
61
- identifier: identifier,
62
- status: status,
63
- };
64
- });
65
- _(this._devices)
66
- .reject((d) => (_.find(currentDevices, (device) => device.identifier === d.identifier && device.status === d.status)))
67
- .each((d) => this.deleteAndRemoveDevice(d.identifier));
68
- yield Promise.all(_(currentDevices)
69
- .reject((d) => (_.find(this._devices, (device) => device.identifier === d.identifier &&
70
- device.status === d.status)))
71
- .map((d) => this.createAndAddDevice(d))
72
- .value());
39
+ async checkCurrentData(result) {
40
+ const currentDevices = result.map((element) => {
41
+ const data = element.split("\t");
42
+ const identifier = data[0];
43
+ const status = data[1];
44
+ return {
45
+ identifier: identifier,
46
+ status: status,
47
+ };
73
48
  });
49
+ _(this._devices)
50
+ .reject((d) => (_.find(currentDevices, (device) => device.identifier === d.identifier && device.status === d.status)))
51
+ .each((d) => this.deleteAndRemoveDevice(d.identifier));
52
+ await Promise.all(_(currentDevices)
53
+ .reject((d) => (_.find(this._devices, (device) => device.identifier === d.identifier &&
54
+ device.status === d.status)))
55
+ .map((d) => this.createAndAddDevice(d))
56
+ .value());
74
57
  }
75
- ensureAdbServerStarted() {
76
- return __awaiter(this, void 0, void 0, function* () {
77
- if (!this.isStarted) {
78
- this.isStarted = true;
79
- try {
80
- return yield this.$adb.executeCommand(["start-server"]);
81
- }
82
- catch (err) {
83
- this.isStarted = false;
84
- throw err;
85
- }
58
+ async ensureAdbServerStarted() {
59
+ if (!this.isStarted) {
60
+ this.isStarted = true;
61
+ try {
62
+ return await this.$adb.executeCommand(["start-server"]);
86
63
  }
87
- });
64
+ catch (err) {
65
+ this.isStarted = false;
66
+ throw err;
67
+ }
68
+ }
88
69
  }
89
70
  }
90
71
  exports.AndroidDeviceDiscovery = AndroidDeviceDiscovery;
@@ -1,13 +1,4 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  Object.defineProperty(exports, "__esModule", { value: true });
12
3
  exports.AndroidEmulatorDiscovery = void 0;
13
4
  const events_1 = require("events");
@@ -21,29 +12,27 @@ class AndroidEmulatorDiscovery extends events_1.EventEmitter {
21
12
  this.$mobileHelper = $mobileHelper;
22
13
  this._emulators = {};
23
14
  }
24
- startLookingForDevices(options) {
25
- return __awaiter(this, void 0, void 0, function* () {
26
- if (options &&
27
- options.platform &&
28
- !this.$mobileHelper.isAndroidPlatform(options.platform)) {
29
- return;
30
- }
31
- const availableEmulatorsOutput = yield this.$androidEmulatorServices.getEmulatorImages();
32
- const currentEmulators = availableEmulatorsOutput.devices;
33
- const cachedEmulators = _.values(this._emulators);
34
- const lostEmulators = _(cachedEmulators)
35
- .reject((e) => _.some(currentEmulators, (emulator) => emulator && e && emulator.imageIdentifier === e.imageIdentifier))
36
- .value();
37
- const foundEmulators = _(currentEmulators)
38
- .reject((e) => _.some(cachedEmulators, (emulator) => emulator && e && emulator.imageIdentifier === e.imageIdentifier))
39
- .value();
40
- if (lostEmulators.length) {
41
- this.raiseOnEmulatorImagesLost(lostEmulators);
42
- }
43
- if (foundEmulators.length) {
44
- this.raiseOnEmulatorImagesFound(foundEmulators);
45
- }
46
- });
15
+ async startLookingForDevices(options) {
16
+ if (options &&
17
+ options.platform &&
18
+ !this.$mobileHelper.isAndroidPlatform(options.platform)) {
19
+ return;
20
+ }
21
+ const availableEmulatorsOutput = await this.$androidEmulatorServices.getEmulatorImages();
22
+ const currentEmulators = availableEmulatorsOutput.devices;
23
+ const cachedEmulators = _.values(this._emulators);
24
+ const lostEmulators = _(cachedEmulators)
25
+ .reject((e) => _.some(currentEmulators, (emulator) => emulator && e && emulator.imageIdentifier === e.imageIdentifier))
26
+ .value();
27
+ const foundEmulators = _(currentEmulators)
28
+ .reject((e) => _.some(cachedEmulators, (emulator) => emulator && e && emulator.imageIdentifier === e.imageIdentifier))
29
+ .value();
30
+ if (lostEmulators.length) {
31
+ this.raiseOnEmulatorImagesLost(lostEmulators);
32
+ }
33
+ if (foundEmulators.length) {
34
+ this.raiseOnEmulatorImagesFound(foundEmulators);
35
+ }
47
36
  }
48
37
  getDevices() {
49
38
  return _.values(this._emulators);
@@ -5,15 +5,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
5
5
  else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
6
6
  return c > 3 && r && Object.defineProperty(target, key, r), r;
7
7
  };
8
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
9
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
10
- return new (P || (P = Promise))(function (resolve, reject) {
11
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
12
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
13
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
14
- step((generator = generator.apply(thisArg, _arguments || [])).next());
15
- });
16
- };
17
8
  Object.defineProperty(exports, "__esModule", { value: true });
18
9
  exports.AndroidProcessService = void 0;
19
10
  const os_1 = require("os");
@@ -32,162 +23,140 @@ class AndroidProcessService {
32
23
  this._devicesAdbs = {};
33
24
  this._forwardedLocalPorts = {};
34
25
  }
35
- forwardFreeTcpToAbstractPort(portForwardInputData) {
36
- return __awaiter(this, void 0, void 0, function* () {
37
- const adb = yield this.setupForPortForwarding(portForwardInputData);
38
- return this.forwardPort(portForwardInputData, adb);
39
- });
26
+ async forwardFreeTcpToAbstractPort(portForwardInputData) {
27
+ const adb = await this.setupForPortForwarding(portForwardInputData);
28
+ return this.forwardPort(portForwardInputData, adb);
40
29
  }
41
- mapAbstractToTcpPort(deviceIdentifier, appIdentifier, framework) {
42
- return __awaiter(this, void 0, void 0, function* () {
43
- const adb = yield this.setupForPortForwarding({
44
- deviceIdentifier,
45
- appIdentifier,
46
- });
47
- const processId = (yield this.getProcessIds(adb, [appIdentifier]))[appIdentifier];
48
- const applicationNotStartedErrorMessage = `The application is not started on the device with identifier ${deviceIdentifier}.`;
30
+ async mapAbstractToTcpPort(deviceIdentifier, appIdentifier, framework) {
31
+ const adb = await this.setupForPortForwarding({
32
+ deviceIdentifier,
33
+ appIdentifier,
34
+ });
35
+ const processId = (await this.getProcessIds(adb, [appIdentifier]))[appIdentifier];
36
+ const applicationNotStartedErrorMessage = `The application is not started on the device with identifier ${deviceIdentifier}.`;
37
+ if (!processId) {
38
+ this.$errors.fail(applicationNotStartedErrorMessage);
39
+ }
40
+ const abstractPortsInformation = await this.getAbstractPortsInformation(adb);
41
+ const abstractPort = await this.getAbstractPortForApplication(adb, processId, appIdentifier, abstractPortsInformation, framework);
42
+ if (!abstractPort) {
43
+ this.$errors.fail(applicationNotStartedErrorMessage);
44
+ }
45
+ const forwardedTcpPort = await this.forwardPort({
46
+ deviceIdentifier,
47
+ appIdentifier,
48
+ abstractPort: `localabstract:${abstractPort}`,
49
+ }, adb);
50
+ return forwardedTcpPort && forwardedTcpPort.toString();
51
+ }
52
+ async getMappedAbstractToTcpPorts(deviceIdentifier, appIdentifiers, framework) {
53
+ const adb = this.getAdb(deviceIdentifier), abstractPortsInformation = await this.getAbstractPortsInformation(adb), processIds = await this.getProcessIds(adb, appIdentifiers), adbForwardList = await adb.executeCommand(["forward", "--list"]), localPorts = {};
54
+ await Promise.all(_.map(appIdentifiers, async (appIdentifier) => {
55
+ localPorts[appIdentifier] = null;
56
+ const processId = processIds[appIdentifier];
49
57
  if (!processId) {
50
- this.$errors.fail(applicationNotStartedErrorMessage);
58
+ return;
51
59
  }
52
- const abstractPortsInformation = yield this.getAbstractPortsInformation(adb);
53
- const abstractPort = yield this.getAbstractPortForApplication(adb, processId, appIdentifier, abstractPortsInformation, framework);
60
+ const abstractPort = await this.getAbstractPortForApplication(adb, processId, appIdentifier, abstractPortsInformation, framework);
54
61
  if (!abstractPort) {
55
- this.$errors.fail(applicationNotStartedErrorMessage);
56
- }
57
- const forwardedTcpPort = yield this.forwardPort({
58
- deviceIdentifier,
59
- appIdentifier,
60
- abstractPort: `localabstract:${abstractPort}`,
61
- }, adb);
62
- return forwardedTcpPort && forwardedTcpPort.toString();
63
- });
64
- }
65
- getMappedAbstractToTcpPorts(deviceIdentifier, appIdentifiers, framework) {
66
- return __awaiter(this, void 0, void 0, function* () {
67
- const adb = this.getAdb(deviceIdentifier), abstractPortsInformation = yield this.getAbstractPortsInformation(adb), processIds = yield this.getProcessIds(adb, appIdentifiers), adbForwardList = yield adb.executeCommand(["forward", "--list"]), localPorts = {};
68
- yield Promise.all(_.map(appIdentifiers, (appIdentifier) => __awaiter(this, void 0, void 0, function* () {
69
- localPorts[appIdentifier] = null;
70
- const processId = processIds[appIdentifier];
71
- if (!processId) {
72
- return;
73
- }
74
- const abstractPort = yield this.getAbstractPortForApplication(adb, processId, appIdentifier, abstractPortsInformation, framework);
75
- if (!abstractPort) {
76
- return;
77
- }
78
- const localPort = yield this.getAlreadyMappedPort(adb, deviceIdentifier, abstractPort, adbForwardList);
79
- if (localPort) {
80
- localPorts[appIdentifier] = localPort;
81
- }
82
- })));
83
- return localPorts;
84
- });
85
- }
86
- getDebuggableApps(deviceIdentifier) {
87
- return __awaiter(this, void 0, void 0, function* () {
88
- const adb = this.getAdb(deviceIdentifier);
89
- const androidWebViewPortInformation = (yield this.getAbstractPortsInformation(adb)).split(os_1.EOL);
90
- const portInformation = yield Promise.all(_.map(androidWebViewPortInformation, (line) => __awaiter(this, void 0, void 0, function* () {
91
- return (yield this.getApplicationInfoFromWebViewPortInformation(adb, deviceIdentifier, line)) ||
92
- (yield this.getNativeScriptApplicationInformation(adb, deviceIdentifier, line));
93
- })));
94
- return _(portInformation)
95
- .filter((deviceAppInfo) => !!deviceAppInfo)
96
- .groupBy((element) => element.framework)
97
- .map((group) => _.uniqBy(group, (g) => g.appIdentifier))
98
- .flatten()
99
- .value();
100
- });
101
- }
102
- getAppProcessId(deviceIdentifier, appIdentifier) {
103
- return __awaiter(this, void 0, void 0, function* () {
104
- const adb = this.getAdb(deviceIdentifier);
105
- const processId = (yield this.getProcessIds(adb, [appIdentifier]))[appIdentifier];
106
- return processId ? processId.toString() : null;
107
- });
108
- }
109
- forwardPort(portForwardInputData, adb) {
110
- return __awaiter(this, void 0, void 0, function* () {
111
- let localPort = yield this.getAlreadyMappedPort(adb, portForwardInputData.deviceIdentifier, portForwardInputData.abstractPort);
112
- if (!localPort) {
113
- localPort = yield this.$net.getFreePort();
114
- yield adb.executeCommand(["forward", `tcp:${localPort}`, portForwardInputData.abstractPort], { deviceIdentifier: portForwardInputData.deviceIdentifier });
115
- }
116
- this._forwardedLocalPorts[portForwardInputData.deviceIdentifier] = localPort;
117
- yield this.$cleanupService.addCleanupCommand({
118
- command: yield this.$staticConfig.getAdbFilePath(),
119
- args: [
120
- "-s",
121
- portForwardInputData.deviceIdentifier,
122
- "forward",
123
- "--remove",
124
- `tcp:${localPort}`,
125
- ],
126
- });
127
- return localPort && +localPort;
128
- });
129
- }
130
- setupForPortForwarding(portForwardInputData) {
131
- return __awaiter(this, void 0, void 0, function* () {
132
- const adb = this.getAdb(portForwardInputData.deviceIdentifier);
133
- return adb;
134
- });
135
- }
136
- getApplicationInfoFromWebViewPortInformation(adb, deviceIdentifier, information) {
137
- return __awaiter(this, void 0, void 0, function* () {
138
- const processIdRegExp = /@webview_devtools_remote_(.+)/g;
139
- const processIdMatches = processIdRegExp.exec(information);
140
- let cordovaAppIdentifier;
141
- if (processIdMatches) {
142
- const processId = processIdMatches[1];
143
- cordovaAppIdentifier = yield this.getApplicationIdentifierFromPid(adb, processId);
144
- }
145
- else {
146
- const chromeAppIdentifierRegExp = /@(.+)_devtools_remote\s?/g;
147
- const chromeAppIdentifierMatches = chromeAppIdentifierRegExp.exec(information);
148
- if (chromeAppIdentifierMatches && chromeAppIdentifierMatches.length > 0) {
149
- cordovaAppIdentifier = chromeAppIdentifierMatches[1];
150
- }
151
- }
152
- if (cordovaAppIdentifier) {
153
- return {
154
- deviceIdentifier: deviceIdentifier,
155
- appIdentifier: cordovaAppIdentifier,
156
- framework: constants_1.TARGET_FRAMEWORK_IDENTIFIERS.Cordova,
157
- };
62
+ return;
158
63
  }
159
- return null;
160
- });
161
- }
162
- getNativeScriptApplicationInformation(adb, deviceIdentifier, information) {
163
- return __awaiter(this, void 0, void 0, function* () {
164
- const nativeScriptAppIdentifierRegExp = /@(.+)-(debug|inspectorServer)/g;
165
- const nativeScriptAppIdentifierMatches = nativeScriptAppIdentifierRegExp.exec(information);
166
- if (nativeScriptAppIdentifierMatches &&
167
- nativeScriptAppIdentifierMatches.length > 0) {
168
- const appIdentifier = nativeScriptAppIdentifierMatches[1];
169
- return {
170
- deviceIdentifier: deviceIdentifier,
171
- appIdentifier: appIdentifier,
172
- framework: constants_1.TARGET_FRAMEWORK_IDENTIFIERS.NativeScript,
173
- };
64
+ const localPort = await this.getAlreadyMappedPort(adb, deviceIdentifier, abstractPort, adbForwardList);
65
+ if (localPort) {
66
+ localPorts[appIdentifier] = localPort;
174
67
  }
175
- return null;
68
+ }));
69
+ return localPorts;
70
+ }
71
+ async getDebuggableApps(deviceIdentifier) {
72
+ const adb = this.getAdb(deviceIdentifier);
73
+ const androidWebViewPortInformation = (await this.getAbstractPortsInformation(adb)).split(os_1.EOL);
74
+ const portInformation = await Promise.all(_.map(androidWebViewPortInformation, async (line) => (await this.getApplicationInfoFromWebViewPortInformation(adb, deviceIdentifier, line)) ||
75
+ (await this.getNativeScriptApplicationInformation(adb, deviceIdentifier, line))));
76
+ return _(portInformation)
77
+ .filter((deviceAppInfo) => !!deviceAppInfo)
78
+ .groupBy((element) => element.framework)
79
+ .map((group) => _.uniqBy(group, (g) => g.appIdentifier))
80
+ .flatten()
81
+ .value();
82
+ }
83
+ async getAppProcessId(deviceIdentifier, appIdentifier) {
84
+ const adb = this.getAdb(deviceIdentifier);
85
+ const processId = (await this.getProcessIds(adb, [appIdentifier]))[appIdentifier];
86
+ return processId ? processId.toString() : null;
87
+ }
88
+ async forwardPort(portForwardInputData, adb) {
89
+ let localPort = await this.getAlreadyMappedPort(adb, portForwardInputData.deviceIdentifier, portForwardInputData.abstractPort);
90
+ if (!localPort) {
91
+ localPort = await this.$net.getFreePort();
92
+ await adb.executeCommand(["forward", `tcp:${localPort}`, portForwardInputData.abstractPort], { deviceIdentifier: portForwardInputData.deviceIdentifier });
93
+ }
94
+ this._forwardedLocalPorts[portForwardInputData.deviceIdentifier] = localPort;
95
+ await this.$cleanupService.addCleanupCommand({
96
+ command: await this.$staticConfig.getAdbFilePath(),
97
+ args: [
98
+ "-s",
99
+ portForwardInputData.deviceIdentifier,
100
+ "forward",
101
+ "--remove",
102
+ `tcp:${localPort}`,
103
+ ],
176
104
  });
177
- }
178
- getAbstractPortForApplication(adb, processId, appIdentifier, abstractPortsInformation, framework) {
179
- return __awaiter(this, void 0, void 0, function* () {
180
- framework = framework || "";
181
- switch (framework.toLowerCase()) {
182
- case constants_1.TARGET_FRAMEWORK_IDENTIFIERS.Cordova.toLowerCase():
183
- return this.getCordovaPortInformation(abstractPortsInformation, appIdentifier, processId);
184
- case constants_1.TARGET_FRAMEWORK_IDENTIFIERS.NativeScript.toLowerCase():
185
- return this.getNativeScriptPortInformation(abstractPortsInformation, appIdentifier);
186
- default:
187
- return (this.getCordovaPortInformation(abstractPortsInformation, appIdentifier, processId) ||
188
- this.getNativeScriptPortInformation(abstractPortsInformation, appIdentifier));
105
+ return localPort && +localPort;
106
+ }
107
+ async setupForPortForwarding(portForwardInputData) {
108
+ const adb = this.getAdb(portForwardInputData.deviceIdentifier);
109
+ return adb;
110
+ }
111
+ async getApplicationInfoFromWebViewPortInformation(adb, deviceIdentifier, information) {
112
+ const processIdRegExp = /@webview_devtools_remote_(.+)/g;
113
+ const processIdMatches = processIdRegExp.exec(information);
114
+ let cordovaAppIdentifier;
115
+ if (processIdMatches) {
116
+ const processId = processIdMatches[1];
117
+ cordovaAppIdentifier = await this.getApplicationIdentifierFromPid(adb, processId);
118
+ }
119
+ else {
120
+ const chromeAppIdentifierRegExp = /@(.+)_devtools_remote\s?/g;
121
+ const chromeAppIdentifierMatches = chromeAppIdentifierRegExp.exec(information);
122
+ if (chromeAppIdentifierMatches && chromeAppIdentifierMatches.length > 0) {
123
+ cordovaAppIdentifier = chromeAppIdentifierMatches[1];
189
124
  }
190
- });
125
+ }
126
+ if (cordovaAppIdentifier) {
127
+ return {
128
+ deviceIdentifier: deviceIdentifier,
129
+ appIdentifier: cordovaAppIdentifier,
130
+ framework: constants_1.TARGET_FRAMEWORK_IDENTIFIERS.Cordova,
131
+ };
132
+ }
133
+ return null;
134
+ }
135
+ async getNativeScriptApplicationInformation(adb, deviceIdentifier, information) {
136
+ const nativeScriptAppIdentifierRegExp = /@(.+)-(debug|inspectorServer)/g;
137
+ const nativeScriptAppIdentifierMatches = nativeScriptAppIdentifierRegExp.exec(information);
138
+ if (nativeScriptAppIdentifierMatches &&
139
+ nativeScriptAppIdentifierMatches.length > 0) {
140
+ const appIdentifier = nativeScriptAppIdentifierMatches[1];
141
+ return {
142
+ deviceIdentifier: deviceIdentifier,
143
+ appIdentifier: appIdentifier,
144
+ framework: constants_1.TARGET_FRAMEWORK_IDENTIFIERS.NativeScript,
145
+ };
146
+ }
147
+ return null;
148
+ }
149
+ async getAbstractPortForApplication(adb, processId, appIdentifier, abstractPortsInformation, framework) {
150
+ framework = framework || "";
151
+ switch (framework.toLowerCase()) {
152
+ case constants_1.TARGET_FRAMEWORK_IDENTIFIERS.Cordova.toLowerCase():
153
+ return this.getCordovaPortInformation(abstractPortsInformation, appIdentifier, processId);
154
+ case constants_1.TARGET_FRAMEWORK_IDENTIFIERS.NativeScript.toLowerCase():
155
+ return this.getNativeScriptPortInformation(abstractPortsInformation, appIdentifier);
156
+ default:
157
+ return (this.getCordovaPortInformation(abstractPortsInformation, appIdentifier, processId) ||
158
+ this.getNativeScriptPortInformation(abstractPortsInformation, appIdentifier));
159
+ }
191
160
  }
192
161
  getCordovaPortInformation(abstractPortsInformation, appIdentifier, processId) {
193
162
  return (this.getPortInformation(abstractPortsInformation, `${appIdentifier}_devtools_remote`) || this.getPortInformation(abstractPortsInformation, processId));
@@ -195,33 +164,27 @@ class AndroidProcessService {
195
164
  getNativeScriptPortInformation(abstractPortsInformation, appIdentifier) {
196
165
  return this.getPortInformation(abstractPortsInformation, `${appIdentifier}-debug`);
197
166
  }
198
- getAbstractPortsInformation(adb) {
199
- return __awaiter(this, void 0, void 0, function* () {
200
- return adb.executeShellCommand(["cat", "/proc/net/unix"]);
201
- });
167
+ async getAbstractPortsInformation(adb) {
168
+ return adb.executeShellCommand(["cat", "/proc/net/unix"]);
202
169
  }
203
170
  getPortInformation(abstractPortsInformation, searchedInfo) {
204
171
  const processRegExp = new RegExp(`\\w+:\\s+(?:\\w+\\s+){1,6}@(.*?${searchedInfo})$`, "gm");
205
172
  const match = processRegExp.exec(abstractPortsInformation);
206
173
  return match && match[1];
207
174
  }
208
- getProcessIds(adb, appIdentifiers) {
209
- return __awaiter(this, void 0, void 0, function* () {
210
- const result = {};
211
- const processIdInformation = yield adb.executeShellCommand(["ps"]);
212
- _.each(appIdentifiers, (appIdentifier) => {
213
- const processIdRegExp = new RegExp(`^\\w*\\s*(\\d+).*?${appIdentifier}$`);
214
- result[appIdentifier] = this.getFirstMatchingGroupFromMultilineResult(processIdInformation, processIdRegExp);
215
- });
216
- return result;
175
+ async getProcessIds(adb, appIdentifiers) {
176
+ const result = {};
177
+ const processIdInformation = await adb.executeShellCommand(["ps"]);
178
+ _.each(appIdentifiers, (appIdentifier) => {
179
+ const processIdRegExp = new RegExp(`^\\w*\\s*(\\d+).*?${appIdentifier}$`);
180
+ result[appIdentifier] = this.getFirstMatchingGroupFromMultilineResult(processIdInformation, processIdRegExp);
217
181
  });
182
+ return result;
218
183
  }
219
- getAlreadyMappedPort(adb, deviceIdentifier, abstractPort, adbForwardList) {
220
- return __awaiter(this, void 0, void 0, function* () {
221
- const allForwardedPorts = adbForwardList || (yield adb.executeCommand(["forward", "--list"])) || "";
222
- const regex = new RegExp(`${deviceIdentifier}\\s+?tcp:(\\d+?)\\s+?.*?${abstractPort}$`);
223
- return this.getFirstMatchingGroupFromMultilineResult(allForwardedPorts, regex);
224
- });
184
+ async getAlreadyMappedPort(adb, deviceIdentifier, abstractPort, adbForwardList) {
185
+ const allForwardedPorts = adbForwardList || (await adb.executeCommand(["forward", "--list"])) || "";
186
+ const regex = new RegExp(`${deviceIdentifier}\\s+?tcp:(\\d+?)\\s+?.*?${abstractPort}$`);
187
+ return this.getFirstMatchingGroupFromMultilineResult(allForwardedPorts, regex);
225
188
  }
226
189
  getAdb(deviceIdentifier) {
227
190
  if (!this._devicesAdbs[deviceIdentifier]) {
@@ -231,11 +194,9 @@ class AndroidProcessService {
231
194
  }
232
195
  return this._devicesAdbs[deviceIdentifier];
233
196
  }
234
- getApplicationIdentifierFromPid(adb, pid, psData) {
235
- return __awaiter(this, void 0, void 0, function* () {
236
- psData = psData || (yield adb.executeShellCommand(["ps"]));
237
- return this.getFirstMatchingGroupFromMultilineResult(psData, new RegExp(`\\s+${pid}(?:\\s+\\d+){3}\\s+.*\\s+(.*?)$`));
238
- });
197
+ async getApplicationIdentifierFromPid(adb, pid, psData) {
198
+ psData = psData || (await adb.executeShellCommand(["ps"]));
199
+ return this.getFirstMatchingGroupFromMultilineResult(psData, new RegExp(`\\s+${pid}(?:\\s+\\d+){3}\\s+.*\\s+(.*?)$`));
239
200
  }
240
201
  getFirstMatchingGroupFromMultilineResult(input, regex) {
241
202
  let result;
@@ -252,8 +213,8 @@ class AndroidProcessService {
252
213
  return result;
253
214
  }
254
215
  }
216
+ exports.AndroidProcessService = AndroidProcessService;
255
217
  __decorate([
256
218
  (0, decorators_1.exported)("androidProcessService")
257
219
  ], AndroidProcessService.prototype, "getAppProcessId", null);
258
- exports.AndroidProcessService = AndroidProcessService;
259
220
  yok_1.injector.register("androidProcessService", AndroidProcessService);
@@ -1,13 +1,4 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  Object.defineProperty(exports, "__esModule", { value: true });
12
3
  exports.DeviceDiscovery = void 0;
13
4
  const events_1 = require("events");
@@ -19,10 +10,8 @@ class DeviceDiscovery extends events_1.EventEmitter {
19
10
  super(...arguments);
20
11
  this.devices = {};
21
12
  }
22
- startLookingForDevices() {
23
- return __awaiter(this, void 0, void 0, function* () {
24
- return;
25
- });
13
+ async startLookingForDevices() {
14
+ return;
26
15
  }
27
16
  getDevice(deviceIdentifier) {
28
17
  const device = this.devices[deviceIdentifier];