Skip to content

fix: refresh cached window tab details on read #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iamEvanYT wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: refresh cached window tab details on read #180

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions packages/electron-chrome-extensions/src/browser/api/windows.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,16 @@ export class WindowsAPI {
d(`Observing window[${windowId}]`)
}

private createWindowTabsDetails(win: Electron.BaseWindow) {
return Array.from(this.ctx.store.tabs)
.filter((tab) => {
const ownerWindow = this.ctx.store.tabToWindow.get(tab)
return ownerWindow?.isDestroyed() ? false : ownerWindow?.id === win.id
})
.map((tab) => this.ctx.store.tabDetailsCache.get(tab.id) as chrome.tabs.Tab)
.filter(Boolean)
}

private createWindowDetails(win: Electron.BaseWindow) {
const details: Partial<chrome.windows.Window> = {
id: win.id,
Expand All @@ -59,13 +69,7 @@ export class WindowsAPI {
left: win.getPosition()[0],
width: win.getSize()[0],
height: win.getSize()[1],
tabs: Array.from(this.ctx.store.tabs)
.filter((tab) => {
const ownerWindow = this.ctx.store.tabToWindow.get(tab)
return ownerWindow?.isDestroyed() ? false : ownerWindow?.id === win.id
})
.map((tab) => this.ctx.store.tabDetailsCache.get(tab.id) as chrome.tabs.Tab)
.filter(Boolean),
tabs: this.createWindowTabsDetails(win),
incognito: !this.ctx.session.isPersistent(),
type: 'normal', // TODO
state: getWindowState(win),
Expand All @@ -79,7 +83,12 @@ export class WindowsAPI {

private getWindowDetails(win: Electron.BaseWindow) {
if (this.ctx.store.windowDetailsCache.has(win.id)) {
return this.ctx.store.windowDetailsCache.get(win.id)
const cachedDetails = this.ctx.store.windowDetailsCache.get(win.id)
// Update the cached details with the latest tabs, otherwise it will be stale.
if (cachedDetails) {
cachedDetails.tabs = this.createWindowTabsDetails(win)
}
return cachedDetails
}
const details = this.createWindowDetails(win)
return details
Expand Down
Loading