refactor: use separate ipc-renderer-internal / ipc-main-internal APIs for Electron internals (#13940)

lib/browser/api/browser-window.js

@@ -1,9 +1,10 @@
 'use strict'
 
 const electron = require('electron')
-const { ipcMain, WebContentsView, TopLevelWindow } = electron
+const { WebContentsView, TopLevelWindow } = electron
 const { BrowserWindow } = process.atomBinding('window')
 const v8Util = process.atomBinding('v8_util')
+const ipcMain = require('@electron/internal/browser/ipc-main-internal')
 
 Object.setPrototypeOf(BrowserWindow.prototype, TopLevelWindow.prototype)
 

lib/browser/api/crash-reporter.js

@@ -0,0 +1,14 @@
+'use strict'
+
+const CrashReporter = require('@electron/internal/common/crash-reporter')
+const ipcMain = require('@electron/internal/browser/ipc-main-internal')
+
+class CrashReporterMain extends CrashReporter {
+  sendSync (channel, ...args) {
+    const event = {}
+    ipcMain.emit(channel, event, ...args)
+    return event.returnValue
+  }
+}
+
+module.exports = new CrashReporterMain()

lib/browser/api/ipc-main.js

@@ -1,17 +1,9 @@
 'use strict'
 
-const EventEmitter = require('events').EventEmitter
+const { EventEmitter } = require('events')
 
 const emitter = new EventEmitter()
 
-const removeAllListeners = emitter.removeAllListeners.bind(emitter)
-emitter.removeAllListeners = function (...args) {
-  if (args.length === 0) {
-    throw new Error('Removing all listeners from ipcMain will make Electron internals stop working.  Please specify a event name')
-  }
-  removeAllListeners(...args)
-}
-
 // Do not throw exception when channel name is "error".
 emitter.on('error', () => {})
 

lib/browser/api/module-list.js

@@ -9,6 +9,7 @@ module.exports = [
   { name: 'BrowserView', file: 'browser-view' },
   { name: 'BrowserWindow', file: 'browser-window' },
   { name: 'contentTracing', file: 'content-tracing' },
+  { name: 'crashReporter', file: 'crash-reporter' },
   { name: 'dialog', file: 'dialog' },
   { name: 'globalShortcut', file: 'global-shortcut' },
   { name: 'ipcMain', file: 'ipc-main' },

lib/browser/api/navigation-controller.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { ipcMain } = require('electron')
+const ipcMain = require('@electron/internal/browser/ipc-main-internal')
 
 // The history operation in renderer is redirected to browser.
 ipcMain.on('ELECTRON_NAVIGATION_CONTROLLER', function (event, method, ...args) {

lib/browser/api/web-contents.js

@@ -6,6 +6,7 @@ const path = require('path')
 const url = require('url')
 const { app, ipcMain, session, NavigationController, deprecate } = electron
 
+const ipcMainInternal = require('@electron/internal/browser/ipc-main-internal')
 const errorUtils = require('@electron/internal/common/error-utils')
 
 // session is not used here, the purpose is to make sure session is initalized
@@ -98,12 +99,45 @@ Object.setPrototypeOf(WebContents.prototype, NavigationController.prototype)
 // WebContents::send(channel, args..)
 // WebContents::sendToAll(channel, args..)
 WebContents.prototype.send = function (channel, ...args) {
-  if (channel == null) throw new Error('Missing required channel argument')
-  return this._send(false, channel, args)
+  if (typeof channel !== 'string') {
+    throw new Error('Missing required channel argument')
+  }
+
+  const internal = false
+  const sendToAll = false
+
+  return this._send(internal, sendToAll, channel, args)
 }
 WebContents.prototype.sendToAll = function (channel, ...args) {
-  if (channel == null) throw new Error('Missing required channel argument')
-  return this._send(true, channel, args)
+  if (typeof channel !== 'string') {
+    throw new Error('Missing required channel argument')
+  }
+
+  const internal = false
+  const sendToAll = true
+
+  return this._send(internal, sendToAll, channel, args)
+}
+
+WebContents.prototype._sendInternal = function (channel, ...args) {
+  if (typeof channel !== 'string') {
+    throw new Error('Missing required channel argument')
+  }
+
+  const internal = true
+  const sendToAll = false
+
+  return this._send(internal, sendToAll, channel, args)
+}
+WebContents.prototype._sendInternalToAll = function (channel, ...args) {
+  if (typeof channel !== 'string') {
+    throw new Error('Missing required channel argument')
+  }
+
+  const internal = true
+  const sendToAll = true
+
+  return this._send(internal, sendToAll, channel, args)
 }
 
 // Following methods are mapped to webFrame.
@@ -116,8 +150,7 @@ const webFrameMethods = [
 
 const asyncWebFrameMethods = function (requestId, method, callback, ...args) {
   return new Promise((resolve, reject) => {
-    this.send('ELECTRON_INTERNAL_RENDERER_ASYNC_WEB_FRAME_METHOD', requestId, method, args)
-    ipcMain.once(`ELECTRON_INTERNAL_BROWSER_ASYNC_WEB_FRAME_RESPONSE_${requestId}`, function (event, error, result) {
+    ipcMainInternal.once(`ELECTRON_INTERNAL_BROWSER_ASYNC_WEB_FRAME_RESPONSE_${requestId}`, function (event, error, result) {
       if (error == null) {
         if (typeof callback === 'function') callback(result)
         resolve(result)
@@ -125,12 +158,13 @@ const asyncWebFrameMethods = function (requestId, method, callback, ...args) {
         reject(errorUtils.deserialize(error))
       }
     })
+    this._sendInternal('ELECTRON_INTERNAL_RENDERER_ASYNC_WEB_FRAME_METHOD', requestId, method, args)
   })
 }
 
 for (const method of webFrameMethods) {
   WebContents.prototype[method] = function (...args) {
-    this.send('ELECTRON_INTERNAL_RENDERER_WEB_FRAME_METHOD', method, args)
+    this._sendInternal('ELECTRON_INTERNAL_RENDERER_WEB_FRAME_METHOD', method, args)
   }
 }
 
@@ -277,6 +311,19 @@ WebContents.prototype._init = function () {
     ipcMain.emit(channel, event, ...args)
   })
 
+  this.on('ipc-internal-message', function (event, [channel, ...args]) {
+    ipcMainInternal.emit(channel, event, ...args)
+  })
+  this.on('ipc-internal-message-sync', function (event, [channel, ...args]) {
+    Object.defineProperty(event, 'returnValue', {
+      set: function (value) {
+        return event.sendReply([value])
+      },
+      get: function () {}
+    })
+    ipcMainInternal.emit(channel, event, ...args)
+  })
+
   // Handle context menu action request from pepper plugin.
   this.on('pepper-context-menu', function (event, params, callback) {
     // Access Menu via electron.Menu to prevent circular require.

lib/browser/chrome-extension.js

@@ -1,8 +1,9 @@
 'use strict'
 
-const { app, ipcMain, webContents, BrowserWindow } = require('electron')
+const { app, webContents, BrowserWindow } = require('electron')
 const { getAllWebContents } = process.atomBinding('web_contents')
 const renderProcessPreferences = process.atomBinding('render_process_preferences').forAllWebContents()
+const ipcMain = require('@electron/internal/browser/ipc-main-internal')
 
 const { Buffer } = require('buffer')
 const fs = require('fs')
@@ -108,7 +109,7 @@ const removeBackgroundPages = function (manifest) {
 
 const sendToBackgroundPages = function (...args) {
   for (const page of Object.values(backgroundPages)) {
-    page.webContents.sendToAll(...args)
+    page.webContents._sendInternalToAll(...args)
   }
 }
 
@@ -160,9 +161,9 @@ ipcMain.on('CHROME_RUNTIME_CONNECT', function (event, extensionId, connectInfo)
 
   event.sender.once('render-view-deleted', () => {
     if (page.webContents.isDestroyed()) return
-    page.webContents.sendToAll(`CHROME_PORT_DISCONNECT_${portId}`)
+    page.webContents._sendInternalToAll(`CHROME_PORT_DISCONNECT_${portId}`)
   })
-  page.webContents.sendToAll(`CHROME_RUNTIME_ONCONNECT_${extensionId}`, event.sender.id, portId, connectInfo)
+  page.webContents._sendInternalToAll(`CHROME_RUNTIME_ONCONNECT_${extensionId}`, event.sender.id, portId, connectInfo)
 })
 
 ipcMain.on('CHROME_I18N_MANIFEST', function (event, extensionId) {
@@ -177,9 +178,9 @@ ipcMain.on('CHROME_RUNTIME_SENDMESSAGE', function (event, extensionId, message,
     return
   }
 
-  page.webContents.sendToAll(`CHROME_RUNTIME_ONMESSAGE_${extensionId}`, event.sender.id, message, resultID)
+  page.webContents._sendInternalToAll(`CHROME_RUNTIME_ONMESSAGE_${extensionId}`, event.sender.id, message, resultID)
   ipcMain.once(`CHROME_RUNTIME_ONMESSAGE_RESULT_${resultID}`, (event, result) => {
-    event.sender.send(`CHROME_RUNTIME_SENDMESSAGE_RESULT_${originResultID}`, result)
+    event.sender._sendInternal(`CHROME_RUNTIME_SENDMESSAGE_RESULT_${originResultID}`, result)
   })
   resultID++
 })
@@ -193,9 +194,9 @@ ipcMain.on('CHROME_TABS_SEND_MESSAGE', function (event, tabId, extensionId, isBa
 
   const senderTabId = isBackgroundPage ? null : event.sender.id
 
-  contents.sendToAll(`CHROME_RUNTIME_ONMESSAGE_${extensionId}`, senderTabId, message, resultID)
+  contents._sendInternalToAll(`CHROME_RUNTIME_ONMESSAGE_${extensionId}`, senderTabId, message, resultID)
   ipcMain.once(`CHROME_RUNTIME_ONMESSAGE_RESULT_${resultID}`, (event, result) => {
-    event.sender.send(`CHROME_TABS_SEND_MESSAGE_RESULT_${originResultID}`, result)
+    event.sender._sendInternal(`CHROME_TABS_SEND_MESSAGE_RESULT_${originResultID}`, result)
   })
   resultID++
 })
@@ -217,7 +218,7 @@ ipcMain.on('CHROME_TABS_EXECUTESCRIPT', function (event, requestId, tabId, exten
     url = `chrome-extension://${extensionId}/${String(Math.random()).substr(2, 8)}.js`
   }
 
-  contents.send('CHROME_TABS_EXECUTESCRIPT', event.sender.id, requestId, extensionId, url, code)
+  contents._sendInternal('CHROME_TABS_EXECUTESCRIPT', event.sender.id, requestId, extensionId, url, code)
 })
 
 // Transfer the content scripts to renderer.

lib/browser/desktop-capturer.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { ipcMain } = require('electron')
+const ipcMain = require('@electron/internal/browser/ipc-main-internal')
 const { desktopCapturer } = process.atomBinding('desktop_capturer')
 
 const deepEqual = (a, b) => JSON.stringify(a) === JSON.stringify(b)
@@ -49,14 +49,16 @@ desktopCapturer.emit = (event, name, sources) => {
   })
 
   if (handledWebContents) {
-    handledWebContents.send(capturerResult(handledRequest.id), result)
+    handledWebContents._sendInternal(capturerResult(handledRequest.id), result)
   }
 
   // Check the queue to see whether there is another identical request & handle
   requestsQueue.forEach(request => {
     const webContents = request.webContents
     if (deepEqual(handledRequest.options, request.options)) {
-      if (webContents) webContents.send(capturerResult(request.id), result)
+      if (webContents) {
+        webContents._sendInternal(capturerResult(request.id), result)
+      }
     } else {
       unhandledRequestsQueue.push(request)
     }

lib/browser/guest-view-manager.js

@@ -1,6 +1,7 @@
 'use strict'
 
-const { ipcMain, webContents } = require('electron')
+const { webContents } = require('electron')
+const ipcMain = require('@electron/internal/browser/ipc-main-internal')
 const parseFeaturesString = require('@electron/internal/common/parse-features-string')
 
 // Doesn't exist in early initialization.
@@ -118,7 +119,7 @@ const createGuest = function (embedder, params) {
 
   const sendToEmbedder = (channel, ...args) => {
     if (!embedder.isDestroyed()) {
-      embedder.send(`${channel}-${guest.viewInstanceId}`, ...args)
+      embedder._sendInternal(`${channel}-${guest.viewInstanceId}`, ...args)
     }
   }
 
@@ -142,7 +143,7 @@ const createGuest = function (embedder, params) {
   guest.on('dom-ready', function () {
     const guestInstance = guestInstances[guestInstanceId]
     if (guestInstance != null && guestInstance.visibilityState != null) {
-      guest.send('ELECTRON_GUEST_INSTANCE_VISIBILITY_CHANGE', guestInstance.visibilityState)
+      guest._sendInternal('ELECTRON_GUEST_INSTANCE_VISIBILITY_CHANGE', guestInstance.visibilityState)
     }
   })
 
@@ -201,7 +202,7 @@ const attachGuest = function (event, embedderFrameId, elementInstanceId, guestIn
     // Remove guest from embedder if moving across web views
     if (guest.viewInstanceId !== params.instanceId) {
       webViewManager.removeGuest(guestInstance.embedder, guestInstanceId)
-      guestInstance.embedder.send(`ELECTRON_GUEST_VIEW_INTERNAL_DESTROY_GUEST-${guest.viewInstanceId}`)
+      guestInstance.embedder._sendInternal(`ELECTRON_GUEST_VIEW_INTERNAL_DESTROY_GUEST-${guest.viewInstanceId}`)
     }
   }
 
@@ -302,7 +303,7 @@ const watchEmbedder = function (embedder) {
       const guestInstance = guestInstances[guestInstanceId]
       guestInstance.visibilityState = visibilityState
       if (guestInstance.embedder === embedder) {
-        guestInstance.guest.send('ELECTRON_GUEST_INSTANCE_VISIBILITY_CHANGE', visibilityState)
+        guestInstance.guest._sendInternal('ELECTRON_GUEST_INSTANCE_VISIBILITY_CHANGE', visibilityState)
       }
     }
   }
@@ -325,7 +326,7 @@ const watchEmbedder = function (embedder) {
 }
 
 ipcMain.on('ELECTRON_GUEST_VIEW_MANAGER_CREATE_GUEST', function (event, params, requestId) {
-  event.sender.send(`ELECTRON_RESPONSE_${requestId}`, createGuest(event.sender, params))
+  event.sender._sendInternal(`ELECTRON_RESPONSE_${requestId}`, createGuest(event.sender, params))
 })
 
 ipcMain.on('ELECTRON_GUEST_VIEW_MANAGER_CREATE_GUEST_SYNC', function (event, params) {

lib/browser/guest-window-manager.js

@@ -1,7 +1,8 @@
 'use strict'
 
-const { BrowserWindow, ipcMain, webContents } = require('electron')
+const { BrowserWindow, webContents } = require('electron')
 const { isSameOrigin } = process.atomBinding('v8_util')
+const ipcMain = require('@electron/internal/browser/ipc-main-internal')
 const parseFeaturesString = require('@electron/internal/common/parse-features-string')
 
 const hasProp = {}.hasOwnProperty
@@ -87,7 +88,7 @@ const setupGuest = function (embedder, frameName, guest, options) {
     guest.destroy()
   }
   const closedByUser = function () {
-    embedder.send('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_CLOSED_' + guestId)
+    embedder._sendInternal('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_CLOSED_' + guestId)
     embedder.removeListener('render-view-deleted', closedByEmbedder)
   }
   embedder.once('render-view-deleted', closedByEmbedder)
@@ -320,7 +321,7 @@ ipcMain.on('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_POSTMESSAGE', function (event,
   // postMessage across origins is useful and not harmful.
   if (targetOrigin === '*' || isSameOrigin(guestContents.getURL(), targetOrigin)) {
     const sourceId = event.sender.id
-    guestContents.send('ELECTRON_GUEST_WINDOW_POSTMESSAGE', sourceId, message, sourceOrigin)
+    guestContents._sendInternal('ELECTRON_GUEST_WINDOW_POSTMESSAGE', sourceId, message, sourceOrigin)
   }
 })
 

lib/browser/ipc-main-internal.js

@@ -0,0 +1,10 @@
+'use strict'
+
+const { EventEmitter } = require('events')
+
+const emitter = new EventEmitter()
+
+// Do not throw exception when channel name is "error".
+emitter.on('error', () => {})
+
+module.exports = emitter

lib/browser/rpc-server.js

@@ -8,8 +8,9 @@ const os = require('os')
 const path = require('path')
 const v8Util = process.atomBinding('v8_util')
 
-const { ipcMain, isPromise } = electron
+const { isPromise } = electron
 
+const ipcMain = require('@electron/internal/browser/ipc-main-internal')
 const objectsRegistry = require('@electron/internal/browser/objects-registry')
 const bufferUtils = require('@electron/internal/common/buffer-utils')
 const errorUtils = require('@electron/internal/common/error-utils')
@@ -215,7 +216,7 @@ const unwrapArgs = function (sender, contextId, args) {
         const processId = sender.getProcessId()
         const callIntoRenderer = function (...args) {
           if (!sender.isDestroyed() && processId === sender.getProcessId()) {
-            sender.send('ELECTRON_RENDERER_CALLBACK', contextId, meta.id, valueToMeta(sender, contextId, args))
+            sender._sendInternal('ELECTRON_RENDERER_CALLBACK', contextId, meta.id, valueToMeta(sender, contextId, args))
           } else {
             removeRemoteListenersAndLogWarning(this, meta, callIntoRenderer)
           }
@@ -390,7 +391,7 @@ ipcMain.on('ELECTRON_BROWSER_ASYNC_CALL_TO_GUEST_VIEW', function (event, request
   }, error => {
     return [errorUtils.serialize(error)]
   }).then(responseArgs => {
-    event.sender.send(`ELECTRON_RENDERER_ASYNC_CALL_TO_GUEST_VIEW_RESPONSE_${requestId}`, ...responseArgs)
+    event.sender._sendInternal(`ELECTRON_RENDERER_ASYNC_CALL_TO_GUEST_VIEW_RESPONSE_${requestId}`, ...responseArgs)
   })
 })
 
@@ -424,7 +425,7 @@ const getTempDirectory = function () {
   }
 }
 
-ipcMain.on('ELECTRON_CRASH_REPORTER_INIT', function (event, options) {
+const crashReporterInit = function (options) {
   const productName = options.productName || electron.app.getName()
   const crashesDirectory = path.join(getTempDirectory(), `${productName} Crashes`)
 
@@ -445,11 +446,19 @@ ipcMain.on('ELECTRON_CRASH_REPORTER_INIT', function (event, options) {
     })
   }
 
-  event.returnValue = {
+  return {
     productName,
     crashesDirectory,
     appVersion: electron.app.getVersion()
   }
+}
+
+ipcMain.on('ELECTRON_CRASH_REPORTER_INIT', function (event, options) {
+  try {
+    event.returnValue = [null, crashReporterInit(options)]
+  } catch (error) {
+    event.returnValue = [errorUtils.serialize(error)]
+  }
 })
 
 ipcMain.on('ELECTRON_BROWSER_SANDBOX_LOAD', function (event) {

lib/common/api/module-list.js

@@ -3,7 +3,6 @@
 // Common modules, please sort alphabetically
 module.exports = [
   { name: 'clipboard', file: 'clipboard' },
-  { name: 'crashReporter', file: 'crash-reporter' },
   { name: 'nativeImage', file: 'native-image' },
   { name: 'shell', file: 'shell' },
   // The internal modules, invisible unless you know their names.

lib/common/crash-reporter.js

@@ -1,17 +1,8 @@
 'use strict'
 
-const electron = require('electron')
 const binding = process.atomBinding('crash_reporter')
 
-const sendSync = function (channel, ...args) {
-  if (process.type === 'browser') {
-    const event = {}
-    electron.ipcMain.emit(channel, event, ...args)
-    return event.returnValue
-  } else {
-    return electron.ipcRenderer.sendSync(channel, ...args)
-  }
-}
+const errorUtils = require('@electron/internal/common/error-utils')
 
 class CrashReporter {
   contructor () {
@@ -19,6 +10,20 @@ class CrashReporter {
     this.crashesDirectory = null
   }
 
+  sendSync (channel, ...args) {
+    throw new Error('Not implemented')
+  }
+
+  invoke (command, ...args) {
+    const [ error, result ] = this.sendSync(command, ...args)
+
+    if (error) {
+      throw errorUtils.deserialize(error)
+    }
+
+    return result
+  }
+
   start (options) {
     if (options == null) options = {}
 
@@ -46,7 +51,7 @@ class CrashReporter {
       throw new Error('submitURL is a required option to crashReporter.start')
     }
 
-    const ret = sendSync('ELECTRON_CRASH_REPORTER_INIT', {
+    const ret = this.invoke('ELECTRON_CRASH_REPORTER_INIT', {
       submitURL,
       productName
     })
@@ -114,4 +119,4 @@ class CrashReporter {
   }
 }
 
-module.exports = new CrashReporter()
+module.exports = CrashReporter

lib/isolated_renderer/init.js

@@ -6,11 +6,11 @@ const { send, sendSync } = binding
 
 const ipcRenderer = {
   send (...args) {
-    return send('ipc-message', args)
+    return send('ipc-internal-message', args)
   },
 
   sendSync (...args) {
-    return sendSync('ipc-message-sync', args)[0]
+    return sendSync('ipc-internal-message-sync', args)[0]
   },
 
   // No-ops since events aren't received

lib/renderer/api/crash-reporter.js

@@ -0,0 +1,12 @@
+'use strict'
+
+const CrashReporter = require('@electron/internal/common/crash-reporter')
+const ipcRenderer = require('@electron/internal/renderer/ipc-renderer-internal')
+
+class CrashReporterRenderer extends CrashReporter {
+  sendSync (channel, ...args) {
+    return ipcRenderer.sendSync(channel, ...args)
+  }
+}
+
+module.exports = new CrashReporterRenderer()

lib/renderer/api/desktop-capturer.js

@@ -1,6 +1,7 @@
 'use strict'
 
-const { ipcRenderer, nativeImage } = require('electron')
+const { nativeImage } = require('electron')
+const ipcRenderer = require('@electron/internal/renderer/ipc-renderer-internal')
 
 const includes = [].includes
 let currentId = 0

lib/renderer/api/ipc-renderer.js

@@ -5,6 +5,7 @@ const v8Util = process.atomBinding('v8_util')
 
 // Created by init.js.
 const ipcRenderer = v8Util.getHiddenValue(global, 'ipc')
+const internal = false
 
 ipcRenderer.send = function (...args) {
   return binding.send('ipc-message', args)
@@ -19,19 +20,11 @@ ipcRenderer.sendToHost = function (...args) {
 }
 
 ipcRenderer.sendTo = function (webContentsId, channel, ...args) {
-  return binding.sendTo(false, webContentsId, channel, args)
+  return binding.sendTo(internal, false, webContentsId, channel, args)
 }
 
 ipcRenderer.sendToAll = function (webContentsId, channel, ...args) {
-  return binding.sendTo(true, webContentsId, channel, args)
-}
-
-const removeAllListeners = ipcRenderer.removeAllListeners.bind(ipcRenderer)
-ipcRenderer.removeAllListeners = function (...args) {
-  if (args.length === 0) {
-    throw new Error('Removing all listeners from ipcRenderer will make Electron internals stop working.  Please specify a event name')
-  }
-  removeAllListeners(...args)
+  return binding.sendTo(internal, true, webContentsId, channel, args)
 }
 
 module.exports = ipcRenderer

lib/renderer/api/module-list.js

@@ -5,6 +5,7 @@ const features = process.atomBinding('features')
 // Renderer side modules, please sort alphabetically.
 // A module is `enabled` if there is no explicit condition defined.
 module.exports = [
+  { name: 'crashReporter', file: 'crash-reporter', enabled: true },
   {
     name: 'desktopCapturer',
     file: 'desktop-capturer',

lib/renderer/api/remote.js

@@ -1,12 +1,13 @@
 'use strict'
 
 const v8Util = process.atomBinding('v8_util')
-const { ipcRenderer, isPromise } = require('electron')
+const { isPromise } = require('electron')
 const resolvePromise = Promise.resolve.bind(Promise)
 
 const CallbacksRegistry = require('@electron/internal/renderer/callbacks-registry')
 const bufferUtils = require('@electron/internal/common/buffer-utils')
 const errorUtils = require('@electron/internal/common/error-utils')
+const ipcRenderer = require('@electron/internal/renderer/ipc-renderer-internal')
 
 const callbacksRegistry = new CallbacksRegistry()
 const remoteObjectCache = v8Util.createIDWeakMap()

lib/renderer/chrome-api.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { ipcRenderer } = require('electron')
+const ipcRenderer = require('@electron/internal/renderer/ipc-renderer-internal')
 const Event = require('@electron/internal/renderer/extensions/event')
 const url = require('url')
 
@@ -43,12 +43,12 @@ class Port {
   disconnect () {
     if (this.disconnected) return
 
-    ipcRenderer.sendToAll(this.tabId, `CHROME_PORT_DISCONNECT_${this.portId}`)
+    ipcRenderer._sendInternalToAll(this.tabId, `CHROME_PORT_DISCONNECT_${this.portId}`)
     this._onDisconnect()
   }
 
   postMessage (message) {
-    ipcRenderer.sendToAll(this.tabId, `CHROME_PORT_POSTMESSAGE_${this.portId}`, message)
+    ipcRenderer._sendInternalToAll(this.tabId, `CHROME_PORT_POSTMESSAGE_${this.portId}`, message)
   }
 
   _onDisconnect () {

lib/renderer/content-scripts-injector.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { ipcRenderer } = require('electron')
+const ipcRenderer = require('@electron/internal/renderer/ipc-renderer-internal')
 const { runInThisContext } = require('vm')
 
 // Check whether pattern matches.

lib/renderer/extensions/i18n.js

@@ -6,7 +6,7 @@
 // Does not implement predefined messages:
 // https://developer.chrome.com/extensions/i18n#overview-predefined
 
-const { ipcRenderer } = require('electron')
+const ipcRenderer = require('@electron/internal/renderer/ipc-renderer-internal')
 const fs = require('fs')
 const path = require('path')
 

lib/renderer/extensions/web-navigation.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const Event = require('@electron/internal/renderer/extensions/event')
-const { ipcRenderer } = require('electron')
+const ipcRenderer = require('@electron/internal/renderer/ipc-renderer-internal')
 
 class WebNavigation {
   constructor () {

lib/renderer/init.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const events = require('events')
+const { EventEmitter } = require('events')
 const path = require('path')
 const Module = require('module')
 
@@ -22,10 +22,11 @@ globalPaths.push(path.join(__dirname, 'api', 'exports'))
 // The global variable will be used by ipc for event dispatching
 const v8Util = process.atomBinding('v8_util')
 
-v8Util.setHiddenValue(global, 'ipc', new events.EventEmitter())
+v8Util.setHiddenValue(global, 'ipc', new EventEmitter())
+v8Util.setHiddenValue(global, 'ipc-internal', new EventEmitter())
 
 // Use electron module after everything is ready.
-const { ipcRenderer } = require('electron')
+const ipcRenderer = require('@electron/internal/renderer/ipc-renderer-internal')
 
 require('@electron/internal/renderer/web-frame-init')()
 

lib/renderer/ipc-renderer-internal.js

@@ -0,0 +1,26 @@
+'use strict'
+
+const binding = process.atomBinding('ipc')
+const v8Util = process.atomBinding('v8_util')
+
+// Created by init.js.
+const ipcRenderer = v8Util.getHiddenValue(global, 'ipc-internal')
+const internal = true
+
+ipcRenderer.send = function (...args) {
+  return binding.send('ipc-internal-message', args)
+}
+
+ipcRenderer.sendSync = function (...args) {
+  return binding.sendSync('ipc-internal-message-sync', args)[0]
+}
+
+ipcRenderer.sendTo = function (webContentsId, channel, ...args) {
+  return binding.sendTo(internal, false, webContentsId, channel, args)
+}
+
+ipcRenderer.sendToAll = function (webContentsId, channel, ...args) {
+  return binding.sendTo(internal, true, webContentsId, channel, args)
+}
+
+module.exports = ipcRenderer

lib/renderer/override.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { ipcRenderer } = require('electron')
+const ipcRenderer = require('@electron/internal/renderer/ipc-renderer-internal')
 
 const { guestInstanceId, openerId } = process
 const hiddenPage = process.argv.includes('--hidden-page')

lib/renderer/security-warnings.js

@@ -264,7 +264,7 @@ const logSecurityWarnings = function (webPreferences, nodeIntegration) {
 }
 
 const getWebPreferences = function () {
-  const { ipcRenderer } = require('electron')
+  const ipcRenderer = require('@electron/internal/renderer/ipc-renderer-internal')
   const errorUtils = require('@electron/internal/common/error-utils')
 
   const [ error, result ] = ipcRenderer.sendSync('ELECTRON_BROWSER_GET_LAST_WEB_PREFERENCES')

lib/renderer/web-frame-init.js

@@ -1,6 +1,7 @@
 'use strict'
 
-const { ipcRenderer, webFrame } = require('electron')
+const { webFrame } = require('electron')
+const ipcRenderer = require('@electron/internal/renderer/ipc-renderer-internal')
 const errorUtils = require('@electron/internal/common/error-utils')
 
 module.exports = () => {

lib/renderer/web-view/guest-view-internal.js

@@ -1,6 +1,7 @@
 'use strict'
 
-const { ipcRenderer, webFrame } = require('electron')
+const { webFrame } = require('electron')
+const ipcRenderer = require('@electron/internal/renderer/ipc-renderer-internal')
 
 let requestId = 0
 

lib/renderer/web-view/web-view-attributes.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { ipcRenderer } = require('electron')
+const ipcRenderer = require('@electron/internal/renderer/ipc-renderer-internal')
 const WebViewImpl = require('@electron/internal/renderer/web-view/web-view')
 const webViewConstants = require('@electron/internal/renderer/web-view/web-view-constants')
 const errorUtils = require('@electron/internal/common/error-utils')

lib/renderer/web-view/web-view.js

@@ -1,8 +1,9 @@
 'use strict'
 
-const { ipcRenderer, remote, webFrame } = require('electron')
+const { remote, webFrame } = require('electron')
 
 const v8Util = process.atomBinding('v8_util')
+const ipcRenderer = require('@electron/internal/renderer/ipc-renderer-internal')
 const guestViewInternal = require('@electron/internal/renderer/web-view/guest-view-internal')
 const webViewConstants = require('@electron/internal/renderer/web-view/web-view-constants')
 const errorUtils = require('@electron/internal/common/error-utils')

lib/sandboxed_renderer/api/module-list.js

@@ -5,7 +5,7 @@ const features = process.atomBinding('features')
 module.exports = [
   {
     name: 'crashReporter',
-    load: () => require('@electron/internal/common/api/crash-reporter')
+    load: () => require('@electron/internal/renderer/api/crash-reporter')
   },
   {
     name: 'desktopCapturer',
@@ -14,7 +14,7 @@ module.exports = [
   },
   {
     name: 'ipcRenderer',
-    load: () => require('@electron/internal/sandboxed_renderer/api/ipc-renderer')
+    load: () => require('@electron/internal/renderer/api/ipc-renderer')
   },
   {
     name: 'isPromise',

lib/sandboxed_renderer/init.js

@@ -17,6 +17,9 @@ v8Util.setHiddenValue(global, 'Buffer', Buffer)
 // The `lib/renderer/api/ipc-renderer.js` module looks for the ipc object in the
 // "ipc" hidden value
 v8Util.setHiddenValue(global, 'ipc', new EventEmitter())
+// The `lib/renderer/ipc-renderer-internal.js` module looks for the ipc object in the
+// "ipc-internal" hidden value
+v8Util.setHiddenValue(global, 'ipc-internal', new EventEmitter())
 // The process object created by browserify is not an event emitter, fix it so
 // the API is more compatible with non-sandboxed renderers.
 for (const prop of Object.keys(EventEmitter.prototype)) {
@@ -40,9 +43,28 @@ const loadedModules = new Map([
   ['url', require('url')]
 ])
 
+// AtomSandboxedRendererClient will look for the "ipcNative" hidden object when
+// invoking the `onMessage`/`onExit` callbacks.
+const ipcNative = process.atomBinding('ipc')
+v8Util.setHiddenValue(global, 'ipcNative', ipcNative)
+
+const ipcRenderer = require('@electron/internal/renderer/ipc-renderer-internal')
+
+ipcNative.onInternalMessage = function (channel, args, senderId) {
+  ipcRenderer.emit(channel, { sender: ipcRenderer, senderId }, ...args)
+}
+
+ipcNative.onMessage = function (channel, args, senderId) {
+  electron.ipcRenderer.emit(channel, { sender: electron.ipcRenderer, senderId }, ...args)
+}
+
+ipcNative.onExit = function () {
+  process.emit('exit')
+}
+
 const {
   preloadSrc, preloadError, process: processProps
-} = electron.ipcRenderer.sendSync('ELECTRON_BROWSER_SANDBOX_LOAD')
+} = ipcRenderer.sendSync('ELECTRON_BROWSER_SANDBOX_LOAD')
 
 require('@electron/internal/renderer/web-frame-init')()