Release 0.0.4

codingiran · codingiran · commit 5ec0ec37ab80 · 2025-05-25T10:31:02.000+08:00
diff --git a/Sources/AsyncTimer/AsyncTimer.swift b/Sources/AsyncTimer/AsyncTimer.swift
@@ -14,7 +14,7 @@ import Foundation
 
 public enum AsyncTimerInfo: Sendable {
     /// Current AsyncTimer version.
-    public static let version = "0.0.3"
+    public static let version = "0.0.4"
 }
 
 /// A simple repeating timer that runs a task at a specified interval.
@@ -81,14 +81,15 @@ public final actor AsyncTimer {
     public func start() {
         stop()
         task = Task(priority: priority) {
+            // one-time timer
             guard repeating else {
-                // one-time timer
                 do {
                     try await Self.sleep(interval)
                     await self.handler()
-                } catch is CancellationError {
-                    // timer was cancelled
-                    await cancelHandler?()
+                    handleTaskCompletion()
+                } catch {
+                    // task was cancelled
+                    handleTaskCancelation()
                 }
                 return
             }
@@ -103,12 +104,11 @@ public final actor AsyncTimer {
                     if Task.isCancelled { break }
                     try await Self.sleep(interval)
                 }
-            } catch is CancellationError {
-                // timer was cancelled
             } catch {
-                // unexpected error
+                // task was cancelled
             }
-            await cancelHandler?()
+            // while loop was break or task cancelled
+            handleTaskCancelation()
         }
     }
 
@@ -136,6 +136,19 @@ public final actor AsyncTimer {
     }
 }
 
+private extension AsyncTimer {
+    /// Handles the task cancelation.
+    func handleTaskCancelation() {
+        task = nil
+        Task { await self.cancelHandler?() }
+    }
+
+    /// Handles the task completion.
+    func handleTaskCompletion() {
+        task = nil
+    }
+}
+
 public extension AsyncTimer {
     /// Sleep for the specified interval.
     static func sleep(_ interval: TimeInterval) async throws {
diff --git a/Tests/AsyncTimerTests/AsyncTimerTests.swift b/Tests/AsyncTimerTests/AsyncTimerTests.swift
@@ -171,7 +171,7 @@ import Testing
             handler: {
                 @MainActor in
                 // Simulate some work
-                for _ in 0..<1000000 {
+                for _ in 0 ..< 1_000_000 {
                     _ = 1 + 1
                 }
                 highPriorityExecutionTime = Date().timeIntervalSince1970 - startTime
@@ -186,7 +186,7 @@ import Testing
             handler: {
                 @MainActor in
                 // Simulate some work
-                for _ in 0..<1000000 {
+                for _ in 0 ..< 1_000_000 {
                     _ = 1 + 1
                 }
                 lowPriorityExecutionTime = Date().timeIntervalSince1970 - startTime
