detox 20.24.0 → 20.25.0

package/Detox-android/com/wix/detox/20.25.0/detox-20.25.0-sources.jar.md5

@@ -0,0 +1 @@
+1ef4d5de8e6a4ecba3ed72380b788a83

package/Detox-android/com/wix/detox/20.25.0/detox-20.25.0-sources.jar.sha1

@@ -0,0 +1 @@
+bf218e51fdffafef09dbfc843a4e78a280e65d89

package/Detox-android/com/wix/detox/20.25.0/detox-20.25.0-sources.jar.sha256

@@ -0,0 +1 @@
+6fc99e94e5a63dcfdec73700425a79685a1379d89894df57063ece91822a9e4d

package/Detox-android/com/wix/detox/20.25.0/detox-20.25.0-sources.jar.sha512

@@ -0,0 +1 @@
+78ba7a9072d2a529054068b59f43da93616ffe5bce9cb99aacded5caf0aac926a3b68afa19dac3e714cf82bb74259a1dc94bf7de277296ea6843c6417676c712

package/Detox-android/com/wix/detox/{20.24.0/detox-20.24.0.pom → 20.25.0/detox-20.25.0.pom}

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
-  <version>20.24.0</version>
+  <version>20.25.0</version>
   <packaging>aar</packaging>
   <name>Detox</name>
   <description>Gray box end-to-end testing and automation library for mobile apps</description>

package/Detox-android/com/wix/detox/20.25.0/detox-20.25.0.pom.md5

@@ -0,0 +1 @@
+957806b8f4d6b7cc51959522d64dcb7f

package/Detox-android/com/wix/detox/20.25.0/detox-20.25.0.pom.sha1

@@ -0,0 +1 @@
+feb3185877ed9e49f252ceba89b9a338a8780a7e

package/Detox-android/com/wix/detox/20.25.0/detox-20.25.0.pom.sha256

@@ -0,0 +1 @@
+720aecc2ad5d50ce4c088fb9c22477d7e1682f19b865e64b5f3bb40f316a471d

package/Detox-android/com/wix/detox/20.25.0/detox-20.25.0.pom.sha512

@@ -0,0 +1 @@
+aeb1ef3a386a2214a8d59b5cfd6941167a3482a2037a0578d9508791784c7687c75ff3cfc8d344d4ed475e2d25f39c588243ea3e0b49371c02ffd0f340ad7a1d

package/Detox-android/com/wix/detox/maven-metadata.xml

@@ -3,11 +3,11 @@
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
   <versioning>
-    <latest>20.24.0</latest>
-    <release>20.24.0</release>
+    <latest>20.25.0</latest>
+    <release>20.25.0</release>
     <versions>
-      <version>20.24.0</version>
+      <version>20.25.0</version>
     </versions>
-    <lastUpdated>20240712095248</lastUpdated>
+    <lastUpdated>20240715205614</lastUpdated>
   </versioning>
 </metadata>

package/Detox-android/com/wix/detox/maven-metadata.xml.md5

@@ -1 +1 @@
-cbe838e81e9b2489895384dbf73d9855
+7190e56ff7f9476749c4b80df18b904f

package/Detox-android/com/wix/detox/maven-metadata.xml.sha1

@@ -1 +1 @@
-248526814045318fcaeda09d11dcff993503e58c
+3dd6be11b5dfc415e669f7dae9b3a64d1c175366

package/Detox-android/com/wix/detox/maven-metadata.xml.sha256

@@ -1 +1 @@
-674cb578d4b1ab1e1f0f3af2f9e6b7d237e9417840a73f4a55181cc61aa55a75
+1410ac33039127064c7d3e49dadc668c0f7e473f41d2cc900904d50340652623

package/Detox-android/com/wix/detox/maven-metadata.xml.sha512

@@ -1 +1 @@
-bf96117e1935d3a9c81337a743672b5ef93cc5c786026f5b2bca4118ab69c5c3b4a55600019581dc75f5b533e0fc310963e457df556d8b5108f2628aa246fbd8
+ded5ced73efe397aba118e65aef95bb92b5de64ea19065c918bcfec049416209b07a08da188f221da3d57a666ee2c3446e8e197ce19d09802b4b4d8f7e7bcdd2

package/Detox-android/com/wix/detox-legacy/20.25.0/detox-legacy-20.25.0-sources.jar.md5

@@ -0,0 +1 @@
+65c4c13e340925f4aab9a63f04e0421d

package/Detox-android/com/wix/detox-legacy/20.25.0/detox-legacy-20.25.0-sources.jar.sha1

@@ -0,0 +1 @@
+7fe9a252f0ff18215ca79bcae96b29b15e819711

