remove engine

Author: Joannis

Package.swift

@@ -17,10 +17,10 @@ let package = Package(
         .package(url: "https://github.com/vapor/crypto.git", .revision("3.0.0-beta.1")),
 
         // Networking
-        .package(url: "https://github.com/vapor/sockets.git", .revision("3.0.0-beta.1")),
+        .package(url: "https://github.com/vapor/sockets.git", .revision("3.0.0-beta.2")),
 
         // SSL support
-        .package(url: "https://github.com/vapor/tls.git", .revision("3.0.0-beta.1")),
+        .package(url: "https://github.com/vapor/tls.git", .revision("3.0.0-beta.2")),
     ],
     targets: [
         .target(name: "MySQL", dependencies: ["CodableKit", "Crypto", "TCP", "TLS"]),

Sources/MySQL/Connection/Connection.swift

@@ -16,7 +16,7 @@ public struct MySQLSSLConfig {
     }
 }
 
-/// A connectio to a MySQL database servers
+/// A connection to a MySQL database servers
 public struct MySQLConnection {
     let stateMachine: MySQLStateMachine
 

Sources/MySQL/Connection/PacketParser.swift

@@ -130,8 +130,8 @@ internal struct MySQLPacketParser: ByteParser {
         guard buffer.count >= 3 else { return nil }
 
         let byte0: UInt32 = numericCast(buffer[0])
-        let byte1: UInt32 = numericCast(buffer[1])
-        let byte2: UInt32 = numericCast(buffer[2])
+        let byte1: UInt32 = numericCast(buffer[1]) << 8
+        let byte2: UInt32 = numericCast(buffer[2]) << 16
 
         return numericCast(byte0 | byte1 | byte2) as Int
     }
@@ -157,16 +157,16 @@ internal struct MySQLPacketParser: ByteParser {
         // Take the cached previous packet edge-case bytes into consideration
         switch headerBytes.count {
         case 1:
-            byte0 = (numericCast(headerBytes[0]) as UInt32).littleEndian
+            byte0 = numericCast(headerBytes[0])
 
-            byte1 = (numericCast(pointer[0]) as UInt32).littleEndian << 8
-            byte2 = (numericCast(pointer[1]) as UInt32).littleEndian << 16
+            byte1 = numericCast(pointer[0]) << 8
+            byte2 = numericCast(pointer[1]) << 16
             parsed = 2
         case 2:
-            byte0 = (numericCast(headerBytes[0]) as UInt32).littleEndian
-            byte1 = (numericCast(headerBytes[1]) as UInt32).littleEndian << 8
+            byte0 = numericCast(headerBytes[0])
+            byte1 = numericCast(headerBytes[1]) << 8
 
-            byte2 = (numericCast(pointer[0]) as UInt32).littleEndian << 16
+            byte2 = numericCast(pointer[0]) << 16
             parsed = 1
         default:
             fatalError("Invalid MySQL parsing scenario reached")

Sources/MySQL/Internals/Handshake.swift

@@ -46,7 +46,12 @@ extension Packet {
 
         // Require decimal `10` to be the protocol version
         guard try parser.byte() == 10 else {
-            throw MySQLError(.invalidHandshake)
+            // if the first byte is 0xff then we got an error packet
+            if parser.payload[0] == 0xff {
+                throw MySQLError(packet: self)
+            } else {
+                throw MySQLError(.invalidHandshake)
+            }
         }
 
         // UTF-8

Sources/MySQL/Internals/MySQLStream.swift

@@ -14,6 +14,7 @@ final class MySQLStateMachine {
     var affectedRows: UInt64?
 
     var handshake: Handshake?
+    /// We currently don't use sequenceId
     var sequenceId: UInt8
     private let ssl: MySQLSSLConfig?
     let connected: Promise<Void>

Sources/MySQL/Internals/Packet.swift

@@ -15,6 +15,10 @@ internal final class Packet: ExpressibleByArrayLiteral {
 
     /// The sequence ID is incremented per message
     /// This client doesn't use this
+    /// The max packet size is 2^24-1 bytes, so the packet fragmenting is hardly used.
+    /// There are cases like bigdata bulk loading, big blob fetch etc when the SERVER will use it,
+    /// therefore later we need to address this
+    
     var sequenceId: UInt8 {
         get {
             return containsPacketSize ? buffer[3] : buffer[0]
@@ -86,8 +90,11 @@ internal final class Packet: ExpressibleByArrayLiteral {
             UInt8((elements.count >> 8) & 0xff),
             UInt8((elements.count >> 16) & 0xff),
         ]
-        
+        var sequenceId = UInt8(0)
+
         memcpy(pointer, packetSizeBytes, 3)
+       
+        memcpy(pointer.advanced(by: 3), &sequenceId, 1)
 
         memcpy(pointer.advanced(by: 4), elements, elements.count)
 
@@ -102,10 +109,12 @@ internal final class Packet: ExpressibleByArrayLiteral {
             UInt8((data.count >> 8) & 0xff),
             UInt8((data.count >> 16) & 0xff),
             ]
-        
+        var  sequenceId = UInt8(0)
         memcpy(pointer, packetSizeBytes, 3)
 
-        _ = memcpy(pointer.advanced(by: 4), data, data.count)
+        memcpy(pointer.advanced(by: 3), &sequenceId, 1)
+        
+        memcpy(pointer.advanced(by: 4), data, data.count)
 
         self.init(payload: MutableByteBuffer(start: pointer, count: 4 &+ data.count), containsPacketSize: true)
     }
@@ -118,9 +127,12 @@ internal final class Packet: ExpressibleByArrayLiteral {
             UInt8((data.count >> 8) & 0xff),
             UInt8((data.count >> 16) & 0xff),
         ]
+        var sequenceId = UInt8(0)
 
         memcpy(pointer, packetSizeBytes, 3)
 
+        memcpy(pointer.advanced(by: 3), &sequenceId, 1)
+        
         data.withByteBuffer { buffer in
             _ = memcpy(pointer.advanced(by: 4), buffer.baseAddress!, data.count)
         }

circle.yml

@@ -3,7 +3,7 @@ version: 2
 jobs:
   macos:
     macos:
-      xcode: "9.0"
+      xcode: "9.2"
     steps:
       - run: brew install mysql
       - run: brew services start mysql