wip

src/node.cc

@@ -5013,8 +5013,8 @@ namespace lib {
     // we do not support additional commandline options for node, uv, or v8
     // we explicitily only set the first argument to the program name
     int argc = 1;
-    std::string* program_name_on_heap = new std::string(program_name);
-    char* program_name_c_string = const_cast<char*>(program_name_on_heap->c_str());
+    char *program_name_c_string = new char[program_name.length() + 1];
+    std::strcpy(program_name_c_string, program_name.c_str());
     char** argv = &program_name_c_string;
 
     // Hack around with the argv pointer. Used for process.title = "blah".
@@ -5220,7 +5220,7 @@ namespace lib {
     }
     Local<v8::Function> _func = v8::Local<v8::Function>::Cast(value);
 
-    _func->Call(object, 1, const_cast<v8::Local<v8::Value>*>(&args[0]));
+    return _func->Call(object, 1, const_cast<v8::Local<v8::Value>*>(&args[0]));
   }
 
   // TODO: Node.js has exceptions disabled.

src/node_lib.h

@@ -5,6 +5,7 @@
 #include <functional>
 #include <initializer_list>
 #include "v8.h"
+#include "node.h"
 
 namespace node { namespace lib {
     void _StartEnv(int argc,
@@ -50,7 +51,7 @@ namespace node { namespace lib {
     *Important*: Node.js has to have been initialized by calling Initialize().
     */
 
-    v8::Local<v8::Value> Run(const std::string & path);
+    NODE_EXTERN v8::Local<v8::Value> Run(const std::string & path);
 
     /*********************************************************
      * Handle JavaScript events
@@ -59,14 +60,14 @@ namespace node { namespace lib {
     /*
     Processes the pending event queue of a *running* Node.js engine once.
     */
-    bool ProcessEvents();
+    NODE_EXTERN bool ProcessEvents();
 
     /*
     Starts the execution of the Node.js event loop, which processes any events in JavaScript.
     Additionally, the given callback will be executed once per main loop run.
     *Important*: Call `initialize()` before using this method.
     */
-    void RunEventLoop(const RunUserLoop & callback);
+    NODE_EXTERN void RunEventLoop(const RunUserLoop & callback);
 
 
     /*********************************************************
@@ -76,13 +77,13 @@ namespace node { namespace lib {
     /*
     Sends termination event into event queue and runs event queue, until all events have been handled.
     */
-    void Terminate();
+    NODE_EXTERN void Terminate();
 
 
     /*
     Stops the *running* Node.js engine. Clears all events and puts Node.js into idle.
     */
-    void RequestTerminate();
+    NODE_EXTERN void RequestTerminate();
 
     /*********************************************************
      * Basic operations
@@ -91,22 +92,22 @@ namespace node { namespace lib {
     /*
     Executes a given piece of JavaScript code, using the *running* Node.js engine.
     */
-    v8::Local<v8::Value> Evaluate(const std::string & java_script_code);
+    NODE_EXTERN v8::Local<v8::Value> Evaluate(const std::string & java_script_code);
 
     /*
     Returns the JavaScript root object for the running application
     */
-    v8::Local<v8::Object> GetRootObject();
+    NODE_EXTERN v8::Local<v8::Object> GetRootObject();
 
     /*
     Registers a C++ module in the *running* Node.js engine.
     */
-    bool RegisterModule(const std::string & name, const CppModule & callback);
+    NODE_EXTERN bool RegisterModule(const std::string & name, const CppModule & callback);
 
     /*
     Registers a C++ module in the *running* Node.js engine exporting the given set of functions.
     */
-    bool RegisterModule(const std::string & name,
+    NODE_EXTERN bool RegisterModule(const std::string & name,
                         const std::map<std::string, ModuleFunction> & module_functions);
 
 
@@ -117,34 +118,34 @@ namespace node { namespace lib {
     /*
     Adds a new JavaScript module to the *running* Node.js engine.
     */
-    v8::Local<v8::Object> IncludeModule(const std::string & modul_name);
+    NODE_EXTERN v8::Local<v8::Object> IncludeModule(const std::string & modul_name);
 
     /*
     Returns the local value (specified by its name) of the module (defined in the `exports`-object).
     */
-    v8::MaybeLocal<v8::Value> GetValue(v8::MaybeLocal<v8::Object> object, const std::string & value_name);
+    NODE_EXTERN v8::MaybeLocal<v8::Value> GetValue(v8::MaybeLocal<v8::Object> object, const std::string & value_name);
 
     /*
     Calls a function (specified by its name) on a given object passing the given arguments.
     *Important*: Throws an exception if the receiver does not define the specified function.
     */
-    v8::Local<v8::Value> Call(v8::Local<v8::Object> object, const std::string & function_name, const std::vector<v8::Local<v8::Value>> & args = {});
+    NODE_EXTERN v8::Local<v8::Value> Call(v8::Local<v8::Object> object, const std::string & function_name, const std::vector<v8::Local<v8::Value>> & args = {});
 
     /*
     Calls a function (specified by its name) on a given object passing the given arguments.
     *Important*: Throws an exception if the receiver does not define the specified function.
     */
-    v8::Local<v8::Value> Call(v8::MaybeLocal<v8::Object> object, const std::string & function_name, std::initializer_list<v8::MaybeLocal<v8::Value>> args);
+    NODE_EXTERN v8::Local<v8::Value> Call(v8::MaybeLocal<v8::Object> object, const std::string & function_name, std::initializer_list<v8::MaybeLocal<v8::Value>> args);
 
     /*
     Calls a given function on a given receiver passing the given arguments.
     *Important*: The amount of arguments can be changed at runtime (for JS var arg functions).
     */
-    v8::Local<v8::Value> Call(v8::MaybeLocal<v8::Object> receiver, v8::MaybeLocal<v8::Function> function, const std::vector<v8::MaybeLocal<v8::Value>> & args = {});
+    NODE_EXTERN v8::Local<v8::Value> Call(v8::MaybeLocal<v8::Object> receiver, v8::MaybeLocal<v8::Function> function, const std::vector<v8::MaybeLocal<v8::Value>> & args = {});
 
     /*
     Calls a given function on a given receiver passing the given arguments.
     *Important*: The amount of arguments must be known at compile time.
     */
-    v8::Local<v8::Value> Call(v8::MaybeLocal<v8::Object> receiver, v8::MaybeLocal<v8::Function> function, std::initializer_list<v8::MaybeLocal<v8::Value>> args);
+    NODE_EXTERN v8::Local<v8::Value> Call(v8::MaybeLocal<v8::Object> receiver, v8::MaybeLocal<v8::Function> function, std::initializer_list<v8::MaybeLocal<v8::Value>> args);
 }}