package/Detox-android/com/wix/detox-legacy/20.25.0/detox-legacy-20.25.0-sources.jar.sha256

@@ -0,0 +1 @@
+aeb521a3fd006873fa3f0c7252b6fdc772d9264ede1f2ce85e3de69eafc0b136

package/Detox-android/com/wix/detox-legacy/20.25.0/detox-legacy-20.25.0-sources.jar.sha512

@@ -0,0 +1 @@
+73329439f480b60ffca53d8244d27883adddba2b4d18c3753b8e6247cee9499674921b522c51fd2f1a2cd59dd84448e22dc7005f8b7c047d61a7aeaf515d8924

package/Detox-android/com/wix/detox-legacy/{20.24.0/detox-legacy-20.24.0.pom → 20.25.0/detox-legacy-20.25.0.pom}

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wix</groupId>
   <artifactId>detox-legacy</artifactId>
-  <version>20.24.0</version>
+  <version>20.25.0</version>
   <packaging>aar</packaging>
   <name>Detox</name>
   <description>Gray box end-to-end testing and automation library for mobile apps</description>

package/Detox-android/com/wix/detox-legacy/20.25.0/detox-legacy-20.25.0.pom.md5

@@ -0,0 +1 @@
+20f9a40218510a8b583767d4fe5c5b2b

package/Detox-android/com/wix/detox-legacy/20.25.0/detox-legacy-20.25.0.pom.sha1

@@ -0,0 +1 @@
+30587cdeead2f48ccc50d83c3a7e9f3f29aa3266

package/Detox-android/com/wix/detox-legacy/20.25.0/detox-legacy-20.25.0.pom.sha256

@@ -0,0 +1 @@
+6801fa55201f5da99902aef7e9b8e769128742421215ddc0838df2b42e06f539

package/Detox-android/com/wix/detox-legacy/20.25.0/detox-legacy-20.25.0.pom.sha512

@@ -0,0 +1 @@
+a68a395358cf5998b6f531d3845189b2c3091d2d2ad84e96557458a413a3c891d5fcab1f21fee134422463a011473dfe472353d4b7b2f1e98cccda4537634346

package/Detox-android/com/wix/detox-legacy/maven-metadata.xml

@@ -3,11 +3,11 @@
   <groupId>com.wix</groupId>
   <artifactId>detox-legacy</artifactId>
   <versioning>
-    <latest>20.24.0</latest>
-    <release>20.24.0</release>
+    <latest>20.25.0</latest>
+    <release>20.25.0</release>
     <versions>
-      <version>20.24.0</version>
+      <version>20.25.0</version>
     </versions>
-    <lastUpdated>20240712095305</lastUpdated>
+    <lastUpdated>20240715205632</lastUpdated>
   </versioning>
 </metadata>

package/Detox-android/com/wix/detox-legacy/maven-metadata.xml.md5

@@ -1 +1 @@
-ebd10c4caa0af7ac57ef360ffe5e7c41
+dade265a6ab1e6c2805c7c514248c301

package/Detox-android/com/wix/detox-legacy/maven-metadata.xml.sha1

@@ -1 +1 @@
-82e96d3f328e2794534a91f0b921dd1c51413e8e
+2f0e11145b8c19b7d690ac624dded2d174b5d73d

package/Detox-android/com/wix/detox-legacy/maven-metadata.xml.sha256

@@ -1 +1 @@
-1d2093dc2d529e5844dd5117be23864ddfc8101c2d5b5a935b48ce56cf434cb2
+4bc8b1de62674a27c93222c12a83391a17162ebd7eb724d98d4963a367a529d1

package/Detox-android/com/wix/detox-legacy/maven-metadata.xml.sha512

@@ -1 +1 @@
-515cd3e14cf792392678590d01108ca641e8ae53db46446f4fa7bbbebc9a680b8efd5568b7b5306ce4ed46e12e36c3fd9fe5d8c05e412a25cfbd5b5fd17a963d
+7b65922619711eceecefd19ecc74f38b37f99d3356eb3c562084311c4fd65a80bae64ca6766da2db270856e83d92ca067103043ec4394d6e8fed84307f2a424b

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "detox",
   "description": "E2E tests and automation for mobile",
-  "version": "20.24.0",
+  "version": "20.25.0",
   "bin": {
     "detox": "local-cli/cli.js"
   },
@@ -115,5 +115,5 @@
   "browserslist": [
     "node 14"
   ],
-  "gitHead": "4a442cee82115ef4eeb5dd618e8ab4d0281f4b2a"
+  "gitHead": "cc035471e072da19c16fc9e49983e00eddfe411b"
 }

package/src/devices/allocation/DeviceAllocator.js

