From 30731305989a65b20a3ab535346e6094aa75b7c1 Mon Sep 17 00:00:00 2001 From: Erik Date: Mon, 11 Apr 2016 18:51:22 -0400 Subject: [PATCH 1/3] change to how server gives id --- Source/SocketIOClient.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/SocketIOClient.swift b/Source/SocketIOClient.swift index 5d36444..99fa5f8 100644 --- a/Source/SocketIOClient.swift +++ b/Source/SocketIOClient.swift @@ -46,7 +46,7 @@ public final class SocketIOClient : NSObject, SocketEngineClient, SocketParsable public var reconnects = true public var reconnectWait = 10 public var sid: String? { - return engine?.sid + return nsp + "#" + (engine?.sid ?? "") } private let emitQueue = dispatch_queue_create("com.socketio.emitQueue", DISPATCH_QUEUE_SERIAL) From e1865e3f94c73f651138906e749505050902f5ec Mon Sep 17 00:00:00 2001 From: Erik Date: Sat, 16 Apr 2016 10:43:20 -0400 Subject: [PATCH 2/3] rename file --- Socket.IO-Client-Swift.xcodeproj/project.pbxproj | 16 ++++++++-------- Source/SocketEnginePollable.swift | 6 ++---- ...ClientSpec.swift => SocketIOClientSpec.swift} | 6 +++--- Source/SocketLogger.swift | 2 +- Source/SocketParsable.swift | 5 ++--- 5 files changed, 16 insertions(+), 19 deletions(-) rename Source/{SocketClientSpec.swift => SocketIOClientSpec.swift} (94%) diff --git a/Socket.IO-Client-Swift.xcodeproj/project.pbxproj b/Socket.IO-Client-Swift.xcodeproj/project.pbxproj index e513ca8..f209032 100644 --- a/Socket.IO-Client-Swift.xcodeproj/project.pbxproj +++ b/Socket.IO-Client-Swift.xcodeproj/project.pbxproj @@ -119,13 +119,13 @@ 742D150C1CA5794B00BD987D /* SocketObjectiveCTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 742D150B1CA5794B00BD987D /* SocketObjectiveCTest.m */; }; 74321DCB1C2D939A00CF6F43 /* SocketAckManagerTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74321DC91C2D939A00CF6F43 /* SocketAckManagerTest.swift */; }; 74321DCC1C2D939A00CF6F43 /* SocketParserTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74321DCA1C2D939A00CF6F43 /* SocketParserTest.swift */; }; - 7471CCEA1C39926300364B59 /* SocketClientSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74ABF7761C3991C10078C657 /* SocketClientSpec.swift */; }; - 7471CCEB1C39926C00364B59 /* SocketClientSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74ABF7761C3991C10078C657 /* SocketClientSpec.swift */; }; + 7471CCEA1C39926300364B59 /* SocketIOClientSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74ABF7761C3991C10078C657 /* SocketIOClientSpec.swift */; }; + 7471CCEB1C39926C00364B59 /* SocketIOClientSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74ABF7761C3991C10078C657 /* SocketIOClientSpec.swift */; }; 7472C65C1BCAB53E003CA70D /* SocketNamespacePacketTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7472C65B1BCAB53E003CA70D /* SocketNamespacePacketTest.swift */; }; 7472C65D1BCAB53E003CA70D /* SocketNamespacePacketTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7472C65B1BCAB53E003CA70D /* SocketNamespacePacketTest.swift */; }; 7472C65F1BCAC46E003CA70D /* SocketSideEffectTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7472C65E1BCAC46E003CA70D /* SocketSideEffectTest.swift */; }; 7472C6601BCAC46E003CA70D /* SocketSideEffectTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7472C65E1BCAC46E003CA70D /* SocketSideEffectTest.swift */; }; - 74ABF7771C3991C10078C657 /* SocketClientSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74ABF7761C3991C10078C657 /* SocketClientSpec.swift */; }; + 74ABF7771C3991C10078C657 /* SocketIOClientSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74ABF7761C3991C10078C657 /* SocketIOClientSpec.swift */; }; 74F124F01BC574CF002966F4 /* SocketBasicPacketTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74F124EF1BC574CF002966F4 /* SocketBasicPacketTest.swift */; }; 74F124F11BC574CF002966F4 /* SocketBasicPacketTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74F124EF1BC574CF002966F4 /* SocketBasicPacketTest.swift */; }; /* End PBXBuildFile section */ @@ -193,7 +193,7 @@ 74321DCA1C2D939A00CF6F43 /* SocketParserTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SocketParserTest.swift; sourceTree = ""; }; 7472C65B1BCAB53E003CA70D /* SocketNamespacePacketTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SocketNamespacePacketTest.swift; sourceTree = ""; }; 7472C65E1BCAC46E003CA70D /* SocketSideEffectTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SocketSideEffectTest.swift; sourceTree = ""; }; - 74ABF7761C3991C10078C657 /* SocketClientSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SocketClientSpec.swift; path = Source/SocketClientSpec.swift; sourceTree = ""; }; + 74ABF7761C3991C10078C657 /* SocketIOClientSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SocketIOClientSpec.swift; path = Source/SocketIOClientSpec.swift; sourceTree = ""; }; 74F124EF1BC574CF002966F4 /* SocketBasicPacketTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SocketBasicPacketTest.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -350,7 +350,6 @@ 74171E501C10CD240062D398 /* SocketAckEmitter.swift */, 74171E511C10CD240062D398 /* SocketAckManager.swift */, 74171E521C10CD240062D398 /* SocketAnyEvent.swift */, - 74ABF7761C3991C10078C657 /* SocketClientSpec.swift */, 74171E531C10CD240062D398 /* SocketEngine.swift */, 74171E541C10CD240062D398 /* SocketEngineClient.swift */, 74171E551C10CD240062D398 /* SocketEnginePacketType.swift */, @@ -360,6 +359,7 @@ 74171E571C10CD240062D398 /* SocketEventHandler.swift */, 74171E591C10CD240062D398 /* SocketIOClient.swift */, 74171E5A1C10CD240062D398 /* SocketIOClientOption.swift */, + 74ABF7761C3991C10078C657 /* SocketIOClientSpec.swift */, 74171E5B1C10CD240062D398 /* SocketIOClientStatus.swift */, 74171E5C1C10CD240062D398 /* SocketLogger.swift */, 74171E5D1C10CD240062D398 /* SocketPacket.swift */, @@ -610,7 +610,7 @@ 74171E751C10CD240062D398 /* SocketEngine.swift in Sources */, 74171E691C10CD240062D398 /* SocketAckManager.swift in Sources */, 7420CB791C49629E00956AA4 /* SocketEnginePollable.swift in Sources */, - 74ABF7771C3991C10078C657 /* SocketClientSpec.swift in Sources */, + 74ABF7771C3991C10078C657 /* SocketIOClientSpec.swift in Sources */, 74171E871C10CD240062D398 /* SocketEngineSpec.swift in Sources */, 74171E631C10CD240062D398 /* SocketAckEmitter.swift in Sources */, 74171EBD1C10CD240062D398 /* SocketStringReader.swift in Sources */, @@ -663,7 +663,7 @@ buildActionMask = 2147483647; files = ( 740CA1211C496EF200CB98F4 /* SocketEngineWebsocket.swift in Sources */, - 7471CCEA1C39926300364B59 /* SocketClientSpec.swift in Sources */, + 7471CCEA1C39926300364B59 /* SocketIOClientSpec.swift in Sources */, 74171EA71C10CD240062D398 /* SocketIOClientStatus.swift in Sources */, 74171E771C10CD240062D398 /* SocketEngine.swift in Sources */, 7420CB7A1C49629E00956AA4 /* SocketEnginePollable.swift in Sources */, @@ -706,7 +706,7 @@ buildActionMask = 2147483647; files = ( 740CA1201C496EEB00CB98F4 /* SocketEngineWebsocket.swift in Sources */, - 7471CCEB1C39926C00364B59 /* SocketClientSpec.swift in Sources */, + 7471CCEB1C39926C00364B59 /* SocketIOClientSpec.swift in Sources */, 74171EA91C10CD240062D398 /* SocketIOClientStatus.swift in Sources */, 74171E791C10CD240062D398 /* SocketEngine.swift in Sources */, 7420CB7B1C49629E00956AA4 /* SocketEnginePollable.swift in Sources */, diff --git a/Source/SocketEnginePollable.swift b/Source/SocketEnginePollable.swift index 86291cd..c419e51 100644 --- a/Source/SocketEnginePollable.swift +++ b/Source/SocketEnginePollable.swift @@ -181,9 +181,7 @@ extension SocketEnginePollable { } func parsePollingMessage(str: String) { - guard str.characters.count != 1 else { - return - } + guard str.characters.count != 1 else { return } var reader = SocketStringReader(message: str) @@ -210,7 +208,7 @@ extension SocketEnginePollable { let fixedMessage: String if doubleEncodeUTF8 { - fixedMessage = doubleEncodeUTF8(message) + fixedMessage = doubleEncodeUTF8(message) } else { fixedMessage = message } diff --git a/Source/SocketClientSpec.swift b/Source/SocketIOClientSpec.swift similarity index 94% rename from Source/SocketClientSpec.swift rename to Source/SocketIOClientSpec.swift index 48b3b17..8b33cf9 100644 --- a/Source/SocketClientSpec.swift +++ b/Source/SocketIOClientSpec.swift @@ -1,5 +1,5 @@ // -// SocketClientSpec.swift +// SocketIOClientSpec.swift // Socket.IO-Client-Swift // // Created by Erik Little on 1/3/16. @@ -22,7 +22,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -protocol SocketClientSpec : class { +protocol SocketIOClientSpec : class { var nsp: String { get set } var waitingPackets: [SocketPacket] { get set } @@ -34,7 +34,7 @@ protocol SocketClientSpec : class { func joinNamespace(namespace: String) } -extension SocketClientSpec { +extension SocketIOClientSpec { func didError(reason: String) { DefaultSocketLogger.Logger.error("%@", type: "SocketIOClient", args: reason) diff --git a/Source/SocketLogger.swift b/Source/SocketLogger.swift index 9ba7d34..bff9d4e 100644 --- a/Source/SocketLogger.swift +++ b/Source/SocketLogger.swift @@ -26,7 +26,7 @@ import Foundation public protocol SocketLogger : class { /// Whether to log or not - var log: Bool {get set} + var log: Bool { get set } /// Normal log messages func log(message: String, type: String, args: AnyObject...) diff --git a/Source/SocketParsable.swift b/Source/SocketParsable.swift index 1c4084a..c74b160 100644 --- a/Source/SocketParsable.swift +++ b/Source/SocketParsable.swift @@ -22,7 +22,7 @@ import Foundation -protocol SocketParsable : SocketClientSpec { +protocol SocketParsable : SocketIOClientSpec { func parseBinaryData(data: NSData) func parseSocketMessage(message: String) } @@ -45,8 +45,7 @@ extension SocketParsable { private func handlePacket(pack: SocketPacket) { switch pack.type { case .Event where isCorrectNamespace(pack.nsp): - handleEvent(pack.event, data: pack.args, - isInternalMessage: false, withAck: pack.id) + handleEvent(pack.event, data: pack.args, isInternalMessage: false, withAck: pack.id) case .Ack where isCorrectNamespace(pack.nsp): handleAck(pack.id, data: pack.data) case .BinaryEvent where isCorrectNamespace(pack.nsp): From 6efeb7d5b2871fd9cdc2ad19143ec7d8f47e77de Mon Sep 17 00:00:00 2001 From: Erik Date: Sat, 16 Apr 2016 11:04:26 -0400 Subject: [PATCH 3/3] expose ws --- Source/SocketEngineSpec.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/SocketEngineSpec.swift b/Source/SocketEngineSpec.swift index 785fc6f..2fde9f3 100644 --- a/Source/SocketEngineSpec.swift +++ b/Source/SocketEngineSpec.swift @@ -46,6 +46,7 @@ import Foundation var urlPolling: NSURL { get } var urlWebSocket: NSURL { get } var websocket: Bool { get } + optional var ws: WebSocket? { get } init(client: SocketEngineClient, url: NSURL, options: NSDictionary?)