@resolveio/server-lib 2.2.2 → 2.2.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -276,7 +276,7 @@ var SubscriptionManager = /** @class */ (function () {
|
|
|
276
276
|
subscriptionData[_i - 3] = arguments[_i];
|
|
277
277
|
}
|
|
278
278
|
return __awaiter(this, void 0, void 0, function () {
|
|
279
|
-
var that, sub,
|
|
279
|
+
var that, sub, i, activeSub;
|
|
280
280
|
return __generator(this, function (_a) {
|
|
281
281
|
switch (_a.label) {
|
|
282
282
|
case 0:
|
|
@@ -286,13 +286,15 @@ var SubscriptionManager = /** @class */ (function () {
|
|
|
286
286
|
return [2 /*return*/];
|
|
287
287
|
case 1:
|
|
288
288
|
sub = that._subscriptions.filter(function (a) { return a.publication === publication && JSON.stringify(a.subscriptionData) === JSON.stringify(subscriptionData); })[0];
|
|
289
|
-
if (!sub) return [3 /*break*/,
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
289
|
+
if (!sub) return [3 /*break*/, 5];
|
|
290
|
+
for (i = sub.clients.length - 1; i >= 0; i--) {
|
|
291
|
+
if (sub.clients[i].id_user === ws['id_user'] && sub.clients[i].messageId === messageId && sub.clients[i].id_socket === ws['id_socket']) {
|
|
292
|
+
sub.clients.splice(i, 1);
|
|
293
|
+
}
|
|
294
|
+
}
|
|
293
295
|
if (!!sub.clients.length) return [3 /*break*/, 2];
|
|
294
296
|
that._subscriptions.splice(that._subscriptions.findIndex(function (a) { return a.publication === publication && JSON.stringify(a.subscriptionData) === JSON.stringify(subscriptionData); }), 1);
|
|
295
|
-
active_subscription_collection_1.ActiveSubscriptions.
|
|
297
|
+
active_subscription_collection_1.ActiveSubscriptions.deleteOne({
|
|
296
298
|
$and: [
|
|
297
299
|
{ publication: publication },
|
|
298
300
|
{ subData: JSON.stringify(subscriptionData) }
|
|
@@ -311,8 +313,10 @@ var SubscriptionManager = /** @class */ (function () {
|
|
|
311
313
|
active_subscription_collection_1.ActiveSubscriptions.updateOne({ _id: activeSub._id }, { $set: { clients: sub.clients } }).exec();
|
|
312
314
|
}
|
|
313
315
|
_a.label = 4;
|
|
314
|
-
case 4: return [3 /*break*/,
|
|
315
|
-
case 5:
|
|
316
|
+
case 4: return [3 /*break*/, 6];
|
|
317
|
+
case 5:
|
|
318
|
+
console.log('Did not sub on unsubscribe');
|
|
319
|
+
_a.label = 6;
|
|
316
320
|
case 6: return [2 /*return*/];
|
|
317
321
|
}
|
|
318
322
|
});
|
|
@@ -351,7 +355,12 @@ var SubscriptionManager = /** @class */ (function () {
|
|
|
351
355
|
case 2:
|
|
352
356
|
activeSubs = _a.sent();
|
|
353
357
|
activeSubs.forEach(function (sub) {
|
|
354
|
-
|
|
358
|
+
for (var j = sub.clients.length - 1; j >= 0; j--) {
|
|
359
|
+
if (sub.clients[j].id_socket === ws['id_socket']) {
|
|
360
|
+
sub.clients.splice(j, 1);
|
|
361
|
+
}
|
|
362
|
+
}
|
|
363
|
+
if (!sub.clients.length) {
|
|
355
364
|
active_subscription_collection_1.ActiveSubscriptions.deleteOne({ _id: sub._id }).exec();
|
|
356
365
|
}
|
|
357
366
|
else {
|