RTP2

Source/ARTBaseMessage.h

@@ -17,7 +17,7 @@ ART_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSString *id;
 
 /// The timestamp for this message
-@property (strong, nonatomic) NSDate *timestamp;
+@property (strong, nonatomic, art_nullable) NSDate *timestamp;
 
 /// The id of the publisher of this message
 @property (strong, nonatomic, art_nullable) NSString *clientId;

Source/ARTPresenceMap.m

@@ -38,7 +38,7 @@ - (id)init {
 
 - (void)put:(ARTPresenceMessage *)message {
     ARTPresenceMessage *latest = [self.recentMembers objectForKey:message.clientId];
-    if (!latest || !message.timestamp || latest.timestamp < message.timestamp) {
+    if (!latest || !message.timestamp || [latest.timestamp timeIntervalSince1970] <= [message.timestamp timeIntervalSince1970]) {
         [self.recentMembers setObject:message forKey:message.clientId];
     }
 }

Source/ARTRealtimeChannel.m

@@ -413,10 +413,13 @@ - (void)onPresence:(ARTProtocolMessage *)message {
             presence.id = [NSString stringWithFormat:@"%@:%d", message.id, i];
         }
 
-        [self.presenceMap put:[message.presence objectAtIndex:i]];
-        [self.presenceMap clean];
-        [self broadcastPresence:presence];
-
+        [self.presenceMap onceSyncEnds:^(__GENERIC(NSArray, ARTPresenceMessage *) *msgs) {
+            [self.presenceMap put:presence];
+            [self.presenceMap clean];
+
+            [self broadcastPresence:presence];
+        }];
+
         ++i;
     }
 }

Spec/NSObject+TestSuite.h

@@ -17,6 +17,9 @@ ART_ASSUME_NONNULL_BEGIN
 /// Get each return value generated by the identified instance method.
 - (void)testSuite_getReturnValueFrom:(SEL)selector callback:(void (^)(id))callback;
 
+/// Get argument at index from the identified instance method.
+- (void)testSuite_getArgumentFrom:(SEL)selector atIndex:(NSInteger)index callback:(void (^)(id))callback;
+
 /// Inject a block of code to the identified instance method.
 - (void)testSuite_injectIntoMethod:(SEL)selector code:(void (^)(void))block;
 

Spec/NSObject+TestSuite.m

@@ -19,6 +19,14 @@ - (void)testSuite_getReturnValueFrom:(SEL)selector callback:(void (^)(id))callba
     } error:nil];
 }
 
+- (void)testSuite_getArgumentFrom:(SEL)selector atIndex:(NSInteger)index callback:(void (^)(id))callback {
+    [self aspect_hookSelector:selector withOptions:AspectPositionAfter usingBlock:^(id<AspectInfo> info) {
+        __autoreleasing id arg;
+        [[info originalInvocation] getArgument:&arg atIndex:2+index];
+        callback([arg copy]);
+    } error:nil];
+}
+
 - (void)testSuite_injectIntoMethod:(SEL)selector code:(void (^)(void))block {
     [self aspect_hookSelector:selector withOptions:AspectPositionAfter usingBlock:^(id<AspectInfo> info) {
         block();

Spec/RealtimeClientPresence.swift

@@ -725,6 +725,64 @@ class RealtimeClientPresence: QuickSpec {
 
             }
 
+            // RTP2
+            pending("should be used a PresenceMap to maintain a list of members") {
+                let options = AblyTests.commonAppSetup()
+                var clientSecondary: ARTRealtime!
+                defer { clientSecondary.close() }
+
+                waitUntil(timeout: testTimeout) { done in
+                    clientSecondary = AblyTests.addMembersSequentiallyToChannel("test", members: 100, options: options) {
+                        done()
+                    }.first
+                }
+
+                let client = AblyTests.newRealtime(options)
+                defer { client.close() }
+                let channel = client.channels.get("test")
+
+                var user50LeaveTimestamp: NSDate?
+                channel.presence.subscribe(.Leave) { member in
+                    expect(member.clientId).to(equal("user50"))
+                    user50LeaveTimestamp = member.timestamp
+                }
+
+                var user50PresentTimestamp: NSDate?
+                channel.presenceMap.testSuite_getArgumentFrom("put:", atIndex: 0) { arg0 in
+                    let member = arg0 as! ARTPresenceMessage
+                    if member.clientId == "user50" && member.action == .Present {
+                        user50PresentTimestamp = member.timestamp
+                    }
+                }
+
+                waitUntil(timeout: testTimeout) { done in
+                    channel.attach() { _ in
+                        let transport = client.transport as! TestProxyTransport
+                        transport.beforeProcessingReceivedMessage = { protocolMessage in
+                            // A leave event for a member can arrive before that member is later registered as present as part of the initial SYNC operation.
+                            if protocolMessage.action == .Sync {
+                                let msg = AblyTests.newPresenceProtocolMessage("test", action: .Leave, clientId: "user50")
+                                // Ensure it happens "later" than the PRESENT message.
+                                msg.timestamp = NSDate().dateByAddingTimeInterval(1.0)
+                                client.onChannelMessage(msg)
+                                done()
+                            }
+                        }
+                    }
+                }
+
+                waitUntil(timeout: testTimeout) { done in
+                    channel.presence.get { members, error in
+                        expect(error).to(beNil())
+                        expect(members).to(haveCount(99))
+                        expect(members!.filter{ $0.clientId == "user50" }).to(haveCount(0))
+                        done()
+                    }
+                }
+
+                expect(user50LeaveTimestamp).to(beGreaterThan(user50PresentTimestamp))
+            }
+
             // RTP15e
             let cases: [String:(ARTRealtimePresence, Optional<(ARTErrorInfo?)->Void>)->()] = [
                 "enterClient": { $0.enterClient("john", data: nil, callback: $1) },

Spec/TestUtilities.swift

@@ -136,6 +136,19 @@ class AblyTests {
         return protocolMessage
     }
 
+    class func newPresenceProtocolMessage(channel: String, action: ARTPresenceAction, clientId: String) -> ARTProtocolMessage {
+        let protocolMessage = ARTProtocolMessage()
+        protocolMessage.action = .Presence
+        protocolMessage.channel = channel
+        protocolMessage.timestamp = NSDate()
+        let presenceMessage = ARTPresenceMessage()
+        presenceMessage.action = action
+        presenceMessage.clientId = clientId
+        presenceMessage.timestamp = NSDate()
+        protocolMessage.presence = [presenceMessage]
+        return protocolMessage
+    }
+
     class func newRealtime(options: ARTClientOptions) -> ARTRealtime {
         options.autoConnect = false
         let realtime = ARTRealtime(options: options)
@@ -582,6 +595,29 @@ extension JSON {
 
 }
 
+
+extension NSDate: Comparable { }
+
+public func ==(lhs: NSDate, rhs: NSDate) -> Bool {
+    return (lhs.compare(rhs) == .OrderedSame)
+}
+
+public func <(lhs: NSDate, rhs: NSDate) -> Bool {
+    return (lhs.compare(rhs) == .OrderedAscending)
+}
+
+public func >(lhs: NSDate, rhs: NSDate) -> Bool {
+    return (lhs.compare(rhs) == .OrderedDescending)
+}
+
+public func <=(lhs: NSDate, rhs: NSDate) -> Bool {
+    return (lhs < rhs || lhs == rhs)
+}
+
+public func >=(lhs: NSDate, rhs: NSDate) -> Bool {
+    return (lhs > rhs || lhs == rhs)
+}
+
 extension NSRegularExpression {
 
     class func match(value: String?, pattern: String) -> Bool {