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

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.3-breaking.new-global-lifecycle.0/detox-20.0.3-breaking.new-global-lifecycle.0-javadoc.jar → 20.0.3/detox-20.0.3-javadoc.jar} +0 -0
  2. package/Detox-android/com/wix/detox/20.0.3/detox-20.0.3-javadoc.jar.md5 +1 -0
  3. package/Detox-android/com/wix/detox/20.0.3/detox-20.0.3-javadoc.jar.sha1 +1 -0
  4. package/Detox-android/com/wix/detox/20.0.3/detox-20.0.3-javadoc.jar.sha256 +1 -0
  5. package/Detox-android/com/wix/detox/20.0.3/detox-20.0.3-javadoc.jar.sha512 +1 -0
  6. package/Detox-android/com/wix/detox/{20.0.3-breaking.new-global-lifecycle.0/detox-20.0.3-breaking.new-global-lifecycle.0-sources.jar → 20.0.3/detox-20.0.3-sources.jar} +0 -0
  7. package/Detox-android/com/wix/detox/20.0.3/detox-20.0.3-sources.jar.md5 +1 -0
  8. package/Detox-android/com/wix/detox/20.0.3/detox-20.0.3-sources.jar.sha1 +1 -0
  9. package/Detox-android/com/wix/detox/20.0.3/detox-20.0.3-sources.jar.sha256 +1 -0
  10. package/Detox-android/com/wix/detox/20.0.3/detox-20.0.3-sources.jar.sha512 +1 -0
  11. package/Detox-android/com/wix/detox/20.0.3/detox-20.0.3.aar +0 -0
  12. package/Detox-android/com/wix/detox/20.0.3/detox-20.0.3.aar.md5 +1 -0
  13. package/Detox-android/com/wix/detox/20.0.3/detox-20.0.3.aar.sha1 +1 -0
  14. package/Detox-android/com/wix/detox/20.0.3/detox-20.0.3.aar.sha256 +1 -0
  15. package/Detox-android/com/wix/detox/20.0.3/detox-20.0.3.aar.sha512 +1 -0
  16. package/Detox-android/com/wix/detox/{20.0.3-breaking.new-global-lifecycle.0/detox-20.0.3-breaking.new-global-lifecycle.0.pom → 20.0.3/detox-20.0.3.pom} +1 -7
  17. package/Detox-android/com/wix/detox/20.0.3/detox-20.0.3.pom.md5 +1 -0
  18. package/Detox-android/com/wix/detox/20.0.3/detox-20.0.3.pom.sha1 +1 -0
  19. package/Detox-android/com/wix/detox/20.0.3/detox-20.0.3.pom.sha256 +1 -0
  20. package/Detox-android/com/wix/detox/20.0.3/detox-20.0.3.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 +205 -43
  49. package/local-cli/build.js +1 -1
  50. package/local-cli/cli.js +11 -6
  51. package/local-cli/init.js +61 -21
  52. package/local-cli/rebuild-framework-cache.js +1 -1
  53. package/local-cli/reset-lock-file.js +16 -0
  54. package/local-cli/templates/jest.js +13 -10
  55. package/local-cli/test.js +14 -8
  56. package/local-cli/test.test.js +142 -61
  57. package/local-cli/testCommand/TestRunnerCommand.js +97 -77
  58. package/local-cli/testCommand/TestRunnerError.js +17 -0
  59. package/local-cli/testCommand/TestRunnerError.test.js +25 -0
  60. package/local-cli/testCommand/builder.js +0 -1
  61. package/local-cli/testCommand/middlewares.js +4 -13
  62. package/local-cli/testCommand/warnings.js +0 -3
  63. package/local-cli/utils/jestInternals.js +4 -1
  64. package/package.json +23 -18
  65. package/runners/deprecation.js +42 -44
  66. package/runners/jest/globalSetup.js +1 -1
  67. package/runners/jest/globalTeardown.js +1 -1
  68. package/runners/jest/index.d.ts +60 -0
  69. package/runners/jest/index.js +3 -8
  70. package/runners/jest/index.test.js +13 -0
  71. package/runners/jest/reporters/DetoxReporter.js +33 -2
  72. package/runners/jest/testEnvironment/index.js +119 -69
  73. package/runners/jest/testEnvironment/listeners/DetoxCoreListener.js +93 -46
  74. package/runners/jest/testEnvironment/listeners/DetoxPlatformFilterListener.js +1 -1
  75. package/runners/jest/testEnvironment/listeners/SpecReporter.js +13 -15
  76. package/runners/jest/testEnvironment/listeners/WorkerAssignReporter.js +1 -5
  77. package/runners/jest/testEnvironment/utils/assertJestCircus27.js +17 -3
  78. package/runners/jest/testEnvironment/utils/assertJestCircus27.test.js +0 -1
  79. package/src/DetoxWorker.js +99 -62
  80. package/src/android/core/NativeElement.js +56 -20
  81. package/src/android/core/NativeExpect.js +28 -9
  82. package/src/android/interactions/native.js +25 -18
  83. package/src/artifacts/ArtifactsManager.js +14 -47
  84. package/src/artifacts/instruments/ios/SimulatorInstrumentsRecording.js +3 -3
  85. package/src/artifacts/log/ios/SimulatorLogRecording.js +1 -1
  86. package/src/artifacts/screenshot/SimulatorScreenshotPlugin.js +1 -1
  87. package/src/artifacts/templates/artifact/Artifact.js +1 -1
  88. package/src/artifacts/templates/plugin/ArtifactPlugin.js +1 -1
  89. package/src/artifacts/timeline/TimelineContextTypes.js +7 -0
  90. package/src/artifacts/utils/temporaryPath.js +49 -8
  91. package/src/artifacts/video/SimulatorRecordVideoPlugin.js +1 -1
  92. package/src/client/AsyncWebSocket.js +8 -17
  93. package/src/client/Client.js +19 -2
  94. package/src/client/actions/formatters/sync-resources/NetworkFormatter.js +1 -1
  95. package/src/configuration/collectCliConfig.js +1 -12
  96. package/src/configuration/composeAppsConfig.js +4 -0
  97. package/src/configuration/composeDeviceConfig.js +1 -1
  98. package/src/configuration/composeLoggerConfig.js +19 -10
  99. package/src/configuration/composeRunnerConfig.js +14 -9
  100. package/src/configuration/index.js +5 -1
  101. package/src/configuration/loadExternalConfig.js +1 -1
  102. package/src/devices/allocation/DeviceAllocator.js +3 -2
  103. package/src/devices/allocation/drivers/android/emulator/AVDValidator.js +5 -5
  104. package/src/devices/allocation/drivers/android/emulator/EmulatorAllocDriver.js +4 -3
  105. package/src/devices/allocation/drivers/android/emulator/EmulatorAllocationHelper.js +1 -1
  106. package/src/devices/allocation/drivers/android/emulator/EmulatorLauncher.js +6 -5
  107. package/src/devices/allocation/drivers/android/emulator/EmulatorVersionResolver.js +4 -6
  108. package/src/devices/allocation/drivers/android/emulator/launchEmulatorProcess.js +4 -17
  109. package/src/devices/allocation/drivers/android/genycloud/GenyInstanceAllocationHelper.js +1 -1
  110. package/src/devices/common/drivers/android/exec/ADB.js +4 -0
  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 +14 -1
  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 +104 -70
  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.3-breaking.new-global-lifecycle.0/detox-20.0.3-breaking.new-global-lifecycle.0-javadoc.jar.md5 +0 -1
  167. package/Detox-android/com/wix/detox/20.0.3-breaking.new-global-lifecycle.0/detox-20.0.3-breaking.new-global-lifecycle.0-javadoc.jar.sha1 +0 -1
  168. package/Detox-android/com/wix/detox/20.0.3-breaking.new-global-lifecycle.0/detox-20.0.3-breaking.new-global-lifecycle.0-javadoc.jar.sha256 +0 -1
  169. package/Detox-android/com/wix/detox/20.0.3-breaking.new-global-lifecycle.0/detox-20.0.3-breaking.new-global-lifecycle.0-javadoc.jar.sha512 +0 -1
  170. package/Detox-android/com/wix/detox/20.0.3-breaking.new-global-lifecycle.0/detox-20.0.3-breaking.new-global-lifecycle.0-sources.jar.md5 +0 -1
  171. package/Detox-android/com/wix/detox/20.0.3-breaking.new-global-lifecycle.0/detox-20.0.3-breaking.new-global-lifecycle.0-sources.jar.sha1 +0 -1
  172. package/Detox-android/com/wix/detox/20.0.3-breaking.new-global-lifecycle.0/detox-20.0.3-breaking.new-global-lifecycle.0-sources.jar.sha256 +0 -1
  173. package/Detox-android/com/wix/detox/20.0.3-breaking.new-global-lifecycle.0/detox-20.0.3-breaking.new-global-lifecycle.0-sources.jar.sha512 +0 -1
  174. package/Detox-android/com/wix/detox/20.0.3-breaking.new-global-lifecycle.0/detox-20.0.3-breaking.new-global-lifecycle.0.aar +0 -0
  175. package/Detox-android/com/wix/detox/20.0.3-breaking.new-global-lifecycle.0/detox-20.0.3-breaking.new-global-lifecycle.0.aar.md5 +0 -1
  176. package/Detox-android/com/wix/detox/20.0.3-breaking.new-global-lifecycle.0/detox-20.0.3-breaking.new-global-lifecycle.0.aar.sha1 +0 -1
  177. package/Detox-android/com/wix/detox/20.0.3-breaking.new-global-lifecycle.0/detox-20.0.3-breaking.new-global-lifecycle.0.aar.sha256 +0 -1
  178. package/Detox-android/com/wix/detox/20.0.3-breaking.new-global-lifecycle.0/detox-20.0.3-breaking.new-global-lifecycle.0.aar.sha512 +0 -1
  179. package/Detox-android/com/wix/detox/20.0.3-breaking.new-global-lifecycle.0/detox-20.0.3-breaking.new-global-lifecycle.0.pom.md5 +0 -1
  180. package/Detox-android/com/wix/detox/20.0.3-breaking.new-global-lifecycle.0/detox-20.0.3-breaking.new-global-lifecycle.0.pom.sha1 +0 -1
  181. package/Detox-android/com/wix/detox/20.0.3-breaking.new-global-lifecycle.0/detox-20.0.3-breaking.new-global-lifecycle.0.pom.sha256 +0 -1
  182. package/Detox-android/com/wix/detox/20.0.3-breaking.new-global-lifecycle.0/detox-20.0.3-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,127 @@
