Merge pull request #634 from share/receive-presence-middleware

🐛 Prevent caching presence broadcasts rejected by middleware
share · Dec 5, 2023 · 54e891b · 54e891b
2 parents cf33697 + cfcf5c0
commit 54e891b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/lib/agent.js b/lib/agent.js
@@ -788,18 +788,19 @@ Agent.prototype._src = function() {
 Agent.prototype._broadcastPresence = function(presence, callback) {
   var agent = this;
   var backend = this.backend;
-  var requests = this.presenceRequests[presence.ch] || (this.presenceRequests[presence.ch] = Object.create(null));
-  var previousRequest = requests[presence.id];
-  if (!previousRequest || previousRequest.pv < presence.pv) {
-    this.presenceRequests[presence.ch][presence.id] = presence;
-  }
+  var presenceRequests = this.presenceRequests;
   var context = {
     presence: presence,
     collection: presence.c
   };
   var start = Date.now();
   backend.trigger(backend.MIDDLEWARE_ACTIONS.receivePresence, this, context, function(error) {
     if (error) return callback(error);
+    var requests = presenceRequests[presence.ch] || (presenceRequests[presence.ch] = Object.create(null));
+    var previousRequest = requests[presence.id];
+    if (!previousRequest || previousRequest.pv < presence.pv) {
+      presenceRequests[presence.ch][presence.id] = presence;
+    }
     backend.transformPresenceToLatestVersion(agent, presence, function(error, presence) {
       if (error) return callback(error);
       var channel = agent._getPresenceChannel(presence.ch);

diff --git a/test/client/presence/presence.js b/test/client/presence/presence.js
@@ -669,6 +669,7 @@ describe('Presence', function() {
           function(next) {
             presence2.on('receive', function(id, value) {
               expect(value).to.eql({index: 6});
+              expect(connection1.agent.presenceRequests['test-channel']['presence-1'].p).to.eql({index: 6});
               next();
             });
             localPresence1.submit({index: 5}, errorHandler(done));
@@ -691,6 +692,7 @@ describe('Presence', function() {
             });
             localPresence1.submit({index: 5}, function(error) {
               expect(error.message).to.contain('bad!');
+              expect(connection1.agent.presenceRequests['test-channel']).not.to.be.ok;
               next();
             });
           }