From a56d1ab785155154b9bc4dd4ac4e8db0ebdf4fce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=A5=87?= <16399091+binaricat@users.noreply.github.com> Date: Tue, 27 Oct 2026 12:04:34 +0000 Subject: [PATCH] fix(plugins): skip destroyed WebContents during scope broadcasts --- .../registerBridgesPluginBroadcast.test.cjs | 29 +++++++++++++++++++ electron/main/registerBridges.cjs | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 electron/bridges/registerBridgesPluginBroadcast.test.cjs diff --git a/electron/bridges/registerBridgesPluginBroadcast.test.cjs b/electron/bridges/registerBridgesPluginBroadcast.test.cjs new file mode 100644 index 000000000..416f51a10 --- /dev/null +++ b/electron/bridges/registerBridgesPluginBroadcast.test.cjs @@ -0,0 +1,29 @@ +"use strict"; + +const test = require("node:test"); +const assert = require("node:assert/strict"); +const fs = require("node:fs"); +const path = require("node:path"); +const vm = require("node:vm"); + +test("actual plugin broadcast skips destroyed WebContents while its BrowserWindow is still alive", () => { + // Evaluate the actual registrar callback with narrow window fixtures. This + // models the destruction-event ordering, not an installed Electron crash. + const source = fs.readFileSync(path.join(__dirname, "../main/registerBridges.cjs"), "utf8"); + const callbacks = [...source.matchAll(/broadcast: \(channel, payload\) => \{([\s\S]*?)\n \},/g)]; + assert.equal(callbacks.length, 1); + const received = []; + const deadWindow = { isDestroyed: () => true, get webContents() { throw Error("Destroyed BrowserWindow getter"); } }; + const closingWindow = { isDestroyed: () => false, webContents: { + isDestroyed: () => true, send() { throw Error("Object has been destroyed"); }, + } }; + const liveWindow = { isDestroyed: () => false, webContents: { + isDestroyed: () => false, send: (...args) => received.push(args), + } }; + const broadcast = vm.runInNewContext(`(channel, payload) => {${callbacks[0][1]}\n}`, { + electronModule: { BrowserWindow: { getAllWindows: () => [deadWindow, closingWindow, liveWindow] } }, + }); + const payload = { host: [], session: [] }; + assert.doesNotThrow(() => broadcast("netcatty:plugins:scope-catalog-changed", payload)); + assert.deepEqual(received, [["netcatty:plugins:scope-catalog-changed", payload]]); +}); diff --git a/electron/main/registerBridges.cjs b/electron/main/registerBridges.cjs index 16ea609d3..9f53e8108 100644 --- a/electron/main/registerBridges.cjs +++ b/electron/main/registerBridges.cjs @@ -240,7 +240,7 @@ function createBridgeRegistrar(context) { isTrustedSender: createTrustedPluginBridgeSender({ devServerUrl: effectiveDevServerUrl }), broadcast: (channel, payload) => { for (const window of electronModule.BrowserWindow.getAllWindows()) { - if (!window.isDestroyed()) window.webContents.send(channel, payload); + if (!window.isDestroyed() && !window.webContents.isDestroyed()) window.webContents.send(channel, payload); } }, });