Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed presence events member_added and member_removed not triggering for iOS #12

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions ios/Classes/ChannelEventListener.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,29 @@ class ChannelEventListener {

func onEvent(event: PusherEvent) -> Void {
let pusherEvent = Event(eventName: event.eventName, channelName: event.channelName, userId: event.userId, data: event.data)

streamEvent(event: pusherEvent, logTag: "ON_EVENT")
}

func onMemberAdded(channelName: String, member: PusherPresenceChannelMember) -> Void {
let eventName = Constants.PresenceEvents.memberAdded.rawValue
let pusherEvent = Event(eventName: eventName, channelName: channelName, userId: member.userId, data: "\(member.userInfo ?? "")")
streamEvent(event: pusherEvent, logTag: "ON_MEMBER_ADDED")
}

func onMemberRemoved(channelName: String, member: PusherPresenceChannelMember) -> Void {
let eventName = Constants.PresenceEvents.memberRemoved.rawValue
let pusherEvent = Event(eventName: eventName, channelName: channelName, userId: member.userId, data: "\(member.userInfo ?? "")")
streamEvent(event: pusherEvent, logTag: "ON_MEMBER_REMOVED")
}

private func streamEvent(event: Event, logTag: String) {
do {
let data = try JSONEncoder().encode(EventStreamResult(pusherEvent: pusherEvent))
let data = try JSONEncoder().encode(EventStreamResult(pusherEvent: event))
StreamHandler.Utils.eventSink!(String(data: data, encoding: .utf8))

PusherService.Utils.debugLog(msg: "[ON_EVENT] Channel: \(event.channelName ?? ""), EventName: \(event.eventName), Data: \(event.data ?? ""), User Id: \(event.userId ?? "")")
PusherService.Utils.debugLog(msg: "[\(logTag)] Channel: \(event.channelName ?? ""), EventName: \(event.eventName), User Id: \(event.userId ?? ""), Data: \(event.data ?? "")")
} catch let err {
StreamHandler.Utils.eventSink!(FlutterError(code: "ON_EVENT_ERROR", message: err.localizedDescription, details: err))
StreamHandler.Utils.eventSink!(FlutterError(code: "\(logTag)_ERROR", message: err.localizedDescription, details: err))
}
}
}
10 changes: 9 additions & 1 deletion ios/Classes/PusherService.swift
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,15 @@ class PusherService: MChannel {
if(!channelName.starts(with: PusherService.PRESENCE_PREFIX)) {
channel = _pusherInstance.subscribe(channelName)
} else {
channel = _pusherInstance.subscribeToPresenceChannel(channelName: channelName)
channel = _pusherInstance.subscribeToPresenceChannel(
channelName: channelName,
onMemberAdded: { (member: PusherPresenceChannelMember) in
ChannelEventListener.default.onMemberAdded(channelName: channelName, member: member)
},
onMemberRemoved: { (member: PusherPresenceChannelMember) in
ChannelEventListener.default.onMemberRemoved(channelName: channelName, member: member)
}
)
for pEvent in Constants.PresenceEvents.allCases {
channel.bind(eventName: pEvent.rawValue, eventCallback: ChannelEventListener.default.onEvent)
}
Expand Down