fix(core): user profile not loading all frames

ulixee · Sep 3, 2022 · d4f6ccc · d4f6ccc
1 parent 333a80c
commit d4f6ccc
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 38 deletions.
diff --git a/core/injected-scripts/domStorage.ts b/core/injected-scripts/domStorage.ts
@@ -69,7 +69,7 @@ async function readStoreData(store: IDBObjectStore) {
       if (cursor) {
         const key = store.keyPath === null ? cursor.key : undefined;
         let value = cursor.value;
-        if (typeof value === 'object') {
+        if (typeof value === 'object' && !('toJSON' in value && typeof value.toJSON === 'function')) {
           value = { ...value };
         }
         data.push(TypeSerializer.stringify({ key, value }));

diff --git a/core/injected-scripts/indexedDbRestore.ts b/core/injected-scripts/indexedDbRestore.ts
@@ -1,41 +1,43 @@
 import type { IIndexedDB } from '@unblocked-web/specifications/agent/browser/IIndexedDB';
 
-async function restoreIndexedDb(restoreDBs: IIndexedDB[]) {
+async function restoreIndexedDb(restoreDBs: IIndexedDB[]): Promise<void> {
   if (!restoreDBs || !restoreDBs.length) return;
 
-  for (const restoreDB of restoreDBs) {
-    await new Promise<void>((resolve, reject) => {
-      const openDBRequest = indexedDB.open(restoreDB.name, restoreDB.version);
-      // only run changes when the db doesn't already exist
-      openDBRequest.onupgradeneeded = event => {
-        const request = event.target as IDBRequest<IDBDatabase>;
-        const db = request.result;
-        for (const objectStoreToRestore of restoreDB.objectStores) {
-          const objectStore = db.createObjectStore(objectStoreToRestore.name, {
-            autoIncrement: objectStoreToRestore.autoIncrement,
-            keyPath: objectStoreToRestore.keyPath,
-          });
-
-          for (const restoreIndex of objectStoreToRestore.indexes) {
-            objectStore.createIndex(restoreIndex.name, restoreIndex.keyPath, {
-              multiEntry: restoreIndex.multiEntry,
-              unique: restoreIndex.unique,
+  await Promise.all(
+    restoreDBs.map(restoreDB => {
+      return new Promise<void>((resolve, reject) => {
+        const openDBRequest = indexedDB.open(restoreDB.name, restoreDB.version);
+        // only run changes when the db doesn't already exist
+        openDBRequest.onupgradeneeded = event => {
+          const request = event.target as IDBRequest<IDBDatabase>;
+          const db = request.result;
+          for (const objectStoreToRestore of restoreDB.objectStores) {
+            const objectStore = db.createObjectStore(objectStoreToRestore.name, {
+              autoIncrement: objectStoreToRestore.autoIncrement,
+              keyPath: objectStoreToRestore.keyPath,
             });
+
+            for (const restoreIndex of objectStoreToRestore.indexes) {
+              objectStore.createIndex(restoreIndex.name, restoreIndex.keyPath, {
+                multiEntry: restoreIndex.multiEntry,
+                unique: restoreIndex.unique,
+              });
+            }
           }
-        }
-      };
-      openDBRequest.onsuccess = async event => {
-        const request = event.target as IDBRequest<IDBDatabase>;
-        try {
-          await restoreData(request.result, restoreDB);
-          resolve();
-        } catch (err) {
-          reject(err);
-        }
-      };
-      openDBRequest.onerror = reject;
-    });
-  }
+        };
+        openDBRequest.onsuccess = async event => {
+          const request = event.target as IDBRequest<IDBDatabase>;
+          try {
+            await restoreData(request.result, restoreDB);
+            resolve();
+          } catch (err) {
+            reject(err);
+          }
+        };
+        openDBRequest.onerror = reject;
+      });
+    }),
+  );
 }
 
 async function restoreData(db: IDBDatabase, restoreDB: IIndexedDB) {

diff --git a/core/lib/UserProfile.ts b/core/lib/UserProfile.ts
@@ -120,12 +120,14 @@ export default class UserProfile {
             responseCode: 200,
             requestId,
             responseHeaders: [{ name: 'Content-Type', value: 'text/html' }],
-            body: Buffer.from(`<html>
+            body: Buffer.from(
+              `<html>
 <body>
 <h1>Restoring Dom Storage</h1>
 ${origins.map(x => `<iframe src="${x}"></iframe>`).join('\n')}
 </body>
-</html>`).toString('base64'),
+</html>`,
+            ).toString('base64'),
           };
         }
         let script = '';
@@ -160,18 +162,22 @@ for (const [key,value] of ${JSON.stringify(localStorage)}) {
         return {
           responseCode: 200,
           requestId,
-          body: Buffer.from(`<html><body class="${readyClass}">
+          body: Buffer.from(
+            `<html><body class="${readyClass}">
 <h5>${url.origin}</h5>
 <script>
 ${script}
 </script>
-</body></html>`).toString('base64'),
+</body></html>`,
+          ).toString('base64'),
         };
       }, true);
 
-
       // clear out frame state
       await page.navigate(storageRestoreDomain);
+      while (page.frames.length <= origins.length) {
+        await new Promise(resolve => setTimeout(resolve, 50));
+      }
 
       await Promise.all(
         page.frames.map(async frame => {

diff --git a/core/test/user-profile.test.ts b/core/test/user-profile.test.ts
@@ -679,6 +679,7 @@ describe('UserProfile IndexedDb tests', () => {
       expect(db.objectStores[1].keyPath).not.toBeTruthy();
 
       expect(db.data.store1).toHaveLength(2);
+      expect(db.data.store2).toHaveLength(1);
     }
     {
       const meta = await connection.createSession({