detox 20.12.0-smoke.0 → 20.12.1

package/src/devices/allocation/DeviceRegistry.js

@@ -1,186 +0,0 @@
-const ExclusiveLockfile = require('../../utils/ExclusiveLockfile');
-const PIDService = require('../../utils/PIDService');
-const { getDeviceRegistryPath } = require('../../utils/environment');
-const safeAsync = require('../../utils/safeAsync');
-
-const DeviceList = require('./DeviceList');
-
-const readOptions = {
-  encoding: 'utf8',
-};
-
-class DeviceRegistry {
-  constructor({
-    lockfilePath = getDeviceRegistryPath(),
-    sessionId = '',
-    pidService = new PIDService(),
-  } = {}) {
-    /***
-     * @private
-     * @type {string}
-     */
-    this._lockfilePath = lockfilePath;
-    /***
-     * @private
-     * @type {string}
-     */
-    this._sessionId = sessionId;
-    /***
-     * @private
-     */
-    this._pidService = pidService;
-    /***
-     * @protected
-     * @type {ExclusiveLockfile}
-     */
-    this._lockfile = new ExclusiveLockfile(this._lockfilePath, {
-      getInitialState: this._getInitialLockFileState.bind(this),
-      readOptions,
-    });
-  }
-
-  get lockFilePath() {
-    return this._lockfilePath;
-  }
-
-  /**
-   * Safety method to ensure that there are no remains of previously crashed Detox sessions.
-   */
-  async reset() {
-    await this._lockfile.exclusively(() => {
-      const empty = this._getInitialLockFileState();
-      this._lockfile.write(empty);
-    });
-  }
-
-  /***
-   * @param {string|Function} getDeviceId
-   * @returns {Promise<string>}
-   */
-  async registerDevice(getDeviceId) {
-    return this._lockfile.exclusively(async () => {
-      const deviceId = await safeAsync(getDeviceId);
-      if (deviceId) {
-        this._upsertDevice(deviceId, {
-          busy: true,
-          sessionId: this._sessionId,
-          pid: this._pidService.getPid(),
-        });
-      }
-      return deviceId;
-    });
-  }
-
-  /***
-   * @param {string|Function} getDeviceId
-   * @returns {Promise<string>}
-   */
-  async releaseDevice(getDeviceId) {
-    return this._lockfile.exclusively(async () => {
-      const deviceId = await safeAsync(getDeviceId);
-      if (deviceId) {
-        this._upsertDevice(deviceId, {
-          busy: false,
-          sessionId: this._sessionId,
-          pid: this._pidService.getPid(),
-        });
-      }
-      return deviceId;
-    });
-  }
-
-  /***
-   * @param {string|Function} getDeviceId
-   * @returns {Promise<void>}
-   */
-  async unregisterDevice(getDeviceId) {
-    await this._lockfile.exclusively(async () => {
-      const deviceId = await safeAsync(getDeviceId);
-      if (deviceId) {
-        this._deleteDevice(deviceId);
-      }
-    });
-  }
-
-  async unregisterSessionDevices() {
-    await this._lockfile.exclusively(async () => {
-      const allDevices = this._getRegisteredDevices();
-      const sessionDevices = allDevices.filter(device => device.sessionId === this._sessionId);
-      for (const id of sessionDevices.getIds()) {
-        allDevices.delete(id);
-      }
-      this._lockfile.write([...allDevices]);
-    });
-  }
-
-  async unregisterZombieDevices() {
-    await this._lockfile.exclusively(async () => {
-      const allDevices = this._getRegisteredDevices();
-      const zombieDevices = allDevices.filter(device => {
-        return device.sessionId !== this._sessionId && !this._pidService.isAlive(device.pid);
-      });
-
-      for (const id of zombieDevices.getIds()) {
-        allDevices.delete(id);
-      }
-      this._lockfile.write([...allDevices]);
-    });
-  }
-
-  async readSessionDevices() {
-    let devices;
-    await this._lockfile.exclusively(() => {
-      devices = this._getSessionDevicesSync();
-    });
-    return devices;
-  }
-
-  getTakenDevicesSync() {
-    const allDevices = this._getRegisteredDevices();
-    const busyDevices = allDevices.filter(device => device.busy);
-    const externalDevices = allDevices.filter(device => device.sessionId !== this._sessionId);
-    return busyDevices.concat(externalDevices);
-  }
-
-  /***
-   * @private
-   */
-  _getInitialLockFileState() {
-    return [];
-  }
-
-  /**
-   * @private
-   */
-  _upsertDevice(deviceId, data) {
-    const devices = this._getRegisteredDevices();
-    devices.add(deviceId, data);
-    this._lockfile.write([...devices]);
-  }
-
-  /**
-   * @private
-   */
-  _deleteDevice(deviceId) {
-    const devices = this._getRegisteredDevices();
-    devices.delete(deviceId);
-    this._lockfile.write([...devices]);
-  }
-
-  /***
-   * @private
-   * @returns {DeviceList}
-   */
-  _getRegisteredDevices() {
-    const devices = this._lockfile.read();
-    return new DeviceList(devices);
-  }
-
-  _getSessionDevicesSync() {
-    const devices = this._getRegisteredDevices();
-    const sessionDevices = devices.filter(device => device.sessionId === this._sessionId);
-    return sessionDevices;
-  }
-}
-
-module.exports = DeviceRegistry;

