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

Add messages for socket/engine deinit

Browse Source
This commit is contained in:
Erik 2015-04-20 12:42:35 -04:00
parent 446cf57978
commit cc99eae737
4 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SocketIOClientSwift/SocketEngine.swift
View File

@ -104,6 +104,10 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
delegate: sessionDelegate, delegateQueue: self.workQueue) delegate: sessionDelegate, delegateQueue: self.workQueue)
} }
deinit {
SocketLogger.log("Engine is being deinit", client: self)
}
public func close(#fast:Bool) { public func close(#fast:Bool) {
self.pingTimer?.invalidate() self.pingTimer?.invalidate()
self.closed = true self.closed = true

26
SocketIOClientSwift/SocketIOClient.swift
View File

@ -62,7 +62,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketLogClient
return self._connecting return self._connecting
} }
public var cookies:[NSHTTPCookie]? public var cookies:[NSHTTPCookie]?
public var engine:SocketEngine? public var engine:SocketEngine!
public var nsp = "/" public var nsp = "/"
public var reconnects = true public var reconnects = true
public var reconnecting:Bool { public var reconnecting:Bool {
@ -143,6 +143,10 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketLogClient
self.init(socketURL: socketURL, opts: options) self.init(socketURL: socketURL, opts: options)
} }
deinit {
SocketLogger.log("Client is being deinit", client: self)
}
private func addEngine() { private func addEngine() {
SocketLogger.log("Adding engine", client: self) SocketLogger.log("Adding engine", client: self)
@ -166,7 +170,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketLogClient
self._connecting = false self._connecting = false
self._connected = false self._connected = false
self._reconnecting = false self._reconnecting = false
self.engine?.close(fast: fast) self.engine.close(fast: fast)
} }
/** /**
@ -183,7 +187,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketLogClient
} }
self.addEngine() self.addEngine()
self.engine?.open() self.engine.open()
} }
/** /**
@ -203,7 +207,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketLogClient
self.paramConnect = true self.paramConnect = true
self.addEngine() self.addEngine()
self.engine?.open(opts: params) self.engine.open(opts: params)
} }
private func createOnAck(event:String, items:[AnyObject]) -> OnAckCallback { private func createOnAck(event:String, items:[AnyObject]) -> OnAckCallback {
@ -238,7 +242,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketLogClient
self.currentReconnectAttempt = 0 self.currentReconnectAttempt = 0
self.reconnectTimer?.invalidate() self.reconnectTimer?.invalidate()
self.reconnectTimer = nil self.reconnectTimer = nil
self._sid = self.engine?.sid self._sid = self.engine.sid
// Don't handle as internal because something crazy could happen where // Don't handle as internal because something crazy could happen where
// we disconnect before it's handled // we disconnect before it's handled
@ -323,9 +327,9 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketLogClient
SocketLogger.log("Emitting: \(str)", client: self) SocketLogger.log("Emitting: \(str)", client: self)
if packet.type == SocketPacket.PacketType.BINARY_EVENT { if packet.type == SocketPacket.PacketType.BINARY_EVENT {
self.engine?.send(str, withData: packet.binary) self.engine.send(str, withData: packet.binary)
} else { } else {
self.engine?.send(str, withData: nil) self.engine.send(str, withData: nil)
} }
} }
@ -343,11 +347,11 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketLogClient
str = packet.createAck() str = packet.createAck()
SocketLogger.log("Emitting Ack: \(str)", client: self!) SocketLogger.log("Emitting Ack: \(str)", client: self!)
if packet.type == SocketPacket.PacketType.BINARY_ACK { if packet.type == SocketPacket.PacketType.BINARY_ACK {
self?.engine?.send(str, withData: packet.binary) self?.engine.send(str, withData: packet.binary)
} else { } else {
self?.engine?.send(str, withData: nil) self?.engine.send(str, withData: nil)
} }
} }
} }
@ -409,7 +413,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketLogClient
SocketLogger.log("Joining namespace", client: self) SocketLogger.log("Joining namespace", client: self)
if self.nsp != "/" { if self.nsp != "/" {
self.engine?.send("0/\(self.nsp)", withData: nil) self.engine.send("0/\(self.nsp)", withData: nil)
} }
} }

6
SocketIOClientSwift/SocketLogger.swift
View File

@ -37,8 +37,8 @@ final class SocketLogger {
return return
} }
dispatch_async(printQueue) { dispatch_async(printQueue) {[type = client.logType] in
NSLog("%@: %@", altType ?? client.logType, message) NSLog("%@: %@", altType ?? type, message)
} }
} }
@ -47,7 +47,7 @@ final class SocketLogger {
return return
} }
dispatch_async(printQueue) { dispatch_async(printQueue) {[type = client.logType] in
NSLog("ERROR %@: %@", altType ?? client.logType, message) NSLog("ERROR %@: %@", altType ?? client.logType, message)
} }
} }

2
SocketIOClientSwift/SwiftRegex.swift
View File

@ -152,7 +152,7 @@ public class SwiftRegex: NSObject, BooleanType {
pos = matchRange.location + matchRange.length pos = matchRange.location + matchRange.length
} }
out.appendString(substring( NSRange(location:pos, length:targetRange.length-pos))!) out.appendString(substring(NSRange(location:pos, length:targetRange.length-pos))!)
return out as String return out as String
} }