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

Sign up to get free protection for your applications and to get access to all the features.
Files changed (192) hide show
  1. package/Detox-android/com/wix/detox/{20.0.2-breaking.new-global-lifecycle.0/detox-20.0.2-breaking.new-global-lifecycle.0-javadoc.jar → 20.0.2/detox-20.0.2-javadoc.jar} +0 -0
  2. package/Detox-android/com/wix/detox/20.0.2/detox-20.0.2-javadoc.jar.md5 +1 -0
  3. package/Detox-android/com/wix/detox/20.0.2/detox-20.0.2-javadoc.jar.sha1 +1 -0
  4. package/Detox-android/com/wix/detox/20.0.2/detox-20.0.2-javadoc.jar.sha256 +1 -0
  5. package/Detox-android/com/wix/detox/20.0.2/detox-20.0.2-javadoc.jar.sha512 +1 -0
  6. package/Detox-android/com/wix/detox/{20.0.2-breaking.new-global-lifecycle.0/detox-20.0.2-breaking.new-global-lifecycle.0-sources.jar → 20.0.2/detox-20.0.2-sources.jar} +0 -0
  7. package/Detox-android/com/wix/detox/20.0.2/detox-20.0.2-sources.jar.md5 +1 -0
  8. package/Detox-android/com/wix/detox/20.0.2/detox-20.0.2-sources.jar.sha1 +1 -0
  9. package/Detox-android/com/wix/detox/20.0.2/detox-20.0.2-sources.jar.sha256 +1 -0
  10. package/Detox-android/com/wix/detox/20.0.2/detox-20.0.2-sources.jar.sha512 +1 -0
  11. package/Detox-android/com/wix/detox/20.0.2/detox-20.0.2.aar +0 -0
  12. package/Detox-android/com/wix/detox/20.0.2/detox-20.0.2.aar.md5 +1 -0
  13. package/Detox-android/com/wix/detox/20.0.2/detox-20.0.2.aar.sha1 +1 -0
  14. package/Detox-android/com/wix/detox/20.0.2/detox-20.0.2.aar.sha256 +1 -0
  15. package/Detox-android/com/wix/detox/20.0.2/detox-20.0.2.aar.sha512 +1 -0
  16. package/Detox-android/com/wix/detox/{20.0.2-breaking.new-global-lifecycle.0/detox-20.0.2-breaking.new-global-lifecycle.0.pom → 20.0.2/detox-20.0.2.pom} +1 -7
  17. package/Detox-android/com/wix/detox/20.0.2/detox-20.0.2.pom.md5 +1 -0
  18. package/Detox-android/com/wix/detox/20.0.2/detox-20.0.2.pom.sha1 +1 -0
  19. package/Detox-android/com/wix/detox/20.0.2/detox-20.0.2.pom.sha256 +1 -0
  20. package/Detox-android/com/wix/detox/20.0.2/detox-20.0.2.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 +12 -7
  30. package/android/detox/build.gradle +13 -9
  31. package/android/detox/proguard-rules-app.pro +6 -0
  32. package/android/detox/proguard-rules.pro +3 -0
  33. package/android/detox/publishing.gradle +27 -27
  34. package/android/detox/src/full/java/com/wix/detox/DetoxCrashHandler.kt +1 -1
  35. package/android/detox/src/full/java/com/wix/detox/LaunchArgs.java +9 -0
  36. package/android/detox/src/full/java/com/wix/detox/TestEngineFacade.kt +1 -1
  37. package/android/detox/src/full/java/com/wix/detox/reactnative/ReactNativeExtension.kt +15 -2
  38. package/android/detox/src/full/java/com/wix/detox/reactnative/ReactNativeIdlingResources.kt +43 -38
  39. package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/IdlingResourceDescription.kt +19 -13
  40. package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/NetworkIdlingResource.java +33 -30
  41. package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/timers/DelegatedIdleInterrogationStrategy.kt +7 -27
  42. package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/timers/IdleInterrogationStrategy.kt +1 -11
  43. package/android/detox/src/main/java/com/wix/detox/common/TextFileReader.kt +1 -1
  44. package/android/detox/src/testFull/java/com/wix/detox/espresso/action/DetoxMultiTapSpec.kt +4 -3
  45. package/android/detox/src/testFull/java/com/wix/detox/reactnative/idlingresources/NetworkIdlingResourcesTest.kt +61 -0
  46. package/android/detox/src/testFull/java/com/wix/detox/reactnative/idlingresources/timers/DelegatedIdleInterrogationStrategySpec.kt +3 -11
  47. package/index.d.ts +195 -59
  48. package/internals.d.ts +216 -49
  49. package/local-cli/build.js +2 -2
  50. package/local-cli/build.test.js +14 -14
  51. package/local-cli/cli.js +11 -6
  52. package/local-cli/init.js +61 -21
  53. package/local-cli/rebuild-framework-cache.js +1 -1
  54. package/local-cli/reset-lock-file.js +16 -0
  55. package/local-cli/templates/jest.js +13 -10
  56. package/local-cli/test.js +14 -8
  57. package/local-cli/test.test.js +143 -62
  58. package/local-cli/testCommand/TestRunnerCommand.js +97 -77
  59. package/local-cli/testCommand/TestRunnerError.js +17 -0
  60. package/local-cli/testCommand/TestRunnerError.test.js +25 -0
  61. package/local-cli/testCommand/builder.js +0 -1
  62. package/local-cli/testCommand/middlewares.js +4 -13
  63. package/local-cli/testCommand/warnings.js +0 -3
  64. package/local-cli/utils/jestInternals.js +4 -1
  65. package/package.json +23 -17
  66. package/runners/deprecation.js +42 -44
  67. package/runners/jest/globalSetup.js +1 -1
  68. package/runners/jest/globalTeardown.js +1 -1
  69. package/runners/jest/index.d.ts +60 -0
  70. package/runners/jest/index.js +3 -8
  71. package/runners/jest/index.test.js +13 -0
  72. package/runners/jest/reporters/DetoxReporter.js +33 -2
  73. package/runners/jest/testEnvironment/index.js +119 -69
  74. package/runners/jest/testEnvironment/listeners/DetoxCoreListener.js +94 -47
  75. package/runners/jest/testEnvironment/listeners/DetoxPlatformFilterListener.js +1 -1
  76. package/runners/jest/testEnvironment/listeners/SpecReporter.js +14 -16
  77. package/runners/jest/testEnvironment/listeners/WorkerAssignReporter.js +2 -6
  78. package/runners/jest/testEnvironment/utils/assertJestCircus27.js +17 -3
  79. package/runners/jest/testEnvironment/utils/assertJestCircus27.test.js +0 -1
  80. package/src/DetoxWorker.js +105 -62
  81. package/src/android/core/NativeElement.js +56 -20
  82. package/src/android/core/NativeExpect.js +28 -9
  83. package/src/android/interactions/native.js +25 -18
  84. package/src/artifacts/ArtifactsManager.js +14 -47
  85. package/src/artifacts/instruments/ios/SimulatorInstrumentsRecording.js +3 -3
  86. package/src/artifacts/log/ios/SimulatorLogRecording.js +1 -1
  87. package/src/artifacts/screenshot/SimulatorScreenshotPlugin.js +1 -1
  88. package/src/artifacts/templates/artifact/Artifact.js +1 -1
  89. package/src/artifacts/templates/plugin/ArtifactPlugin.js +1 -1
  90. package/src/artifacts/timeline/TimelineContextTypes.js +7 -0
  91. package/src/artifacts/utils/temporaryPath.js +49 -8
  92. package/src/artifacts/video/SimulatorRecordVideoPlugin.js +1 -1
  93. package/src/client/AsyncWebSocket.js +8 -17
  94. package/src/client/Client.js +19 -2
  95. package/src/client/actions/formatters/sync-resources/NetworkFormatter.js +1 -1
  96. package/src/configuration/collectCliConfig.js +1 -12
  97. package/src/configuration/composeAppsConfig.js +4 -0
  98. package/src/configuration/composeDeviceConfig.js +1 -1
  99. package/src/configuration/composeLoggerConfig.js +19 -10
  100. package/src/configuration/composeRunnerConfig.js +61 -9
  101. package/src/configuration/index.js +14 -9
  102. package/src/configuration/loadExternalConfig.js +1 -1
  103. package/src/devices/allocation/DeviceAllocator.js +3 -2
  104. package/src/devices/allocation/drivers/android/emulator/AVDValidator.js +5 -5
  105. package/src/devices/allocation/drivers/android/emulator/EmulatorAllocDriver.js +4 -3
  106. package/src/devices/allocation/drivers/android/emulator/EmulatorAllocationHelper.js +1 -1
  107. package/src/devices/allocation/drivers/android/emulator/EmulatorLauncher.js +3 -2
  108. package/src/devices/allocation/drivers/android/emulator/EmulatorVersionResolver.js +4 -6
  109. package/src/devices/allocation/drivers/android/emulator/launchEmulatorProcess.js +1 -1
  110. package/src/devices/allocation/drivers/android/genycloud/GenyInstanceAllocationHelper.js +1 -1
  111. package/src/devices/common/drivers/android/genycloud/services/GenyInstanceNaming.js +3 -3
  112. package/src/devices/common/drivers/android/genycloud/services/GenyRecipesService.js +1 -1
  113. package/src/devices/common/drivers/android/tools/EmulatorTelnet.js +1 -1
  114. package/src/devices/common/drivers/android/tools/FreeDeviceFinder.js +1 -1
  115. package/src/devices/common/drivers/android/tools/MonitoredInstrumentation.js +1 -1
  116. package/src/devices/common/drivers/ios/tools/AppleSimUtils.js +29 -3
  117. package/src/devices/lifecycle/GenyGlobalLifecycleHandler.js +13 -15
  118. package/src/devices/runtime/RuntimeDevice.js +19 -12
  119. package/src/devices/runtime/drivers/DeviceDriverBase.js +1 -1
  120. package/src/devices/runtime/drivers/android/AndroidDriver.js +10 -2
  121. package/src/devices/runtime/drivers/ios/SimulatorDriver.js +1 -1
  122. package/src/errors/DetoxConfigErrorComposer.js +17 -2
  123. package/src/errors/DetoxError.js +5 -1
  124. package/src/ios/expectTwo.js +153 -67
  125. package/src/ipc/IPCClient.js +12 -13
  126. package/src/ipc/IPCServer.js +28 -24
  127. package/src/ipc/{state.js → SessionState.js} +26 -53
  128. package/src/logger/DetoxLogger.js +287 -154
  129. package/src/logger/index.js +5 -0
  130. package/src/logger/utils/BunyanLogger.js +115 -0
  131. package/src/logger/utils/CategoryThreadDispatcher.js +37 -0
  132. package/src/logger/utils/DetoxLogFinalizer.js +162 -0
  133. package/src/logger/utils/MessageStack.js +35 -0
  134. package/src/logger/utils/ThreadDispatcher.js +61 -0
  135. package/src/logger/{customConsoleLogger.js → utils/customConsoleLogger.js} +23 -6
  136. package/src/logger/utils/getMainCategory.js +5 -0
  137. package/src/logger/utils/sanitizeBunyanContext.js +30 -0
  138. package/src/logger/utils/streams/BunyanTransformer.js +72 -0
  139. package/src/logger/utils/streams/ChromeTraceTransformer.js +127 -0
  140. package/src/logger/utils/streams/DetoxJSONLParser.js +31 -0
  141. package/src/logger/utils/streams/JSONLStringer.js +55 -0
  142. package/src/logger/utils/streams/index.js +7 -0
  143. package/src/logger/utils/streams/transformers.js +39 -0
  144. package/src/logger/utils/tracerLegacy.js +37 -0
  145. package/src/realms/DetoxContext.js +79 -65
  146. package/src/realms/DetoxInternalsFacade.js +8 -12
  147. package/src/realms/DetoxPrimaryContext.js +111 -72
  148. package/src/realms/DetoxSecondaryContext.js +29 -32
  149. package/src/server/DetoxConnection.js +18 -23
  150. package/src/server/DetoxServer.js +7 -10
  151. package/src/server/DetoxSession.js +6 -6
  152. package/src/server/DetoxSessionManager.js +1 -1
  153. package/src/server/handlers/RegisteredConnectionHandler.js +1 -2
  154. package/src/symbols.js +16 -22
  155. package/src/utils/Timer.js +55 -38
  156. package/src/utils/argparse.js +11 -0
  157. package/src/utils/childProcess/exec.js +1 -1
  158. package/src/utils/childProcess/spawn.js +1 -1
  159. package/src/utils/errorUtils.js +24 -3
  160. package/src/utils/invocationTraceDescriptions.js +43 -0
  161. package/src/utils/logger.js +1 -1
  162. package/src/utils/pathUtils.js +11 -0
  163. package/src/utils/shellUtils.js +17 -0
  164. package/src/utils/traceInvocationCall.js +21 -0
  165. package/src/utils/traceMethods.js +15 -0
  166. package/Detox-android/com/wix/detox/20.0.2-breaking.new-global-lifecycle.0/detox-20.0.2-breaking.new-global-lifecycle.0-javadoc.jar.md5 +0 -1
  167. package/Detox-android/com/wix/detox/20.0.2-breaking.new-global-lifecycle.0/detox-20.0.2-breaking.new-global-lifecycle.0-javadoc.jar.sha1 +0 -1
  168. package/Detox-android/com/wix/detox/20.0.2-breaking.new-global-lifecycle.0/detox-20.0.2-breaking.new-global-lifecycle.0-javadoc.jar.sha256 +0 -1
  169. package/Detox-android/com/wix/detox/20.0.2-breaking.new-global-lifecycle.0/detox-20.0.2-breaking.new-global-lifecycle.0-javadoc.jar.sha512 +0 -1
  170. package/Detox-android/com/wix/detox/20.0.2-breaking.new-global-lifecycle.0/detox-20.0.2-breaking.new-global-lifecycle.0-sources.jar.md5 +0 -1
  171. package/Detox-android/com/wix/detox/20.0.2-breaking.new-global-lifecycle.0/detox-20.0.2-breaking.new-global-lifecycle.0-sources.jar.sha1 +0 -1
  172. package/Detox-android/com/wix/detox/20.0.2-breaking.new-global-lifecycle.0/detox-20.0.2-breaking.new-global-lifecycle.0-sources.jar.sha256 +0 -1
  173. package/Detox-android/com/wix/detox/20.0.2-breaking.new-global-lifecycle.0/detox-20.0.2-breaking.new-global-lifecycle.0-sources.jar.sha512 +0 -1
  174. package/Detox-android/com/wix/detox/20.0.2-breaking.new-global-lifecycle.0/detox-20.0.2-breaking.new-global-lifecycle.0.aar +0 -0
  175. package/Detox-android/com/wix/detox/20.0.2-breaking.new-global-lifecycle.0/detox-20.0.2-breaking.new-global-lifecycle.0.aar.md5 +0 -1
  176. package/Detox-android/com/wix/detox/20.0.2-breaking.new-global-lifecycle.0/detox-20.0.2-breaking.new-global-lifecycle.0.aar.sha1 +0 -1
  177. package/Detox-android/com/wix/detox/20.0.2-breaking.new-global-lifecycle.0/detox-20.0.2-breaking.new-global-lifecycle.0.aar.sha256 +0 -1
  178. package/Detox-android/com/wix/detox/20.0.2-breaking.new-global-lifecycle.0/detox-20.0.2-breaking.new-global-lifecycle.0.aar.sha512 +0 -1
  179. package/Detox-android/com/wix/detox/20.0.2-breaking.new-global-lifecycle.0/detox-20.0.2-breaking.new-global-lifecycle.0.pom.md5 +0 -1
  180. package/Detox-android/com/wix/detox/20.0.2-breaking.new-global-lifecycle.0/detox-20.0.2-breaking.new-global-lifecycle.0.pom.sha1 +0 -1
  181. package/Detox-android/com/wix/detox/20.0.2-breaking.new-global-lifecycle.0/detox-20.0.2-breaking.new-global-lifecycle.0.pom.sha256 +0 -1
  182. package/Detox-android/com/wix/detox/20.0.2-breaking.new-global-lifecycle.0/detox-20.0.2-breaking.new-global-lifecycle.0.pom.sha512 +0 -1
  183. package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/timers/DefaultIdleInterrogationStrategy.kt +0 -84
  184. package/android/detox/src/testFull/java/com/wix/detox/reactnative/idlingresources/timers/DefaultIdleInterrogationStrategySpec.kt +0 -115
  185. package/runners/jest/deprecation.js +0 -25
  186. package/src/configuration/utils/warnings.js +0 -12
  187. package/src/logger/DetoxTraceEventBuilder.js +0 -21
  188. package/src/logger/DetoxTracer.js +0 -133
  189. package/src/logger/TraceThreadDispatcher.js +0 -52
  190. package/src/utils/ChromeTracingExporter.js +0 -54
  191. package/src/utils/streamUtils.js +0 -214
  192. package/src/utils/trace.js +0 -19
