Merge pull request #1059 from atom/ipc-preload

Don't rely on global "process" object for message dispatching
This commit is contained in:
Cheng Zhao 2015-01-27 10:58:20 -08:00
commit 5bfe644c3e
6 changed files with 53 additions and 28 deletions

View file

@ -9,8 +9,8 @@ module.exports.wrap = (webContents) ->
webContents.__proto__ = EventEmitter.prototype
# WebContents::send(channel, args..)
webContents.send = (args...) ->
@_send 'ATOM_INTERNAL_MESSAGE', [args...]
webContents.send = (channel, args...) ->
@_send channel, [args...]
# Make sure webContents.executeJavaScript would run the code only when the
# web contents has been loaded.

View file

@ -1,26 +1,20 @@
EventEmitter = require('events').EventEmitter
process = global.process
ipc = process.atomBinding('ipc')
binding = process.atomBinding 'ipc'
v8Util = process.atomBinding 'v8_util'
class Ipc extends EventEmitter
constructor: ->
process.on 'ATOM_INTERNAL_MESSAGE', (args...) =>
@emit args...
# Created by init.coffee.
ipc = v8Util.getHiddenValue global, 'ipc'
window.addEventListener 'unload', (event) ->
process.removeAllListeners 'ATOM_INTERNAL_MESSAGE'
ipc.send = (args...) ->
binding.send 'ipc-message', [args...]
send: (args...) ->
ipc.send 'ipc-message', [args...]
ipc.sendSync = (args...) ->
JSON.parse binding.sendSync('ipc-message-sync', [args...])
sendSync: (args...) ->
JSON.parse ipc.sendSync('ipc-message-sync', [args...])
ipc.sendToHost = (args...) ->
binding.send 'ipc-message-host', [args...]
sendToHost: (args...) ->
ipc.send 'ipc-message-host', [args...]
# Deprecated.
ipc.sendChannel = ipc.send
ipc.sendChannelSync = ipc.sendSync
# Discarded
sendChannel: -> @send.apply this, arguments
sendChannelSync: -> @sendSync.apply this, arguments
module.exports = new Ipc
module.exports = ipc

View file

@ -29,10 +29,15 @@ namespace atom {
namespace {
v8::Handle<v8::Object> GetProcessObject(v8::Isolate* isolate,
v8::Handle<v8::Context> context) {
v8::Handle<v8::String> key = mate::StringToV8(isolate, "process");
return context->Global()->Get(key)->ToObject();
bool GetIPCObject(v8::Isolate* isolate,
v8::Handle<v8::Context> context,
v8::Handle<v8::Object>* ipc) {
v8::Handle<v8::String> key = mate::StringToV8(isolate, "ipc");
v8::Handle<v8::Value> value = context->Global()->GetHiddenValue(key);
if (value.IsEmpty() || !value->IsObject())
return false;
*ipc = value->ToObject();
return true;
}
std::vector<v8::Handle<v8::Value>> ListValueToVector(
@ -118,8 +123,9 @@ void AtomRenderViewObserver::OnBrowserMessage(const base::string16& channel,
isolate, args);
arguments.insert(arguments.begin(), mate::ConvertToV8(isolate, channel));
v8::Handle<v8::Object> process = GetProcessObject(isolate, context);
node::MakeCallback(isolate, process, "emit", arguments.size(), &arguments[0]);
v8::Handle<v8::Object> ipc;
if (GetIPCObject(isolate, context, &ipc))
node::MakeCallback(isolate, ipc, "emit", arguments.size(), &arguments[0]);
}
} // namespace atom

View file

@ -1,4 +1,5 @@
process = global.process
events = require 'events'
path = require 'path'
url = require 'url'
Module = require 'module'
@ -21,6 +22,10 @@ globalPaths.push path.join(process.resourcesPath, 'app')
# Import common settings.
require path.resolve(__dirname, '..', '..', 'common', 'lib', 'init')
# The global variable will be used by ipc for event dispatching
v8Util = process.atomBinding 'v8_util'
v8Util.setHiddenValue global, 'ipc', new events.EventEmitter
# Process command line arguments.
nodeIntegration = 'false'
for arg in process.argv

4
spec/fixtures/module/preload-ipc.js vendored Normal file
View file

@ -0,0 +1,4 @@
var ipc = require('ipc');
ipc.on('ping', function(message) {
ipc.sendToHost('pong', message);
});

View file

@ -58,6 +58,22 @@ describe '<webview> tag', ->
webview.src = "file://#{fixtures}/pages/e.html"
document.body.appendChild webview
it 'receives ipc message in preload script', (done) ->
message = 'boom!'
listener = (e) ->
assert.equal e.channel, 'pong'
assert.deepEqual e.args, [message]
webview.removeEventListener 'ipc-message', listener
done()
listener2 = (e) ->
webview.send 'ping', message
webview.removeEventListener 'did-finish-load', listener2
webview.addEventListener 'ipc-message', listener
webview.addEventListener 'did-finish-load', listener2
webview.setAttribute 'preload', "#{fixtures}/module/preload-ipc.js"
webview.src = "file://#{fixtures}/pages/e.html"
document.body.appendChild webview
describe 'httpreferrer attribute', ->
it 'sets the referrer url', (done) ->
referrer = 'http://github.com/'