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

try and avoid a bunch of as AnyObject nonsense

Browse Source
This commit is contained in:
Erik 2016-05-22 14:05:01 -04:00
parent 044d9c0746
commit 51ee4d3d1d
3 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/SocketIOClient.swift
View File

@ -208,8 +208,8 @@ public final class SocketIOClient : NSObject, SocketEngineClient, SocketParsable
} }
/// Send a message to the server /// Send a message to the server
public func emit(_ event: String, _ items: AnyObject...) { public func emit(_ event: String, _ items: SocketData...) {
emit(event, with: items) emit(event, with: socketDataToAnyObject(data: items))
} }
/// Same as emit, but meant for Objective-C /// Same as emit, but meant for Objective-C
@ -224,8 +224,8 @@ public final class SocketIOClient : NSObject, SocketEngineClient, SocketParsable
/// Sends a message to the server, requesting an ack. Use the onAck method of SocketAckHandler to add /// Sends a message to the server, requesting an ack. Use the onAck method of SocketAckHandler to add
/// an ack. /// an ack.
public func emitWithAck(_ event: String, _ items: AnyObject...) -> OnAckCallback { public func emitWithAck(_ event: String, _ items: SocketData...) -> OnAckCallback {
return emitWithAck(event, with: items) return emitWithAck(event, with: socketDataToAnyObject(data: items))
} }
/// Same as emitWithAck, but for Objective-C /// Same as emitWithAck, but for Objective-C

4
Source/SocketIOClientSpec.swift
View File

@ -40,4 +40,8 @@ extension SocketIOClientSpec {
handleEvent("error", data: [reason as AnyObject], isInternalMessage: true, withAck: -1) handleEvent("error", data: [reason as AnyObject], isInternalMessage: true, withAck: -1)
} }
func socketDataToAnyObject(data: [SocketData]) -> [AnyObject] {
return data.flatMap({$0 as? AnyObject})
}
} }

14
Source/SocketTypes.swift
View File

@ -24,6 +24,20 @@
import Foundation import Foundation
public protocol SocketData {}
extension Array : SocketData {}
extension Bool : SocketData {}
extension Dictionary : SocketData {}
extension Double : SocketData {}
extension Int : SocketData {}
extension NSArray : SocketData {}
extension NSData : SocketData {}
extension NSDictionary : SocketData {}
extension NSString : SocketData {}
extension NSNull : SocketData {}
extension String : SocketData {}
public typealias AckCallback = ([AnyObject]) -> Void public typealias AckCallback = ([AnyObject]) -> Void
public typealias NormalCallback = ([AnyObject], SocketAckEmitter) -> Void public typealias NormalCallback = ([AnyObject], SocketAckEmitter) -> Void
public typealias OnAckCallback = (timeoutAfter: UInt64, callback: AckCallback) -> Void public typealias OnAckCallback = (timeoutAfter: UInt64, callback: AckCallback) -> Void