1
+ const { AbstractEventBuilder } = require('trace-event-lib');
2
+
3
+ const getMainCategory = require('../getMainCategory');
4
+
5
+ const JSONLStringer = require('./JSONLStringer');
6
+ const { flatMapTransform } = require('./transformers');
7
+
8
+ class ChromeTraceTransformer {
9
+ constructor() {
10
+ /** @type {Map<string, number>} */
11
+ this._globalThreadMap = null;
12
+ }
13
+
14
+ /**
15
+ * @param {NodeJS.ReadableStream} eventStream
16
+ */
17
+ async scanThreadIDs(eventStream) {
18
+ const processes = await new Promise((resolve, reject) => {
19
+ const result = {};
20
+ eventStream
21
+ .on('end', () => resolve(result))
22
+ .on('error', /* istanbul ignore next */ (err) => reject(err))
23
+ .on('data', (event) => {
24
+ const { ph, pid, tid, cat } = event;
25
+ if (ph === 'B' || ph === 'i') {
26
+ const categories = (result[pid] = result[pid] || {});
27
+ const mainCategory = String(cat).split(',')[0];
28
+ const tids = (categories[mainCategory] = categories[mainCategory] || []);
29
+ if (!tids.includes(tid)) {
30
+ tids.push(tid);
31
+ }
32
+ }
33
+ });
34
+ });
35
+
36
+ const tidArray = Object.entries(processes).flatMap(([pid, categories]) => {
37
+ return Object.entries(categories).flatMap(([category, tids]) => {
38
+ return tids.map(tid => `${pid}:${category}:${tid}`);
39
+ });
40
+ });
41
+
42
+ this._globalThreadMap = new Map(tidArray.map((hash, index) => [hash, index]));
43
+ }
44
+
45
+ /**
46
+ * @returns {module:stream.internal.Transform}
47
+ */
48
+ createStream() {
49
+ const transformFn = this._transformBunyanRecord.bind(this, {
50
+ knownPids: new Set(),
51
+ knownTids: new Set(),
52
+ });
53
+
54
+ return flatMapTransform(transformFn);
55
+ }
56
+
57
+ createSerializedStream() {
58
+ const writable = this.createStream();
59
+ const readable = JSONLStringer.serializeJSON();
60
+ writable.pipe(readable);
61
+ return { writable, readable };
62
+ }
63
+
64
+ /**
65
+ * @param {{ knownPids: Set<number>, knownTids: Set<number> }} state
66
+ * @param {*} bunyanLogRecord
67
+ * @returns {import('trace-event-lib').Event[]}
68
+ * @private
69
+ */
70
+ _transformBunyanRecord(state, bunyanLogRecord) {
71
+ // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
72
+ const { cat: rawCat, msg: name, ph, pid, tid: _tid, time, name: _name, hostname: _hostname, ...args } = bunyanLogRecord;
73
+ const ts = new Date(time).getTime() * 1E3;
74
+ const cat = rawCat || 'undefined';
75
+ const tid = this._resolveGlobalTID(bunyanLogRecord);
76
+
77
+ const builder = new SimpleEventBuilder();
78
+ if (!state.knownPids.has(pid)) {
79
+ builder.metadata({ pid, ts, name: 'process_name', args: { name: pid === process.pid ? 'primary' : 'secondary' } });
80
+ builder.metadata({ pid, ts, name: 'process_sort_index', args: { sort_index: state.knownPids.size } });
81
+ state.knownPids.add(pid);
82
+ }
83
+
84
+ if (!state.knownTids.has(tid)) {
85
+ const mainCategory = getMainCategory(cat);
86
+ builder.metadata({ pid, tid, ts, name: 'thread_name', args: { name: mainCategory } });
87
+ builder.metadata({ pid, tid, ts, name: 'thread_sort_index', args: { sort_index: tid } });
88
+ state.knownTids.add(tid);
89
+ }
90
+
91
+ const event = { ph, name, pid, tid, cat, ts, args };
92
+ if (ph === 'E') {
93
+ delete event.name;
94
+ }
95
+
96
+ builder.events.push(event);
97
+ return builder.events;
98
+ }
99
+
100
+ _resolveGlobalTID(event) {
101
+ const hash = this._computeThreadHash(event);
102
+ const tid = this._globalThreadMap ? this._globalThreadMap.get(hash) : event.tid;
103
+
104
+ // Impossible condition, but anyway it is better to be safe than sorry.
105
+ /* istanbul ignore next */
106
+ return tid === undefined ? ChromeTraceTransformer.ERROR_TID : tid;
107
+ }
108
+
109
+ _computeThreadHash({ pid, tid, cat }) {
110
+ return `${pid}:${getMainCategory(cat)}:${tid}`;
111
+ }
112
+
113
+ /* istanbul ignore next */
114
+ static get ERROR_TID() {
115
+ return 37707;
116
+ }
117
+ }
118
+
119
+ class SimpleEventBuilder extends AbstractEventBuilder {
120
+ events = [];
121
+
122
+ send(event) {
123
+ this.events.push(event);
124
+ }
125
+ }
126
+
127
+ module.exports = ChromeTraceTransformer;
@@ -0,0 +1,31 @@
1
+ const JsonlParser = require('stream-json/jsonl/Parser');
2
+
3
+ const { through } = require('./transformers');
4
+
5
+ class DetoxJSONLParser {
6
+ constructor(log) {
7
+ this._log = log;
8
+ }
9
+
10
+ createTransformer() {
11
+ const log = this._log;
12
+ const readable = through();
13
+ const writable = JsonlParser.make({ checkErrors: true })
14
+ .on('error', (err) => {
15
+ /* istanbul ignore else */
16
+ if (err instanceof SyntaxError) {
17
+ log.debug({ err });
18
+ readable.end();
19
+ } else {
20
+ readable.emit('error', err);
21
+ }
22
+ });
23
+
24
+ return {
25
+ writable,
26
+ readable: writable.pipe(readable),
27
+ };
28
+ }
29
+ }
30
+
31
+ module.exports = DetoxJSONLParser;
@@ -0,0 +1,55 @@
1
+ const { Transform } = require('stream');
2
+
3
+ class JSONLStringer extends Transform {
4
+ constructor({ replacer, header, delimiter, footer }) {
5
+ super({ writableObjectMode: true, readableObjectMode: false });
6
+
7
+ this._replacer = replacer;
8
+ this._header = header;
9
+ this._delimiter = delimiter;
10
+ this._footer = footer;
11
+ }
12
+
13
+ _transform(chunk, _, callback) {
14
+ if (this._header) {
15
+ this.push(this._header);
16
+ }
17
+
18
+ this.push(JSON.stringify(chunk, this._replacer));
19
+ this._transform = this._nextTransform;
20
+ callback(null);
21
+ }
22
+
23
+ _nextTransform(chunk, _, callback) {
24
+ this.push(this._delimiter + JSON.stringify(chunk, this._replacer));
25
+ callback(null);
26
+ }
27
+
28
+ _flush(callback) {
29
+ if (this._footer) {
30
+ this.push(this._footer);
31
+ }
32
+
33
+ callback();
34
+ }
35
+
36
+ static serializeJSONL() {
37
+ return new JSONLStringer({
38
+ replacer: undefined,
39
+ header: '',
40
+ delimiter: '\n',
41
+ footer: '',
42
+ });
43
+ }
44
+
45
+ static serializeJSON() {
46
+ return new JSONLStringer({
47
+ replacer: undefined,
48
+ header: '[\n\t',
49
+ delimiter: ',\n\t',
50
+ footer: '\n]\n',
51
+ });
52
+ }
53
+ }
54
+
55
+ module.exports = JSONLStringer;
@@ -0,0 +1,7 @@
1
+ const BunyanTransformer = require('./BunyanTransformer');
2
+ const ChromeTraceTransformer = require('./ChromeTraceTransformer');
3
+
4
+ module.exports = {
5
+ BunyanTransformer,
6
+ ChromeTraceTransformer,
7
+ };
@@ -0,0 +1,39 @@
1
+ const { PassThrough, Transform } = require('stream');
2
+
3
+ function through() {
4
+ return new PassThrough({ objectMode: true });
5
+ }
6
+
7
+ function mapTransform(fn) {
8
+ return new Transform({
9
+ objectMode: true,
10
+ transform(chunk, encoding, callback){
11
+ this.push(fn(chunk));
12
+ callback();
13
+ },
14
+ });
15
+ }
16
+
17
+ function flatMapTransform(fn) {
18
+ let index = 0;
19
+
20
+ return new Transform({
21
+ objectMode: true,
22
+ transform(chunk, encoding, callback){
23
+ const results = fn(chunk, index++);
24
+ // eslint-disable-next-line unicorn/no-array-method-this-argument
25
+ results.forEach(pushThis, this);
26
+ callback();
27
+ },
28
+ });
29
+ }
30
+
31
+ function pushThis(x) {
32
+ return this.push(x);
33
+ }
34
+
35
+ module.exports = {
36
+ through,
37
+ mapTransform,
38
+ flatMapTransform,
39
+ };
@@ -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 };
@@ -1,48 +1,71 @@
1
1
  const funpermaproxy = require('funpermaproxy');
