From 3daf3a4921eb99a5481961e66135bbfe7b7a1ac4 Mon Sep 17 00:00:00 2001 From: Benedict Chen Date: Thu, 24 Mar 2022 12:20:00 -0700 Subject: [PATCH 1/7] Make ScClient open --- Sources/ScClient/client.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/ScClient/client.swift b/Sources/ScClient/client.swift index 4a2a1f7..b8a03bb 100644 --- a/Sources/ScClient/client.swift +++ b/Sources/ScClient/client.swift @@ -2,7 +2,7 @@ import Starscream import Foundation -public class ScClient : Listener, WebSocketDelegate { +open class ScClient : Listener, WebSocketDelegate { var authToken : String? var url : String? From d5ce7697ca7dd9ba75bb931bd610a50d940b95e4 Mon Sep 17 00:00:00 2001 From: Benedict Chen Date: Thu, 24 Mar 2022 12:23:08 -0700 Subject: [PATCH 2/7] make things open and listener removable --- Sources/ScClient/Emitter/Listener.swift | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Sources/ScClient/Emitter/Listener.swift b/Sources/ScClient/Emitter/Listener.swift index 622695d..5d14b9d 100644 --- a/Sources/ScClient/Emitter/Listener.swift +++ b/Sources/ScClient/Emitter/Listener.swift @@ -6,10 +6,10 @@ // import Foundation -public class Listener { - var emitAckListener : [Int : (String, (String, AnyObject?, AnyObject? ) -> Void )] - var onListener :[String : (String, AnyObject?) -> Void] - var onAckListener : [String: (String, AnyObject?, (AnyObject?, AnyObject?) -> Void ) -> Void] +open public class Listener { + open var emitAckListener : [Int : (String, (String, AnyObject?, AnyObject? ) -> Void )] + open var onListener :[String : (String, AnyObject?) -> Void] + open var onAckListener : [String: (String, AnyObject?, (AnyObject?, AnyObject?) -> Void ) -> Void] public init() { emitAckListener = [Int : (String, (String, AnyObject?, AnyObject? ) -> Void )]() @@ -34,6 +34,10 @@ public class Listener { self.onListener[eventName] = onListener } + func removeListener(eventName: String) { + self.onListener.removeValue(forKey: eventName) + } + func handleOnListener (eventName : String, data : AnyObject?) { if let on = onListener[eventName] { on(eventName, data) From b5b49dd969731b5b480b6659b883fec8831f2078 Mon Sep 17 00:00:00 2001 From: Benedict Chen Date: Wed, 13 Jul 2022 18:22:48 -0700 Subject: [PATCH 3/7] Make things notcrash. --- ScClient.podspec | 8 ++++---- Sources/ScClient/client.swift | 9 ++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ScClient.podspec b/ScClient.podspec index 705e858..4d6c298 100644 --- a/ScClient.podspec +++ b/ScClient.podspec @@ -15,8 +15,8 @@ Pod::Spec.new do |s| # summary should be tweet-length, and the description more in depth. # - s.name = "ScClient" - s.version = "2.0.1" + s.name = "SocketClusterClient" + s.version = "2.0.2" s.summary = "A socketcluster client for iOS and OSX." s.swift_version = '4.0' @@ -27,7 +27,7 @@ Pod::Spec.new do |s| # * Finally, don't worry about the indent, CocoaPods strips it! s.description = "Native iOS/macOS client written in swift. Provides support to for emitting and listening to remote events, publish-subscribe and authentication using JWT" - s.homepage = "https://github.com/sacOO7/socketcluster-client-swift.git" + s.homepage = "https://github.com/benedictchen/socketcluster-client-swift.git" # s.screenshots = "www.example.com/screenshots_1.gif", "www.example.com/screenshots_2.gif" @@ -84,7 +84,7 @@ Pod::Spec.new do |s| # Supports git, hg, bzr, svn and HTTP. # - s.source = { :git => "https://github.com/sacOO7/socketcluster-client-swift.git", :tag => s.version.to_s } + s.source = { :git => "https://github.com/benedictchen/socketcluster-client-swift.git", :tag => s.version.to_s } # ――― Source Code ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # diff --git a/Sources/ScClient/client.swift b/Sources/ScClient/client.swift index b8a03bb..3a3ebf4 100644 --- a/Sources/ScClient/client.swift +++ b/Sources/ScClient/client.swift @@ -68,13 +68,12 @@ open class ScClient : Listener, WebSocketDelegate { authToken = ClientUtils.getAuthToken(message: messageObject) self.onSetAuthentication?(self, authToken) case .ackReceive: - - handleEmitAck(id: rid!, error: error as AnyObject, data: data as AnyObject) + handleEmitAck(id: rid ?? -1, error: error as AnyObject, data: data as AnyObject) case .event: - if hasEventAck(eventName: eventName!) { - handleOnAckListener(eventName: eventName!, data: data as AnyObject, ack: self.ack(cid: cid!)) + if hasEventAck(eventName: eventName ?? "") { + handleOnAckListener(eventName: eventName ?? "", data: data as AnyObject, ack: self.ack(cid: cid!)) } else { - handleOnListener(eventName: eventName!, data: data as AnyObject) + handleOnListener(eventName: eventName ?? "", data: data as AnyObject) } } From 694d1a38b49e844fe886756e47c8001b0a07e8be Mon Sep 17 00:00:00 2001 From: Benedict Chen Date: Wed, 13 Jul 2022 18:23:37 -0700 Subject: [PATCH 4/7] rename --- ScClient.podspec => SocketClusterClient.podspec | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ScClient.podspec => SocketClusterClient.podspec (100%) diff --git a/ScClient.podspec b/SocketClusterClient.podspec similarity index 100% rename from ScClient.podspec rename to SocketClusterClient.podspec From a72eb8aed071fb1b974883230c03d688ad25c742 Mon Sep 17 00:00:00 2001 From: Benedict Chen Date: Wed, 13 Jul 2022 18:28:47 -0700 Subject: [PATCH 5/7] Fix bug. --- Sources/ScClient/Emitter/Listener.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/ScClient/Emitter/Listener.swift b/Sources/ScClient/Emitter/Listener.swift index 5d14b9d..b979822 100644 --- a/Sources/ScClient/Emitter/Listener.swift +++ b/Sources/ScClient/Emitter/Listener.swift @@ -6,7 +6,7 @@ // import Foundation -open public class Listener { +open class Listener { open var emitAckListener : [Int : (String, (String, AnyObject?, AnyObject? ) -> Void )] open var onListener :[String : (String, AnyObject?) -> Void] open var onAckListener : [String: (String, AnyObject?, (AnyObject?, AnyObject?) -> Void ) -> Void] From 95410b88774e7fcf0d8cfe98c9f62c74b0a21bd7 Mon Sep 17 00:00:00 2001 From: Benedict Chen Date: Wed, 13 Jul 2022 18:29:28 -0700 Subject: [PATCH 6/7] Fix bug. --- SocketClusterClient.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SocketClusterClient.podspec b/SocketClusterClient.podspec index 4d6c298..d885857 100644 --- a/SocketClusterClient.podspec +++ b/SocketClusterClient.podspec @@ -16,7 +16,7 @@ Pod::Spec.new do |s| # s.name = "SocketClusterClient" - s.version = "2.0.2" + s.version = "2.0.3" s.summary = "A socketcluster client for iOS and OSX." s.swift_version = '4.0' From 3a6f6595a9eee22ae010c342063a6af42c6949e5 Mon Sep 17 00:00:00 2001 From: Benedict Chen Date: Wed, 13 Jul 2022 18:44:59 -0700 Subject: [PATCH 7/7] 2.0.4 --- SocketClusterClient.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SocketClusterClient.podspec b/SocketClusterClient.podspec index d885857..e028bd9 100644 --- a/SocketClusterClient.podspec +++ b/SocketClusterClient.podspec @@ -16,7 +16,7 @@ Pod::Spec.new do |s| # s.name = "SocketClusterClient" - s.version = "2.0.3" + s.version = "2.0.4" s.summary = "A socketcluster client for iOS and OSX." s.swift_version = '4.0' @@ -52,7 +52,7 @@ Pod::Spec.new do |s| # profile URL. # - s.author = { "sacOO7" => "sachinshinde7676@gmail.com" } + s.author = "benedictchen" # Or just: s.author = "sacOO7" # s.authors = { "sacOO7" => "sachinshinde7676@gmail.com" } # s.social_media_url = "http://twitter.com/sacOO7"