fixup! fix(docs-infra): print info to help debugging SW cache issue

gkalpak · gkalpak · commit 88fed01cfe09 · 2021-03-08T18:00:14.000+02:00
diff --git a/aio/src/app/layout/doc-viewer/doc-viewer.component.ts b/aio/src/app/layout/doc-viewer/doc-viewer.component.ts
@@ -259,49 +259,49 @@ export class DocViewerComponent implements OnDestroy {
  * issues with failing to find resources in the cache.
  * (See https://github.com/angular/angular/issues/28114.)
  */
-async function printSwDebugInfo(): Promise<void> {
-  console.log(`\nServiceWorker: ${navigator.serviceWorker?.controller?.state ?? 'N/A'}`);
-
-  if (typeof caches === 'undefined') {
-    console.log('\nCaches: N/A');
-  } else {
-    const allCacheNames = await caches.keys();
-    const swCacheNames = allCacheNames.filter(name => name.startsWith('ngsw:/:'));
-
-    await findCachesAndPrintEntries(swCacheNames, 'db:control', true, ['manifests']);
-    await findCachesAndPrintEntries(swCacheNames, 'assets:app-shell:cache', false);
-    await findCachesAndPrintEntries(swCacheNames, 'assets:app-shell:meta', true);
-  }
+function printSwDebugInfo(): Promise<void> {
+  return Promise.resolve()
+      .then(() => console.log(`\nServiceWorker: ${navigator.serviceWorker?.controller?.state ?? 'N/A'}`))
+      .then(() => {
+        if (typeof caches === 'undefined') {
+          return console.log('\nCaches: N/A');
+        } else {
+          return caches.keys().then(allCacheNames => {
+            const swCacheNames = allCacheNames.filter(name => name.startsWith('ngsw:/:'));
+            return findCachesAndPrintEntries(swCacheNames, 'db:control', true, ['manifests'])
+                .then(() => findCachesAndPrintEntries(swCacheNames, 'assets:app-shell:cache', false))
+                .then(() => findCachesAndPrintEntries(swCacheNames, 'assets:app-shell:meta', true));
+          });
+        }
+      })
+      .then(() => {
+        console.warn(
+            '\nIf you see this error, please report an issue at ' +
+            'https://github.com/angular/angular/issues/new?template=3-docs-bug.md including the above logs.');
+      });
 
-  console.warn(
-      '\nIf you see this error, please report an issue at ' +
-      'https://github.com/angular/angular/issues/new?template=3-docs-bug.md including the above logs.');
 
   // Internal helpers
-  async function findCachesAndPrintEntries(
+  function findCachesAndPrintEntries(
       swCacheNames: string[], nameSuffix: string, includeValues = false,
       ignoredKeys: string[] = []): Promise<void> {
     const cacheNames = swCacheNames.filter(name => name.endsWith(nameSuffix));
 
-    for (const cacheName of cacheNames) {
-      const cacheEntries = await getCacheEntries(cacheName, includeValues, ignoredKeys);
-      await printCacheEntries(cacheName, cacheEntries);
-    }
+    return cacheNames.reduce((prev, cacheName) => prev
+        .then(() => getCacheEntries(cacheName, includeValues, ignoredKeys))
+        .then(cacheEntries => printCacheEntries(cacheName, cacheEntries)), Promise.resolve());
   }
 
-  async function getCacheEntries(
+  function getCacheEntries(
       name: string, includeValues = false,
       ignoredKeys: string[] = []): Promise<{key: string, value?: object}[]> {
     const ignoredUrls = new Set(ignoredKeys.map(key => new Request(key).url));
 
-    const cache = await caches.open(name);
-    const keys = (await cache.keys()).map(req => req.url).filter(url => !ignoredUrls.has(url));
-    const entries = await Promise.all(keys.map(async key => ({
-      key,
-      value: !includeValues ? undefined : await (await cache.match(key))?.json(),
-    })));
-
-    return entries;
+    return caches.open(name).then(cache => cache.keys()
+        .then(keys => keys.map(req => req.url).filter(url => !ignoredUrls.has(url)))
+        .then(keys => Promise.all(keys.map(key => !includeValues ?
+          {key} :
+          cache.match(key).then(res => res?.json()).then(value => ({key, value}))))));
   }
 
   function printCacheEntries(name: string, entries: {key: string, value?: object}[]): void {
diff --git a/goldens/size-tracking/aio-payloads.json b/goldens/size-tracking/aio-payloads.json
@@ -3,7 +3,7 @@
     "master": {
       "uncompressed": {
         "runtime-es2015": 3033,
-        "main-es2015": 450959,
+        "main-es2015": 450581,
         "polyfills-es2015": 52343
       }
     }
@@ -12,7 +12,7 @@
     "master": {
       "uncompressed": {
         "runtime-es2015": 3033,
-        "main-es2015": 451408,
+        "main-es2015": 451030,
         "polyfills-es2015": 52493
       }
     }
@@ -21,7 +21,7 @@
     "master": {
       "uncompressed": {
         "runtime-es2015": 3153,
-        "main-es2015": 437011,
+        "main-es2015": 436633,
         "polyfills-es2015": 52493
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"master": {`
`4`	`4`	`"uncompressed": {`
`5`	`5`	`"runtime-es2015": 3033,`
`6`		`- "main-es2015": 450959,`
	`6`	`+ "main-es2015": 450581,`
`7`	`7`	`"polyfills-es2015": 52343`
`8`	`8`	`}`
`9`	`9`	`}`
`@@ -12,7 +12,7 @@`
`12`	`12`	`"master": {`
`13`	`13`	`"uncompressed": {`
`14`	`14`	`"runtime-es2015": 3033,`
`15`		`- "main-es2015": 451408,`
	`15`	`+ "main-es2015": 451030,`
`16`	`16`	`"polyfills-es2015": 52493`
`17`	`17`	`}`
`18`	`18`	`}`
`@@ -21,7 +21,7 @@`
`21`	`21`	`"master": {`
`22`	`22`	`"uncompressed": {`
`23`	`23`	`"runtime-es2015": 3153,`
`24`		`- "main-es2015": 437011,`
	`24`	`+ "main-es2015": 436633,`
`25`	`25`	`"polyfills-es2015": 52493`
`26`	`26`	`}`
`27`	`27`	`}`