@resolveio/server-lib 2.0.4 → 2.0.6

package/managers/subscription.manager.d.ts

@@ -5,6 +5,7 @@ export declare class SubscriptionManager {
     private _publications;
     private _subscriptions;
     private _wss;
+    private _oplogQueue;
     private _sendQueue;
     private _runningQueue;
     private serverConfig;
@@ -16,6 +17,7 @@ export declare class SubscriptionManager {
     unsubscribeAll(ws: WebSocket): Promise<void>;
     private getPublicationCollections;
     private tailOpLog;
+    private runOpLogQueue;
     private tailOpLogSupport;
     private resendPubsForDelete;
     private checkPubsForChanges;

package/managers/subscription.manager.js

@@ -51,11 +51,13 @@ var method_responses_1 = require("../publications/method-responses");
 var support_tickets_1 = require("../publications/support-tickets");
 var index_1 = require("../index");
 var notifications_1 = require("../publications/notifications");
+var common_1 = require("../util/common");
 var SubscriptionManager = /** @class */ (function () {
     function SubscriptionManager(mainServer, wss, serverConfig) {
         var _this = this;
         this._publications = {};
         this._subscriptions = [];
+        this._oplogQueue = [];
         this._sendQueue = [];
         this._runningQueue = false;
         this._mainServer = mainServer;
@@ -74,6 +76,7 @@ var SubscriptionManager = /** @class */ (function () {
         support_tickets_1.loadSupportTicketPublications(this);
         notifications_1.loadNotificationPublications(this);
         this.tailOpLog();
+        this.runOpLogQueue();
         if (index_1.ResolveIOServer.getSupportDB()) {
             this.tailOpLogSupport();
         }
@@ -350,7 +353,6 @@ var SubscriptionManager = /** @class */ (function () {
             if (nsArray[2]) {
                 collection += '.' + nsArray[2];
             }
-            that.checkPubsForChanges(collection, doc.o);
             if (collection === 'cron-jobs') {
                 _this._mainServer.getCronManager().checkCronJobsForUpdates();
             }
@@ -363,6 +365,13 @@ var SubscriptionManager = /** @class */ (function () {
             else if (collection === 'support-tickets') {
                 _this._mainServer.getMethodManager().callMethodInternal('sendSupportTicketEmail', doc.o._id);
             }
+            else {
+                _this._oplogQueue.push({
+                    type: 'insert',
+                    collection: collection,
+                    doc: doc.o
+                });
+            }
         });
         oplog.on('update', function (doc) {
             var nsArray = doc.ns.split('.');
@@ -371,10 +380,16 @@ var SubscriptionManager = /** @class */ (function () {
                 collection += '.' + nsArray[2];
             }
             doc.o['_id'] = doc.o2['_id'];
-            that.checkPubsForChanges(collection, doc.o);
             if (collection === 'cron-jobs') {
                 _this._mainServer.getCronManager().checkCronJobsForUpdates();
             }
+            else {
+                _this._oplogQueue.push({
+                    type: 'update',
+                    collection: collection,
+                    doc: doc.o
+                });
+            }
         });
         oplog.on('delete', function (doc) {
             var nsArray = doc.ns.split('.');
@@ -398,6 +413,34 @@ var SubscriptionManager = /** @class */ (function () {
             console.log('oplog stopped');
         });
     };
+    SubscriptionManager.prototype.runOpLogQueue = function () {
+        var _this = this;
+        setInterval(function () {
+            var oplogQueue = common_1.deepCopy(_this._oplogQueue);
+            var uniqueCollectionOplogQueue = oplogQueue.map(function (a) { return a.collection; }).filter(function (elem, index, self) {
+                return index === self.indexOf(elem);
+            });
+            uniqueCollectionOplogQueue.forEach(function (collection) {
+                var oplogQueueFiltered = oplogQueue.filter(function (a) { return a.collection === collection; });
+                if (oplogQueueFiltered.length === 1) {
+                    _this.checkPubsForChanges(oplogQueueFiltered[0].collection, oplogQueueFiltered[0].doc);
+                    _this._oplogQueue.splice(oplogQueue.map(collection).indexOf(collection), 1);
+                }
+                else {
+                    oplogQueueFiltered.forEach(function (item) {
+                        _this.checkPubsForChanges(item.collection, item.doc, true);
+                    });
+                    _this.checkPubsForChanges(oplogQueueFiltered[oplogQueueFiltered.length - 1].collection, oplogQueueFiltered[oplogQueueFiltered.length - 1].doc);
+                    for (var i = _this._oplogQueue.length - 1; i >= 0; i--) {
+                        var item = _this._oplogQueue[i];
+                        if (item.collection === collection) {
+                            _this._oplogQueue.splice(i, 1);
+                        }
+                    }
+                }
+            });
+        }, 1000);
+    };
     SubscriptionManager.prototype.tailOpLogSupport = function () {
         var that = this;
         var oplog = MongoOplog(that.serverConfig['RESOLVEIO_SUPPORT_OPLOG_URL']);
@@ -466,8 +509,9 @@ var SubscriptionManager = /** @class */ (function () {
     // Document: Inserted/Modified/Deleted Document
     // Collection: Collection Document Lives In
     // Check to see if any pubs need to refetch due to Mongo operation
-    SubscriptionManager.prototype.checkPubsForChanges = function (collection, document) {
+    SubscriptionManager.prototype.checkPubsForChanges = function (collection, document, fetchFunctionOnly) {
         var _this = this;
+        if (fetchFunctionOnly === void 0) { fetchFunctionOnly = false; }
         var that = this;
         that._subscriptions.filter(function (a) { return a.collections.includes(collection); }).forEach(function (sub) { return __awaiter(_this, void 0, void 0, function () {
             var _a, schemaErrors, _b;
@@ -509,7 +553,7 @@ var SubscriptionManager = /** @class */ (function () {
                                         });
                                     }
                                 }
-                                else {
+                                else if (!fetchFunctionOnly) {
                                     that._wss.clients.forEach(function (ws) {
                                         if (ws['id_socket'] === client.id_socket) {
                                             that.sendPubDataOnce(ws, client.messageId, sub);
@@ -524,7 +568,7 @@ var SubscriptionManager = /** @class */ (function () {
                                     that.sendPubData(sub);
                                 }
                             }
-                            else {
+                            else if (!fetchFunctionOnly) {
                                 that.sendPubData(sub);
                             }
                         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@resolveio/server-lib",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "description": "",
   "main": "index.ts",
   "scripts": {