@paulirish/trace_engine 0.0.67 → 0.0.69

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (169) hide show
  1. package/.tmp/tsbuildinfo/tsconfig.tsbuildinfo +1 -1
  2. package/README.md +17 -1
  3. package/core/common/ParsedURL.d.ts +0 -2
  4. package/core/common/ParsedURL.js +3 -3
  5. package/core/common/ParsedURL.js.map +1 -1
  6. package/core/platform/StringUtilities.d.ts +15 -4
  7. package/core/platform/StringUtilities.js +48 -12
  8. package/core/platform/StringUtilities.js.map +1 -1
  9. package/generated/protocol.d.ts +89 -19
  10. package/generated/protocol.js +9 -4
  11. package/locales/af.json +12 -12
  12. package/locales/am.json +19 -19
  13. package/locales/ar.json +56 -56
  14. package/locales/as.json +69 -69
  15. package/locales/az.json +22 -22
  16. package/locales/be.json +46 -46
  17. package/locales/bg.json +17 -17
  18. package/locales/bn.json +76 -76
  19. package/locales/bs.json +23 -23
  20. package/locales/ca.json +14 -14
  21. package/locales/cs.json +13 -13
  22. package/locales/cy.json +21 -21
  23. package/locales/da.json +12 -12
  24. package/locales/de.json +10 -10
  25. package/locales/el.json +14 -14
  26. package/locales/en-GB.json +73 -73
  27. package/locales/en-US.json +3 -6
  28. package/locales/en-XL.json +3 -6
  29. package/locales/es-419.json +64 -64
  30. package/locales/es.json +44 -44
  31. package/locales/et.json +48 -48
  32. package/locales/eu.json +18 -18
  33. package/locales/fa.json +39 -39
  34. package/locales/fi.json +11 -11
  35. package/locales/fil.json +34 -34
  36. package/locales/fr-CA.json +49 -49
  37. package/locales/fr.json +18 -18
  38. package/locales/gl.json +33 -33
  39. package/locales/gu.json +39 -39
  40. package/locales/he.json +72 -72
  41. package/locales/hi.json +40 -40
  42. package/locales/hr.json +26 -26
  43. package/locales/hu.json +56 -56
  44. package/locales/hy.json +19 -19
  45. package/locales/id.json +68 -68
  46. package/locales/is.json +11 -11
  47. package/locales/it.json +44 -44
  48. package/locales/ja.json +15 -15
  49. package/locales/ka.json +68 -68
  50. package/locales/kk.json +44 -44
  51. package/locales/km.json +18 -18
  52. package/locales/kn.json +28 -28
  53. package/locales/ko.json +11 -11
  54. package/locales/ky.json +22 -22
  55. package/locales/lo.json +33 -33
  56. package/locales/lt.json +9 -9
  57. package/locales/lv.json +35 -35
  58. package/locales/mk.json +18 -18
  59. package/locales/ml.json +19 -19
  60. package/locales/mn.json +40 -40
  61. package/locales/mr.json +12 -12
  62. package/locales/ms.json +15 -15
  63. package/locales/my.json +62 -62
  64. package/locales/ne.json +42 -42
  65. package/locales/nl.json +33 -33
  66. package/locales/no.json +17 -17
  67. package/locales/or.json +54 -54
  68. package/locales/pa.json +24 -24
  69. package/locales/pl.json +32 -32
  70. package/locales/pt-PT.json +12 -12
  71. package/locales/pt.json +41 -41
  72. package/locales/ro.json +11 -11
  73. package/locales/ru.json +40 -40
  74. package/locales/si.json +36 -36
  75. package/locales/sk.json +65 -65
  76. package/locales/sl.json +13 -13
  77. package/locales/sq.json +21 -21
  78. package/locales/sr-Latn.json +17 -17
  79. package/locales/sr.json +17 -17
  80. package/locales/sv.json +13 -13
  81. package/locales/sw.json +69 -69
  82. package/locales/ta.json +39 -39
  83. package/locales/te.json +38 -38
  84. package/locales/th.json +38 -38
  85. package/locales/tr.json +17 -17
  86. package/locales/uk.json +23 -23
  87. package/locales/ur.json +13 -13
  88. package/locales/uz.json +15 -15
  89. package/locales/vi.json +43 -43
  90. package/locales/zh-HK.json +38 -38
  91. package/locales/zh-TW.json +35 -35
  92. package/locales/zh.json +73 -73
  93. package/locales/zu.json +53 -53
  94. package/models/cpu_profile/CPUProfileDataModel.d.ts +0 -33
  95. package/models/cpu_profile/CPUProfileDataModel.js +14 -14
  96. package/models/cpu_profile/CPUProfileDataModel.js.map +1 -1
  97. package/models/cpu_profile/ProfileTreeModel.d.ts +1 -2
  98. package/models/cpu_profile/ProfileTreeModel.js +4 -4
  99. package/models/cpu_profile/ProfileTreeModel.js.map +1 -1
  100. package/models/trace/EventsSerializer.js +1 -13
  101. package/models/trace/EventsSerializer.js.map +1 -1
  102. package/models/trace/LanternComputationData.js +36 -10
  103. package/models/trace/LanternComputationData.js.map +1 -1
  104. package/models/trace/ModelImpl.js +0 -2
  105. package/models/trace/ModelImpl.js.map +1 -1
  106. package/models/trace/Processor.js +16 -8
  107. package/models/trace/Processor.js.map +1 -1
  108. package/models/trace/extras/ThirdParties.js +4 -6
  109. package/models/trace/extras/ThirdParties.js.map +1 -1
  110. package/models/trace/extras/TraceFilter.d.ts +1 -0
  111. package/models/trace/extras/TraceFilter.js +18 -8
  112. package/models/trace/extras/TraceFilter.js.map +1 -1
  113. package/models/trace/extras/TraceTree.d.ts +13 -16
  114. package/models/trace/extras/TraceTree.js +161 -110
  115. package/models/trace/extras/TraceTree.js.map +1 -1
  116. package/models/trace/handlers/ExtensionTraceDataHandler.d.ts +0 -5
  117. package/models/trace/handlers/ExtensionTraceDataHandler.js +0 -5
  118. package/models/trace/handlers/ExtensionTraceDataHandler.js.map +1 -1
  119. package/models/trace/handlers/FlowsHandler.js +34 -19
  120. package/models/trace/handlers/FlowsHandler.js.map +1 -1
  121. package/models/trace/handlers/InitiatorsHandler.js +22 -34
  122. package/models/trace/handlers/InitiatorsHandler.js.map +1 -1
  123. package/models/trace/handlers/LayoutShiftsHandler.js +2 -6
  124. package/models/trace/handlers/LayoutShiftsHandler.js.map +1 -1
  125. package/models/trace/handlers/MetaHandler.js +3 -0
  126. package/models/trace/handlers/MetaHandler.js.map +1 -1
  127. package/models/trace/handlers/NetworkRequestsHandler.js +12 -6
  128. package/models/trace/handlers/NetworkRequestsHandler.js.map +1 -1
  129. package/models/trace/handlers/RendererHandler.js +7 -6
  130. package/models/trace/handlers/RendererHandler.js.map +1 -1
  131. package/models/trace/handlers/SamplesHandler.d.ts +0 -1
  132. package/models/trace/handlers/SamplesHandler.js +11 -6
  133. package/models/trace/handlers/SamplesHandler.js.map +1 -1
  134. package/models/trace/handlers/ScriptsHandler.js +24 -22
  135. package/models/trace/handlers/ScriptsHandler.js.map +1 -1
  136. package/models/trace/handlers/types.d.ts +15 -0
  137. package/models/trace/handlers/types.js.map +1 -1
  138. package/models/trace/helpers/Extensions.js +1 -3
  139. package/models/trace/helpers/Extensions.js.map +1 -1
  140. package/models/trace/helpers/SamplesIntegrator.d.ts +17 -14
  141. package/models/trace/helpers/SamplesIntegrator.js +147 -84
  142. package/models/trace/helpers/SamplesIntegrator.js.map +1 -1
  143. package/models/trace/helpers/SyntheticEvents.d.ts +0 -8
  144. package/models/trace/helpers/SyntheticEvents.js +10 -33
  145. package/models/trace/helpers/SyntheticEvents.js.map +1 -1
  146. package/models/trace/helpers/Trace.js +19 -14
  147. package/models/trace/helpers/Trace.js.map +1 -1
  148. package/models/trace/helpers/TreeHelpers.d.ts +13 -1
  149. package/models/trace/helpers/TreeHelpers.js +35 -8
  150. package/models/trace/helpers/TreeHelpers.js.map +1 -1
  151. package/models/trace/insights/DuplicatedJavaScript.js +1 -2
  152. package/models/trace/insights/DuplicatedJavaScript.js.map +1 -1
  153. package/models/trace/insights/RenderBlocking.js +3 -1
  154. package/models/trace/insights/RenderBlocking.js.map +1 -1
  155. package/models/trace/insights/SlowCSSSelector.js +2 -2
  156. package/models/trace/insights/SlowCSSSelector.js.map +1 -1
  157. package/models/trace/lantern/metrics/LargestContentfulPaint.d.ts +6 -1
  158. package/models/trace/lantern/metrics/LargestContentfulPaint.js +130 -5
  159. package/models/trace/lantern/metrics/LargestContentfulPaint.js.map +1 -1
  160. package/models/trace/lantern/simulation/Simulator.d.ts +4 -0
  161. package/models/trace/lantern/simulation/Simulator.js +8 -1
  162. package/models/trace/lantern/simulation/Simulator.js.map +1 -1
  163. package/models/trace/lantern/types/Lantern.d.ts +4 -0
  164. package/models/trace/lantern/types/Lantern.js.map +1 -1
  165. package/models/trace/types/TraceEvents.d.ts +21 -19
  166. package/models/trace/types/TraceEvents.js.map +1 -1
  167. package/package.json +1 -1
  168. package/test/test-trace-engine.mjs +20 -17
  169. package/third_party/legacy-javascript/lib/legacy-javascript.js +2 -2
