detox 20.11.5-smoke.0 → 20.12.0-smoke.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (145) hide show
  1. package/Detox-android/com/wix/detox/{20.11.5-smoke.0/detox-20.11.5-smoke.0-javadoc.jar → 20.12.0-smoke.1/detox-20.12.0-smoke.1-javadoc.jar} +0 -0
  2. package/Detox-android/com/wix/detox/20.12.0-smoke.1/detox-20.12.0-smoke.1-javadoc.jar.md5 +1 -0
  3. package/Detox-android/com/wix/detox/20.12.0-smoke.1/detox-20.12.0-smoke.1-javadoc.jar.sha1 +1 -0
  4. package/Detox-android/com/wix/detox/20.12.0-smoke.1/detox-20.12.0-smoke.1-javadoc.jar.sha256 +1 -0
  5. package/Detox-android/com/wix/detox/20.12.0-smoke.1/detox-20.12.0-smoke.1-javadoc.jar.sha512 +1 -0
  6. package/Detox-android/com/wix/detox/{20.11.5-smoke.0/detox-20.11.5-smoke.0-sources.jar → 20.12.0-smoke.1/detox-20.12.0-smoke.1-sources.jar} +0 -0
  7. package/Detox-android/com/wix/detox/20.12.0-smoke.1/detox-20.12.0-smoke.1-sources.jar.md5 +1 -0
  8. package/Detox-android/com/wix/detox/20.12.0-smoke.1/detox-20.12.0-smoke.1-sources.jar.sha1 +1 -0
  9. package/Detox-android/com/wix/detox/20.12.0-smoke.1/detox-20.12.0-smoke.1-sources.jar.sha256 +1 -0
  10. package/Detox-android/com/wix/detox/20.12.0-smoke.1/detox-20.12.0-smoke.1-sources.jar.sha512 +1 -0
  11. package/Detox-android/com/wix/detox/20.12.0-smoke.1/detox-20.12.0-smoke.1.aar +0 -0
  12. package/Detox-android/com/wix/detox/20.12.0-smoke.1/detox-20.12.0-smoke.1.aar.md5 +1 -0
  13. package/Detox-android/com/wix/detox/20.12.0-smoke.1/detox-20.12.0-smoke.1.aar.sha1 +1 -0
  14. package/Detox-android/com/wix/detox/20.12.0-smoke.1/detox-20.12.0-smoke.1.aar.sha256 +1 -0
  15. package/Detox-android/com/wix/detox/20.12.0-smoke.1/detox-20.12.0-smoke.1.aar.sha512 +1 -0
  16. package/Detox-android/com/wix/detox/{20.11.5-smoke.0/detox-20.11.5-smoke.0.pom → 20.12.0-smoke.1/detox-20.12.0-smoke.1.pom} +1 -1
  17. package/Detox-android/com/wix/detox/20.12.0-smoke.1/detox-20.12.0-smoke.1.pom.md5 +1 -0
  18. package/Detox-android/com/wix/detox/20.12.0-smoke.1/detox-20.12.0-smoke.1.pom.sha1 +1 -0
  19. package/Detox-android/com/wix/detox/20.12.0-smoke.1/detox-20.12.0-smoke.1.pom.sha256 +1 -0
  20. package/Detox-android/com/wix/detox/20.12.0-smoke.1/detox-20.12.0-smoke.1.pom.sha512 +1 -0
  21. package/Detox-android/com/wix/detox/maven-metadata.xml +4 -4
  22. package/Detox-android/com/wix/detox/maven-metadata.xml.md5 +1 -1
  23. package/Detox-android/com/wix/detox/maven-metadata.xml.sha1 +1 -1
  24. package/Detox-android/com/wix/detox/maven-metadata.xml.sha256 +1 -1
  25. package/Detox-android/com/wix/detox/maven-metadata.xml.sha512 +1 -1
  26. package/Detox-ios-src.tbz +0 -0
  27. package/Detox-ios.tbz +0 -0
  28. package/android/detox/src/full/java/com/wix/detox/espresso/DetoxAssertion.java +44 -25
  29. package/android/detox/src/full/java/com/wix/detox/espresso/EspressoDetox.java +6 -7
  30. package/android/detox/src/full/java/com/wix/detox/espresso/action/GetAttributesAction.kt +4 -4
  31. package/android/detox/src/full/java/com/wix/detox/espresso/performer/MultipleViewsActionPerformer.kt +43 -0
  32. package/android/detox/src/full/java/com/wix/detox/espresso/performer/SingleViewActionPerformer.kt +19 -0
  33. package/android/detox/src/full/java/com/wix/detox/espresso/performer/ViewActionPerformer.kt +24 -0
  34. package/android/detox/src/full/java/com/wix/invoke/types/Invocation.java +5 -4
  35. package/android/detox/src/main/java/com/wix/detox/espresso/MultipleViewsAction.kt +4 -0
  36. package/android/detox/src/main/java/com/wix/detox/espresso/UiControllerSpy.kt +0 -1
  37. package/android/detox/src/main/java/com/wix/detox/espresso/ViewActionWithResult.kt +2 -1
  38. package/android/detox/src/testFull/java/com/wix/detox/espresso/action/GetAttributesActionTest.kt +6 -5
  39. package/android/detox/src/testFull/java/com/wix/detox/espresso/performer/ViewActionPerformerSpec.kt +37 -0
  40. package/index.d.ts +47 -3
  41. package/local-cli/reset-lock-file.js +5 -9
  42. package/package.json +6 -6
  43. package/runners/jest/testEnvironment/index.js +1 -0
  44. package/src/DetoxWorker.js +5 -11
  45. package/src/android/core/NativeElement.js +26 -29
  46. package/src/android/espressoapi/DetoxAssertion.js +16 -14
  47. package/src/android/espressoapi/EspressoDetox.js +9 -2
  48. package/src/android/interactions/native.js +2 -3
  49. package/src/artifacts/providers/index.js +3 -3
  50. package/src/artifacts/screenshot/SimulatorScreenshotPlugin.js +0 -17
  51. package/src/configuration/composeLoggerConfig.js +1 -0
  52. package/src/devices/allocation/DeviceAllocator.js +66 -20
  53. package/src/devices/allocation/DeviceList.js +44 -0
  54. package/src/devices/allocation/DeviceRegistry.js +189 -0
  55. package/src/devices/allocation/drivers/AllocationDriverBase.d.ts +15 -0
  56. package/src/devices/{common/drivers/android/tools → allocation/drivers/android}/FreeDeviceFinder.js +11 -10
  57. package/src/devices/allocation/drivers/android/attached/AttachedAndroidAllocDriver.js +22 -17
  58. package/src/devices/allocation/drivers/android/emulator/EmulatorAllocDriver.js +97 -38
  59. package/src/devices/allocation/drivers/android/emulator/EmulatorLauncher.js +32 -45
  60. package/src/devices/allocation/drivers/android/emulator/FreeEmulatorFinder.js +1 -1
  61. package/src/devices/allocation/drivers/android/emulator/FreePortFinder.js +16 -0
  62. package/src/devices/allocation/drivers/android/emulator/launchEmulatorProcess.js +3 -3
  63. package/src/devices/allocation/drivers/android/genycloud/GenyAllocDriver.js +104 -32
  64. package/src/devices/allocation/drivers/android/genycloud/GenyInstanceLauncher.js +40 -31
  65. package/src/devices/allocation/drivers/android/genycloud/GenyRegistry.js +121 -0
  66. package/src/devices/allocation/drivers/android/genycloud/services/GenyInstanceLifecycleService.js +24 -0
  67. package/src/devices/{common → allocation}/drivers/android/genycloud/services/GenyRecipesService.js +1 -1
  68. package/src/devices/{common → allocation}/drivers/android/genycloud/services/dto/GenyInstance.js +6 -1
  69. package/src/devices/allocation/drivers/ios/SimulatorAllocDriver.js +94 -51
  70. package/src/devices/allocation/drivers/ios/SimulatorLauncher.js +11 -7
  71. package/src/devices/allocation/drivers/ios/SimulatorQuery.js +24 -0
  72. package/src/devices/allocation/factories/android.js +29 -35
  73. package/src/devices/allocation/factories/ios.js +7 -5
  74. package/src/devices/common/drivers/DeviceCookie.d.ts +12 -0
  75. package/src/devices/common/drivers/android/cookies.d.ts +11 -0
  76. package/src/devices/common/drivers/android/emulator/exec/EmulatorExec.js +17 -5
  77. package/src/devices/common/drivers/android/exec/ADB.js +1 -0
  78. package/src/devices/common/drivers/ios/cookies.d.ts +9 -0
  79. package/src/devices/common/drivers/ios/tools/AppleSimUtils.js +2 -0
  80. package/src/devices/cookies/index.js +0 -6
  81. package/src/devices/runtime/drivers/android/genycloud/GenyCloudDriver.js +7 -6
  82. package/src/devices/runtime/factories/android.js +3 -11
  83. package/src/devices/runtime/factories/ios.js +3 -2
  84. package/src/{servicelocator → devices/servicelocator}/android/emulatorServiceLocator.js +1 -1
  85. package/src/devices/servicelocator/android/genycloudServiceLocator.js +17 -0
  86. package/src/devices/servicelocator/android/index.js +23 -0
  87. package/src/{validation → devices/validation}/EnvironmentValidatorBase.js +1 -0
  88. package/src/{validation → devices/validation}/android/GenycloudEnvValidator.js +2 -2
  89. package/src/{validation → devices/validation}/factories/index.js +1 -1
  90. package/src/{validation → devices/validation}/ios/IosSimulatorEnvValidator.js +2 -2
  91. package/src/environmentFactory.js +1 -11
  92. package/src/ipc/IPCClient.js +17 -1
  93. package/src/ipc/IPCServer.js +27 -1
  94. package/src/logger/DetoxLogger.js +2 -2
  95. package/src/realms/DetoxContext.js +6 -0
  96. package/src/realms/DetoxPrimaryContext.js +42 -42
  97. package/src/realms/DetoxSecondaryContext.js +19 -0
  98. package/src/realms/symbols.js +4 -0
  99. package/src/utils/PIDService.js +27 -0
  100. package/src/utils/environment.js +8 -15
  101. package/src/utils/errorUtils.js +3 -3
  102. package/tsconfig.json +5 -3
  103. package/Detox-android/com/wix/detox/20.11.5-smoke.0/detox-20.11.5-smoke.0-javadoc.jar.md5 +0 -1
  104. package/Detox-android/com/wix/detox/20.11.5-smoke.0/detox-20.11.5-smoke.0-javadoc.jar.sha1 +0 -1
  105. package/Detox-android/com/wix/detox/20.11.5-smoke.0/detox-20.11.5-smoke.0-javadoc.jar.sha256 +0 -1
  106. package/Detox-android/com/wix/detox/20.11.5-smoke.0/detox-20.11.5-smoke.0-javadoc.jar.sha512 +0 -1
  107. package/Detox-android/com/wix/detox/20.11.5-smoke.0/detox-20.11.5-smoke.0-sources.jar.md5 +0 -1
  108. package/Detox-android/com/wix/detox/20.11.5-smoke.0/detox-20.11.5-smoke.0-sources.jar.sha1 +0 -1
  109. package/Detox-android/com/wix/detox/20.11.5-smoke.0/detox-20.11.5-smoke.0-sources.jar.sha256 +0 -1
  110. package/Detox-android/com/wix/detox/20.11.5-smoke.0/detox-20.11.5-smoke.0-sources.jar.sha512 +0 -1
  111. package/Detox-android/com/wix/detox/20.11.5-smoke.0/detox-20.11.5-smoke.0.aar +0 -0
  112. package/Detox-android/com/wix/detox/20.11.5-smoke.0/detox-20.11.5-smoke.0.aar.md5 +0 -1
  113. package/Detox-android/com/wix/detox/20.11.5-smoke.0/detox-20.11.5-smoke.0.aar.sha1 +0 -1
  114. package/Detox-android/com/wix/detox/20.11.5-smoke.0/detox-20.11.5-smoke.0.aar.sha256 +0 -1
  115. package/Detox-android/com/wix/detox/20.11.5-smoke.0/detox-20.11.5-smoke.0.aar.sha512 +0 -1
  116. package/Detox-android/com/wix/detox/20.11.5-smoke.0/detox-20.11.5-smoke.0.pom.md5 +0 -1
  117. package/Detox-android/com/wix/detox/20.11.5-smoke.0/detox-20.11.5-smoke.0.pom.sha1 +0 -1
  118. package/Detox-android/com/wix/detox/20.11.5-smoke.0/detox-20.11.5-smoke.0.pom.sha256 +0 -1
  119. package/Detox-android/com/wix/detox/20.11.5-smoke.0/detox-20.11.5-smoke.0.pom.sha512 +0 -1
  120. package/src/devices/DeviceRegistry.js +0 -176
  121. package/src/devices/allocation/drivers/AllocationDriverBase.js +0 -30
  122. package/src/devices/allocation/drivers/android/attached/AttachedAndroidLauncher.js +0 -13
  123. package/src/devices/allocation/drivers/android/emulator/EmulatorAllocationHelper.js +0 -72
  124. package/src/devices/allocation/drivers/android/genycloud/GenyDeviceRegistryFactory.js +0 -16
  125. package/src/devices/allocation/drivers/android/genycloud/GenyInstanceAllocationHelper.js +0 -65
  126. package/src/devices/common/drivers/DeviceAllocationHelper.js +0 -20
  127. package/src/devices/common/drivers/DeviceLauncher.js +0 -19
  128. package/src/devices/common/drivers/android/genycloud/services/GenyInstanceLifecycleService.js +0 -25
  129. package/src/devices/common/drivers/android/genycloud/services/GenyInstanceLookupService.js +0 -38
  130. package/src/devices/common/drivers/android/genycloud/services/GenyInstanceNaming.js +0 -14
  131. package/src/devices/cookies/AndroidDeviceCookie.js +0 -13
  132. package/src/devices/cookies/AndroidEmulatorCookie.js +0 -6
  133. package/src/devices/cookies/AttachedAndroidDeviceCookie.js +0 -12
  134. package/src/devices/cookies/DeviceCookie.js +0 -4
  135. package/src/devices/cookies/GenycloudEmulatorCookie.js +0 -20
  136. package/src/devices/cookies/IosCookie.js +0 -6
  137. package/src/devices/cookies/IosSimulatorCookie.js +0 -10
  138. package/src/devices/lifecycle/GenyGlobalLifecycleHandler.js +0 -71
  139. package/src/devices/lifecycle/factories/GenyGlobalLifecycleHandlerFactory.js +0 -18
  140. package/src/servicelocator/android/genycloudServiceLocator.js +0 -21
  141. package/src/servicelocator/android/index.js +0 -25
  142. package/src/servicelocator/ios.js +0 -7
  143. /package/src/devices/{common → allocation}/drivers/android/genycloud/exec/GenyCloudExec.js +0 -0
  144. /package/src/devices/{common → allocation}/drivers/android/genycloud/services/GenyAuthService.js +0 -0
  145. /package/src/devices/{common → allocation}/drivers/android/genycloud/services/dto/GenyRecipe.js +0 -0
