From 85c655a91c4e140d5d60d1e9f8fc9c79599a29be Mon Sep 17 00:00:00 2001
From: Ari Lazier <alazier@gmail.com>
Date: Wed, 9 Nov 2016 17:46:26 -0800
Subject: [PATCH] fix for constructor destruction after timeout

---
 src/js_realm.hpp            |  6 +++---
 src/js_types.hpp            |  5 +++++
 src/jsc/jsc_protected.hpp   |  7 +++++++
 src/node/node_protected.hpp | 22 ++++++++++++++++++++++
 4 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/src/js_realm.hpp b/src/js_realm.hpp
index 9634a431..a670224c 100644
--- a/src/js_realm.hpp
+++ b/src/js_realm.hpp
@@ -147,7 +147,7 @@ class RealmClass : public ClassDefinition<T, SharedRealm, ObservableClass<T>> {
 
 public:
     static FunctionType create_constructor(ContextType);
-    static Protected<FunctionType> s_constructor;
+    static Global<FunctionType> s_constructor;
 
     // methods
     static void objects(ContextType, ObjectType, size_t, const ValueType[], ReturnValue &);
@@ -258,7 +258,7 @@ public:
 };
 
 template<typename T>
-Protected<typename T::Function> RealmClass<T>::s_constructor;
+Global<typename T::Function> RealmClass<T>::s_constructor;
 
 template<typename T>
 inline typename T::Function RealmClass<T>::create_constructor(ContextType ctx) {
@@ -279,7 +279,7 @@ inline typename T::Function RealmClass<T>::create_constructor(ContextType ctx) {
     Object::set_property(ctx, realm_constructor, "Sync", sync_constructor, attributes);
 #endif
 
-    s_constructor = Protected<FunctionType>(ctx, realm_constructor);
+    s_constructor = Global<FunctionType>(ctx, realm_constructor);
     return realm_constructor;
 }
 
diff --git a/src/js_types.hpp b/src/js_types.hpp
index 6c2e78a1..7cd56b91 100644
--- a/src/js_types.hpp
+++ b/src/js_types.hpp
@@ -258,6 +258,11 @@ class Protected {
     };
 };
 
+template<typename ValueType>
+class Global {
+    operator ValueType() const;
+};
+
 template<typename T>
 struct Exception : public std::runtime_error {
     using ContextType = typename T::Context;
diff --git a/src/jsc/jsc_protected.hpp b/src/jsc/jsc_protected.hpp
index 10c25fa1..d569fc89 100644
--- a/src/jsc/jsc_protected.hpp
+++ b/src/jsc/jsc_protected.hpp
@@ -119,5 +119,12 @@ class Protected<JSObjectRef> : public Protected<JSValueRef> {
     }
 };
 
+template<>
+class Global<JSObjectRef> : public Protected<JSObjectRef> {
+  public:
+    Global() : Protected<JSObjectRef>() {}
+    Global(JSContextRef ctx, JSObjectRef value) : Protected<JSObjectRef>(ctx, value) {}
+};
+
 } // js
 } // realm
diff --git a/src/node/node_protected.hpp b/src/node/node_protected.hpp
index c48cc027..97ac12da 100644
--- a/src/node/node_protected.hpp
+++ b/src/node/node_protected.hpp
@@ -94,5 +94,27 @@ class Protected<node::Types::Function> : public node::Protected<v8::Function> {
     Protected(v8::Isolate* isolate, v8::Local<v8::Function> object) : node::Protected<v8::Function>(object) {}
 };
 
+template<typename T>
+struct GlobalCopyablePersistentTraits {
+    typedef v8::Persistent<T, GlobalCopyablePersistentTraits<T>> CopyablePersistent;
+    static const bool kResetInDestructor = false;
+    template<typename S, typename M>
+    static inline void Copy(const v8::Persistent<S, M> &source, CopyablePersistent *dest) {}
+};
+
+template<>
+class Global<node::Types::Function> {
+    // TODO: Figure out why Nan::CopyablePersistentTraits causes a build failure.
+    Nan::Persistent<v8::Function, GlobalCopyablePersistentTraits<v8::Function>> m_value;
+
+public:
+    Global() {}
+    Global(v8::Isolate* isolate, v8::Local<v8::Function> value) : m_value(value) {}
+
+    operator v8::Local<v8::Function>() const {
+        return Nan::New(m_value);
+    }
+};
+
 } // js
 } // realm