From 25256f747f570b3020ae69a8490c8ec7ec526af7 Mon Sep 17 00:00:00 2001
From: popaprozac <zbotterman@gmail.com>
Date: Wed, 19 Mar 2025 21:40:26 -0700
Subject: [PATCH] allow only one notification service per app

---
 .../services/notifications/notifications.go   |  8 ++++--
 .../notifications/notifications_darwin.go     | 28 +++++++++----------
 .../notifications/notifications_linux.go      |  8 ++++--
 .../notifications/notifications_windows.go    | 10 +++----
 4 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/v3/pkg/services/notifications/notifications.go b/v3/pkg/services/notifications/notifications.go
index d3295d8c1..297a21059 100644
--- a/v3/pkg/services/notifications/notifications.go
+++ b/v3/pkg/services/notifications/notifications.go
@@ -26,8 +26,11 @@ type Service struct {
 	callbackLock sync.RWMutex
 }
 
-var NotificationService *Service
-var notificationServiceLock sync.RWMutex
+var (
+	notificationServiceOnce sync.Once
+	NotificationService     *Service
+	notificationServiceLock sync.RWMutex
+)
 
 // NotificationAction represents an action button for a notification
 type NotificationAction = struct {
@@ -109,6 +112,7 @@ func (ns *Service) handleNotificationResult(result NotificationResult) {
 	}
 }
 
+// validateNotificationOptions validates an ID and Title are provided for notifications
 func validateNotificationOptions(options NotificationOptions) error {
 	if options.ID == "" {
 		return fmt.Errorf("notification ID cannot be empty")
diff --git a/v3/pkg/services/notifications/notifications_darwin.go b/v3/pkg/services/notifications/notifications_darwin.go
index 638c8b3a4..d6eee5464 100644
--- a/v3/pkg/services/notifications/notifications_darwin.go
+++ b/v3/pkg/services/notifications/notifications_darwin.go
@@ -33,21 +33,21 @@ const AppleDefaultActionIdentifier = "com.apple.UNNotificationDefaultActionIdent
 // Creates a new Notifications Service.
 // Your app must be packaged and signed for this feature to work.
 func New() *Service {
-	if !CheckBundleIdentifier() {
-		panic("\nError: Cannot use the notification API in development mode on macOS.\n" +
-			"Notifications require the app to be properly bundled with a bundle identifier and signed.\n" +
-			"To use the notification API on macOS:\n" +
-			"  1. Build and package your app using 'wails3 package'\n" +
-			"  2. Sign the packaged .app\n" +
-			"  3. Run the signed .app bundle")
-	}
+	notificationServiceOnce.Do(func() {
+		if !CheckBundleIdentifier() {
+			panic("\nError: Cannot use the notification API in development mode on macOS.\n" +
+				"Notifications require the app to be properly bundled with a bundle identifier and signed.\n" +
+				"To use the notification API on macOS:\n" +
+				"  1. Build and package your app using 'wails3 package'\n" +
+				"  2. Sign the packaged .app\n" +
+				"  3. Run the signed .app bundle")
+		}
 
-	notificationServiceLock.Lock()
-	defer notificationServiceLock.Unlock()
+		if NotificationService == nil {
+			NotificationService = &Service{}
+		}
+	})
 
-	if NotificationService == nil {
-		NotificationService = &Service{}
-	}
 	return NotificationService
 }
 
@@ -70,7 +70,7 @@ func (ns *Service) RequestNotificationAuthorization() (bool, error) {
 		return result.Success, result.Error
 	case <-ctx.Done():
 		cleanupChannel(id)
-		return false, fmt.Errorf("notification authorization timed out after 15s: %w", ctx.Err())
+		return false, fmt.Errorf("notification authorization timed out after 15 minutes: %w", ctx.Err())
 	}
 }
 
diff --git a/v3/pkg/services/notifications/notifications_linux.go b/v3/pkg/services/notifications/notifications_linux.go
index a75996f50..54b0d2a99 100644
--- a/v3/pkg/services/notifications/notifications_linux.go
+++ b/v3/pkg/services/notifications/notifications_linux.go
@@ -81,9 +81,11 @@ var notifier *internalNotifier
 
 // New creates a new Notifications Service
 func New() *Service {
-	if NotificationService == nil {
-		NotificationService = &Service{}
-	}
+	notificationServiceOnce.Do(func() {
+		if NotificationService == nil {
+			NotificationService = &Service{}
+		}
+	})
 	return NotificationService
 }
 
diff --git a/v3/pkg/services/notifications/notifications_windows.go b/v3/pkg/services/notifications/notifications_windows.go
index 06884f3f6..1367f194c 100644
--- a/v3/pkg/services/notifications/notifications_windows.go
+++ b/v3/pkg/services/notifications/notifications_windows.go
@@ -42,12 +42,12 @@ type NotificationPayload struct {
 
 // Creates a new Notifications Service.
 func New() *Service {
-	notificationServiceLock.Lock()
-	defer notificationServiceLock.Unlock()
+	notificationServiceOnce.Do(func() {
+		if NotificationService == nil {
+			NotificationService = &Service{}
+		}
+	})
 
-	if NotificationService == nil {
-		NotificationService = &Service{}
-	}
 	return NotificationService
 }