@@ -1,176 +0,0 @@
1
- // @ts-nocheck
2
- const fs = require('fs-extra');
3
- const _ = require('lodash');
4
-
5
- const ExclusiveLockfile = require('../utils/ExclusiveLockfile');
6
- const environment = require('../utils/environment');
7
- const safeAsync = require('../utils/safeAsync');
8
-
9
- const readOptions = {
10
- encoding: 'utf8',
11
- };
12
-
13
- const FIELD_NAME_ID = 'id';
14
- const FIELD_NAME_DATA = 'data';
15
-
16
- class DevicesList {
17
- constructor(devices) {
18
- this._devices = Object.freeze(devices);
19
- }
20
-
21
- /**
22
- * @returns {{id: string, data: *?}[]}
23
- */
24
- get rawDevices() {
25
- return this._devices;
26
- }
27
-
28
- /**
29
- * @param {string} deviceId
30
- * @returns {boolean}
31
- */
32
- includes(deviceId) {
33
- return DevicesList._includes(deviceId, this._devices);
34
- }
35
-
36
- static _includes(deviceId, devices) {
37
- return _.some(devices, [FIELD_NAME_ID, deviceId]);
38
- }
39
- }
40
-
41
- class DeviceRegistry {
42
- constructor({ lockfilePath }) {
43
- /***
44
- * @private
45
- * @type {string}
46
- */
47
- this._lockfilePath = lockfilePath;
48
-
49
- /***
50
- * @protected
51
- * @type {ExclusiveLockfile}
52
- */
53
- this._lockfile = new ExclusiveLockfile(lockfilePath, {
54
- getInitialState: this._getInitialLockFileState.bind(this),
55
- readOptions,
56
- });
57
- }
58
-
59
- async reset() {
60
- await this._lockfile.exclusively(() => {
61
- const empty = this._getInitialLockFileState();
62
- this._lockfile.write(empty);
63
- });
64
- }
65
-
66
- /***
67
- * @param {string|Function} getDeviceId
68
- * @param {*?} data
69
- * @returns {Promise<string>}
70
- */
71
- async allocateDevice(getDeviceId, data) {
72
- return this._lockfile.exclusively(async () => {
73
- const deviceId = await safeAsync(getDeviceId);
74
- this._registerDevice(deviceId, data);
75
- return deviceId;
76
- });
77
- }
78
-
79
- /***
80
- * @param {string|Function} getDeviceId
81
- * @returns {Promise<void>}
82
- */
83
- async disposeDevice(getDeviceId) {
84
- await this._lockfile.exclusively(async () => {
85
- const deviceId = await safeAsync(getDeviceId);
86
- if (deviceId) {
87
- this._unregisterDevice(deviceId);
88
- }
89
- });
90
- }
91
-
92
- /***
93
- * @param {string} deviceId
94
- * @returns {boolean}
95
- */
96
- includes(deviceId) {
97
- const devices = this._lockfile.read();
98
- return DevicesList._includes(deviceId, devices);
99
- }
100
-
101
- /***
102
- * @returns {DevicesList}
103
- */
104
- getRegisteredDevices() {
105
- const devices = this._lockfile.read();
106
- return new DevicesList(devices);
107
- }
108
-
109
- /***
110
- * @returns {DevicesList}
111
- */
112
- async readRegisteredDevices() {
113
- let result = null;
114
- await this._lockfile.exclusively(() => {
115
- result = this.getRegisteredDevices();
116
- });
117
- return result;
118
- }
119
-
120
- /***
121
- * @returns {DevicesList}
122
- */
123
- readRegisteredDevicesUNSAFE() {
124
- const contents = fs.readFileSync(this._lockfilePath, readOptions);
125
- const devices = JSON.parse(contents);
126
- return new DevicesList(devices);
127
- }
128
-
129
- /***
130
- * @private
131
- */
132
- _getInitialLockFileState() {
133
- return [];
134
- }
135
-
136
- /**
137
- * @private
138
- */
139
- _registerDevice(deviceId, data) {
140
- const state = this._lockfile.read();
141
- let newState = _.reject(state, [FIELD_NAME_ID, deviceId]);
142
-
143
- const device = {};
144
- device[FIELD_NAME_ID] = deviceId;
145
-
146
- if (data) {
147
- device[FIELD_NAME_DATA] = data;
148
- }
149
-
150
- newState = _.concat(newState, device);
151
- this._lockfile.write(newState);
152
- }
153
-
154
- /**
155
- * @private
156
- */
157
- _unregisterDevice(deviceId) {
158
- const state = this._lockfile.read();
159
- const newState = _.reject(state, [FIELD_NAME_ID, deviceId]);
160
- this._lockfile.write(newState);
161
- }
162
-
163
- static forIOS() {
164
- return new DeviceRegistry({
165
- lockfilePath: environment.getDeviceLockFilePathIOS(),
166
- });
167
- }
168
-
169
- static forAndroid() {
170
- return new DeviceRegistry({
171
- lockfilePath: environment.getDeviceLockFilePathAndroid(),
172
- });
173
- }
174
- }
175
-
176
- module.exports = DeviceRegistry;
@@ -1,30 +0,0 @@
1
- /* eslint @typescript-eslint/no-unused-vars: ["error", { "args": "none" }] */
2
- // @ts-nocheck
3
-
4
- /**
5
- * @typedef DeallocOptions
6
- * @property shutdown { Boolean }
7
- */
8
-
9
- class AllocationDriverBase {
10
- /**
11
- * @param deviceConfig { Object }
12
- * @return {Promise<DeviceCookie>}
13
- */
14
- async allocate(deviceConfig) {}
15
-
16
- /**
17
- * @param {DeviceCookie} deviceCookie
18
- * @return {Promise<void>}
19
- */
20
- async postAllocate(deviceCookie) {}
21
-
22
- /**
23
- * @param cookie { DeviceCookie }
24
- * @param options { DeallocOptions }
25
- * @return {Promise<void>}
26
- */
27
- async free(cookie, options) {}
28
- }
29
-
30
- module.exports = AllocationDriverBase;
@@ -1,13 +0,0 @@
1
- const DeviceLauncher = require('../../../../common/drivers/DeviceLauncher');
2
-
3
- class AttachedAndroidLauncher extends DeviceLauncher {
4
- constructor(eventEmitter) {
5
- super(eventEmitter);
6
- }
7
-
8
- notifyLaunchCompleted(adbName) {
9
- return super._notifyBootEvent(adbName, 'device', false);
10
- }
11
- }
12
-
13
- module.exports = AttachedAndroidLauncher;
@@ -1,72 +0,0 @@
1
- const logger = require('../../../../../utils/logger').child({ cat: 'device' });
2
- const DeviceAllocationHelper = require('../../../../common/drivers/DeviceAllocationHelper');
3
-
4
- const DetoxEmulatorsPortRange = {
5
- min: 10000,
6
- max: 20000
7
- };
8
-
9
- class AllocationResult {
10
- constructor(adbName, placeholderPort) {
11
- this.adbName = adbName;
12
- this.placeholderPort = placeholderPort;
13
- }
14
-
15
- get isRunning() {
16
- return !this.placeholderPort;
17
- }
18
- }
19
-
20
- class EmulatorAllocationHelper extends DeviceAllocationHelper {
21
- constructor(deviceRegistry, freeDeviceFinder, rand = Math.random) {
22
- super(deviceRegistry, logger);
23
- this._freeDeviceFinder = freeDeviceFinder;
24
- this._rand = rand;
25
- }
26
-
27
- /**
28
- * @param avdName
29
- * @returns {Promise<AllocationResult>}
30
- */
31
- async allocateDevice(avdName) {
32
- this._logAllocationAttempt(avdName);
33
-
34
- const result = await this._doSynchronizedAllocation(avdName);
35
- this._logAllocationResult(avdName, result.adbName);
36
-
37
- return result;
38
- }
39
-
40
- async deallocateDevice(adbName) {
41
- await this._deviceRegistry.disposeDevice(adbName);
42
- }
43
-
44
- /**
45
- * @returns {Promise<AllocationResult>}
46
- * @private
47
- */
48
- async _doSynchronizedAllocation(avdName) {
49
- let placeholderPort = null;
50
- let adbName = null;
51
-
52
- await this._deviceRegistry.allocateDevice(async () => {
53
- adbName = await this._freeDeviceFinder.findFreeDevice(avdName);
54
- if (!adbName) {
55
- placeholderPort = this._allocateEmulatorPlaceholderPort();
56
- adbName = `emulator-${placeholderPort}`;
57
- }
58
- return adbName;
59
- });
60
-
61
- return new AllocationResult(adbName, placeholderPort);
62
- }
63
-
64
- _allocateEmulatorPlaceholderPort() {
65
- const { min, max } = DetoxEmulatorsPortRange;
66
- let port = this._rand() * (max - min) + min;
67
- port = port & 0xFFFFFFFE; // Should always be even
68
- return port;
69
- }
70
- }
71
-
72
- module.exports = EmulatorAllocationHelper;
@@ -1,16 +0,0 @@
1
- const environment = require('../../../../../utils/environment');
2
- const DeviceRegistry = require('../../../../DeviceRegistry');
3
-
4
- class GenyDeviceRegistryFactory {
5
- forRuntime() {
6
- return DeviceRegistry.forAndroid();
7
- }
8
-
9
- forGlobalShutdown() {
10
- return new DeviceRegistry({
11
- lockfilePath: environment.getGenyCloudGlobalCleanupFilePath(),
12
- });
13
- }
14
- }
15
-
16
- module.exports = new GenyDeviceRegistryFactory();
@@ -1,65 +0,0 @@
1
- // @ts-nocheck
2
- const logger = require('../../../../../utils/logger').child({ cat: 'device' });
3
- const DeviceAllocationHelper = require('../../../../common/drivers/DeviceAllocationHelper');
4
-
5
- const { ALLOCATE_DEVICE_LOG_EVT } = DeviceAllocationHelper;
6
-
7
- class AllocationResult {
8
- constructor(instance, isNew) {
9
- this.instance = instance;
10
- this.isNew = isNew;
11
- }
12
- }
13
-
14
- class GenyInstanceAllocationHelper extends DeviceAllocationHelper {
15
- constructor({ deviceRegistry, instanceLookupService, instanceLifecycleService }) {
16
- super(deviceRegistry, logger);
17
-
18
- this._instanceLookupService = instanceLookupService;
19
- this._instanceLifecycleService = instanceLifecycleService;
20
- }
21
-
22
- /**
23
- * @param recipe { GenyRecipe }
24
- * @return { Promise<AllocationResult> }
25
- */
26
- async allocateDevice(recipe) {
27
- this._logAllocationAttempt(recipe);
28
-
29
- const allocationResult = await this._doSynchronizedAllocation(recipe);
30
- this._logAllocationResult(recipe, allocationResult.instance);
31
-
32
- return allocationResult;
33
- }
34
-
35
- async deallocateDevice(instanceUUID) {
36
- await this._deviceRegistry.disposeDevice(instanceUUID);
37
- }
38
-
39
- /**
40
- * @param recipe { GenyRecipe }
41
- * @return {Promise<{AllocationResult}>}
42
- * @private
43
- */
44
- async _doSynchronizedAllocation(recipe) {
45
- let instance = null;
46
- let isNew = false;
47
-
48
- await this._deviceRegistry.allocateDevice(async () => {
49
- instance = await this._instanceLookupService.findFreeInstance();
50
- if (!instance) {
51
- instance = await this._instanceLifecycleService.createInstance(recipe.uuid);
52
- isNew = true;
53
- }
54
- return instance.uuid;
55
- });
56
-
57
- return new AllocationResult(instance, isNew);
58
- }
59
-
60
- _logAllocationResult(deviceQuery, deviceHandle) {
61
- logger.info({ event: ALLOCATE_DEVICE_LOG_EVT }, `Allocating Genymotion-Cloud instance ${deviceHandle.name} for testing. To access it via a browser, go to: https://cloud.geny.io/instance/${deviceHandle.uuid}`);
62
- }
63
- }
64
-
65
- module.exports = GenyInstanceAllocationHelper;
@@ -1,20 +0,0 @@
1
- const ALLOCATE_DEVICE_LOG_EVT = 'ALLOCATE_DEVICE';
2
-
3
- class DeviceAllocationHelper {
4
- constructor(deviceRegistry, logger) {
5
- this._deviceRegistry = deviceRegistry;
6
- this._logger = logger;
7
- }
8
-
9
- _logAllocationAttempt(deviceQuery) {
10
- this._logger.debug({ event: ALLOCATE_DEVICE_LOG_EVT }, `Trying to allocate a device based on "${deviceQuery}"`);
11
- }
12
-
13
- _logAllocationResult(deviceQuery, deviceHandle) {
14
- this._logger.debug({ event: ALLOCATE_DEVICE_LOG_EVT }, `Settled on ${deviceHandle}`);
15
- }
16
- }
17
-
18
- DeviceAllocationHelper.ALLOCATE_DEVICE_LOG_EVT = ALLOCATE_DEVICE_LOG_EVT;
19
-
20
- module.exports = DeviceAllocationHelper;
@@ -1,19 +0,0 @@
1
- class DeviceLauncher {
2
- constructor(eventEmitter) {
3
- this._eventEmitter = eventEmitter;
4
- }
5
-
6
- async _notifyPreShutdown(deviceId) {
7
- return this._eventEmitter.emit('beforeShutdownDevice', { deviceId });
8
- }
9
-
10
- async _notifyShutdownCompleted(deviceId) {
11
- return this._eventEmitter.emit('shutdownDevice', { deviceId });
12
- }
13
-
14
- async _notifyBootEvent(deviceId, type, coldBoot, headless) {
15
- return this._eventEmitter.emit('bootDevice', { deviceId, type, coldBoot, headless });
16
- }
17
- }
18
-
19
- module.exports = DeviceLauncher;
@@ -1,25 +0,0 @@
1
- const Instance = require('./dto/GenyInstance');
2
-
3
- class GenyInstanceLifecycleService {
4
- constructor(genyCloudExec, instanceNaming) {
5
- this.genyCloudExec = genyCloudExec;
6
- this.instanceNaming = instanceNaming;
7
- }
8
-
9
- async createInstance(recipeUUID) {
10
- const result = await this.genyCloudExec.startInstance(recipeUUID, this.instanceNaming.generateName());
11
- return new Instance(result.instance);
12
- }
13
-
14
- async adbConnectInstance(instanceUUID) {
15
- const result = (await this.genyCloudExec.adbConnect(instanceUUID));
16
- return new Instance(result.instance);
17
- }
18
-
19
- async deleteInstance(instanceUUID) {
20
- const result = await this.genyCloudExec.stopInstance(instanceUUID);
21
- return new Instance(result.instance);
22
- }
23
- }
24
-
25
- module.exports = GenyInstanceLifecycleService;
@@ -1,38 +0,0 @@
1
- const Instance = require('./dto/GenyInstance');
2
-
3
- class GenyInstanceLookupService {
4
- constructor(genyCloudExec, instanceNaming, genyCloudDeviceRegistry) {
5
- this.genyCloudExec = genyCloudExec;
6
- this.instanceNaming = instanceNaming;
7
- this.deviceRegistry = genyCloudDeviceRegistry;
8
- }
9
-
10
- async findFreeInstance() {
11
- const freeInstances = await this._getRelevantInstances();
12
- return (freeInstances[0] || null);
13
- }
14
-
15
- async getInstance(instanceUUID) {
16
- const { instance } = await this.genyCloudExec.getInstance(instanceUUID);
17
- return new Instance(instance);
18
- }
19
-
20
- async _getRelevantInstances() {
21
- const takenInstances = this.deviceRegistry.getRegisteredDevices();
22
- const isRelevant = (instance) =>
23
- (instance.isOnline() || instance.isInitializing()) &&
24
- this.instanceNaming.isFamilial(instance.name) &&
25
- !takenInstances.includes(instance.uuid);
26
-
27
- const instances = await this._getAllInstances();
28
- return instances.filter(isRelevant);
29
- }
30
-
31
- async _getAllInstances() {
32
- return (await this.genyCloudExec.getInstances())
33
- .instances
34
- .map((rawInstance) => new Instance(rawInstance));
35
- }
36
- }
37
-
38
- module.exports = GenyInstanceLookupService;
@@ -1,14 +0,0 @@
1
- const internals = () => require('../../../../../../../internals');
2
-
3
- class GenyInstanceNaming {
4
- generateName() {
5
- const { session, worker } = internals();
6
- return `Detox.${session.id}.${worker.id}`;
7
- }
8
-
9
- isFamilial(name) {
10
- return name === this.generateName();
11
- }
12
- }
13
-
14
- module.exports = GenyInstanceNaming;
@@ -1,13 +0,0 @@
1
- const DeviceCookie = require('./DeviceCookie');
2
-
3
- class AndroidDeviceCookie extends DeviceCookie {
4
- /**
5
- * @param adbName { String }
6
- */
7
- constructor(adbName) {
8
- super();
9
- this.adbName = adbName;
10
- }
11
- }
12
-
13
- module.exports = AndroidDeviceCookie;
@@ -1,6 +0,0 @@
1
- const AndroidDeviceCookie = require('./AndroidDeviceCookie');
2
-
3
- class AndroidEmulatorCookie extends AndroidDeviceCookie {
4
- }
5
-
6
- module.exports = AndroidEmulatorCookie;
@@ -1,12 +0,0 @@
1
- const AndroidDeviceCookie = require('./AndroidDeviceCookie');
2
-
3
- class AttachedAndroidDeviceCookie extends AndroidDeviceCookie {
4
- /**
5
- * @param adbName { String }
6
- */
7
- constructor(adbName) {
8
- super(adbName);
9
- }
10
- }
11
-
12
- module.exports = AttachedAndroidDeviceCookie;
@@ -1,4 +0,0 @@
1
- class DeviceCookie {
2
- }
3
-
4
- module.exports = DeviceCookie;
@@ -1,20 +0,0 @@
1
- // @ts-nocheck
2
- const AndroidDeviceCookie = require('./AndroidDeviceCookie');
3
-
4
- class GenycloudEmulatorCookie extends AndroidDeviceCookie {
5
- /**
6
- * @param instance { GenyInstance }
7
- */
8
- constructor(instance) {
9
- super();
10
- this.instance = instance;
11
- }
12
-
13
- get adbName() {
14
- return this.instance.adbName;
15
- }
16
-
17
- set adbName(value) {}
18
- }
19
-
20
- module.exports = GenycloudEmulatorCookie;
@@ -1,6 +0,0 @@
1
- const DeviceCookie = require('./DeviceCookie');
2
-
3
- class IosCookie extends DeviceCookie {
4
- }
5
-
6
- module.exports = IosCookie;
@@ -1,10 +0,0 @@
1
- const IosCookie = require('./IosCookie');
2
-
3
- class IosSimulatorCookie extends IosCookie {
4
- constructor(udid) {
5
- super();
6
- this.udid = udid;
7
- }
8
- }
9
-
10
- module.exports = IosSimulatorCookie;
@@ -1,71 +0,0 @@
1
- const logger = require('../../utils/logger').child({ cat: 'device' });
2
-
3
- const cleanupLogData = {
4
- event: 'GENYCLOUD_TEARDOWN',
5
- };
6
-
7
- class GenyGlobalLifecycleHandler {
8
- constructor({ deviceCleanupRegistry, instanceLifecycleService }) {
9
- /** @private */
10
- this._deviceCleanupRegistry = deviceCleanupRegistry;
11
- /** @private */
12
- this._instanceLifecycleService = instanceLifecycleService;
13
- }
14
-
15
- async globalInit() {}
16
-
17
- emergencyCleanup() {
18
- const { rawDevices } = this._deviceCleanupRegistry.readRegisteredDevicesUNSAFE();
19
- const instanceHandles = rawDevicesToInstanceHandles(rawDevices);
20
- if (instanceHandles.length) {
21
- reportGlobalCleanupSummary(instanceHandles);
22
- }
23
- }
24
-
25
- async globalCleanup() {
26
- const { rawDevices } = await this._deviceCleanupRegistry.readRegisteredDevices();
27
- const instanceHandles = rawDevicesToInstanceHandles(rawDevices);
28
- if (instanceHandles.length) {
29
- await doSafeCleanup(this._instanceLifecycleService, instanceHandles);
30
- }
31
- }
32
- }
33
-
34
- async function doSafeCleanup(instanceLifecycleService, instanceHandles) {
35
- logger.info(cleanupLogData, 'Initiating Genymotion SaaS instances teardown...');
36
-
37
- const deletionLeaks = [];
38
- const killPromises = instanceHandles.map((instanceHandle) =>
39
- instanceLifecycleService.deleteInstance(instanceHandle.uuid)
40
- .catch((error) => deletionLeaks.push({ ...instanceHandle, error })));
41
-
42
- await Promise.all(killPromises);
43
- reportGlobalCleanupSummary(deletionLeaks);
44
- }
45
-
46
- function reportGlobalCleanupSummary(deletionLeaks) {
47
- if (deletionLeaks.length) {
48
- logger.warn(cleanupLogData, 'WARNING! Detected a Genymotion SaaS instance leakage, for the following instances:');
49
-
50
- deletionLeaks.forEach(({ uuid, name, error }) => {
51
- logger.warn(cleanupLogData, [
52
- `Instance ${name} (${uuid})${error ? `: ${error}` : ''}`,
53
- ` Kill it by visiting https://cloud.geny.io/instance/${uuid}, or by running:`,
54
- ` gmsaas instances stop ${uuid}`,
55
- ].join('\n'));
56
- });
57
-
58
- logger.info(cleanupLogData, 'Instances teardown completed with warnings');
59
- } else {
60
- logger.info(cleanupLogData, 'Instances teardown completed successfully');
61
- }
62
- }
63
-
64
- function rawDevicesToInstanceHandles(rawDevices) {
65
- return rawDevices.map((rawDevice) => ({
66
- uuid: rawDevice.id,
67
- name: rawDevice.data.name,
68
- }));
69
- }
70
-
71
- module.exports = GenyGlobalLifecycleHandler;
@@ -1,18 +0,0 @@
1
- class GenyGlobalLifecycleHandlerFactory {
2
- /**
3
- * @returns { GenyGlobalLifecycleHandler }
4
- */
5
- createHandler() {
6
- const serviceLocator = require('../../../servicelocator/android');
7
- const deviceCleanupRegistry = serviceLocator.genycloud.cleanupDeviceRegistry;
8
- const exec = serviceLocator.genycloud.exec;
9
-
10
- const InstanceLifecycleService = require('../../common/drivers/android/genycloud/services/GenyInstanceLifecycleService');
11
- const instanceLifecycleService = new InstanceLifecycleService(exec, null);
12
-
13
- const GenyGlobalLifecycleHandler = require('../GenyGlobalLifecycleHandler');
14
- return new GenyGlobalLifecycleHandler({ deviceCleanupRegistry, instanceLifecycleService });
15
- }
16
- }
17
-
18
- module.exports = GenyGlobalLifecycleHandlerFactory;