detox 20.0.0-breaking.new-global-lifecycle.0 → 20.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (204) hide show
  1. package/Detox-android/com/wix/detox/{20.0.0-breaking.new-global-lifecycle.0/detox-20.0.0-breaking.new-global-lifecycle.0-javadoc.jar → 20.0.0/detox-20.0.0-javadoc.jar} +0 -0
  2. package/Detox-android/com/wix/detox/20.0.0/detox-20.0.0-javadoc.jar.md5 +1 -0
  3. package/Detox-android/com/wix/detox/20.0.0/detox-20.0.0-javadoc.jar.sha1 +1 -0
  4. package/Detox-android/com/wix/detox/20.0.0/detox-20.0.0-javadoc.jar.sha256 +1 -0
  5. package/Detox-android/com/wix/detox/20.0.0/detox-20.0.0-javadoc.jar.sha512 +1 -0
  6. package/Detox-android/com/wix/detox/{20.0.0-breaking.new-global-lifecycle.0/detox-20.0.0-breaking.new-global-lifecycle.0-sources.jar → 20.0.0/detox-20.0.0-sources.jar} +0 -0
  7. package/Detox-android/com/wix/detox/20.0.0/detox-20.0.0-sources.jar.md5 +1 -0
  8. package/Detox-android/com/wix/detox/20.0.0/detox-20.0.0-sources.jar.sha1 +1 -0
  9. package/Detox-android/com/wix/detox/20.0.0/detox-20.0.0-sources.jar.sha256 +1 -0
  10. package/Detox-android/com/wix/detox/20.0.0/detox-20.0.0-sources.jar.sha512 +1 -0
  11. package/Detox-android/com/wix/detox/20.0.0/detox-20.0.0.aar +0 -0
  12. package/Detox-android/com/wix/detox/20.0.0/detox-20.0.0.aar.md5 +1 -0
  13. package/Detox-android/com/wix/detox/20.0.0/detox-20.0.0.aar.sha1 +1 -0
  14. package/Detox-android/com/wix/detox/20.0.0/detox-20.0.0.aar.sha256 +1 -0
  15. package/Detox-android/com/wix/detox/20.0.0/detox-20.0.0.aar.sha512 +1 -0
  16. package/Detox-android/com/wix/detox/{20.0.0-breaking.new-global-lifecycle.0/detox-20.0.0-breaking.new-global-lifecycle.0.pom → 20.0.0/detox-20.0.0.pom} +2 -8
  17. package/Detox-android/com/wix/detox/20.0.0/detox-20.0.0.pom.md5 +1 -0
  18. package/Detox-android/com/wix/detox/20.0.0/detox-20.0.0.pom.sha1 +1 -0
  19. package/Detox-android/com/wix/detox/20.0.0/detox-20.0.0.pom.sha256 +1 -0
  20. package/Detox-android/com/wix/detox/20.0.0/detox-20.0.0.pom.sha512 +1 -0
  21. package/Detox-android/com/wix/detox/maven-metadata.xml +4 -4
  22. package/Detox-android/com/wix/detox/maven-metadata.xml.md5 +1 -1
  23. package/Detox-android/com/wix/detox/maven-metadata.xml.sha1 +1 -1
  24. package/Detox-android/com/wix/detox/maven-metadata.xml.sha256 +1 -1
  25. package/Detox-android/com/wix/detox/maven-metadata.xml.sha512 +1 -1
  26. package/Detox-ios-src.tbz +0 -0
  27. package/Detox-ios.tbz +0 -0
  28. package/README.md +1 -1
  29. package/android/build.gradle +13 -8
  30. package/android/detox/build.gradle +14 -10
  31. package/android/detox/proguard-rules-app.pro +6 -0
  32. package/android/detox/proguard-rules.pro +3 -0
  33. package/android/detox/publish-pom.gradle +5 -1
  34. package/android/detox/publishing.gradle +35 -33
  35. package/android/detox/src/full/java/com/wix/detox/DetoxCrashHandler.kt +1 -1
  36. package/android/detox/src/full/java/com/wix/detox/LaunchArgs.java +9 -0
  37. package/android/detox/src/full/java/com/wix/detox/TestEngineFacade.kt +1 -1
  38. package/android/detox/src/full/java/com/wix/detox/adapters/server/WebSocketClient.java +3 -1
  39. package/android/detox/src/full/java/com/wix/detox/espresso/DetoxAction.java +1 -3
  40. package/android/detox/src/full/java/com/wix/detox/espresso/UiAutomatorHelper.java +1 -1
  41. package/android/detox/src/full/java/com/wix/detox/espresso/action/AdjustSliderToPositionAction.kt +22 -0
  42. package/android/detox/src/{main → full}/java/com/wix/detox/espresso/action/GetAttributesAction.kt +13 -1
  43. package/android/detox/src/full/java/com/wix/detox/espresso/common/SliderHelper.kt +75 -0
  44. package/android/detox/src/full/java/com/wix/detox/espresso/matcher/ViewMatchers.kt +16 -23
  45. package/android/detox/src/full/java/com/wix/detox/reactnative/ReactNativeExtension.kt +15 -2
  46. package/android/detox/src/full/java/com/wix/detox/reactnative/ReactNativeIdlingResources.kt +43 -38
  47. package/android/detox/src/full/java/com/wix/detox/reactnative/ReactNativeLoadingMonitor.kt +54 -8
  48. package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/IdlingResourceDescription.kt +19 -13
  49. package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/NetworkIdlingResource.java +33 -30
  50. package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/timers/DelegatedIdleInterrogationStrategy.kt +7 -27
  51. package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/timers/IdleInterrogationStrategy.kt +1 -11
  52. package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/uimodule/RN66Workaround.kt +13 -4
  53. package/android/detox/src/main/java/com/wix/detox/common/DetoxErrors.java +4 -1
  54. package/android/detox/src/main/java/com/wix/detox/common/TextFileReader.kt +1 -1
  55. package/android/detox/src/main/java/com/wix/detox/espresso/UiControllerSpy.kt +2 -1
  56. package/android/detox/src/main/java/com/wix/detox/espresso/action/common/ReflectUtils.kt +10 -0
  57. package/android/detox/src/main/java/com/wix/detox/espresso/action/common/utils/UiControllerUtils.kt +1 -1
  58. package/android/detox/src/testFull/java/com/wix/detox/espresso/action/DetoxMultiTapSpec.kt +4 -3
  59. package/android/detox/src/testFull/java/com/wix/detox/espresso/action/GetAttributesActionTest.kt +15 -3
  60. package/android/detox/src/testFull/java/com/wix/detox/espresso/common/SliderHelperTest.kt +39 -0
  61. package/android/detox/src/testFull/java/com/wix/detox/reactnative/idlingresources/NetworkIdlingResourcesTest.kt +61 -0
  62. package/android/detox/src/testFull/java/com/wix/detox/reactnative/idlingresources/timers/DelegatedIdleInterrogationStrategySpec.kt +3 -11
  63. package/android/gradle/wrapper/gradle-wrapper.properties +2 -1
  64. package/android/gradlew +181 -107
  65. package/index.d.ts +198 -57
  66. package/internals.d.ts +220 -51
  67. package/local-cli/build.js +2 -2
  68. package/local-cli/build.test.js +14 -14
  69. package/local-cli/cli.js +8 -6
  70. package/local-cli/init.js +61 -21
  71. package/local-cli/rebuild-framework-cache.js +1 -1
  72. package/local-cli/reset-lock-file.js +16 -0
  73. package/local-cli/templates/jest.js +13 -10
  74. package/local-cli/test.js +14 -8
  75. package/local-cli/test.test.js +148 -61
  76. package/local-cli/testCommand/TestRunnerCommand.js +78 -71
  77. package/local-cli/testCommand/builder.js +0 -1
  78. package/local-cli/testCommand/middlewares.js +4 -13
  79. package/local-cli/testCommand/warnings.js +0 -3
  80. package/local-cli/utils/jestInternals.js +4 -1
  81. package/package.json +22 -15
  82. package/runners/deprecation.js +42 -44
  83. package/runners/jest/globalSetup.js +1 -1
  84. package/runners/jest/globalTeardown.js +1 -1
  85. package/runners/jest/index.d.ts +60 -0
  86. package/runners/jest/index.js +3 -8
  87. package/runners/jest/index.test.js +13 -0
  88. package/runners/jest/reporters/DetoxReporter.js +33 -2
  89. package/runners/jest/testEnvironment/index.js +119 -69
  90. package/runners/jest/testEnvironment/listeners/DetoxCoreListener.js +94 -51
  91. package/runners/jest/testEnvironment/listeners/DetoxPlatformFilterListener.js +1 -1
  92. package/runners/jest/testEnvironment/listeners/SpecReporter.js +14 -16
  93. package/runners/jest/testEnvironment/listeners/WorkerAssignReporter.js +2 -6
  94. package/runners/jest/testEnvironment/utils/assertJestCircus27.js +17 -3
  95. package/runners/jest/testEnvironment/utils/assertJestCircus27.test.js +0 -1
  96. package/src/DetoxWorker.js +107 -59
  97. package/src/android/core/NativeElement.js +56 -20
  98. package/src/android/core/NativeExpect.js +28 -9
  99. package/src/android/interactions/native.js +25 -18
  100. package/src/artifacts/ArtifactsManager.js +14 -47
  101. package/src/artifacts/instruments/ios/SimulatorInstrumentsRecording.js +3 -3
  102. package/src/artifacts/log/android/ADBLogcatRecording.js +11 -28
  103. package/src/artifacts/log/ios/SimulatorLogRecording.js +1 -1
  104. package/src/artifacts/screenshot/SimulatorScreenshotPlugin.js +1 -1
  105. package/src/artifacts/templates/artifact/Artifact.js +1 -1
  106. package/src/artifacts/templates/plugin/ArtifactPlugin.js +1 -1
  107. package/src/artifacts/timeline/TimelineContextTypes.js +7 -0
  108. package/src/artifacts/utils/temporaryPath.js +18 -7
  109. package/src/artifacts/video/SimulatorRecordVideoPlugin.js +1 -1
  110. package/src/client/AsyncWebSocket.js +8 -17
  111. package/src/client/Client.js +19 -2
  112. package/src/client/actions/formatters/sync-resources/NetworkFormatter.js +1 -1
  113. package/src/configuration/collectCliConfig.js +1 -12
  114. package/src/configuration/composeAppsConfig.js +5 -1
  115. package/src/configuration/composeDeviceConfig.js +1 -1
  116. package/src/configuration/composeLoggerConfig.js +19 -10
  117. package/src/configuration/composeRunnerConfig.js +62 -9
  118. package/src/configuration/index.js +14 -9
  119. package/src/configuration/loadExternalConfig.js +1 -1
  120. package/src/devices/allocation/DeviceAllocator.js +3 -2
  121. package/src/devices/allocation/drivers/android/emulator/AVDValidator.js +5 -5
  122. package/src/devices/allocation/drivers/android/emulator/EmulatorAllocDriver.js +4 -3
  123. package/src/devices/allocation/drivers/android/emulator/EmulatorAllocationHelper.js +1 -1
  124. package/src/devices/allocation/drivers/android/emulator/EmulatorLauncher.js +3 -2
  125. package/src/devices/allocation/drivers/android/emulator/EmulatorVersionResolver.js +4 -6
  126. package/src/devices/allocation/drivers/android/emulator/launchEmulatorProcess.js +1 -1
  127. package/src/devices/allocation/drivers/android/genycloud/GenyAllocDriver.js +1 -0
  128. package/src/devices/allocation/drivers/android/genycloud/GenyInstanceAllocationHelper.js +1 -1
  129. package/src/devices/common/drivers/android/exec/ADB.js +5 -0
  130. package/src/devices/common/drivers/android/genycloud/services/GenyInstanceNaming.js +3 -3
  131. package/src/devices/common/drivers/android/genycloud/services/GenyRecipesService.js +1 -1
  132. package/src/devices/common/drivers/android/tools/EmulatorTelnet.js +1 -1
  133. package/src/devices/common/drivers/android/tools/FreeDeviceFinder.js +1 -1
  134. package/src/devices/common/drivers/android/tools/MonitoredInstrumentation.js +1 -1
  135. package/src/devices/common/drivers/ios/tools/AppleSimUtils.js +29 -3
  136. package/src/devices/lifecycle/GenyGlobalLifecycleHandler.js +13 -15
  137. package/src/devices/runtime/RuntimeDevice.js +19 -12
  138. package/src/devices/runtime/drivers/DeviceDriverBase.js +1 -1
  139. package/src/devices/runtime/drivers/android/AndroidDriver.js +10 -2
  140. package/src/devices/runtime/drivers/ios/SimulatorDriver.js +1 -1
  141. package/src/errors/DetoxConfigErrorComposer.js +18 -3
  142. package/src/ios/expectTwo.js +153 -67
  143. package/src/ipc/IPCClient.js +12 -12
  144. package/src/ipc/IPCServer.js +34 -17
  145. package/src/ipc/{state.js → SessionState.js} +26 -31
  146. package/src/logger/DetoxLogger.js +261 -157
  147. package/src/logger/index.js +5 -0
  148. package/src/logger/utils/BunyanLogger.js +76 -0
  149. package/src/logger/utils/CategoryThreadDispatcher.js +36 -0
  150. package/src/logger/utils/DetoxLogFinalizer.js +140 -0
  151. package/src/logger/utils/MessageStack.js +24 -0
  152. package/src/logger/utils/ThreadDispatcher.js +61 -0
  153. package/src/logger/{customConsoleLogger.js → utils/customConsoleLogger.js} +5 -4
  154. package/src/logger/utils/sanitizeBunyanContext.js +30 -0
  155. package/src/{utils → logger/utils}/streamUtils.js +51 -17
  156. package/src/logger/utils/tracerLegacy.js +37 -0
  157. package/src/realms/DetoxContext.js +78 -65
  158. package/src/realms/DetoxInternalsFacade.js +8 -12
  159. package/src/realms/DetoxPrimaryContext.js +106 -73
  160. package/src/realms/DetoxSecondaryContext.js +29 -31
  161. package/src/server/DetoxConnection.js +18 -23
  162. package/src/server/DetoxServer.js +7 -10
  163. package/src/server/DetoxSession.js +6 -6
  164. package/src/server/DetoxSessionManager.js +1 -1
  165. package/src/server/handlers/RegisteredConnectionHandler.js +1 -2
  166. package/src/symbols.js +16 -22
  167. package/src/utils/Timer.js +55 -38
  168. package/src/utils/argparse.js +11 -0
  169. package/src/utils/childProcess/exec.js +1 -1
  170. package/src/utils/childProcess/spawn.js +1 -1
  171. package/src/utils/environment.js +30 -15
  172. package/src/utils/errorUtils.js +24 -3
  173. package/src/utils/invocationTraceDescriptions.js +43 -0
  174. package/src/utils/logger.js +1 -1
  175. package/src/utils/traceInvocationCall.js +21 -0
  176. package/src/utils/traceMethods.js +15 -0
  177. package/Detox-android/com/wix/detox/20.0.0-breaking.new-global-lifecycle.0/detox-20.0.0-breaking.new-global-lifecycle.0-javadoc.jar.md5 +0 -1
  178. package/Detox-android/com/wix/detox/20.0.0-breaking.new-global-lifecycle.0/detox-20.0.0-breaking.new-global-lifecycle.0-javadoc.jar.sha1 +0 -1
  179. package/Detox-android/com/wix/detox/20.0.0-breaking.new-global-lifecycle.0/detox-20.0.0-breaking.new-global-lifecycle.0-javadoc.jar.sha256 +0 -1
  180. package/Detox-android/com/wix/detox/20.0.0-breaking.new-global-lifecycle.0/detox-20.0.0-breaking.new-global-lifecycle.0-javadoc.jar.sha512 +0 -1
  181. package/Detox-android/com/wix/detox/20.0.0-breaking.new-global-lifecycle.0/detox-20.0.0-breaking.new-global-lifecycle.0-sources.jar.md5 +0 -1
  182. package/Detox-android/com/wix/detox/20.0.0-breaking.new-global-lifecycle.0/detox-20.0.0-breaking.new-global-lifecycle.0-sources.jar.sha1 +0 -1
  183. package/Detox-android/com/wix/detox/20.0.0-breaking.new-global-lifecycle.0/detox-20.0.0-breaking.new-global-lifecycle.0-sources.jar.sha256 +0 -1
  184. package/Detox-android/com/wix/detox/20.0.0-breaking.new-global-lifecycle.0/detox-20.0.0-breaking.new-global-lifecycle.0-sources.jar.sha512 +0 -1
  185. package/Detox-android/com/wix/detox/20.0.0-breaking.new-global-lifecycle.0/detox-20.0.0-breaking.new-global-lifecycle.0.aar +0 -0
  186. package/Detox-android/com/wix/detox/20.0.0-breaking.new-global-lifecycle.0/detox-20.0.0-breaking.new-global-lifecycle.0.aar.md5 +0 -1
  187. package/Detox-android/com/wix/detox/20.0.0-breaking.new-global-lifecycle.0/detox-20.0.0-breaking.new-global-lifecycle.0.aar.sha1 +0 -1
  188. package/Detox-android/com/wix/detox/20.0.0-breaking.new-global-lifecycle.0/detox-20.0.0-breaking.new-global-lifecycle.0.aar.sha256 +0 -1
  189. package/Detox-android/com/wix/detox/20.0.0-breaking.new-global-lifecycle.0/detox-20.0.0-breaking.new-global-lifecycle.0.aar.sha512 +0 -1
  190. package/Detox-android/com/wix/detox/20.0.0-breaking.new-global-lifecycle.0/detox-20.0.0-breaking.new-global-lifecycle.0.pom.md5 +0 -1
  191. package/Detox-android/com/wix/detox/20.0.0-breaking.new-global-lifecycle.0/detox-20.0.0-breaking.new-global-lifecycle.0.pom.sha1 +0 -1
  192. package/Detox-android/com/wix/detox/20.0.0-breaking.new-global-lifecycle.0/detox-20.0.0-breaking.new-global-lifecycle.0.pom.sha256 +0 -1
  193. package/Detox-android/com/wix/detox/20.0.0-breaking.new-global-lifecycle.0/detox-20.0.0-breaking.new-global-lifecycle.0.pom.sha512 +0 -1
  194. package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/timers/DefaultIdleInterrogationStrategy.kt +0 -84
  195. package/android/detox/src/main/java/com/wix/detox/espresso/action/AdjustSliderToPositionAction.kt +0 -36
  196. package/android/detox/src/testFull/java/com/wix/detox/espresso/action/AdjustSliderToPositionActionTest.kt +0 -59
  197. package/android/detox/src/testFull/java/com/wix/detox/reactnative/idlingresources/timers/DefaultIdleInterrogationStrategySpec.kt +0 -115
  198. package/runners/jest/deprecation.js +0 -25
  199. package/src/configuration/utils/warnings.js +0 -12
  200. package/src/logger/DetoxTraceEventBuilder.js +0 -21
  201. package/src/logger/DetoxTracer.js +0 -133
  202. package/src/logger/TraceThreadDispatcher.js +0 -52
  203. package/src/utils/ChromeTracingExporter.js +0 -53
  204. package/src/utils/trace.js +0 -19