2
2
 
3
+ const temporary = require('../artifacts/utils/temporaryPath');
3
4
  const { DetoxRuntimeError } = require('../errors');
4
- const DetoxLogger = require('../logger/DetoxLogger');
5
- const DetoxTracer = require('../logger/DetoxTracer');
5
+ const { DetoxLogger, DetoxLogFinalizer, installLegacyTracerInterface } = require('../logger');
6
6
  const symbols = require('../symbols');
7
7
 
8
8
  const DetoxConstants = require('./DetoxConstants');
9
9
 
10
+ //#region Protected symbols
10
11
  const $cleanup = Symbol('cleanup');
11
- const $logger = Symbol('logger');
12
+ const $logFinalizer = Symbol('logFinalizer');
12
13
  const $restoreSessionState = Symbol('restoreSessionState');
13
14
  const $sessionState = Symbol('restoreSessionState');
14
- const $tracer = Symbol('tracer');
15
-
16
- const _worker = Symbol('worker');
15
+ const $status = Symbol('status');
16
+ const $worker = Symbol('worker');
17
+ //#endregion
17
18
 
18
19
  class DetoxContext {
19
20
  constructor() {
20
- this[symbols.globalSetup] = this[symbols.globalSetup].bind(this);
21
- this[symbols.globalTeardown] = this[symbols.globalTeardown].bind(this);
22
- this[symbols.reportFailedTests] = this[symbols.reportFailedTests].bind(this);
21
+ /** @type {DetoxInternals.DetoxStatus} */
22
+ this[$status] = 'inactive';
23
+
24
+ const _init = this[symbols.init].bind(this);
25
+ this[symbols.init] = async (opts) => {
26
+ this[$status] = 'init';
27
+ await _init(opts);
28
+ this[$status] = 'active';
29
+ };
30
+
31
+ const _cleanup = this[symbols.cleanup].bind(this);
32
+ this[symbols.cleanup] = async () => {
33
+ this[$status] = 'cleanup';
34
+ try {
35
+ await _cleanup();
36
+ } finally {
37
+ this[$status] = 'inactive';
38
+ }
39
+ };
40
+
41
+ this[symbols.getStatus] = this[symbols.getStatus].bind(this);
42
+ this[symbols.reportTestResults] = this[symbols.reportTestResults].bind(this);
23
43
  this[symbols.resolveConfig] = this[symbols.resolveConfig].bind(this);
24
- this[symbols.setup] = this[symbols.setup].bind(this);
25
- this[symbols.teardown] = this[symbols.teardown].bind(this);
44
+ this[symbols.installWorker] = this[symbols.installWorker].bind(this);
45
+ this[symbols.uninstallWorker] = this[symbols.uninstallWorker].bind(this);
26
46
 
27
47
  this[$sessionState] = this[$restoreSessionState]();
28
48
 
29
- const loggerConfig = this[$sessionState].detoxConfig
30
- ? this[$sessionState].detoxConfig.logger
31
- : undefined;
32
-
33
49
  /**
34
- * @protected
35
50
  * @type {DetoxLogger & Detox.Logger}
36
51
  */
37
- this[$logger] = new DetoxLogger(loggerConfig);
38
- /** @protected */
39
- this[$tracer] = DetoxTracer.default({
40
- logger: this[$logger],
52
+ this[symbols.logger] = new DetoxLogger({
53
+ file: temporary.for.jsonl(`${this[$sessionState].id}.${process.pid}`),
54
+ userConfig: this[$sessionState].detoxConfig
55
+ ? this[$sessionState].detoxConfig.logger
56
+ : null,
41
57
  });
42
- /** @deprecated */
43
- this.traceCall = this[$tracer].bind(this[$tracer]);
58
+
59
+ this.log = this[symbols.logger].child({ cat: 'user' });
60
+ installLegacyTracerInterface(this.log, this);
61
+
62
+ this[$logFinalizer] = new DetoxLogFinalizer({
63
+ session: this[$sessionState],
64
+ logger: this[symbols.logger],
65
+ });
66
+
44
67
  /** @type {import('../DetoxWorker') | null} */
45
- this[_worker] = null;
68
+ this[$worker] = null;
46
69
  }
47
70
 
48
71
  //#region Public members
@@ -62,91 +85,81 @@ class DetoxContext {
62
85
  return DetoxConstants;
63
86
  }
64
87
 
65
- /**
66
- * @returns {Detox.Logger}
67
- */
68
- get log() {
69
- return this[$logger];
70
- }
71
-
72
- /**
73
- * @returns {Detox.Tracer}
74
- */
75
- get trace() {
76
- return this[$tracer];
77
- }
78
88
  //#endregion
79
89
 
80
90
  //#region Internal members
81
- [symbols.onRunStart] = (...args) => this[symbols.worker].onRunStart(...args);
82
91
  [symbols.onRunDescribeStart] = (...args) => this[symbols.worker].onRunDescribeStart(...args);
83
92
  [symbols.onTestStart] = (...args) => this[symbols.worker].onTestStart(...args);
84
- [symbols.onHookStart] = (...args) => this[symbols.worker].onHookStart(...args);
85
93
  [symbols.onHookFailure] = (...args) => this[symbols.worker].onHookFailure(...args);
86
- [symbols.onHookSuccess] = (...args) => this[symbols.worker].onHookSuccess(...args);
87
- [symbols.onTestFnStart] = (...args) => this[symbols.worker].onTestFnStart(...args);
88
94
  [symbols.onTestFnFailure] = (...args) => this[symbols.worker].onTestFnFailure(...args);
89
- [symbols.onTestFnSuccess] = (...args) => this[symbols.worker].onTestFnSuccess(...args);
90
95
  [symbols.onTestDone] = (...args) => this[symbols.worker].onTestDone(...args);
91
96
  [symbols.onRunDescribeFinish] = (...args) => this[symbols.worker].onRunDescribeFinish(...args);
92
- [symbols.onRunFinish] = (...args) => this[symbols.worker].onRunFinish(...args);
93
97
  [symbols.config] = funpermaproxy(() => this[symbols.session].detoxConfig);
94
98
  [symbols.session] = funpermaproxy(() => this[$sessionState]);
99
+ [symbols.tracing] = Object.freeze({
100
+ createEventStream: () => this[$logFinalizer].createEventStream(),
101
+ });
95
102
  /** @abstract */
96
- [symbols.reportFailedTests](_testFilePaths, _permanent) {}
103
+ [symbols.reportTestResults](_testResults) {}
97
104
  /**
98
105
  * @abstract
99
- * @param {Partial<DetoxInternals.DetoxGlobalSetupOptions>} _opts
106
+ * @param {Partial<DetoxInternals.DetoxInitOptions>} _opts
100
107
  * @returns {Promise<DetoxInternals.RuntimeConfig>}
101
108
  */
102
109
  async [symbols.resolveConfig](_opts) { return null; }
103
110
 
111
+ [symbols.getStatus]() {
112
+ return this[$status];
113
+ }
114
+
104
115
  get [symbols.worker]() {
105
- if (!this[_worker]) {
116
+ if (!this[$worker]) {
106
117
  throw new DetoxRuntimeError({
107
- message: `Detox worker instance has not been initialized in this context (${this.constructor.name}).`,
108
- hint: DetoxRuntimeError.reportIssueIfJest + '\n' + 'Otherwise, make sure you call detox.setup() beforehand.',
118
+ message: `Detox worker instance has not been installed in this context (${this.constructor.name}).`,
119
+ hint: DetoxRuntimeError.reportIssueIfJest + '\n' + 'Otherwise, make sure you call detox.installWorker() beforehand.',
109
120
  });
110
121
  }
111
122
 
112
- return this[_worker];
123
+ return this[$worker];
113
124
  }
114
125
 
115
126
  /**
116
127
  * @abstract
117
- * @param {Partial<DetoxInternals.DetoxGlobalSetupOptions>} [_opts]
128
+ * @param {Partial<DetoxInternals.DetoxInitOptions>} [_opts]
118
129
  * @returns {Promise<void>}
119
130
  */
120
- async [symbols.globalSetup](_opts = {}) {}
131
+ async [symbols.init](_opts = {}) {}
121
132
 
122
133
  /**
123
- * @param {Partial<DetoxInternals.DetoxConfigurationSetupOptions>} [opts]
134
+ * @param {Partial<DetoxInternals.DetoxInstallWorkerOptions>} [opts]
124
135
  */
125
- async [symbols.setup](opts) {
126
- const theGlobal = opts.global || global;
127
- theGlobal['__detox__'] = this;
128
- this[$logger].overrideConsole(theGlobal);
136
+ async [symbols.installWorker](opts) {
137
+ if (opts.global) {
138
+ opts.global['__detox__'] = this;
139
+ this.log.overrideConsole(opts.global);
140
+ }
129
141
 
130
142
  const DetoxWorker = require('../DetoxWorker');
131
- DetoxWorker.global = theGlobal;
132
- this[_worker] = new DetoxWorker(this);
133
- await this[_worker].init();
143
+ DetoxWorker.global = opts.global || global;
144
+ this[$worker] = new DetoxWorker(this);
145
+ this[$worker].id = opts.workerId;
146
+ await this[$worker].init();
134
147
  }
135
148
 
136
- async [symbols.teardown]() {
149
+ async [symbols.uninstallWorker]() {
137
150
  try {
138
- if (this[_worker]) {
139
- await this[_worker].cleanup();
151
+ if (this[$worker]) {
152
+ await this[$worker].cleanup();
140
153
  }
141
154
  } finally {
142
- this[_worker] = null;
155
+ this[$worker] = null;
143
156
  }
144
157
  }
145
158
 
146
159
  /**
147
160
  * @abstract
148
161
  */
149
- async [symbols.globalTeardown]() {}
162
+ async [symbols.cleanup]() {}
150
163
  //#endregion
151
164
 
152
165
  //#region Protected members
@@ -163,8 +176,9 @@ class DetoxContext {
163
176
  module.exports = DetoxContext;
164
177
  module.exports.protected = {
165
178
  $cleanup,
166
- $logger,
179
+ $logFinalizer,
167
180
  $restoreSessionState,
181
+ $status,
168
182
  $sessionState,
169
- $tracer,
183
+ $worker,
170
184
  };
@@ -8,26 +8,22 @@ class DetoxInternalsFacade {
8
8
  */
9
9
  constructor(context) {
10
10
  this.config = context[symbols.config];
11
- this.globalSetup = context[symbols.globalSetup];
12
- this.globalTeardown = context[symbols.globalTeardown];
13
- this.log = context.log;
14
- this.setup = context[symbols.setup];
15
- this.teardown = context[symbols.teardown];
11
+ this.getStatus = context[symbols.getStatus];
12
+ this.init = context[symbols.init];
13
+ this.cleanup = context[symbols.cleanup];
14
+ this.log = context[symbols.logger];
15
+ this.installWorker = context[symbols.installWorker];
16
+ this.uninstallWorker = context[symbols.uninstallWorker];
16
17
  this.onHookFailure = context[symbols.onHookFailure];
17
- this.onHookStart = context[symbols.onHookStart];
18
- this.onHookSuccess = context[symbols.onHookSuccess];
19
18
  this.onRunDescribeFinish = context[symbols.onRunDescribeFinish];
20
19
  this.onRunDescribeStart = context[symbols.onRunDescribeStart];
21
- this.onRunFinish = context[symbols.onRunFinish];
22
- this.onRunStart = context[symbols.onRunStart];
23
20
  this.onTestDone = context[symbols.onTestDone];
24
21
  this.onTestFnFailure = context[symbols.onTestFnFailure];
25
- this.onTestFnStart = context[symbols.onTestFnStart];
26
- this.onTestFnSuccess = context[symbols.onTestFnSuccess];
27
22
  this.onTestStart = context[symbols.onTestStart];
28
- this.reportFailedTests = context[symbols.reportFailedTests];
23
+ this.reportTestResults = context[symbols.reportTestResults];
29
24
  this.resolveConfig = context[symbols.resolveConfig];
30
25
  this.session = context[symbols.session];
26
+ this.tracing = context[symbols.tracing];
31
27
  this.worker = funpermaproxy(() => context[symbols.worker]);
32
28
  }
33
29
  }