fix(BidirectionalStream): fix nested stream will cause nested error (#5)

rockmagma02 · Apr 22, 2024 · eeb9361 · eeb9361
1 parent 579c993
commit eeb9361
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 18 deletions.
diff --git a/Sources/SyncStream/BidirectionalAsyncStream.swift b/Sources/SyncStream/BidirectionalAsyncStream.swift
@@ -218,15 +218,19 @@ public extension BidirectionalAsyncStream {
 
             finished = true
 
-            let filename = (fileName as NSString).lastPathComponent
-            let terminated = Terminated(
-                fileName: fileName,
-                functionName: functionName,
-                lineNumber: lineNumber,
-                columnNumber: columnNumber,
-                error: error
-            )
-            state = .error(terminated)
+            if let error = (error as? Terminated) {
+                state = .error(error)
+            } else {
+                let filename = (fileName as NSString).lastPathComponent
+                let terminated = Terminated(
+                    fileName: fileName,
+                    functionName: functionName,
+                    lineNumber: lineNumber,
+                    columnNumber: columnNumber,
+                    error: error
+                )
+                state = .error(terminated)
+            }
             await yieldSemaphore.signal()
         }
 

diff --git a/Sources/SyncStream/BidirectionalSyncStream.swift b/Sources/SyncStream/BidirectionalSyncStream.swift
@@ -262,15 +262,19 @@ public extension BidirectionalSyncStream {
 
             finished = true
 
-            let filename = (fileName as NSString).lastPathComponent
-            let terminated = Terminated(
-                fileName: fileName,
-                functionName: functionName,
-                lineNumber: lineNumber,
-                columnNumber: columnNumber,
-                error: error
-            )
-            state = .error(terminated)
+            if let error = (error as? Terminated) {
+                state = .error(error)
+            } else {
+                let filename = (fileName as NSString).lastPathComponent
+                let terminated = Terminated(
+                    fileName: fileName,
+                    functionName: functionName,
+                    lineNumber: lineNumber,
+                    columnNumber: columnNumber,
+                    error: error
+                )
+                state = .error(terminated)
+            }
             yieldSemaphore.signal()
         }