Merge pull request #140 from treastrain/event-stream-cancellation

Support cancellation in NFCReaderSessions' eventStream
treastrain · Dec 22, 2024 · dff358e · dff358e
2 parents 70b9419 + cd059bf
commit dff358e
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 0 deletions.
diff --git a/Sources/Core/NFCNDEFReaderSession+.swift b/Sources/Core/NFCNDEFReaderSession+.swift
@@ -98,6 +98,17 @@ private final class NFCNDEFReaderSessionDelegateHandleObjectForMessage: NSObject
     var continuation: AsyncStream<NFCNDEFReaderSession.MessageEvent>.Continuation?
 
     func readerSessionDidBecomeActive(_ session: NFCNDEFReaderSession) {
+        let invalidator = NFCReaderSessionInvalidator(session)
+        continuation?.onTermination = { @Sendable in
+            switch $0 {
+            case .finished:
+                break
+            case .cancelled:
+                invalidator.invalidate(errorMessage: invalidator.alertMessage)
+            @unknown default:
+                break
+            }
+        }
         continuation?.yield(.sessionBecomeActive)
     }
 
@@ -117,6 +128,17 @@ private final class NFCNDEFReaderSessionDelegateHandleObjectForTag: NSObject, NF
     var continuation: AsyncStream<NFCNDEFReaderSession.TagEvent>.Continuation?
 
     func readerSessionDidBecomeActive(_ session: NFCNDEFReaderSession) {
+        let invalidator = NFCReaderSessionInvalidator(session)
+        continuation?.onTermination = { @Sendable in
+            switch $0 {
+            case .finished:
+                break
+            case .cancelled:
+                invalidator.invalidate(errorMessage: invalidator.alertMessage)
+            @unknown default:
+                break
+            }
+        }
         continuation?.yield(.sessionBecomeActive)
     }
 

diff --git a/Sources/Core/NFCReaderSessionInvalidator.swift b/Sources/Core/NFCReaderSessionInvalidator.swift
@@ -13,6 +13,10 @@ package final class NFCReaderSessionInvalidator<Base: NFCReaderSessionProtocol>:
         self.readerSession = readerSession
     }
 
+    package var alertMessage: String {
+        readerSession?.alertMessage ?? ""
+    }
+
     package func invalidate(errorMessage: String) {
         readerSession?.invalidate(errorMessage: errorMessage)
     }

diff --git a/Sources/Core/NFCTagReaderSession+.swift b/Sources/Core/NFCTagReaderSession+.swift
@@ -56,6 +56,17 @@ private final class NFCTagReaderSessionDelegateHandleObject: NSObject, NFCTagRea
     var continuation: AsyncStream<NFCTagReaderSession.Event>.Continuation?
 
     func tagReaderSessionDidBecomeActive(_ session: NFCTagReaderSession) {
+        let invalidator = NFCReaderSessionInvalidator(session)
+        continuation?.onTermination = { @Sendable in
+            switch $0 {
+            case .finished:
+                break
+            case .cancelled:
+                invalidator.invalidate(errorMessage: invalidator.alertMessage)
+            @unknown default:
+                break
+            }
+        }
         continuation?.yield(.sessionBecomeActive)
     }
 

diff --git a/Sources/Core/NFCVASReaderSession+.swift b/Sources/Core/NFCVASReaderSession+.swift
@@ -52,6 +52,17 @@ private final class NFCVASReaderSessionDelegateHandleObject: NSObject, NFCVASRea
     var continuation: AsyncStream<NFCVASReaderSession.Event>.Continuation?
 
     func readerSessionDidBecomeActive(_ session: NFCVASReaderSession) {
+        let invalidator = NFCReaderSessionInvalidator(session)
+        continuation?.onTermination = { @Sendable in
+            switch $0 {
+            case .finished:
+                break
+            case .cancelled:
+                invalidator.invalidate(errorMessage: invalidator.alertMessage)
+            @unknown default:
+                break
+            }
+        }
         continuation?.yield(.sessionBecomeActive)
     }