@resolveio/server-lib 20.9.9 → 20.9.11

package/managers/subscription.manager.d.ts

@@ -64,7 +64,7 @@ export declare class SubscriptionManager {
     private ensureDependencyContainers;
     private updateSubscriptionDependencies;
     private normalizeDocumentId;
-    private convertDocumentIdForQuery;
+    private getDocumentIdQueryCandidates;
     private documentMatchesFilter;
     private shouldInvalidateSubscription;
     private shouldInvalidateSubscriptionForEvents;

package/managers/subscription.manager.js

@@ -73,7 +73,6 @@ 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");
@@ -1407,28 +1406,55 @@ var SubscriptionManager = /** @class */ (function () {
         }
         return null;
     };
-    SubscriptionManager.prototype.convertDocumentIdForQuery = function (documentId) {
-        if (!documentId) {
-            return documentId;
+    SubscriptionManager.prototype.getDocumentIdQueryCandidates = function (documentId) {
+        var candidates = [];
+        if (documentId === undefined || documentId === null) {
+            return [documentId];
         }
-        if (/^[a-fA-F0-9]{24}$/.test(documentId)) {
-            try {
-                return new mongodb_1.ObjectId(documentId);
+        var addCandidate = function (value) {
+            if (value === undefined || value === null) {
+                return;
             }
-            catch (_a) { }
+            if (!candidates.includes(value)) {
+                candidates.push(value);
+            }
+        };
+        addCandidate(documentId);
+        if (typeof documentId === 'object') {
+            if (typeof documentId.toHexString === 'function') {
+                addCandidate(documentId.toHexString());
+            }
+            if (typeof documentId.toString === 'function') {
+                var str = documentId.toString();
+                if (str && str !== '[object Object]') {
+                    addCandidate(str);
+                }
+            }
+        }
+        else if (typeof documentId !== 'string') {
+            addCandidate(String(documentId));
         }
-        return documentId;
+        return candidates;
     };
     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) {
+            var db, filterCopy, idCandidates, idCandidates_1, idCandidates_1_1, idValue, combinedFilter, doc, e_6_1, _a;
+            var e_6, _b;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
-                        _b.trys.push([0, 2, , 3]);
+                        _c.trys.push([0, 9, , 10]);
                         db = resolveio_server_app_1.ResolveIOServer.getMainDB();
                         filterCopy = (0, common_1.deepCopy)(filter) || {};
-                        idValue = this.convertDocumentIdForQuery(documentId);
+                        idCandidates = this.getDocumentIdQueryCandidates(documentId);
+                        _c.label = 1;
+                    case 1:
+                        _c.trys.push([1, 6, 7, 8]);
+                        idCandidates_1 = __values(idCandidates), idCandidates_1_1 = idCandidates_1.next();
+                        _c.label = 2;
+                    case 2:
+                        if (!!idCandidates_1_1.done) return [3 /*break*/, 5];
+                        idValue = idCandidates_1_1.value;
                         combinedFilter = {
                             $and: [
                                 { _id: idValue },
@@ -1436,21 +1462,39 @@ var SubscriptionManager = /** @class */ (function () {
                             ]
                         };
                         return [4 /*yield*/, db.collection(collection).findOne(combinedFilter)];
-                    case 1:
-                        doc = _b.sent();
-                        return [2 /*return*/, !!doc];
-                    case 2:
-                        _a = _b.sent();
+                    case 3:
+                        doc = _c.sent();
+                        if (doc) {
+                            return [2 /*return*/, true];
+                        }
+                        _c.label = 4;
+                    case 4:
+                        idCandidates_1_1 = idCandidates_1.next();
+                        return [3 /*break*/, 2];
+                    case 5: return [3 /*break*/, 8];
+                    case 6:
+                        e_6_1 = _c.sent();
+                        e_6 = { error: e_6_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; }
+                        return [7 /*endfinally*/];
+                    case 8: return [2 /*return*/, false];
+                    case 9:
+                        _a = _c.sent();
                         return [2 /*return*/, true];
-                    case 3: return [2 /*return*/];
+                    case 10: 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;
+            var trackedIds, filters, filters_1, filters_1_1, filter, e_7_1;
+            var e_7, _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -1494,14 +1538,14 @@ var SubscriptionManager = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_6_1 = _b.sent();
-                        e_6 = { error: e_6_1 };
+                        e_7_1 = _b.sent();
+                        e_7 = { error: e_7_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; }
+                        finally { if (e_7) throw e_7.error; }
                         return [7 /*endfinally*/];
                     case 8:
                         this.dependencyDebug('Skip invalidation after dependency checks', { publication: sub.publication, collection: collection, type: type, documentId: documentId });
@@ -1512,8 +1556,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, normalizedDocumentId, e_7_1, paginationMeta, paginationReasons;
-            var e_7, _a;
+            var sawInsert, sawDelete, events_1, events_1_1, event_1, normalizedDocumentId, e_8_1, paginationMeta, paginationReasons;
+            var e_8, _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -1545,14 +1589,14 @@ var SubscriptionManager = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_7_1 = _b.sent();
-                        e_7 = { error: e_7_1 };
+                        e_8_1 = _b.sent();
+                        e_8 = { error: e_8_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_7) throw e_7.error; }
+                        finally { if (e_8) throw e_8.error; }
                         return [7 /*endfinally*/];
                     case 8:
                         paginationMeta = this.getPaginationMeta(sub, collection);