@resolveio/server-lib 20.12.50 → 20.12.51

package/managers/subscription.manager.js

@@ -92,8 +92,8 @@ 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 error_tracking_1 = require("../util/error-tracking");
 var error_reporter_1 = require("../util/error-reporter");
+var error_tracking_1 = require("../util/error-tracking");
 var subscription_dependency_context_1 = require("../util/subscription-dependency-context");
 var numCPUs = (0, os_1.cpus)().length;
 var v8 = require('v8');
@@ -112,6 +112,7 @@ var SubscriptionManager = /** @class */ (function () {
         this._publications = {};
         this._subscriptions = [];
         this._loggedInUsers = [];
+        this._lastRouteBySocket = new Map();
         this._mongoQueue = [];
         this._mongoQueueId = 0;
         this._cacheId = 1;
@@ -129,6 +130,14 @@ var SubscriptionManager = /** @class */ (function () {
         this._debugSendQueueHits = 0;
         this._debugRemoveCacheHits = 0;
         this._oplogRetryCount = 0;
+        this._lastResumeToken = null;
+        this._lastResumeTokenSaveMs = 0;
+        this._resumeTokenSavePromise = null;
+        this._resumeTokenSaveForcePending = false;
+        this._fullResyncPromise = null;
+        this.RESUME_TOKEN_COLLECTION = 'subscription-manager-resume-tokens';
+        this.RESUME_TOKEN_DOC_ID = 'oplog';
+        this.RESUME_TOKEN_SAVE_INTERVAL_MS = 5000;
         // Buffer to store throttled latency updates with timestamps
         this.latencyBuffer = new Map();
         // Interval to flush latency updates in MongoDB
@@ -161,7 +170,7 @@ var SubscriptionManager = /** @class */ (function () {
     };
     SubscriptionManager.prototype.initialize = function (wss, serverConfig, monitorManagerFunction) {
         return __awaiter(this, void 0, void 0, function () {
-            var flag, dependencyFlag;
+            var resumeToken, flag, dependencyFlag;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -201,8 +210,11 @@ var SubscriptionManager = /** @class */ (function () {
                         (0, user_groups_1.loadUserGroupPublications)(this);
                         (0, user_guides_1.loadUserGuidePublications)(this);
                         (0, report_builder_dashboard_builders_1.loadReportBuilderDashboardBuilderPublications)(this);
-                        return [4 /*yield*/, this.tailOpLog()];
+                        return [4 /*yield*/, this.loadResumeToken()];
                     case 1:
+                        resumeToken = _a.sent();
+                        return [4 /*yield*/, this.tailOpLog(resumeToken || undefined)];
+                    case 2:
                         _a.sent();
                         setInterval(function () {
                             _this._oplogRetryCount = 0;
@@ -310,10 +322,10 @@ var SubscriptionManager = /** @class */ (function () {
                             });
                         }); }, 30000);
                         return [4 /*yield*/, flag_collection_1.Flags.findOne({ type: 'Enable Debug' })];
-                    case 2:
+                    case 3:
                         flag = _a.sent();
                         return [4 /*yield*/, flag_collection_1.Flags.findOne({ type: 'Enable Dependency Debug' })];
-                    case 3:
+                    case 4:
                         dependencyFlag = _a.sent();
                         if (flag && flag.value) {
                             this._enableDebug = true;
@@ -523,6 +535,41 @@ var SubscriptionManager = /** @class */ (function () {
             });
         });
     };
+    SubscriptionManager.prototype.getMessageDateMs = function (messageDate) {
+        if (messageDate instanceof Date && !isNaN(messageDate.getTime())) {
+            return messageDate.getTime();
+        }
+        if (typeof messageDate === 'string' || typeof messageDate === 'number') {
+            var parsed = new Date(messageDate);
+            if (!isNaN(parsed.getTime())) {
+                return parsed.getTime();
+            }
+        }
+        return Date.now();
+    };
+    SubscriptionManager.prototype.isStaleRouteMessage = function (ws, messageRoute, messageDate) {
+        var socketId = ws ? ws['id_socket'] : '';
+        if (!socketId) {
+            return false;
+        }
+        if (!messageRoute || messageRoute === 'Bypass') {
+            return false;
+        }
+        var messageDateMs = this.getMessageDateMs(messageDate);
+        var lastRoute = this._lastRouteBySocket.get(socketId);
+        if (lastRoute && messageDateMs < lastRoute.dateMs) {
+            this.dependencyDebug('Skip route cleanup due to stale route message', {
+                socketId: socketId,
+                messageRoute: messageRoute,
+                messageDateMs: messageDateMs,
+                lastRoute: lastRoute.route,
+                lastRouteDateMs: lastRoute.dateMs
+            });
+            return true;
+        }
+        this._lastRouteBySocket.set(socketId, { route: messageRoute, dateMs: messageDateMs });
+        return false;
+    };
     SubscriptionManager.prototype.sendDataToAllWithRetry = function (sub, collection, type) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
@@ -652,7 +699,7 @@ var SubscriptionManager = /** @class */ (function () {
     // Subscribe to publication
     SubscriptionManager.prototype.subscribe = function (messageRoute, messageDate, ws, messageId, publication, subscriptionData) {
         return __awaiter(this, void 0, void 0, function () {
-            var pub, valObj, valKeys, rootKeys, i, urlData, urlModule_1, urlNext, otherRouteSubs, normalizedSubscriptionData, subscriptionKey_1, sub;
+            var pub, valObj, valKeys, rootKeys, i, staleRouteMessage, urlData, urlModule_1, urlNext, otherRouteSubs, normalizedSubscriptionData, subscriptionKey_1, sub;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -699,7 +746,8 @@ var SubscriptionManager = /** @class */ (function () {
                                 }
                             }
                         }
-                        if (messageRoute !== 'Bypass') {
+                        staleRouteMessage = this.isStaleRouteMessage(ws, messageRoute, messageDate);
+                        if (messageRoute !== 'Bypass' && messageRoute !== '/' && !staleRouteMessage) {
                             urlData = messageRoute.split('/');
                             urlModule_1 = '';
                             urlNext = urlData[0];
@@ -833,6 +881,9 @@ var SubscriptionManager = /** @class */ (function () {
                     case 0:
                         this._debugUnSubAllHits += 1;
                         if (!ws) return [3 /*break*/, 2];
+                        if (ws['id_socket']) {
+                            this._lastRouteBySocket.delete(ws['id_socket']);
+                        }
                         // Check if WebSocket has already been unsubscribed
                         if (ws['isUnsubscribed']) {
                             return [2 /*return*/]; // Skip if already unsubscribed
@@ -878,27 +929,274 @@ var SubscriptionManager = /** @class */ (function () {
         var mainDb = config && typeof config['DATABASE'] === 'string' ? config['DATABASE'] : '';
         return mainDb ? [mainDb] : [];
     };
+    SubscriptionManager.prototype.loadResumeToken = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var db, doc, error_2;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 2, , 3]);
+                        db = resolveio_server_app_1.ResolveIOServer.getMainDB();
+                        if (!db) {
+                            return [2 /*return*/, null];
+                        }
+                        return [4 /*yield*/, db.collection(this.RESUME_TOKEN_COLLECTION).findOne({ _id: this.RESUME_TOKEN_DOC_ID })];
+                    case 1:
+                        doc = _a.sent();
+                        return [2 /*return*/, (doc === null || doc === void 0 ? void 0 : doc.token) || null];
+                    case 2:
+                        error_2 = _a.sent();
+                        console.log(new Date(), 'Sub Manager', 'Failed to load oplog resume token', error_2);
+                        return [2 /*return*/, null];
+                    case 3: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    SubscriptionManager.prototype.saveResumeToken = function (token) {
+        return __awaiter(this, void 0, void 0, function () {
+            var db, error_3;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!token) {
+                            return [2 /*return*/];
+                        }
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        db = resolveio_server_app_1.ResolveIOServer.getMainDB();
+                        if (!db) {
+                            return [2 /*return*/];
+                        }
+                        return [4 /*yield*/, db.collection(this.RESUME_TOKEN_COLLECTION).updateOne({ _id: this.RESUME_TOKEN_DOC_ID }, { $set: { token: token, updatedAt: new Date() } }, { upsert: true })];
+                    case 2:
+                        _a.sent();
+                        return [3 /*break*/, 4];
+                    case 3:
+                        error_3 = _a.sent();
+                        console.log(new Date(), 'Sub Manager', 'Failed to persist oplog resume token', error_3);
+                        return [3 /*break*/, 4];
+                    case 4: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    SubscriptionManager.prototype.clearResumeToken = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var db, error_4;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 2, , 3]);
+                        db = resolveio_server_app_1.ResolveIOServer.getMainDB();
+                        if (!db) {
+                            return [2 /*return*/];
+                        }
+                        return [4 /*yield*/, db.collection(this.RESUME_TOKEN_COLLECTION).deleteOne({ _id: this.RESUME_TOKEN_DOC_ID })];
+                    case 1:
+                        _a.sent();
+                        return [3 /*break*/, 3];
+                    case 2:
+                        error_4 = _a.sent();
+                        console.log(new Date(), 'Sub Manager', 'Failed to clear oplog resume token', error_4);
+                        return [3 /*break*/, 3];
+                    case 3: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    SubscriptionManager.prototype.queueResumeTokenSave = function (token, options) {
+        var _this = this;
+        if (!token) {
+            return;
+        }
+        this._lastResumeToken = token;
+        var now = Date.now();
+        var shouldSave = !!(options === null || options === void 0 ? void 0 : options.force) || (now - this._lastResumeTokenSaveMs) >= this.RESUME_TOKEN_SAVE_INTERVAL_MS;
+        if (!shouldSave) {
+            return;
+        }
+        if (this._resumeTokenSavePromise !== null) {
+            if (options === null || options === void 0 ? void 0 : options.force) {
+                this._resumeTokenSaveForcePending = true;
+            }
+            return;
+        }
+        this._lastResumeTokenSaveMs = now;
+        var tokenToSave = this._lastResumeToken;
+        this._resumeTokenSavePromise = (function () { return __awaiter(_this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, , 2, 3]);
+                        return [4 /*yield*/, this.saveResumeToken(tokenToSave)];
+                    case 1:
+                        _a.sent();
+                        return [3 /*break*/, 3];
+                    case 2:
+                        this._resumeTokenSavePromise = null;
+                        if (this._resumeTokenSaveForcePending) {
+                            this._resumeTokenSaveForcePending = false;
+                            this.queueResumeTokenSave(this._lastResumeToken, { force: true });
+                        }
+                        return [7 /*endfinally*/];
+                    case 3: return [2 /*return*/];
+                }
+            });
+        }); })();
+    };
+    SubscriptionManager.prototype.queueFullResync = function (reason) {
+        var _this = this;
+        if (this._fullResyncPromise !== null) {
+            return;
+        }
+        this._fullResyncPromise = (function () { return __awaiter(_this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, , 2, 3]);
+                        return [4 /*yield*/, this.fullResyncSubscriptions(reason)];
+                    case 1:
+                        _a.sent();
+                        return [3 /*break*/, 3];
+                    case 2:
+                        this._fullResyncPromise = null;
+                        return [7 /*endfinally*/];
+                    case 3: return [2 /*return*/];
+                }
+            });
+        }); })();
+    };
+    SubscriptionManager.prototype.fullResyncSubscriptions = function (reason) {
+        return __awaiter(this, void 0, void 0, function () {
+            var subs, subs_1, subs_1_1, sub, pub, _a, _b, client, ws, _c, e_3_1, e_4_1, error_5;
+            var e_4, _d, e_3, _e;
+            var _f, _g, _h, _j, _k;
+            return __generator(this, function (_l) {
+                switch (_l.label) {
+                    case 0:
+                        _l.trys.push([0, 20, , 21]);
+                        if (this._enableDebug) {
+                            console.log(new Date(), 'Sub Manager', 'Full subscription resync', reason, this._subscriptions.length);
+                        }
+                        try {
+                            (_g = (_f = resolveio_server_app_1.ResolveIOServer.getMongoManager()) === null || _f === void 0 ? void 0 : _f.clearQueryCache) === null || _g === void 0 ? void 0 : _g.call(_f, reason);
+                        }
+                        catch (_m) {
+                            // ignore cache-clear errors
+                        }
+                        try {
+                            (_j = (_h = this._nodeCache) === null || _h === void 0 ? void 0 : _h.flushAll) === null || _j === void 0 ? void 0 : _j.call(_h);
+                        }
+                        catch (_o) {
+                            // ignore cache-clear errors
+                        }
+                        subs = this._subscriptions.slice();
+                        _l.label = 1;
+                    case 1:
+                        _l.trys.push([1, 17, 18, 19]);
+                        subs_1 = __values(subs), subs_1_1 = subs_1.next();
+                        _l.label = 2;
+                    case 2:
+                        if (!!subs_1_1.done) return [3 /*break*/, 16];
+                        sub = subs_1_1.value;
+                        if (!((_k = sub === null || sub === void 0 ? void 0 : sub.clients) === null || _k === void 0 ? void 0 : _k.length)) {
+                            return [3 /*break*/, 15];
+                        }
+                        pub = this._publications[sub.publication];
+                        if (!pub) {
+                            return [3 /*break*/, 15];
+                        }
+                        if (sub.running) {
+                            sub.runAgain = true;
+                            return [3 /*break*/, 15];
+                        }
+                        if (!pub.user_specific) return [3 /*break*/, 13];
+                        _l.label = 3;
+                    case 3:
+                        _l.trys.push([3, 10, 11, 12]);
+                        _a = (e_3 = void 0, __values(sub.clients)), _b = _a.next();
+                        _l.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];
+                        _l.label = 5;
+                    case 5:
+                        _l.trys.push([5, 7, , 8]);
+                        return [4 /*yield*/, this.sendDataToOneWithRetry(ws, client.messageId, sub, '', reason)];
+                    case 6:
+                        _l.sent();
+                        return [3 /*break*/, 8];
+                    case 7:
+                        _c = _l.sent();
+                        return [3 /*break*/, 8];
+                    case 8:
+                        _b = _a.next();
+                        return [3 /*break*/, 4];
+                    case 9: return [3 /*break*/, 12];
+                    case 10:
+                        e_3_1 = _l.sent();
+                        e_3 = { error: e_3_1 };
+                        return [3 /*break*/, 12];
+                    case 11:
+                        try {
+                            if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
+                        }
+                        finally { if (e_3) throw e_3.error; }
+                        return [7 /*endfinally*/];
+                    case 12: return [3 /*break*/, 15];
+                    case 13: return [4 /*yield*/, this.sendDataToAllWithRetry(sub, '', reason)];
+                    case 14:
+                        _l.sent();
+                        _l.label = 15;
+                    case 15:
+                        subs_1_1 = subs_1.next();
+                        return [3 /*break*/, 2];
+                    case 16: return [3 /*break*/, 19];
+                    case 17:
+                        e_4_1 = _l.sent();
+                        e_4 = { error: e_4_1 };
+                        return [3 /*break*/, 19];
+                    case 18:
+                        try {
+                            if (subs_1_1 && !subs_1_1.done && (_d = subs_1.return)) _d.call(subs_1);
+                        }
+                        finally { if (e_4) throw e_4.error; }
+                        return [7 /*endfinally*/];
+                    case 19: return [3 /*break*/, 21];
+                    case 20:
+                        error_5 = _l.sent();
+                        console.log(new Date(), 'Sub Manager', 'Full resync failed', reason, error_5);
+                        return [3 /*break*/, 21];
+                    case 21: return [2 /*return*/];
+                }
+            });
+        });
+    };
     // Watch (tail) Mongo's operation log on the entire database (all insert/modify/delete will trigger this function)
     SubscriptionManager.prototype.tailOpLog = function (resumeToken) {
         return __awaiter(this, void 0, void 0, function () {
-            var watchDatabases, pipeline, lastResumeToken_1, _a;
+            var watchDatabases, pipeline, lastResumeToken_1, startedWithResumeToken, error_6;
             var _this = this;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
                         if (!(this._oplog$ && !this._oplog$.closed)) return [3 /*break*/, 2];
                         this._oplog$.removeAllListeners();
                         return [4 /*yield*/, this._oplog$.close()];
                     case 1:
-                        _b.sent();
+                        _a.sent();
                         this._oplog$ = null;
-                        _b.label = 2;
+                        _a.label = 2;
                     case 2: 
                     // eslint-disable-next-line no-restricted-syntax
                     return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, 1000); })];
                     case 3:
                         // eslint-disable-next-line no-restricted-syntax
