mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix: apply senderFrame details to ipcMain port event (#33756)

Browse source
This commit is contained in:
Robo 2022-04-14 13:01:00 +09:00 committed by GitHub
parent 3d4d39d67b
commit 16f8d713ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/browser/api/web-contents.ts
View file

@ -627,6 +627,7 @@ WebContents.prototype._init = function () {
}); });
this.on('-ipc-ports' as any, function (event: Electron.IpcMainEvent, internal: boolean, channel: string, message: any, ports: any[]) { 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)); event.ports = ports.map(p => new MessagePortMain(p));
ipcMain.emit(channel, event, message); ipcMain.emit(channel, event, message);
}); });

4
spec-main/api-ipc-spec.ts
View file

@ -212,6 +212,8 @@ describe('ipc module', () => {
const [ev, msg] = await p; const [ev, msg] = await p;
expect(msg).to.equal('hi'); expect(msg).to.equal('hi');
expect(ev.ports).to.have.length(1); 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; const [port] = ev.ports;
expect(port).to.be.an.instanceOf(EventEmitter); expect(port).to.be.an.instanceOf(EventEmitter);
}); });
@ -226,6 +228,7 @@ describe('ipc module', () => {
const [ev, msg] = await p; const [ev, msg] = await p;
expect(msg).to.equal('hi'); expect(msg).to.equal('hi');
expect(ev.ports).to.deep.equal([]); expect(ev.ports).to.deep.equal([]);
expect(ev.senderFrame.routingId).to.equal(w.webContents.mainFrame.routingId);
}); });
it('can communicate between main and renderer', async () => { it('can communicate between main and renderer', async () => {
@ -241,6 +244,7 @@ describe('ipc module', () => {
}})()`); }})()`);
const [ev] = await p; const [ev] = await p;
expect(ev.ports).to.have.length(1); expect(ev.ports).to.have.length(1);
expect(ev.senderFrame.routingId).to.equal(w.webContents.mainFrame.routingId);
const [port] = ev.ports; const [port] = ev.ports;
port.start(); port.start();
port.postMessage(42); port.postMessage(42);