detox 20.24.0 → 20.25.1

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

@@ -0,0 +1 @@
+ef152eed43d99abecc781d2c5581ed2c

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

@@ -0,0 +1 @@
+a00c63f1d6864fe3684aabdc4addaf251db4f12d

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

@@ -0,0 +1 @@
+9d2842e3781dc8085a80c2029c5d63cac9b382181371e3d715e71248ae81e619

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

@@ -0,0 +1 @@
+9f993e109ac46d9ec4132ad900b0eee9e4f5604909c69496ebc364ba1bc32ceb19fca9b5adbfe6a9e61c4c489e6a21e61efd58ec6a0602a4c8dd35c0f1897c72

package/Detox-android/com/wix/detox/{20.24.0/detox-20.24.0.pom → 20.25.1/detox-20.25.1.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.1</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.1/detox-20.25.1.pom.md5

@@ -0,0 +1 @@
+5a378650b3fb1fc751bad1924a05e988

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

@@ -0,0 +1 @@
+a2d652e833f0d7a91a8f05e2232a4ca964992a66

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

@@ -0,0 +1 @@
+97b5030e5db6c3d762c9a24ecc11a6989f4079591ddab23d2b8c67e4ac20bfb7

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

@@ -0,0 +1 @@
+37ab0fe6dec997c70fdff5e0f76acf744c487d150a70954bffa0467042c861b2bfe3711d53762c1ea0efce1a6fc8c29b82bfb822435cac2756474fcec24c4d5e

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.1</latest>
+    <release>20.25.1</release>
     <versions>
-      <version>20.24.0</version>
+      <version>20.25.1</version>
     </versions>
-    <lastUpdated>20240712095248</lastUpdated>
+    <lastUpdated>20240716121904</lastUpdated>
   </versioning>
 </metadata>

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

@@ -1 +1 @@
-cbe838e81e9b2489895384dbf73d9855
+275ff0123e1dbaa1aed3a7e91e9ae762

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

@@ -1 +1 @@
-248526814045318fcaeda09d11dcff993503e58c
+f986a8170fefe76b9f4efd0b755aaccde8b51bdd

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

@@ -1 +1 @@
-674cb578d4b1ab1e1f0f3af2f9e6b7d237e9417840a73f4a55181cc61aa55a75
+779e3063806e639cd380893e02fe5a902fbdad0f12d6eb06b09819f07a863272

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

@@ -1 +1 @@
-bf96117e1935d3a9c81337a743672b5ef93cc5c786026f5b2bca4118ab69c5c3b4a55600019581dc75f5b533e0fc310963e457df556d8b5108f2628aa246fbd8
+8c0fae16887da6da5fa405a62587e05612fa0b27a8d4e047419dfeb0bf3889b83c4c367941056b92b309b327c3f9aa28f1b26cc882ce6dda96ec2564a0836089

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

@@ -0,0 +1 @@
+5faf79ea736df2cf512a937df79bec2a

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

@@ -0,0 +1 @@
+834508470595778511d3f3b564de2d31413e57ff

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

@@ -0,0 +1 @@
+3d5e951f611b30a5d85d3535db3152824f019c4cd99972ff304b76d0c46b1038

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

@@ -0,0 +1 @@
+ff7bf763835d49aa17a6ba58b738cf47e5577038c10de0e6af0c629be076970895540b02ee8ba9d431c277f28aa1458c617d95b9df0adb0a32d0fa3afb67972c

package/Detox-android/com/wix/detox-legacy/{20.24.0/detox-legacy-20.24.0.pom → 20.25.1/detox-legacy-20.25.1.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.1</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.1/detox-legacy-20.25.1.pom.md5

@@ -0,0 +1 @@
+275a026938b603bc63c62aa9105660ab

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

@@ -0,0 +1 @@
+38f52f7d5a0616f1ea0c7fd7831197ebda6b4df9

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

@@ -0,0 +1 @@
+92ee50857ac9fb128bd30d6079ed09ef71e53526fe45581baec69d72bc05c5a4

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

@@ -0,0 +1 @@
+e6ca3c09f9026d4e0c54b71f8b1c78506fc6a2005c3f41e6df65b4f8f36fb4bea770cca153c887f140ce338200397777168a55e52bd51c4894dbe11677d422b6

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.1</latest>
+    <release>20.25.1</release>
     <versions>
-      <version>20.24.0</version>
+      <version>20.25.1</version>
     </versions>
-    <lastUpdated>20240712095305</lastUpdated>
+    <lastUpdated>20240716121940</lastUpdated>
   </versioning>
 </metadata>

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

@@ -1 +1 @@
-ebd10c4caa0af7ac57ef360ffe5e7c41
+39a5211574c6847cfa8ba0c843d19419

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

@@ -1 +1 @@
-82e96d3f328e2794534a91f0b921dd1c51413e8e
+03853c1e7b6181d8a82d09756d5ffeb0894d2883

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

@@ -1 +1 @@
-1d2093dc2d529e5844dd5117be23864ddfc8101c2d5b5a935b48ce56cf434cb2
+3c07d8c65169a75189c32e72f195d09399c059a0a42a5d42e0a54e06a9c1af8e

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

@@ -1 +1 @@
-515cd3e14cf792392678590d01108ca641e8ae53db46446f4fa7bbbebc9a680b8efd5568b7b5306ce4ed46e12e36c3fd9fe5d8c05e412a25cfbd5b5fd17a963d
+01a09bb5c4de685f4a81bb7b11d211230808546068b486ca51e3889dfb74ad278c18f7a330c6b1898d73a8b993d91884e36336fcb84054e1a923b93f6578613f

package/package.json

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

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/allocation/drivers/android/genycloud/exec/GenyCloudExec.js

@@ -28,7 +28,7 @@ class GenyCloudExec {
   }
 
   adbConnect(instanceUUID) {
-    return this._exec(`instances adbconnect ${instanceUUID}`);
+    return this._exec(`instances adbconnect ${instanceUUID}`, { retries: 0 });
   }
 
   stopInstance(instanceUUID) {

package/src/devices/allocation/drivers/android/genycloud/services/GenyInstanceLifecycleService.js

@@ -1,8 +1,16 @@
+const log = require('../../../../../../utils/logger').child({ cat: 'device' });
+const retry = require('../../../../../../utils/retry');
+
 const Instance = require('./dto/GenyInstance');
 
 class GenyInstanceLifecycleService {
-  constructor(genyCloudExec) {
+  /**
+   * @param { import('../exec/GenyCloudExec') } genyCloudExec
+   * @param { import('../../../../../common/drivers/android/exec/ADB') } adb
+   */
+  constructor(genyCloudExec, adb) {
     this._genyCloudExec = genyCloudExec;
+    this._adb = adb;
   }
 
   async createInstance(recipeUUID, instanceName) {
@@ -10,8 +18,24 @@ class GenyInstanceLifecycleService {
     return new Instance(result.instance);
   }
 
-  async adbConnectInstance(instanceUUID) {
-    const result = (await this._genyCloudExec.adbConnect(instanceUUID));
+  async adbConnectInstance(instanceUUID){
+    const doAdbConnect = async () =>
+      this._genyCloudExec.adbConnect(instanceUUID);
+    const beforeEachRetry = async () => {
+      try {
+        const { stdout } = await this._adb.devices({ retries: 0, verbosity: 'low' });
+        log.warn('adb-connect command failed, current ADB devices list:\n', stdout);
+      } catch (e) {
+        log.warn('adb-connect command failed; couldn\'t get the list of current devices (see error)', e);
+      }
+      return true;
+    };
+    const options = {
+      conditionFn: beforeEachRetry,
+      retries: 2,
+    };
+
+    const result = await retry(options, doAdbConnect);
     return new Instance(result.instance);
   }
 

package/src/devices/allocation/factories/android.js

@@ -66,7 +66,7 @@ class Genycloud extends DeviceAllocatorFactory {
     const recipeService = new RecipesService(exec);
 
     const InstanceLifecycleService = require('../drivers/android/genycloud/services/GenyInstanceLifecycleService');
-    const instanceLifecycleService = new InstanceLifecycleService(exec);
+    const instanceLifecycleService = new InstanceLifecycleService(exec, adb);
 
     const RecipeQuerying = require('../drivers/android/genycloud/GenyRecipeQuerying');
     const recipeQuerying = new RecipeQuerying(recipeService);

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

@@ -16,8 +16,12 @@ class ADB {
     this.adbBin = getAdbPath();
   }
 
-  async devices() {
-    const { stdout } = await this.adbCmd('', 'devices', { verbosity: 'high' });
+  async startDaemon() {
+    await this.adbCmd('', 'start-server', { retries: 0, verbosity: 'high' });
+  }
+
+  async devices(options) {
+    const { stdout } = await this.adbCmd('', 'devices', { verbosity: 'high', ...options });
     /** @type {DeviceHandle[]} */
     const devices = _.chain(stdout)
       .trim()

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