-                        _b.sent();
+                        _a.sent();
                         if (!(!this._oplog$ || this._oplog$.closed)) return [3 /*break*/, 12];
                         this._oplogRetryCount += 1;
                         if (this._oplogRetryCount > 5) {
@@ -928,32 +1226,39 @@ var SubscriptionManager = /** @class */ (function () {
                                 },
                             },
                         ];
+                        startedWithResumeToken = false;
                         if (!resumeToken) return [3 /*break*/, 10];
                         lastResumeToken_1 = resumeToken;
-                        _b.label = 4;
+                        _a.label = 4;
                     case 4:
-                        _b.trys.push([4, 5, , 9]);
+                        _a.trys.push([4, 5, , 9]);
                         this._oplog$ = resolveio_server_app_1.ResolveIOServer.getMongoConnection().watch(pipeline, { resumeAfter: resumeToken });
+                        startedWithResumeToken = true;
                         return [3 /*break*/, 9];
                     case 5:
-                        _a = _b.sent();
+                        error_6 = _a.sent();
                         if (!this._oplog$) return [3 /*break*/, 7];
                         this._oplog$.removeAllListeners();
                         return [4 /*yield*/, this._oplog$.close()];
                     case 6:
-                        _b.sent();
+                        _a.sent();
                         this._oplog$ = null;
