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

Bump websocket version, fix some warnings

Browse Source
This commit is contained in:
Erik 2017-03-28 05:10:46 -04:00
parent 01790af3c5
commit 9e94ed1cea
No known key found for this signature in database
GPG Key ID: 4930B7C5FBC1A69D
2 changed files with 87 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/SocketAnyEvent.swift
View File

@ -28,7 +28,7 @@ public final class SocketAnyEvent : NSObject {
public let event: String public let event: String
public let items: [Any]? public let items: [Any]?
override public var description: String { override public var description: String {
return "SocketAnyEvent: Event: \(event) items: \(items ?? nil)" return "SocketAnyEvent: Event: \(event) items: \(String(describing: items))"
} }
init(event: String, items: [Any]?) { init(event: String, items: [Any]?) {

32
Source/WebSocket.swift
View File

@ -246,7 +246,6 @@ open class WebSocket : NSObject, StreamDelegate {
Private method that starts the connection. Private method that starts the connection.
*/ */
private func createHTTPRequest() { private func createHTTPRequest() {
let urlRequest = CFHTTPMessageCreateRequest(kCFAllocatorDefault, "GET" as CFString, let urlRequest = CFHTTPMessageCreateRequest(kCFAllocatorDefault, "GET" as CFString,
url as CFURL, kCFHTTPVersion1_1).takeRetainedValue() url as CFURL, kCFHTTPVersion1_1).takeRetainedValue()
@ -370,14 +369,29 @@ open class WebSocket : NSObject, StreamDelegate {
guard !sOperation.isCancelled else { return } guard !sOperation.isCancelled else { return }
out -= 100 out -= 100
if out < 0 { if out < 0 {
WebSocket.sharedWorkQueue.async {
self?.cleanupStream() self?.cleanupStream()
}
self?.doDisconnect(self?.errorWithDetail("write wait timed out", code: 2)) self?.doDisconnect(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.
} }
} }
guard !sOperation.isCancelled else { return } guard !sOperation.isCancelled, let s = self else { return }
// Do the pinning now if needed
if let sec = s.security, !s.certValidated {
let trust = outStream.property(forKey: kCFStreamPropertySSLPeerTrust as Stream.PropertyKey) as! SecTrust
let domain = outStream.property(forKey: kCFStreamSSLPeerName as Stream.PropertyKey) as? String
s.certValidated = sec.isValid(trust, domain: domain)
if !s.certValidated {
WebSocket.sharedWorkQueue.async {
let error = s.errorWithDetail("Invalid SSL certificate", code: 1)
s.disconnectStream(error)
}
return
}
}
outStream.write(bytes, maxLength: data.count) outStream.write(bytes, maxLength: data.count)
} }
writeQueue.addOperation(operation) writeQueue.addOperation(operation)
@ -387,17 +401,6 @@ open class WebSocket : NSObject, StreamDelegate {
Delegate for the stream methods. Processes incoming bytes Delegate for the stream methods. Processes incoming bytes
*/ */
open func stream(_ aStream: Stream, handle eventCode: Stream.Event) { open func stream(_ aStream: Stream, handle eventCode: Stream.Event) {
if let sec = security, !certValidated && [.hasBytesAvailable, .hasSpaceAvailable].contains(eventCode) {
let trust = aStream.property(forKey: kCFStreamPropertySSLPeerTrust as Stream.PropertyKey) as! SecTrust
let domain = aStream.property(forKey: kCFStreamSSLPeerName as Stream.PropertyKey) as? String
if sec.isValid(trust, domain: domain) {
certValidated = true
} else {
let error = errorWithDetail("Invalid SSL certificate", code: 1)
disconnectStream(error)
return
}
}
if eventCode == .hasBytesAvailable { if eventCode == .hasBytesAvailable {
if aStream == inputStream { if aStream == inputStream {
processInputStream() processInputStream()
@ -642,7 +645,7 @@ open 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(errorWithDetail("unknown opcode: \(receivedOpcode)", code: errCode)) doDisconnect(errorWithDetail("unknown opcode: \(String(describing: receivedOpcode))", code: errCode))
writeError(errCode) writeError(errCode)
return emptyBuffer return emptyBuffer
} }
@ -931,6 +934,7 @@ open class WebSocket : NSObject, StreamDelegate {
readyToWrite = false readyToWrite = false
mutex.unlock() mutex.unlock()
cleanupStream() cleanupStream()
writeQueue.cancelAllOperations()
} }
} }