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

Merge branch 'swift3' of github.com:socketio/socket.io-client-swift into swift3

Browse Source 
# Conflicts:
#	SocketIO-MacTests/SocketBasicPacketTest.swift
#	SocketIO-MacTests/SocketNamespacePacketTest.swift
#	Source/SocketExtensions.swift
#	Source/SocketPacket.swift
#	Source/WebSocket.swift
This commit is contained in:
David Beck 2016-08-23 10:17:44 -07:00
commit 59c158119a
5 changed files with 138 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
SocketIO-MacTests/SocketBasicPacketTest.swift
View File

@ -46,7 +46,7 @@ class SocketBasicPacketTest: XCTestCase {
} }
func testJSONEmit() { func testJSONEmit() {
let expectedSendString = "2[\"test\",{\"test\":\"hello\",\"hello\":1,\"foobar\":1,\"null\":null}]" let expectedSendString = "2[\"test\",{\"test\":\"hello\",\"hello\":1,\"foobar\":true,\"null\":null}]"
let sendData: [Any] = ["test", ["foobar": true, "hello": 1, "test": "hello", "null": NSNull()]] let sendData: [Any] = ["test", ["foobar": true, "hello": 1, "test": "hello", "null": NSNull()]]
let packet = SocketPacket.packetFromEmit(sendData, id: -1, nsp: "/", ack: false) let packet = SocketPacket.packetFromEmit(sendData, id: -1, nsp: "/", ack: false)
@ -62,7 +62,7 @@ class SocketBasicPacketTest: XCTestCase {
} }
func testBinaryEmit() { func testBinaryEmit() {
let expectedSendString = "51-[\"test\",{\"_placeholder\":1,\"num\":0}]" let expectedSendString = "51-[\"test\",{\"_placeholder\":true,\"num\":0}]"
let sendData: [Any] = ["test", data] let sendData: [Any] = ["test", data]
let packet = SocketPacket.packetFromEmit(sendData, id: -1, nsp: "/", ack: false) let packet = SocketPacket.packetFromEmit(sendData, id: -1, nsp: "/", ack: false)
@ -71,7 +71,7 @@ class SocketBasicPacketTest: XCTestCase {
} }
func testMultipleBinaryEmit() { func testMultipleBinaryEmit() {
let expectedSendString = "52-[\"test\",{\"data1\":{\"_placeholder\":1,\"num\":0},\"data2\":{\"_placeholder\":1,\"num\":1}}]" let expectedSendString = "52-[\"test\",{\"data1\":{\"_placeholder\":true,\"num\":0},\"data2\":{\"_placeholder\":true,\"num\":1}}]"
let sendData: [Any] = ["test", ["data1": data, "data2": data2] as NSDictionary] let sendData: [Any] = ["test", ["data1": data, "data2": data2] as NSDictionary]
let packet = SocketPacket.packetFromEmit(sendData, id: -1, nsp: "/", ack: false) let packet = SocketPacket.packetFromEmit(sendData, id: -1, nsp: "/", ack: false)
@ -90,7 +90,7 @@ class SocketBasicPacketTest: XCTestCase {
} }
func testEmitDataWithAck() { func testEmitDataWithAck() {
let expectedSendString = "51-0[\"test\",{\"_placeholder\":1,\"num\":0}]" let expectedSendString = "51-0[\"test\",{\"_placeholder\":true,\"num\":0}]"
let sendData: [Any] = ["test", data] let sendData: [Any] = ["test", data]
let packet = SocketPacket.packetFromEmit(sendData, id: 0, nsp: "/", ack: false) let packet = SocketPacket.packetFromEmit(sendData, id: 0, nsp: "/", ack: false)
@ -123,7 +123,7 @@ class SocketBasicPacketTest: XCTestCase {
} }
func testJSONAck() { func testJSONAck() {
let expectedSendString = "30[{\"test\":\"hello\",\"hello\":1,\"foobar\":1,\"null\":null}]" let expectedSendString = "30[{\"test\":\"hello\",\"hello\":1,\"foobar\":true,\"null\":null}]"
let sendData = [["foobar": true, "hello": 1, "test": "hello", "null": NSNull()]] let sendData = [["foobar": true, "hello": 1, "test": "hello", "null": NSNull()]]
let packet = SocketPacket.packetFromEmit(sendData, id: 0, nsp: "/", ack: true) let packet = SocketPacket.packetFromEmit(sendData, id: 0, nsp: "/", ack: true)
@ -131,7 +131,7 @@ class SocketBasicPacketTest: XCTestCase {
} }
func testBinaryAck() { func testBinaryAck() {
let expectedSendString = "61-0[{\"_placeholder\":1,\"num\":0}]" let expectedSendString = "61-0[{\"_placeholder\":true,\"num\":0}]"
let sendData = [data] let sendData = [data]
let packet = SocketPacket.packetFromEmit(sendData, id: 0, nsp: "/", ack: true) let packet = SocketPacket.packetFromEmit(sendData, id: 0, nsp: "/", ack: true)
@ -140,7 +140,7 @@ class SocketBasicPacketTest: XCTestCase {
} }
func testMultipleBinaryAck() { func testMultipleBinaryAck() {
let expectedSendString = "62-0[{\"data2\":{\"_placeholder\":1,\"num\":0},\"data1\":{\"_placeholder\":1,\"num\":1}}]" let expectedSendString = "62-0[{\"data2\":{\"_placeholder\":true,\"num\":0},\"data1\":{\"_placeholder\":true,\"num\":1}}]"
let sendData = [["data1": data, "data2": data2]] let sendData = [["data1": data, "data2": data2]]
let packet = SocketPacket.packetFromEmit(sendData, id: 0, nsp: "/", ack: true) let packet = SocketPacket.packetFromEmit(sendData, id: 0, nsp: "/", ack: true)

16
SocketIO-MacTests/SocketNamespacePacketTest.swift
View File

@ -38,7 +38,7 @@ class SocketNamespacePacketTest: XCTestCase {
} }
func testJSONEmit() { func testJSONEmit() {
let expectedSendString = "2/swift,[\"test\",{\"test\":\"hello\",\"hello\":1,\"foobar\":1,\"null\":null}]" let expectedSendString = "2/swift,[\"test\",{\"test\":\"hello\",\"hello\":1,\"foobar\":true,\"null\":null}]"
let sendData: [Any] = ["test", ["foobar": true, "hello": 1, "test": "hello", "null": NSNull()] as NSDictionary] let sendData: [Any] = ["test", ["foobar": true, "hello": 1, "test": "hello", "null": NSNull()] as NSDictionary]
let packet = SocketPacket.packetFromEmit(sendData, id: -1, nsp: "/swift", ack: false) let packet = SocketPacket.packetFromEmit(sendData, id: -1, nsp: "/swift", ack: false)
@ -46,7 +46,7 @@ class SocketNamespacePacketTest: XCTestCase {
} }
func testArrayEmit() { func testArrayEmit() {
let expectedSendString = "2/swift,[\"test\",[\"hello\",1,{\"test\":\"test\"}]]" let expectedSendString = "2/swift,[\"test\",[\"hello\",true,{\"test\":\"test\"}]]"
let sendData: [Any] = ["test", ["hello", 1, ["test": "test"]]] let sendData: [Any] = ["test", ["hello", 1, ["test": "test"]]]
let packet = SocketPacket.packetFromEmit(sendData, id: -1, nsp: "/swift", ack: false) let packet = SocketPacket.packetFromEmit(sendData, id: -1, nsp: "/swift", ack: false)
@ -55,7 +55,7 @@ class SocketNamespacePacketTest: XCTestCase {
} }
func testBinaryEmit() { func testBinaryEmit() {
let expectedSendString = "51-/swift,[\"test\",{\"_placeholder\":1,\"num\":0}]" let expectedSendString = "51-/swift,[\"test\",{\"_placeholder\":true,\"num\":0}]"
let sendData: [Any] = ["test", data] let sendData: [Any] = ["test", data]
let packet = SocketPacket.packetFromEmit(sendData, id: -1, nsp: "/swift", ack: false) let packet = SocketPacket.packetFromEmit(sendData, id: -1, nsp: "/swift", ack: false)
@ -64,7 +64,7 @@ class SocketNamespacePacketTest: XCTestCase {
} }
func testMultipleBinaryEmit() { func testMultipleBinaryEmit() {
let expectedSendString = "52-/swift,[\"test\",{\"data1\":{\"_placeholder\":1,\"num\":0},\"data2\":{\"_placeholder\":1,\"num\":1}}]" let expectedSendString = "52-/swift,[\"test\",{\"data1\":{\"_placeholder\":true,\"num\":0},\"data2\":{\"_placeholder\":true,\"num\":1}}]"
let sendData: [Any] = ["test", ["data1": data, "data2": data2] as NSDictionary] let sendData: [Any] = ["test", ["data1": data, "data2": data2] as NSDictionary]
let packet = SocketPacket.packetFromEmit(sendData, id: -1, nsp: "/swift", ack: false) let packet = SocketPacket.packetFromEmit(sendData, id: -1, nsp: "/swift", ack: false)
@ -81,7 +81,7 @@ class SocketNamespacePacketTest: XCTestCase {
} }
func testEmitDataWithAck() { func testEmitDataWithAck() {
let expectedSendString = "51-/swift,0[\"test\",{\"_placeholder\":1,\"num\":0}]" let expectedSendString = "51-/swift,0[\"test\",{\"_placeholder\":true,\"num\":0}]"
let sendData: [Any] = ["test", data] let sendData: [Any] = ["test", data]
let packet = SocketPacket.packetFromEmit(sendData, id: 0, nsp: "/swift", ack: false) let packet = SocketPacket.packetFromEmit(sendData, id: 0, nsp: "/swift", ack: false)
@ -114,7 +114,7 @@ class SocketNamespacePacketTest: XCTestCase {
} }
func testJSONAck() { func testJSONAck() {
let expectedSendString = "3/swift,0[{\"test\":\"hello\",\"hello\":1,\"foobar\":1,\"null\":null}]" let expectedSendString = "3/swift,0[{\"test\":\"hello\",\"hello\":1,\"foobar\":true,\"null\":null}]"
let sendData = [["foobar": true, "hello": 1, "test": "hello", "null": NSNull()]] let sendData = [["foobar": true, "hello": 1, "test": "hello", "null": NSNull()]]
let packet = SocketPacket.packetFromEmit(sendData, id: 0, nsp: "/swift", ack: true) let packet = SocketPacket.packetFromEmit(sendData, id: 0, nsp: "/swift", ack: true)
@ -122,7 +122,7 @@ class SocketNamespacePacketTest: XCTestCase {
} }
func testBinaryAck() { func testBinaryAck() {
let expectedSendString = "61-/swift,0[{\"_placeholder\":1,\"num\":0}]" let expectedSendString = "61-/swift,0[{\"_placeholder\":true,\"num\":0}]"
let sendData = [data] let sendData = [data]
let packet = SocketPacket.packetFromEmit(sendData, id: 0, nsp: "/swift", ack: true) let packet = SocketPacket.packetFromEmit(sendData, id: 0, nsp: "/swift", ack: true)
@ -131,7 +131,7 @@ class SocketNamespacePacketTest: XCTestCase {
} }
func testMultipleBinaryAck() { func testMultipleBinaryAck() {
let expectedSendString = "62-/swift,0[{\"data2\":{\"_placeholder\":1,\"num\":0},\"data1\":{\"_placeholder\":1,\"num\":1}}]" let expectedSendString = "62-/swift,0[{\"data2\":{\"_placeholder\":true,\"num\":0},\"data1\":{\"_placeholder\":true,\"num\":1}}]"
let sendData = [["data1": data, "data2": data2]] let sendData = [["data1": data, "data2": data2]]
let packet = SocketPacket.packetFromEmit(sendData, id: 0, nsp: "/swift", ack: true) let packet = SocketPacket.packetFromEmit(sendData, id: 0, nsp: "/swift", ack: true)

15
Source/SocketPacket.swift
View File

@ -134,12 +134,12 @@ struct SocketPacket {
// binary data // binary data
private func _fillInPlaceholders(_ object: Any) -> Any { private func _fillInPlaceholders(_ object: Any) -> Any {
switch object { switch object {
case let dict as NSDictionary: case let dict as [String: Any]:
if dict["_placeholder"] as? Bool ?? false { if dict["_placeholder"] as? Bool ?? false {
return binary[dict["num"] as! Int] return binary[dict["num"] as! Int]
} else { } else {
return dict.reduce(NSMutableDictionary(), {cur, keyValue in return dict.reduce(NSMutableDictionary(), {cur, keyValue in
cur[keyValue.0 as! NSCopying] = _fillInPlaceholders(keyValue.1) cur[keyValue.0] = _fillInPlaceholders(keyValue.1)
return cur return cur
}) })
} }
@ -187,10 +187,13 @@ private extension SocketPacket {
return placeholder return placeholder
case let arr as [Any]: case let arr as [Any]:
return arr.map({shred($0, binary: &binary)}) return arr.map({shred($0, binary: &binary)})
case let dict as NSDictionary: case let dict as [String: Any]:
return dict.reduce(NSMutableDictionary(), {cur, keyValue in return dict.reduce([String: Any](), {cur, keyValue in
cur[keyValue.0 as! NSCopying] = shred(keyValue.1, binary: &binary) var mutCur = cur
return cur
mutCur[keyValue.0] = shred(keyValue.1, binary: &binary)
return mutCur
}) })
default: default:
return data return data

2
Source/SocketStringReader.swift
View File

@ -47,6 +47,7 @@ struct SocketStringReader {
mutating func read(count: Int) -> String { mutating func read(count: Int) -> String {
let readString = message[currentIndex..<message.characters.index(currentIndex, offsetBy: count)] let readString = message[currentIndex..<message.characters.index(currentIndex, offsetBy: count)]
advance(by: count) advance(by: count)
return readString return readString
@ -54,6 +55,7 @@ struct SocketStringReader {
mutating func readUntilOccurence(of string: String) -> String { mutating func readUntilOccurence(of string: String) -> String {
let substring = message[currentIndex..<message.endIndex] let substring = message[currentIndex..<message.endIndex]
guard let foundRange = substring.range(of: string) else { guard let foundRange = substring.range(of: string) else {
currentIndex = message.endIndex currentIndex = message.endIndex

230
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
} }
@ -135,7 +135,7 @@ public class WebSocket: NSObject, StreamDelegate {
public var isConnected :Bool { public var isConnected :Bool {
return connected return connected
} }
public var currentURL: NSURL { return url } public var currentURL: NSURL { return url }
// MARK: - Private // MARK: - Private
@ -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)
} }
@ -296,87 +296,86 @@ public class WebSocket: NSObject, StreamDelegate {
//higher level API we will cut over to at some point //higher level API we will cut over to at some point
//NSStream.getStreamsToHostWithName(url.host, port: url.port.integerValue, inputStream: &inputStream, outputStream: &outputStream) //NSStream.getStreamsToHostWithName(url.host, port: url.port.integerValue, inputStream: &inputStream, outputStream: &outputStream)
// var readStream: Unmanaged<CFReadStream>? var readStream: Unmanaged<CFReadStream>?
// var writeStream: Unmanaged<CFWriteStream>? var writeStream: Unmanaged<CFWriteStream>?
// let h = url.host! let h = url.host!
// CFStreamCreatePairWithSocketToHost(nil, h as NSString, UInt32(port), &readStream, &writeStream) CFStreamCreatePairWithSocketToHost(nil, h as NSString, UInt32(port), &readStream, &writeStream)
// inputStream = readStream!.takeRetainedValue() inputStream = readStream!.takeRetainedValue()
// outputStream = writeStream!.takeRetainedValue() outputStream = writeStream!.takeRetainedValue()
// guard let inStream = inputStream, let outStream = outputStream else { return } guard let inStream = inputStream, let outStream = outputStream else { return }
// 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 as AnyObject, forKey: Stream.PropertyKey.socketSecurityLevelKey)
// outStream.setProperty(StreamSocketSecurityLevel.negotiatedSSL, forKey: Stream.PropertyKey.socketSecurityLevelKey) outStream.setProperty(StreamSocketSecurityLevel.negotiatedSSL as AnyObject, 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
// } }
// if voipEnabled { if voipEnabled {
// inStream.setProperty(StreamNetworkServiceTypeValue.voIP as NSString, forKey: Stream.PropertyKey(rawValue: Stream.PropertyKey.networkServiceType.rawValue)) inStream.setProperty(StreamNetworkServiceTypeValue.voIP as AnyObject, forKey: Stream.PropertyKey.networkServiceType)
// outStream.setProperty(StreamNetworkServiceTypeValue.voIP as NSString, forKey: Stream.PropertyKey(rawValue: Stream.PropertyKey.networkServiceType.rawValue)) outStream.setProperty(StreamNetworkServiceTypeValue.voIP as AnyObject, forKey: Stream.PropertyKey.networkServiceType)
// } }
// if selfSignedSSL { if selfSignedSSL {
// let settings: [NSObject: NSObject] = [kCFStreamSSLValidatesCertificateChain: NSNumber(value: false), kCFStreamSSLPeerName: kCFNull] let settings: [NSObject: NSObject] = [kCFStreamSSLValidatesCertificateChain: NSNumber(value: false), kCFStreamSSLPeerName: kCFNull]
// inStream.setProperty(settings, forKey: kCFStreamPropertySSLSettings as Stream.PropertyKey) inStream.setProperty(settings, forKey: kCFStreamPropertySSLSettings as Stream.PropertyKey)
// outStream.setProperty(settings, forKey: kCFStreamPropertySSLSettings as Stream.PropertyKey) outStream.setProperty(settings, forKey: kCFStreamPropertySSLSettings as Stream.PropertyKey)
// } }
// if let cipherSuites = self.enabledSSLCipherSuites { if let cipherSuites = self.enabledSSLCipherSuites {
// if let sslContextIn = CFReadStreamCopyProperty(inputStream, CFStreamPropertyKey(rawValue: kCFStreamPropertySSLContext)) as! SSLContext?, if let sslContextIn = CFReadStreamCopyProperty(inputStream, CFStreamPropertyKey(rawValue: kCFStreamPropertySSLContext)) as! SSLContext?,
// let sslContextOut = CFWriteStreamCopyProperty(outputStream, CFStreamPropertyKey(rawValue: kCFStreamPropertySSLContext)) as! SSLContext? { let sslContextOut = CFWriteStreamCopyProperty(outputStream, CFStreamPropertyKey(rawValue: kCFStreamPropertySSLContext)) as! SSLContext? {
// 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)
// return
// }
// if resOut != errSecSuccess {
// let error = self.errorWithDetail(detail: "Error setting outgoing cypher suites", code: UInt16(resOut))
// disconnectStream(error: error)
// return
// }
// }
// }
// CFReadStreamSetDispatchQueue(inStream, WebSocket.sharedWorkQueue)
// CFWriteStreamSetDispatchQueue(outStream, WebSocket.sharedWorkQueue)
// inStream.open()
// outStream.open()
//
// self.mutex.lock()
// self.readyToWrite = true
// self.mutex.unlock()
//
// let bytes = UnsafeRawPointer(data.bytes).assumingMemoryBound(to: UInt8.self)
// var out = timeout * 1000000 // wait 5 seconds before giving up
// writeQueue.addOperation { [weak self] in
// while !outStream.hasSpaceAvailable {
// usleep(100) // wait until the socket is ready
// out -= 100
// if out < 0 {
// self?.cleanupStream()
// self?.doDisconnect(error: self?.errorWithDetail(detail: "write wait timed out", code: 2))
// return
// } else if outStream.streamError != nil {
// return // disconnectStream will be called.
// }
// }
// outStream.write(bytes, maxLength: data.length)
// }
}
// Delegate for the stream methods. Processes incoming bytes.
public func stream(aStream: Stream, handleEvent eventCode: Stream.Event) {
if let sec = security , !certValidated && [.hasBytesAvailable, .hasSpaceAvailable].contains(eventCode) {
let possibleTrust = aStream.property(forKey: kCFStreamPropertySSLPeerTrust as Stream.PropertyKey)
let domain = aStream.property(forKey: kCFStreamSSLPeerName as Stream.PropertyKey) as? String
if sec.isValid(possibleTrust as! SecTrust, domain: domain) {
certValidated = true
} else {
let error = errorWithDetail(detail: "Invalid SSL certificate", code: 1)
disconnectStream(error: error) disconnectStream(error: error)
return return
} }
if resOut != errSecSuccess {
let error = self.errorWithDetail("Error setting outgoing cypher suites", code: UInt16(resOut))
disconnectStream(error: error)
return
}
}
}
CFReadStreamSetDispatchQueue(inStream, WebSocket.sharedWorkQueue)
CFWriteStreamSetDispatchQueue(outStream, WebSocket.sharedWorkQueue)
inStream.open()
outStream.open()
self.mutex.lock()
self.readyToWrite = true
self.mutex.unlock()
let bytes = UnsafeRawPointer(data.bytes).assumingMemoryBound(to: UInt8.self)
var out = timeout * 1000000 // wait 5 seconds before giving up
writeQueue.addOperation { [weak self] in
while !outStream.hasSpaceAvailable {
usleep(100) // wait until the socket is ready
out -= 100
if out < 0 {
self?.cleanupStream()
self?.doDisconnect(error: self?.errorWithDetail("write wait timed out", code: 2))
return
} else if outStream.streamError != nil {
return // disconnectStream will be called.
}
}
outStream.write(bytes, maxLength: data.length)
}
}
// Delegate for the stream methods. Processes incoming bytes.
public func stream(_ aStream: Stream, handle eventCode: Stream.Event) {
if let sec = security , !certValidated && [.hasBytesAvailable, .hasSpaceAvailable].contains(eventCode) {
let possibleTrust = aStream.property(forKey: kCFStreamPropertySSLPeerTrust as Stream.PropertyKey)
let domain = aStream.property(forKey: kCFStreamSSLPeerName as Stream.PropertyKey) as? String
if sec.isValid(possibleTrust as! SecTrust, domain: domain) {
certValidated = true
} else {
let error = errorWithDetail("Invalid SSL certificate", code: 1)
disconnectStream(error: error)
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)))
} }
} }
@ -544,7 +543,7 @@ public class WebSocket: NSObject, StreamDelegate {
buffer[offset + 0] = UInt8(value >> 8) buffer[offset + 0] = UInt8(value >> 8)
buffer[offset + 1] = UInt8(value & 0xff) buffer[offset + 1] = UInt8(value & 0xff)
} }
/// Write a 64-bit big endian value to a buffer. /// Write a 64-bit big endian value to a buffer.
private static func writeUint64(buffer: UnsafeMutablePointer<UInt8>, offset: Int, value: UInt64) { private static func writeUint64(buffer: UnsafeMutablePointer<UInt8>, offset: Int, value: UInt64) {
for i in 0...7 { for i in 0...7 {
@ -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
@ -869,10 +863,10 @@ public class WebSocket: NSObject, StreamDelegate {
} }
private extension NSData { private extension Data {
convenience init(buffer: UnsafeBufferPointer<UInt8>) { init(buffer: UnsafeBufferPointer<UInt8>) {
self.init(bytes: buffer.baseAddress, length: buffer.count) self.init(bytes: buffer.baseAddress!, count: buffer.count)
} }
} }