@@ -0,0 +1,76 @@
1
+ const { PassThrough } = require('stream');
2
+
3
+ const bunyan = require('bunyan');
4
+ const bds = require('bunyan-debug-stream');
5
+ const _ = require('lodash');
6
+
7
+ const { DetoxInternalError } = require('../../errors');
8
+
9
+ class BunyanLogger {
10
+ constructor() {
11
+ this._bunyan = bunyan.createLogger({ name: 'detox', streams: [] });
12
+ /** @type {bunyan.Stream} */
13
+ this._debugStream = null;
14
+ /** @type {bunyan.Stream} */
15
+ this._fileStream = null;
16
+ }
17
+
18
+ /**
19
+ * @returns {bunyan}
20
+ */
21
+ get logger() {
22
+ return this._bunyan;
23
+ }
24
+
25
+ /**
26
+ * @param {Detox.DetoxLoggerConfig} config
27
+ * @returns {this}
28
+ */
29
+ installDebugStream(config) {
30
+ if (this._debugStream) {
31
+ _.remove(this._bunyan['streams'], this._debugStream);
32
+ // @ts-ignore
33
+ this._debugStream.stream.end();
34
+ this._debugStream = null;
35
+ }
36
+
37
+ const streamOptions = { out: null, ...config.options };
38
+ /* istanbul ignore next */
39
+ if (!streamOptions.out) {
40
+ // This is a default if-else branch, used everywhere except for the unit tests.
41
+ streamOptions.out = new PassThrough().pipe(process.stderr);
42
+ }
43
+
44
+ this._debugStream = {
45
+ type: 'raw',
46
+ level: config.level,
47
+ stream: bds.default(streamOptions),
48
+ };
49
+
50
+ this._bunyan.addStream(this._debugStream);
51
+ return this;
52
+ }
53
+
54
+ /**
55
+ * @param {string} file
56
+ * @returns {this}
57
+ */
58
+ installFileStream(file) {
59
+ /* istanbul ignore next */
60
+ if (this._fileStream) {
61
+ // This is an impossible condition, but we keep it here for the sake of completeness.
62
+ throw new DetoxInternalError('Trying to install a second file stream inside already initialized Bunyan logger');
63
+ }
64
+
65
+ this._fileStream = {
66
+ level: 'trace',
67
+ path: file,
68
+ };
69
+
70
+ this._bunyan.addStream(this._fileStream);
71
+
72
+ return this;
73
+ }
74
+ }
75
+
76
+ module.exports = BunyanLogger;
@@ -0,0 +1,36 @@
1
+ const ThreadDispatcher = require('./ThreadDispatcher');
2
+
3
+ class CategoryThreadDispatcher {
4
+ constructor() {
5
+ /** @type {Record<string, ThreadDispatcher>} */
6
+ this._dispatchers = {};
7
+ }
8
+
9
+ /**
10
+ * @param {'B' | 'E' | 'i'} ph
11
+ * @param {string[] | undefined} cat
12
+ * @param {string | number} id
13
+ * @returns {number}
14
+ */
15
+ resolve(ph, cat, id) {
16
+ const dispatcher = this._resolveDispatcher(cat);
17
+
18
+ switch (ph) {
19
+ case 'B': return dispatcher.begin(id);
20
+ case 'E': return dispatcher.end(id);
21
+ default: return dispatcher.resolve(id);
22
+ }
23
+ }
24
+
25
+ /** @returns {ThreadDispatcher} */
26
+ _resolveDispatcher(cat) {
27
+ const mainCategory = cat ? cat.split(',', 1)[0] : 'undefined';
28
+ if (!this._dispatchers[mainCategory]) {
29
+ this._dispatchers[mainCategory] = new ThreadDispatcher(mainCategory);
30
+ }
31
+
32
+ return this._dispatchers[mainCategory];
33
+ }
34
+ }
35
+
36
+ module.exports = CategoryThreadDispatcher;
@@ -0,0 +1,140 @@
1
+ const path = require('path');
2
+ const { promisify } = require('util');
3
+
4
+ const fs = require('fs-extra');
5
+ const glob = require('glob');
6
+ const pipe = require('multipipe');
7
+
8
+ const temporary = require('../../artifacts/utils/temporaryPath');
9
+
10
+ const globAsync = promisify(glob);
11
+ const globSync = glob.sync;
12
+ const streamUtils = () => require('../../logger/utils/streamUtils');
13
+
14
+ /**
15
+ * @typedef DetoxLogFinalizerConfig
16
+ * @property {import('../../ipc/SessionState')} session
17
+ */
18
+
19
+ class DetoxLogFinalizer {
20
+ /** @param {DetoxLogFinalizerConfig} config */
21
+ constructor(config) {
22
+ this._session = config.session;
23
+ }
24
+
25
+ createEventStream() {
26
+ const sessionId = this._session.id;
27
+ const logs = globSync(temporary.for.jsonl(`${sessionId}.*`));
28
+
29
+ return streamUtils()
30
+ .uniteSessionLogs(logs)
31
+ .pipe(streamUtils().chromeTraceStream());
32
+ }
33
+
34
+ async finalize() {
35
+ const sessionId = this._session.id;
36
+ const logs = await globAsync(temporary.for.jsonl(`${sessionId}.*`));
37
+ if (logs.length === 0) {
38
+ return;
39
+ }
40
+
41
+ if (this._areLogsEnabled()) {
42
+ const rootDir = this._config.artifacts.rootDir;
43
+
44
+ await fs.mkdirp(rootDir);
45
+ const [out1Stream, out2Stream] = ['detox.log', 'detox.trace.json']
46
+ .map((filename) => fs.createWriteStream(path.join(rootDir, filename)));
47
+
48
+ const tidHashMap = await this._scanForThreadIds(logs);
49
+ const mergedStream = streamUtils().uniteSessionLogs(logs);
50
+
51
+ await Promise.all([
52
+ pipe(mergedStream, streamUtils().debugStream(this._config.logger.options), out1Stream),
53
+ pipe(mergedStream, streamUtils().chromeTraceStream(tidHashMap), streamUtils().writeJSON(), out2Stream),
54
+ ]);
55
+ }
56
+
57
+ await Promise.all(logs.map(filepath => fs.remove(filepath)));
58
+ }
59
+
60
+ finalizeSync() {
61
+ const sessionId = this._session.id;
62
+ const logs = globSync(temporary.for.jsonl(`${sessionId}.*`));
63
+ if (logs.length === 0) {
64
+ return;
65
+ }
66
+
67
+ const logsEnabled = this._areLogsEnabled();
68
+ const rootDir = logsEnabled ? this._config.artifacts.rootDir : '';
69
+ if (logsEnabled) {
70
+ fs.mkdirpSync(rootDir);
71
+ }
72
+
73
+ for (const log of logs) {
74
+ if (logsEnabled) {
75
+ fs.moveSync(log, path.join(rootDir, path.basename(log)));
76
+ } else {
77
+ fs.removeSync(log);
78
+ }
79
+ }
80
+ }
81
+
82
+ /** @private */
83
+ get _config() {
84
+ // The config appears later in the lifecycle, so we need to access it lazily
85
+ return this._session.detoxConfig;
86
+ }
87
+
88
+ /** @private */
89
+ _areLogsEnabled() {
90
+ if (!this._config) {
91
+ return false;
92
+ }
93
+
94
+ const { rootDir, plugins } = this._config.artifacts;
95
+ if (!rootDir || !plugins) {
96
+ return false;
97
+ }
98
+
99
+ if (!plugins.log.enabled) {
100
+ return false;
101
+ }
102
+
103
+ if (!plugins.log.keepOnlyFailedTestsArtifacts) {
104
+ return true;
105
+ }
106
+
107
+ return this._session.testResults.some(r => !r.success);
108
+ }
109
+
110
+ /** @private */
111
+ async _scanForThreadIds(logs) {
112
+ const processes = await new Promise((resolve, reject) => {
113
+ const result = {};
114
+ streamUtils().uniteSessionLogs(logs)
115
+ .on('end', () => resolve(result))
116
+ .on('error', /* istanbul ignore next */ (err) => reject(err))
117
+ .on('data', (event) => {
118
+ const { ph, pid, tid, cat } = event;
119
+ if (ph === 'B' || ph === 'i') {
120
+ const categories = (result[pid] = result[pid] || {});
121
+ const mainCategory = String(cat).split(',')[0];
122
+ const tids = (categories[mainCategory] = categories[mainCategory] || []);
123
+ if (!tids.includes(tid)) {
124
+ tids.push(tid);
125
+ }
126
+ }
127
+ });
128
+ });
129
+
130
+ const tidArray = Object.entries(processes).flatMap(([pid, categories]) => {
131
+ return Object.entries(categories).flatMap(([category, tids]) => {
132
+ return tids.map(tid => `${pid}:${category}:${tid}`);
133
+ });
134
+ });
135
+
136
+ return new Map(tidArray.map((hash, index) => [hash, index]));
137
+ }
138
+ }
139
+
140
+ module.exports = DetoxLogFinalizer;
@@ -0,0 +1,24 @@
1
+ class MessageStack {
2
+ constructor() {
3
+ this._map = {};
4
+ }
5
+
6
+ push(tid, msg) {
7
+ if (this._map[tid] == null) {
8
+ this._map[tid] = [];
9
+ }
10
+
11
+ return this._map[tid].push(msg);
12
+ }
13
+
14
+ pop(tid) {
15
+ const stack = this._map[tid];
16
+ if (stack == null || stack.length === 0) {
17
+ return ['<no begin message>'];
18
+ }
19
+
20
+ return stack.pop();
21
+ }
22
+ }
23
+
24
+ module.exports = MessageStack;
@@ -0,0 +1,61 @@
1
+ const isUndefined = (x) => x === undefined;
2
+
3
+ class ThreadDispatcher {
4
+ /**
5
+ * @param {string} name
6
+ */
7
+ constructor(name) {
8
+ this.name = name;
9
+ this.stacks = [];
10
+ this.threads = [];
11
+ }
12
+
13
+ /**
14
+ * @param {string | number} [id]
15
+ * @returns {number}
16
+ */
17
+ begin(id) {
18
+ const tid = this._findTID(id);
19
+ this.threads[tid] = id;
20
+ this.stacks[tid] = (this.stacks[tid] || 0) + 1;
21
+ return tid;
22
+ }
23
+
24
+ /**
25
+ * @param {string | number} [id]
26
+ * @returns {number}
27
+ */
28
+ resolve(id) {
29
+ return this._findTID(id);
30
+ }
31
+
32
+ /**
33
+ * @param {string | number} [id]
34
+ * @returns {number}
35
+ */
36
+ end(id) {
37
+ const tid = this._findTID(id);
38
+ if (this.stacks[tid] && --this.stacks[tid] === 0) {
39
+ delete this.threads[tid];
40
+ }
41
+ return tid;
42
+ }
43
+
44
+ /**
45
+ * @param {string | number | undefined} id
46
+ * @returns {number}
47
+ * @private
48
+ *
49
+ * Memory-efficient finder of a free item index in the threads array.
50
+ */
51
+ _findTID(id) {
52
+ let tid = this.threads.indexOf(id);
53
+ if (tid === -1) {
54
+ // Try to find a recently released slot in the array:
55
+ tid = this.threads.findIndex(isUndefined);
56
+ }
57
+ return tid === -1 ? this.threads.length : tid;
58
+ }
59
+ }
60
+
61
+ module.exports = ThreadDispatcher;
@@ -1,6 +1,6 @@
1
1
  const util = require('util');
