Now we keep a collection to determine if a script needs to be added, removed or changed on the client

Author: Diego Geffner

src/chrome/chromeDebugAdapter.ts

@@ -156,6 +156,8 @@ export abstract class ChromeDebugAdapter implements IDebugAdapter {
 
     public readonly events: StepProgressEventsEmitter;
 
+    private _loadedSourcesByScriptId = new Map<Crdp.Runtime.ScriptId, CrdpScript>();
+
     public constructor({ chromeConnection, lineColTransformer, sourceMapTransformer, pathTransformer, targetFilter, enableSourceMapCaching }: IChromeDebugAdapterOpts,
         session: ChromeDebugSession) {
         telemetry.setupEventHandler(e => session.sendEvent(e));
@@ -599,7 +601,7 @@ export abstract class ChromeDebugAdapter implements IDebugAdapter {
      * e.g. the target navigated
      */
     protected onExecutionContextsCleared(): Promise<void> {
-        const cachedScriptParsedEvents = Array.from(this._scriptsById.values());
+        const cachedScriptParsedEvents = Array.from(this._loadedSourcesByScriptId.values());
         this.clearTargetContext();
         return this.doAfterProcessingSourceEvents(async () => { // This will not execute until all the on-flight 'new' source events have been processed
             for (let scriptedParseEvent of cachedScriptParsedEvents) {
@@ -856,7 +858,28 @@ export abstract class ChromeDebugAdapter implements IDebugAdapter {
     }
 
     protected async sendLoadedSourceEvent(script: Crdp.Debugger.ScriptParsedEvent, loadedSourceEventReason: LoadedSourceEventReason = 'new'): Promise<void> {
+        switch (loadedSourceEventReason) {
+            case 'new':
+            case 'changed':
+                if (this._loadedSourcesByScriptId.get(script.scriptId)) {
+                    loadedSourceEventReason = 'changed';
+                } else {
+                    loadedSourceEventReason = 'new';
+                }
+                this._loadedSourcesByScriptId.set(script.scriptId, script);
+                break;
+            case 'removed':
+                if (!this._loadedSourcesByScriptId.delete(script.scriptId)) {
+                    telemetry.reportEvent('LoadedSourceEventError', { issue: 'Tried to remove non-existent script', scriptId: script.scriptId });
+                    return;
+                }
+                break;
+            default:
+                telemetry.reportEvent('LoadedSourceEventError', { issue: 'Unknown reason', reason: loadedSourceEventReason });
+        }
+
         const scriptEvent = await this.scriptToLoadedSourceEvent(loadedSourceEventReason, script);
+
         this._session.sendEvent(scriptEvent);
     }