detox 20.0.4-breaking.new-global-lifecycle.0 → 20.0.5-breaking.new-global-lifecycle.0
Sign up to get free protection for your applications and to get access to all the features.
- package/Detox-android/com/wix/detox/{20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0-javadoc.jar → 20.0.5-breaking.new-global-lifecycle.0/detox-20.0.5-breaking.new-global-lifecycle.0-javadoc.jar} +0 -0
- package/Detox-android/com/wix/detox/20.0.5-breaking.new-global-lifecycle.0/detox-20.0.5-breaking.new-global-lifecycle.0-javadoc.jar.md5 +1 -0
- package/Detox-android/com/wix/detox/20.0.5-breaking.new-global-lifecycle.0/detox-20.0.5-breaking.new-global-lifecycle.0-javadoc.jar.sha1 +1 -0
- package/Detox-android/com/wix/detox/20.0.5-breaking.new-global-lifecycle.0/detox-20.0.5-breaking.new-global-lifecycle.0-javadoc.jar.sha256 +1 -0
- package/Detox-android/com/wix/detox/20.0.5-breaking.new-global-lifecycle.0/detox-20.0.5-breaking.new-global-lifecycle.0-javadoc.jar.sha512 +1 -0
- package/Detox-android/com/wix/detox/{20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0-sources.jar → 20.0.5-breaking.new-global-lifecycle.0/detox-20.0.5-breaking.new-global-lifecycle.0-sources.jar} +0 -0
- package/Detox-android/com/wix/detox/20.0.5-breaking.new-global-lifecycle.0/detox-20.0.5-breaking.new-global-lifecycle.0-sources.jar.md5 +1 -0
- package/Detox-android/com/wix/detox/20.0.5-breaking.new-global-lifecycle.0/detox-20.0.5-breaking.new-global-lifecycle.0-sources.jar.sha1 +1 -0
- package/Detox-android/com/wix/detox/20.0.5-breaking.new-global-lifecycle.0/detox-20.0.5-breaking.new-global-lifecycle.0-sources.jar.sha256 +1 -0
- package/Detox-android/com/wix/detox/20.0.5-breaking.new-global-lifecycle.0/detox-20.0.5-breaking.new-global-lifecycle.0-sources.jar.sha512 +1 -0
- package/Detox-android/com/wix/detox/{20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0.aar → 20.0.5-breaking.new-global-lifecycle.0/detox-20.0.5-breaking.new-global-lifecycle.0.aar} +0 -0
- package/Detox-android/com/wix/detox/{20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0.aar.md5 → 20.0.5-breaking.new-global-lifecycle.0/detox-20.0.5-breaking.new-global-lifecycle.0.aar.md5} +0 -0
- package/Detox-android/com/wix/detox/{20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0.aar.sha1 → 20.0.5-breaking.new-global-lifecycle.0/detox-20.0.5-breaking.new-global-lifecycle.0.aar.sha1} +0 -0
- package/Detox-android/com/wix/detox/{20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0.aar.sha256 → 20.0.5-breaking.new-global-lifecycle.0/detox-20.0.5-breaking.new-global-lifecycle.0.aar.sha256} +0 -0
- package/Detox-android/com/wix/detox/{20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0.aar.sha512 → 20.0.5-breaking.new-global-lifecycle.0/detox-20.0.5-breaking.new-global-lifecycle.0.aar.sha512} +0 -0
- package/Detox-android/com/wix/detox/{20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0.pom → 20.0.5-breaking.new-global-lifecycle.0/detox-20.0.5-breaking.new-global-lifecycle.0.pom} +1 -1
- package/Detox-android/com/wix/detox/20.0.5-breaking.new-global-lifecycle.0/detox-20.0.5-breaking.new-global-lifecycle.0.pom.md5 +1 -0
- package/Detox-android/com/wix/detox/20.0.5-breaking.new-global-lifecycle.0/detox-20.0.5-breaking.new-global-lifecycle.0.pom.sha1 +1 -0
- package/Detox-android/com/wix/detox/20.0.5-breaking.new-global-lifecycle.0/detox-20.0.5-breaking.new-global-lifecycle.0.pom.sha256 +1 -0
- package/Detox-android/com/wix/detox/20.0.5-breaking.new-global-lifecycle.0/detox-20.0.5-breaking.new-global-lifecycle.0.pom.sha512 +1 -0
- package/Detox-android/com/wix/detox/maven-metadata.xml +4 -4
- package/Detox-android/com/wix/detox/maven-metadata.xml.md5 +1 -1
- package/Detox-android/com/wix/detox/maven-metadata.xml.sha1 +1 -1
- package/Detox-android/com/wix/detox/maven-metadata.xml.sha256 +1 -1
- package/Detox-android/com/wix/detox/maven-metadata.xml.sha512 +1 -1
- package/Detox-ios-src.tbz +0 -0
- package/Detox-ios.tbz +0 -0
- package/index.d.ts +49 -40
- package/internals.d.ts +63 -15
- package/local-cli/cli.js +1 -1
- package/local-cli/rebuild-framework-cache.js +1 -1
- package/local-cli/test.js +3 -2
- package/local-cli/test.test.js +1 -1
- package/local-cli/testCommand/TestRunnerCommand.js +4 -3
- package/package.json +5 -4
- package/runners/jest/globalSetup.js +1 -1
- package/runners/jest/globalTeardown.js +1 -1
- package/runners/jest/testEnvironment/index.js +33 -16
- package/runners/jest/testEnvironment/listeners/DetoxCoreListener.js +76 -41
- package/runners/jest/testEnvironment/listeners/SpecReporter.js +1 -1
- package/runners/jest/testEnvironment/listeners/WorkerAssignReporter.js +1 -1
- package/src/DetoxWorker.js +4 -1
- package/src/artifacts/ArtifactsManager.js +8 -23
- package/src/artifacts/instruments/ios/SimulatorInstrumentsRecording.js +3 -3
- package/src/artifacts/log/ios/SimulatorLogRecording.js +1 -1
- package/src/artifacts/screenshot/SimulatorScreenshotPlugin.js +1 -1
- package/src/artifacts/templates/artifact/Artifact.js +1 -1
- package/src/artifacts/templates/plugin/ArtifactPlugin.js +1 -1
- package/src/artifacts/utils/temporaryPath.js +18 -7
- package/src/artifacts/video/SimulatorRecordVideoPlugin.js +1 -1
- package/src/client/AsyncWebSocket.js +8 -17
- package/src/client/Client.js +1 -1
- package/src/configuration/collectCliConfig.js +1 -1
- package/src/configuration/composeDeviceConfig.js +1 -1
- package/src/configuration/composeLoggerConfig.js +17 -8
- package/src/configuration/composeRunnerConfig.js +1 -1
- package/src/configuration/index.js +5 -1
- package/src/configuration/loadExternalConfig.js +1 -1
- package/src/devices/allocation/DeviceAllocator.js +3 -2
- package/src/devices/allocation/drivers/android/emulator/AVDValidator.js +1 -1
- package/src/devices/allocation/drivers/android/emulator/EmulatorAllocDriver.js +3 -2
- package/src/devices/allocation/drivers/android/emulator/EmulatorAllocationHelper.js +1 -1
- package/src/devices/allocation/drivers/android/emulator/EmulatorLauncher.js +3 -2
- package/src/devices/allocation/drivers/android/emulator/EmulatorVersionResolver.js +4 -6
- package/src/devices/allocation/drivers/android/emulator/launchEmulatorProcess.js +1 -1
- package/src/devices/allocation/drivers/android/genycloud/GenyInstanceAllocationHelper.js +1 -1
- package/src/devices/common/drivers/android/genycloud/services/GenyInstanceNaming.js +3 -3
- package/src/devices/common/drivers/android/genycloud/services/GenyRecipesService.js +1 -1
- package/src/devices/common/drivers/android/tools/EmulatorTelnet.js +1 -1
- package/src/devices/common/drivers/android/tools/FreeDeviceFinder.js +1 -1
- package/src/devices/common/drivers/ios/tools/AppleSimUtils.js +1 -1
- package/src/devices/lifecycle/GenyGlobalLifecycleHandler.js +9 -13
- package/src/devices/runtime/RuntimeDevice.js +7 -8
- package/src/devices/runtime/drivers/DeviceDriverBase.js +1 -1
- package/src/devices/runtime/drivers/android/AndroidDriver.js +1 -1
- package/src/devices/runtime/drivers/ios/SimulatorDriver.js +1 -1
- package/src/ipc/IPCClient.js +3 -8
- package/src/ipc/IPCServer.js +11 -11
- package/src/ipc/{state.js → SessionState.js} +23 -50
- package/src/logger/DetoxLogger.js +264 -155
- package/src/logger/index.js +4 -0
- package/src/logger/utils/BunyanLogger.js +72 -0
- package/src/logger/utils/CategoryThreadDispatcher.js +58 -0
- package/src/logger/utils/MessageStack.js +24 -0
- package/src/logger/{TraceThreadDispatcher.js → utils/ThreadDispatcher.js} +34 -5
- package/src/logger/{customConsoleLogger.js → utils/customConsoleLogger.js} +4 -4
- package/src/logger/utils/sanitizeBunyanContext.js +28 -0
- package/src/logger/utils/tracerLegacy.js +25 -0
- package/src/realms/DetoxContext.js +65 -57
- package/src/realms/DetoxInternalsFacade.js +7 -5
- package/src/realms/DetoxPrimaryContext.js +111 -39
- package/src/realms/DetoxSecondaryContext.js +24 -29
- package/src/server/DetoxConnection.js +18 -23
- package/src/server/DetoxServer.js +7 -10
- package/src/server/DetoxSession.js +6 -6
- package/src/server/DetoxSessionManager.js +1 -1
- package/src/server/handlers/RegisteredConnectionHandler.js +1 -2
- package/src/symbols.js +12 -8
- package/src/utils/childProcess/exec.js +1 -1
- package/src/utils/childProcess/spawn.js +1 -1
- package/src/utils/streamUtils.js +10 -11
- package/src/utils/trace.js +2 -18
- package/src/utils/traceMethods.js +15 -0
- package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0-javadoc.jar.md5 +0 -1
- package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0-javadoc.jar.sha1 +0 -1
- package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0-javadoc.jar.sha256 +0 -1
- package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0-javadoc.jar.sha512 +0 -1
- package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0-sources.jar.md5 +0 -1
- package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0-sources.jar.sha1 +0 -1
- package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0-sources.jar.sha256 +0 -1
- package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0-sources.jar.sha512 +0 -1
- package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0.pom.md5 +0 -1
- package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0.pom.sha1 +0 -1
- package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0.pom.sha256 +0 -1
- package/Detox-android/com/wix/detox/20.0.4-breaking.new-global-lifecycle.0/detox-20.0.4-breaking.new-global-lifecycle.0.pom.sha512 +0 -1
- package/src/logger/DetoxTraceEventBuilder.js +0 -21
- package/src/logger/DetoxTracer.js +0 -133
- package/src/utils/ChromeTracingExporter.js +0 -54
@@ -1,133 +0,0 @@
|
|
1
|
-
const _ = require('lodash');
|
2
|
-
|
3
|
-
const isPromise = require('../utils/isPromise');
|
4
|
-
|
5
|
-
const DetoxTraceEventBuilder = require('./DetoxTraceEventBuilder');
|
6
|
-
const TraceThreadDispatcher = require('./TraceThreadDispatcher');
|
7
|
-
|
8
|
-
class DetoxTracer {
|
9
|
-
/**
|
10
|
-
* @param {object} options
|
11
|
-
* @param {Detox.Logger} options.logger
|
12
|
-
*/
|
13
|
-
constructor({ logger }) {
|
14
|
-
this.logger = logger;
|
15
|
-
this.builder = new DetoxTraceEventBuilder(this.logger.trace);
|
16
|
-
this.categories = {};
|
17
|
-
this.defaultEventDispatcher = new TraceThreadDispatcher({
|
18
|
-
logger,
|
19
|
-
name: 'Default',
|
20
|
-
min: 10000,
|
21
|
-
});
|
22
|
-
this.eventDispatchers = { '': this.defaultEventDispatcher };
|
23
|
-
}
|
24
|
-
|
25
|
-
/**
|
26
|
-
* @param {Detox.TraceEvent | string} eventOrName
|
27
|
-
* @param {Detox.TraceEvent['args']} [args]
|
28
|
-
* @returns {import('trace-event-lib').EndHandle<Detox.TraceEvent>}
|
29
|
-
*/
|
30
|
-
begin(eventOrName, args) {
|
31
|
-
const event = typeof eventOrName === 'string' ? { name: eventOrName, args } : eventOrName;
|
32
|
-
const mainCategory = event.cat ? event.cat.split(',', 1)[0] : '';
|
33
|
-
const dispatcher = this.eventDispatchers[mainCategory] || this.defaultEventDispatcher;
|
34
|
-
const tid = dispatcher.begin(event.id);
|
35
|
-
|
36
|
-
return this.builder.begin({
|
37
|
-
args: event.args,
|
38
|
-
cat: event.cat || '',
|
39
|
-
cname: event.cname,
|
40
|
-
name: event.name,
|
41
|
-
tid,
|
42
|
-
});
|
43
|
-
}
|
44
|
-
|
45
|
-
end(eventOrName, args) {
|
46
|
-
const event = typeof eventOrName === 'string' ? { name: eventOrName, args } : eventOrName || {};
|
47
|
-
const mainCategory = event.cat ? event.cat.split(',', 1)[0] : '';
|
48
|
-
const dispatcher = this.eventDispatchers[mainCategory] || this.defaultEventDispatcher;
|
49
|
-
const tid = dispatcher.end(event.id);
|
50
|
-
|
51
|
-
this.builder.end({
|
52
|
-
args: event.args,
|
53
|
-
cname: event.cname,
|
54
|
-
tid,
|
55
|
-
});
|
56
|
-
}
|
57
|
-
|
58
|
-
section(sectionName, func) {
|
59
|
-
let result;
|
60
|
-
|
61
|
-
this.begin(sectionName);
|
62
|
-
try {
|
63
|
-
result = func();
|
64
|
-
if (!isPromise(result)) {
|
65
|
-
this.end(sectionName, { success: true });
|
66
|
-
} else {
|
67
|
-
result.then(
|
68
|
-
() => this.end(sectionName, { success: true }),
|
69
|
-
(err) => this.end(sectionName, { success: false, err }),
|
70
|
-
);
|
71
|
-
}
|
72
|
-
} catch (err) {
|
73
|
-
this.end(sectionName, { success: false, err });
|
74
|
-
throw err;
|
75
|
-
}
|
76
|
-
|
77
|
-
return result;
|
78
|
-
}
|
79
|
-
|
80
|
-
registerThreads(event, [min, max]) {
|
81
|
-
this.eventDispatchers[event] = new TraceThreadDispatcher({
|
82
|
-
logger: this.logger,
|
83
|
-
name: event,
|
84
|
-
min,
|
85
|
-
max,
|
86
|
-
});
|
87
|
-
|
88
|
-
return this;
|
89
|
-
}
|
90
|
-
|
91
|
-
static default(options) {
|
92
|
-
const tracer = new DetoxTracer(options);
|
93
|
-
for (const [key, range] of Object.entries(this.CATEGORIES)) {
|
94
|
-
tracer.registerThreads(key, range);
|
95
|
-
}
|
96
|
-
|
97
|
-
return Object.assign(
|
98
|
-
tracer.section.bind(tracer),
|
99
|
-
{
|
100
|
-
begin: tracer.begin.bind(tracer),
|
101
|
-
startSection: tracer.begin.bind(tracer),
|
102
|
-
end: tracer.end.bind(tracer),
|
103
|
-
endSection: tracer.end.bind(tracer),
|
104
|
-
});
|
105
|
-
}
|
106
|
-
|
107
|
-
static categorize(tid) {
|
108
|
-
return _.findKey(this.CATEGORIES, ([min, max]) => min <= tid && tid <= max) || 'user';
|
109
|
-
}
|
110
|
-
|
111
|
-
static threadize(cat) {
|
112
|
-
const [mainCategory] = cat ? cat.split(',', 1) : 'user';
|
113
|
-
const threads = _.find(this.CATEGORIES, (_, key) => key === mainCategory);
|
114
|
-
return threads ? threads[0] : 10000;
|
115
|
-
}
|
116
|
-
|
117
|
-
/**
|
118
|
-
* @type {Record<string, [number, number]>}
|
119
|
-
*/
|
120
|
-
static CATEGORIES = {
|
121
|
-
'lifecycle': [0, 0],
|
122
|
-
'ipc': [29, 29],
|
123
|
-
'ws-server': [50, 99],
|
124
|
-
'ws-client': [100, 149],
|
125
|
-
'device': [150, 159],
|
126
|
-
'artifacts-manager': [300, 300],
|
127
|
-
'artifact-plugin': [310, 349],
|
128
|
-
'artifact': [350, 399],
|
129
|
-
'child-process': [400, 499],
|
130
|
-
};
|
131
|
-
}
|
132
|
-
|
133
|
-
module.exports = DetoxTracer;
|
@@ -1,54 +0,0 @@
|
|
1
|
-
const _ = require('lodash');
|
2
|
-
|
3
|
-
const DetoxRuntimeError = require('../errors/DetoxRuntimeError');
|
4
|
-
|
5
|
-
class ChromeTracingExporter {
|
6
|
-
constructor({
|
7
|
-
process,
|
8
|
-
thread,
|
9
|
-
}) {
|
10
|
-
this._process = {
|
11
|
-
id: process.id,
|
12
|
-
name: process.name,
|
13
|
-
};
|
14
|
-
this._thread = {
|
15
|
-
id: thread.id,
|
16
|
-
name: thread.name,
|
17
|
-
};
|
18
|
-
}
|
19
|
-
|
20
|
-
export(traceEvents, append) {
|
21
|
-
const _events = _.flatMap(traceEvents, this._parseEvent.bind(this));
|
22
|
-
const json = JSON.stringify(_events);
|
23
|
-
const prefix = (append ? ',' : '[');
|
24
|
-
return `${prefix}${json.slice(1, -1)}`;
|
25
|
-
}
|
26
|
-
|
27
|
-
_parseEvent(event) {
|
28
|
-
const { name, ts, args, type } = event;
|
29
|
-
const tsInMicroseconds = ts * 1000;
|
30
|
-
switch (type) {
|
31
|
-
case 'start': return this._event(name, 'B', tsInMicroseconds, args);
|
32
|
-
case 'end': return this._event(name, 'E', tsInMicroseconds, args);
|
33
|
-
case 'init': return [
|
34
|
-
this._event('process_name', 'M', tsInMicroseconds, { name: this._process.name }),
|
35
|
-
this._event('thread_name', 'M', tsInMicroseconds, { name: this._thread.name }),
|
36
|
-
];
|
37
|
-
default:
|
38
|
-
throw new DetoxRuntimeError({ message: `Invalid type '${type}' in event: ${event}` });
|
39
|
-
}
|
40
|
-
}
|
41
|
-
|
42
|
-
_event(name, phase, ts, args) {
|
43
|
-
return {
|
44
|
-
name,
|
45
|
-
pid: this._process.id,
|
46
|
-
tid: this._thread.id,
|
47
|
-
ts,
|
48
|
-
ph: phase,
|
49
|
-
args: { ...args },
|
50
|
-
};
|
51
|
-
}
|
52
|
-
}
|
53
|
-
|
54
|
-
module.exports = ChromeTracingExporter;
|