package/src/devices/allocation/drivers/android/emulator/FreePortFinder.js

@@ -1,16 +0,0 @@
-class FreePortFinder {
-  constructor({ min = 10000, max = 20000 } = {}) {
-    this._min = min;
-    this._max = max;
-  }
-
-  async findFreePort() {
-    const min = this._min;
-    const max = this._max;
-    let port = Math.random() * (max - min) + min;
-    port = port & 0xFFFFFFFE; // Should always be even
-    return port;
-  }
-}
-
-module.exports = FreePortFinder;

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

@@ -1,93 +0,0 @@
-const { DetoxInternalError } = require('../../../../../errors');
-
-class GenyRegistry {
-  constructor() {
-    /** @type {Map<string, import('./services/dto/GenyRecipe')>} */
-    this._recipes = new Map();
-    /** @type {Map<string, import('./services/dto/GenyInstance')>} */
-    this._freeInstances = new Map();
-    /** @type {Map<string, import('./services/dto/GenyInstance')>} */
-    this._busyInstances = new Map();
-    /** @type {Set<string>} */
-    this._newInstances = new Set();
-  }
-
-  getInstances() {
-    return [...this._freeInstances.values(), ...this._busyInstances.values()];
-  }
-
-  /**
-   * @param {import('./services/dto/GenyInstance')} instance
-   * @param {import('./services/dto/GenyRecipe')} recipe
-   */
-  addInstance(instance, recipe) {
-    this._recipes.set(instance.uuid, recipe);
-    this._busyInstances.set(instance.uuid, instance);
-    this._newInstances.add(instance.uuid);
-  }
-
-  /** @param {import('./services/dto/GenyInstance')} instance */
-  pollNewInstance(instance) {
-    const result = this._newInstances.has(instance.uuid);
-    this._newInstances.delete(instance.uuid);
-    return result;
-  }
-
-  /** @param {import('./services/dto/GenyInstance')} instance */
-  updateInstance(instance) {
-    if (this._freeInstances.has(instance.uuid)) {
-      this._freeInstances.set(instance.uuid, instance);
-    }
-
-    if (this._busyInstances.has(instance.uuid)) {
-       this._busyInstances.set(instance.uuid, instance);
-    }
-  }
-
-  /** @param {import('./services/dto/GenyInstance')} instance */
-  removeInstance(instance) {
-    this._freeInstances.delete(instance.uuid);
-    this._busyInstances.delete(instance.uuid);
-    this._newInstances.delete(instance.uuid);
-    this._recipes.delete(instance.uuid);
-  }
-
-  /** @param {import('./services/dto/GenyInstance')} instance */
-  markAsBusy({ uuid }) {
-    if (this._busyInstances.has(uuid)) {
-      return;
-    }
-
-    const instance = this._freeInstances.get(uuid);
-    if (!instance) {
-      throw new DetoxInternalError(`Cannot mark an unknown instance ${uuid} as busy`);
-    }
-
-    this._busyInstances.set(uuid, instance);
-    this._freeInstances.delete(uuid);
-    return instance;
-  }
-
-  /** @param {import('./services/dto/GenyInstance')} instance */
-  markAsFree({ uuid }) {
-    const instance = this._busyInstances.get(uuid);
-    if (!instance) {
-      throw new DetoxInternalError(`Cannot mark an unknown instance ${uuid} as free`);
-    }
-
-    this._busyInstances.delete(uuid);
-    this._freeInstances.set(uuid, instance);
-    return instance;
-  }
-
-  findFreeInstance(recipe) {
-    for (const instance of this._freeInstances.values()) {
-      const aRecipe = this._recipes.get(instance.uuid);
-      if (recipe.uuid === aRecipe.uuid) {
-        return this.markAsBusy(instance);
-      }
-    }
-  }
-}
-
-module.exports = GenyRegistry;

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