@@ -0,0 +1,115 @@
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
+ async closeFileStreams() {
76
+ const { _closeStream } = BunyanLogger;
77
+ const internalBunyanStreams = this._bunyan['streams'];
78
+ const openFileStreams = _.filter(internalBunyanStreams, this._isOpenFileStream);
79
+ _.remove(internalBunyanStreams, openFileStreams);
80
+
81
+ await Promise.all(openFileStreams.map(_closeStream));
82
+ }
83
+
84
+ /** @private */
85
+ _isOpenFileStream = (bunyanStream) => {
86
+ switch (bunyanStream.type) {
87
+ case 'file':
88
+ return bunyanStream.path && !bunyanStream.stream.destroyed;
89
+ case 'raw':
90
+ /* istanbul ignore next */
91
+ const stream = bunyanStream.stream === this._debugStream.stream
92
+ ? bunyanStream.stream._out
93
+ : bunyanStream.stream;
94
+
95
+ /* istanbul ignore next */
96
+ return stream.fd !== undefined && !stream.closed;
97
+ }
98
+ };
99
+
100
+ /** @private */
101
+ static _closeStream(bunyanStream) {
102
+ return new Promise((resolve, reject) => {
103
+ bunyanStream.stream.end((err) => {
104
+ /* istanbul ignore next */
105
+ if (err) {
106
+ reject(err);
107
+ } else {
108
+ resolve();
109
+ }
110
+ });
111
+ });
112
+ }
113
+ }
114
+
115
+ module.exports = BunyanLogger;
@@ -0,0 +1,37 @@
1
+ const ThreadDispatcher = require('./ThreadDispatcher');
2
+ const getMainCategory = require('./getMainCategory');
3
+
4
+ class CategoryThreadDispatcher {
5
+ constructor() {
6
+ /** @type {Record<string, ThreadDispatcher>} */
7
+ this._dispatchers = {};
8
+ }
9
+
10
+ /**
11
+ * @param {'B' | 'E' | 'i'} ph
12
+ * @param {string[] | undefined} cat
13
+ * @param {string | number} id
14
+ * @returns {number}
15
+ */
16
+ resolve(ph, cat, id) {
17
+ const dispatcher = this._resolveDispatcher(cat);
18
+
19
+ switch (ph) {
20
+ case 'B': return dispatcher.begin(id);
21
+ case 'E': return dispatcher.end(id);
22
+ default: return dispatcher.resolve(id);
23
+ }
24
+ }
25
+
26
+ /** @returns {ThreadDispatcher} */
27
+ _resolveDispatcher(cat) {
28
+ const mainCategory = getMainCategory(cat);
29
+ if (!this._dispatchers[mainCategory]) {
30
+ this._dispatchers[mainCategory] = new ThreadDispatcher(mainCategory);
31
+ }
32
+
33
+ return this._dispatchers[mainCategory];
34
+ }
35
+ }
36
+
37
+ module.exports = CategoryThreadDispatcher;
@@ -0,0 +1,162 @@
1
+ const path = require('path');
2
+
3
+ const fs = require('fs-extra');
4
+
5
+ const temporary = require('../../artifacts/utils/temporaryPath');
6
+
7
+ const { BunyanTransformer, ChromeTraceTransformer } = require('./streams');
8
+
9
+ /**
10
+ * @typedef DetoxLogFinalizerConfig
11
+ * @property {import('../../ipc/SessionState')} session
12
+ * @property {import('../DetoxLogger')} logger
13
+ */
14
+
15
+ class DetoxLogFinalizer {
16
+ /** @param {DetoxLogFinalizerConfig} config */
17
+ constructor(config) {
18
+ this._session = config.session;
19
+ this._bunyanTransformer = new BunyanTransformer(
20
+ config.logger.child({ cat: 'logger' }),
21
+ );
22
+ this._chromeTransformer = new ChromeTraceTransformer();
23
+ }
24
+
25
+ createEventStream() {
26
+ const sessionId = this._session.id;
27
+ const logs = temporary.find.jsonl.sync(`${sessionId}.*`);
28
+
29
+ const toChromeTrace = this._chromeTransformer.createStream();
30
+ return this._bunyanTransformer.uniteSessionLogs(logs).pipe(toChromeTrace);
31
+ }
32
+
33
+ async finalize() {
34
+ const sessionId = this._session.id;
35
+ const logs = await temporary.find.jsonl.async(`${sessionId}.*`);
36
+ if (logs.length === 0) {
37
+ return;
38
+ }
39
+
40
+ if (this._areLogsEnabled()) {
41
+ const rootDir = this._config.artifacts.rootDir;
42
+
43
+ await fs.mkdirp(rootDir);
44
+
45
+ const firstPass = this._bunyanTransformer.uniteSessionLogs(logs);
46
+ await this._chromeTransformer.scanThreadIDs(firstPass);
47
+
48
+ const secondPass = this._bunyanTransformer.uniteSessionLogs(logs);
49
+ const outStreams = [this._createPlainFileStream(), this._createChromeTraceStream()];
50
+
51
+ await Promise.all(outStreams.map(stream => {
52
+ return new Promise((resolve, reject) => {
53
+ stream.target
54
+ .on('finish', resolve)
55
+ .on('error', reject);
56
+
57
+ secondPass.pipe(stream.writable);
58
+ });
59
+ }));
60
+ }
61
+
62
+ await Promise.all(logs.map(filepath => fs.remove(filepath)));
63
+ }
64
+
65
+ finalizeSync() {
66
+ const sessionId = this._session.id;
67
+ const logs = temporary.find.jsonl.sync(`${sessionId}.*`);
68
+ if (logs.length === 0) {
69
+ return;
70
+ }
71
+
72
+ const logsEnabled = this._areLogsEnabled();
73
+ const rootDir = logsEnabled ? this._config.artifacts.rootDir : '';
74
+ if (logsEnabled) {
75
+ fs.mkdirpSync(rootDir);
76
+ }
77
+
78
+ for (const log of logs) {
79
+ if (logsEnabled) {
80
+ const dest = path.join(rootDir, path.basename(log));
81
+ this._safeMoveSync(log, dest);
82
+ } else {
83
+ this._safeRemoveSync(log);
84
+ }
85
+ }
86
+ }
87
+
88
+ _createPlainFileStream() {
89
+ const rootDir = this._config.artifacts.rootDir;
90
+ const bunyanOptions = this._config.logger.options;
91
+ const transformer = this._bunyanTransformer.createPlainTransformer(bunyanOptions);
92
+ const fileStream = fs.createWriteStream(path.join(rootDir, 'detox.log'));
93
+ transformer.readable.pipe(fileStream);
94
+
95
+ return { writable: transformer.writable, target: fileStream };
96
+ }
97
+
98
+ _createChromeTraceStream() {
99
+ const rootDir = this._config.artifacts.rootDir;
100
+ const transformer = this._chromeTransformer.createSerializedStream();
101
+ const fileStream = fs.createWriteStream(path.join(rootDir, 'detox.trace.json'));
102
+ transformer.readable.pipe(fileStream);
103
+
104
+ return { writable: transformer.writable, target: fileStream };
105
+ }
106
+
107
+ /* istanbul ignore next */
108
+ _safeMoveSync(src, dest) {
109
+ // Using console.* instead of logger.* because this is the end of the execution,
110
+ // and the logger is already closed.
111
+
112
+ try {
113
+ fs.moveSync(src, dest);
114
+ } catch (moveError) {
115
+ console.warn(`Failed to move a log file from: ${src}.\nReason: ${moveError.message}`);
116
+ try {
117
+ fs.copySync(src, dest);
118
+ } catch (copyError) {
119
+ console.warn(`Attempt to copy the file also failed.\nReason: ${copyError.message}`);
120
+ }
121
+ }
122
+ }
123
+
124
+ /* istanbul ignore next */
125
+ _safeRemoveSync(filepath) {
126
+ try {
127
+ fs.removeSync(filepath);
128
+ } catch (removeError) {
129
+ console.warn(`Failed to remove a log file at: ${filepath}.\nReason: ${removeError.message}`);
130
+ }
131
+ }
132
+
133
+ /** @private */
134
+ get _config() {
135
+ // The config appears later in the lifecycle, so we need to access it lazily
136
+ return this._session.detoxConfig;
137
+ }
138
+
139
+ /** @private */
140
+ _areLogsEnabled() {
141
+ if (!this._config) {
142
+ return false;
143
+ }
144
+
145
+ const { rootDir, plugins } = this._config.artifacts;
146
+ if (!rootDir || !plugins) {
147
+ return false;
148
+ }
149
+
150
+ if (!plugins.log.enabled) {
151
+ return false;
152
+ }
153
+
154
+ if (!plugins.log.keepOnlyFailedTestsArtifacts) {
155
+ return true;
156
+ }
157
+
158
+ return this._session.testResults.some(r => !r.success);
159
+ }
160
+ }
161
+
162
+ module.exports = DetoxLogFinalizer;
@@ -0,0 +1,35 @@
1
+ const getMainCategory = require('./getMainCategory');
2
+
3
+ class MessageStack {
4
+ constructor() {
5
+ this._map = {};
6
+ }
7
+
8
+ push(context, msg) {
9
+ const hash = this._hash(context);
10
+
11
+ if (this._map[hash] == null) {
12
+ this._map[hash] = [];
13
+ }
14
+
15
+ return this._map[hash].push(msg);
16
+ }
17
+
18
+ pop(context) {
19
+ const hash = this._hash(context);
20
+ const stack = this._map[hash];
21
+ if (stack == null || stack.length === 0) {
22
+ return ['<no begin message>'];
23
+ }
24
+
25
+ return stack.pop();
26
+ }
27
+
28
+ _hash(context) {
29
+ const cat = getMainCategory(context.cat);
30
+ const tid = context.tid;
31
+ return `${cat}:${tid}`;
32
+ }
33
+ }
34
+
35
+ 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
  }
