mongo-realtime 2.0.1 → 2.0.3

package/README.md

@@ -51,17 +51,19 @@ MongoRealtime.init({
   offSocket: (socket, reason) => {
     console.log(`Client disconnected: ${socket.id}, reason: ${reason}`);
   },
+}).then(() => {
+  // It's better to start the server after the db connection is established
+  server.listen(3000, () => {
+    console.log("Server listening on port 3000");
+  });
 });
 
-server.listen(3000, () => {
-  console.log("Server started on port 3000");
-});
 ```
 
 ## Breaking Changes since v2.x.x
 
 In older versions, streams receive all documents and send them to sockets. This can lead to performance issues with large collections.\
-From version 2.x.x, streams now require a limit (default 50 documents) from the client side to avoid overloading the server and network.\
+From version 2.x.x, streams now require a limit (default 100 documents) from the client side to avoid overloading the server and network.\
 Receiving streamed docs now works like this:
 
 ```javascript

package/index.js

@@ -63,7 +63,7 @@ class MongoRealtime {
 
       const expr = err ?? (match ? match[1].trim() : src);
 
-      throw new Error(`MongoRealtime failed to check "${expr}"`);
+      throw new Error(`MongoRealtime expects "${expr}"`);
     }
   }
 
@@ -116,12 +116,15 @@ class MongoRealtime {
    * @param {bool} options.debug -  Enable debug mode
    * @param {number} options.cacheDelay - Cache delay in minutes. Put 0 if no cache
    * @param {number} options.allowDbOperations - If true, you can use find and update operations.
+   * @param {mongoose} options.mongooseInstance - Running mongoose instance
+   *
    *
    */
   static async init({
     dbUri,
     dbOptions,
     server,
+    mongooseInstance,
     onDbConnect,
     onDbError,
     authentify,
@@ -192,42 +195,14 @@ class MongoRealtime {
       changeStream.on("change", async (change) => {
         const coll = change.ns.coll;
         const colName = coll.toLowerCase();
-        const doc = change.fullDocument;
+        const id = change.documentKey?._id.toString();
+        const doc = change.fullDocument ?? { _id: id };
 
         this.#debugLog(`Collection '${colName}' changed`);
 
         change.col = colName;
 
         const type = change.operationType;
-        const id = change.documentKey?._id.toString();
-
-        for (const k in this.#streams) {
-          const stream = this.#streams[k];
-          if (stream.collection != coll) continue;
-
-          Promise.resolve(stream.filter(doc)).then((ok) => {
-            if (ok) {
-              this.io.emit(`realtime:${k}`, {
-                results: [doc],
-                coll: coll,
-                count: 1,
-                total: 1,
-                remaining: 0,
-              });
-            }
-          });
-        }
-        for (let k in this.#data) {
-          if (!k.startsWith(`${coll}-`) || !this.#data[k].result[id]) continue;
-          doc._id = doc._id.toString();
-          switch (change.operationType) {
-            case "delete":
-              delete this.#data[k].result[id];
-              break;
-            default:
-              this.#data[k].result[id] = doc;
-          }
-        }
 
         const e_change = "db:change";
         const e_change_type = `db:${type}`;
@@ -251,12 +226,39 @@ class MongoRealtime {
           this.io.emit(e, change);
           this.notifyListeners(e, change);
         }
+
+        for (const k in this.#streams) {
+          const stream = this.#streams[k];
+          if (stream.collection != coll) continue;
+
+          Promise.resolve(stream.filter(doc)).then((ok) => {
+            if (ok) {
+              const data = { added: [], removed: [] };
+              if (change.operationType == "delete") data.removed.push(doc);
+              else data.added.push(doc);
+
+              this.io.emit(`realtime:${k}`, data);
+            }
+          });
+        }
+        for (let k in this.#data) {
+          if (!k.startsWith(`${coll}-`) || !this.#data[k].result[id]) continue;
+          switch (change.operationType) {
+            case "delete":
+              delete this.#data[k].result[id];
+              break;
+            default:
+              doc._id = id;
+              this.#data[k].result[id] = doc;
+          }
+        }
       });
     });
 
     try {
       await mongoose.connect(dbUri, dbOptions);
       this.#log(`Connected to db '${mongoose.connection.name}'`, 1);
+      if (mongooseInstance) mongooseInstance.connection = mongoose.connection;
       onDbConnect?.call(this, mongoose.connection);
     } catch (error) {
       onDbError?.call(this, error);
@@ -303,8 +305,8 @@ class MongoRealtime {
 
           const stream = this.#streams[streamId];
           const coll = stream.collection;
-
-          const default_limit = 50;
+ 
+          const default_limit = 100;
           limit ??= default_limit;
           try {
             limit = parseInt(limit);
@@ -315,7 +317,7 @@ class MongoRealtime {
           reverse = reverse == true;
           registerId ??= "";
           this.#debugLog(
-            `Socket ${socket.id} registred for realtime '${coll}:${registerId}'. Limit ${limit}. Reversed ${reverse}`
+            `Socket '${socket.id}' registred for realtime '${coll}:${registerId}'. Limit ${limit}. Reversed ${reverse}`
           );
 
           let total;
@@ -390,11 +392,8 @@ class MongoRealtime {
               .map((item) => item.doc);
 
             const data = {
-              results: filtered,
-              coll,
-              count: filtered.length,
-              total,
-              remaining: total - ids.length,
+              added: filtered,
+              removed: [],
             };
 
             socket.emit(`realtime:${streamId}:${registerId}`, data);
@@ -457,12 +456,14 @@ class MongoRealtime {
             { coll, query, limit, sortBy, project, one, skip, id, update },
             ack
           ) => {
-
             if (!coll || !notEmpty(update)) return ack(0);
             const c = this.connection.db.collection(coll);
 
-            if (id) {  
-              ack((await c.updateOne({ _id: toObjectId(id) }, update)).modifiedCount);
+            if (id) {
+              ack(
+                (await c.updateOne({ _id: toObjectId(id) }, update))
+                  .modifiedCount
+              );
               return;
             }
 
@@ -481,11 +482,11 @@ class MongoRealtime {
             };
 
             if (one) {
-              ack((await c.updateOne(query,update, options)).modifiedCount);
+              ack((await c.updateOne(query, update, options)).modifiedCount);
               return;
             }
 
-            let cursor = await c.updateMany(query,update, options);
+            let cursor = await c.updateMany(query, update, options);
             ack(cursor.modifiedCount);
           }
         );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mongo-realtime",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "main": "index.js",
   "scripts": {},
   "keywords": [