Apply collection level namespace config to dedicated channels

cult-of-coders · Oct 1, 2021 · 8841e5a · 8841e5a
1 parent b2be29d
commit 8841e5a
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 20 deletions.
diff --git a/lib/mongo/Mutator.js b/lib/mongo/Mutator.js
@@ -6,7 +6,8 @@ import {
     dispatchRemove
 } from "./lib/dispatchers";
 import Config from "../config";
-import { Events } from "../constants";
+import { Events, RedisPipe } from "../constants";
+import getDedicatedChannel from '../utils/getDedicatedChannel';
 
 function runCallbackInBackground(fn) {
     Meteor.defer(Meteor.bindEnvironment(fn));
@@ -78,10 +79,12 @@ export default class Mutator {
                 doc = Originals.findOne.call(this, docId);
             }
 
+            const dedicatedChannel = getDedicatedChannel(this._name, doc._id, config);
+
             dispatchInsert(
                 config.optimistic,
                 this._name,
-                config._channels,
+                [dedicatedChannel, ...config._channels],
                 doc
             );
 
@@ -195,10 +198,14 @@ export default class Mutator {
 
             const { fields } = getFields(modifier);
 
+            const dedicatedChannels = docs.map(({ _id }) => {
+                return getDedicatedChannel(this._name, _id, config);
+            });
+
             dispatchUpdate(
                 config.optimistic,
                 this._name,
-                config._channels,
+                [...dedicatedChannels, ...config._channels],
                 docs,
                 fields
             );
@@ -258,10 +265,12 @@ export default class Mutator {
                         doc = this.findOne(doc._id);
                     }
 
+                    const dedicatedChannel = getDedicatedChannel(this._name, doc._id, config);
+
                     dispatchInsert(
                         config.optimistic,
                         this._name,
-                        config._channels,
+                        [dedicatedChannel, ...config._channels],
                         doc
                     );
                 } else {
@@ -283,10 +292,14 @@ export default class Mutator {
 
                         docs = this.find(selector).fetch();
 
+                        const dedicatedChannels = docs.map(({ _id }) => {
+                            return getDedicatedChannel(this._name, _id, config);
+                        });
+
                         dispatchUpdate(
                             config.optimistic,
                             this._name,
-                            config._channels,
+                            [...dedicatedChannels, ...config._channels],
                             docs,
                             fields
                         );
@@ -357,10 +370,14 @@ export default class Mutator {
                 });
             }
 
+            const dedicatedChannels = docs.map(({ _id }) => {
+                return getDedicatedChannel(this._name, _id, config);
+            });
+
             dispatchRemove(
                 config.optimistic,
                 this._name,
-                config._channels,
+                [...dedicatedChannels, ...config._channels],
                 docs
             );
 

diff --git a/lib/mongo/lib/dispatchers.js b/lib/mongo/lib/dispatchers.js
@@ -4,21 +4,13 @@ import { EJSON } from 'meteor/ejson';
 import { Events, RedisPipe } from '../../constants';
 import RedisSubscriptionManager from '../../redis/RedisSubscriptionManager';
 import { getRedisPusher } from '../../redis/getRedisClient';
-import getDedicatedChannel from '../../utils/getDedicatedChannel';
 import Config from '../../config';
 import OptimisticInvocation from '../OptimisticInvocation';
 
 const dispatchEvents = function(optimistic, collectionName, channels, events) {
     if (optimistic) {
         OptimisticInvocation.withValue(true, () => {
             events.forEach(event => {
-                const docId = event[RedisPipe.DOC]._id;
-                const dedicatedChannel = getDedicatedChannel(
-                    collectionName,
-                    docId
-                );
-                RedisSubscriptionManager.process(dedicatedChannel, event);
-
                 channels.forEach(channelName => {
                     RedisSubscriptionManager.process(channelName, event);
                 });
@@ -37,9 +29,6 @@ const dispatchEvents = function(optimistic, collectionName, channels, events) {
             channels.forEach(channelName => {
                 client.publish(channelName, message);
             });
-            const docId = event[RedisPipe.DOC]._id;
-            const dedicatedChannel = getDedicatedChannel(collectionName, docId);
-            client.publish(dedicatedChannel, message);
         });
     });
 };

diff --git a/lib/redis/RedisSubscriber.js b/lib/redis/RedisSubscriber.js
@@ -39,7 +39,7 @@ export default class RedisSubscriber {
                     this.observableCollection.selector
                 );
 
-                return ids.map(id => getDedicatedChannel(collectionName, id));
+                return ids.map(id => getDedicatedChannel(collectionName, id, this.observableCollection.options));
             default:
                 throw new Meteor.Error(
                     `Strategy could not be found: ${this.strategy}`

diff --git a/lib/utils/getDedicatedChannel.js b/lib/utils/getDedicatedChannel.js
@@ -1,7 +1,8 @@
 import { MongoID } from 'meteor/mongo-id';
 import getChannelName from './getChannelName';
 
-export default function getDedicatedChannel(collectionName, docId){
-  const channelName = `${collectionName}::${MongoID.idStringify(docId)}`;
+// TODO do we want to support the multiple `namespaces` config for dedicated channels?
+export default function getDedicatedChannel(collectionName, docId, { namespace }){
+  const channelName = `${namespace ? (namespace + '::') : ''}${collectionName}::${MongoID.idStringify(docId)}`;
   return getChannelName(channelName);
 }