@resolveio/server-lib 5.2.37 → 5.2.38

package/managers/subscription.manager.js

@@ -368,31 +368,28 @@ var SubscriptionManager = /** @class */ (function () {
                         return [2 /*return*/];
                     case 1:
                         sub = that._subscriptions.filter(function (a) { return a.publication === publication && JSON.stringify(a.subscriptionData) === JSON.stringify(subscriptionData); })[0];
-                        if (!sub) return [3 /*break*/, 5];
+                        if (!sub) return [3 /*break*/, 3];
                         for (i = sub.clients.length - 1; i >= 0; i--) {
                             if (sub.clients[i].id_user === ws['id_user'] && sub.clients[i].messageId === messageId && sub.clients[i].id_socket === ws['id_socket']) {
                                 sub.clients.splice(i, 1);
                             }
                         }
-                        if (!!sub.clients.length) return [3 /*break*/, 2];
-                        return [3 /*break*/, 4];
-                    case 2: return [4 /*yield*/, active_subscription_collection_1.ActiveSubscriptions.findOne({
-                            $and: [
-                                { publication: publication },
-                                { subData: JSON.stringify(subscriptionData) }
-                            ]
-                        })];
-                    case 3:
+                        return [4 /*yield*/, active_subscription_collection_1.ActiveSubscriptions.findOne({
+                                $and: [
+                                    { publication: publication },
+                                    { subData: JSON.stringify(subscriptionData) }
+                                ]
+                            })];
+                    case 2:
                         activeSub = _a.sent();
                         if (activeSub) {
                             active_subscription_collection_1.ActiveSubscriptions.updateOne({ _id: activeSub._id }, { $set: { clients: sub.clients } }).exec();
                         }
-                        _a.label = 4;
-                    case 4: return [3 /*break*/, 6];
-                    case 5:
+                        return [3 /*break*/, 4];
+                    case 3:
                         console.log('Did not sub on unsubscribe');
-                        _a.label = 6;
-                    case 6: return [2 /*return*/];
+                        _a.label = 4;
+                    case 4: return [2 /*return*/];
                 }
             });
         });
@@ -422,9 +419,6 @@ var SubscriptionManager = /** @class */ (function () {
                                     sub.clients.splice(j, 1);
                                 }
                             }
-                            if (!sub.clients.length) {
-                                // that._subscriptions.splice(that._subscriptions.findIndex(a => a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData)), 1);
-                            }
                         }
                         return [4 /*yield*/, active_subscription_collection_1.ActiveSubscriptions.find({ 'clients.id_socket': ws['id_socket'] })];
                     case 2:
@@ -435,17 +429,12 @@ var SubscriptionManager = /** @class */ (function () {
                                     sub.clients.splice(j, 1);
                                 }
                             }
-                            if (!sub.clients.length) {
-                                // ActiveSubscriptions.deleteOne({_id: sub._id}).exec();
-                            }
-                            else {
-                                for (var j = sub.clients.length - 1; j >= 0; j--) {
-                                    if (sub.clients[j].id_socket === ws['id_socket']) {
-                                        sub.clients.splice(j, 1);
-                                    }
+                            for (var j = sub.clients.length - 1; j >= 0; j--) {
+                                if (sub.clients[j].id_socket === ws['id_socket']) {
+                                    sub.clients.splice(j, 1);
                                 }
-                                active_subscription_collection_1.ActiveSubscriptions.updateOne({ _id: sub._id }, { $set: { clients: sub.clients } }).exec();
                             }
+                            active_subscription_collection_1.ActiveSubscriptions.updateOne({ _id: sub._id }, { $set: { clients: sub.clients } }).exec();
                         });
                         ws.terminate();
                         return [2 /*return*/];

package/package.json

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