detox 20.0.10-prerelease.0 → 20.0.12-prerelease.0

package/src/ipc/IPCClient.js

@@ -1,6 +1,7 @@
 const { IPC } = require('node-ipc');
 
 const { DetoxInternalError } = require('../errors');
+const { serializeObjectWithError } = require('../utils/errorUtils');
 
 class IPCClient {
   constructor({ id, logger, state }) {
@@ -47,15 +48,18 @@ class IPCClient {
   }
 
   async registerWorker(workerId) {
-    await this._emit('registerWorker', { workerId });
+    const sessionState = await this._emit('registerWorker', { workerId });
+    this._state.patch(sessionState);
   }
 
   /**
-   * @param {string[]} testFilePaths
-   * @param {Boolean} permanent
+   * @param {DetoxInternals.DetoxTestFileReport[]} testResults
    */
-  async reportFailedTests(testFilePaths, permanent) {
-    await this._emit('failedTests', { testFilePaths, permanent });
+  async reportTestResults(testResults) {
+    const sessionState = await this._emit('reportTestResults', {
+      testResults: testResults.map(r => serializeObjectWithError(r, 'testExecError')),
+    });
+    this._state.patch(sessionState);
   }
 
   async _connectToServer() {

package/src/ipc/IPCServer.js

@@ -1,5 +1,8 @@
+const { uniqBy } = require('lodash');
 const { IPC } = require('node-ipc');
 
+const { serializeObjectWithError } = require('../utils/errorUtils');
+
 class IPCServer {
   /**
    * @param {object} options
@@ -27,12 +30,12 @@ class IPCServer {
     this._ipc.config.appspace = 'detox.';
     this._ipc.config.logger = (msg) => this._logger.trace(msg);
 
-      await new Promise((resolve) => {
+    await new Promise((resolve) => {
       // TODO: handle reject
       this._ipc.serve(() => resolve());
       this._ipc.server.on('registerContext', this.onRegisterContext.bind(this));
       this._ipc.server.on('registerWorker', this.onRegisterWorker.bind(this));
-      this._ipc.server.on('failedTests', this.onFailedTests.bind(this));
+      this._ipc.server.on('reportTestResults', this.onReportTestResults.bind(this));
       this._ipc.server.start();
     });
   }
@@ -53,8 +56,7 @@ class IPCServer {
     this._sessionState.contexts.push(id);
 
     this._ipc.server.emit(socket, 'registerContextDone', {
-      failedTestFiles: this._sessionState.failedTestFiles,
-      testFilesToRetry: this._sessionState.testFilesToRetry,
+      testResults: this._sessionState.testResults,
       testSessionIndex: this._sessionState.testSessionIndex,
     });
   }
@@ -73,20 +75,22 @@ class IPCServer {
     }
   }
 
-  onFailedTests({ testFilePaths, permanent }, socket = null) {
-    if (permanent) {
-      this._sessionState.failedTestFiles.push(...testFilePaths);
-    } else {
-      this._sessionState.testFilesToRetry.push(...testFilePaths);
-    }
+  onReportTestResults({ testResults }, socket = null) {
+    const merged = uniqBy([
+      ...testResults.map(r => serializeObjectWithError(r, 'testExecError')),
+      ...this._sessionState.testResults
+    ], 'testFilePath');
+
+    this._sessionState.testResults.splice(0, Infinity, ...merged);
 
     if (socket) {
-      this._ipc.server.emit(socket, 'failedTestsDone', {});
+      this._ipc.server.emit(socket, 'reportTestResultsDone', {
+        testResults: this._sessionState.testResults,
+      });
     }
 
     this._ipc.server.broadcast('sessionStateUpdate', {
-      failedTestFiles: this._sessionState.failedTestFiles,
-      testFilesToRetry: this._sessionState.testFilesToRetry,
+      testResults: this._sessionState.testResults,
     });
   }
 }

package/src/ipc/SessionState.js

@@ -9,8 +9,7 @@ class SessionState {
     detoxConfigSnapshotPath = '',
     detoxConfig = null,
     detoxIPCServer = '',
-    failedTestFiles = [],
-    testFilesToRetry = [],
+    testResults = [],
     testSessionIndex = 0,
     workersCount = 0
   }) {
@@ -19,8 +18,7 @@ class SessionState {
     this.detoxConfigSnapshotPath = detoxConfigSnapshotPath;
     this.detoxConfig = detoxConfig;
     this.detoxIPCServer = detoxIPCServer;
-    this.failedTestFiles = failedTestFiles;
-    this.testFilesToRetry = testFilesToRetry;
+    this.testResults = testResults;
     this.testSessionIndex = testSessionIndex;
     this.workersCount = workersCount;
   }

package/src/realms/DetoxContext.js

@@ -36,7 +36,7 @@ class DetoxContext {
     };
 
     this[symbols.getStatus] = this[symbols.getStatus].bind(this);
-    this[symbols.reportFailedTests] = this[symbols.reportFailedTests].bind(this);
+    this[symbols.reportTestResults] = this[symbols.reportTestResults].bind(this);
     this[symbols.resolveConfig] = this[symbols.resolveConfig].bind(this);
     this[symbols.installWorker] = this[symbols.installWorker].bind(this);
     this[symbols.uninstallWorker] = this[symbols.uninstallWorker].bind(this);
@@ -103,7 +103,7 @@ class DetoxContext {
     },
   });
   /** @abstract */
-  [symbols.reportFailedTests](_testFilePaths, _permanent) {}
+  [symbols.reportTestResults](_testResults) {}
   /**
    * @abstract
    * @param {Partial<DetoxInternals.DetoxInitOptions>} _opts

package/src/realms/DetoxInternalsFacade.js

@@ -26,7 +26,7 @@ class DetoxInternalsFacade {
     this.onTestFnStart = context[symbols.onTestFnStart];
     this.onTestFnSuccess = context[symbols.onTestFnSuccess];
     this.onTestStart = context[symbols.onTestStart];
-    this.reportFailedTests = context[symbols.reportFailedTests];
+    this.reportTestResults = context[symbols.reportTestResults];
     this.resolveConfig = context[symbols.resolveConfig];
     this.session = context[symbols.session];
     this.tracing = context[symbols.tracing];

package/src/realms/DetoxPrimaryContext.js

@@ -46,9 +46,9 @@ class DetoxPrimaryContext extends DetoxContext {
   }
 
   //#region Internal members
-  async [symbols.reportFailedTests](testFilePaths, permanent = false) {
+  async [symbols.reportTestResults](testResults) {
     if (this[_ipcServer]) {
-      this[_ipcServer].onFailedTests({ testFilePaths, permanent });
+      this[_ipcServer].onReportTestResults({ testResults });
     }
   }
 
@@ -236,15 +236,14 @@ class DetoxPrimaryContext extends DetoxContext {
       const { rootDir } = this[symbols.config].artifacts;
 
       await fs.mkdirp(rootDir);
-      const [out1Stream, out2Stream, out3Stream] = ['detox.log.jsonl', 'detox.log', 'detox.trace.json']
+      const [out1Stream, out2Stream] = ['detox.log', 'detox.trace.json']
         .map((filename) => fs.createWriteStream(path.join(rootDir, filename)));
 
       const mergedStream = streamUtils.uniteSessionLogs(sessionId);
 
       await Promise.all([
-        pipe(mergedStream, streamUtils.writeJSONL(), out1Stream),
-        pipe(mergedStream, streamUtils.debugStream(this[symbols.logger].config.options), out2Stream),
-        pipe(mergedStream, streamUtils.chromeTraceStream(), streamUtils.writeJSON(), out3Stream),
+        pipe(mergedStream, streamUtils.debugStream(this[symbols.logger].config.options), out1Stream),
+        pipe(mergedStream, streamUtils.chromeTraceStream(), streamUtils.writeJSON(), out2Stream),
       ]);
     }
 
@@ -286,8 +285,7 @@ class DetoxPrimaryContext extends DetoxContext {
       return true;
     }
 
-    const { failedTestFiles, testFilesToRetry } = this[$sessionState];
-    return failedTestFiles.length + testFilesToRetry.length > 0;
+    return this[$sessionState].testResults.some(r => !r.success);
   }
 
   async[_resetLockFile]() {

package/src/realms/DetoxSecondaryContext.js

@@ -29,9 +29,9 @@ class DetoxSecondaryContext extends DetoxContext {
   }
 
   //#region Internal members
-  async [symbols.reportFailedTests](testFilePaths, permanent = false) {
+  async [symbols.reportTestResults](testResults) {
     if (this[_ipcClient]) {
-      await this[_ipcClient].reportFailedTests(testFilePaths, permanent);
+      await this[_ipcClient].reportTestResults(testResults);
     } else {
       throw new DetoxInternalError('Detected an attempt to report failed tests using a non-initialized context.');
     }

package/src/symbols.js

@@ -18,7 +18,7 @@
  *   readonly onTestFnStart: unique symbol;
  *   readonly onTestFnSuccess: unique symbol;
  *   readonly onTestStart: unique symbol;
- *   readonly reportFailedTests: unique symbol;
+ *   readonly reportTestResults: unique symbol;
  *   readonly resolveConfig: unique symbol;
  *   readonly session: unique symbol;
  *   readonly tracing: unique symbol;
@@ -43,7 +43,7 @@ module.exports = {
   //#endregion
 
   //#region IPC
-  reportFailedTests: Symbol('reportFailedTests'),
+  reportTestResults: Symbol('reportTestResults'),
   //#endregion
 
   //#region Main

package/src/utils/Timer.js

@@ -1,65 +1,82 @@
-// @ts-nocheck
-const DetoxRuntimeError = require('../errors/DetoxRuntimeError');
+const { DetoxRuntimeError, DetoxInternalError } = require('../errors');
 
 const Deferred = require('./Deferred');
 
 class Timer {
+  constructor() {
+    /** @private */
+    this._eta = NaN;
+    /** @private */
+    this._timeout = NaN;
+    /** @type {NodeJS.Timer | null} */
+    this._timeoutHandle = null;
+    /** @type {Deferred | null} */
+    this._timeoutDeferred = null;
+  }
+
+  clear() {
+    if (this._timeoutHandle) {
+      clearTimeout(this._timeoutHandle);
+      this._timeoutHandle = null;
+    }
+
+    this._eta = NaN;
+    this._timeout = NaN;
+    this._timeoutDeferred = null;
+  }
+
+  get expired() {
+    return this._timeoutDeferred ? this._timeoutDeferred.isResolved() : false;
+  }
+
   /**
-   * @param {string} description - gives more context for thrown errors
    * @param {number} timeout - maximal allowed duration in milliseconds
    */
-  constructor({ description, timeout }) {
-    /** @private */
+  schedule(timeout) {
+    this.clear();
+
+    this._eta = Date.now() + timeout;
     this._timeout = timeout;
-    /** @public */
-    this.description = description;
+    this._timeoutDeferred = new Deferred();
+    this._timeoutHandle = setTimeout(() => {
+      this._timeoutDeferred.resolve();
+    }, this._timeout);
 
-    this._schedule();
+    return this;
   }
 
-  _schedule() {
-    this._createdAt = Date.now();
-    this._timeoutDeferred = new Deferred();
+  extend(ms) {
+    if (this.expired) {
+      return this.schedule(ms);
+    }
+
+    clearTimeout(this._timeoutHandle);
+    this._eta += ms;
+    this._timeout += ms;
     this._timeoutHandle = setTimeout(() => {
       this._timeoutDeferred.resolve();
-    }, this._timeout);
+    }, this._eta - Date.now());
   }
 
-  async run(action) {
+  async run(description, action) {
+    if (!this._timeoutDeferred) {
+      throw new DetoxInternalError('Cannot run a timer action from an uninitialized timer');
+    }
+
     const error = new DetoxRuntimeError({
-      message: `Exceeded timeout of ${this._timeout}ms while ${this.description}`,
+      message: `Exceeded timeout of ${this._timeout}ms while ${description}`,
       noStack: true,
     });
 
+    if (this.expired) {
+      throw error;
+    }
+
     return Promise.race([
       this._timeoutDeferred.promise.then(() => { throw error; }),
       Promise.resolve().then(action),
     ]);
   }
-
-  dispose() {
-    clearTimeout(this._timeoutHandle);
-  }
-
-  reset(extraDelayMs) {
-    this._timeout = extraDelayMs;
-
-    if (this._timeoutDeferred.status !== Deferred.PENDING) {
-      this._schedule();
-    } else {
-      clearTimeout(this._timeoutHandle);
-      this._timeoutHandle = setTimeout(() => this._timeoutDeferred.resolve(), extraDelayMs);
-    }
-  }
-
-  static async run({ description, timeout, fn }) {
-    const timer = new Timer({ description, timeout });
-    try {
-      await timer.run(fn);
-    } finally {
-      timer.dispose();
-    }
-  }
 }
 
 module.exports = Timer;

package/src/utils/errorUtils.js

@@ -1,4 +1,6 @@
 const { isError } = require('lodash');
+const { deserializeError, serializeError } = require('serialize-error');
+
 const CLEAN_AT = /\n\s*at [\s\S]*/m;
 
 function filterErrorStack(error, predicate) {
@@ -38,9 +40,27 @@ function asError(error) {
   return isError(error) ? error : new Error(error);
 }
 
+function serializeObjectWithError(obj, errorKey) {
+  if (obj[errorKey]) {
+    return { ...obj, [errorKey]: serializeError(obj[errorKey]) };
+  }
+
+  return obj;
+}
+
+function deserializeObjectWithError(obj, errorKey) {
+  if (typeof obj[errorKey] === 'object' && !(obj[errorKey] instanceof Error)) {
+    return { ...obj, [errorKey]: deserializeError(obj[errorKey]) };
+  }
+
+  return obj;
+}
+
 module.exports = {
   asError,
   replaceErrorStack,
   filterErrorStack,
   createErrorWithUserStack,
+  serializeObjectWithError,
+  deserializeObjectWithError,
 };

package/Detox-android/com/wix/detox/20.0.10-prerelease.0/detox-20.0.10-prerelease.0-javadoc.jar.md5

@@ -1 +0,0 @@
-9bde09ebc6c2e1d48446c96c8c395bf0

package/Detox-android/com/wix/detox/20.0.10-prerelease.0/detox-20.0.10-prerelease.0-javadoc.jar.sha1

@@ -1 +0,0 @@
-6f4375b8d626c5e56010bb9079d2def1daf66206

package/Detox-android/com/wix/detox/20.0.10-prerelease.0/detox-20.0.10-prerelease.0-javadoc.jar.sha256

@@ -1 +0,0 @@
-5f2296afd84c0b9887d0f69d5ce484c193e2337f457156755dd5dbd1b18e1f2e

package/Detox-android/com/wix/detox/20.0.10-prerelease.0/detox-20.0.10-prerelease.0-javadoc.jar.sha512

@@ -1 +0,0 @@
-9d30f9d43a3483289b0d34cd1c7f052328167aaf404558cb174f3134561d5cfda3440439af1c58239447ab8b18f6386ac3e3e06acde12db9753993d45fadb254

package/Detox-android/com/wix/detox/20.0.10-prerelease.0/detox-20.0.10-prerelease.0-sources.jar.md5

@@ -1 +0,0 @@
-215ed320f30e45f5ea71f65aa033306e

package/Detox-android/com/wix/detox/20.0.10-prerelease.0/detox-20.0.10-prerelease.0-sources.jar.sha1

@@ -1 +0,0 @@
-b39c10ee0d40e56d89210314cf5ddaf2d2aa96bb

package/Detox-android/com/wix/detox/20.0.10-prerelease.0/detox-20.0.10-prerelease.0-sources.jar.sha256

@@ -1 +0,0 @@
-83099d2c42349ecefa7540645d893fd1f57545a3d4a4176e64b6ea775cd1e624

package/Detox-android/com/wix/detox/20.0.10-prerelease.0/detox-20.0.10-prerelease.0-sources.jar.sha512

@@ -1 +0,0 @@
-ef17949935df0db02792f2b6c75ed22010258c48da606b417bd69e5ad41e9951810739c19f607f77ca245059573399e76310ac70fb5cfbcb1784be605fefb0d8

package/Detox-android/com/wix/detox/20.0.10-prerelease.0/detox-20.0.10-prerelease.0.aar.md5

@@ -1 +0,0 @@
-7a46662622c24f8677074374fd81b604

package/Detox-android/com/wix/detox/20.0.10-prerelease.0/detox-20.0.10-prerelease.0.aar.sha1

@@ -1 +0,0 @@
-43bfd8fb25e7b0c24e0d1ed4b250f138b8f21537

package/Detox-android/com/wix/detox/20.0.10-prerelease.0/detox-20.0.10-prerelease.0.aar.sha256

@@ -1 +0,0 @@
-0df8f8ebf03215da2f15fe8e6a093b65dd808d6870b69eabbb4ae8f680b18bdc

package/Detox-android/com/wix/detox/20.0.10-prerelease.0/detox-20.0.10-prerelease.0.aar.sha512

@@ -1 +0,0 @@
-e0721afc0568f85c754e4741cc58a885a77c8f6f485b9eda322290d906eae9707473016ca97ea6cef6583c9f98e82622dd13343d0fa5a7f9d77daf62f97791df

package/Detox-android/com/wix/detox/20.0.10-prerelease.0/detox-20.0.10-prerelease.0.pom.md5

@@ -1 +0,0 @@
-332c4d3da54dd80f67e23eda984e156b

package/Detox-android/com/wix/detox/20.0.10-prerelease.0/detox-20.0.10-prerelease.0.pom.sha1

@@ -1 +0,0 @@
-c67b0ded2e25005ab37a36e40f69f2c7ddac7afc

package/Detox-android/com/wix/detox/20.0.10-prerelease.0/detox-20.0.10-prerelease.0.pom.sha256

@@ -1 +0,0 @@
-f888b95186a4212d022b0288320cf4408d343bc0070522d91ebad8254f4fc20b

package/Detox-android/com/wix/detox/20.0.10-prerelease.0/detox-20.0.10-prerelease.0.pom.sha512

@@ -1 +0,0 @@
-67a61376843dba1e684c928d6cab78c2682f7b20424cd75d06f67aae3a9a782ac3f9ca1208c68f5568067698fe7e909c236723a0a7ca11f67033d09292b55fe6