fix: issue with collection hooks

.github/workflows/test.yml

@@ -7,11 +7,11 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        meteor: [1.12.2, 2.6.1, 2.7.3, 2.8.1, 2.12]
+        meteor: [1.12.2, 2.8.1, 2.12, 2.15]
         redis-version: [4, 5, 6, 7]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Start Redis
         uses: supercharge/[email protected]
@@ -26,7 +26,7 @@ jobs:
         run: |
           meteor create --release ${{ matrix.meteor }} --bare test
           cd test
-          meteor npm i --save [email protected] simpl-schema chai
+          meteor npm i --save [email protected] simpl-schema@1.13.1 chai
       - name: Test
         working-directory: ./test
         run: METEOR_PACKAGE_DIRS="../" TEST_BROWSER_DRIVER=puppeteer meteor test-packages --raw-logs --once --driver-package meteortesting:mocha ../

docs/finetuning.md

@@ -278,4 +278,4 @@ SyntheticMutator.update(`company::{companyId}::threads`, threadId, {});
 SyntheticMutator.update([`company::{companyId}::threads`, `threads::${threadId}`], threadId, {});
 
 // If you pass-in the collection instance as argument, this will be automatically done.
-```
+```

lib/cache/ObservableCollection.js

@@ -69,7 +69,7 @@ export default class ObservableCollection {
             );
         }
 
