fix(core): load fragments from other session

ulixee · Jan 18, 2022 · 8145a01 · 8145a01
1 parent 3e964d0
commit 8145a01
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/client/lib/CoreSession.ts b/client/lib/CoreSession.ts
@@ -158,6 +158,7 @@ export default class CoreSession implements IJsPathEventTarget {
         prefetchedJsPaths: IJsPathResult[];
       }[]
     >('Session.loadAllFragments', sessionId);
+    if (!fragments) return [];
     return fragments.map(fragment => {
       const coreTab = new CoreTab(
         { ...fragment.detachedTab, sessionName: this.sessionName },

diff --git a/core/lib/Session.ts b/core/lib/Session.ts
@@ -287,8 +287,13 @@ export default class Session
       prefetchedJsPaths: IJsPathResult[];
     }[]
   > {
-    await this.db.flush();
-    const fragments = this.db.fragments.all();
+    let db = this.db;
+    if (fromSessionId === this.id) {
+      db.flush();
+    } else {
+      db = SessionDb.getCached(fromSessionId);
+    }
+    const fragments = db.fragments.all();
     return await Promise.all(
       fragments.map(async fragment => {
         const { name, frameNavigationId, domChangeEventIndex } = fragment;