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

feat: add onclose method to MessagePort (#22532)

Browse source 
* feat: add onclose method to MessagePort

* more scope, more good

* de-flake GC test
This commit is contained in:
Jeremy Apthorp 2020-03-13 10:00:50 -07:00 • committed by GitHub
parent 829d4815a9
commit 0c02d794c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 114 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -278,6 +278,57 @@ describe('ipc module', () => {
expect(data).to.equal('a message')
})
describe('close event', () => {
describe('in renderer', () => {
it('is emitted when the main process closes its end of the port', async () => {
const w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true } })
w.loadURL('about:blank')
await w.webContents.executeJavaScript(`(${function () {
const { ipcRenderer } = require('electron')
ipcRenderer.on('port', (e) => {
const [port] = e.ports
port.start();
(port as any).onclose = () => {
ipcRenderer.send('closed')
}
})
}})()`)
const { port1, port2 } = new MessageChannelMain()
w.webContents.postMessage('port', null, [port2])
port1.close()
await emittedOnce(ipcMain, 'closed')
})
it('is emitted when the other end of a port is garbage-collected', async () => {
const w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true } })
w.loadURL('about:blank')
await w.webContents.executeJavaScript(`(${async function () {
const { port2 } = new MessageChannel()
await new Promise(resolve => {
port2.start();
(port2 as any).onclose = resolve
process.electronBinding('v8_util').requestGarbageCollectionForTesting()
})
}})()`)
})
it('is emitted when the other end of a port is sent to nowhere', async () => {
const w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true } })
w.loadURL('about:blank')
ipcMain.once('do-a-gc', () => v8Util.requestGarbageCollectionForTesting())
await w.webContents.executeJavaScript(`(${async function () {
const { port1, port2 } = new MessageChannel()
await new Promise(resolve => {
port2.start();
(port2 as any).onclose = resolve
require('electron').ipcRenderer.postMessage('nobody-listening', null, [port1])
require('electron').ipcRenderer.send('do-a-gc')
})
}})()`)
})
})
})
describe('MessageChannelMain', () => {
it('can be created', () => {
const { port1, port2 } = new MessageChannelMain()