@@ -4,10 +4,38 @@
4
4
  import * as Helpers from '../helpers/helpers.js';
5
5
  import * as Types from '../types/types.js';
6
6
  const SamplesIntegrator = Helpers.SamplesIntegrator.SamplesIntegrator;
7
+ function buildEventFilter(filters) {
8
+ if (filters.length === 0) {
9
+ return () => true;
10
+ }
11
+ return e => {
12
+ for (let i = 0; i < filters.length; i++) {
13
+ if (!filters[i].accept(e)) {
14
+ return false;
15
+ }
16
+ }
17
+ return true;
18
+ };
19
+ }
20
+ function createEventIdCache() {
21
+ // Profile calls for the same frame share one callFrame object, and their ID
22
+ // only depends on its fields. Caching per root avoids rebuilding and
23
+ // re-hashing identical strings across root construction and child expansions.
24
+ const profileCallIdByCallFrame = new Map();
25
+ return (event) => {
26
+ if (Types.Events.isProfileCall(event)) {
27
+ let id = profileCallIdByCallFrame.get(event.callFrame);
28
+ if (id === undefined) {
29
+ id = generateEventID(event);
30
+ profileCallIdByCallFrame.set(event.callFrame, id);
31
+ }
32
+ return id;
33
+ }
34
+ return generateEventID(event);
35
+ };
36
+ }
7
37
  export class Node {
8
- /** ms */
9
38
  totalTime;
10
- /** ms */
11
39
  selfTime;
12
40
  transferSize;
13
41
  id;
@@ -23,8 +51,8 @@ export class Node {
23
51
  isGroupNodeInternal;
24
52
  depth;
25
53
  constructor(id, event) {
26
- this.totalTime = 0;
27
- this.selfTime = 0;
54
+ this.totalTime = Types.Timing.Micro(0);
55
+ this.selfTime = Types.Timing.Micro(0);
28
56
  this.transferSize = 0;
29
57
  this.id = id;
30
58
  this.event = event;
@@ -98,7 +126,7 @@ export class TopDownNode extends Node {
98
126
  const startTime = root.startTime;
99
127
  const endTime = root.endTime;
100
128
  const instantEventCallback = (root.doNotAggregate || root.includeInstantEvents) ? onInstantEvent : undefined;
101
- const eventIdCallback = root.doNotAggregate ? undefined : generateEventID;
129
+ const eventIdCallback = root.doNotAggregate ? undefined : root.eventId;
102
130
  const eventGroupIdCallback = root.getEventGroupIdCallback();
103
131
  let depth = 0;
104
132
  // The amount of ancestors found to match this node's ancestors
@@ -110,13 +138,12 @@ export class TopDownNode extends Node {
110
138
  onStartEvent,
111
139
  onEndEvent,
112
140
  onInstantEvent: instantEventCallback,
113
- startTime: Helpers.Timing.milliToMicro(startTime),
114
- endTime: Helpers.Timing.milliToMicro(endTime),
141
+ startTime,
142
+ endTime,
115
143
  eventFilter: root.filter,
116
144
  ignoreAsyncEvents: false,
117
145
  });
118
146
  function onStartEvent(e) {
119
- const { startTime: currentStartTime, endTime: currentEndTime } = Helpers.Timing.eventTimingsMilliSeconds(e);
120
147
  ++depth;
121
148
  if (depth > path.length + 2) {
122
149
  return;
@@ -124,8 +151,10 @@ export class TopDownNode extends Node {
124
151
  if (!matchPath(e)) {
125
152
  return;
126
153
  }
127
- const actualEndTime = currentEndTime !== undefined ? Math.min(currentEndTime, endTime) : endTime;
128
- const duration = actualEndTime - Math.max(startTime, currentStartTime);
154
+ const currentStartTime = e.ts;
155
+ const currentEndTime = e.ts + (e.dur ?? 0);
156
+ const actualEndTime = Math.min(currentEndTime, endTime);
157
+ const duration = Types.Timing.Micro(actualEndTime - Math.max(startTime, currentStartTime));
129
158
  if (duration < 0) {
130
159
  console.error('Negative event duration');
131
160
  }
@@ -134,7 +163,7 @@ export class TopDownNode extends Node {
134
163
  function onInstantEvent(e) {
135
164
  ++depth;
136
165
  if (matchedDepth === path.length && depth <= path.length + 2) {
137
- processEvent(e, 0);
166
+ processEvent(e, Types.Timing.Micro(0));
138
167
  }
139
168
  --depth;
140
169
  }
@@ -147,7 +176,7 @@ export class TopDownNode extends Node {
147
176
  return;
148
177
  }
149
178
  currentDirectChild.setHasChildren(true);
150
- currentDirectChild.selfTime -= duration;
179
+ currentDirectChild.selfTime = Types.Timing.Micro(currentDirectChild.selfTime - duration);
151
180
  return;
152
181
  }
153
182
  let id;
@@ -171,8 +200,8 @@ export class TopDownNode extends Node {
171
200
  else {
172
201
  node.events.push(e);
173
202
  }
174
- node.selfTime += duration;
175
- node.totalTime += duration;
203
+ node.selfTime = Types.Timing.Micro(node.selfTime + duration);
204
+ node.totalTime = Types.Timing.Micro(node.totalTime + duration);
176
205
  if (Types.Events.isReceivedDataEvent(e)) {
177
206
  node.transferSize += e.args.data.encodedDataLength;
178
207
  }
@@ -185,14 +214,14 @@ export class TopDownNode extends Node {
185
214
  * is cached on `matchedDepth`, for future checks.
186
215
  */
187
216
  function matchPath(e) {
188
- const { endTime } = Helpers.Timing.eventTimingsMilliSeconds(e);
189
217
  if (matchedDepth === path.length) {
190
218
  return true;
191
219
  }
192
220
  if (matchedDepth !== depth - 1) {
193
221
  return false;
194
222
  }
195
- if (!endTime) {
223
+ const eventEndTime = e.ts + (e.dur ?? 0);
224
+ if (!eventEndTime) {
196
225
  return false;
197
226
  }
198
227
  if (!eventIdCallback) {
@@ -216,6 +245,9 @@ export class TopDownNode extends Node {
216
245
  if (matchedDepth > depth) {
217
246
  matchedDepth = depth;
218
247
  }
248
+ if (depth === path.length) {
249
+ currentDirectChild = null;
250
+ }
219
251
  }
220
252
  this.childrenInternal = children;
221
253
  return children;
@@ -229,20 +261,19 @@ export class TopDownRootNode extends TopDownNode {
229
261
  /** Default behavior is to aggregate similar trace events into one Node based on generateEventID(), eventGroupIdCallback(), etc. Set true to keep nodes 1:1 with events. */
230
262
  doNotAggregate;
231
263
  includeInstantEvents;
232
- totalTime;
233
- selfTime;
264
+ eventId = createEventIdCache();
234
265
  constructor(events, { filters, startTime, endTime, doNotAggregate, eventGroupIdCallback, includeInstantEvents }) {
235
266
  super('', events[0], null);
236
267
  this.event = events[0];
237
268
  this.root = this;
238
269
  this.events = events;
239
- this.filter = (e) => filters.every(f => f.accept(e));
270
+ this.filter = buildEventFilter(filters);
240
271
  this.startTime = startTime;
241
272
  this.endTime = endTime;
242
273
  this.eventGroupIdCallback = eventGroupIdCallback;
243
274
  this.doNotAggregate = doNotAggregate;
244
275
  this.includeInstantEvents = includeInstantEvents;
245
- this.totalTime = endTime - startTime;
276
+ this.totalTime = Types.Timing.Micro(endTime - startTime);
246
277
  this.selfTime = this.totalTime;
247
278
  }
248
279
  children() {
@@ -252,7 +283,7 @@ export class TopDownRootNode extends TopDownNode {
252
283
  grouppedTopNodes() {
253
284
  const flatNodes = super.children();
254
285
  for (const node of flatNodes.values()) {
255
- this.selfTime -= node.totalTime;
286
+ this.selfTime = Types.Timing.Micro(this.selfTime - node.totalTime);
256
287
  }
257
288
  if (!this.eventGroupIdCallback) {
258
289
  return flatNodes;
@@ -277,26 +308,51 @@ export class TopDownRootNode extends TopDownNode {
277
308
  return this.eventGroupIdCallback;
278
309
  }
279
310
  }
311
+ /**
312
+ * Maps a trace events array to the set of network request IDs served from cache.
313
+ * Timeline pans and zooms rebuild the tree with new time bounds over the same
314
+ * events array; memoizing this lookup avoids an O(N) full-trace scan per rebuild.
315
+ */
316
+ const cacheHitRequestIdsByEvents = new WeakMap();
317
+ function getCacheHitRequestIds(events) {
318
+ let cacheHitRequestIds = cacheHitRequestIdsByEvents.get(events);
319
+ if (!cacheHitRequestIds) {
320
+ const requestIds = new Set();
321
+ for (const e of events) {
322
+ if (Types.Events.isResourceReceiveResponse(e)) {
323
+ if (e.args.data.fromCache) {
324
+ requestIds.add(e.args.data.requestId);
325
+ }
326
+ else {
327
+ requestIds.delete(e.args.data.requestId);
328
+ }
329
+ }
330
+ }
331
+ cacheHitRequestIds = requestIds;
332
+ cacheHitRequestIdsByEvents.set(events, cacheHitRequestIds);
333
+ }
334
+ return cacheHitRequestIds;
335
+ }
280
336
  export class BottomUpRootNode extends Node {
281
337
  childrenInternal;
282
338
  textFilter;
283
339
  filter;
284
340
  startTime;
285
341
  endTime;
286
- totalTime;
287
342
  eventGroupIdCallback;
288
343
  calculateTransferSize;
289
344
  forceGroupIdCallback;
345
+ eventId = createEventIdCache();
290
346
  constructor(events, { textFilter, filters, startTime, endTime, eventGroupIdCallback, calculateTransferSize, forceGroupIdCallback, }) {
291
347
  super('', events[0]);
292
348
  this.childrenInternal = null;
293
349
  this.events = events;
294
350
  this.textFilter = textFilter;
295
- this.filter = (e) => filters.every(f => f.accept(e));
351
+ this.filter = buildEventFilter(filters);
296
352
  this.startTime = startTime;
297
353
  this.endTime = endTime;
298
354
  this.eventGroupIdCallback = eventGroupIdCallback;
299
- this.totalTime = endTime - startTime;
355
+ this.totalTime = Types.Timing.Micro(endTime - startTime);
300
356
  this.calculateTransferSize = calculateTransferSize;
301
357
  this.forceGroupIdCallback = forceGroupIdCallback;
302
358
  }
@@ -326,69 +382,54 @@ export class BottomUpRootNode extends Node {
326
382
  const root = this;
327
383
  const startTime = this.startTime;
328
384
  const endTime = this.endTime;
329
- const idStack = [];
385
+ const stateStack = [];
330
386
  const nodeById = new Map();
331
- const selfTimeStack = [endTime - startTime];
387
+ const selfTimeStack = [Types.Timing.Micro(endTime - startTime)];
332
388
  const firstNodeStack = [];
333
- const totalTimeById = new Map();
334
389
  // TODO(paulirish): rename to getGroupNodeId
335
390
  const eventGroupIdCallback = this.eventGroupIdCallback;
336
391
  const forceGroupIdCallback = this.forceGroupIdCallback;
337
- const idToIsCacheHit = new Map();
338
- // Node IDs are cached so that every event with the same ID reuses one
339
- // string. Building a new ID string per event, and hashing it again on
340
- // each Map lookup, is a large part of the cost of this loop on big
341
- // traces.
342
- const profileCallIdByCallFrame = new Map();
343
- // Grouped IDs are looked up by ID and then by group ID, because keying a
344
- // flat Map by `${id}-${groupId}` would build a new string per event.
345
- const groupedIdsByEventId = new Map();
346
- const nodeIdForEvent = (e) => {
347
- let id;
348
- if (Types.Events.isProfileCall(e)) {
349
- // Profile calls for the same frame share one callFrame object, and
350
- // their ID only depends on its fields.
351
- const cachedId = profileCallIdByCallFrame.get(e.callFrame);
352
- if (cachedId === undefined) {
353
- id = generateEventID(e);
354
- profileCallIdByCallFrame.set(e.callFrame, id);
355
- }
356
- else {
357
- id = cachedId;
358
- }
359
- }
360
- else {
361
- id = generateEventID(e);
362
- }
392
+ const eventId = this.eventId;
393
+ // Group IDs are looked up first by base event ID and then by group ID,
394
+ // storing the state object directly so steady-state events need no node
395
+ // map lookup or string concatenation.
396
+ const stateById = new Map();
397
+ const groupedStatesByEventId = new Map();
398
+ const stateForEvent = (e) => {
399
+ const id = eventId(e);
363
400
  if (!forceGroupIdCallback || !eventGroupIdCallback) {
364
- return id;
401
+ let state = stateById.get(id);
402
+ if (!state) {
403
+ state = { id, node: null, onStack: false, pendingTotalTime: Types.Timing.Micro(0) };
404
+ stateById.set(id, state);
405
+ }
406
+ return state;
365
407
  }
366
408
  const groupId = eventGroupIdCallback(e);
367
- let groupedIds = groupedIdsByEventId.get(id);
368
- if (!groupedIds) {
369
- groupedIds = new Map();
370
- groupedIdsByEventId.set(id, groupedIds);
409
+ let groupedStates = groupedStatesByEventId.get(id);
410
+ if (!groupedStates) {
411
+ groupedStates = new Map();
412
+ groupedStatesByEventId.set(id, groupedStates);
371
413
  }
372
- let groupedId = groupedIds.get(groupId);
373
- if (groupedId === undefined) {
374
- groupedId = `${id}-${groupId}`;
375
- groupedIds.set(groupId, groupedId);
414
+ let state = groupedStates.get(groupId);
415
+ if (!state) {
416
+ state = { id: `${id}-${groupId}`, node: null, onStack: false, pendingTotalTime: Types.Timing.Micro(0) };
417
+ groupedStates.set(groupId, state);
376
418
  }
377
- return groupedId;
419
+ return state;
378
420
  };
379
- for (const e of this.events) {
380
- if (Types.Events.isReceivedDataEvent(e) && e.name === 'ResourceReceiveResponse') {
381
- idToIsCacheHit.set(nodeIdForEvent(e), e.args.data.fromCache || false);
382
- }
383
- }
421
+ // Evaluated lazily on the first relevant event to avoid a WeakMap lookup or
422
+ // full-trace scan when the time window contains no network data events.
423
+ let cacheHitRequestIds = null;
384
424
  // encodedDataLength is provided solely on instant events.
385
425
  const sumTransferSizeOfInstantEvent = (e) => {
386
426
  if (Types.Events.isReceivedDataEvent(e)) {
387
- const id = nodeIdForEvent(e);
388
- let node = nodeById.get(id);
427
+ const state = stateForEvent(e);
428
+ let node = state.node;
389
429
  if (!node) {
390
- node = new BottomUpNode(root, id, e, false, root);
391
- nodeById.set(id, node);
430
+ node = new BottomUpNode(root, state.id, e, false, root);
431
+ state.node = node;
432
+ nodeById.set(state.id, node);
392
433
  }
393
434
  else {
394
435
  node.events.push(e);
@@ -396,7 +437,8 @@ export class BottomUpRootNode extends Node {
396
437
  // ResourceReceivedData events tally up the transfer size over time, but the
397
438
  // ResourceReceiveResponse / ResourceFinish events hold the final result.
398
439
  if (e.name === 'ResourceReceivedData') {
399
- if (idToIsCacheHit.get(id)) {
440
+ cacheHitRequestIds ??= getCacheHitRequestIds(this.events);
441
+ if (cacheHitRequestIds.has(e.args.data.requestId)) {
400
442
  // It's a cache hit, so the actual network transfer size is 0.
401
443
  // We overwrite the tallied sum (which is uncompressed body size) with 0.
402
444
  node.transferSize = 0;
@@ -405,8 +447,11 @@ export class BottomUpRootNode extends Node {
405
447
  node.transferSize += e.args.data.encodedDataLength;
406
448
  }
407
449
  }
408
- else if (e.name === 'ResourceFinish' && e.args.data.encodedDataLength === 0 && idToIsCacheHit.get(id)) {
409
- node.transferSize = 0;
450
+ else if (e.name === 'ResourceFinish' && e.args.data.encodedDataLength === 0) {
451
+ cacheHitRequestIds ??= getCacheHitRequestIds(this.events);
452
+ if (cacheHitRequestIds.has(e.args.data.requestId)) {
453
+ node.transferSize = 0;
454
+ }
410
455
  }
411
456
  else if (e.args.data.encodedDataLength > 0) {
412
457
  // For some reason, ResourceFinish can be zero even if data was sent.
@@ -423,54 +468,57 @@ export class BottomUpRootNode extends Node {
423
468
  onStartEvent,
424
469
  onEndEvent,
425
470
  onInstantEvent: this.calculateTransferSize ? sumTransferSizeOfInstantEvent : undefined,
426
- startTime: Helpers.Timing.milliToMicro(this.startTime),
427
- endTime: Helpers.Timing.milliToMicro(this.endTime),
471
+ startTime: this.startTime,
472
+ endTime: this.endTime,
428
473
  eventFilter: this.filter,
429
474
  ignoreAsyncEvents: false,
430
475
  });
431
476
  function onStartEvent(e) {
432
- const { startTime: currentStartTime, endTime: currentEndTime } = Helpers.Timing.eventTimingsMilliSeconds(e);
433
- const actualEndTime = currentEndTime !== undefined ? Math.min(currentEndTime, endTime) : endTime;
434
- const duration = actualEndTime - Math.max(currentStartTime, startTime);
435
- selfTimeStack[selfTimeStack.length - 1] -= duration;
477
+ const currentStartTime = e.ts;
478
+ const currentEndTime = e.ts + (e.dur ?? 0);
479
+ const actualEndTime = Math.min(currentEndTime, endTime);
480
+ const duration = Types.Timing.Micro(actualEndTime - Math.max(currentStartTime, startTime));
481
+ selfTimeStack[selfTimeStack.length - 1] = Types.Timing.Micro(selfTimeStack[selfTimeStack.length - 1] - duration);
436
482
  selfTimeStack.push(duration);
437
- const id = nodeIdForEvent(e);
438
- idStack.push(id);
483
+ const state = stateForEvent(e);
484
+ stateStack.push(state);
439
485
  // For an event 'X' that contains another event 'X' (resolving to the same node
440
486
  // id), we need to measure `totalTime` from the start of the outermost 'X' to
441
487
  // its corresponding end. This logic ensures we don't double-count the duration
442
488
  // of the inner event.
443
- const noNodeOnStack = !totalTimeById.has(id);
489
+ const noNodeOnStack = !state.onStack;
444
490
  if (noNodeOnStack) {
445
- totalTimeById.set(id, duration);
491
+ state.onStack = true;
492
+ state.pendingTotalTime = duration;
446
493
  }
447
494
  firstNodeStack.push(noNodeOnStack);
448
495
  }
449
496
  function onEndEvent(event) {
450
- const id = idStack.pop();
451
- if (id === undefined) {
497
+ const state = stateStack.pop();
498
+ if (!state) {
452
499
  return;
453
500
  }
454
- let node = nodeById.get(id);
501
+ let node = state.node;
455
502
  if (!node) {
456
- node = new BottomUpNode(root, id, event, false, root);
457
- nodeById.set(id, node);
503
+ node = new BottomUpNode(root, state.id, event, false, root);
504
+ state.node = node;
505
+ nodeById.set(state.id, node);
458
506
  }
459
507
  else {
460
508
  node.events.push(event);
461
509
  }
462
- node.selfTime += selfTimeStack.pop() || 0;
510
+ node.selfTime = Types.Timing.Micro(node.selfTime + (selfTimeStack.pop() || 0));
463
511
  if (firstNodeStack.pop()) {
464
- node.totalTime += totalTimeById.get(id) || 0;
465
- totalTimeById.delete(id);
512
+ node.totalTime = Types.Timing.Micro(node.totalTime + state.pendingTotalTime);
513
+ state.onStack = false;
466
514
  }
467
515
  // An item on this stack means that this current node has a caller. Therefore,
468
516
  // in a bottom-up view it has children.
469
- if (idStack.length > 0) {
517
+ if (stateStack.length > 0) {
470
518
  node.setHasChildren(true);
471
519
  }
472
520
  }
473
- this.selfTime = selfTimeStack.pop() || 0;
521
+ this.selfTime = Types.Timing.Micro(selfTimeStack.pop() || 0);
474
522
  // Delete any nodes that have no selfTime (or transferSize, if it's being calculated)
475
523
  for (const pair of nodeById) {
476
524
  if (pair[1].selfTime <= 0 && (!this.calculateTransferSize || pair[1].transferSize <= 0)) {
@@ -515,8 +563,8 @@ export class GroupNode extends Node {
515
563
  }
516
564
  addChild(child, selfTime, totalTime, transferSize) {
517
565
  this.childrenInternal.set(child.id, child);
518
- this.selfTime += selfTime;
519
- this.totalTime += totalTime;
566
+ this.selfTime = Types.Timing.Micro(this.selfTime + selfTime);
567
+ this.totalTime = Types.Timing.Micro(this.totalTime + totalTime);
520
568
  this.transferSize += transferSize;
521
569
  child.parent = this;
522
570
  }
@@ -551,37 +599,38 @@ export class BottomUpNode extends Node {
551
599
  if (this.cachedChildren) {
552
600
  return this.cachedChildren;
553
601
  }
554
- const selfTimeStack = [0];
602
+ const selfTimeStack = [Types.Timing.Micro(0)];
555
603
  const eventIdStack = [];
556
604
  const eventStack = [];
557
605
  const nodeById = new Map();
558
606
  const startTime = this.root.startTime;
559
607
  const endTime = this.root.endTime;
608
+ const eventId = this.root.eventId;
560
609
  let lastTimeMarker = startTime;
561
610
  const self = this;
562
611
  Helpers.Trace.forEachEvent(this.root.events, {
563
612
  onStartEvent,
564
613
  onEndEvent,
565
- startTime: Helpers.Timing.milliToMicro(startTime),
566
- endTime: Helpers.Timing.milliToMicro(endTime),
614
+ startTime,
615
+ endTime,
567
616
  eventFilter: this.root.filter,
568
617
  ignoreAsyncEvents: false,
569
618
  });
570
619
  function onStartEvent(e) {
571
- const { startTime: currentStartTime, endTime: currentEndTime } = Helpers.Timing.eventTimingsMilliSeconds(e);
572
- const actualEndTime = currentEndTime !== undefined ? Math.min(currentEndTime, endTime) : endTime;
573
- const duration = actualEndTime - Math.max(currentStartTime, startTime);
620
+ const currentStartTime = e.ts;
621
+ const currentEndTime = e.ts + (e.dur ?? 0);
622
+ const actualEndTime = Math.min(currentEndTime, endTime);
623
+ const duration = Types.Timing.Micro(actualEndTime - Math.max(currentStartTime, startTime));
574
624
  if (duration < 0) {
575
625
  console.assert(false, 'Negative duration of an event');
576
626
  }
577
- selfTimeStack[selfTimeStack.length - 1] -= duration;
627
+ selfTimeStack[selfTimeStack.length - 1] = Types.Timing.Micro(selfTimeStack[selfTimeStack.length - 1] - duration);
578
628
  selfTimeStack.push(duration);
579
- const id = generateEventID(e);
629
+ const id = eventId(e);
580
630
  eventIdStack.push(id);
581
631
  eventStack.push(e);
582
632
  }
583
633
  function onEndEvent(e) {
584
- const { startTime: currentStartTime, endTime: currentEndTime } = Helpers.Timing.eventTimingsMilliSeconds(e);
585
634
  const selfTime = selfTimeStack.pop();
586
635
  const id = eventIdStack.pop();
587
636
  eventStack.pop();
@@ -605,10 +654,12 @@ export class BottomUpNode extends Node {
605
654
  else {
606
655
  node.events.push(e);
607
656
  }
608
- const actualEndTime = currentEndTime !== undefined ? Math.min(currentEndTime, endTime) : endTime;
609
- const totalTime = actualEndTime - Math.max(currentStartTime, lastTimeMarker);
610
- node.selfTime += selfTime || 0;
611
- node.totalTime += totalTime;
657
+ const currentStartTime = e.ts;
658
+ const currentEndTime = e.ts + (e.dur ?? 0);
659
+ const actualEndTime = Types.Timing.Micro(Math.min(currentEndTime, endTime));
660
+ const totalTime = Types.Timing.Micro(actualEndTime - Math.max(currentStartTime, lastTimeMarker));
661
+ node.selfTime = Types.Timing.Micro(node.selfTime + (selfTime || 0));
662
+ node.totalTime = Types.Timing.Micro(node.totalTime + totalTime);
612
663
  lastTimeMarker = actualEndTime;
613
664
  }
614
665
  this.cachedChildren = this.root.filterChildren(nodeById);