-        this.cursor = this.collection.find(
+        this.cursor = this.collection._redisOplogCollectionMethods.find(
             cursorDescription.selector,
             cursorDescription.options
         );
@@ -155,7 +155,7 @@ export default class ObservableCollection {
      */
     isEligibleByDB(_id) {
         if (this.matcher) {
-            return !!this.collection.findOne(
+            return !!this.collection._redisOplogCollectionMethods.findOne(
                 Object.assign({}, this.selector, { _id }),
                 { fields: { _id: 1 } }
             );
@@ -214,7 +214,7 @@ export default class ObservableCollection {
      */
     addById(docId) {
         const { limit, skip, ...cleanedOptions } = this.options;
-        const doc = this.collection.findOne({ _id: docId }, cleanedOptions);
+        const doc = this.collection._redisOplogCollectionMethods.findOne({ _id: docId }, cleanedOptions);
 
         this.store.set(docId, doc);
 

lib/mongo/mongoCollectionNames.js

@@ -4,13 +4,22 @@ const constructor = Mongo.Collection;
 const proto = Mongo.Collection.prototype;
 
 const hook = function() {
-    let ret = constructor.apply(this, arguments);
+    const ret = constructor.apply(this, arguments);
     map[arguments[0]] = this;
     return ret;
 };
 
 hook.__getCollectionByName = function (name) {
-    return map[name];
+    if (!(name in map)) {
+        return null;
+    }
+
+    const collection = map[name];
+
+    // Use 'direct', if available, to skip all collection hooks
+    collection._redisOplogCollectionMethods = collection.direct ?? collection;
+
+    return collection;
 };
 
 hook.prototype = proto;

lib/processors/actions/requery.js

@@ -4,40 +4,35 @@ import { MongoIDMap } from '../../cache/mongoIdMap';
 
 /**
  * @param observableCollection
- * @param newCommer
+ * @param newcomer
  * @param event
  * @param modifiedFields
  */
-export default function (observableCollection, newCommer, event, modifiedFields) {
+export default function (observableCollection, newcomer, event, modifiedFields) {
     const { store, selector, options } = observableCollection;
 
     const newStore = new MongoIDMap();
-    const freshIds = observableCollection.collection.find(
-        selector, { ...options, fields: { _id: 1 } }).fetch();
-    freshIds.forEach(doc => newStore.set(doc._id, doc));
+    const freshIds = observableCollection.collection._redisOplogCollectionMethods.find(selector, { ...options, fields: { _id: 1 } }).fetch();
+    freshIds.forEach((doc) => newStore.set(doc._id, doc));
 
     let added = false;
     store.compareWith(newStore, {
         leftOnly(docId) {
             observableCollection.remove(docId);
         },
         rightOnly(docId) {
-            if (newCommer && EJSON.equals(docId, newCommer._id)) {
+            if (newcomer && EJSON.equals(docId, newcomer._id)) {
                 added = true;
-                observableCollection.add(newCommer);
+                observableCollection.add(newcomer);
             } else {
                 observableCollection.addById(docId);
             }
-        }
+        },
     });
 
-    // if we have an update, and we have a newcommer, that new commer may be inside the ids
+    // if we have an update, and we have a newcomer, that newcomer may be inside the ids
     // TODO: maybe refactor this in a separate action (?)
-    if (newCommer
-        && Events.UPDATE === event
-        && modifiedFields
-        && !added
-        && store.has(newCommer._id)) {
-        observableCollection.change(newCommer, modifiedFields);
+    if (newcomer && Events.UPDATE === event && modifiedFields && !added && store.has(newcomer._id)) {
+        observableCollection.change(newcomer, modifiedFields);
     }
 }

lib/redis/RedisSubscriptionManager.js

@@ -164,6 +164,9 @@ class RedisSubscriptionManager {
                     debug(
                         `[RedisSubscriptionManager] Exception while processing event: ${e.toString()}`
                     );
+                    Meteor._debug(
+                        `[RedisSubscriptionManager] Exception while processing event: ${e.toString()}`, e
+                    );
                 }
             });
         } else {
@@ -179,6 +182,9 @@ class RedisSubscriptionManager {
                     debug(
                         `[RedisSubscriptionManager] Exception while processing synthetic event: ${e.toString()}`
                     );
+                    Meteor._debug(
+                        `[RedisSubscriptionManager] Exception while processing synthetic event: ${e.toString()}`, e
+                    );
                 }
             });
         }
@@ -203,9 +209,9 @@ class RedisSubscriptionManager {
         const fieldsOfInterest = getFieldsOfInterestFromAll(subscribers);
 
         if (fieldsOfInterest === true) {
-            doc = collection.findOne(doc._id);
+            doc = collection._redisOplogCollectionMethods.findOne(doc._id);
         } else {
-            doc = collection.findOne(doc._id, { fields: fieldsOfInterest });
+            doc = collection._redisOplogCollectionMethods.findOne(doc._id, { fields: fieldsOfInterest });
         }
 
         return doc;

package.js

@@ -1,6 +1,6 @@
 Package.describe({
     name: 'cultofcoders:redis-oplog',
-    version: '2.2.1',
+    version: '2.2.2',
     // Brief, one-line summary of the package.
     summary: "Replacement for Meteor's MongoDB oplog implementation",
     // URL to the Git repository containing the source code for this package.
@@ -17,7 +17,7 @@ Npm.depends({
 });
 
 Package.onUse(function(api) {
-    api.versionsFrom(['1.12.2', '2.8.1', '2.12']);
+    api.versionsFrom(['1.12.2', '2.8.1', '2.13', '2.15']);
     api.use([
         'underscore',
         'ecmascript',

testing/collection_hooks.server.js

@@ -1,6 +1,5 @@
 import { assert } from 'chai';
 import { _ } from 'meteor/underscore';
-import { Random } from 'meteor/random';
 
 describe('It should work with collection:hooks', function () {
 
@@ -53,5 +52,26 @@ describe('It should work with collection:hooks', function () {
                 assert.isTrue(value, key);
             })
         })
+
+        it('Should use direct methods when available: ' + JSON.stringify(options), function () {
+            let withDirect = false;
+
+            const id = Collection.insert({ someData: true });
+
+            Collection.before.find(function () {
+                withDirect = true;
+            });
+
+            const handle = Collection.find({
+                someData: true,
+            }).observeChanges({
+                added: function() {}
+            });
+
+            assert.isTrue(withDirect, 'Used direct');
+
+            handle.stop();
+            Collection.remove(id);
+        })
     })
 });