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

merge master

Browse Source
This commit is contained in:
Erik 2015-03-18 18:39:53 -04:00
commit 84752b463a
5 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
README.md
View File

@ -47,10 +47,10 @@ Methods
-------
1. `socket.on(name:String, callback:((data:NSArray?, ack:AckEmitter?) -> Void))` - Adds a handler for an event. Items are passed by an array. `ack` can be used to send an ack when one is requested. See example.
2. `socket.onAny(callback:((event:String, items:AnyObject?)) -> Void)` - Adds a handler for all events. It will be called on any received event.
3. `socket.emit(event:String, args:AnyObject...)` - Sends a message. Can send multiple args.
4. `socket.emitObjc(event:String, args:[AnyObject])` - `emit` for Objective-C
5. `socket.emitWithAck(event:String, args:AnyObject...) -> SocketAckHandler` - Sends a message that requests an acknowledgement from the server. Returns a SocketAckHandler which you can use to add an onAck handler. See example.
6. `socket.emitWithAckObjc(event:String, _ args:[AnyObject]) -> SocketAckHandler` - `emitWithAck` for Objective-C.
3. `socket.emit(event:String, _ args:AnyObject...)` - Sends a message. Can send multiple args.
4. `socket.emitObjc(event:String, withItems items:[AnyObject])` - `emit` for Objective-C
5. `socket.emitWithAck(event:String, _ args:AnyObject...) -> SocketAckHandler` - Sends a message that requests an acknowledgement from the server. Returns a SocketAckHandler which you can use to add an onAck handler. See example.
6. `socket.emitWithAckObjc(event:String, withItems items:[AnyObject]) -> SocketAckHandler` - `emitWithAck` for Objective-C.
7. `socket.connect()` - Establishes a connection to the server. A "connect" event is fired upon successful connection.
8. `socket.connectWithParams(params:[String: AnyObject])` - Establishes a connection to the server passing the specified params. A "connect" event is fired upon successful connection.
9. `socket.close()` - Closes the socket. Once a socket is closed it should not be reopened.
@ -131,8 +131,8 @@ SocketIOClient* socket = [[SocketIOClient alloc] initWithSocketURL:@"localhost:8
[socket on: @"connect" callback: ^(NSArray* data, void (^ack)(NSArray*)) {
NSLog(@"connected");
[socket emitObjc:@"echo" :@[@"echo test"]];
[[socket emitWithAckObjc:@"ackack" :@[@"test"]] onAck:0 withCallback:^(NSArray* data) {
[socket emitObjc:@"echo" withItems:@[@"echo test"]];
[[socket emitWithAckObjc:@"ackack" withItems:@[@"test"]] onAck:0 withCallback:^(NSArray* data) {
NSLog(@"Got data");
}];
}];

4
Socket.IO-Client-Swift.podspec
View File

@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "Socket.IO-Client-Swift"
s.version = "1.2.2"
s.version = "1.3.0"
s.summary = "Socket.IO-client for Swift"
s.description = <<-DESC
Socket.IO-client for Swift.
@ -12,7 +12,7 @@ Pod::Spec.new do |s|
s.author = { "Erik" => "nuclear.ace@gmail.com" }
s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.10'
s.source = { :git => "https://github.com/socketio/socket.io-client-swift.git", :tag => 'v1.2.2' }
s.source = { :git => "https://github.com/socketio/socket.io-client-swift.git", :tag => 'v1.3.0' }
s.source_files = "SwiftIO/**/*.swift"
s.requires_arc = true
# s.dependency 'Starscream', '~> 0.9' # currently this repo includes Starscream swift files

4
SwiftIO/SocketEngine.swift
View File

@ -109,7 +109,7 @@ public class SocketEngine: NSObject, WebSocketDelegate {
}
}
private func createURLs(params:[String: AnyObject]? = nil) -> (String, String) {
private func createURLs(params:[String: AnyObject]?) -> (String, String) {
var url = "\(self.client.socketURL)/socket.io/?transport="
var urlPolling:String
var urlWebSocket:String
@ -288,7 +288,7 @@ public class SocketEngine: NSObject, WebSocketDelegate {
assert(false, "We're in a bad state, this shouldn't happen.")
}
let (urlPolling, urlWebSocket) = self.createURLs(params: opts)
let (urlPolling, urlWebSocket) = self.createURLs(opts)
self.urlPolling = urlPolling
self.urlWebSocket = urlWebSocket
let reqPolling = NSMutableURLRequest(URL: NSURL(string: urlPolling + "&b64=1")!)

21
SwiftIO/SocketIOClient.swift
View File

@ -175,13 +175,13 @@ public class SocketIOClient: NSObject {
}
// Server wants us to die
func didForceClose() {
func didForceClose(#message:String) {
self._closed = true
self._connected = false
self.reconnects = false
self._connecting = false
self._reconnecting = false
self.handleEvent("disconnect", data: "closed", isInternalMessage: true)
self.handleEvent("disconnect", data: message, isInternalMessage: true)
}
// Sends a message with multiple args
@ -199,8 +199,8 @@ public class SocketIOClient: NSObject {
}
// Objc doesn't have variadics
public func emitObjc(event:String, _ args:[AnyObject]) {
self.emit(event, args)
public func emitObjc(event:String, withItems items:[AnyObject]) {
self.emit(event, items)
}
public func emitWithAck(event:String, _ args:AnyObject...) -> SocketAckHandler {
@ -221,8 +221,8 @@ public class SocketIOClient: NSObject {
return ackHandler
}
public func emitWithAckObjc(event:String, _ args:[AnyObject]) -> SocketAckHandler {
return self.emitWithAck(event, args)
public func emitWithAckObjc(event:String, withItems items:[AnyObject]) -> SocketAckHandler {
return self.emitWithAck(event, items)
}
private func _emit(event:String, _ args:[AnyObject], ack:Int? = nil) {
@ -319,10 +319,13 @@ public class SocketIOClient: NSObject {
return
}
if self.anyHandler != nil {
dispatch_async(dispatch_get_main_queue()) {[weak self] in
self?.anyHandler?((event, data))
return
}
}
for handler in self.handlers {
if handler.event == event {
if data is NSArray {
@ -400,7 +403,7 @@ public class SocketIOClient: NSObject {
// We lost connection and should attempt to reestablish
func tryReconnect() {
if self.reconnectAttempts != -1 && self.currentReconnectAttempt + 1 > self.reconnectAttempts {
self.didForceClose()
self.didForceClose(message: "Reconnect Failed")
return
} else if self.connected {
self._connecting = false
@ -438,7 +441,7 @@ public class SocketIOClient: NSObject {
self._connected = false
self._connecting = false
if self.closed || !self.reconnects {
self.didForceClose()
self.didForceClose(message: "WebSocket closed")
} else {
self.handleEvent("reconnect", data: reason, isInternalMessage: true)
self.tryReconnect()
@ -451,7 +454,7 @@ public class SocketIOClient: NSObject {
self._connecting = false
self.handleEvent("error", data: error.localizedDescription, isInternalMessage: true)
if self.closed || !self.reconnects {
self.didForceClose()
self.didForceClose(message: "WebSocket closed with an error \(error)")
} else if !self.reconnecting {
self.handleEvent("reconnect", data: error.localizedDescription, isInternalMessage: true)
self.tryReconnect()

3
SwiftIO/SocketParser.swift
View File

@ -209,6 +209,9 @@ class SocketParser {
socket.didConnect()
return
}
} else if stringMessage == "1" {
socket.didForceClose(message: "Got disconnect")
return
}
if stringMessage.hasPrefix("5") || stringMessage.hasPrefix("6") {