From 8acd32324e842ccd1540e69ce2401a096d46dbfe Mon Sep 17 00:00:00 2001 From: Erik Date: Thu, 1 Oct 2015 15:25:17 -0400 Subject: [PATCH 1/6] tweak to connect timeout --- SocketIOClientSwift/SocketIOClient.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SocketIOClientSwift/SocketIOClient.swift b/SocketIOClientSwift/SocketIOClient.swift index f787864..86831eb 100644 --- a/SocketIOClientSwift/SocketIOClient.swift +++ b/SocketIOClientSwift/SocketIOClient.swift @@ -171,10 +171,10 @@ public final class SocketIOClient: NSObject, SocketEngineClient { let time = dispatch_time(DISPATCH_TIME_NOW, Int64(timeoutAfter) * Int64(NSEC_PER_SEC)) - dispatch_after(time, dispatch_get_main_queue()) {[weak self] in - if self != nil && self?.status != .Connected { - self?.status = .Closed - self?.engine?.close(fast: true) + dispatch_after(time, handleQueue) {[weak self] in + if let this = self where this.status != .Connected { + this.status = .Closed + this.engine?.close(fast: true) handler?() } From a11533b61f238266709dc3d5d64422a92c0405cf Mon Sep 17 00:00:00 2001 From: NachoSoto Date: Mon, 5 Oct 2015 03:29:31 +0000 Subject: [PATCH 2/6] Enabled Bitcode --- Socket.IO-Client-Swift.xcodeproj/project.pbxproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Socket.IO-Client-Swift.xcodeproj/project.pbxproj b/Socket.IO-Client-Swift.xcodeproj/project.pbxproj index 5872a57..5ef0da1 100644 --- a/Socket.IO-Client-Swift.xcodeproj/project.pbxproj +++ b/Socket.IO-Client-Swift.xcodeproj/project.pbxproj @@ -561,7 +561,9 @@ 572EF2121B51F12F00EEBB58 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + BITCODE_GENERATION_MODE = bitcode; CODE_SIGN_IDENTITY = "Developer ID Application"; + ENABLE_BITCODE = YES; GCC_OPTIMIZATION_LEVEL = 0; PRODUCT_NAME = SocketIO; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -571,7 +573,9 @@ 572EF2131B51F12F00EEBB58 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + BITCODE_GENERATION_MODE = bitcode; CODE_SIGN_IDENTITY = "Developer ID Application"; + ENABLE_BITCODE = YES; PRODUCT_NAME = SocketIO; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; }; From a0c213364d8303174eef99dae7089e54a9503f70 Mon Sep 17 00:00:00 2001 From: Tom Baranes Date: Wed, 7 Oct 2015 08:49:49 +0200 Subject: [PATCH 3/6] Add CocoaSeeds installation --- README.md | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7c6f2ba..69c976e 100644 --- a/README.md +++ b/README.md @@ -95,15 +95,30 @@ $ pod install Import the module: Swift: -```swift +``` +swift import Socket_IO_Client_Swift ``` Objective-C: -```Objective-C + +``` +Objective-C #import ``` +CocoaSeeds +----------------- + +Add this line to your `Seedfile`: + +``` +github "socketio/socket.io-client-swift", "v3.1.4", :files => "SocketIOClientSwift/*.swift" # Or latest version +``` + +Run `seed install`. + + ##API Constructors ----------- From 6d49c37fb858b53f61a0bdaf75b8cb7f95b42f8a Mon Sep 17 00:00:00 2001 From: Tom Baranes Date: Wed, 7 Oct 2015 15:27:40 +0200 Subject: [PATCH 4/6] Fix syntax highlighting --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 69c976e..37055ae 100644 --- a/README.md +++ b/README.md @@ -95,15 +95,13 @@ $ pod install Import the module: Swift: -``` -swift +```swift import Socket_IO_Client_Swift ``` Objective-C: -``` -Objective-C +```Objective-C #import ``` From 7ff1d327dea8f94cfa0565a666c9a2d7c19788cd Mon Sep 17 00:00:00 2001 From: Erik Date: Tue, 13 Oct 2015 12:28:02 -0400 Subject: [PATCH 5/6] Fix socketio/socket.io-client-swift#203 --- SocketIOClientSwift/SocketEngine.swift | 9 +++++---- SocketIOClientSwift/SocketFixUTF8.swift | 1 + SocketIOClientSwift/SocketPacket.swift | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/SocketIOClientSwift/SocketEngine.swift b/SocketIOClientSwift/SocketEngine.swift index ec9ec07..6f946de 100644 --- a/SocketIOClientSwift/SocketEngine.swift +++ b/SocketIOClientSwift/SocketEngine.swift @@ -530,14 +530,15 @@ public final class SocketEngine: NSObject, WebSocketDelegate { private func parseEngineMessage(var message: String, fromPolling: Bool) { Logger.log("Got message: %@", type: logType, args: message) - if fromPolling { - fixDoubleUTF8(&message) - } - let type = PacketType(str: (message["^(\\d)"].groups()?[1]) ?? "") ?? { self.checkIfMessageIsBase64Binary(message) return .Noop }() + + + if fromPolling && type != .Noop { + fixDoubleUTF8(&message) + } switch type { case PacketType.Message: diff --git a/SocketIOClientSwift/SocketFixUTF8.swift b/SocketIOClientSwift/SocketFixUTF8.swift index 0cffd86..e20f5c6 100644 --- a/SocketIOClientSwift/SocketFixUTF8.swift +++ b/SocketIOClientSwift/SocketFixUTF8.swift @@ -26,6 +26,7 @@ import Foundation func fixDoubleUTF8(inout name: String) { + print(name) let utf8 = name.dataUsingEncoding(NSISOLatin1StringEncoding)! let latin1 = NSString(data: utf8, encoding: NSUTF8StringEncoding)! name = latin1 as String diff --git a/SocketIOClientSwift/SocketPacket.swift b/SocketIOClientSwift/SocketPacket.swift index 5608d7d..8f0ff2e 100644 --- a/SocketIOClientSwift/SocketPacket.swift +++ b/SocketIOClientSwift/SocketPacket.swift @@ -116,7 +116,7 @@ struct SocketPacket { message += jsonString! as String + "," } catch { - Logger.error("Error creating JSON object in SocketPacket.completeMessage", type: SocketPacket.logType) + Logger.error("Error creating JSON object in SocketPacket.completeMessage", type: SocketPacket.logType) } } else if var str = arg as? String { str = str["\n"] ~= "\\\\n" From f57786ad5b6fa115af893c5af77edf25fdde8854 Mon Sep 17 00:00:00 2001 From: Erik Date: Tue, 13 Oct 2015 12:28:52 -0400 Subject: [PATCH 6/6] remove debug print --- SocketIOClientSwift/SocketFixUTF8.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/SocketIOClientSwift/SocketFixUTF8.swift b/SocketIOClientSwift/SocketFixUTF8.swift index e20f5c6..0cffd86 100644 --- a/SocketIOClientSwift/SocketFixUTF8.swift +++ b/SocketIOClientSwift/SocketFixUTF8.swift @@ -26,7 +26,6 @@ import Foundation func fixDoubleUTF8(inout name: String) { - print(name) let utf8 = name.dataUsingEncoding(NSISOLatin1StringEncoding)! let latin1 = NSString(data: utf8, encoding: NSUTF8StringEncoding)! name = latin1 as String