@@ -1,24 +0,0 @@
-const Instance = require('./dto/GenyInstance');
-
-class GenyInstanceLifecycleService {
-  constructor(genyCloudExec) {
-    this._genyCloudExec = genyCloudExec;
-  }
-
-  async createInstance(recipeUUID, instanceName) {
-    const result = await this._genyCloudExec.startInstance(recipeUUID, instanceName);
-    return new Instance(result.instance);
-  }
-
-  async adbConnectInstance(instanceUUID) {
-    const result = (await this._genyCloudExec.adbConnect(instanceUUID));
-    return new Instance(result.instance);
-  }
-
-  async deleteInstance(instanceUUID) {
-    const result = await this._genyCloudExec.stopInstance(instanceUUID);
-    return new Instance(result.instance);
-  }
-}
-
-module.exports = GenyInstanceLifecycleService;

package/src/devices/allocation/drivers/ios/SimulatorQuery.js

@@ -1,24 +0,0 @@
-class SimulatorQuery {
-  /** @param {Partial<Detox.IosSimulatorQuery>} query */
-  constructor({ id, name, os, type }) {
-    if (id != null) this.byId = id;
-    if (name != null) this.byName = name;
-    if (os != null) this.byOS = os;
-    if (type != null) this.byType = type;
-  }
-
-  getDeviceComment() {
-    return this.byId || [this.byName, this.byType, this.byOS].filter(Boolean).join(', ');
-  }
-
-  toString() {
-    return [
-      this.byId && `by UDID = ${JSON.stringify(this.byId)}`,
-      this.byName && `by name = ${JSON.stringify(this.byName)}`,
-      this.byType && `by type = ${JSON.stringify(this.byType)}`,
-      this.byOS && `by OS = ${JSON.stringify(this.byOS)}`,
-    ].filter(Boolean).join(' and ');
-  }
-}
-
-module.exports = SimulatorQuery;

package/src/devices/servicelocator/android/genycloudServiceLocator.js

@@ -1,17 +0,0 @@
-class GenycloudServiceLocator {
-  constructor() {
-    this._exec = null;
-  }
-
-  // Note: important to keep lazy because of implicit validations that are sensitive (inside environment, in particular).
-  get exec() {
-    if (!this._exec) {
-      const Exec = require('../../allocation/drivers/android/genycloud/exec/GenyCloudExec');
-      const environment = require('../../../utils/environment');
-      this._exec = new Exec(environment.getGmsaasPath());
-    }
-    return this._exec;
-  }
-}
-
-module.exports = new GenycloudServiceLocator();

package/src/devices/servicelocator/android/index.js

@@ -1,23 +0,0 @@
-const AndroidDevicePathBuilder = require('../../../artifacts/utils/AndroidDevicePathBuilder');
-const AAPT = require('../../common/drivers/android/exec/AAPT');
-const ADB = require('../../common/drivers/android/exec/ADB');
-const ApkValidator = require('../../common/drivers/android/tools/ApkValidator');
-const { TempFileTransfer } = require('../../common/drivers/android/tools/TempFileTransfer');
-
-const AndroidServiceLocator = {
-  get emulator() {
-    return require('./emulatorServiceLocator');
-  },
-
-  get genycloud() {
-    return require('./genycloudServiceLocator');
-  },
-};
-
-AndroidServiceLocator.adb = new ADB();
-AndroidServiceLocator.aapt = new AAPT();
-AndroidServiceLocator.apkValidator = new ApkValidator(AndroidServiceLocator.aapt);
-AndroidServiceLocator.fileTransfer = new TempFileTransfer(AndroidServiceLocator.adb);
-AndroidServiceLocator.devicePathBuilder = new AndroidDevicePathBuilder();
-
-module.exports = AndroidServiceLocator;

package/src/utils/PIDService.js

@@ -1,27 +0,0 @@
-const { pid } = require('process');
-
-class PIDService {
-  getPid() {
-    return pid;
-  }
-
-  /**
-   * Checks if the other process id is running in the current operating system
-   * @param {number} otherPID
-   * @returns {boolean}
-   */
-  isAlive(otherPID) {
-    try {
-      process.kill(otherPID, 0);
-      return true;
-    } catch (ex) {
-      if (ex.code === 'ESRCH') {
-        return false;
-      }
-      throw ex;
-    }
-  }
-
-}
-
-module.exports = PIDService;