diff --git a/.swift-version b/.swift-version index 02cfe02..db0cde6 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -swift-DEVELOPMENT-SNAPSHOT-2016-05-09-a +swift-DEVELOPMENT-SNAPSHOT-2016-05-31-a diff --git a/Package.swift b/Package.swift index e929e68..3e1aa0d 100644 --- a/Package.swift +++ b/Package.swift @@ -4,9 +4,9 @@ let package = Package( name: "WebSocketClient", dependencies: [ .Package(url: "https://github.com/Zewo/WebSocket.git", majorVersion: 0, minor: 8), - .Package(url: "https://github.com/Zewo/HTTP.git", majorVersion: 0, minor: 7), + .Package(url: "https://github.com/Zewo/HTTP.git", majorVersion: 0, minor: 8), .Package(url: "https://github.com/Zewo/Base64.git", majorVersion: 0, minor: 8), - .Package(url: "https://github.com/VeniceX/HTTPClient.git", majorVersion: 0, minor: 7), - .Package(url: "https://github.com/VeniceX/HTTPSClient.git", majorVersion: 0, minor: 7), + .Package(url: "https://github.com/VeniceX/HTTPClient.git", majorVersion: 0, minor: 8), + .Package(url: "https://github.com/VeniceX/HTTPSClient.git", majorVersion: 0, minor: 8), ] ) diff --git a/README.md b/README.md index 7d4df3f..2b5f7dc 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ import PackageDescription let package = Package( dependencies: [ - .Package(url: "https://github.com/Zewo/WebSocketClient.git", majorVersion: 0, minor: 1), + .Package(url: "https://github.com/Zewo/WebSocketClient.git", majorVersion: 0, minor: 2), ] ) ``` diff --git a/Sources/Client.swift b/Sources/Client.swift index d8d1d47..ba96ceb 100644 --- a/Sources/Client.swift +++ b/Sources/Client.swift @@ -68,7 +68,7 @@ public struct Client { "Connection": "Upgrade", "Upgrade": "websocket", "Sec-WebSocket-Version": "13", - "Sec-WebSocket-Key": [key], + "Sec-WebSocket-Key": key, ] let request = try Request(method: .get, uri: path, headers: headers) { response, stream in @@ -85,7 +85,7 @@ public struct Client { try webSocket.start() } - try client.respond(to: request) + _ = try client.respond(to: request) } public func connectInBackground(_ path: String, failure: (ErrorProtocol) -> Void = Client.logError) { @@ -105,18 +105,18 @@ public struct Client { public extension Response { public var webSocketVersion: String? { - return headers["Sec-Websocket-Version"].first + return headers["Sec-Websocket-Version"] } public var webSocketKey: String? { - return headers["Sec-Websocket-Key"].first + return headers["Sec-Websocket-Key"] } public var webSocketAccept: String? { - return headers["Sec-WebSocket-Accept"].first + return headers["Sec-WebSocket-Accept"] } public var isWebSocket: Bool { - return connection.first?.lowercased() == "upgrade" && upgrade.first?.lowercased() == "websocket" + return connection?.lowercased() == "upgrade" && upgrade?.lowercased() == "websocket" } }