@resolveio/server-lib 4.3.3 → 4.3.5

package/collections/log-subscription.collection.js

@@ -30,6 +30,13 @@ var schema = {
     },
     collection_name: {
         type: String
+    },
+    subData: {
+        type: Array
+    },
+    'subData.$': {
+        type: Object,
+        blackbox: true
     }
 };
 var DefaultSchema = new mongoose_1.Schema(schema, {

package/managers/subscription.manager.js

@@ -409,11 +409,13 @@ var SubscriptionManager = /** @class */ (function () {
             else if (collection === 'support-tickets') {
                 _this._mainServer.getMethodManager().callMethodInternal('sendSupportTicketEmail', doc.o._id);
             }
-            _this._oplogQueue.push({
-                type: 'insert',
-                collection: collection,
-                doc: doc.o
-            });
+            if (!collection.endsWith('.versions') && !collection.startsWith('system.')) {
+                _this._oplogQueue.push({
+                    type: 'insert',
+                    collection: collection,
+                    doc: doc.o
+                });
+            }
         });
         oplog.on('update', function (doc) {
             var nsArray = doc.ns.split('.');
@@ -425,11 +427,13 @@ var SubscriptionManager = /** @class */ (function () {
             if (collection === 'cron-jobs') {
                 _this._mainServer.getCronManager().checkCronJobsForUpdates();
             }
-            _this._oplogQueue.push({
-                type: 'update',
-                collection: collection,
-                doc: doc.o
-            });
+            if (!collection.endsWith('.versions') && !collection.startsWith('system.')) {
+                _this._oplogQueue.push({
+                    type: 'update',
+                    collection: collection,
+                    doc: doc.o
+                });
+            }
         });
         oplog.on('delete', function (doc) {
             var nsArray = doc.ns.split('.');
@@ -515,7 +519,7 @@ var SubscriptionManager = /** @class */ (function () {
                         this._oplogQueue = [];
                         uniqueOplog_1 = [];
                         needIds_1 = {};
-                        console.log('----------------OPLOG QUEUE START BEFORE DATA--------------------', new Date(), oplogQueue.length);
+                        // console.log('----------------OPLOG QUEUE START BEFORE DATA--------------------', new Date(), oplogQueue.length);
                         oplogQueue.forEach(function (oplog) {
                             if (!uniqueOplog_1.filter(function (a) { return JSON.stringify(a) === JSON.stringify(oplog); }).length) {
                                 uniqueOplog_1.push(oplog);
@@ -550,7 +554,12 @@ var SubscriptionManager = /** @class */ (function () {
                                     case 1:
                                         docs = _a.sent();
                                         needIds_1[collection].forEach(function (id_doc) {
-                                            uniqueOplog_1.filter(function (a) { return a.doc._id === id_doc; })[0].doc = docs.filter(function (a) { return a._id === id_doc; })[0];
+                                            if (uniqueOplog_1.filter(function (a) { return a.doc && a.doc._id === id_doc; })[0]) {
+                                                uniqueOplog_1.filter(function (a) { return a.doc && a.doc._id === id_doc; })[0].doc = docs.filter(function (a) { return a._id === id_doc; })[0];
+                                            }
+                                            else {
+                                                console.log('PROBLEMAAAAAAAA');
+                                            }
                                         });
                                         return [2 /*return*/];
                                 }
@@ -568,7 +577,7 @@ var SubscriptionManager = /** @class */ (function () {
                         i++;
                         return [3 /*break*/, 1];
                     case 4:
-                        console.log('----------------OPLOG QUEUE END--------------------', new Date(), uniqueOplog_1.length);
+                        // console.log('----------------OPLOG QUEUE END--------------------', new Date(), uniqueOplog.length);
                         uniqueOplog_1.forEach(function (oplog) {
                             // console.log('OPLOG QUEUE END - Oplog', oplog);
                             _this.checkPubsForChanges(oplog.collection, oplog.doc, oplog.type);
@@ -752,7 +761,7 @@ var SubscriptionManager = /** @class */ (function () {
             return __generator(this, function (_c) {
                 that = this;
                 if (subscription.publication !== 'superadminAPM') {
-                    that._mainServer.getMethodManager().callMethodInternal('insertSubscriptionLog', type, subscription.publication, collection);
+                    that._mainServer.getMethodManager().callMethodInternal('insertSubscriptionLog', type, subscription.publication, collection, subscription.subscriptionData);
                 }
                 if (!that._publications[subscription.publication].ws_specific) { // Same pub for all users
                     (_a = that._publications[subscription.publication].function).call.apply(_a, [Object.assign({}, that, SubscriptionManager.prototype)].concat(subscription.subscriptionData)).then(function (res) {
@@ -805,7 +814,7 @@ var SubscriptionManager = /** @class */ (function () {
             return __generator(this, function (_b) {
                 that = this;
                 if (subscription.publication !== 'superadminAPM') {
-                    that._mainServer.getMethodManager().callMethodInternal('insertSubscriptionLog', type, subscription.publication, collection);
+                    that._mainServer.getMethodManager().callMethodInternal('insertSubscriptionLog', type, subscription.publication, collection, subscription.subscriptionData);
                 }
                 (_a = that._publications[subscription.publication].function).call.apply(_a, [Object.assign({}, that, SubscriptionManager.prototype)].concat(subscription.subscriptionData)).then(function (res) {
                     subscription.clients.forEach(function (client) {

package/methods/logs.js

@@ -28,14 +28,15 @@ function loadLogMethods(methodManager) {
         },
         insertSubscriptionLog: {
             skipQueue: true,
-            function: function (type, subscription, collection_name) {
+            function: function (type, subscription, collection_name, subData) {
                 return log_subscription_collection_1.LogSubscriptions.create({
                     _id: mongoose_1.Types.ObjectId().toHexString(),
                     __v: 0,
                     date: new Date(),
                     type: type,
                     subscription: subscription,
-                    collection_name: collection_name
+                    collection_name: collection_name,
+                    subData: subData
                 });
             },
             skipValidation: true

package/models/log-subscription.model.d.ts

@@ -4,5 +4,6 @@ export interface LogSubscriptionModel extends CollectionDocument {
     type: LogSubscriptionType;
     subscription: string;
     collection_name: string;
+    subData: any[];
 }
 export declare type LogSubscriptionType = 'insert' | 'update' | 'delete';

package/package.json

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