refactor: replace Semaphore package with native Swift actor

Author: stonerl

Thaw.xcodeproj/project.pbxproj

@@ -14,7 +14,6 @@
 		7127A9FF2C4886D100D99DEF /* IfritStatic in Frameworks */ = {isa = PBXBuildFile; productRef = 7127A9FE2C4886D100D99DEF /* IfritStatic */; };
 		7168EE532E281CBC00FF9830 /* AXSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 7168EE522E281CBC00FF9830 /* AXSwift */; };
 		7188A68C2E27F9ED008F131D /* MenuBarItemService.xpc in Embed XPC Services */ = {isa = PBXBuildFile; fileRef = 7188A6832E27F9ED008F131D /* MenuBarItemService.xpc */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
-		71A065092E680C620087DB38 /* Semaphore in Frameworks */ = {isa = PBXBuildFile; productRef = 71A065082E680C620087DB38 /* Semaphore */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -97,7 +96,6 @@
 				175061912B1543DD003144CD /* LaunchAtLogin in Frameworks */,
 				1787C4272B16890B002F50DF /* AXSwift in Frameworks */,
 				17F71BB52B880B4500905CBA /* CompactSlider in Frameworks */,
-				71A065092E680C620087DB38 /* Semaphore in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -160,7 +158,6 @@
 				170423D82B56DE78004A2549 /* Sparkle */,
 				17F71BB42B880B4500905CBA /* CompactSlider */,
 				7127A9FE2C4886D100D99DEF /* IfritStatic */,
-				71A065082E680C620087DB38 /* Semaphore */,
 			);
 			productName = Ice;
 			productReference = 7166832A2A767E6A006ABF84 /* Thaw.app */;
@@ -222,7 +219,6 @@
 				170423D72B56DE78004A2549 /* XCRemoteSwiftPackageReference "Sparkle" */,
 				17F71BB32B880B4500905CBA /* XCRemoteSwiftPackageReference "CompactSlider" */,
 				7127A9FB2C4881BC00D99DEF /* XCRemoteSwiftPackageReference "Ifrit" */,
-				71A065072E680C620087DB38 /* XCRemoteSwiftPackageReference "Semaphore" */,
 			);
 			preferredProjectObjectVersion = 77;
 			productRefGroup = 7166832B2A767E6A006ABF84 /* Products */;
@@ -623,14 +619,6 @@
 				minimumVersion = 4.0.0;
 			};
 		};
-		71A065072E680C620087DB38 /* XCRemoteSwiftPackageReference "Semaphore" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/groue/Semaphore";
-			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 0.1.0;
-			};
-		};
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
@@ -664,11 +652,6 @@
 			package = 1787C4252B16890B002F50DF /* XCRemoteSwiftPackageReference "AXSwift" */;
 			productName = AXSwift;
 		};
-		71A065082E680C620087DB38 /* Semaphore */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 71A065072E680C620087DB38 /* XCRemoteSwiftPackageReference "Semaphore" */;
-			productName = Semaphore;
-		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 716683222A767E6A006ABF84 /* Project object */;

Thaw.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -6,7 +6,36 @@
 import Cocoa
 import Combine
 import OSLog
-import Semaphore
+
+/// Simple actor-based semaphore to prevent overlapping operations
+actor SimpleSemaphore {
+    private var value: Int
+    private var waiters: [CheckedContinuation<Void, Never>] = []
+
+    init(value: Int) {
+        self.value = value
+    }
+
+    func wait() async {
+        if value > 0 {
+            value -= 1
+            return
+        }
+
+        await withCheckedContinuation { continuation in
+            waiters.append(continuation)
+        }
+    }
+
+    func signal() {
+        if let waiter = waiters.first {
+            waiters.removeFirst()
+            waiter.resume()
+        } else {
+            value += 1
+        }
+    }
+}
 
 /// Manager for menu bar items.
 @MainActor
@@ -18,7 +47,7 @@ final class MenuBarItemManager: ObservableObject {
     private nonisolated let logger = Logger.menuBarItemManager
 
     /// Semaphore to prevent overlapping event operations.
-    private nonisolated let eventSemaphore = AsyncSemaphore(value: 1)
+    private let eventSemaphore = SimpleSemaphore(value: 1)
 
     /// Actor for managing menu bar item cache operations.
     private let cacheActor = CacheActor()
@@ -1007,9 +1036,11 @@ extension MenuBarItemManager {
     ///   - item: The menu bar item to move.
     ///   - destination: The destination to move the menu bar item.
     private func postMoveEvents(item: MenuBarItem, destination: MoveDestination) async throws {
-        try await eventSemaphore.waitUnlessCancelled()
+        await eventSemaphore.wait()
         defer {
-            eventSemaphore.signal()
+            Task {
+                await eventSemaphore.signal()
+            }
         }
 
         var itemOrigin = try await getCurrentBounds(for: item).origin
@@ -1178,9 +1209,11 @@ extension MenuBarItemManager {
     ///   - item: The menu bar item to click.
     ///   - mouseButton: The mouse button to click the item with.
     private func postClickEvents(item: MenuBarItem, mouseButton: CGMouseButton) async throws {
-        try await eventSemaphore.waitUnlessCancelled()
+        await eventSemaphore.wait()
         defer {
-            eventSemaphore.signal()
+            Task {
+                await eventSemaphore.signal()
+            }
         }
 
         let clickPoint = try await getCurrentBounds(for: item).center

Thaw/MenuBar/MenuBarItems/MenuBarItemManager.swift

@@ -1,15 +1,15 @@
-{\rtf1\ansi\ansicpg1252\cocoartf2865
+{\rtf1\ansi\ansicpg1252\cocoartf2867
 \cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Arial-BoldMT;\f1\fswiss\fcharset0 ArialMT;}
 {\colortbl;\red255\green255\blue255;\red0\green0\blue0;}
 {\*\expandedcolortbl;;\cssrgb\c0\c1\c1;}
-\margl1440\margr1440\vieww34360\viewh20220\viewkind0
+\paperw12240\paperh15840\margl1440\margr1440\vieww34360\viewh20220\viewkind0
 \deftab720
 \pard\pardeftab720\partightenfactor0
 
 \f0\b\fs24 \cf2 \expnd0\expndtw0\kerning0
 Acknowledgements
 \f1\b0 \
-Ice uses a number of excellent open source libraries. Their licenses and copyright notices are included below.\
+Thaw uses a number of excellent open source libraries. Their licenses and copyright notices are included below.\
 \
 
 \f0\b AXSwift - https://github.com/tmandry/AXSwift
@@ -44,14 +44,6 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\
 \
 
-\f0\b Semaphore - https://github.com/groue/Semaphore
-\f1\b0 \
-Copyright (c) 2022 Gwendal Rou\'e9\
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\
-\
-
 \f0\b Sparkle - https://github.com/sparkle-project/Sparkle
 \f1\b0 \
 Copyright (c) 2006-2013 Andy Matuschak.\