@resolveio/server-lib 20.9.3 → 20.9.5

package/managers/subscription.manager.js

@@ -73,6 +73,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SubscriptionManager = void 0;
+var mongodb_1 = require("mongodb");
 var NodeCache = require("node-cache");
 var os_1 = require("os");
 var flag_collection_1 = require("../collections/flag.collection");
@@ -92,6 +93,7 @@ var user_groups_1 = require("../publications/user-groups");
 var user_guides_1 = require("../publications/user-guides");
 var resolveio_server_app_1 = require("../resolveio-server-app");
 var common_1 = require("../util/common");
+var subscription_dependency_context_1 = require("../util/subscription-dependency-context");
 var numCPUs = (0, os_1.cpus)().length;
 var v8 = require('v8');
 // interface CurrentPerformanceMonitor {
@@ -114,6 +116,7 @@ var SubscriptionManager = /** @class */ (function () {
         this._cacheId = 1;
         this._heapSize = v8.getHeapStatistics() / numCPUs;
         this._enableDebug = false;
+        this._enableDependencyDebug = false;
         this._debugOplogCollections = [];
         this._debugOplogHits = 0;
         this._debugSubCollections = [];
@@ -156,7 +159,7 @@ var SubscriptionManager = /** @class */ (function () {
     };
     SubscriptionManager.prototype.initialize = function (wss, serverConfig, monitorManagerFunction) {
         return __awaiter(this, void 0, void 0, function () {
-            var flag;
+            var flag, dependencyFlag;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -307,12 +310,21 @@ var SubscriptionManager = /** @class */ (function () {
                         return [4 /*yield*/, flag_collection_1.Flags.findOne({ type: 'Enable Debug' })];
                     case 2:
                         flag = _a.sent();
+                        return [4 /*yield*/, flag_collection_1.Flags.findOne({ type: 'Enable Dependency Debug' })];
+                    case 3:
+                        dependencyFlag = _a.sent();
                         if (flag && flag.value) {
                             this._enableDebug = true;
                         }
                         else {
                             this._enableDebug = false;
                         }
+                        if (dependencyFlag && dependencyFlag.value) {
+                            this._enableDependencyDebug = true;
+                        }
+                        else {
+                            this._enableDependencyDebug = process.env.ENABLE_DEPENDENCY_DEBUG === 'true';
+                        }
                         this.setCacheLimit();
                         return [2 /*return*/];
                 }
@@ -327,7 +339,7 @@ var SubscriptionManager = /** @class */ (function () {
             this._heapLimit = this._heapSize * 0.3; // Use 50% of total heap size
         }
     };
-    SubscriptionManager.prototype.invalidatePubsCache = function (collection, type) {
+    SubscriptionManager.prototype.invalidatePubsCache = function (collection, type, documentId) {
         return __awaiter(this, void 0, void 0, function () {
             var debounceKey, now, firstInvalidationTime, waitedTooLong;
             var _this = this;
@@ -346,7 +358,7 @@ var SubscriptionManager = /** @class */ (function () {
                         if (!waitedTooLong) return [3 /*break*/, 2];
                         // Immediate execution path
                         this._invalidationPendingTimestamps.delete(debounceKey);
-                        return [4 /*yield*/, this._executeInvalidation(collection, type)];
+                        return [4 /*yield*/, this._executeInvalidation(collection, type, documentId)];
                     case 1:
                         _a.sent();
                         return [3 /*break*/, 3];
@@ -357,7 +369,7 @@ var SubscriptionManager = /** @class */ (function () {
                                 switch (_a.label) {
                                     case 0:
                                         this._invalidationPendingTimestamps.delete(debounceKey);
-                                        return [4 /*yield*/, this._executeInvalidation(collection, type)];
+                                        return [4 /*yield*/, this._executeInvalidation(collection, type, documentId)];
                                     case 1:
                                         _a.sent();
                                         return [2 /*return*/];
@@ -370,9 +382,9 @@ var SubscriptionManager = /** @class */ (function () {
             });
         });
     };
-    SubscriptionManager.prototype._executeInvalidation = function (collection, type) {
+    SubscriptionManager.prototype._executeInvalidation = function (collection, type, documentId) {
         return __awaiter(this, void 0, void 0, function () {
-            var collSubs, collSubs_1, collSubs_1_1, sub, _a, _b, client, ws, _c, e_1_1, e_2_1;
+            var collSubs, normalizedDocumentId, collSubs_1, collSubs_1_1, sub, _a, _b, client, ws, _c, e_1_1, e_2_1;
             var e_2, _d, e_1, _e;
             return __generator(this, function (_f) {
                 switch (_f.label) {
@@ -385,76 +397,86 @@ var SubscriptionManager = /** @class */ (function () {
                         // Original invalidation logic
                         resolveio_server_app_1.ResolveIOServer.getMongoManager().invalidateQueryCache(collection);
                         collSubs = this._subscriptions.filter(function (a) { return a.collections.includes(collection); });
+                        normalizedDocumentId = this.normalizeDocumentId(documentId);
                         _f.label = 1;
                     case 1:
-                        _f.trys.push([1, 17, 18, 19]);
+                        _f.trys.push([1, 18, 19, 20]);
                         collSubs_1 = __values(collSubs), collSubs_1_1 = collSubs_1.next();
                         _f.label = 2;
                     case 2:
-                        if (!!collSubs_1_1.done) return [3 /*break*/, 16];
+                        if (!!collSubs_1_1.done) return [3 /*break*/, 17];
                         sub = collSubs_1_1.value;
                         if (this._enableDebug) {
                             console.log(new Date(), 'Invalidate Sub', sub.publication, sub.running, sub.runAgain);
                         }
+                        return [4 /*yield*/, this.shouldInvalidateSubscription(sub, collection, type, normalizedDocumentId)];
+                    case 3:
+                        if (!(_f.sent())) {
+                            return [3 /*break*/, 16];
+                        }
                         if (sub.running) {
                             sub.runAgain = true;
-                            return [3 /*break*/, 15];
+                            this.dependencyDebug('Subscription busy, scheduling rerun', { publication: sub.publication, collection: collection, type: type });
+                            return [3 /*break*/, 16];
                         }
-                        if (!this._publications[sub.publication].user_specific) return [3 /*break*/, 13];
-                        _f.label = 3;
-                    case 3:
-                        _f.trys.push([3, 10, 11, 12]);
-                        _a = (e_1 = void 0, __values(sub.clients)), _b = _a.next();
+                        if (!this._publications[sub.publication].user_specific) return [3 /*break*/, 14];
+                        this.dependencyDebug('Triggering user-specific invalidation', { publication: sub.publication, collection: collection, type: type, documentId: normalizedDocumentId, clientCount: sub.clients.length });
                         _f.label = 4;
                     case 4:
-                        if (!!_b.done) return [3 /*break*/, 9];
-                        client = _b.value;
-                        ws = this._websocketManager.getWebSocket(client.id_socket);
-                        if (!((ws === null || ws === void 0 ? void 0 : ws.readyState) === ws.OPEN)) return [3 /*break*/, 8];
+                        _f.trys.push([4, 11, 12, 13]);
+                        _a = (e_1 = void 0, __values(sub.clients)), _b = _a.next();
                         _f.label = 5;
                     case 5:
-                        _f.trys.push([5, 7, , 8]);
-                        return [4 /*yield*/, this.sendDataToOneWithRetry(ws, client.messageId, sub, collection, type)];
+                        if (!!_b.done) return [3 /*break*/, 10];
+                        client = _b.value;
+                        ws = this._websocketManager.getWebSocket(client.id_socket);
+                        if (!((ws === null || ws === void 0 ? void 0 : ws.readyState) === ws.OPEN)) return [3 /*break*/, 9];
+                        _f.label = 6;
                     case 6:
-                        _f.sent();
-                        return [3 /*break*/, 8];
+                        _f.trys.push([6, 8, , 9]);
+                        return [4 /*yield*/, this.sendDataToOneWithRetry(ws, client.messageId, sub, collection, type)];
                     case 7:
-                        _c = _f.sent();
-                        return [3 /*break*/, 8];
+                        _f.sent();
+                        return [3 /*break*/, 9];
                     case 8:
+                        _c = _f.sent();
+                        return [3 /*break*/, 9];
+                    case 9:
                         _b = _a.next();
-                        return [3 /*break*/, 4];
-                    case 9: return [3 /*break*/, 12];
-                    case 10:
+                        return [3 /*break*/, 5];
+                    case 10: return [3 /*break*/, 13];
+                    case 11:
                         e_1_1 = _f.sent();
                         e_1 = { error: e_1_1 };
-                        return [3 /*break*/, 12];
-                    case 11:
+                        return [3 /*break*/, 13];
+                    case 12:
                         try {
                             if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
                         }
                         finally { if (e_1) throw e_1.error; }
                         return [7 /*endfinally*/];
-                    case 12: return [3 /*break*/, 15];
-                    case 13: return [4 /*yield*/, this.sendDataToAllWithRetry(sub, collection, type)];
+                    case 13: return [3 /*break*/, 16];
                     case 14:
-                        _f.sent();
-                        _f.label = 15;
+                        this.dependencyDebug('Triggering broadcast invalidation', { publication: sub.publication, collection: collection, type: type, documentId: normalizedDocumentId, clientCount: sub.clients.length });
+                        return [4 /*yield*/, this.sendDataToAllWithRetry(sub, collection, type)];
                     case 15:
+                        _f.sent();
+                        _f.label = 16;
+                    case 16:
                         collSubs_1_1 = collSubs_1.next();
                         return [3 /*break*/, 2];
-                    case 16: return [3 /*break*/, 19];
-                    case 17:
+                    case 17: return [3 /*break*/, 20];
+                    case 18:
                         e_2_1 = _f.sent();
                         e_2 = { error: e_2_1 };
-                        return [3 /*break*/, 19];
-                    case 18:
+                        return [3 /*break*/, 20];
+                    case 19:
                         try {
                             if (collSubs_1_1 && !collSubs_1_1.done && (_d = collSubs_1.return)) _d.call(collSubs_1);
                         }
                         finally { if (e_2) throw e_2.error; }
                         return [7 /*endfinally*/];
-                    case 19: return [2 /*return*/];
+                    case 20: return [2 /*return*/];
                 }
             });
         });
@@ -694,12 +716,16 @@ var SubscriptionManager = /** @class */ (function () {
                                     }],
                                 cacheId: 0,
                                 running: false,
-                                runAgain: false
+                                runAgain: false,
+                                collectionDependencies: new Map(),
+                                collectionFilters: new Map(),
+                                watchAllCollections: new Set()
                             });
                         }
                         if (!sub) {
                             sub = this._subscriptions.find(function (a) { return a.publication === publication && a.subscriptionKey === subscriptionKey_1; });
                         }
+                        this.ensureDependencyContainers(sub);
                         if (this._enableDebug) {
                             console.log(new Date(), 'New Sub', sub.publication, sub.running, sub.runAgain, sub.clients.length);
                         }
@@ -894,11 +920,11 @@ var SubscriptionManager = /** @class */ (function () {
                     case 11:
                         console.log(new Date(), 'oplog started');
                         this._oplog$.on('change', function (doc) { return __awaiter(_this, void 0, void 0, function () {
-                            var collection, flag;
+                            var collection, docId, flag, dependencyFlag;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
                                     case 0:
-                                        if (!doc.ns) return [3 /*break*/, 13];
+                                        if (!doc.ns) return [3 /*break*/, 14];
                                         if (this._enableDebug) {
                                             console.log(new Date(), 'Oplog Hit', doc.ns);
                                         }
@@ -915,17 +941,18 @@ var SubscriptionManager = /** @class */ (function () {
                                         }
                                         if (!collection) return [3 /*break*/, 10];
                                         this._debugOplogHits += 1;
+                                        docId = doc.documentKey && doc.documentKey['_id'] !== undefined ? doc.documentKey['_id'] : (doc['fullDocument'] && doc['fullDocument']['_id'] !== undefined ? doc['fullDocument']['_id'] : null);
                                         if (!(doc.operationType === 'insert')) return [3 /*break*/, 5];
                                         if (!(collection === 'support-tickets')) return [3 /*break*/, 2];
                                         if (!(this.serverConfig['ROOT_URL'] === 'https://resolveio.com')) return [3 /*break*/, 2];
                                         resolveio_server_app_1.ResolveIOServer.getMainServer().getMethodManager().callMethod.call(resolveio_server_app_1.ResolveIOServer.getMainServer().getMethodManager(), 'sendSupportTicketEmail', doc.documentKey['_id']);
-                                        return [4 /*yield*/, this.invalidatePubsCache(collection, 'insert')];
+                                        return [4 /*yield*/, this.invalidatePubsCache(collection, 'insert', docId)];
                                     case 1:
                                         _a.sent();
                                         _a.label = 2;
                                     case 2:
                                         if (!(collection !== 'method-responses')) return [3 /*break*/, 4];
-                                        return [4 /*yield*/, this.invalidatePubsCache(collection, 'insert')];
+                                        return [4 /*yield*/, this.invalidatePubsCache(collection, 'insert', docId)];
                                     case 3:
                                         _a.sent();
                                         _a.label = 4;
@@ -933,7 +960,7 @@ var SubscriptionManager = /** @class */ (function () {
                                     case 5:
                                         if (!(doc.operationType === 'update' || doc.operationType === 'replace')) return [3 /*break*/, 8];
                                         if (!(collection !== 'method-responses')) return [3 /*break*/, 7];
-                                        return [4 /*yield*/, this.invalidatePubsCache(collection, 'update')];
+                                        return [4 /*yield*/, this.invalidatePubsCache(collection, 'update', docId)];
                                     case 6:
                                         _a.sent();
                                         _a.label = 7;
@@ -941,28 +968,37 @@ var SubscriptionManager = /** @class */ (function () {
                                     case 8:
                                         if (!(doc.operationType === 'delete')) return [3 /*break*/, 10];
                                         if (!(collection !== 'method-responses')) return [3 /*break*/, 10];
-                                        return [4 /*yield*/, this.invalidatePubsCache(collection, 'delete')];
+                                        return [4 /*yield*/, this.invalidatePubsCache(collection, 'delete', docId)];
                                     case 9:
                                         _a.sent();
                                         _a.label = 10;
                                     case 10:
-                                        if (!(collection === 'flags')) return [3 /*break*/, 12];
+                                        if (!(collection === 'flags')) return [3 /*break*/, 13];
                                         return [4 /*yield*/, flag_collection_1.Flags.findOne({ type: 'Enable Debug' })];
                                     case 11:
                                         flag = _a.sent();
+                                        return [4 /*yield*/, flag_collection_1.Flags.findOne({ type: 'Enable Dependency Debug' })];
+                                    case 12:
+                                        dependencyFlag = _a.sent();
                                         if (flag && flag.value) {
                                             this._enableDebug = true;
                                         }
                                         else {
                                             this._enableDebug = false;
                                         }
-                                        _a.label = 12;
-                                    case 12:
+                                        if (dependencyFlag && dependencyFlag.value) {
+                                            this._enableDependencyDebug = true;
+                                        }
+                                        else {
+                                            this._enableDependencyDebug = process.env.ENABLE_DEPENDENCY_DEBUG === 'true';
+                                        }
+                                        _a.label = 13;
+                                    case 13:
                                         lastResumeToken_1 = doc._id;
                                         if ((!process.env.NODE_APP_INSTANCE || process.env.NODE_APP_INSTANCE === '0') && (process.env.IS_WORKERS_ENABLED === 'false' || (process.env.IS_WORKER_INSTANCE === 'true' && process.env.WORKER_INDEX === '0'))) {
                                         }
-                                        _a.label = 13;
-                                    case 13: return [2 /*return*/];
+                                        _a.label = 14;
+                                    case 14: return [2 /*return*/];
                                 }
                             });
                         }); });
@@ -1071,19 +1107,25 @@ var SubscriptionManager = /** @class */ (function () {
     };
     SubscriptionManager.prototype.sendDataToOne = function (ws, messageId, sub, collection, type) {
         return __awaiter(this, void 0, void 0, function () {
-            var monitor, res, serverRes, err_1, serverRes;
-            var _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var monitor, dependencySnapshot, res, execution, serverRes, err_1, serverRes;
+            var _this = this;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
                         monitor = this._monitorManagerFunction.startMonitorFunction('User Specific Publication', sub.publication, '', '', sub.subscriptionData);
-                        _b.label = 1;
+                        _a.label = 1;
                     case 1:
-                        _b.trys.push([1, 3, 5, 7]);
+                        _a.trys.push([1, 3, 5, 7]);
                         resolveio_server_app_1.ResolveIOServer.getMainServer().getMethodManager().callMethod.call(resolveio_server_app_1.ResolveIOServer.getMainServer().getMethodManager(), 'insertSubscriptionLog', type, sub.publication, collection, JSON.stringify(sub.subscriptionData));
-                        return [4 /*yield*/, (_a = this._publications[sub.publication].function).call.apply(_a, __spreadArray([Object.assign({}, this, SubscriptionManager.prototype), ws['id_user']], __read(sub.subscriptionData), false))];
+                        return [4 /*yield*/, (0, subscription_dependency_context_1.withDependencyTracking)(function () {
+                                var _a;
+                                return (_a = _this._publications[sub.publication].function).call.apply(_a, __spreadArray([Object.assign({}, _this, SubscriptionManager.prototype), ws['id_user']], __read(sub.subscriptionData), false));
+                            })];
                     case 2:
-                        res = _b.sent();
+                        execution = _a.sent();
+                        res = execution.result;
+                        dependencySnapshot = execution.snapshot;
+                        this.updateSubscriptionDependencies(sub, dependencySnapshot);
                         serverRes = {
                             messageId: messageId,
                             hasError: false,
@@ -1092,7 +1134,7 @@ var SubscriptionManager = /** @class */ (function () {
                         this.sendWS(ws, serverRes);
                         return [3 /*break*/, 7];
                     case 3:
-                        err_1 = _b.sent();
+                        err_1 = _a.sent();
                         serverRes = {
                             messageId: messageId,
                             hasError: true,
@@ -1101,11 +1143,11 @@ var SubscriptionManager = /** @class */ (function () {
                         this.sendWS(ws, serverRes);
                         return [4 /*yield*/, resolveio_server_app_1.ResolveIOServer.getMainServer().getMethodManager().sendEmail('dev@resolveio.com', 'SERVER - Error Detected - ' + this.serverConfig['CLIENT_NAME'], 'Error Detected During Subscription ' + sub.publication + ' - (sendDataToOne - WS)\n\nData \n' + JSON.stringify(sub.subscriptionData, null, 2) + '\n\nErrors\n' + JSON.stringify(err_1, null, 2))];
                     case 4:
-                        _b.sent();
+                        _a.sent();
                         return [3 /*break*/, 7];
                     case 5: return [4 /*yield*/, this._monitorManagerFunction.finishMonitorFunction(monitor)];
                     case 6:
-                        _b.sent();
+                        _a.sent();
                         return [7 /*endfinally*/];
                     case 7: return [2 /*return*/];
                 }
@@ -1115,11 +1157,11 @@ var SubscriptionManager = /** @class */ (function () {
     // Fetch pub once, send to all clients linked to this pub
     SubscriptionManager.prototype.sendDataToAll = function (sub, collection, type) {
         return __awaiter(this, void 0, void 0, function () {
-            var subIndex, monitor, res_1, cacheData, _a, _b, client, ws, serverRes, _c, _d, client, ws, serverRes, nodeCacheSize, deleteCount, subArr, zz, err_2, _e, _f, client, ws, serverRes;
-            var _g, e_3, _h, e_4, _j, e_5, _k;
+            var subIndex, monitor, res_1, dependencySnapshot, execution, cacheData, _a, _b, client, ws, serverRes, _c, _d, client, ws, serverRes, nodeCacheSize, deleteCount, subArr, zz, err_2, _e, _f, client, ws, serverRes;
+            var e_3, _g, e_4, _h, e_5, _j;
             var _this = this;
-            return __generator(this, function (_l) {
-                switch (_l.label) {
+            return __generator(this, function (_k) {
+                switch (_k.label) {
                     case 0:
                         if (!!sub.clients.length) return [3 /*break*/, 1];
                         if (sub.cacheId) {
@@ -1133,15 +1175,22 @@ var SubscriptionManager = /** @class */ (function () {
                         return [2 /*return*/];
                     case 1:
                         monitor = this._monitorManagerFunction.startMonitorFunction('Publication', sub.publication, '', '', sub.subscriptionData);
-                        _l.label = 2;
+                        dependencySnapshot = void 0;
+                        _k.label = 2;
                     case 2:
-                        _l.trys.push([2, 4, 6, 8]);
+                        _k.trys.push([2, 4, 6, 8]);
                         if (sub.publication !== 'superadminAPM' && sub.publication !== 'loggedInUsers') {
                             resolveio_server_app_1.ResolveIOServer.getMainServer().getMethodManager().callMethod.call(resolveio_server_app_1.ResolveIOServer.getMainServer().getMethodManager(), 'insertSubscriptionLog', type, sub.publication, collection, JSON.stringify(sub.subscriptionData));
                         }
-                        return [4 /*yield*/, (_g = this._publications[sub.publication].function).call.apply(_g, __spreadArray([Object.assign({}, this, SubscriptionManager.prototype)], __read(sub.subscriptionData), false))];
+                        return [4 /*yield*/, (0, subscription_dependency_context_1.withDependencyTracking)(function () {
+                                var _a;
+                                return (_a = _this._publications[sub.publication].function).call.apply(_a, __spreadArray([Object.assign({}, _this, SubscriptionManager.prototype)], __read(sub.subscriptionData), false));
+                            })];
                     case 3:
-                        res_1 = _l.sent();
+                        execution = _k.sent();
+                        res_1 = execution.result;
+                        dependencySnapshot = execution.snapshot;
+                        this.updateSubscriptionDependencies(sub, dependencySnapshot);
                         if (sub.cacheId) {
                             try {
                                 cacheData = JSON.parse(this._nodeCache.get(sub.cacheId), common_1.dateReviver);
@@ -1163,7 +1212,7 @@ var SubscriptionManager = /** @class */ (function () {
                                     catch (e_3_1) { e_3 = { error: e_3_1 }; }
                                     finally {
                                         try {
-                                            if (_b && !_b.done && (_h = _a.return)) _h.call(_a);
+                                            if (_b && !_b.done && (_g = _a.return)) _g.call(_a);
                                         }
                                         finally { if (e_3) throw e_3.error; }
                                     }
@@ -1179,7 +1228,7 @@ var SubscriptionManager = /** @class */ (function () {
                                     }
                                 }
                             }
-                            catch (_m) {
+                            catch (_l) {
                                 sub.clients.map(function (client) {
                                     var ws = _this._websocketManager.getWebSocket(client.id_socket);
                                     if (ws && ws.readyState === ws.OPEN) {
@@ -1221,7 +1270,7 @@ var SubscriptionManager = /** @class */ (function () {
                             catch (e_4_1) { e_4 = { error: e_4_1 }; }
                             finally {
                                 try {
-                                    if (_d && !_d.done && (_j = _c.return)) _j.call(_c);
+                                    if (_d && !_d.done && (_h = _c.return)) _h.call(_c);
                                 }
                                 finally { if (e_4) throw e_4.error; }
                             }
@@ -1261,7 +1310,7 @@ var SubscriptionManager = /** @class */ (function () {
                         }
                         return [3 /*break*/, 8];
                     case 4:
-                        err_2 = _l.sent();
+                        err_2 = _k.sent();
                         try {
                             for (_e = __values(sub.clients), _f = _e.next(); !_f.done; _f = _e.next()) {
                                 client = _f.value;
@@ -1279,29 +1328,215 @@ var SubscriptionManager = /** @class */ (function () {
                         catch (e_5_1) { e_5 = { error: e_5_1 }; }
                         finally {
                             try {
-                                if (_f && !_f.done && (_k = _e.return)) _k.call(_e);
+                                if (_f && !_f.done && (_j = _e.return)) _j.call(_e);
                             }
                             finally { if (e_5) throw e_5.error; }
                         }
                         return [4 /*yield*/, resolveio_server_app_1.ResolveIOServer.getMainServer().getMethodManager().sendEmail('dev@resolveio.com', 'SERVER - Error Detected - ' + this.serverConfig['CLIENT_NAME'], 'Error Detected During Subscription ' + sub.publication + ' - (sendPubData)\n\nData \n' + JSON.stringify(sub.subscriptionData, null, 2) + '\n\nErrors\n' + JSON.stringify(err_2, null, 2))];
                     case 5:
-                        _l.sent();
+                        _k.sent();
                         return [3 /*break*/, 8];
                     case 6: return [4 /*yield*/, this._monitorManagerFunction.finishMonitorFunction(monitor)];
                     case 7:
-                        _l.sent();
+                        _k.sent();
                         return [7 /*endfinally*/];
                     case 8: return [2 /*return*/];
                 }
             });
         });
     };
+    SubscriptionManager.prototype.ensureDependencyContainers = function (sub) {
+        if (!sub.collectionDependencies) {
+            sub.collectionDependencies = new Map();
+        }
+        if (!sub.collectionFilters) {
+            sub.collectionFilters = new Map();
+        }
+        if (!sub.watchAllCollections) {
+            sub.watchAllCollections = new Set();
+        }
+    };
+    SubscriptionManager.prototype.updateSubscriptionDependencies = function (sub, snapshot) {
+        this.ensureDependencyContainers(sub);
+        if (!snapshot) {
+            sub.collectionDependencies.clear();
+            sub.collectionFilters.clear();
+            sub.watchAllCollections.clear();
+            this.dependencyDebug('Cleared dependency snapshot', { publication: sub.publication });
+            return;
+        }
+        sub.collectionDependencies = snapshot.dependencies;
+        sub.collectionFilters = snapshot.filters;
+        sub.watchAllCollections = snapshot.watchAllCollections;
+        this.logDependencySnapshot(sub, 'Snapshot updated');
+    };
+    SubscriptionManager.prototype.normalizeDocumentId = function (rawId) {
+        if (rawId === null || rawId === undefined) {
+            return null;
+        }
+        if (typeof rawId === 'string') {
+            return rawId;
+        }
+        if (typeof rawId === 'object' && typeof rawId.toHexString === 'function') {
+            return rawId.toHexString();
+        }
+        if (typeof (rawId === null || rawId === void 0 ? void 0 : rawId.toString) === 'function') {
+            var str = rawId.toString();
+            if (str && str !== '[object Object]') {
+                return str;
+            }
+        }
+        return null;
+    };
+    SubscriptionManager.prototype.convertDocumentIdForQuery = function (documentId) {
+        if (!documentId) {
+            return documentId;
+        }
+        if (/^[a-fA-F0-9]{24}$/.test(documentId)) {
+            try {
+                return new mongodb_1.ObjectId(documentId);
+            }
+            catch (_a) { }
+        }
+        return documentId;
+    };
+    SubscriptionManager.prototype.documentMatchesFilter = function (collection, documentId, filter) {
+        return __awaiter(this, void 0, void 0, function () {
+            var db, filterCopy, idValue, combinedFilter, doc, _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _b.trys.push([0, 2, , 3]);
+                        db = resolveio_server_app_1.ResolveIOServer.getMainDB();
+                        filterCopy = (0, common_1.deepCopy)(filter) || {};
+                        idValue = this.convertDocumentIdForQuery(documentId);
+                        combinedFilter = {
+                            $and: [
+                                { _id: idValue },
+                                filterCopy
+                            ]
+                        };
+                        return [4 /*yield*/, db.collection(collection).findOne(combinedFilter)];
+                    case 1:
+                        doc = _b.sent();
+                        return [2 /*return*/, !!doc];
+                    case 2:
+                        _a = _b.sent();
+                        return [2 /*return*/, true];
+                    case 3: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    SubscriptionManager.prototype.shouldInvalidateSubscription = function (sub, collection, type, documentId) {
+        return __awaiter(this, void 0, void 0, function () {
+            var trackedIds, filters, filters_1, filters_1_1, filter, e_6_1;
+            var e_6, _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        this.ensureDependencyContainers(sub);
+                        if (!documentId) {
+                            this.dependencyDebug('Invalidate due to missing documentId', { publication: sub.publication, collection: collection, type: type });
+                            return [2 /*return*/, true];
+                        }
+                        if (sub.watchAllCollections.has(collection)) {
+                            this.dependencyDebug('Invalidate due to watch-all collection', { publication: sub.publication, collection: collection, type: type });
+                            return [2 /*return*/, true];
+                        }
+                        trackedIds = sub.collectionDependencies.get(collection);
+                        if (trackedIds && trackedIds.has(documentId)) {
+                            this.dependencyDebug('Invalidate due to tracked id', { publication: sub.publication, collection: collection, type: type, documentId: documentId });
+                            return [2 /*return*/, true];
+                        }
+                        if (type === 'delete') {
+                            this.dependencyDebug('Skip invalidation on delete for unknown id', { publication: sub.publication, collection: collection, type: type, documentId: documentId });
+                            return [2 /*return*/, false];
+                        }
+                        filters = sub.collectionFilters.get(collection);
+                        if (!(filters && filters.length)) return [3 /*break*/, 8];
+                        _b.label = 1;
+                    case 1:
+                        _b.trys.push([1, 6, 7, 8]);
+                        filters_1 = __values(filters), filters_1_1 = filters_1.next();
+                        _b.label = 2;
+                    case 2:
+                        if (!!filters_1_1.done) return [3 /*break*/, 5];
+                        filter = filters_1_1.value;
+                        return [4 /*yield*/, this.documentMatchesFilter(collection, documentId, filter)];
+                    case 3:
+                        if (_b.sent()) {
+                            this.dependencyDebug('Invalidate due to filter match', { publication: sub.publication, collection: collection, type: type, documentId: documentId, filter: filter });
+                            return [2 /*return*/, true];
+                        }
+                        _b.label = 4;
+                    case 4:
+                        filters_1_1 = filters_1.next();
+                        return [3 /*break*/, 2];
+                    case 5: return [3 /*break*/, 8];
+                    case 6:
+                        e_6_1 = _b.sent();
+                        e_6 = { error: e_6_1 };
+                        return [3 /*break*/, 8];
+                    case 7:
+                        try {
+                            if (filters_1_1 && !filters_1_1.done && (_a = filters_1.return)) _a.call(filters_1);
+                        }
+                        finally { if (e_6) throw e_6.error; }
+                        return [7 /*endfinally*/];
+                    case 8:
+                        this.dependencyDebug('Skip invalidation after dependency checks', { publication: sub.publication, collection: collection, type: type, documentId: documentId });
+                        return [2 /*return*/, false];
+                }
+            });
+        });
+    };
     SubscriptionManager.prototype.sendWS = function (ws, data) {
         this._websocketManager.send(ws, data);
     };
     SubscriptionManager.prototype.getEnableDebug = function () {
         return this._enableDebug;
     };
+    SubscriptionManager.prototype.dependencyDebug = function (message, details) {
+        if (!this._enableDependencyDebug) {
+            return;
+        }
+        if (details) {
+            console.log(new Date(), '[Dependency Debug]', message, JSON.stringify(details, null, 2));
+        }
+        else {
+            console.log(new Date(), '[Dependency Debug]', message);
+        }
+    };
+    SubscriptionManager.prototype.logDependencySnapshot = function (sub, context) {
+        if (!this._enableDependencyDebug) {
+            return;
+        }
+        var dependencySummary = Array.from(sub.collectionDependencies.entries()).map(function (_a) {
+            var _b = __read(_a, 2), collectionName = _b[0], ids = _b[1];
+            var idList = Array.from(ids || []);
+            return {
+                collection: collectionName,
+                count: idList.length,
+                sample: idList.slice(0, 10)
+            };
+        });
+        var filterSummary = Array.from(sub.collectionFilters.entries()).map(function (_a) {
+            var _b = __read(_a, 2), collectionName = _b[0], filters = _b[1];
+            return ({
+                collection: collectionName,
+                count: filters.length
+            });
+        });
+        var watchAll = Array.from(sub.watchAllCollections || []);
+        this.dependencyDebug('Dependency snapshot updated', {
+            context: context,
+            publication: sub.publication,
+            dependencies: dependencySummary,
+            collectionsWithFilters: filterSummary,
+            watchAll: watchAll
+        });
+    };
     return SubscriptionManager;
 }());
 exports.SubscriptionManager = SubscriptionManager;