@@ -47,19 +47,36 @@ function overrideConsoleMethods(console, bunyanLogger) {
47
47
  if (!console.__detox_log__) {
48
48
  const log = bunyanLogger;
49
49
 
50
+ console.__detox_log__ = {
51
+ log: console.log,
52
+ info: console.info,
53
+ warn: console.warn,
54
+ trace: console.trace,
55
+ error: console.error,
56
+ debug: console.debug,
57
+ assert: console.assert,
58
+ };
59
+
50
60
  override(console, 'log', log.info.bind(log));
61
+ override(console, 'info', log.info.bind(log));
51
62
  override(console, 'warn', log.warn.bind(log));
52
63
  override(console, 'trace', log.info.bind(log));
53
64
  override(console, 'error', log.error.bind(log));
54
65
  override(console, 'debug', log.debug.bind(log));
55
66
  override(console, 'assert', log.error.bind(log));
56
-
57
- console.__detox_log__ = log;
58
67
  }
59
68
 
60
69
  return console;
61
70
  }
62
71
 
72
+ function restoreConsoleMethods(console) {
73
+ if (console.__detox_log__) {
74
+ Object.assign(console, console.__detox_log__);
75
+ delete console.__detox_log__;
76
+ }
77
+ }
78
+
63
79
  module.exports = {
64
80
  overrideConsoleMethods,
81
+ restoreConsoleMethods,
65
82
  };
