@resolveio/server-lib 3.2.4-newrole → 3.2.5-newrole

package/managers/subscription.manager.js

@@ -553,9 +553,9 @@ var SubscriptionManager = /** @class */ (function () {
         if (noFetchFunction === void 0) { noFetchFunction = false; }
         var that = this;
         that._subscriptions.filter(function (a) { return a.collections.includes(collection); }).forEach(function (sub) { return __awaiter(_this, void 0, void 0, function () {
-            var _a, schemaErrors, _b;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var _a, _b, schemaErrors, _c, _d;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
                         schemaErrors = null;
                         try {
@@ -567,21 +567,30 @@ var SubscriptionManager = /** @class */ (function () {
                         if (!schemaErrors) return [3 /*break*/, 2];
                         return [4 /*yield*/, index_1.ResolveIOServer.getMainDB().model(collection).findById(document['_id'])];
                     case 1:
-                        document = _c.sent();
-                        _c.label = 2;
+                        document = _e.sent();
+                        _e.label = 2;
                     case 2:
-                        if (!that._publications[sub.publication].preFunction) return [3 /*break*/, 5];
-                        if (!!noFetchFunction) return [3 /*break*/, 4];
-                        _b = sub;
-                        return [4 /*yield*/, that._publications[sub.publication].preFunction(sub.subscriptionData)];
+                        if (!sub.preSubscriptionData) return [3 /*break*/, 4];
+                        if (!that._publications[sub.publication].fetchFunction(document, sub.preSubscriptionData)) return [3 /*break*/, 4];
+                        that.sendPubData(sub);
+                        _c = sub;
+                        return [4 /*yield*/, (_a = that._publications[sub.publication]).preFunction.apply(_a, sub.subscriptionData)];
                     case 3:
-                        _b.preSubscriptionData = _c.sent();
+                        _c.preSubscriptionData = _e.sent();
+                        return [2 /*return*/];
+                    case 4:
+                        if (!that._publications[sub.publication].preFunction) return [3 /*break*/, 7];
+                        if (!!noFetchFunction) return [3 /*break*/, 6];
+                        _d = sub;
+                        return [4 /*yield*/, that._publications[sub.publication].preFunction(sub.subscriptionData)];
+                    case 5:
+                        _d.preSubscriptionData = _e.sent();
                         if (that._publications[sub.publication].fetchFunction(document, sub.preSubscriptionData)) {
                             that.sendPubData(sub);
                         }
-                        _c.label = 4;
-                    case 4: return [3 /*break*/, 6];
-                    case 5:
+                        _e.label = 6;
+                    case 6: return [3 /*break*/, 8];
+                    case 7:
                         if (that._publications[sub.publication].ws_specific) {
                             sub.clients.forEach(function (client) {
                                 var _a;
@@ -608,7 +617,7 @@ var SubscriptionManager = /** @class */ (function () {
                         else {
                             if (that._publications[sub.publication].fetchFunction) {
                                 if (!noFetchFunction) {
-                                    if ((_a = that._publications[sub.publication]).fetchFunction.apply(_a, [document].concat(sub.subscriptionData))) {
+                                    if ((_b = that._publications[sub.publication]).fetchFunction.apply(_b, [document].concat(sub.subscriptionData))) {
                                         that.sendPubData(sub);
                                     }
                                 }
@@ -617,8 +626,8 @@ var SubscriptionManager = /** @class */ (function () {
                                 that.sendPubData(sub);
                             }
                         }
-                        _c.label = 6;
-                    case 6: return [2 /*return*/];
+                        _e.label = 8;
+                    case 8: return [2 /*return*/];
                 }
             });
         }); });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@resolveio/server-lib",
-  "version": "3.2.4-newrole",
+  "version": "3.2.5-newrole",
   "description": "",
   "main": "index.ts",
   "scripts": {