Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add extra HTTPHeaders to WebSocket client #2

Merged
merged 3 commits into from
Apr 26, 2018
Merged

Add extra HTTPHeaders to WebSocket client #2

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b39ab04
add extra http headres to websocket client
pvels Apr 19, 2018
b450c97
use permanent header field names
pvels Apr 19, 2018
be37e7b
docblock update and little fix
pvels Apr 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions Sources/WebSocket/WebSocket+Client.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,18 @@ extension HTTPClient {
/// - hostname: Remote server's hostname.
/// - port: Remote server's port, defaults to 80 for TCP and 443 for TLS.
/// - path: Path on remote server to connect to.
/// - headers: Additional HTTP headers are used to establish a connection.
/// - worker: `Worker` to perform async work on.
/// - returns: A `Future` containing the connected `HTTPClient`.
/// - returns: A `Future` containing the connected `WebSocket`.
public static func webSocket(
scheme: HTTPScheme = .ws,
hostname: String,
port: Int? = nil,
path: String = "/",
headers: HTTPHeaders = .init(),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

docblock needs to be adjusted for this new param

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done 🙂

on worker: Worker
) -> Future<WebSocket> {
let upgrader = WebSocketClientUpgrader(hostname: hostname, path: path)
let upgrader = WebSocketClientUpgrader(hostname: hostname, path: path, headers: headers)
return HTTPClient.upgrade(scheme: scheme, hostname: hostname, port: port, upgrader: upgrader, on: worker)
}
}
Expand All @@ -47,22 +49,27 @@ private final class WebSocketClientUpgrader: HTTPClientProtocolUpgrader {

/// Path to use when upgrading.
let path: String

/// Additional headers to use when upgrading.
let headers: HTTPHeaders

/// Creates a new `WebSocketClientUpgrader`.
init(hostname: String, path: String) {
init(hostname: String, path: String, headers: HTTPHeaders) {
self.hostname = hostname
self.path = path
self.headers = headers
}

/// See `HTTPClientProtocolUpgrader`.
func buildUpgradeRequest() -> HTTPRequestHead {
var upgradeReq = HTTPRequestHead(version: .init(major: 1, minor: 1), method: .GET, uri: path)
headers.forEach { upgradeReq.headers.replaceOrAdd(name: $0.name, value: $0.value) }
upgradeReq.headers.add(name: .connection, value: "Upgrade")
upgradeReq.headers.add(name: .upgrade, value: "websocket")
upgradeReq.headers.add(name: .host, value: hostname)
upgradeReq.headers.add(name: .origin, value: "vapor/websocket")
upgradeReq.headers.add(name: "Sec-WebSocket-Version", value: "13") // fixme: randomly gen
upgradeReq.headers.add(name: "Sec-WebSocket-Key", value: "MTMtMTUyMzk4NDIxNzk3NQ==") // fixme: randomly gen
upgradeReq.headers.add(name: .secWebSocketVersion, value: "13") // fixme: randomly gen
upgradeReq.headers.add(name: .secWebSocketKey, value: "MTMtMTUyMzk4NDIxNzk3NQ==") // fixme: randomly gen
return upgradeReq
}

Expand Down