Create a new handler for subscription count event

Author: fbenevides

Sources/Models/PusherChannel.swift

@@ -27,6 +27,8 @@ open class PusherChannel: NSObject {
     open var unsentEvents = [QueuedClientEvent]()
     public let type: PusherChannelType
     public var auth: PusherAuth?
+    
+    private let onSubscriptionCountChanged: ((Int) -> Void)?
 
     // Wrap accesses to the decryption key in a serial queue because it will be accessed from multiple threads
     @nonobjc private var decryptionKeyQueue = DispatchQueue(label: "com.pusher.pusherswift-channel-decryption-key-\(UUID().uuidString)",
@@ -51,17 +53,17 @@ open class PusherChannel: NSObject {
 
         - returns: A new PusherChannel instance
     */
-    public init(name: String, connection: PusherConnection, auth: PusherAuth? = nil) {
+    public init(name: String, connection: PusherConnection, auth: PusherAuth? = nil, onSubscriptionCountChanged: ((Int) -> Void)? = nil) {
         self.name = name
         self.connection = connection
         self.auth = auth
         self.type = PusherChannelType(name: name)
+        self.onSubscriptionCountChanged = onSubscriptionCountChanged
     }
 
-    internal func updateSubscriptionCount(count: Int, event: PusherEvent) {
+    internal func updateSubscriptionCount(count: Int) {
         self._subscriptionCount = count
-        let subscriptionEvent = event.copy(withEventName: Constants.Events.Pusher.subscriptionCount)
-        handleEvent(event: subscriptionEvent)
+        self.onSubscriptionCountChanged?(count)
     }
 
     /**

Sources/Models/PusherChannels.swift

@@ -36,7 +36,8 @@ import Foundation
         connection: PusherConnection,
         auth: PusherAuth? = nil,
         onMemberAdded: ((PusherPresenceChannelMember) -> Void)? = nil,
-        onMemberRemoved: ((PusherPresenceChannelMember) -> Void)? = nil
+        onMemberRemoved: ((PusherPresenceChannelMember) -> Void)? = nil,
+        onSubscriptionCountChanged: ((Int) -> Void)? = nil
     ) -> PusherChannel {
         if let channel = self.channels[name] {
             return channel
@@ -51,7 +52,10 @@ import Foundation
                     onMemberRemoved: onMemberRemoved
                 )
             } else {
-                newChannel = PusherChannel(name: name, connection: connection, auth: auth)
+                newChannel = PusherChannel(name: name,
+                                           connection: connection,
+                                           auth: auth,
+                                           onSubscriptionCountChanged: onSubscriptionCountChanged)
             }
             self.channels[name] = newChannel
             return newChannel

Sources/ObjC/Pusher+ObjectiveC.swift

@@ -8,9 +8,14 @@ import Foundation
     func subscribe(
         channelName: String,
         onMemberAdded: ((PusherPresenceChannelMember) -> Void)? = nil,
-        onMemberRemoved: ((PusherPresenceChannelMember) -> Void)? = nil
+        onMemberRemoved: ((PusherPresenceChannelMember) -> Void)? = nil,
+        onSubscriptionCountChanged: ((Int) -> Void)? = nil
     ) -> PusherChannel {
-        return self.subscribe(channelName, auth: nil, onMemberAdded: onMemberAdded, onMemberRemoved: onMemberRemoved)
+        return self.subscribe(channelName,
+                              auth: nil,
+                              onMemberAdded: onMemberAdded,
+                              onMemberRemoved: onMemberRemoved,
+                              onSubscriptionCountChanged: onSubscriptionCountChanged)
     }
 
     func subscribeToPresenceChannel(channelName: String) -> PusherPresenceChannel {

Sources/PusherSwift.swift

@@ -51,7 +51,8 @@ let CLIENT_NAME = "pusher-websocket-swift"
         _ channelName: String,
         auth: PusherAuth? = nil,
         onMemberAdded: ((PusherPresenceChannelMember) -> Void)? = nil,
-        onMemberRemoved: ((PusherPresenceChannelMember) -> Void)? = nil
+        onMemberRemoved: ((PusherPresenceChannelMember) -> Void)? = nil,
+        onSubscriptionCountChanged: ((Int) -> Void)? = nil
     ) -> PusherChannel {
 
         let isEncryptedChannel = PusherChannel.isEncrypted(name: channelName)
@@ -64,7 +65,8 @@ let CLIENT_NAME = "pusher-websocket-swift"
             channelName: channelName,
             auth: auth,
             onMemberAdded: onMemberAdded,
-            onMemberRemoved: onMemberRemoved
+            onMemberRemoved: onMemberRemoved,
+            onSubscriptionCountChanged: onSubscriptionCountChanged
         )
     }
 

Sources/Services/PusherConnection.swift

@@ -104,14 +104,16 @@ import NWWebSocket
         channelName: String,
         auth: PusherAuth? = nil,
         onMemberAdded: ((PusherPresenceChannelMember) -> Void)? = nil,
-        onMemberRemoved: ((PusherPresenceChannelMember) -> Void)? = nil
+        onMemberRemoved: ((PusherPresenceChannelMember) -> Void)? = nil,
+        onSubscriptionCountChanged: ((Int) -> Void)? = nil
     ) -> PusherChannel {
             let newChannel = channels.add(
                 name: channelName,
                 connection: self,
                 auth: auth,
                 onMemberAdded: onMemberAdded,
-                onMemberRemoved: onMemberRemoved
+                onMemberRemoved: onMemberRemoved,
+                onSubscriptionCountChanged: onSubscriptionCountChanged
             )
 
             guard self.connectionState == .connected else { return newChannel }
@@ -564,7 +566,7 @@ import NWWebSocket
             return
         }
 
-        channel.updateSubscriptionCount(count: count, event: event)
+        channel.updateSubscriptionCount(count: count)
     }
 
     /**