@@ -0,0 +1,5 @@
1
+ function getMainCategory(category) {
2
+ return category ? String(category).split(',', 1)[0] : 'undefined';
3
+ }
4
+
5
+ module.exports = getMainCategory;
@@ -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;
@@ -0,0 +1,72 @@
1
+ const fs = require('fs');
2
+ const { PassThrough } = require('stream');
3
+
4
+ const bunyanDebugStream = require('bunyan-debug-stream');
5
+ const multiSort = require('multi-sort-stream');
6
+ const pipe = require('multipipe');
7
+ const stripAnsi = require('strip-ansi');
8
+
9
+ const DetoxJSONLParser = require('./DetoxJSONLParser');
10
+ const { mapTransform, through } = require('./transformers');
11
+
12
+ class BunyanTransformer {
13
+ /**
14
+ * @param {Detox.Logger} log
15
+ */
16
+ constructor(log) {
17
+ this._jsonlParser = new DetoxJSONLParser(log);
18
+ }
19
+
20
+ /**
21
+ * @param {string[]} logFilePaths
22
+ */
23
+ uniteSessionLogs(logFilePaths) {
24
+ const intermediate = mapTransform(BunyanTransformer.normalizeBunyanRecord);
25
+ const reemitError = (err) => intermediate.emit('error', err);
26
+
27
+ const jsonlStreams = logFilePaths.map(filePath => {
28
+ const { readable, writable } = this._jsonlParser.createTransformer();
29
+ fs.createReadStream(filePath)
30
+ .on('error', reemitError)
31
+ .pipe(writable);
32
+
33
+ return readable;
34
+ });
35
+
36
+ const multisorted = multiSort(jsonlStreams, BunyanTransformer.compareTimestamps);
37
+ return pipe(multisorted, intermediate, through());
38
+ }
39
+
40
+ createPlainTransformer(bunyanOptions) {
41
+ /** @type {*} */
42
+ const readable = new PassThrough({ encoding: 'utf8', objectMode: false });
43
+ const writable = bunyanDebugStream.default({
44
+ ...bunyanOptions,
45
+
46
+ colors: false,
47
+ out: readable,
48
+ });
49
+
50
+ writable.on('error', /* istanbul ignore next */ (err) => readable.emit('error', err));
51
+ writable.on('finish', () => readable.end());
52
+
53
+ return {
54
+ writable,
55
+ readable,
56
+ };
57
+ }
58
+
59
+ static normalizeBunyanRecord(record) {
60
+ const value = record.value;
61
+ value.msg = stripAnsi(value.msg);
62
+ value.time = new Date(value.time);
63
+
64
+ return value;
65
+ }
66
+
67
+ static compareTimestamps(a, b) {
68
+ return +(a.value.time > b.value.time) - +(a.value.time < b.value.time);
69
+ }
70
+ }
71
+
72
+ module.exports = BunyanTransformer;