diff --git a/Source/SocketEngine.swift b/Source/SocketEngine.swift index 4ca63a6..b01a2e4 100644 --- a/Source/SocketEngine.swift +++ b/Source/SocketEngine.swift @@ -151,8 +151,7 @@ public final class SocketEngine : NSObject, SocketEnginePollable, SocketEngineWe if message.hasPrefix("b4") { // binary in base64 string let noPrefix = message[message.characters.index(message.startIndex, offsetBy: 2).. String { if let latin1 = string.data(using: String.Encoding.utf8), - utf8 = NSString(data: latin1, encoding: String.Encoding.isoLatin1.rawValue) { + let utf8 = NSString(data: latin1, encoding: String.Encoding.isoLatin1.rawValue) { return utf8 as String } else { return string @@ -101,7 +101,7 @@ extension SocketEngineSpec { func fixDoubleUTF8(_ string: String) -> String { if let utf8 = string.data(using: String.Encoding.isoLatin1), - latin1 = NSString(data: utf8, encoding: String.Encoding.utf8.rawValue) { + let latin1 = NSString(data: utf8, encoding: String.Encoding.utf8.rawValue) { return latin1 as String } else { return string diff --git a/Source/SocketIOClient.swift b/Source/SocketIOClient.swift index fdc2a2f..478790b 100644 --- a/Source/SocketIOClient.swift +++ b/Source/SocketIOClient.swift @@ -150,7 +150,7 @@ public final class SocketIOClient : NSObject, SocketEngineClient, SocketParsable let time = DispatchTime.now() + Double(Int64(timeoutAfter) * Int64(NSEC_PER_SEC)) / Double(NSEC_PER_SEC) handleQueue.after(when: time) {[weak self] in - if let this = self where this.status != .connected && this.status != .disconnected { + if let this = self, this.status != .connected && this.status != .disconnected { this.status = .disconnected this.engine?.disconnect(reason: "Connect timeout") diff --git a/Source/SocketIOClientOption.swift b/Source/SocketIOClientOption.swift index c06a245..db860c9 100644 --- a/Source/SocketIOClientOption.swift +++ b/Source/SocketIOClientOption.swift @@ -217,7 +217,7 @@ extension NSDictionary { var options = Set() for (rawKey, value) in self { - if let key = rawKey as? String, opt = NSDictionary.keyValueToSocketIOClientOption(key, value: value) { + if let key = rawKey as? String, let opt = NSDictionary.keyValueToSocketIOClientOption(key, value: value) { options.insertIgnore(opt) } } diff --git a/Source/WebSocket/SSLSecurity.swift b/Source/WebSocket/SSLSecurity.swift index b93e55b..7ed067e 100644 --- a/Source/WebSocket/SSLSecurity.swift +++ b/Source/WebSocket/SSLSecurity.swift @@ -96,7 +96,7 @@ public class SSLSecurity : NSObject { DispatchQueue.global(attributes: DispatchQueue.GlobalAttributes.qosDefault).async { let pubKeys = certs.reduce([SecKey]()) { (pubKeys: [SecKey], cert: SSLCert) -> [SecKey] in var pubKeys = pubKeys - if let data = cert.certData where cert.key == nil { + if let data = cert.certData, cert.key == nil { cert.key = self.extractPublicKey(data) } if let key = cert.key { diff --git a/Source/WebSocket/WebSocket.swift b/Source/WebSocket/WebSocket.swift index 5dce627..2c45b73 100644 --- a/Source/WebSocket/WebSocket.swift +++ b/Source/WebSocket/WebSocket.swift @@ -305,7 +305,7 @@ public class WebSocket : NSObject, StreamDelegate { } if let cipherSuites = self.enabledSSLCipherSuites { if let sslContextIn = CFReadStreamCopyProperty(inputStream, CFStreamPropertyKey(rawValue: kCFStreamPropertySSLContext)) as! SSLContext?, - 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 resOut = SSLSetEnabledCiphers(sslContextOut, cipherSuites, cipherSuites.count) if resIn != errSecSuccess { @@ -349,7 +349,7 @@ public class WebSocket : NSObject, StreamDelegate { //delegate for the stream methods. Processes incoming bytes public func stream(_ aStream: Stream, handle eventCode: Stream.Event) { - if let sec = security where !certValidated && [.hasBytesAvailable, .hasSpaceAvailable].contains(eventCode) { + if let sec = security, !certValidated && [.hasBytesAvailable, .hasSpaceAvailable].contains(eventCode) { let possibleTrust: AnyObject? = aStream.property(forKey: kCFStreamPropertySSLPeerTrust as Stream.PropertyKey) if let trust: AnyObject = possibleTrust { let domain: AnyObject? = aStream.property(forKey: kCFStreamSSLPeerName as Stream.PropertyKey) @@ -534,7 +534,7 @@ public class WebSocket : NSObject, StreamDelegate { } /// 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. - @warn_unused_result + private func processOneRawMessage(inBuffer buffer: UnsafeBufferPointer) -> UnsafeBufferPointer { let response = readStack.last guard let baseAddress = buffer.baseAddress else { fatalError("") } @@ -543,7 +543,7 @@ public class WebSocket : NSObject, StreamDelegate { fragBuffer = Data(buffer: buffer) return emptyBuffer } - if let response = response where response.bytesLeft > 0 { + if let response = response, response.bytesLeft > 0 { var len = response.bytesLeft var extra = bufferLen - response.bytesLeft if response.bytesLeft > bufferLen { @@ -612,10 +612,10 @@ public class WebSocket : NSObject, StreamDelegate { var dataLength = UInt64(payloadLen) if dataLength == 127 { dataLength = WebSocket.readUint64(baseAddress, offset: offset) - offset += sizeof(UInt64) + offset += sizeof(UInt64.self) } else if dataLength == 126 { dataLength = UInt64(WebSocket.readUint16(baseAddress, offset: offset)) - offset += sizeof(UInt16) + offset += sizeof(UInt16.self) } if bufferLen < offset || UInt64(bufferLen - offset) < dataLength { fragBuffer = Data(bytes: baseAddress, count: bufferLen) @@ -754,10 +754,10 @@ public class WebSocket : NSObject, StreamDelegate { ///write a an error to the socket private func writeError(_ code: UInt16) { - let buf = NSMutableData(capacity: sizeof(UInt16)) + let buf = NSMutableData(capacity: sizeof(UInt16.self)) let buffer = UnsafeMutablePointer(buf!.bytes) WebSocket.writeUint16(buffer, offset: 0, value: code) - dequeueWrite(Data(bytes: buffer, count: sizeof(UInt16)), code: .connectionClose) + dequeueWrite(Data(bytes: buffer, count: sizeof(UInt16.self)), code: .connectionClose) } ///used to write things to the stream private func dequeueWrite(_ data: Data, code: OpCode, writeCompletion: (() -> ())? = nil) { @@ -775,19 +775,19 @@ public class WebSocket : NSObject, StreamDelegate { } else if dataLength <= Int(UInt16.max) { buffer[1] = 126 WebSocket.writeUint16(buffer, offset: offset, value: UInt16(dataLength)) - offset += sizeof(UInt16) + offset += sizeof(UInt16.self) } else { buffer[1] = 127 WebSocket.writeUint64(buffer, offset: offset, value: UInt64(dataLength)) - offset += sizeof(UInt64) + offset += sizeof(UInt64.self) } buffer[1] |= s.MaskMask let maskKey = UnsafeMutablePointer(buffer + offset) - SecRandomCopyBytes(kSecRandomDefault, Int(sizeof(UInt32)), maskKey) - offset += sizeof(UInt32) + _ = SecRandomCopyBytes(kSecRandomDefault, Int(sizeof(UInt32.self)), maskKey) + offset += sizeof(UInt32.self) for i in 0..= offset { - if let queue = self?.queue, callback = writeCompletion { + if let queue = self?.queue, let callback = writeCompletion { queue.asynchronously() { callback() }