-                        _b.label = 7;
-                    case 7: return [4 /*yield*/, this.tailOpLog(resumeToken)];
+                        _a.label = 7;
+                    case 7: return [4 /*yield*/, this.clearResumeToken()];
                     case 8:
-                        _b.sent();
-                        return [2 /*return*/];
+                        _a.sent();
+                        lastResumeToken_1 = null;
+                        console.log(new Date(), 'oplog resumeAfter failed, starting fresh', error_6);
+                        this._oplog$ = resolveio_server_app_1.ResolveIOServer.getMongoConnection().watch(pipeline);
+                        startedWithResumeToken = false;
+                        this.queueFullResync('oplog-resumeAfter-failed');
+                        return [3 /*break*/, 9];
                     case 9: return [3 /*break*/, 11];
                     case 10:
                         this._oplog$ = resolveio_server_app_1.ResolveIOServer.getMongoConnection().watch(pipeline);
-                        _b.label = 11;
+                        _a.label = 11;
                     case 11:
-                        console.log(new Date(), 'oplog started');
+                        console.log(new Date(), 'oplog started', startedWithResumeToken ? '(resumeAfter)' : '');
                         this._oplog$.on('change', function (doc) { return __awaiter(_this, void 0, void 0, function () {
                             var collection, docId, flag, dependencyFlag;
                             return __generator(this, function (_a) {
@@ -1030,6 +1335,7 @@ var SubscriptionManager = /** @class */ (function () {
                                         _a.label = 13;
                                     case 13:
                                         lastResumeToken_1 = doc._id;
+                                        this.queueResumeTokenSave(lastResumeToken_1);
                                         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 = 14;
@@ -1066,6 +1372,7 @@ var SubscriptionManager = /** @class */ (function () {
                                 switch (_a.label) {
                                     case 0:
                                         console.log(new Date(), 'oplog close');
+                                        this.queueResumeTokenSave(lastResumeToken_1, { force: true });
                                         this._oplog$.removeAllListeners();
                                         this._oplog$ = null;
                                         return [4 /*yield*/, this.tailOpLog(lastResumeToken_1)];
@@ -1075,7 +1382,7 @@ var SubscriptionManager = /** @class */ (function () {
                                 }
                             });
                         }); });
-                        _b.label = 12;
+                        _a.label = 12;
                     case 12: return [2 /*return*/];
                 }
             });
@@ -1227,7 +1534,7 @@ var SubscriptionManager = /** @class */ (function () {
     SubscriptionManager.prototype.sendDataToAll = function (sub, collection, type) {
         return __awaiter(this, void 0, void 0, function () {
             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, normalizedError, correlationId, _f, _g, client, ws, serverRes, errorPayload;
-            var e_3, _h, e_4, _j, e_5, _k;
+            var e_5, _h, e_6, _j, e_7, _k;
             var _this = this;
             var _l;
             return __generator(this, function (_m) {
@@ -1282,12 +1589,12 @@ var SubscriptionManager = /** @class */ (function () {
                                             }
                                         }
                                     }
-                                    catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                                    catch (e_5_1) { e_5 = { error: e_5_1 }; }
                                     finally {
                                         try {
                                             if (_b && !_b.done && (_h = _a.return)) _h.call(_a);
                                         }
-                                        finally { if (e_3) throw e_3.error; }
+                                        finally { if (e_5) throw e_5.error; }
                                     }
                                     this._nodeCache.del(sub.cacheId);
                                     if ((0, common_1.getBinarySize)(JSON.stringify(res_1)) < 1000000 &&
@@ -1340,12 +1647,12 @@ var SubscriptionManager = /** @class */ (function () {
                                     }
                                 }
                             }
-                            catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                            catch (e_6_1) { e_6 = { error: e_6_1 }; }
                             finally {
                                 try {
                                     if (_d && !_d.done && (_j = _c.return)) _j.call(_c);
                                 }
-                                finally { if (e_4) throw e_4.error; }
+                                finally { if (e_6) throw e_6.error; }
                             }
                             if ((0, common_1.getBinarySize)(JSON.stringify(res_1)) < 1000000 &&
                                 !sub.collections.includes('logs') &&
@@ -1399,12 +1706,12 @@ var SubscriptionManager = /** @class */ (function () {
                                 }
                             }
                         }
-                        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                        catch (e_7_1) { e_7 = { error: e_7_1 }; }
                         finally {
                             try {
                                 if (_g && !_g.done && (_k = _f.return)) _k.call(_f);
                             }
-                            finally { if (e_5) throw e_5.error; }
+                            finally { if (e_7) throw e_7.error; }
                         }
                         errorPayload = {
                             publication: sub.publication,
@@ -1527,8 +1834,8 @@ var SubscriptionManager = /** @class */ (function () {
     };
     SubscriptionManager.prototype.documentMatchesFilter = function (collection, documentId, filter) {
         return __awaiter(this, void 0, void 0, function () {
-            var db, filterCopy, idCandidates, idCandidates_1, idCandidates_1_1, idValue, combinedFilter, doc, e_6_1, _a;
-            var e_6, _b;
+            var db, filterCopy, idCandidates, idCandidates_1, idCandidates_1_1, idValue, combinedFilter, doc, e_8_1, _a;
+            var e_8, _b;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -1562,14 +1869,14 @@ var SubscriptionManager = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_6_1 = _c.sent();
-                        e_6 = { error: e_6_1 };
+                        e_8_1 = _c.sent();
+                        e_8 = { error: e_8_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (idCandidates_1_1 && !idCandidates_1_1.done && (_b = idCandidates_1.return)) _b.call(idCandidates_1);
                         }
-                        finally { if (e_6) throw e_6.error; }
+                        finally { if (e_8) throw e_8.error; }
                         return [7 /*endfinally*/];
                     case 8: return [2 /*return*/, false];
                     case 9:
@@ -1582,8 +1889,8 @@ var SubscriptionManager = /** @class */ (function () {
     };
     SubscriptionManager.prototype.shouldInvalidateSubscription = function (sub, collection, type, documentId) {
         return __awaiter(this, void 0, void 0, function () {
-            var normalizedDocumentId, hasDependencyData, trackedIds, filters, filters_1, filters_1_1, filter, e_7_1;
-            var e_7, _a;
+            var normalizedDocumentId, hasDependencyData, trackedIds, filters, filters_1, filters_1_1, filter, e_9_1;
+            var e_9, _a;
             var _b, _c;
             return __generator(this, function (_d) {
                 switch (_d.label) {
@@ -1640,14 +1947,14 @@ var SubscriptionManager = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_7_1 = _d.sent();
-                        e_7 = { error: e_7_1 };
+                        e_9_1 = _d.sent();
+                        e_9 = { error: e_9_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_7) throw e_7.error; }
+                        finally { if (e_9) throw e_9.error; }
                         return [7 /*endfinally*/];
                     case 8:
                         this.dependencyDebug('Skip invalidation after dependency checks', { publication: sub.publication, collection: collection, type: type, documentId: normalizedDocumentId });
@@ -1658,8 +1965,8 @@ var SubscriptionManager = /** @class */ (function () {
     };
     SubscriptionManager.prototype.shouldInvalidateSubscriptionForEvents = function (sub, collection, events) {
         return __awaiter(this, void 0, void 0, function () {
-            var sawInsert, sawDelete, events_1, events_1_1, event_1, e_8_1, paginationMeta, paginationReasons;
-            var e_8, _a;
+            var sawInsert, sawDelete, events_1, events_1_1, event_1, e_10_1, paginationMeta, paginationReasons;
+            var e_10, _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -1690,14 +1997,14 @@ var SubscriptionManager = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_8_1 = _b.sent();
-                        e_8 = { error: e_8_1 };
+                        e_10_1 = _b.sent();
+                        e_10 = { error: e_10_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (events_1_1 && !events_1_1.done && (_a = events_1.return)) _a.call(events_1);
                         }
-                        finally { if (e_8) throw e_8.error; }
+                        finally { if (e_10) throw e_10.error; }
                         return [7 /*endfinally*/];
                     case 8:
                         paginationMeta = this.getPaginationMeta(sub, collection);