diff --git a/Source/SocketIO/Engine/SocketEngineSpec.swift b/Source/SocketIO/Engine/SocketEngineSpec.swift index 5554a27..52105e9 100644 --- a/Source/SocketIO/Engine/SocketEngineSpec.swift +++ b/Source/SocketIO/Engine/SocketEngineSpec.swift @@ -296,12 +296,11 @@ extension SocketEngineSpec { func createBinaryDataForSend(using data: Data) -> Either { if websocket { - var byteArray = [UInt8](repeating: 0x4, count: 1) - let mutData = NSMutableData(bytes: &byteArray, length: 1) + var mutData = Data(bytes: [UInt8](repeating: 0x4, count: 1)) mutData.append(data) - return .left(mutData as Data) + return .left(mutData) } else { return .right("b4" + data.base64EncodedString(options: Data.Base64EncodingOptions(rawValue: 0))) } diff --git a/Source/SocketIO/Engine/SocketEngineWebsocket.swift b/Source/SocketIO/Engine/SocketEngineWebsocket.swift index e22346e..9e0e7a0 100644 --- a/Source/SocketIO/Engine/SocketEngineWebsocket.swift +++ b/Source/SocketIO/Engine/SocketEngineWebsocket.swift @@ -174,7 +174,7 @@ extension WebSocket { func write(string: String) { do { - try ws?.send(string) + try send(string) } catch { DefaultSocketLogger.Logger.error("Error sending string", type: "SocketEngineWebsocket", args: string) } @@ -183,7 +183,7 @@ extension WebSocket { func write(data: Data) { do { try data.withUnsafeBytes {(bytes: UnsafePointer) in - try ws?.send(Array(UnsafeBufferPointer(start: bytes, count: data.count))) + try self.send(Array(UnsafeBufferPointer(start: bytes, count: data.count))) } } catch { DefaultSocketLogger.Logger.error("Error sending data", type: "SocketEngineWebsocket", args: data) diff --git a/Source/SocketIO/Util/SocketLogger.swift b/Source/SocketIO/Util/SocketLogger.swift index 0b457ae..3141eb0 100644 --- a/Source/SocketIO/Util/SocketLogger.swift +++ b/Source/SocketIO/Util/SocketLogger.swift @@ -62,10 +62,12 @@ public extension SocketLogger { private func abstractLog(_ logType: String, message: String, type: String, args: [Any]) { guard log else { return } + #if !os(Linux) let newArgs = args.map({arg -> CVarArg in String(describing: arg)}) let messageFormat = String(format: message, arguments: newArgs) NSLog("\(logType) \(type): %@", messageFormat) + #endif } }