detox 19.9.0 → 21.0.0-breaking.new-global-lifecycle.0

package/src/utils/ChromeTracingExporter.js

@@ -26,16 +26,15 @@ class ChromeTracingExporter {
 
   _parseEvent(event) {
     const { name, ts, args, type } = event;
-    const tsInMicroseconds = ts * 1000;
     switch (type) {
-      case 'start': return this._event(name, 'B', tsInMicroseconds, args);
-      case 'end': return this._event(name, 'E', tsInMicroseconds, args);
+      case 'start': return this._event(name, 'B', ts * 1000, args);
+      case 'end': return this._event(name, 'E', ts * 1000, args);
       case 'init': return [
-          this._event('process_name', 'M', tsInMicroseconds, { name: this._process.name }),
-          this._event('thread_name', 'M', tsInMicroseconds, { name: this._thread.name }),
+          this._event('process_name', 'M', ts, { name: this._process.name }),
+          this._event('thread_name', 'M', ts, { name: this._thread.name }),
         ];
       default:
-        throw new DetoxRuntimeError({ message: `Invalid type '${type}' in event: ${event}` });
+        throw new DetoxRuntimeError(`Invalid type '${type}' in event: ${event}`);
     }
   }
 

package/src/utils/Timer.js

@@ -26,14 +26,13 @@ class Timer {
   }
 
   async run(action) {
-    const error = new DetoxRuntimeError();
-    delete error.stack;
+    const error = new DetoxRuntimeError({
+      message: `Exceeded timeout of ${this._timeout}ms while ${this.description}`,
+      noStack: true,
+    });
 
     return Promise.race([
-      this._timeoutDeferred.promise.then(() => {
-        error.message = `Exceeded timeout of ${this._timeout}ms while ${this.description}`;
-        throw error;
-      }),
+      this._timeoutDeferred.promise.then(() => { throw error; }),
       Promise.resolve().then(action),
     ]);
   }
@@ -52,6 +51,15 @@ class Timer {
       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/{local-cli/utils/misc.js → src/utils/envUtils.js}

@@ -1,13 +1,5 @@
 const path = require('path');
 
-function getPlatformSpecificString(platform) {
-  switch (platform) {
-    case 'ios': return ':android:';
-    case 'android': return ':ios:';
-    default: return undefined;
-  }
-}
-
 function printEnvironmentVariables(envObject) {
   return Object.entries(envObject).reduce((cli, [key, value]) => {
     if (value == null || value === '') {
@@ -33,7 +25,6 @@ function prependNodeModulesBinToPATH(env) {
 }
 
 module.exports = {
-  getPlatformSpecificString,
   printEnvironmentVariables,
   prependNodeModulesBinToPATH,
 };

package/src/utils/logger.js

@@ -1,164 +1,4 @@
-// @ts-nocheck
-
-const path = require('path');
-
-const bunyan = require('bunyan');
-const bunyanDebugStream = require('bunyan-debug-stream');
-const fs = require('fs-extra');
-const onExit = require('signal-exit');
-
-const temporaryPath = require('../artifacts/utils/temporaryPath');
-
-const argparse = require('./argparse');
-const customConsoleLogger = require('./customConsoleLogger');
-const { shortFormat: shortDateFormat } = require('./dateUtils');
-
-function adaptLogLevelName(level) {
-  switch (level) {
-    case 'fatal':
-    case 'error':
-    case 'warn':
-    case 'info':
-    case 'debug':
-    case 'trace':
-      return level;
-
-    case 'verbose':
-      return 'debug';
-
-    default:
-      return 'info';
-  }
-}
-
-function tryOverrideConsole(logger, global) {
-  if (argparse.getArgValue('use-custom-logger') === 'true') {
-    const userLogger = logger.child({ component: 'USER_LOG' });
-    customConsoleLogger.overrideConsoleMethods(global.console, userLogger);
-  }
-}
-
-function createPlainBunyanStream({ logPath, level, showDate = true }) {
-  const options = {
-    showDate: showDate,
-    showLoggerName: true,
-    showPid: true,
-    showMetadata: false,
-    basepath: __dirname,
-    out: process.stderr,
-    prefixers: {
-      '__filename': (filename, { entry }) => {
-        if (entry.event === 'USER_LOG') {
-          return '';
-        }
-
-        if (entry.event === 'ERROR') {
-          return `${filename}/${entry.event}`;
-        }
-
-        return entry.event ? entry.event : filename;
-      },
-      'trackingId': id => ` #${id}`,
-      'cpid': pid => ` cpid=${pid}`,
-    },
-  };
-
-  if (logPath) {
-    options.colors = false;
-    options.out = fs.createWriteStream(logPath, {
-      flags: 'a',
-    });
-  }
-
-  if (argparse.getFlag('--no-color')) {
-    options.colors = false;
-  }
-
-  return {
-    level,
-    type: 'raw',
-    stream: bunyanDebugStream(options),
-    serializers: bunyanDebugStream.serializers,
-  };
-}
-
 /**
- * @returns {Logger}
+ * @type {Detox.Logger}
  */
-function init() {
-  const levelFromArg = argparse.getArgValue('loglevel', 'l');
-  const level = adaptLogLevelName(levelFromArg);
-  const debugStream = createPlainBunyanStream({ level, showDate: shortDateFormat });
-  const bunyanStreams = [debugStream];
-
-  let jsonFileStreamPath, plainFileStreamPath;
-  if (!global.DETOX_CLI && !global.IS_RUNNING_DETOX_UNIT_TESTS) {
-    {
-      jsonFileStreamPath = temporaryPath.for.log();
-      fs.ensureFileSync(jsonFileStreamPath);
-      bunyanStreams.push({
-        level: 'trace',
-        path: jsonFileStreamPath,
-      });
-    }
-    {
-      plainFileStreamPath = temporaryPath.for.log();
-      fs.ensureFileSync(plainFileStreamPath);
-      bunyanStreams.push(createPlainBunyanStream({
-        level: 'trace',
-        logPath: plainFileStreamPath,
-      }));
-    }
-
-    onExit(() => {
-      try { fs.unlinkSync(jsonFileStreamPath); } catch (e) {}
-      try { fs.unlinkSync(plainFileStreamPath); } catch (e) {}
-    });
-  }
-
-  const logger = bunyan.createLogger({
-    name: 'detox',
-    streams: bunyanStreams,
-  });
-
-  if (jsonFileStreamPath) {
-    logger.jsonFileStreamPath = jsonFileStreamPath;
-  }
-
-  if (plainFileStreamPath) {
-    logger.plainFileStreamPath = plainFileStreamPath;
-  }
-
-  tryOverrideConsole(logger, global);
-
-  logger.getDetoxLevel = () => level;
-
-  logger.reinitialize = (global) => {
-    if (jsonFileStreamPath) {
-      fs.ensureFileSync(jsonFileStreamPath);
-    }
-
-    if (plainFileStreamPath) {
-      fs.ensureFileSync(plainFileStreamPath);
-    }
-
-    tryOverrideConsole(logger, global);
-  };
-
-  const originalChild = logger.child.bind(logger);
-
-  logger.child = (options) => {
-    if (options && options.__filename) {
-      return originalChild({
-        ...options,
-        __filename: path.basename(options.__filename)
-      });
-    }
-
-    return originalChild(options);
-  };
-
-  return logger;
-}
-
-module.exports = init();
+module.exports = require('../..').log;

package/src/utils/shellUtils.js

@@ -1,7 +1,17 @@
+const SPACE = ' ';
 const BACK_SLASH = '\\';
 const SINGLE_QUOTE = "'";
 const DOUBLE_QUOTE = '"';
 
+function escapeSpacesCMD(str) {
+  return str.includes(' ') ? `"${str}"` : str;
+}
+
+const BACK_SLASH_SPACE = BACK_SLASH + SPACE;
+function escapeSpacesShell(str) {
+  return str.replace(/ /g, BACK_SLASH_SPACE);
+}
+
 const ESCAPED_DOUBLE_QUOTE = BACK_SLASH + DOUBLE_QUOTE;
 function escapeInDoubleQuotedString(fragment) {
   return fragment.replace(/"/g, ESCAPED_DOUBLE_QUOTE);
@@ -62,12 +72,20 @@ const autoEscape = isRunningInCMDEXE()
   /* istanbul ignore next */ ? autoEscapeCmd
   /* istanbul ignore next */ : autoEscapeShell;
 
+const escapeSpaces = isRunningInCMDEXE()
+  /* istanbul ignore next */ ? escapeSpacesCMD
+  /* istanbul ignore next */ : escapeSpacesShell;
+
 module.exports = {
   escapeInDoubleQuotedString,
   escapeInDoubleQuotedRegexp,
   escapeWithSingleQuotedString,
   escapeWithDoubleQuotedString,
   isRunningInCMDEXE,
+  escapeSpaces: Object.assign(escapeSpaces, {
+    cmd: escapeSpacesCMD,
+    shell: escapeSpacesShell,
+  }),
   hasUnsafeChars: Object.assign(hasUnsafeChars, {
     cmd: hasUnsafeCMDChars,
     shell: hasUnsafeShellChars,

package/src/utils/streamUtils.js

@@ -0,0 +1,214 @@
+const { PassThrough, Transform } = require('stream');
+
+const bunyanDebugStream = require('bunyan-debug-stream');
+const duplexify = require('duplexify');
+const multiSort = require('multi-sort-stream');
+const pipe = require('multipipe');
+const JsonlParser = require('stream-json/jsonl/Parser');
+const stripAnsi = require('strip-ansi');
+const { AbstractEventBuilder } = require('trace-event-lib');
+
+const DetoxTracer = require('../logger/DetoxTracer');
+
+const log = require('./logger').child({ __filename });
+
+function compareTimestamps(a, b) {
+  return +(a.value.time > b.value.time) - +(a.value.time < b.value.time);
+}
+
+function mapTransform(fn) {
+  return new Transform({
+    objectMode: true,
+    transform(chunk, encoding, callback){
+      this.push(fn(chunk));
+      callback();
+    },
+  });
+}
+
+function flatMapTransform(fn) {
+  let index = 0;
+
+  return new Transform({
+    objectMode: true,
+    transform(chunk, encoding, callback){
+      const result = fn(chunk, index++);
+      if (Array.isArray(result)) {
+        // eslint-disable-next-line unicorn/no-array-method-this-argument
+        result.forEach(pushThis, this);
+      } else if (result) {
+        this.push(result);
+      }
+
+      callback();
+    },
+  });
+}
+
+function pushThis(x) {
+  return this.push(x);
+}
+
+function extractValue({ value }) {
+  value.msg = stripAnsi(value.msg);
+
+  if (typeof value.time === 'string') {
+    value.time = new Date(value.time);
+  }
+
+  return value;
+}
+
+function through() {
+  return new PassThrough({ objectMode: true });
+}
+
+function mergeSortedJSONL(jsonlStreams, comparator = compareTimestamps) {
+  const intermediate = mapTransform(extractValue);
+  const reemitError = (err) => intermediate.emit('error', err);
+  const addReemit = (stream) => stream.on('error', reemitError);
+  return pipe(multiSort(jsonlStreams.map(addReemit), comparator), intermediate, through());
+}
+
+function writeJSONL() {
+  return new JsonlStringer({
+    header: '',
+    delimiter: '\n',
+    footer: '',
+  });
+}
+
+function writeJSON() {
+  return new JsonlStringer({
+    header: '[\n\t',
+    delimiter: ',\n\t',
+    footer: '\n]\n',
+  });
+}
+
+function debugStream(options) {
+  const out = new PassThrough({ encoding: 'utf8' });
+  const writable = bunyanDebugStream.default({
+    ...options,
+    colors: false,
+    out,
+  });
+
+  return duplexify(writable, out, {
+    readableObjectMode: false,
+    writableObjectMode: true
+  });
+}
+
+class JsonlStringer extends Transform {
+  constructor({ replacer = undefined, header = '', delimiter = '\n', footer = '' } = {}) {
+    super({ writableObjectMode: true, readableObjectMode: false });
+
+    this._replacer = replacer;
+    this._header = header;
+    this._delimiter = delimiter;
+    this._footer = footer;
+  }
+
+  _transform(chunk, _, callback) {
+    if (this._header) {
+      this.push(this._header);
+    }
+
+    this.push(JSON.stringify(chunk, this._replacer));
+    this._transform = this._nextTransform;
+    callback(null);
+  }
+
+  _nextTransform(chunk, _, callback) {
+    this.push(this._delimiter + JSON.stringify(chunk, this._replacer));
+    callback(null);
+  }
+
+  _flush(callback) {
+    if (this._footer) {
+      this.push(this._footer);
+    }
+
+    callback();
+  }
+}
+
+class SimpleEventBuilder extends AbstractEventBuilder {
+  events = [];
+  send(event) {
+    this.events.push(event);
+  }
+}
+
+function chromeTraceStream() {
+  const knownPids = new Set();
+  const knownTids = new Set();
+
+  return flatMapTransform((data) => {
+    // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
+    const { pid, trace, msg, time, name: _name, hostname: _hostname, ...args } = data;
+    const tid = trace ? trace.tid : DetoxTracer.threadize(args.cat);
+    const ts = new Date(time).getTime() * 1E3;
+
+    const builder = new SimpleEventBuilder();
+    if (!knownPids.has(pid)) {
+      builder.process_name(pid === process.pid ? 'primary' : 'secondary', pid);
+      knownPids.add(pid);
+    }
+
+    const tidHash = `${pid}:${tid}`;
+    if (!knownTids.has(tidHash)) {
+      builder.thread_name(DetoxTracer.categorize(tid), tid, pid);
+      builder.thread_sort_index(tid, tid, pid);
+      knownTids.add(tidHash);
+    }
+
+    const event = { ph: 'i', ...data.trace, pid, tid, ts, args };
+    if (!trace || trace.ph !== 'E') {
+      event.name = msg || '';
+    }
+
+    builder.events.push(event);
+    return builder.events;
+  });
+}
+
+// TODO: create PR to https://github.com/mafintosh/duplexify
+// should be able to pass { error: false } to end-of-stream
+function preventErrorSubscriptions(emitter) {
+  const originalOn = emitter.on.bind(emitter);
+  emitter.on = (event, ...args) => {
+    if (event === 'error') {
+      return emitter;
+    }
+
+    return originalOn(event, ...args);
+  };
+
+  return emitter;
+}
+
+function readJSONL() {
+  const readable = new PassThrough({ objectMode: true });
+  const writable = JsonlParser.make({ checkErrors: true })
+    .on('error', (err) => {
+      if (err instanceof SyntaxError) {
+        log.debug({ event: 'JSONL_ERROR', err });
+        readable.end();
+      } else {
+        readable.emit('error', err);
+      }
+    });
+
+  return duplexify.obj(preventErrorSubscriptions(writable), writable.pipe(readable));
+}
+
+module.exports = {
+  readJSONL,
+  writeJSON,
+  writeJSONL,
+  mergeSortedJSONL,
+  debugStream,
+  chromeTraceStream,
+};

package/src/utils/trace.js

@@ -1,54 +1,19 @@
-class Trace {
-  constructor() {
-    this.events = [];
-  }
-
-  init(timestampProviderFn = Date.now) {
-    this._timestampProviderFn = timestampProviderFn;
-    this.events = [
-      this._event('init'),
-    ];
-  }
+/** @type {Detox.Tracer} */
+const trace = require('../..').trace;
+const traceCall = trace.bind(null);
 
-  startSection(name, args) {
-    this.events.push(this._event('start', name, args));
-  }
-
-  endSection(name, args) {
-    this.events.push(this._event('end', name, args));
-  }
+function traceMethods(obj, cat, methodNames) {
+  for (const name of methodNames) {
+    const originalMethod = obj[name];
 
-  reset() {
-    this.events = [
-      this._event('init'),
-    ];
-  }
-
-  _event(type, name, args) {
-    return {
-      type,
-      ts: this._timestampProviderFn(),
-      name,
-      args,
+    obj[name] = function tracedMethod() {
+      return traceCall({ cat, name }, originalMethod.apply.bind(originalMethod, obj, arguments));
     };
   }
 }
 
-let trace = new Trace();
-async function traceCall(sectionName, func) {
-  trace.startSection(sectionName);
-  try {
-    const result = await func();
-    trace.endSection(sectionName, { success: true });
-    return result;
-  } catch (error) {
-    trace.endSection(sectionName, { success: false, error: error.toString() });
-    throw error;
-  }
-}
-
 module.exports = {
-  Trace,
   trace,
   traceCall,
+  traceMethods,
 };

package/Detox-android/com/wix/detox/19.9.0/detox-19.9.0-javadoc.jar.md5

@@ -1 +0,0 @@
-5ab3b2caf273681ecb01c3a125ef417f

package/Detox-android/com/wix/detox/19.9.0/detox-19.9.0-javadoc.jar.sha1

@@ -1 +0,0 @@
-eb4040ada71ccb1050cab9b5e755ff83791d4a39

package/Detox-android/com/wix/detox/19.9.0/detox-19.9.0-javadoc.jar.sha256

@@ -1 +0,0 @@
-ae666fd6178d7c81e549450c5874a07604fd14988436e45526071fa43043e061

package/Detox-android/com/wix/detox/19.9.0/detox-19.9.0-javadoc.jar.sha512

@@ -1 +0,0 @@
-f6f987d885a2975deb085c30211d5ae5fd2f3bfd9e7b87537aed1c017a439e6fb59fe2c65119e7581f36d8fca570629c7f02a3709a5a7014580d5299237fbd0b

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

@@ -1 +0,0 @@
-8168ce2f62008b352b7912c7494b44e2

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

@@ -1 +0,0 @@
-6c478ca17616be344363b47be51ae3cd565a7d1e

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

@@ -1 +0,0 @@
-280ed7cc988d683fca37ec69b7d09f1922148c655de34e473101cbcdd30c2593

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

@@ -1 +0,0 @@
-514f843d3398f32c481b2fdc868d457f7a323ca6963e6007486d72d3577ac7d083ff2c05598e823067ad900ecf5167199ad5c61aab879e613e2becba89b0c883

package/Detox-android/com/wix/detox/19.9.0/detox-19.9.0.aar.md5

@@ -1 +0,0 @@
-6d3f9250a50b2297577f126aa0253833

package/Detox-android/com/wix/detox/19.9.0/detox-19.9.0.aar.sha1

@@ -1 +0,0 @@
-e8a6d8b30ca550020ddcc21a061ea5cb360515d8

package/Detox-android/com/wix/detox/19.9.0/detox-19.9.0.aar.sha256

@@ -1 +0,0 @@
-bc528b332ad97156496b6d44e60005884f2d9ffe79808319e4a844b65cad9810

package/Detox-android/com/wix/detox/19.9.0/detox-19.9.0.aar.sha512

@@ -1 +0,0 @@
-d3b944c0bedc48769416f46594853b759776b04befafc96314f2023f01f94607b43a22f2ebffe2ccd2c1c9144357d8e8888b600bfed1c8550263ff1c63d1f22f

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

@@ -1 +0,0 @@
-3b4fab7ecd725791870c6e4eb635f0d2

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

@@ -1 +0,0 @@
-13dae48f94fca5e145502af8cf488b395201f59e

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

@@ -1 +0,0 @@
-cd4f6484c2f129367407435232f2065edae2562dbdb861fcefa9d40675a04f75

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

@@ -1 +0,0 @@
-afe8148d581769b9292c92aa9ae48f5e8671c7c0f1950b35eb552c831e5b8ace7f54f1a2ac2604a43e2a6ae380cab441935059494963820b1f15c53ad94e2b1d

package/android/detox/src/full/java/com/wix/detox/espresso/action/AdjustSliderToPositionAction.kt

@@ -1,22 +0,0 @@
-package com.wix.detox.espresso.action
-
-import android.view.View
-import androidx.appcompat.widget.AppCompatSeekBar
-import androidx.test.espresso.UiController
-import androidx.test.espresso.ViewAction
-import androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom
-import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
-import com.wix.detox.espresso.common.SliderHelper
-import org.hamcrest.Matcher
-import org.hamcrest.Matchers
-
-class AdjustSliderToPositionAction(private val targetPositionPct: Double) : ViewAction {
-    override fun getDescription() = "adjustSliderToPosition"
-    override fun getConstraints(): Matcher<View?>? =
-        Matchers.allOf( isDisplayed(), isAssignableFrom(AppCompatSeekBar::class.java) )
-
-    override fun perform(uiController: UiController?, view: View) {
-        val sliderHelper = SliderHelper.create(view)
-        sliderHelper.setProgressPct(targetPositionPct)
-    }
-}