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

Write a warning instead of crashing.

Browse source
This commit is contained in:
Charlie Hess 2017-01-13 12:28:11 -08:00 • committed by Kevin Sawicki
parent bc2f1e8199
commit c213971a2d
3 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/browser/rpc-server.js
View file

@ -160,6 +160,9 @@ const rendererMissingErrorMessage = (meta, args, callIntoRenderer) => {
if (remoteEvents.length > 0) { if (remoteEvents.length > 0) {
message += `\nRemote event names: ${remoteEvents.join(', ')}` message += `\nRemote event names: ${remoteEvents.join(', ')}`
remoteEvents.forEach((eventName) => {
sender.removeListener(eventName, callIntoRenderer)
})
} }
return message return message
@ -215,7 +218,7 @@ const unwrapArgs = function (sender, args) {
if (!sender.isDestroyed() && webContentsId === sender.getId()) { if (!sender.isDestroyed() && webContentsId === sender.getId()) {
sender.send('ELECTRON_RENDERER_CALLBACK', meta.id, valueToMeta(sender, args)) sender.send('ELECTRON_RENDERER_CALLBACK', meta.id, valueToMeta(sender, args))
} else { } else {
throw new Error(rendererMissingErrorMessage(meta, args, callIntoRenderer)) console.warn(rendererMissingErrorMessage(meta, args, callIntoRenderer))
} }
} }

6
spec/api-ipc-spec.js
View file

@ -495,7 +495,7 @@ describe('ipc module', function () {
assert.equal(w.listenerCount('test'), 0) assert.equal(w.listenerCount('test'), 0)
}) })
it('throws an error when a function is called in a destroyed renderer', (done) => { it('shows a warning when a function is called in a destroyed renderer', (done) => {
w = new BrowserWindow({ w = new BrowserWindow({
show: false show: false
}) })
@ -506,8 +506,8 @@ describe('ipc module', function () {
'Function provided here: remote-event-handler.html:11:33', 'Function provided here: remote-event-handler.html:11:33',
'Remote event names: remote-handler, other-remote-handler' 'Remote event names: remote-handler, other-remote-handler'
].join('\n') ].join('\n')
const errorMessage = ipcRenderer.sendSync('try-emit-web-contents-event', w.webContents.id, 'remote-handler') const warningMessage = ipcRenderer.sendSync('try-emit-web-contents-event', w.webContents.id, 'remote-handler')
assert.equal(errorMessage, expectedMessage) assert.equal(warningMessage, expectedMessage)
done() done()
}) })
w.webContents.reload() w.webContents.reload()

14
spec/static/main.js
View file

@ -251,11 +251,13 @@ ipcMain.on('prevent-next-new-window', (event, id) => {
}) })
ipcMain.on('try-emit-web-contents-event', (event, id, eventName) => { ipcMain.on('try-emit-web-contents-event', (event, id, eventName) => {
const contents = webContents.fromId(id) const consoleWarn = console.warn
try { let lastWarning = null
contents.emit(eventName, {sender: contents}) console.warn = (message) => {
event.returnValue = null lastWarning = message
} catch (error) {
event.returnValue = error.message
} }
const contents = webContents.fromId(id)
contents.emit(eventName, {sender: contents})
event.returnValue = lastWarning
console.warn = consoleWarn
}) })