Merge pull request #207 from phuccvx12/fix/ws-length-endianness

Author: swhitty

FlyingFox/Sources/WebSocket/WSFrameEncoder.swift

@@ -142,14 +142,14 @@ struct WSFrameEncoder {
                                    UInt16(bytes.take())
             return try await (Int(length), hasMask ? decodeMask(from: bytes) : nil)
         default:
-            var length = try await UInt64(bytes.take())
-            length |= try await UInt64(bytes.take()) << 8
-            length |= try await UInt64(bytes.take()) << 16
-            length |= try await UInt64(bytes.take()) << 24
-            length |= try await UInt64(bytes.take()) << 32
-            length |= try await UInt64(bytes.take()) << 40
+            var length = try await UInt64(bytes.take()) << 56
             length |= try await UInt64(bytes.take()) << 48
-            length |= try await UInt64(bytes.take()) << 56
+            length |= try await UInt64(bytes.take()) << 40
+            length |= try await UInt64(bytes.take()) << 32
+            length |= try await UInt64(bytes.take()) << 24
+            length |= try await UInt64(bytes.take()) << 16
+            length |= try await UInt64(bytes.take()) << 8
+            length |= try await UInt64(bytes.take())
 
             guard length <= Int.max else {
                 throw Error("Length is greater than Int.max")

FlyingFox/Tests/WebSocket/WSFrameEncoderTests.swift

@@ -231,12 +231,18 @@ struct WSFrameEncoderTests {
 
     @Test
     func decodeLength() async throws {
+        #expect(
+            try await WSFrameEncoder.decodeLength(0x00) == 0
+        )
         #expect(
             try await WSFrameEncoder.decodeLength(0x01) == 1
         )
         #expect(
             try await WSFrameEncoder.decodeLength(0x7D) == 125
         )
+        #expect(
+            try await WSFrameEncoder.decodeLength(0x7E, 0x00, 0x7E) == 126
+        )
         #expect(
             try await WSFrameEncoder.decodeLength(0x7E, 0x00, 0xFF) == 0x00FF
         )
@@ -247,7 +253,22 @@ struct WSFrameEncoderTests {
             try await WSFrameEncoder.decodeLength(0x7E, 0xFF, 0xFF) == 0xFFFF
         )
         #expect(
-            try await WSFrameEncoder.decodeLength(0x7F, 0xFF, 0xEE, 0xDD, 0xCC, 0xBB, 0xAA, 0x99, 0x00) == 0x0099AABBCCDDEEFF
+            try await WSFrameEncoder.decodeLength(0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00) == 0x00010000
+        )
+        #expect(
+            try await WSFrameEncoder.decodeLength(0x7F, 0x00, 0x99, 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF) == 0x0099AABBCCDDEEFF
+        )
+        #expect(
+            try await WSFrameEncoder.decodeLength(0x7F, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF) == Int.max
+        )
+        #expect(
+            try await WSFrameEncoder.decodeLength(0x80, 0x00, 0x00, 0x00, 0x00) == 0x00
+        )
+        #expect(
+            try await WSFrameEncoder.decodeLength(0xFE, 0x00, 0x7E, 0x00, 0x00, 0x00, 0x00) == 0x7E
+        )
+        #expect(
+            try await WSFrameEncoder.decodeLength(0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x00, 0x00, 0x00, 0x00) == 0x7F
         )
     }
 
@@ -256,9 +277,18 @@ struct WSFrameEncoderTests {
         await #expect(throws: SocketError.disconnected) {
             try await WSFrameEncoder.decodeLength(0x7E)
         }
+        await #expect(throws: SocketError.disconnected) {
+            try await WSFrameEncoder.decodeLength(0x7E, 0x00)
+        }
         await #expect(throws: SocketError.disconnected) {
             try await WSFrameEncoder.decodeLength(0x7F, 0xFF, 0xFF, 0xFF)
         }
+        await #expect(throws: SocketError.disconnected) {
+            try await WSFrameEncoder.decodeLength(0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00)
+        }
+        await #expect(throws: WSFrameEncoder.Error.self) {
+            try await WSFrameEncoder.decodeLength(0x7F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00)
+        }
         await #expect(throws: WSFrameEncoder.Error.self) {
             try await WSFrameEncoder.decodeLength(0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF)
         }