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

Fix missing remote object error when calling remote function created in preload script (#15444)

Browse source 
* fix: report wrong context error based on contextId

* fix: destroyed remote renderer warning is now async
This commit is contained in:
Cheng Zhao 2018-11-01 00:26:57 +09:00 • committed by John Kleinschmidt
parent b2e1a93177
commit a8f2646ba6
5 changed files with 54 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -152,9 +152,10 @@ const throwRPCError = function (message) {
throw error
}
const removeRemoteListenersAndLogWarning = (sender, meta, callIntoRenderer) => {
const removeRemoteListenersAndLogWarning = (sender, callIntoRenderer) => {
const location = v8Util.getHiddenValue(callIntoRenderer, 'location')
let message = `Attempting to call a function in a renderer window that has been closed or released.` +
`\nFunction provided here: ${meta.location}`
`\nFunction provided here: ${location}`
if (sender instanceof EventEmitter) {
const remoteEvents = sender.eventNames().filter((eventName) => {
@ -214,14 +215,14 @@ const unwrapArgs = function (sender, contextId, args) {
return rendererFunctions.get(objectId)
}
const processId = sender.getProcessId()
const callIntoRenderer = function (...args) {
if (!sender.isDestroyed() && processId === sender.getProcessId()) {
if (!sender.isDestroyed()) {
sender._sendInternal('ELECTRON_RENDERER_CALLBACK', contextId, meta.id, valueToMeta(sender, contextId, args))
} else {
removeRemoteListenersAndLogWarning(this, meta, callIntoRenderer)
removeRemoteListenersAndLogWarning(this, callIntoRenderer)
}
}
v8Util.setHiddenValue(callIntoRenderer, 'location', meta.location)
Object.defineProperty(callIntoRenderer, 'length', { value: meta.length })
v8Util.setRemoteCallbackFreer(callIntoRenderer, contextId, meta.id, sender)
@ -281,6 +282,15 @@ const handleRemoteCommand = function (channel, handler) {
})
}
handleRemoteCommand('ELECTRON_BROWSER_WRONG_CONTEXT_ERROR', function (event, contextId, passedContextId, id) {
const objectId = [passedContextId, id]
if (!rendererFunctions.has(objectId)) {
// Do nothing if the error has already been reported before.
return
}
removeRemoteListenersAndLogWarning(event.sender, rendererFunctions.get(objectId))
})
handleRemoteCommand('ELECTRON_BROWSER_REQUIRE', function (event, contextId, moduleName) {
const customEvent = eventBinding.createWithSender(event.sender)
event.sender.emit('remote-require', customEvent, moduleName)