mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
fix: apply senderFrame details to ipcMain port event (#33781)
Co-authored-by: deepak1556 <hop2deep@gmail.com>
This commit is contained in:
@@ -613,6 +613,7 @@ WebContents.prototype._init = function () {
|
||||
});
|
||||
|
||||
this.on('-ipc-ports' as any, function (event: Electron.IpcMainEvent, internal: boolean, channel: string, message: any, ports: any[]) {
|
||||
addSenderFrameToEvent(event);
|
||||
event.ports = ports.map(p => new MessagePortMain(p));
|
||||
ipcMain.emit(channel, event, message);
|
||||
});
|
||||
|
||||
@@ -212,6 +212,8 @@ describe('ipc module', () => {
|
||||
const [ev, msg] = await p;
|
||||
expect(msg).to.equal('hi');
|
||||
expect(ev.ports).to.have.length(1);
|
||||
expect(ev.senderFrame.parent).to.be.null();
|
||||
expect(ev.senderFrame.routingId).to.equal(w.webContents.mainFrame.routingId);
|
||||
const [port] = ev.ports;
|
||||
expect(port).to.be.an.instanceOf(EventEmitter);
|
||||
});
|
||||
@@ -226,6 +228,7 @@ describe('ipc module', () => {
|
||||
const [ev, msg] = await p;
|
||||
expect(msg).to.equal('hi');
|
||||
expect(ev.ports).to.deep.equal([]);
|
||||
expect(ev.senderFrame.routingId).to.equal(w.webContents.mainFrame.routingId);
|
||||
});
|
||||
|
||||
it('can communicate between main and renderer', async () => {
|
||||
@@ -241,6 +244,7 @@ describe('ipc module', () => {
|
||||
}})()`);
|
||||
const [ev] = await p;
|
||||
expect(ev.ports).to.have.length(1);
|
||||
expect(ev.senderFrame.routingId).to.equal(w.webContents.mainFrame.routingId);
|
||||
const [port] = ev.ports;
|
||||
port.start();
|
||||
port.postMessage(42);
|
||||
|
||||
Reference in New Issue
Block a user