RPP: Prevent syntheticEvent registration from throwing

Bug: GoogleChrome/lighthouse#16571
Change-Id: I15d96f69994a072fe6e057f6c9f714d7aaddc0a4
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6701907
Reviewed-by: Connor Clark <[email protected]>
Commit-Queue: Connor Clark <[email protected]>
Auto-Submit: Paul Irish <[email protected]>
Commit-Queue: Paul Irish <[email protected]>

Author: paulirish

front_end/models/trace/ModelImpl.ts

@@ -30,7 +30,6 @@ export interface ParseConfig {
  **/
 export class Model extends EventTarget {
   readonly #traces: ParsedTraceFile[] = [];
-  readonly #syntheticEventsManagerByTrace: Helpers.SyntheticEvents.SyntheticEventsManager[] = [];
   readonly #nextNumberByDomain = new Map<string, number>();
 
   readonly #recordingsAvailable: string[] = [];
@@ -108,12 +107,12 @@ export class Model extends EventTarget {
       metadata,
       parsedTrace: null,
       traceInsights: null,
+      syntheticEventsManager: Helpers.SyntheticEvents.SyntheticEventsManager.createAndActivate(traceEvents),
     };
 
     try {
       // Wait for all outstanding promises before finishing the async execution,
       // but perform all tasks in parallel.
-      const syntheticEventsManager = Helpers.SyntheticEvents.SyntheticEventsManager.createAndActivate(traceEvents);
       await this.#processor.parse(traceEvents, {
         isFreshRecording,
         isCPUProfile,
@@ -124,7 +123,6 @@ export class Model extends EventTarget {
       // We only push the file onto this.#traces here once we know it's valid
       // and there's been no errors in the parsing.
       this.#traces.push(file);
-      this.#syntheticEventsManagerByTrace.push(syntheticEventsManager);
     } catch (e) {
       throw e;
     } finally {
@@ -186,7 +184,7 @@ export class Model extends EventTarget {
 
   syntheticTraceEventsManager(index: number = this.#traces.length - 1): Helpers.SyntheticEvents.SyntheticEventsManager
       |null {
-    return this.#syntheticEventsManagerByTrace.at(index) ?? null;
+    return this.#traces.at(index)?.syntheticEventsManager ?? null;
   }
 
   size(): number {
@@ -215,6 +213,7 @@ export class Model extends EventTarget {
 export type ParsedTraceFile = Types.File.TraceFile&{
   parsedTrace: Handlers.Types.ParsedTrace | null,
   traceInsights: Insights.Types.TraceInsightSets | null,
+  syntheticEventsManager: Helpers.SyntheticEvents.SyntheticEventsManager,
 };
 
 export const enum ModelUpdateType {

front_end/models/trace/handlers/ExtensionTraceDataHandler.ts

@@ -118,7 +118,7 @@ export function extractConsoleAPIExtensionEntries(): void {
         ph: Types.Events.Phase.COMPLETE,
       };
       const extensionEntry =
-          Helpers.SyntheticEvents.SyntheticEventsManager.getActiveManager()
+          Helpers.SyntheticEvents.SyntheticEventsManager
               .registerSyntheticEvent<Types.Extensions.SyntheticExtensionTrackEntry>(unregisteredExtensionEntry);
       extensionTrackEntries.push(extensionEntry);
       continue;
@@ -137,8 +137,8 @@ export function extractConsoleAPIExtensionEntries(): void {
       rawSourceEvent: currentTimeStamp
     };
     const syntheticTimeStamp =
-        Helpers.SyntheticEvents.SyntheticEventsManager.getActiveManager()
-            .registerSyntheticEvent<Types.Events.SyntheticConsoleTimeStamp>(unregisteredSyntheticTimeStamp);
+        Helpers.SyntheticEvents.SyntheticEventsManager.registerSyntheticEvent<Types.Events.SyntheticConsoleTimeStamp>(
+            unregisteredSyntheticTimeStamp);
     syntheticConsoleEntriesForTimingsTrack.push(syntheticTimeStamp);
   }
 }
@@ -196,7 +196,7 @@ export function extractPerformanceAPIExtensionEntries(
 
     if (Types.Extensions.isExtensionPayloadMarker(extensionPayload)) {
       const extensionMarker =
-          Helpers.SyntheticEvents.SyntheticEventsManager.getActiveManager()
+          Helpers.SyntheticEvents.SyntheticEventsManager
               .registerSyntheticEvent<Types.Extensions.SyntheticExtensionMarker>(
                   extensionSyntheticEntry as Omit<Types.Extensions.SyntheticExtensionMarker, '_tag'>);
       extensionMarkers.push(extensionMarker);
@@ -205,7 +205,7 @@ export function extractPerformanceAPIExtensionEntries(
 
     if (Types.Extensions.isExtensionPayloadTrackEntry(extensionSyntheticEntry.args)) {
       const extensionTrackEntry =
-          Helpers.SyntheticEvents.SyntheticEventsManager.getActiveManager()
+          Helpers.SyntheticEvents.SyntheticEventsManager
               .registerSyntheticEvent<Types.Extensions.SyntheticExtensionTrackEntry>(
                   extensionSyntheticEntry as Omit<Types.Extensions.SyntheticExtensionTrackEntry, '_tag'>);
       extensionTrackEntries.push(extensionTrackEntry);

front_end/models/trace/helpers/SyntheticEvents.ts

@@ -40,7 +40,7 @@ export class SyntheticEventsManager {
 
   static registerSyntheticEvent<T extends Types.Events.SyntheticBased>(syntheticEvent: Omit<T, '_tag'>): T {
     try {
-      return SyntheticEventsManager.getActiveManager().registerSyntheticEvent(syntheticEvent);
+      return SyntheticEventsManager.getActiveManager().#registerSyntheticEvent(syntheticEvent);
     } catch {
       // If no active manager has been initialized, we assume the trace engine is
       // not running as part of the Performance panel. In this case we don't
@@ -59,7 +59,7 @@ export class SyntheticEventsManager {
    * be created with this method to ensure they are registered and made
    * available to load events using serialized keys.
    */
-  registerSyntheticEvent<T extends Types.Events.SyntheticBased>(syntheticEvent: Omit<T, '_tag'>): T {
+  #registerSyntheticEvent<T extends Types.Events.SyntheticBased>(syntheticEvent: Omit<T, '_tag'>): T {
     const rawIndex = this.#rawTraceEvents.indexOf(syntheticEvent.rawSourceEvent);
     if (rawIndex < 0) {
       throw new Error('Attempted to register a synthetic event paired to an unknown raw event.');