Merge pull request #32 from MarshallOfSound/context-aware

chore: make context aware

Notification.cc

@@ -3,4 +3,8 @@
 // Notification.cc represents the top level of the module.
 // C++ constructs that are exposed to javascript are exported here
 
+#if NODE_MAJOR_VERSION >= 10
+NAN_MODULE_WORKER_ENABLED(Notification, MacNotification::Init)
+#else
 NODE_MODULE(Notification, MacNotification::Init)
+#endif

mac_notification.mm

@@ -185,6 +185,20 @@
   NotificationCenterDelegate *delegate = [[NotificationCenterDelegate alloc] initWithActivationCallback:activated];
   NSUserNotificationCenter *center = [NSUserNotificationCenter defaultUserNotificationCenter];
   center.delegate = delegate;
+
+#if NODE_MAJOR_VERSION >= 10
+  node::AddEnvironmentCleanupHook(
+    v8::Isolate::GetCurrent(),
+    [](void *arg) {
+      auto our_delegate = static_cast<NotificationCenterDelegate*>(arg);
+      NSUserNotificationCenter *center = [NSUserNotificationCenter defaultUserNotificationCenter];
+      if (center.delegate == our_delegate) {
+        center.delegate = nil;
+      }
+    },
+    const_cast<void*>(static_cast<const void*>(delegate))
+  );
+#endif
 }
 
 Nan::Utf8String* MacNotification::StringFromObjectOrNull(Local<Object> object, const char *key) {

notification_center_delegate.mm

@@ -32,7 +32,8 @@ static void AsyncSendHandler(uv_async_t *handle) {
     Nan::New(info->id).ToLocalChecked()
   };
 
-  info->callback->Call(3, argv);
+  Nan::AsyncResource async_resource("NodeMacNotifier:AsyncSendHandler");
+  info->callback->Call(3, argv, &async_resource);
 
   delete info;
   info = nullptr;