@resolveio/server-lib 20.14.32 → 20.14.34

package/managers/subscription.manager.d.ts

@@ -25,6 +25,7 @@ export declare class SubscriptionManager {
     private _monitorManagerFunction;
     private _enableDebug;
     private _enableDependencyDebug;
+    private _connectDebug;
     private _debugOplogCollections;
     private _debugOplogHits;
     private _debugSubCollections;
@@ -93,7 +94,11 @@ export declare class SubscriptionManager {
     private getWatchedDatabases;
     private resolveOplogMode;
     private resolveLocalOplogResyncIntervalMs;
+    private resolveResumeTokenMaxAgeMs;
+    private resolveConnectDebug;
+    private parseDebugFlag;
     private parsePositiveNumber;
+    private connectDebug;
     private parsePositiveFloat;
     private isChangeStreamUnsupported;
     private isResumeTokenInvalid;

package/managers/subscription.manager.js

@@ -134,6 +134,7 @@ var SubscriptionManager = /** @class */ (function () {
         this._heapSize = resolveHeapLimitBytes();
         this._enableDebug = false;
         this._enableDependencyDebug = false;
+        this._connectDebug = false;
         this._debugOplogCollections = [];
         this._debugOplogHits = 0;
         this._debugSubCollections = [];
@@ -224,6 +225,7 @@ var SubscriptionManager = /** @class */ (function () {
                         // }, 10000);
                         this.serverConfig = serverConfig;
                         this._wss = wss;
+                        this._connectDebug = this.resolveConnectDebug();
                         this._oplogMode = this.resolveOplogMode();
                         this._localOplogResyncIntervalMs = this.resolveLocalOplogResyncIntervalMs();
                         this.registerCorePublications();
@@ -947,6 +949,14 @@ var SubscriptionManager = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this._debugSubHits += 1;
+                        this.connectDebug('Subscribe request', {
+                            publication: publication,
+                            messageRoute: messageRoute,
+                            messageId: messageId,
+                            id_socket: ws ? ws['id_socket'] : null,
+                            user: ws ? ws['user'] : null,
+                            args: Array.isArray(subscriptionData) ? subscriptionData.length : 0
+                        });
                         if (!this._debugSubCollections.some(function (a) { return a.publication === publication; })) {
                             this._debugSubCollections.push({
                                 publication: publication,
@@ -959,15 +969,18 @@ var SubscriptionManager = /** @class */ (function () {
                         pub = this._publications[publication];
                         if (!!pub) return [3 /*break*/, 1];
                         console.error(new Date(), 'No Publication: ' + publication);
+                        this.connectDebug('Missing publication', { publication: publication, messageRoute: messageRoute, messageId: messageId });
                         return [2 /*return*/];
                     case 1:
                         if (subscriptionData.length > 1 || subscriptionData[0]) {
                             if (!pub.check) {
                                 console.error(new Date(), 'No Check Function For Pub ' + publication);
+                                this.connectDebug('Missing check for publication', { publication: publication, messageRoute: messageRoute, messageId: messageId });
                                 return [2 /*return*/];
                             }
                             else if (!pub.check._schema) {
                                 console.error(new Date(), 'No Check Schema For Pub ' + publication);
+                                this.connectDebug('Missing check schema for publication', { publication: publication, messageRoute: messageRoute, messageId: messageId });
                                 return [2 /*return*/];
                             }
                             else {
@@ -983,6 +996,14 @@ var SubscriptionManager = /** @class */ (function () {
                                 catch (errors) {
                                     if (errors) {
                                         console.error(new Date(), 'Error in Pub Check (' + publication + ')', errors);
+                                        this.connectDebug('Publication check failed', {
+                                            publication: publication,
+                                            messageRoute: messageRoute,
+                                            messageId: messageId,
+                                            args: subscriptionData.length,
+                                            valObj: valObj,
+                                            error: (errors === null || errors === void 0 ? void 0 : errors.message) || errors
+                                        });
                                         return [2 /*return*/];
                                     }
                                 }
@@ -1194,6 +1215,38 @@ var SubscriptionManager = /** @class */ (function () {
             || config['SUBSCRIPTION_OPLOG_RESYNC_MS'];
         return this.parsePositiveNumber(raw);
     };
+    SubscriptionManager.prototype.resolveResumeTokenMaxAgeMs = function () {
+        var config = this.serverConfig || resolveio_server_app_1.ResolveIOServer.getServerConfig() || {};
+        var raw = process.env.OPLOG_RESUME_TOKEN_MAX_AGE_MS
+            || process.env.SUBSCRIPTION_OPLOG_RESUME_TOKEN_MAX_AGE_MS
+            || config['OPLOG_RESUME_TOKEN_MAX_AGE_MS']
+            || config['SUBSCRIPTION_OPLOG_RESUME_TOKEN_MAX_AGE_MS'];
+        return this.parsePositiveNumber(raw);
+    };
+    SubscriptionManager.prototype.resolveConnectDebug = function () {
+        var config = this.serverConfig || resolveio_server_app_1.ResolveIOServer.getServerConfig() || {};
+        var raw = process.env.WS_CONNECT_DEBUG
+            || process.env.CONNECT_DEBUG
+            || config['WS_CONNECT_DEBUG']
+            || config['CONNECT_DEBUG'];
+        return this.parseDebugFlag(raw);
+    };
+    SubscriptionManager.prototype.parseDebugFlag = function (value) {
+        if (value === true) {
+            return true;
+        }
+        if (value === false || value === null || value === undefined) {
+            return false;
+        }
+        if (typeof value === 'number') {
+            return value === 1;
+        }
+        if (typeof value === 'string') {
+            var normalized = value.trim().toLowerCase();
+            return ['1', 'true', 'yes', 'y', 'on'].includes(normalized);
+        }
+        return false;
+    };
     SubscriptionManager.prototype.parsePositiveNumber = function (value) {
         if (typeof value === 'number' && Number.isFinite(value) && value > 0) {
             return value;
@@ -1206,6 +1259,17 @@ var SubscriptionManager = /** @class */ (function () {
         }
         return 0;
     };
+    SubscriptionManager.prototype.connectDebug = function (message, details) {
+        if (!this._connectDebug) {
+            return;
+        }
+        if (details) {
+            console.log(new Date(), '[Connect Debug]', message, JSON.stringify(details));
+        }
+        else {
+            console.log(new Date(), '[Connect Debug]', message);
+        }
+    };
     SubscriptionManager.prototype.parsePositiveFloat = function (value) {
         if (typeof value === 'number' && Number.isFinite(value) && value > 0) {
             return value;
@@ -1337,31 +1401,66 @@ var SubscriptionManager = /** @class */ (function () {
     };
     SubscriptionManager.prototype.loadResumeToken = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var db, doc, error_3;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var db_1, loadToken, mongoManager, _a, error_3;
+            var _this = this;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
-                        _a.trys.push([0, 2, , 3]);
-                        db = resolveio_server_app_1.ResolveIOServer.getMainDB();
-                        if (!db) {
+                        _b.trys.push([0, 5, , 6]);
+                        db_1 = resolveio_server_app_1.ResolveIOServer.getMainDB();
+                        if (!db_1) {
                             return [2 /*return*/, null];
                         }
-                        return [4 /*yield*/, db.collection(this.RESUME_TOKEN_COLLECTION).findOne({ _id: this.getResumeTokenDocId() })];
+                        loadToken = function () { return __awaiter(_this, void 0, void 0, function () {
+                            var collection, doc, token, maxAgeMs, ageMs;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        collection = db_1.collection(this.RESUME_TOKEN_COLLECTION);
+                                        return [4 /*yield*/, collection.findOne({ _id: this.getResumeTokenDocId() })];
+                                    case 1:
+                                        doc = _a.sent();
+                                        token = (doc === null || doc === void 0 ? void 0 : doc.token) || null;
+                                        if (!token) {
+                                            return [2 /*return*/, null];
+                                        }
+                                        maxAgeMs = this.resolveResumeTokenMaxAgeMs();
+                                        if (!(maxAgeMs > 0 && (doc === null || doc === void 0 ? void 0 : doc.updatedAt) instanceof Date)) return [3 /*break*/, 3];
+                                        ageMs = Date.now() - doc.updatedAt.getTime();
+                                        if (!(ageMs > maxAgeMs)) return [3 /*break*/, 3];
+                                        return [4 /*yield*/, collection.deleteOne({ _id: this.getResumeTokenDocId() })];
+                                    case 2:
+                                        _a.sent();
+                                        console.log(new Date(), 'Sub Manager', 'Resume token expired, clearing', (0, common_1.round)(ageMs / 1000), 's');
+                                        return [2 /*return*/, null];
+                                    case 3: return [2 /*return*/, token];
+                                }
+                            });
+                        }); };
+                        mongoManager = resolveio_server_app_1.ResolveIOServer.getMongoManager();
+                        if (!mongoManager) return [3 /*break*/, 2];
+                        return [4 /*yield*/, mongoManager.runWithoutSession(loadToken)];
                     case 1:
-                        doc = _a.sent();
-                        return [2 /*return*/, (doc === null || doc === void 0 ? void 0 : doc.token) || null];
-                    case 2:
-                        error_3 = _a.sent();
+                        _a = _b.sent();
+                        return [3 /*break*/, 4];
+                    case 2: return [4 /*yield*/, loadToken()];
+                    case 3:
+                        _a = _b.sent();
+                        _b.label = 4;
+                    case 4: return [2 /*return*/, _a];
+                    case 5:
+                        error_3 = _b.sent();
                         console.log(new Date(), 'Sub Manager', 'Failed to load oplog resume token', error_3);
                         return [2 /*return*/, null];
-                    case 3: return [2 /*return*/];
+                    case 6: return [2 /*return*/];
                 }
             });
         });
     };
     SubscriptionManager.prototype.saveResumeToken = function (token) {
         return __awaiter(this, void 0, void 0, function () {
-            var db, error_4;
+            var db_2, saveToken, mongoManager, error_4;
+            var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -1370,44 +1469,80 @@ var SubscriptionManager = /** @class */ (function () {
                         }
                         _a.label = 1;
                     case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        db = resolveio_server_app_1.ResolveIOServer.getMainDB();
-                        if (!db) {
+                        _a.trys.push([1, 6, , 7]);
+                        db_2 = resolveio_server_app_1.ResolveIOServer.getMainDB();
+                        if (!db_2) {
                             return [2 /*return*/];
                         }
-                        return [4 /*yield*/, db.collection(this.RESUME_TOKEN_COLLECTION).updateOne({ _id: this.getResumeTokenDocId() }, { $set: { token: token, updatedAt: new Date() } }, { upsert: true })];
+                        saveToken = function () { return __awaiter(_this, void 0, void 0, function () {
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0: return [4 /*yield*/, db_2.collection(this.RESUME_TOKEN_COLLECTION).updateOne({ _id: this.getResumeTokenDocId() }, { $set: { token: token, updatedAt: new Date() } }, { upsert: true })];
+                                    case 1:
+                                        _a.sent();
+                                        return [2 /*return*/];
+                                }
+                            });
+                        }); };
+                        mongoManager = resolveio_server_app_1.ResolveIOServer.getMongoManager();
+                        if (!mongoManager) return [3 /*break*/, 3];
+                        return [4 /*yield*/, mongoManager.runWithoutSession(saveToken)];
                     case 2:
                         _a.sent();
-                        return [3 /*break*/, 4];
-                    case 3:
+                        return [3 /*break*/, 5];
+                    case 3: return [4 /*yield*/, saveToken()];
+                    case 4:
+                        _a.sent();
+                        _a.label = 5;
+                    case 5: return [3 /*break*/, 7];
+                    case 6:
                         error_4 = _a.sent();
                         console.log(new Date(), 'Sub Manager', 'Failed to persist oplog resume token', error_4);
-                        return [3 /*break*/, 4];
-                    case 4: return [2 /*return*/];
+                        return [3 /*break*/, 7];
+                    case 7: return [2 /*return*/];
                 }
             });
         });
     };
     SubscriptionManager.prototype.clearResumeToken = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var db, error_5;
+            var db_3, clearToken, mongoManager, error_5;
+            var _this = this;
             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) {
+                        _a.trys.push([0, 5, , 6]);
+                        db_3 = resolveio_server_app_1.ResolveIOServer.getMainDB();
+                        if (!db_3) {
                             return [2 /*return*/];
                         }
-                        return [4 /*yield*/, db.collection(this.RESUME_TOKEN_COLLECTION).deleteOne({ _id: this.getResumeTokenDocId() })];
+                        clearToken = function () { return __awaiter(_this, void 0, void 0, function () {
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0: return [4 /*yield*/, db_3.collection(this.RESUME_TOKEN_COLLECTION)
+                                            .deleteOne({ _id: this.getResumeTokenDocId() })];
+                                    case 1:
+                                        _a.sent();
+                                        return [2 /*return*/];
+                                }
+                            });
+                        }); };
+                        mongoManager = resolveio_server_app_1.ResolveIOServer.getMongoManager();
+                        if (!mongoManager) return [3 /*break*/, 2];
+                        return [4 /*yield*/, mongoManager.runWithoutSession(clearToken)];
                     case 1:
                         _a.sent();
-                        return [3 /*break*/, 3];
-                    case 2:
+                        return [3 /*break*/, 4];
+                    case 2: return [4 /*yield*/, clearToken()];
+                    case 3:
+                        _a.sent();
+                        _a.label = 4;
+                    case 4: return [3 /*break*/, 6];
+                    case 5:
                         error_5 = _a.sent();
                         console.log(new Date(), 'Sub Manager', 'Failed to clear oplog resume token', error_5);
-                        return [3 /*break*/, 3];
-                    case 3: return [2 /*return*/];
+                        return [3 /*break*/, 6];
+                    case 6: return [2 /*return*/];
                 }
             });
         });