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

detect EventEmitter in removeRemoteListenersAndLogWarning (#12975)

Browse source
This commit is contained in:
Milan Burda 2018-05-18 04:09:25 +02:00 committed by Cheng Zhao
parent 850051463b
commit 5a5eb43359
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,8 +2,8 @@
const {Buffer} = require('buffer')
const electron = require('electron')
const {EventEmitter} = require('events')
const v8Util = process.atomBinding('v8_util')
const {WebContents} = process.atomBinding('web_contents')
const {ipcMain, isPromise, webContents} = electron
@ -147,12 +147,17 @@ const throwRPCError = function (message) {
throw error
}
const removeRemoteListenersAndLogWarning = (meta, args, callIntoRenderer) => {
const isEventEmitter = (object) => {
if (!object) return false
const prototype = Object.getPrototypeOf(object)
return prototype === EventEmitter.prototype || isEventEmitter(prototype)
}
const removeRemoteListenersAndLogWarning = (sender, meta, callIntoRenderer) => {
let message = `Attempting to call a function in a renderer window that has been closed or released.` +
`\nFunction provided here: ${meta.location}`
if (args.length > 0 && (args[0].sender instanceof WebContents)) {
const {sender} = args[0]
if (isEventEmitter(sender)) {
const remoteEvents = sender.eventNames().filter((eventName) => {
return sender.listeners(eventName).includes(callIntoRenderer)
})
@ -218,7 +223,7 @@ const unwrapArgs = function (sender, args) {
if (!sender.isDestroyed() && webContentsId === sender.getId()) {
sender.send('ELECTRON_RENDERER_CALLBACK', meta.id, valueToMeta(sender, args))
} else {
removeRemoteListenersAndLogWarning(meta, args, callIntoRenderer)
removeRemoteListenersAndLogWarning(this, meta, callIntoRenderer)
}
}
Object.defineProperty(callIntoRenderer, 'length', { value: meta.length })