Revert "fix(trace): survive sw restart (#37442)"

This reverts commit 25f89ac.

Author: pavelfeldman

package-lock.json

@@ -4,7 +4,6 @@
   "version": "0.0.0",
   "type": "module",
   "dependencies": {
-    "idb-keyval": "^6.2.2",
     "yaml": "^2.6.0"
   }
 }

packages/trace-viewer/package.json

@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-import * as idbKeyval from 'idb-keyval';
-
 import { splitProgress } from './progress';
 import { unwrapPopoutUrl } from './snapshotRenderer';
 import { SnapshotServer } from './snapshotServer';
@@ -35,13 +33,10 @@ self.addEventListener('activate', function(event: any) {
 });
 
 const scopePath = new URL(self.registration.scope).pathname;
+
 const loadedTraces = new Map<string, { traceModel: TraceModel, snapshotServer: SnapshotServer }>();
-const clientIdToTraceUrls = new Map<string, { limit: number | undefined, traceUrls: Set<string>, traceViewerServer: TraceViewerServer }>();
 
-function simulateServiceWorkerRestart() {
-  loadedTraces.clear();
-  clientIdToTraceUrls.clear();
-}
+const clientIdToTraceUrls = new Map<string, { limit: number | undefined, traceUrls: Set<string>, traceViewerServer: TraceViewerServer }>();
 
 async function loadTrace(traceUrl: string, traceFileName: string | null, client: any | undefined, limit: number | undefined, progress: (done: number, total: number) => undefined): Promise<TraceModel> {
   await gc();
@@ -54,7 +49,6 @@ async function loadTrace(traceUrl: string, traceFileName: string | null, client:
     clientIdToTraceUrls.set(clientId, data);
   }
   data.traceUrls.add(traceUrl);
-  await saveClientIdParams();
 
   const traceModel = new TraceModel();
   try {
@@ -107,10 +101,6 @@ async function doFetch(event: FetchEvent): Promise<Response> {
       await gc();
       return new Response(null, { status: 200 });
     }
-    if (relativePath === '/restartServiceWorker') {
-      simulateServiceWorkerRestart();
-      return new Response(null, { status: 200 });
-    }
 
     const traceUrl = url.searchParams.get('trace');
 
@@ -132,16 +122,6 @@ async function doFetch(event: FetchEvent): Promise<Response> {
       }
     }
 
-    if (!clientIdToTraceUrls.has(event.clientId)) {
-      // Service worker was restarted upon subresource fetch.
-      // It was stopped because ping did not keep it alive since the tab itself was throttled.
-      const params = await loadClientIdParams(event.clientId);
-      if (params) {
-        for (const traceUrl of params.traceUrls)
-          await loadTrace(traceUrl, null, client, params.limit, () => {});
-      }
-    }
-
     if (relativePath.startsWith('/snapshotInfo/')) {
       const { snapshotServer } = loadedTraces.get(traceUrl!) || {};
       if (!snapshotServer)
@@ -241,36 +221,6 @@ async function gc() {
     if (!usedTraces.has(traceUrl))
       loadedTraces.delete(traceUrl);
   }
-
-  await saveClientIdParams();
-}
-
-// Persist clientIdToTraceUrls to localStorage to avoid losing it when the service worker is restarted.
-async function saveClientIdParams() {
-  const serialized: Record<string, {
-    limit: number | undefined,
-    traceUrls: string[]
-  }> = {};
-  for (const [clientId, data] of clientIdToTraceUrls) {
-    serialized[clientId] = {
-      limit: data.limit,
-      traceUrls: [...data.traceUrls]
-    };
-  }
-
-  const newValue = JSON.stringify(serialized);
-  const oldValue = await idbKeyval.get('clientIdToTraceUrls');
-  if (newValue === oldValue)
-    return;
-  idbKeyval.set('clientIdToTraceUrls', newValue);
-}
-
-async function loadClientIdParams(clientId: string): Promise<{ limit: number | undefined, traceUrls: string[] } | undefined> {
-  const serialized = await idbKeyval.get('clientIdToTraceUrls') as string | undefined;
-  if (!serialized)
-    return;
-  const deserialized = JSON.parse(serialized);
-  return deserialized[clientId];
 }
 
 // @ts-ignore

packages/trace-viewer/src/sw/main.ts

@@ -2037,22 +2037,3 @@ test.describe(() => {
     await expect(frame.getByRole('button')).toHaveCSS('color', 'rgb(255, 0, 0)');
   });
 });
-
-test('should survive service worker restart', async ({ page, runAndTrace, server }) => {
-  const traceViewer = await runAndTrace(async () => {
-    await page.goto(server.EMPTY_PAGE);
-    await page.setContent('Old world');
-    await page.evaluate(() => document.body.textContent = 'New world');
-  });
-  const snapshot1 = await traceViewer.snapshotFrame('Evaluate');
-  await expect(snapshot1.locator('body')).toHaveText('New world');
-
-  const status = await traceViewer.page.evaluate(async () => {
-    const response = await fetch('restartServiceWorker');
-    return response.status;
-  });
-  expect(status).toBe(200);
-
-  const snapshot2 = await traceViewer.snapshotFrame('Set content');
-  await expect(snapshot2.locator('body')).toHaveText('Old world');
-});