cheykrym/socket.io-client-swift
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix websocket

Browse Source
This commit is contained in:
Erik 2016-08-20 15:30:07 -04:00
parent 1232c34817
commit 70b870690e
No known key found for this signature in database
GPG Key ID: 4930B7C5FBC1A69D
1 changed files with 46 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
Source/WebSocket.swift
View File

@ -38,9 +38,9 @@ public protocol WebSocketPongDelegate: class {
func websocketDidReceivePong(_ socket: WebSocket) func websocketDidReceivePong(_ socket: WebSocket)
} }
public class WebSocket: NSObject, StreamDelegate { public class WebSocket : NSObject, StreamDelegate {
enum OpCode: UInt8 { enum OpCode : UInt8 {
case continueFrame = 0x0 case continueFrame = 0x0
case textFrame = 0x1 case textFrame = 0x1
case binaryFrame = 0x2 case binaryFrame = 0x2
@ -51,7 +51,7 @@ public class WebSocket: NSObject, StreamDelegate {
// B-F reserved. // B-F reserved.
} }
public enum CloseCode: UInt16 { public enum CloseCode : UInt16 {
case normal = 1000 case normal = 1000
case goingAway = 1001 case goingAway = 1001
case protocolError = 1002 case protocolError = 1002
@ -66,7 +66,7 @@ public class WebSocket: NSObject, StreamDelegate {
public static let ErrorDomain = "WebSocket" public static let ErrorDomain = "WebSocket"
enum InternalErrorCode: UInt16 { enum InternalErrorCode : UInt16 {
// 0-999 WebSocket status codes not used // 0-999 WebSocket status codes not used
case outputStreamWriteError = 1 case outputStreamWriteError = 1
} }
@ -190,7 +190,7 @@ public class WebSocket: NSObject, StreamDelegate {
- Parameter forceTimeout: Maximum time to wait for the server to close the socket. - Parameter forceTimeout: Maximum time to wait for the server to close the socket.
*/ */
public func disconnect(_ forceTimeout: TimeInterval? = nil) { public func disconnect(forceTimeout: TimeInterval? = nil) {
switch forceTimeout { switch forceTimeout {
case .some(let seconds) where seconds > 0: case .some(let seconds) where seconds > 0:
callbackQueue.asyncAfter(deadline: DispatchTime.now() + Double(Int64(seconds * Double(NSEC_PER_SEC))) / Double(NSEC_PER_SEC)) { [weak self] in callbackQueue.asyncAfter(deadline: DispatchTime.now() + Double(Int64(seconds * Double(NSEC_PER_SEC))) / Double(NSEC_PER_SEC)) { [weak self] in
@ -253,19 +253,19 @@ public class WebSocket: NSObject, StreamDelegate {
port = 80 port = 80
} }
} }
addHeader(urlRequest: urlRequest, key: headerWSUpgradeName as NSString, val: headerWSUpgradeValue as NSString) addHeader(urlRequest, key: headerWSUpgradeName as NSString, val: headerWSUpgradeValue as NSString)
addHeader(urlRequest: urlRequest, key: headerWSConnectionName as NSString, val: headerWSConnectionValue as NSString) addHeader(urlRequest, key: headerWSConnectionName as NSString, val: headerWSConnectionValue as NSString)
if let protocols = optionalProtocols { if let protocols = optionalProtocols {
addHeader(urlRequest: urlRequest, key: headerWSProtocolName as NSString, val: protocols.joined(separator: ",") as NSString) addHeader(urlRequest, key: headerWSProtocolName as NSString, val: protocols.joined(separator: ",") as NSString)
} }
addHeader(urlRequest: urlRequest, key: headerWSVersionName as NSString, val: headerWSVersionValue as NSString) addHeader(urlRequest, key: headerWSVersionName as NSString, val: headerWSVersionValue as NSString)
addHeader(urlRequest: urlRequest, key: headerWSKeyName as NSString, val: generateWebSocketKey() as NSString) addHeader(urlRequest, key: headerWSKeyName as NSString, val: generateWebSocketKey() as NSString)
if let origin = origin { if let origin = origin {
addHeader(urlRequest: urlRequest, key: headerOriginName as NSString, val: origin as NSString) addHeader(urlRequest, key: headerOriginName as NSString, val: origin as NSString)
} }
addHeader(urlRequest: urlRequest, key: headerWSHostName as NSString, val: "\(url.host!):\(port!)" as NSString) addHeader(urlRequest, key: headerWSHostName as NSString, val: "\(url.host!):\(port!)" as NSString)
for (key,value) in headers { for (key,value) in headers {
addHeader(urlRequest: urlRequest, key: key as NSString, val: value as NSString) addHeader(urlRequest, key: key as NSString, val: value as NSString)
} }
if let cfHTTPMessage = CFHTTPMessageCopySerializedMessage(urlRequest) { if let cfHTTPMessage = CFHTTPMessageCopySerializedMessage(urlRequest) {
let serializedRequest = cfHTTPMessage.takeRetainedValue() let serializedRequest = cfHTTPMessage.takeRetainedValue()
@ -274,7 +274,7 @@ public class WebSocket: NSObject, StreamDelegate {
} }
/// Add a header to the CFHTTPMessage by using the NSString bridges to CFString. /// Add a header to the CFHTTPMessage by using the NSString bridges to CFString.
private func addHeader(urlRequest: CFHTTPMessage, key: NSString, val: NSString) { private func addHeader(_ urlRequest: CFHTTPMessage, key: NSString, val: NSString) {
CFHTTPMessageSetHeaderFieldValue(urlRequest, key, val) CFHTTPMessageSetHeaderFieldValue(urlRequest, key, val)
} }
@ -306,8 +306,8 @@ public class WebSocket: NSObject, StreamDelegate {
inStream.delegate = self inStream.delegate = self
outStream.delegate = self outStream.delegate = self
if supportedSSLSchemes.contains(url.scheme!) { if supportedSSLSchemes.contains(url.scheme!) {
// inStream.setProperty(StreamSocketSecurityLevel.negotiatedSSL, forKey: Stream.PropertyKey.socketSecurityLevelKey) // inStream.setProperty(StreamSocketSecurityLevel.negotiatedSSL, forKey: Stream.PropertyKey.socketSecurityLevelKey)
// outStream.setProperty(StreamSocketSecurityLevel.negotiatedSSL, forKey: Stream.PropertyKey.socketSecurityLevelKey) // outStream.setProperty(StreamSocketSecurityLevel.negotiatedSSL, forKey: Stream.PropertyKey.socketSecurityLevelKey)
} else { } else {
certValidated = true //not a https session, so no need to check SSL pinning certValidated = true //not a https session, so no need to check SSL pinning
} }
@ -326,12 +326,12 @@ public class WebSocket: NSObject, StreamDelegate {
let resIn = SSLSetEnabledCiphers(sslContextIn, cipherSuites, cipherSuites.count) let resIn = SSLSetEnabledCiphers(sslContextIn, cipherSuites, cipherSuites.count)
let resOut = SSLSetEnabledCiphers(sslContextOut, cipherSuites, cipherSuites.count) let resOut = SSLSetEnabledCiphers(sslContextOut, cipherSuites, cipherSuites.count)
if resIn != errSecSuccess { if resIn != errSecSuccess {
let error = self.errorWithDetail(detail: "Error setting ingoing cypher suites", code: UInt16(resIn)) let error = self.errorWithDetail("Error setting ingoing cypher suites", code: UInt16(resIn))
disconnectStream(error: error) disconnectStream(error: error)
return return
} }
if resOut != errSecSuccess { if resOut != errSecSuccess {
let error = self.errorWithDetail(detail: "Error setting outgoing cypher suites", code: UInt16(resOut)) let error = self.errorWithDetail("Error setting outgoing cypher suites", code: UInt16(resOut))
disconnectStream(error: error) disconnectStream(error: error)
return return
} }
@ -354,7 +354,7 @@ public class WebSocket: NSObject, StreamDelegate {
out -= 100 out -= 100
if out < 0 { if out < 0 {
self?.cleanupStream() self?.cleanupStream()
self?.doDisconnect(error: self?.errorWithDetail(detail: "write wait timed out", code: 2)) self?.doDisconnect(error: self?.errorWithDetail("write wait timed out", code: 2))
return return
} else if outStream.streamError != nil { } else if outStream.streamError != nil {
return // disconnectStream will be called. return // disconnectStream will be called.
@ -365,18 +365,17 @@ public class WebSocket: NSObject, StreamDelegate {
} }
// Delegate for the stream methods. Processes incoming bytes. // Delegate for the stream methods. Processes incoming bytes.
public func stream(aStream: Stream, handleEvent eventCode: Stream.Event) { public func stream(_ aStream: Stream, handle eventCode: Stream.Event) {
if let sec = security , !certValidated && [.hasBytesAvailable, .hasSpaceAvailable].contains(eventCode) { if let sec = security , !certValidated && [.hasBytesAvailable, .hasSpaceAvailable].contains(eventCode) {
let possibleTrust = aStream.property(forKey: kCFStreamPropertySSLPeerTrust as Stream.PropertyKey) as AnyObject let possibleTrust = aStream.property(forKey: kCFStreamPropertySSLPeerTrust as Stream.PropertyKey) as AnyObject
let domain = aStream.property(forKey: kCFStreamSSLPeerName as Stream.PropertyKey) as? String let domain = aStream.property(forKey: kCFStreamSSLPeerName as Stream.PropertyKey) as? String
if sec.isValid(possibleTrust as! SecTrust, domain: domain) { if sec.isValid(possibleTrust as! SecTrust, domain: domain) {
certValidated = true certValidated = true
} else { } else {
let error = errorWithDetail(detail: "Invalid SSL certificate", code: 1) let error = errorWithDetail("Invalid SSL certificate", code: 1)
disconnectStream(error: error) disconnectStream(error: error)
return return
} }
} }
if eventCode == .hasBytesAvailable { if eventCode == .hasBytesAvailable {
if aStream == inputStream { if aStream == inputStream {
@ -426,7 +425,7 @@ public class WebSocket: NSObject, StreamDelegate {
if inputQueue.count == 0 { if inputQueue.count == 0 {
process = true process = true
} }
inputQueue.append(Data(bytes: UnsafePointer<UInt8>(buffer), count: length)) inputQueue.append(Data(bytes: UnsafeRawPointer(buffer).assumingMemoryBound(to: UInt8.self), count: length))
if process { if process {
dequeueInput() dequeueInput()
} }
@ -471,7 +470,7 @@ public class WebSocket: NSObject, StreamDelegate {
fragBuffer = NSData(bytes: buffer, length: bufferLen) as Data fragBuffer = NSData(bytes: buffer, length: bufferLen) as Data
break // do nothing, we are going to collect more data break // do nothing, we are going to collect more data
default: default:
doDisconnect(error: errorWithDetail(detail: "Invalid HTTP upgrade", code: UInt16(code))) doDisconnect(error: errorWithDetail("Invalid HTTP upgrade", code: UInt16(code)))
} }
} }
@ -571,7 +570,7 @@ public class WebSocket: NSObject, StreamDelegate {
} }
response.bytesLeft -= len response.bytesLeft -= len
response.buffer?.append(Data(bytes: baseAddress, count: len)) response.buffer?.append(Data(bytes: baseAddress, count: len))
processResponse(response: response) _ = processResponse(response)
return buffer.fromOffset(bufferLen - extra) return buffer.fromOffset(bufferLen - extra)
} else { } else {
let isFin = (FinMask & baseAddress[0]) let isFin = (FinMask & baseAddress[0])
@ -581,7 +580,7 @@ public class WebSocket: NSObject, StreamDelegate {
var offset = 2 var offset = 2
if (isMasked > 0 || (RSVMask & baseAddress[0]) > 0) && receivedOpcode != .pong { if (isMasked > 0 || (RSVMask & baseAddress[0]) > 0) && receivedOpcode != .pong {
let errCode = CloseCode.protocolError.rawValue let errCode = CloseCode.protocolError.rawValue
doDisconnect(error: errorWithDetail(detail: "masked and rsv data is not currently supported", code: errCode)) doDisconnect(error: errorWithDetail("masked and rsv data is not currently supported", code: errCode))
writeError(code: errCode) writeError(code: errCode)
return emptyBuffer return emptyBuffer
} }
@ -589,13 +588,13 @@ public class WebSocket: NSObject, StreamDelegate {
if !isControlFrame && (receivedOpcode != .binaryFrame && receivedOpcode != .continueFrame && if !isControlFrame && (receivedOpcode != .binaryFrame && receivedOpcode != .continueFrame &&
receivedOpcode != .textFrame && receivedOpcode != .pong) { receivedOpcode != .textFrame && receivedOpcode != .pong) {
let errCode = CloseCode.protocolError.rawValue let errCode = CloseCode.protocolError.rawValue
doDisconnect(error: errorWithDetail(detail: "unknown opcode: \(receivedOpcode)", code: errCode)) doDisconnect(error: errorWithDetail("unknown opcode: \(receivedOpcode)", code: errCode))
writeError(code: errCode) writeError(code: errCode)
return emptyBuffer return emptyBuffer
} }
if isControlFrame && isFin == 0 { if isControlFrame && isFin == 0 {
let errCode = CloseCode.protocolError.rawValue let errCode = CloseCode.protocolError.rawValue
doDisconnect(error: errorWithDetail(detail: "control frames can't be fragmented", code: errCode)) doDisconnect(error: errorWithDetail("control frames can't be fragmented", code: errCode))
writeError(code: errCode) writeError(code: errCode)
return emptyBuffer return emptyBuffer
} }
@ -622,7 +621,7 @@ public class WebSocket: NSObject, StreamDelegate {
} }
} }
} }
doDisconnect(error: errorWithDetail(detail: closeReason, code: code)) doDisconnect(error: errorWithDetail(closeReason, code: code))
writeError(code: code) writeError(code: code)
return emptyBuffer return emptyBuffer
} }
@ -669,7 +668,7 @@ public class WebSocket: NSObject, StreamDelegate {
} }
if isFin == 0 && receivedOpcode == .continueFrame && response == nil { if isFin == 0 && receivedOpcode == .continueFrame && response == nil {
let errCode = CloseCode.protocolError.rawValue let errCode = CloseCode.protocolError.rawValue
doDisconnect(error: errorWithDetail(detail: "continue frame before a binary or text frame", code: errCode)) doDisconnect(error: errorWithDetail("continue frame before a binary or text frame", code: errCode))
writeError(code: errCode) writeError(code: errCode)
return emptyBuffer return emptyBuffer
} }
@ -677,8 +676,8 @@ public class WebSocket: NSObject, StreamDelegate {
if response == nil { if response == nil {
if receivedOpcode == .continueFrame { if receivedOpcode == .continueFrame {
let errCode = CloseCode.protocolError.rawValue let errCode = CloseCode.protocolError.rawValue
doDisconnect(error: errorWithDetail(detail: "first frame can't be a continue frame", doDisconnect(error: errorWithDetail("first frame can't be a continue frame",
code: errCode)) code: errCode))
writeError(code: errCode) writeError(code: errCode)
return emptyBuffer return emptyBuffer
} }
@ -692,8 +691,8 @@ public class WebSocket: NSObject, StreamDelegate {
response!.bytesLeft = Int(dataLength) response!.bytesLeft = Int(dataLength)
} else { } else {
let errCode = CloseCode.protocolError.rawValue let errCode = CloseCode.protocolError.rawValue
doDisconnect(error: errorWithDetail(detail: "second and beyond of fragment message must be a continue frame", doDisconnect(error: errorWithDetail("second and beyond of fragment message must be a continue frame",
code: errCode)) code: errCode))
writeError(code: errCode) writeError(code: errCode)
return emptyBuffer return emptyBuffer
} }
@ -706,7 +705,7 @@ public class WebSocket: NSObject, StreamDelegate {
if isNew { if isNew {
readStack.append(response) readStack.append(response)
} }
processResponse(response: response) _ = processResponse(response)
} }
let step = Int(offset + numericCast(len)) let step = Int(offset + numericCast(len))
@ -726,7 +725,7 @@ public class WebSocket: NSObject, StreamDelegate {
} }
/// Process the finished response of a buffer. /// Process the finished response of a buffer.
private func processResponse(response: WSResponse) -> Bool { private func processResponse(_ response: WSResponse) -> Bool {
if response.isFin && response.bytesLeft <= 0 { if response.isFin && response.bytesLeft <= 0 {
if response.code == .ping { if response.code == .ping {
let data = response.buffer! // local copy so it's not perverse for writing let data = response.buffer! // local copy so it's not perverse for writing
@ -761,15 +760,10 @@ public class WebSocket: NSObject, StreamDelegate {
} }
/// Create an error. /// Create an error.
private func errorWithDetail(detail: String, code: UInt16) -> NSError { private func errorWithDetail(_ detail: String, code: UInt16) -> NSError {
var details = [String: String]() var details = [String: String]()
details[NSLocalizedDescriptionKey] = detail details[NSLocalizedDescriptionKey] = detail
#if swift(>=3)
return NSError(domain: "This is still broken", code: Int(code), userInfo: details)
#else
return NSError(domain: WebSocket.ErrorDomain, code: Int(code), userInfo: details) return NSError(domain: WebSocket.ErrorDomain, code: Int(code), userInfo: details)
#endif
} }
/// Write a an error to the socket. /// Write a an error to the socket.
@ -822,7 +816,7 @@ public class WebSocket: NSObject, StreamDelegate {
error = streamError as NSError error = streamError as NSError
} else { } else {
let errCode = InternalErrorCode.outputStreamWriteError.rawValue let errCode = InternalErrorCode.outputStreamWriteError.rawValue
error = s.errorWithDetail(detail: "output stream error during write", code: errCode) error = s.errorWithDetail("output stream error during write", code: errCode)
} }
s.doDisconnect(error: error) s.doDisconnect(error: error)
break break