Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
50 changes: 47 additions & 3 deletions apps/desktop/src/main/__tests__/workhub-presentation.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,10 @@ async function harness(animate = false, displayFrequency = 60, revealMode: Windo
let releasedViews = 0;
let pointerDisplay = { x: 0, y: 0, width: 1200, height: 900 };
class Contents extends EventEmitter {
mainFrame = {};
mainFrame = {
isDestroyed: () => this.destroyed,
send: (channel: string, ...args: unknown[]) => { this.sent.push([channel, ...args]); },
};
destroyed = false;
sent: [string, ...unknown[]][] = [];
session = { setPermissionCheckHandler() {}, setPermissionRequestHandler() {} };
Expand Down Expand Up @@ -462,16 +465,57 @@ test('application broadcasts reach registered auxiliaries once and stop after re
onRendererProcessGone: () => undefined,
});
const messages: string[] = [];
const renderer = Object.assign(new EventEmitter(), {
const destroyedFrame = {
isDestroyed: () => true,
send: (channel: string) => { messages.push(channel); },
} as unknown as Electron.WebFrameMain;
const liveFrame = {
isDestroyed: () => false,
send: (channel: string) => { messages.push(channel); },
} as unknown as Electron.WebFrameMain;
let mainFrame: Electron.WebFrameMain = destroyedFrame;
let mainFrameUnavailable = false;
let contentsDestroyed = false;
const renderer = Object.assign(new EventEmitter(), {
isDestroyed: () => contentsDestroyed,
}) as unknown as Electron.WebContents;
Object.defineProperty(renderer, 'mainFrame', {
get: () => {
if (mainFrameUnavailable) throw new Error('Renderer frame is being replaced');
return mainFrame;
},
});
const parent = {} as Electron.View;
const release = controller.registerAuxiliaryRenderer(renderer, parent);
assert.equal(controller.ownsRenderer(renderer), true);
assert.equal(controller.browserParentForRenderer(renderer), parent);
controller.send('settings:changed');
const otherMessages: string[] = [];
const otherRenderer = Object.assign(new EventEmitter(), {
isDestroyed: () => false,
mainFrame: {
isDestroyed: () => false,
send: (channel: string) => { otherMessages.push(channel); },
},
}) as unknown as Electron.WebContents;
const releaseOther = controller.registerAuxiliaryRenderer(otherRenderer);
assert.doesNotThrow(() => controller.send('settings:changed'));
assert.deepEqual(messages, []);
assert.deepEqual(otherMessages, ['settings:changed']);
mainFrameUnavailable = true;
assert.doesNotThrow(() => controller.send('settings:changed'));
assert.deepEqual(messages, []);
assert.deepEqual(otherMessages, ['settings:changed', 'settings:changed']);
mainFrameUnavailable = false;
mainFrame = liveFrame;
assert.doesNotThrow(() => controller.send('settings:changed'));
assert.deepEqual(messages, ['settings:changed']);
assert.equal(otherMessages.length, 3);
contentsDestroyed = true;
assert.doesNotThrow(() => controller.send('settings:changed'));
assert.deepEqual(messages, ['settings:changed']);
assert.equal(otherMessages.length, 4);
contentsDestroyed = false;
releaseOther();
release();
controller.send('settings:changed');
assert.deepEqual(messages, ['settings:changed']);
Expand Down
16 changes: 15 additions & 1 deletion apps/desktop/src/main/main-window.ts
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,21 @@ export function safeSendToRenderer(channel: string, ...args: unknown[]): void {
const recipients = new Set(auxiliaryRenderers.keys());
if (mainWindow && !mainWindow.isDestroyed()) recipients.add(mainWindow.webContents);
for (const contents of recipients) {
if (!contents.isDestroyed()) contents.send(channel, ...args);
const frame = liveMainFrame(contents);
if (frame) frame.send(channel, ...args);
}
}

function liveMainFrame(contents: Electron.WebContents): Electron.WebFrameMain | undefined {
if (contents.isDestroyed()) return undefined;
try {
const frame = contents.mainFrame;
return frame.isDestroyed() ? undefined : frame;
} catch {
// WebContents can outlive its Renderer generation. Electron may dispose
// the main frame between process loss/navigation and the replacement
// document, so broadcasts wait for the next live generation.
return undefined;
}
}

Expand Down