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]?) {

168
Source/WebSocket.swift
View File

@ -38,7 +38,7 @@ public protocol WebSocketPongDelegate: class {
} }
open class WebSocket : NSObject, StreamDelegate { open class WebSocket : NSObject, StreamDelegate {
enum OpCode : UInt8 { enum OpCode : UInt8 {
case continueFrame = 0x0 case continueFrame = 0x0
case textFrame = 0x1 case textFrame = 0x1
@ -49,7 +49,7 @@ open class WebSocket : NSObject, StreamDelegate {
case pong = 0xA case pong = 0xA
// 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
@ -62,19 +62,19 @@ open class WebSocket : NSObject, StreamDelegate {
case policyViolated = 1008 case policyViolated = 1008
case messageTooBig = 1009 case messageTooBig = 1009
} }
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
} }
// Where the callback is executed. It defaults to the main UI thread queue. // Where the callback is executed. It defaults to the main UI thread queue.
public var callbackQueue = DispatchQueue.main public var callbackQueue = DispatchQueue.main
var optionalProtocols: [String]? var optionalProtocols: [String]?
// MARK: - Constants // MARK: - Constants
let headerWSUpgradeName = "Upgrade" let headerWSUpgradeName = "Upgrade"
let headerWSUpgradeValue = "websocket" let headerWSUpgradeValue = "websocket"
@ -96,7 +96,7 @@ open class WebSocket : NSObject, StreamDelegate {
let MaxFrameSize: Int = 32 let MaxFrameSize: Int = 32
let httpSwitchProtocolCode = 101 let httpSwitchProtocolCode = 101
let supportedSSLSchemes = ["wss", "https"] let supportedSSLSchemes = ["wss", "https"]
class WSResponse { class WSResponse {
var isFin = false var isFin = false
var code: OpCode = .continueFrame var code: OpCode = .continueFrame
@ -104,23 +104,23 @@ open class WebSocket : NSObject, StreamDelegate {
var frameCount = 0 var frameCount = 0
var buffer: NSMutableData? var buffer: NSMutableData?
} }
// MARK: - Delegates // MARK: - Delegates
/// Responds to callback about new messages coming in over the WebSocket /// Responds to callback about new messages coming in over the WebSocket
/// and also connection/disconnect messages. /// and also connection/disconnect messages.
public weak var delegate: WebSocketDelegate? public weak var delegate: WebSocketDelegate?
/// Receives a callback for each pong message recived. /// Receives a callback for each pong message recived.
public weak var pongDelegate: WebSocketPongDelegate? public weak var pongDelegate: WebSocketPongDelegate?
// MARK: - Block based API. // MARK: - Block based API.
public var onConnect: ((Void) -> Void)? public var onConnect: ((Void) -> Void)?
public var onDisconnect: ((NSError?) -> Void)? public var onDisconnect: ((NSError?) -> Void)?
public var onText: ((String) -> Void)? public var onText: ((String) -> Void)?
public var onData: ((Data) -> Void)? public var onData: ((Data) -> Void)?
public var onPong: ((Data?) -> Void)? public var onPong: ((Data?) -> Void)?
public var headers = [String: String]() public var headers = [String: String]()
public var voipEnabled = false public var voipEnabled = false
public var disableSSLCertValidation = false public var disableSSLCertValidation = false
@ -131,9 +131,9 @@ open class WebSocket : NSObject, StreamDelegate {
public var isConnected: Bool { public var isConnected: Bool {
return connected return connected
} }
public var currentURL: URL { return url } public var currentURL: URL { return url }
// MARK: - Private // MARK: - Private
private var url: URL private var url: URL
private var inputStream: InputStream? private var inputStream: InputStream?
@ -157,7 +157,7 @@ open class WebSocket : NSObject, StreamDelegate {
} }
/// The shared processing queue used for all WebSocket. /// The shared processing queue used for all WebSocket.
private static let sharedWorkQueue = DispatchQueue(label: "com.vluxe.starscream.websocket", attributes: []) private static let sharedWorkQueue = DispatchQueue(label: "com.vluxe.starscream.websocket", attributes: [])
/// Used for setting protocols. /// Used for setting protocols.
public init(url: URL, protocols: [String]? = nil) { public init(url: URL, protocols: [String]? = nil) {
self.url = url self.url = url
@ -170,13 +170,13 @@ open class WebSocket : NSObject, StreamDelegate {
writeQueue.maxConcurrentOperationCount = 1 writeQueue.maxConcurrentOperationCount = 1
optionalProtocols = protocols optionalProtocols = protocols
} }
// Used for specifically setting the QOS for the write queue. // Used for specifically setting the QOS for the write queue.
public convenience init(url: URL, writeQueueQOS: QualityOfService, protocols: [String]? = nil) { public convenience init(url: URL, writeQueueQOS: QualityOfService, protocols: [String]? = nil) {
self.init(url: url, protocols: protocols) self.init(url: url, protocols: protocols)
writeQueue.qualityOfService = writeQueueQOS writeQueue.qualityOfService = writeQueueQOS
} }
/** /**
Connect to the WebSocket server on a background thread. Connect to the WebSocket server on a background thread.
*/ */
@ -186,14 +186,14 @@ open class WebSocket : NSObject, StreamDelegate {
isConnecting = true isConnecting = true
createHTTPRequest() createHTTPRequest()
} }
/** /**
Disconnect from the server. I send a Close control frame to the server, then expect the server to respond with a Close control frame and close the socket from its end. I notify my delegate once the socket has been closed. Disconnect from the server. I send a Close control frame to the server, then expect the server to respond with a Close control frame and close the socket from its end. I notify my delegate once the socket has been closed.
If you supply a non-nil `forceTimeout`, I wait at most that long (in seconds) for the server to close the socket. After the timeout expires, I close the socket and notify my delegate. If you supply a non-nil `forceTimeout`, I wait at most that long (in seconds) for the server to close the socket. After the timeout expires, I close the socket and notify my delegate.
If you supply a zero (or negative) `forceTimeout`, I immediately close the socket (without sending a Close control frame) and notify my delegate. If you supply a zero (or negative) `forceTimeout`, I immediately close the socket (without sending a Close control frame) and notify my delegate.
- 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.
- Parameter closeCode: The code to send on disconnect. The default is the normal close code for cleanly disconnecting a webSocket. - Parameter closeCode: The code to send on disconnect. The default is the normal close code for cleanly disconnecting a webSocket.
*/ */
open func disconnect(forceTimeout: TimeInterval? = nil, closeCode: UInt16 = CloseCode.normal.rawValue) { open func disconnect(forceTimeout: TimeInterval? = nil, closeCode: UInt16 = CloseCode.normal.rawValue) {
guard isConnected else { return } guard isConnected else { return }
switch forceTimeout { switch forceTimeout {
@ -210,7 +210,7 @@ open class WebSocket : NSObject, StreamDelegate {
break break
} }
} }
/** /**
Write a string to the websocket. This sends it as a text frame. Write a string to the websocket. This sends it as a text frame.
If you supply a non-nil completion block, I will perform it when the write completes. If you supply a non-nil completion block, I will perform it when the write completes.
@ -221,7 +221,7 @@ open class WebSocket : NSObject, StreamDelegate {
guard isConnected else { return } guard isConnected else { return }
dequeueWrite(string.data(using: String.Encoding.utf8)!, code: .textFrame, writeCompletion: completion) dequeueWrite(string.data(using: String.Encoding.utf8)!, code: .textFrame, writeCompletion: completion)
} }
/** /**
Write binary data to the websocket. This sends it as a binary frame. Write binary data to the websocket. This sends it as a binary frame.
If you supply a non-nil completion block, I will perform it when the write completes. If you supply a non-nil completion block, I will perform it when the write completes.
@ -232,7 +232,7 @@ open class WebSocket : NSObject, StreamDelegate {
guard isConnected else { return } guard isConnected else { return }
dequeueWrite(data, code: .binaryFrame, writeCompletion: completion) dequeueWrite(data, code: .binaryFrame, writeCompletion: completion)
} }
/** /**
Write a ping to the websocket. This sends it as a control frame. Write a ping to the websocket. This sends it as a control frame.
Yodel a sound to the planet. This sends it as an astroid. http://youtu.be/Eu5ZJELRiJ8?t=42s Yodel a sound to the planet. This sends it as an astroid. http://youtu.be/Eu5ZJELRiJ8?t=42s
@ -241,15 +241,14 @@ open class WebSocket : NSObject, StreamDelegate {
guard isConnected else { return } guard isConnected else { return }
dequeueWrite(ping, code: .ping, writeCompletion: completion) dequeueWrite(ping, code: .ping, writeCompletion: completion)
} }
/** /**
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()
var port = url.port var port = url.port
if port == nil { if port == nil {
if supportedSSLSchemes.contains(url.scheme!) { if supportedSSLSchemes.contains(url.scheme!) {
@ -277,14 +276,14 @@ open class WebSocket : NSObject, StreamDelegate {
initStreamsWithData(serializedRequest as Data, Int(port!)) initStreamsWithData(serializedRequest as Data, Int(port!))
} }
} }
/** /**
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: String, val: String) { private func addHeader(_ urlRequest: CFHTTPMessage, key: String, val: String) {
CFHTTPMessageSetHeaderFieldValue(urlRequest, key as CFString, val as CFString) CFHTTPMessageSetHeaderFieldValue(urlRequest, key as CFString, val as CFString)
} }
/** /**
Generate a WebSocket key as needed in RFC. Generate a WebSocket key as needed in RFC.
*/ */
@ -299,7 +298,7 @@ open class WebSocket : NSObject, StreamDelegate {
let baseKey = data?.base64EncodedString(options: NSData.Base64EncodingOptions(rawValue: 0)) let baseKey = data?.base64EncodedString(options: NSData.Base64EncodingOptions(rawValue: 0))
return baseKey! return baseKey!
} }
/** /**
Start the stream connection and write the data to the output stream. Start the stream connection and write the data to the output stream.
*/ */
@ -308,7 +307,7 @@ open class WebSocket : NSObject, StreamDelegate {
//NSStream.getStreamsToHostWithName(url.host, port: url.port.integerValue, inputStream: &inputStream, outputStream: &outputStream) //NSStream.getStreamsToHostWithName(url.host, port: url.port.integerValue, inputStream: &inputStream, outputStream: &outputStream)
// Disconnect and clean up any existing streams before setting up a new pair // Disconnect and clean up any existing streams before setting up a new pair
disconnectStream(nil, runDelegate: false) disconnectStream(nil, runDelegate: false)
var readStream: Unmanaged<CFReadStream>? var readStream: Unmanaged<CFReadStream>?
var writeStream: Unmanaged<CFWriteStream>? var writeStream: Unmanaged<CFWriteStream>?
let h = url.host! as NSString let h = url.host! as NSString
@ -350,16 +349,16 @@ open class WebSocket : NSObject, StreamDelegate {
inStream.setProperty(StreamNetworkServiceTypeValue.voIP as AnyObject, forKey: Stream.PropertyKey.networkServiceType) inStream.setProperty(StreamNetworkServiceTypeValue.voIP as AnyObject, forKey: Stream.PropertyKey.networkServiceType)
outStream.setProperty(StreamNetworkServiceTypeValue.voIP as AnyObject, forKey: Stream.PropertyKey.networkServiceType) outStream.setProperty(StreamNetworkServiceTypeValue.voIP as AnyObject, forKey: Stream.PropertyKey.networkServiceType)
} }
CFReadStreamSetDispatchQueue(inStream, WebSocket.sharedWorkQueue) CFReadStreamSetDispatchQueue(inStream, WebSocket.sharedWorkQueue)
CFWriteStreamSetDispatchQueue(outStream, WebSocket.sharedWorkQueue) CFWriteStreamSetDispatchQueue(outStream, WebSocket.sharedWorkQueue)
inStream.open() inStream.open()
outStream.open() outStream.open()
self.mutex.lock() self.mutex.lock()
self.readyToWrite = true self.readyToWrite = true
self.mutex.unlock() self.mutex.unlock()
let bytes = UnsafeRawPointer((data as NSData).bytes).assumingMemoryBound(to: UInt8.self) let bytes = UnsafeRawPointer((data as NSData).bytes).assumingMemoryBound(to: UInt8.self)
var out = timeout * 1_000_000 // wait 5 seconds before giving up var out = timeout * 1_000_000 // wait 5 seconds before giving up
let operation = BlockOperation() let operation = BlockOperation()
@ -370,34 +369,38 @@ 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 {
self?.cleanupStream() WebSocket.sharedWorkQueue.async {
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)
} }
/** /**
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()
@ -408,7 +411,7 @@ open class WebSocket : NSObject, StreamDelegate {
disconnectStream(nil) disconnectStream(nil)
} }
} }
/** /**
Disconnect the stream object and notifies the delegate. Disconnect the stream object and notifies the delegate.
*/ */
@ -424,7 +427,7 @@ open class WebSocket : NSObject, StreamDelegate {
doDisconnect(error) doDisconnect(error)
} }
} }
/** /**
cleanup the streams. cleanup the streams.
*/ */
@ -443,7 +446,7 @@ open class WebSocket : NSObject, StreamDelegate {
inputStream = nil inputStream = nil
fragBuffer = nil fragBuffer = nil
} }
/** /**
Handles the incoming bytes and sending them to the proper processing method. Handles the incoming bytes and sending them to the proper processing method.
*/ */
@ -461,7 +464,7 @@ open class WebSocket : NSObject, StreamDelegate {
dequeueInput() dequeueInput()
} }
} }
/** /**
Dequeue the incoming input so it is processed in order. Dequeue the incoming input so it is processed in order.
*/ */
@ -487,7 +490,7 @@ open class WebSocket : NSObject, StreamDelegate {
} }
} }
} }
/** /**
Handle checking the inital connection status Handle checking the inital connection status
*/ */
@ -498,12 +501,12 @@ open class WebSocket : NSObject, StreamDelegate {
break break
case -1: case -1:
fragBuffer = Data(bytes: buffer, count: bufferLen) fragBuffer = Data(bytes: buffer, count: bufferLen)
break // do nothing, we are going to collect more data break // do nothing, we are going to collect more data
default: default:
doDisconnect(errorWithDetail("Invalid HTTP upgrade", code: UInt16(code))) doDisconnect(errorWithDetail("Invalid HTTP upgrade", code: UInt16(code)))
} }
} }
/** /**
Finds the HTTP Packet in the TCP stream, by looking for the CRLF. Finds the HTTP Packet in the TCP stream, by looking for the CRLF.
*/ */
@ -547,7 +550,7 @@ open class WebSocket : NSObject, StreamDelegate {
} }
return -1 // Was unable to find the full TCP header. return -1 // Was unable to find the full TCP header.
} }
/** /**
Validates the HTTP is a 101 as per the RFC spec. Validates the HTTP is a 101 as per the RFC spec.
*/ */
@ -568,14 +571,14 @@ open class WebSocket : NSObject, StreamDelegate {
} }
return -1 return -1
} }
/** /**
Read a 16 bit big endian value from a buffer Read a 16 bit big endian value from a buffer
*/ */
private static func readUint16(_ buffer: UnsafePointer<UInt8>, offset: Int) -> UInt16 { private static func readUint16(_ buffer: UnsafePointer<UInt8>, offset: Int) -> UInt16 {
return (UInt16(buffer[offset + 0]) << 8) | UInt16(buffer[offset + 1]) return (UInt16(buffer[offset + 0]) << 8) | UInt16(buffer[offset + 1])
} }
/** /**
Read a 64 bit big endian value from a buffer Read a 64 bit big endian value from a buffer
*/ */
@ -586,7 +589,7 @@ open class WebSocket : NSObject, StreamDelegate {
} }
return value return value
} }
/** /**
Write a 16-bit big endian value to a buffer. Write a 16-bit big endian value to a buffer.
*/ */
@ -594,7 +597,7 @@ open 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.
*/ */
@ -603,7 +606,7 @@ open class WebSocket : NSObject, StreamDelegate {
buffer[offset + i] = UInt8((value >> (8*UInt64(7 - i))) & 0xff) buffer[offset + i] = UInt8((value >> (8*UInt64(7 - i))) & 0xff)
} }
} }
/** /**
Process one message at the start of `buffer`. Return another buffer (sharing storage) that contains the leftover contents of `buffer` that I didn't process. Process one message at the start of `buffer`. Return another buffer (sharing storage) that contains the leftover contents of `buffer` that I didn't process.
*/ */
@ -641,10 +644,10 @@ open class WebSocket : NSObject, StreamDelegate {
let isControlFrame = (receivedOpcode == .connectionClose || receivedOpcode == .ping) let isControlFrame = (receivedOpcode == .connectionClose || receivedOpcode == .ping)
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
} }
if isControlFrame && isFin == 0 { if isControlFrame && isFin == 0 {
let errCode = CloseCode.protocolError.rawValue let errCode = CloseCode.protocolError.rawValue
@ -736,7 +739,7 @@ open class WebSocket : NSObject, StreamDelegate {
if receivedOpcode == .continueFrame { if receivedOpcode == .continueFrame {
let errCode = CloseCode.protocolError.rawValue let errCode = CloseCode.protocolError.rawValue
doDisconnect(errorWithDetail("first frame can't be a continue frame", doDisconnect(errorWithDetail("first frame can't be a continue frame",
code: errCode)) code: errCode))
writeError(errCode) writeError(errCode)
return emptyBuffer return emptyBuffer
} }
@ -751,7 +754,7 @@ open class WebSocket : NSObject, StreamDelegate {
} else { } else {
let errCode = CloseCode.protocolError.rawValue let errCode = CloseCode.protocolError.rawValue
doDisconnect(errorWithDetail("second and beyond of fragment message must be a continue frame", doDisconnect(errorWithDetail("second and beyond of fragment message must be a continue frame",
code: errCode)) code: errCode))
writeError(errCode) writeError(errCode)
return emptyBuffer return emptyBuffer
} }
@ -766,12 +769,12 @@ open class WebSocket : NSObject, StreamDelegate {
} }
_ = processResponse(response) _ = processResponse(response)
} }
let step = Int(offset + numericCast(len)) let step = Int(offset + numericCast(len))
return buffer.fromOffset(step) return buffer.fromOffset(step)
} }
} }
/** /**
Process all messages in the buffer if possible. Process all messages in the buffer if possible.
*/ */
@ -784,7 +787,7 @@ open class WebSocket : NSObject, StreamDelegate {
fragBuffer = Data(buffer: buffer) fragBuffer = Data(buffer: buffer)
} }
} }
/** /**
Process the finished response of a buffer. Process the finished response of a buffer.
*/ */
@ -821,7 +824,7 @@ open class WebSocket : NSObject, StreamDelegate {
} }
return false return false
} }
/** /**
Create an error Create an error
*/ */
@ -830,7 +833,7 @@ open class WebSocket : NSObject, StreamDelegate {
details[NSLocalizedDescriptionKey] = detail details[NSLocalizedDescriptionKey] = detail
return NSError(domain: WebSocket.ErrorDomain, code: Int(code), userInfo: details) return NSError(domain: WebSocket.ErrorDomain, code: Int(code), userInfo: details)
} }
/** /**
Write an error to the socket Write an error to the socket
*/ */
@ -840,7 +843,7 @@ open class WebSocket : NSObject, StreamDelegate {
WebSocket.writeUint16(buffer, offset: 0, value: code) WebSocket.writeUint16(buffer, offset: 0, value: code)
dequeueWrite(Data(bytes: buffer, count: MemoryLayout<UInt16>.size), code: .connectionClose) dequeueWrite(Data(bytes: buffer, count: MemoryLayout<UInt16>.size), code: .connectionClose)
} }
/** /**
Used to write things to the stream Used to write things to the stream
*/ */
@ -870,7 +873,7 @@ open class WebSocket : NSObject, StreamDelegate {
let maskKey = UnsafeMutablePointer<UInt8>(buffer + offset) let maskKey = UnsafeMutablePointer<UInt8>(buffer + offset)
_ = SecRandomCopyBytes(kSecRandomDefault, Int(MemoryLayout<UInt32>.size), maskKey) _ = SecRandomCopyBytes(kSecRandomDefault, Int(MemoryLayout<UInt32>.size), maskKey)
offset += MemoryLayout<UInt32>.size offset += MemoryLayout<UInt32>.size
for i in 0..<dataLength { for i in 0..<dataLength {
buffer[offset] = data[i] ^ maskKey[i % MemoryLayout<UInt32>.size] buffer[offset] = data[i] ^ maskKey[i % MemoryLayout<UInt32>.size]
offset += 1 offset += 1
@ -899,14 +902,14 @@ open class WebSocket : NSObject, StreamDelegate {
callback() callback()
} }
} }
break break
} }
} }
} }
writeQueue.addOperation(operation) writeQueue.addOperation(operation)
} }
/** /**
Used to preform the disconnect delegate Used to preform the disconnect delegate
*/ */
@ -924,31 +927,32 @@ open class WebSocket : NSObject, StreamDelegate {
s.notificationCenter.post(name: NSNotification.Name(WebsocketDidDisconnectNotification), object: self, userInfo: userInfo) s.notificationCenter.post(name: NSNotification.Name(WebsocketDidDisconnectNotification), object: self, userInfo: userInfo)
} }
} }
// MARK: - Deinit // MARK: - Deinit
deinit { deinit {
mutex.lock() mutex.lock()
readyToWrite = false readyToWrite = false
mutex.unlock() mutex.unlock()
cleanupStream() cleanupStream()
writeQueue.cancelAllOperations()
} }
} }
private extension Data { private extension Data {
init(buffer: UnsafeBufferPointer<UInt8>) { init(buffer: UnsafeBufferPointer<UInt8>) {
self.init(bytes: buffer.baseAddress!, count: buffer.count) self.init(bytes: buffer.baseAddress!, count: buffer.count)
} }
} }
private extension UnsafeBufferPointer { private extension UnsafeBufferPointer {
func fromOffset(_ offset: Int) -> UnsafeBufferPointer<Element> { func fromOffset(_ offset: Int) -> UnsafeBufferPointer<Element> {
return UnsafeBufferPointer<Element>(start: baseAddress?.advanced(by: offset), count: count - offset) return UnsafeBufferPointer<Element>(start: baseAddress?.advanced(by: offset), count: count - offset)
} }
} }
private let emptyBuffer = UnsafeBufferPointer<UInt8>(start: nil, count: 0) private let emptyBuffer = UnsafeBufferPointer<UInt8>(start: nil, count: 0)