Cleanup and add destructor handling

mhdawson · mhdawson · commit 67e70fa79ffb · 2016-06-21T17:47:13.000-04:00
- misc cleanup
- add passing in destructor so that C++ objects
  will be cleaned up properly when the js objects
  are collected
diff --git a/6_object_wrap/abi/myobject.cc b/6_object_wrap/abi/myobject.cc
@@ -1,13 +1,17 @@
 #include "myobject.h"
 
-node::js::persistent constructor;
+node::js::persistent MyObject::constructor;
 
 MyObject::MyObject(double value) : value_(value) {
 }
 
 MyObject::~MyObject() {
 }
 
+void MyObject::Destructor(void* nativeObject) {
+  ((MyObject*) nativeObject)->~MyObject();
+}
+
 void MyObject::Init(node::js::value env, node::js::value exports) {
   node::js::value function = node::js::CreateConstructorForWrap(env, New);
   node::js::SetFunctionName(env, function, node::js::CreateString(env, "MyObject"));
@@ -31,24 +35,8 @@ void MyObject::Init(node::js::value env, node::js::value exports) {
 }
 
 void MyObject::New(node::js::value env, node::js::FunctionCallbackInfo info) {
-/*
-  if (info.IsConstructCall()) {
-    // Invoked as constructor: `new MyObject(...)`
-    double value = info[0]->IsUndefined() ? 0 : info[0]->NumberValue();
-    MyObject* obj = new MyObject(value);
-    obj->Wrap(info.This());
-    info.GetReturnValue().Set(info.This());
-  } else {
-    // Invoked as plain function `MyObject(...)`, turn into construct call.
-    const int argc = 1;
-    v8::Local<v8::Value> argv[argc] = { info[0] };
-    v8::Local<v8::Function> cons = Nan::New<v8::Function>(constructor);
-    info.GetReturnValue().Set(cons->NewInstance(argc, argv));
-  }
-*/
-
-  // assumes its a constructor call
   if (node::js::IsContructCall(env, info)) {
+    // Invoked as constructor: `new MyObject(...)`
     node::js::value args[1];
     node::js::GetCallbackArgs(info, args, 1);
     double value = 0;
@@ -57,9 +45,10 @@ void MyObject::New(node::js::value env, node::js::FunctionCallbackInfo info) {
     }
     MyObject* obj = new MyObject(value);
     node::js::value jsobj = node::js::GetCallbackObject(env, info);
-    node::js::Wrap(env, jsobj, (void*) obj, nullptr);
+    node::js::Wrap(env, jsobj, (void*) obj, MyObject::Destructor);
     node::js::SetReturnValue(env, info, jsobj);
   } else {
+    // Invoked as plain function `MyObject(...)`, turn into construct call.
     node::js::value args[1];
     node::js::GetCallbackArgs(info, args, 1);
     const int argc = 1;
diff --git a/6_object_wrap/abi/myobject.h b/6_object_wrap/abi/myobject.h
@@ -6,6 +6,7 @@
 class MyObject {
  public:
   static void Init(node::js::value env, node::js::value exports);
+  static void Destructor(void* jsObject);
 
  private:
   explicit MyObject(double value = 0);
@@ -15,6 +16,7 @@ class MyObject {
   static void GetValue(node::js::value env, node::js::FunctionCallbackInfo info);
   static void PlusOne(node::js::value env, node::js::FunctionCallbackInfo info);
   static void Multiply(node::js::value env, node::js::FunctionCallbackInfo info);
+  static node::js::persistent constructor;
   double value_;
 };
 
