Add our own built-in native module system.

This commit is contained in:
Cheng Zhao 2013-04-14 15:36:48 +08:00
parent 3c96007131
commit 0f6ece2d27
12 changed files with 217 additions and 5 deletions

View file

@ -8,6 +8,12 @@
'lib_sources': [ 'lib_sources': [
'app/atom_main_delegate.cc', 'app/atom_main_delegate.cc',
'app/atom_main_delegate.h', 'app/atom_main_delegate.h',
'browser/api/atom_bindings.cc',
'browser/api/atom_bindings.h',
'browser/api/atom_extensions.cc',
'browser/api/atom_extensions.h',
'browser/api/atom_window.cc',
'browser/api/atom_window.h',
'browser/atom_browser_client.cc', 'browser/atom_browser_client.cc',
'browser/atom_browser_client.h', 'browser/atom_browser_client.h',
'browser/atom_browser_main_parts.cc', 'browser/atom_browser_main_parts.cc',

View file

@ -0,0 +1,65 @@
// Copyright (c) 2013 GitHub, Inc. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "browser/api/atom_bindings.h"
#include "vendor/node/src/node.h"
#include "vendor/node/src/node_internals.h"
using node::node_isolate;
namespace atom {
// Defined in atom_extensions.cc.
node::node_module_struct* get_builtin_module(const char *name);
v8::Persistent<v8::Object> AtomBindings::binding_cache_;
AtomBindings::AtomBindings() {
}
AtomBindings::~AtomBindings() {
}
void AtomBindings::BindTo(v8::Handle<v8::Object> process) {
v8::HandleScope scope;
v8::Context::Scope context_scope(node::g_context);
node::SetMethod(process, "atom_binding", Binding);
}
// static
v8::Handle<v8::Value> AtomBindings::Binding(const v8::Arguments& args) {
v8::HandleScope scope;
v8::Local<v8::String> module = args[0]->ToString();
v8::String::Utf8Value module_v(module);
node::node_module_struct* modp;
if (binding_cache_.IsEmpty()) {
binding_cache_ = v8::Persistent<v8::Object>::New(
node_isolate, v8::Object::New());
}
v8::Local<v8::Object> exports;
if (binding_cache_->Has(module)) {
exports = binding_cache_->Get(module)->ToObject();
return scope.Close(exports);
}
if ((modp = get_builtin_module(*module_v)) != NULL) {
exports = v8::Object::New();
// Internal bindings don't have a "module" object,
// only exports.
modp->register_func(exports, v8::Undefined());
binding_cache_->Set(module, exports);
return scope.Close(exports);
}
return v8::ThrowException(v8::Exception::Error(
v8::String::New("No such module")));
}
} // namespace atom

View file

@ -0,0 +1,32 @@
// Copyright (c) 2013 GitHub, Inc. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef ATOM_BROWSER_API_ATOM_BINDINGS_
#define ATOM_BROWSER_API_ATOM_BINDINGS_
#include "base/basictypes.h"
#include "v8/include/v8.h"
namespace atom {
class AtomBindings {
public:
AtomBindings();
virtual ~AtomBindings();
// Add process.atom_binding function, which behaves like process.binding but
// load native code from atom-shell instead.
void BindTo(v8::Handle<v8::Object> process);
private:
static v8::Handle<v8::Value> Binding(const v8::Arguments& args);
static v8::Persistent<v8::Object> binding_cache_;
DISALLOW_COPY_AND_ASSIGN(AtomBindings);
};
} // namespace atom
#endif // ATOM_BROWSER_API_ATOM_BINDINGS_

View file

@ -0,0 +1,51 @@
// Copyright (c) 2013 GitHub, Inc. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include <string.h>
#include <stdio.h>
#include "vendor/node/src/node.h"
#include "vendor/node/src/node_version.h"
namespace atom {
#undef NODE_EXT_LIST_START
#undef NODE_EXT_LIST_ITEM
#undef NODE_EXT_LIST_END
#define NODE_EXT_LIST_START
#define NODE_EXT_LIST_ITEM NODE_MODULE_DECL
#define NODE_EXT_LIST_END
#include "browser/api/atom_extensions.h"
#undef NODE_EXT_LIST_START
#undef NODE_EXT_LIST_ITEM
#undef NODE_EXT_LIST_END
#define NODE_EXT_STRING(x) &x ## _module,
#define NODE_EXT_LIST_START node::node_module_struct *node_module_list[] = {
#define NODE_EXT_LIST_ITEM NODE_EXT_STRING
#define NODE_EXT_LIST_END NULL};
#include "browser/api/atom_extensions.h"
node::node_module_struct* get_builtin_module(const char *name)
{
char buf[128];
node::node_module_struct *cur = NULL;
snprintf(buf, sizeof(buf), "atom_%s", name);
/* TODO: you could look these up in a hash, but there are only
* a few, and once loaded they are cached. */
for (int i = 0; node_module_list[i] != NULL; i++) {
cur = node_module_list[i];
if (strcmp(cur->modname, buf) == 0) {
return cur;
}
}
return NULL;
}
} // namespace atom

View file

@ -0,0 +1,11 @@
// Copyright (c) 2013 GitHub, Inc. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// Used by atom_extensions.cc to declare a list of built-in modules of Atom.
NODE_EXT_LIST_START
NODE_EXT_LIST_ITEM(atom_window)
NODE_EXT_LIST_END

View file

@ -0,0 +1,15 @@
// Copyright (c) 2013 GitHub, Inc. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "browser/api/atom_window.h"
namespace atom {
static void Initialize(v8::Handle<v8::Object> target) {
target->Set(v8::String::New("hello"), v8::String::New("world"));
}
} // namespace atom
NODE_MODULE(atom_window, atom::Initialize)

15
browser/api/atom_window.h Normal file
View file

@ -0,0 +1,15 @@
// Copyright (c) 2013 GitHub, Inc. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef ATOM_BROWSER_API_ATOM_WINDOW_H_
#define ATOM_BROWSER_API_ATOM_WINDOW_H_
#include "vendor/node/src/node.h"
#include "vendor/node/src/node_object_wrap.h"
namespace atom {
} // namespace atom
#endif // ATOM_BROWSER_API_ATOM_WINDOW_H_

View file

@ -5,3 +5,5 @@ process.on('uncaughtException', function(error) {
else else
console.error(error.name + ': ' + error.message); console.error(error.name + ': ' + error.message);
}); });
console.log(process.atom_binding('window'));

