@resolveio/server-lib 20.14.7 → 20.14.9

package/managers/subscription.manager.d.ts

@@ -44,6 +44,8 @@ export declare class SubscriptionManager {
     private readonly RESUME_TOKEN_COLLECTION;
     private readonly RESUME_TOKEN_SAVE_INTERVAL_MS;
     private latencyBuffer;
+    private _latencyFlushInProgress;
+    private _latencyFlushPending;
     private readonly LATENCY_UPDATE_INTERVAL;
     private readonly LATENCY_UPDATE_THRESHOLD_MS;
     private _invalidationDebounceTimers;

package/managers/subscription.manager.js

@@ -153,6 +153,8 @@ var SubscriptionManager = /** @class */ (function () {
         this.RESUME_TOKEN_SAVE_INTERVAL_MS = 5000;
         // Buffer to store throttled latency updates with timestamps
         this.latencyBuffer = new Map();
+        this._latencyFlushInProgress = false;
+        this._latencyFlushPending = false;
         // Interval to flush latency updates in MongoDB
         this.LATENCY_UPDATE_INTERVAL = 60000;
         // Minimum time difference between two latency updates for the same user
@@ -684,13 +686,22 @@ var SubscriptionManager = /** @class */ (function () {
     // Method to flush buffered latency updates in bulk
     SubscriptionManager.prototype.flushThrottledLatencyUpdates = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var updates, error_1;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var pendingEntries, updates, error_1, pendingEntries_1, pendingEntries_1_1, _a, id_ws, payload, current;
+            var e_3, _b;
+            var _this = this;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         if (this.latencyBuffer.size === 0)
                             return [2 /*return*/]; // No updates to flush
-                        updates = Array.from(this.latencyBuffer.entries()).map(function (_a) {
+                        if (this._latencyFlushInProgress) {
+                            this._latencyFlushPending = true;
+                            return [2 /*return*/];
+                        }
+                        this._latencyFlushInProgress = true;
+                        pendingEntries = Array.from(this.latencyBuffer.entries());
+                        this.latencyBuffer.clear();
+                        updates = pendingEntries.map(function (_a) {
                             var _b = __read(_a, 2), id_ws = _b[0], _c = _b[1], latency = _c.latency, lastUpdate = _c.lastUpdate;
                             return ({
                                 updateOne: {
@@ -699,22 +710,44 @@ var SubscriptionManager = /** @class */ (function () {
                                 }
                             });
                         });
-                        _a.label = 1;
+                        _c.label = 1;
                     case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, logged_in_users_collection_1.LoggedInUsers.bulkWrite(updates)];
+                        _c.trys.push([1, 3, 4, 5]);
+                        return [4 /*yield*/, logged_in_users_collection_1.LoggedInUsers.bulkWrite(updates, { ordered: false })];
                     case 2:
-                        _a.sent();
-                        this.latencyBuffer.clear(); // Clear buffer after successful update
+                        _c.sent();
                         if (this.getEnableDebug()) {
                             console.log(new Date(), 'Sub Manager', 'Throttled latency batch update successful', updates.length);
                         }
-                        return [3 /*break*/, 4];
+                        return [3 /*break*/, 5];
                     case 3:
-                        error_1 = _a.sent();
+                        error_1 = _c.sent();
+                        try {
+                            for (pendingEntries_1 = __values(pendingEntries), pendingEntries_1_1 = pendingEntries_1.next(); !pendingEntries_1_1.done; pendingEntries_1_1 = pendingEntries_1.next()) {
+                                _a = __read(pendingEntries_1_1.value, 2), id_ws = _a[0], payload = _a[1];
+                                current = this.latencyBuffer.get(id_ws);
+                                if (!current || current.lastUpdate < payload.lastUpdate) {
+                                    this.latencyBuffer.set(id_ws, payload);
+                                }
+                            }
+                        }
+                        catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                        finally {
+                            try {
+                                if (pendingEntries_1_1 && !pendingEntries_1_1.done && (_b = pendingEntries_1.return)) _b.call(pendingEntries_1);
+                            }
+                            finally { if (e_3) throw e_3.error; }
+                        }
                         console.error(new Date(), 'Sub Manager', 'Throttled latency batch update failed', error_1);
-                        return [3 /*break*/, 4];
-                    case 4: return [2 /*return*/];
+                        return [3 /*break*/, 5];
+                    case 4:
+                        this._latencyFlushInProgress = false;
+                        if (this._latencyFlushPending) {
+                            this._latencyFlushPending = false;
+                            setImmediate(function () { return _this.flushThrottledLatencyUpdates(); });
+                        }
+                        return [7 /*endfinally*/];
+                    case 5: return [2 /*return*/];
                 }
             });
         });
@@ -1222,8 +1255,8 @@ var SubscriptionManager = /** @class */ (function () {
     };
     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 subs, subs_1, subs_1_1, sub, pub, _a, _b, client, ws, _c, e_4_1, e_5_1, error_5;
+            var e_5, _d, e_4, _e;
             var _f, _g, _h, _j, _k;
             return __generator(this, function (_l) {
                 switch (_l.label) {
@@ -1268,7 +1301,7 @@ var SubscriptionManager = /** @class */ (function () {
                         _l.label = 3;
                     case 3:
                         _l.trys.push([3, 10, 11, 12]);
-                        _a = (e_3 = void 0, __values(sub.clients)), _b = _a.next();
+                        _a = (e_4 = void 0, __values(sub.clients)), _b = _a.next();
                         _l.label = 4;
                     case 4:
                         if (!!_b.done) return [3 /*break*/, 9];
@@ -1290,14 +1323,14 @@ var SubscriptionManager = /** @class */ (function () {
                         return [3 /*break*/, 4];
                     case 9: return [3 /*break*/, 12];
                     case 10:
-                        e_3_1 = _l.sent();
-                        e_3 = { error: e_3_1 };
+                        e_4_1 = _l.sent();
+                        e_4 = { error: e_4_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; }
+                        finally { if (e_4) throw e_4.error; }
                         return [7 /*endfinally*/];
                     case 12: return [3 /*break*/, 15];
                     case 13: return [4 /*yield*/, this.sendDataToAllWithRetry(sub, '', reason)];
@@ -1309,14 +1342,14 @@ var SubscriptionManager = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 16: return [3 /*break*/, 19];
                     case 17:
-                        e_4_1 = _l.sent();
-                        e_4 = { error: e_4_1 };
+                        e_5_1 = _l.sent();
+                        e_5 = { error: e_5_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; }
+                        finally { if (e_5) throw e_5.error; }
                         return [7 /*endfinally*/];
                     case 19: return [3 /*break*/, 21];
                     case 20:
@@ -1724,7 +1757,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_5, _h, e_6, _j, e_7, _k;
+            var e_6, _h, e_7, _j, e_8, _k;
             var _this = this;
             var _l;
             return __generator(this, function (_m) {
@@ -1779,12 +1812,12 @@ var SubscriptionManager = /** @class */ (function () {
                                             }
                                         }
                                     }
-                                    catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                                    catch (e_6_1) { e_6 = { error: e_6_1 }; }
                                     finally {
                                         try {
                                             if (_b && !_b.done && (_h = _a.return)) _h.call(_a);
                                         }
-                                        finally { if (e_5) throw e_5.error; }
+                                        finally { if (e_6) throw e_6.error; }
                                     }
                                     this._nodeCache.del(sub.cacheId);
                                     if ((0, common_1.getBinarySize)(JSON.stringify(res_1)) < 1000000 &&
@@ -1837,12 +1870,12 @@ var SubscriptionManager = /** @class */ (function () {
                                     }
                                 }
                             }
-                            catch (e_6_1) { e_6 = { error: e_6_1 }; }
+                            catch (e_7_1) { e_7 = { error: e_7_1 }; }
                             finally {
                                 try {
                                     if (_d && !_d.done && (_j = _c.return)) _j.call(_c);
                                 }
-                                finally { if (e_6) throw e_6.error; }
+                                finally { if (e_7) throw e_7.error; }
                             }
                             if ((0, common_1.getBinarySize)(JSON.stringify(res_1)) < 1000000 &&
                                 !sub.collections.includes('logs') &&
@@ -1896,12 +1929,12 @@ var SubscriptionManager = /** @class */ (function () {
                                 }
                             }
                         }
-                        catch (e_7_1) { e_7 = { error: e_7_1 }; }
+                        catch (e_8_1) { e_8 = { error: e_8_1 }; }
                         finally {
                             try {
                                 if (_g && !_g.done && (_k = _f.return)) _k.call(_f);
                             }
-                            finally { if (e_7) throw e_7.error; }
+                            finally { if (e_8) throw e_8.error; }
                         }
                         errorPayload = {
                             publication: sub.publication,
@@ -2062,7 +2095,7 @@ var SubscriptionManager = /** @class */ (function () {
             '$bitsAnyClear'
         ]);
         var walk = function (value) {
-            var e_8, _a;
+            var e_9, _a;
             if (Array.isArray(value)) {
                 return value.every(function (item) { return walk(item); });
             }
@@ -2085,19 +2118,19 @@ var SubscriptionManager = /** @class */ (function () {
                     }
                 }
             }
-            catch (e_8_1) { e_8 = { error: e_8_1 }; }
+            catch (e_9_1) { e_9 = { error: e_9_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_8) throw e_8.error; }
+                finally { if (e_9) throw e_9.error; }
             }
             return true;
         };
         return walk(filter);
     };
     SubscriptionManager.prototype.documentIdMatchesEvent = function (documentId, document) {
-        var e_9, _a;
+        var e_10, _a;
         var _this = this;
         if (!document || documentId === undefined || documentId === null) {
             return true;
@@ -2120,12 +2153,12 @@ var SubscriptionManager = /** @class */ (function () {
                 }
             }
         }
-        catch (e_9_1) { e_9 = { error: e_9_1 }; }
+        catch (e_10_1) { e_10 = { error: e_10_1 }; }
         finally {
             try {
                 if (eventCandidates_1_1 && !eventCandidates_1_1.done && (_a = eventCandidates_1.return)) _a.call(eventCandidates_1);
             }
-            finally { if (e_9) throw e_9.error; }
+            finally { if (e_10) throw e_10.error; }
         }
         return false;
     };
@@ -2149,8 +2182,8 @@ var SubscriptionManager = /** @class */ (function () {
     };
     SubscriptionManager.prototype.documentMatchesFilter = function (collection, documentId, filter, document) {
         return __awaiter(this, void 0, void 0, function () {
-            var inMemoryMatch, db, filterCopy, idCandidates, idCandidates_1, idCandidates_1_1, idValue, combinedFilter, doc, e_10_1, _a;
-            var e_10, _b;
+            var inMemoryMatch, db, filterCopy, idCandidates, idCandidates_1, idCandidates_1_1, idValue, combinedFilter, doc, e_11_1, _a;
+            var e_11, _b;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -2188,14 +2221,14 @@ var SubscriptionManager = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_10_1 = _c.sent();
-                        e_10 = { error: e_10_1 };
+                        e_11_1 = _c.sent();
+                        e_11 = { error: e_11_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_10) throw e_10.error; }
+                        finally { if (e_11) throw e_11.error; }
                         return [7 /*endfinally*/];
                     case 8: return [2 /*return*/, false];
                     case 9:
@@ -2208,8 +2241,8 @@ var SubscriptionManager = /** @class */ (function () {
     };
     SubscriptionManager.prototype.shouldInvalidateSubscription = function (sub, collection, type, documentId, document) {
         return __awaiter(this, void 0, void 0, function () {
-            var normalizedDocumentId, hasDependencyData, trackedIds, filters, filters_1, filters_1_1, filter, e_11_1;
-            var e_11, _a;
+            var normalizedDocumentId, hasDependencyData, trackedIds, filters, filters_1, filters_1_1, filter, e_12_1;
+            var e_12, _a;
             var _b, _c;
             return __generator(this, function (_d) {
                 switch (_d.label) {
@@ -2266,14 +2299,14 @@ var SubscriptionManager = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_11_1 = _d.sent();
-                        e_11 = { error: e_11_1 };
+                        e_12_1 = _d.sent();
+                        e_12 = { error: e_12_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_11) throw e_11.error; }
+                        finally { if (e_12) throw e_12.error; }
                         return [7 /*endfinally*/];
                     case 8:
                         this.dependencyDebug('Skip invalidation after dependency checks', { publication: sub.publication, collection: collection, type: type, documentId: normalizedDocumentId });
@@ -2284,8 +2317,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_12_1, paginationMeta, paginationReasons;
-            var e_12, _a;
+            var sawInsert, sawDelete, events_1, events_1_1, event_1, e_13_1, paginationMeta, paginationReasons;
+            var e_13, _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -2316,14 +2349,14 @@ var SubscriptionManager = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_12_1 = _b.sent();
-                        e_12 = { error: e_12_1 };
+                        e_13_1 = _b.sent();
+                        e_13 = { error: e_13_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_12) throw e_12.error; }
+                        finally { if (e_13) throw e_13.error; }
                         return [7 /*endfinally*/];
                     case 8:
                         paginationMeta = this.getPaginationMeta(sub, collection);