close code should terminate stream

swhitty · swhitty · commit 9cd87050ca99 · 2025-03-05T07:28:43.000+11:00
diff --git a/FlyingFox/Sources/WebSocket/WSHandler.swift b/FlyingFox/Sources/WebSocket/WSHandler.swift
@@ -119,10 +119,18 @@ public struct MessageFrameWSHandler: WSHandler {
                 }
             }
             group.addTask {
-                for await message in messagesOut {
-                    for frame in makeFrames(for: message) {
-                        framesOut.yield(frame)
+                do {
+                    for await message in messagesOut {
+                        for frame in makeFrames(for: message) {
+                            framesOut.yield(frame)
+                            if frame.opcode == .close {
+                                throw FrameError.closed(frame)
+                            }
+                        }
                     }
+                    framesOut.finish(throwing: nil)
+                } catch {
+                    framesOut.finish(throwing: nil)
                 }
             }
             await group.next()!

Original file line number	Diff line number	Diff line change
`@@ -119,10 +119,18 @@ public struct MessageFrameWSHandler: WSHandler {`
`119`	`119`	`}`
`120`	`120`	`}`
`121`	`121`	`group.addTask {`
`122`		`- for await message in messagesOut {`
`123`		`- for frame in makeFrames(for: message) {`
`124`		`- framesOut.yield(frame)`
	`122`	`+ do {`
	`123`	`+ for await message in messagesOut {`
	`124`	`+ for frame in makeFrames(for: message) {`
	`125`	`+ framesOut.yield(frame)`
	`126`	`+ if frame.opcode == .close {`
	`127`	`+ throw FrameError.closed(frame)`
	`128`	`+ }`
	`129`	`+ }`
`125`	`130`	`}`
	`131`	`+ framesOut.finish(throwing: nil)`
	`132`	`+ } catch {`
	`133`	`+ framesOut.finish(throwing: nil)`
`126`	`134`	`}`
`127`	`135`	`}`
`128`	`136`	`await group.next()!`