2
2
 
3
- const callsites = require('../utils/callsites');
3
+ const callsites = require('../../utils/callsites');
4
4
 
5
5
  const USER_STACK_FRAME_INDEX = 2;
6
6
 
@@ -25,20 +25,20 @@ function getStackDump() {
25
25
 
26
26
  function proxyLog(bunyanLoggerFn) {
27
27
  return (...args) => {
28
- bunyanLoggerFn({ event: 'USER_LOG' }, getOrigin(), '\n', util.format(...args));
28
+ bunyanLoggerFn({ cat: 'user', origin: getOrigin() }, util.format(...args));
29
29
  };
30
30
  }
31
31
 
32
32
  function proxyTracing(bunyanLoggerFn) {
33
33
  return (...args) => {
34
- bunyanLoggerFn({ event: 'USER_LOG' }, getOrigin(), '\n Trace:', util.format(...args), '\n\r' + getStackDump());
34
+ bunyanLoggerFn({ cat: 'user', origin: getOrigin(), stack: getStackDump() }, util.format(...args));
35
35
  };
36
36
  }
37
37
 
38
38
  function proxyAssert(bunyanLoggerFn) {
39
39
  return (condition, ...args) => {
40
40
  if (!condition) {
41
- bunyanLoggerFn({ event: 'USER_LOG' }, getOrigin(), '\n AssertionError:', util.format(...args));
41
+ bunyanLoggerFn({ cat: 'user', origin: getOrigin() }, 'AssertionError:', util.format(...args));
42
42
  }
43
43
  };
44
44
  }
@@ -48,6 +48,7 @@ function overrideConsoleMethods(console, bunyanLogger) {
48
48
  const log = bunyanLogger;
49
49
 
50
50
  override(console, 'log', log.info.bind(log));
51
+ override(console, 'info', log.info.bind(log));
51
52
  override(console, 'warn', log.warn.bind(log));
52
53
  override(console, 'trace', log.info.bind(log));
53
54
  override(console, 'error', log.error.bind(log));
@@ -0,0 +1,30 @@
1
+ const _ = require('lodash');
2
+
3
+ const RESERVED_PROPERTIES = [
4
+ 'hostname',
5
+ 'level',
6
+ 'msg',
7
+ 'name',
8
+ 'pid',
9
+ 'tid',
10
+ 'ph',
11
+ 'time',
12
+ ];
13
+
14
+ function hasProperty(p) {
15
+ return _.has(this, p);
16
+ }
17
+
18
+ function hasReservedProperties(o) {
19
+ return RESERVED_PROPERTIES.some(hasProperty, o); // eslint-disable-line unicorn/no-array-method-this-argument
20
+ }
21
+
22
+ function escapeCallback(value, key) {
23
+ return RESERVED_PROPERTIES.includes(key) ? `${key}$` : key;
24
+ }
25
+
26
+ function sanitizeBunyanContext(context) {
27
+ return context && hasReservedProperties(context) ? _.mapKeys(context, escapeCallback) : context;
28
+ }
29
+
30
+ module.exports = sanitizeBunyanContext;
@@ -2,15 +2,14 @@ const { PassThrough, Transform } = require('stream');
2
2
 
3
3
  const bunyanDebugStream = require('bunyan-debug-stream');
4
4
  const duplexify = require('duplexify');
5
+ const fs = require('fs-extra');
5
6
  const multiSort = require('multi-sort-stream');
6
7
  const pipe = require('multipipe');
7
8
  const JsonlParser = require('stream-json/jsonl/Parser');
8
9
  const stripAnsi = require('strip-ansi');
9
10
  const { AbstractEventBuilder } = require('trace-event-lib');
10
11
 
11
- const DetoxTracer = require('../logger/DetoxTracer');
12
-
13
- const log = require('./logger').child({ __filename });
12
+ const log = require('../../utils/logger').child({ cat: 'logger' });
14
13
 
15
14
  function compareTimestamps(a, b) {
16
15
  return +(a.value.time > b.value.time) - +(a.value.time < b.value.time);
@@ -136,37 +135,60 @@ class JsonlStringer extends Transform {
136
135
 
137
136
  class SimpleEventBuilder extends AbstractEventBuilder {
138
137
  events = [];
138
+
139
139
  send(event) {
140
140
  this.events.push(event);
141
141
  }
142
142
  }
143
143
 
144
- function chromeTraceStream() {
144
+ const ERROR_TID = 37707;
145
+
146
+ function getTidHash({ pid, tid, cat }) {
147
+ const mainCategory = String(cat).split(',')[0];
148
+ return `${pid}:${mainCategory}:${tid}`;
149
+ }
150
+
151
+ function getFixedTID(tidHashMap, event) {
152
+ let tid = tidHashMap.get(getTidHash(event));
153
+ if (tid === undefined) {
154
+ tid = ERROR_TID;
155
+ }
156
+
157
+ return tid;
158
+ }
159
+
160
+ /**
161
+ * @param {Map<string, number>} [tidHashMap]
162
+ */
163
+ function chromeTraceStream(tidHashMap) {
145
164
  const knownPids = new Set();
146
165
  const knownTids = new Set();
166
+ const fixTID = tidHashMap ? getFixedTID.bind(null, tidHashMap) : (x) => x.tid;
147
167
 
148
168
  return flatMapTransform((data) => {
149
169
  // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
150
- const { pid, trace, msg, time, name: _name, hostname: _hostname, ...args } = data;
151
- const tid = trace ? trace.tid : DetoxTracer.threadize(args.cat);
170
+ const { cat: rawCat, msg: name, ph = 'i', pid, tid: _tid, time, name: _name, hostname: _hostname, ...args } = data;
152
171
  const ts = new Date(time).getTime() * 1E3;
172
+ const cat = rawCat || 'undefined';
173
+ const tid = fixTID(data);
153
174
 
154
175
  const builder = new SimpleEventBuilder();
155
176
  if (!knownPids.has(pid)) {
156
- builder.process_name(pid === process.pid ? 'primary' : 'secondary', pid);
177
+ builder.metadata({ pid, ts, name: 'process_name', args: { name: pid === process.pid ? 'primary' : 'secondary' } });
178
+ builder.metadata({ pid, ts, name: 'process_sort_index', args: { sort_index: knownPids.size } });
157
179
  knownPids.add(pid);
158
180
  }
159
181
 
160
- const tidHash = `${pid}:${tid}`;
161
- if (!knownTids.has(tidHash)) {
162
- builder.thread_name(DetoxTracer.categorize(tid), tid, pid);
163
- builder.thread_sort_index(tid, tid, pid);
164
- knownTids.add(tidHash);
182
+ if (!knownTids.has(tid)) {
183
+ const primaryCategory = cat.split(',', 1)[0];
184
+ builder.metadata({ pid, tid, ts, name: 'thread_name', args: { name: primaryCategory } });
185
+ builder.metadata({ pid, tid, ts, name: 'thread_sort_index', args: { sort_index: tid } });
186
+ knownTids.add(tid);
165
187
  }
166
188
 
167
- const event = { ph: 'i', ...data.trace, pid, tid, ts, args };
168
- if (!trace || trace.ph !== 'E') {
169
- event.name = msg || '';
189
+ const event = { ph, name, pid, tid, cat, ts, args };
190
+ if (ph === 'E') {
191
+ delete event.name;
170
192
  }
171
193
 
172
194
  builder.events.push(event);
@@ -190,11 +212,11 @@ function preventErrorSubscriptions(emitter) {
190
212
  }
191
213
 
192
214
  function readJSONL() {
193
- const readable = new PassThrough({ objectMode: true });
215
+ const readable = through();
194
216
  const writable = JsonlParser.make({ checkErrors: true })
195
217
  .on('error', (err) => {
196
218
  if (err instanceof SyntaxError) {
197
- log.debug({ event: 'JSONL_ERROR', err });
219
+ log.debug({ err });
198
220
  readable.end();
199
221
  } else {
200
222
  readable.emit('error', err);
@@ -204,6 +226,17 @@ function readJSONL() {
204
226
  return duplexify.obj(preventErrorSubscriptions(writable), writable.pipe(readable));
205
227
  }
206
228
 
229
+ /**
230
+ * @param {string[]} logs
231
+ * @returns {NodeJS.ReadableStream}
232
+ */
233
+ function uniteSessionLogs(logs) {
234
+ const readable = through();
235
+ const jsonlStreams = logs.map(filePath => fs.createReadStream(filePath).pipe(readJSONL()));
236
+ mergeSortedJSONL(jsonlStreams).pipe(readable);
237
+ return readable;
238
+ }
239
+
207
240
  module.exports = {
208
241
  readJSONL,
209
242
  writeJSON,
@@ -211,4 +244,5 @@ module.exports = {
211
244
  mergeSortedJSONL,
212
245
  debugStream,
213
246
  chromeTraceStream,
247
+ uniteSessionLogs,
214
248
  };
@@ -0,0 +1,37 @@
1
+ const methods = {
2
+ startSection(logger) {
3
+ return (msg, args) => {
4
+ if (args !== undefined) {
5
+ return logger.trace.begin(args, msg);
6
+ } else {
7
+ return logger.trace.begin(msg);
8
+ }
9
+ };
10
+ },
11
+
12
+ endSection(logger) {
13
+ return (_msg, args) => {
14
+ if (args !== undefined) {
15
+ return logger.trace.end(args);
16
+ } else {
17
+ return logger.trace.end();
18
+ }
19
+ };
20
+ },
21
+
22
+ traceCall(logger) {
23
+ return (name, action, args = {}) => logger.trace.complete(args, name, action);
24
+ },
25
+ };
26
+
27
+ function installLegacyTracerInterface(logger, target) {
28
+ target.traceCall = methods.traceCall(logger);
29
+ target.trace = Object.freeze({
30
+ startSection: methods.startSection(logger),
31
+ endSection: methods.endSection(logger),
32
+ });
33
+
34
+ return this;
35
+ }
36
+
37
+ module.exports = { install: installLegacyTracerInterface };