View file

@ -5,17 +5,19 @@
#include "browser/atom_browser_main_parts.h" #include "browser/atom_browser_main_parts.h"
#include "base/values.h" #include "base/values.h"
#include "browser/api/atom_bindings.h"
#include "browser/native_window.h" #include "browser/native_window.h"
#include "brightray/browser/browser_context.h" #include "brightray/browser/browser_context.h"
#include "brightray/browser/default_web_contents_delegate.h"
#include "brightray/browser/inspectable_web_contents.h" #include "brightray/browser/inspectable_web_contents.h"
#include "brightray/browser/inspectable_web_contents_view.h" #include "brightray/browser/inspectable_web_contents_view.h"
#include "common/node_bindings.h" #include "common/node_bindings.h"
#include "vendor/node/src/node_internals.h"
namespace atom { namespace atom {
AtomBrowserMainParts::AtomBrowserMainParts() AtomBrowserMainParts::AtomBrowserMainParts()
: node_bindings_(NodeBindings::Create(true)) { : atom_bindings_(new AtomBindings),
node_bindings_(NodeBindings::Create(true)) {
} }
AtomBrowserMainParts::~AtomBrowserMainParts() { AtomBrowserMainParts::~AtomBrowserMainParts() {
@ -25,6 +27,10 @@ void AtomBrowserMainParts::PostEarlyInitialization() {
brightray::BrowserMainParts::PostEarlyInitialization(); brightray::BrowserMainParts::PostEarlyInitialization();
node_bindings_->Initialize(); node_bindings_->Initialize();
atom_bindings_->BindTo(node::process);
node_bindings_->Load();
} }
void AtomBrowserMainParts::PreMainMessageLoopStart() { void AtomBrowserMainParts::PreMainMessageLoopStart() {

View file

@ -10,6 +10,7 @@
namespace atom { namespace atom {
class AtomBindings;
class NodeBindings; class NodeBindings;
class AtomBrowserMainParts : public brightray::BrowserMainParts { class AtomBrowserMainParts : public brightray::BrowserMainParts {
@ -23,6 +24,7 @@ class AtomBrowserMainParts : public brightray::BrowserMainParts {
virtual void PreMainMessageLoopRun() OVERRIDE; virtual void PreMainMessageLoopRun() OVERRIDE;
private: private:
scoped_ptr<AtomBindings> atom_bindings_;
scoped_ptr<NodeBindings> node_bindings_; scoped_ptr<NodeBindings> node_bindings_;
DISALLOW_COPY_AND_ASSIGN(AtomBrowserMainParts); DISALLOW_COPY_AND_ASSIGN(AtomBrowserMainParts);

View file

@ -47,9 +47,13 @@ void NodeBindings::Initialize() {
v8::Handle<v8::String> type = v8::Handle<v8::String> type =
is_browser_ ? v8::String::New("browser") : v8::String::New("renderer"); is_browser_ ? v8::String::New("browser") : v8::String::New("renderer");
process->Set(v8::String::New("__atom_type"), type); process->Set(v8::String::New("__atom_type"), type);
node::Load(process);
} }
} }
void NodeBindings::Load() {
v8::HandleScope scope;
v8::Context::Scope context_scope(node::g_context);
node::Load(node::process);
}
} // namespace atom } // namespace atom

View file

@ -15,9 +15,12 @@ class NodeBindings {
virtual ~NodeBindings(); virtual ~NodeBindings();
// Setup everything including V8, libuv and node.js main script. // Setup V8, libuv and the process object.
virtual void Initialize(); virtual void Initialize();
// Load node.js main script.
virtual void Load();
// Prepare for message loop integration. // Prepare for message loop integration.
virtual void PrepareMessageLoop() = 0; virtual void PrepareMessageLoop() = 0;