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

try and get something to compile

Browse Source
This commit is contained in:
Erik Little 2017-09-17 10:54:05 -04:00
parent d0420bc3c6
commit 53289dc092
No known key found for this signature in database
GPG Key ID: 4930B7C5FBC1A69D
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/SocketIO/Engine/SocketEngineSpec.swift
View File

@ -296,12 +296,11 @@ extension SocketEngineSpec {
func createBinaryDataForSend(using data: Data) -> Either<Data, String> { func createBinaryDataForSend(using data: Data) -> Either<Data, String> {
if websocket { if websocket {
var byteArray = [UInt8](repeating: 0x4, count: 1) var mutData = Data(bytes: [UInt8](repeating: 0x4, count: 1))
let mutData = NSMutableData(bytes: &byteArray, length: 1)
mutData.append(data) mutData.append(data)
return .left(mutData as Data) return .left(mutData)
} else { } else {
return .right("b4" + data.base64EncodedString(options: Data.Base64EncodingOptions(rawValue: 0))) return .right("b4" + data.base64EncodedString(options: Data.Base64EncodingOptions(rawValue: 0)))
} }

4
Source/SocketIO/Engine/SocketEngineWebsocket.swift
View File

@ -174,7 +174,7 @@ extension WebSocket {
func write(string: String) { func write(string: String) {
do { do {
try ws?.send(string) try send(string)
} catch { } catch {
DefaultSocketLogger.Logger.error("Error sending string", type: "SocketEngineWebsocket", args: string) DefaultSocketLogger.Logger.error("Error sending string", type: "SocketEngineWebsocket", args: string)
} }
@ -183,7 +183,7 @@ extension WebSocket {
func write(data: Data) { func write(data: Data) {
do { do {
try data.withUnsafeBytes {(bytes: UnsafePointer<UInt8>) in try data.withUnsafeBytes {(bytes: UnsafePointer<UInt8>) in
try ws?.send(Array(UnsafeBufferPointer(start: bytes, count: data.count))) try self.send(Array(UnsafeBufferPointer(start: bytes, count: data.count)))
} }
} catch { } catch {
DefaultSocketLogger.Logger.error("Error sending data", type: "SocketEngineWebsocket", args: data) DefaultSocketLogger.Logger.error("Error sending data", type: "SocketEngineWebsocket", args: data)

2
Source/SocketIO/Util/SocketLogger.swift
View File

@ -62,10 +62,12 @@ public extension SocketLogger {
private func abstractLog(_ logType: String, message: String, type: String, args: [Any]) { private func abstractLog(_ logType: String, message: String, type: String, args: [Any]) {
guard log else { return } guard log else { return }
#if !os(Linux)
let newArgs = args.map({arg -> CVarArg in String(describing: arg)}) let newArgs = args.map({arg -> CVarArg in String(describing: arg)})
let messageFormat = String(format: message, arguments: newArgs) let messageFormat = String(format: message, arguments: newArgs)
NSLog("\(logType) \(type): %@", messageFormat) NSLog("\(logType) \(type): %@", messageFormat)
#endif
} }
} }