Refactor global registry and add tray icon cleanup

Moved global registry template to a new header for shared use and updated menu and tray icon C APIs to use it. Added explicit cleanup functions for tray icon resources and documented their usage. Improved resource management and clarified object lifetime handling.

Author: lijy91

src/capi/menu_c.cpp

@@ -4,19 +4,12 @@
 #include <cstring>
 #include <map>
 #include <memory>
-#include <unordered_map>
+#include <optional>
+#include "../global_registry.h"
 #include "../menu.h"
 
 using namespace nativeapi;
 
-// Template function to create and manage global registries for different object
-// types Uses heap allocation to avoid destruction order issues at program exit
-template <typename T>
-static auto& globalRegistry() {
-  static auto* instance = new std::unordered_map<void*, std::shared_ptr<T>>();
-  return *instance;
-}
-
 // Global registry instances for managing MenuItem and Menu object lifetimes
 static auto& g_menu_items = globalRegistry<MenuItem>();
 static auto& g_menus = globalRegistry<Menu>();
@@ -1144,23 +1137,6 @@ void native_menu_item_list_free(native_menu_item_list_t list) {
   }
 }
 
-// Implementation of cleanup function
-void cleanup_at_exit() {
-  // Clear all event listeners first to prevent callbacks during cleanup
-  g_menu_item_listeners.clear();
-  g_menu_listeners.clear();
-
-  // Note: We intentionally do NOT clear g_menu_items and g_menus here
-  // because they are now managed by function-local static pointers that
-  // won't be destroyed during normal exit, preventing double-free issues.
-  // The memory will be cleaned up by the OS when the process terminates.
-}
-
-// Cleanup functions to ensure proper resource management
-void native_menu_cleanup_all(void) {
-  cleanup_at_exit();
-}
-
 char* native_keyboard_accelerator_to_string(
     const native_keyboard_accelerator_t* accelerator) {
   if (!accelerator)

src/capi/tray_icon_c.cpp

@@ -2,6 +2,8 @@
 #include <cstring>
 #include <map>
 #include <memory>
+#include <optional>
+#include "../global_registry.h"
 #include "../tray_icon.h"
 #include "../tray_icon_event.h"
 #include "string_utils_c.h"
@@ -22,12 +24,17 @@ static std::map<native_tray_icon_t,
     g_tray_icon_listeners;
 static std::atomic<int> g_tray_icon_next_listener_id{1};
 
+// Global registry instance for managing TrayIcon object lifetimes
+static auto& g_tray_icons = globalRegistry<TrayIcon>();
+
 // TrayIcon C API Implementation
 
 native_tray_icon_t native_tray_icon_create(void) {
   try {
     auto tray_icon = std::make_shared<TrayIcon>();
-    return static_cast<native_tray_icon_t>(tray_icon.get());
+    void* handle = tray_icon.get();
+    g_tray_icons[handle] = tray_icon;  // Store shared_ptr to keep object alive
+    return static_cast<native_tray_icon_t>(handle);
   } catch (...) {
     return nullptr;
   }
@@ -39,7 +46,9 @@ native_tray_icon_t native_tray_icon_create_from_native(void* native_tray) {
 
   try {
     auto tray_icon = std::make_shared<TrayIcon>(native_tray);
-    return static_cast<native_tray_icon_t>(tray_icon.get());
+    void* handle = tray_icon.get();
+    g_tray_icons[handle] = tray_icon;  // Store shared_ptr to keep object alive
+    return static_cast<native_tray_icon_t>(handle);
   } catch (...) {
     return nullptr;
   }
@@ -49,14 +58,17 @@ void native_tray_icon_destroy(native_tray_icon_t tray_icon) {
   if (!tray_icon)
     return;
 
-  // Clean up listeners
-  auto it = g_tray_icon_listeners.find(tray_icon);
-  if (it != g_tray_icon_listeners.end()) {
-    g_tray_icon_listeners.erase(it);
+  // Remove event listeners first
+  auto listeners_it = g_tray_icon_listeners.find(tray_icon);
+  if (listeners_it != g_tray_icon_listeners.end()) {
+    g_tray_icon_listeners.erase(listeners_it);
   }
 
-  // Note: The actual TrayIcon object is managed by shared_ptr
-  // This just removes our reference to it
+  // Remove from global storage - this will release the shared_ptr
+  auto tray_icon_it = g_tray_icons.find(tray_icon);
+  if (tray_icon_it != g_tray_icons.end()) {
+    g_tray_icons.erase(tray_icon_it);
+  }
 }
 
 native_tray_icon_id_t native_tray_icon_get_id(native_tray_icon_t tray_icon) {
@@ -369,3 +381,19 @@ bool native_tray_icon_close_context_menu(native_tray_icon_t tray_icon) {
     return false;
   }
 }
+
+// Implementation of cleanup function
+void cleanup_tray_icon_at_exit() {
+  // Clear all event listeners first to prevent callbacks during cleanup
+  g_tray_icon_listeners.clear();
+
+  // Note: We intentionally do NOT clear g_tray_icons here
+  // because they are now managed by function-local static pointers that
+  // won't be destroyed during normal exit, preventing double-free issues.
+  // The memory will be cleaned up by the OS when the process terminates.
+}
+
+// Cleanup functions to ensure proper resource management
+void native_tray_icon_cleanup_all(void) {
+  cleanup_tray_icon_at_exit();
+}

src/capi/tray_icon_c.h

@@ -231,6 +231,13 @@ bool native_tray_icon_open_context_menu(native_tray_icon_t tray_icon);
 FFI_PLUGIN_EXPORT
 bool native_tray_icon_close_context_menu(native_tray_icon_t tray_icon);
 
+/**
+ * Cleanup all tray icon resources
+ * This should be called at program exit to ensure proper cleanup
+ */
+FFI_PLUGIN_EXPORT
+void native_tray_icon_cleanup_all(void);
+
 #ifdef __cplusplus
 }
 #endif

src/global_registry.h

@@ -0,0 +1,16 @@
+#pragma once
+
+#include <memory>
+#include <unordered_map>
+
+namespace nativeapi {
+
+// Template function to create and manage global registries for different object
+// types Uses heap allocation to avoid destruction order issues at program exit
+template <typename T>
+static auto& globalRegistry() {
+  static auto* instance = new std::unordered_map<void*, std::shared_ptr<T>>();
+  return *instance;
+}
+
+}  // namespace nativeapi

src/platform/macos/menu_macos.mm

@@ -597,7 +597,10 @@ - (void)menuDidClose:(NSMenu*)menu {
   bool visible_;
 
   Impl(NSMenu* menu)
-      : ns_menu_(menu), delegate_([[NSMenuDelegateImpl alloc] init]), enabled_(true), visible_(false) {
+      : ns_menu_(menu),
+        delegate_([[NSMenuDelegateImpl alloc] init]),
+        enabled_(true),
+        visible_(false) {
     [ns_menu_ setDelegate:delegate_];
   }
 

src/platform/macos/tray_icon_macos.mm

@@ -27,8 +27,6 @@ - (void)statusItemClicked:(id)sender;
 // Private implementation class
 class TrayIcon::Impl {
  public:
-  Impl() : ns_status_item_(nil), ns_status_bar_button_target_(nil), menu_closed_listener_id_(0) {}
-
   Impl(NSStatusItem* status_item)
       : ns_status_item_(status_item),
         ns_status_bar_button_target_(nil),
@@ -88,15 +86,15 @@ - (void)statusItemClicked:(id)sender;
   size_t menu_closed_listener_id_;
 };
 
-TrayIcon::TrayIcon() : pimpl_(std::make_unique<Impl>()) {
+TrayIcon::TrayIcon() {
   id = -1;
 
   // Create platform-specific NSStatusItem
   NSStatusBar* status_bar = [NSStatusBar systemStatusBar];
   NSStatusItem* status_item = [status_bar statusItemWithLength:NSVariableStatusItemLength];
 
   if (status_item) {
-    // Reinitialize the Impl with the created status item
+    // Initialize the Impl with the created status item
     pimpl_ = std::make_unique<Impl>(status_item);
 
     if (pimpl_->ns_status_bar_button_target_) {
@@ -128,6 +126,9 @@ - (void)statusItemClicked:(id)sender;
         }
       };
     }
+  } else {
+    // If status_item creation failed, create Impl with nil
+    pimpl_ = std::make_unique<Impl>(nil);
   }
 }