@@ -4,6 +4,8 @@
  * @typedef {import('../common/drivers/DeviceCookie').DeviceCookie} DeviceCookie
  */
 
+const _ = require('lodash');
+
 const log = require('../../utils/logger').child({ cat: 'device,device-allocation' });
 const traceMethods = require('../../utils/traceMethods');
 
@@ -16,6 +18,11 @@ class DeviceAllocator {
     this._counter = 0;
     this._ids = new Map();
     traceMethods(log, this, ['init', 'cleanup', 'emergencyCleanup']);
+
+    // Init and cleanup should be called once for each allocation driver type
+    this.init = _.once(this.init.bind(this));
+    this.cleanup = _.once(this.cleanup.bind(this));
+    this.emergencyCleanup = _.once(this.emergencyCleanup.bind(this));
   }
 
   /**

package/src/devices/allocation/drivers/android/genycloud/GenyAllocDriver.js

@@ -10,6 +10,7 @@ const log = require('../../../../../utils/logger').child({ cat: 'device' });
 const GenyRegistry = require('./GenyRegistry');
 
 const events = {
+  GENYCLOUD_INIT: { event: 'GENYCLOUD_INIT' },
   GENYCLOUD_TEARDOWN: { event: 'GENYCLOUD_TEARDOWN' },
 };
 
@@ -40,12 +41,19 @@ class GenyAllocDriver {
     this._instanceCounter = 0;
   }
 
+  async init() {
+    try {
+      await this._adb.startDaemon();
+    } catch (error) {
+      log.warn({ ...events.GENYCLOUD_INIT, error }, 'ADB server start failed; error ignored');
+    }
+  }
+
   /**
    * @param deviceConfig { Object }
    * @return {Promise<GenycloudEmulatorCookie>}
    */
   async allocate(deviceConfig) {
-    await new Promise((resolve) => setTimeout(resolve, 10000));
     const deviceQuery = deviceConfig.device;
     const recipe = await this._recipeQuerying.getRecipeFromQuery(deviceQuery);
     this._assertRecipe(deviceQuery, recipe);

package/src/devices/common/drivers/android/exec/ADB.js

@@ -16,6 +16,14 @@ class ADB {
     this.adbBin = getAdbPath();
   }
 
+  async startDaemon() {
+    await this.adbCmd('', 'start-server', { retries: 0, verbosity: 'high' });
+  }
+
+  async killDaemon() {
+    await this.adbCmd('', 'kill-server', { retries: 0, verbosity: 'high' });
+  }
+
   async devices() {
     const { stdout } = await this.adbCmd('', 'devices', { verbosity: 'high' });
     /** @type {DeviceHandle[]} */

package/src/realms/DetoxPrimaryContext.js

@@ -26,6 +26,7 @@ const _logFinalError = Symbol('logFinalError');
 const _cookieAllocators = Symbol('cookieAllocators');
 const _deviceAllocators = Symbol('deviceAllocators');
 const _createDeviceAllocator = Symbol('createDeviceAllocator');
+const _createDeviceAllocatorInstance = Symbol('createDeviceAllocatorInstance');
 //#endregion
 
 class DetoxPrimaryContext extends DetoxContext {
@@ -272,29 +273,41 @@ class DetoxPrimaryContext extends DetoxContext {
   /** @param {Detox.DetoxDeviceConfig} deviceConfig */
   [_createDeviceAllocator] = async (deviceConfig) => {
     const deviceType = deviceConfig.type;
+    const deviceAllocator = this[_createDeviceAllocatorInstance](deviceConfig);
+
+    try {
+      await deviceAllocator.init();
+    } catch (e) {
+      try {
+        delete this[_deviceAllocators][deviceType];
+        await deviceAllocator.cleanup();
+      } catch (e2) {
+        this[symbols.logger].error({ cat: 'device', err: e2 }, `Failed to cleanup the device allocation driver for ${deviceType} after a failed initialization`);
+      }
+
+      throw e;
+    }
+
+    return this[_deviceAllocators][deviceType];
+  };
+
+  /**
+   * @param {Detox.DetoxDeviceConfig} deviceConfig
+   * @returns { DeviceAllocator }
+   */
+  [_createDeviceAllocatorInstance] = (deviceConfig) => {
+    const deviceType = deviceConfig.type;
+
     if (!this[_deviceAllocators][deviceType]) {
       const environmentFactory = require('../environmentFactory');
       const { deviceAllocatorFactory } = environmentFactory.createFactories(deviceConfig);
       const { detoxConfig } = this[$sessionState];
-      const deviceAllocator = deviceAllocatorFactory.createDeviceAllocator({
+
+      this[_deviceAllocators][deviceType] = deviceAllocatorFactory.createDeviceAllocator({
         detoxConfig,
-        detoxSession: this[$sessionState],
+        detoxSession: this[$sessionState]
       });
-
-      try {
-        await deviceAllocator.init();
-        this[_deviceAllocators][deviceType] = deviceAllocator;
-      } catch (e) {
-        try {
-          await deviceAllocator.cleanup();
-        } catch (e2) {
-          this[symbols.logger].error({ cat: 'device', err: e2 }, `Failed to cleanup the device allocation driver for ${deviceType} after a failed initialization`);
-        }
-
-        throw e;
-      }
     }
-
     return this[_deviceAllocators][deviceType];
   };
 

package/Detox-android/com/wix/detox/20.24.0/detox-20.24.0-sources.jar.md5

@@ -1 +0,0 @@
-619b3e428e498fda0870620ce2d3c5c4

package/Detox-android/com/wix/detox/20.24.0/detox-20.24.0-sources.jar.sha1

@@ -1 +0,0 @@
-017905bcc89ab25f26a51c0d724680d83416b2e7

package/Detox-android/com/wix/detox/20.24.0/detox-20.24.0-sources.jar.sha256

@@ -1 +0,0 @@
-d88cd6cd15872d9f04c77c23c1c2fd4474787eb0f25333f08452c2fb4de8c74b

package/Detox-android/com/wix/detox/20.24.0/detox-20.24.0-sources.jar.sha512

@@ -1 +0,0 @@
-2757b909c56c219bdb8fcb4b629523bcad05556234bf89ae5953b21e62c3a9676f45ad36ed3eb4b8a875a891406664c55a7102ff8933a8c4dcb8eecf3f2723a1

package/Detox-android/com/wix/detox/20.24.0/detox-20.24.0.pom.md5

@@ -1 +0,0 @@
-d6caeb72643d8530ef1b332e98566350

package/Detox-android/com/wix/detox/20.24.0/detox-20.24.0.pom.sha1

@@ -1 +0,0 @@
-13c3cb0d37f92bcd283ef5344897c975396b93d0

package/Detox-android/com/wix/detox/20.24.0/detox-20.24.0.pom.sha256

@@ -1 +0,0 @@
-348ea5305bc6ebd7658d9966eee32c073f268adf33e802a12469c2dad0c136bf

package/Detox-android/com/wix/detox/20.24.0/detox-20.24.0.pom.sha512

@@ -1 +0,0 @@
-cf5032396a95a97fd964672c188382d46fd16195e5708a6b21f85322a678595d8923f7dac31479f05e1121af4fcef0734c22ceabdf22afd54db9213ccb70a9dc

package/Detox-android/com/wix/detox-legacy/20.24.0/detox-legacy-20.24.0-sources.jar.md5

@@ -1 +0,0 @@
-9e833c26f83f840d110b10f49e930040

package/Detox-android/com/wix/detox-legacy/20.24.0/detox-legacy-20.24.0-sources.jar.sha1

@@ -1 +0,0 @@
-47fa17817e76b9388404db2f8af6adf908faa1cb

package/Detox-android/com/wix/detox-legacy/20.24.0/detox-legacy-20.24.0-sources.jar.sha256

@@ -1 +0,0 @@
-4ad337ac65a1942992b394b1bacdbec38f2415032903af63d6dfbe7bf8539233

package/Detox-android/com/wix/detox-legacy/20.24.0/detox-legacy-20.24.0-sources.jar.sha512

@@ -1 +0,0 @@
-5d9ddd3356f022e5a7a341caddb73a9a2deb69f36886824bda7e7f48f104ad94f7950924101dbd6248a7afd4cb03a8da2ae5a9a4b2f1cf498cae53f306a68ccf

package/Detox-android/com/wix/detox-legacy/20.24.0/detox-legacy-20.24.0.pom.md5

@@ -1 +0,0 @@
-c0fb34a4b4869fb29fe7c29e071a8905

package/Detox-android/com/wix/detox-legacy/20.24.0/detox-legacy-20.24.0.pom.sha1

@@ -1 +0,0 @@
-01fb530a4a232d4ddd2428bc594a69de25963637

package/Detox-android/com/wix/detox-legacy/20.24.0/detox-legacy-20.24.0.pom.sha256

@@ -1 +0,0 @@
-6cb3e5c70e00b6dc5f102587810da45a304a2b61dc843161b00a9022cdae27de

package/Detox-android/com/wix/detox-legacy/20.24.0/detox-legacy-20.24.0.pom.sha512

@@ -1 +0,0 @@
-d6a1b08152dc9a8c0f5defe3251ed611cd3fd2648702b54d12e53f00d3a8a1315897466eb02e31350379002eb74e8bbdd91539a91b18c5bfffa4a5fa8db78719