@resolveio/server-lib 5.2.22 → 5.2.23

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.
Files changed (2) hide show
  1. package/managers/subscription.manager.js +144 -131
  2. package/package.json +1 -1
package/managers/subscription.manager.js CHANGED
@@ -197,7 +197,7 @@ var SubscriptionManager = /** @class */ (function () {
197
197
  });
198
198
  }
199
199
  else {
200
- this._mainServer.getMethodManager().callMethodInternal('sendEmail', 'dev@resolveio.com', 'SERVER - Subscription Error Detected (Same socket and user) - ' + that.serverConfig['CLIENT_NAME'], 'Pub: ' + sub.publication + ', id_user: ' + ws['id_user']);
200
+ this._mainServer.getMethodManager().sendEmail('dev@resolveio.com', 'SERVER - Subscription Error Detected (Same socket and user) - ' + that.serverConfig['CLIENT_NAME'], 'Pub: ' + sub.publication + ', id_user: ' + ws['id_user']);
201
201
  }
202
202
  }
203
203
  // If sub not found, create new sub
@@ -515,12 +515,12 @@ var SubscriptionManager = /** @class */ (function () {
515
515
  var _this = this;
516
516
  var that = this;
517
517
  setInterval(function () { return __awaiter(_this, void 0, void 0, function () {
518
- var uniqueOplog_1, uniquePubs, needIds_1, _loop_2, i, _loop_3, i, i, oplog, _loop_4, this_1, j, i, pub;
518
+ var uniqueOplog_1, uniquePubs, needIds_1, _loop_2, i, _loop_3, i, _loop_4, this_1, i, i, pub;
519
519
  var _this = this;
520
520
  return __generator(this, function (_a) {
521
521
  switch (_a.label) {
522
522
  case 0:
523
- if (!this._oplogQueue.length) return [3 /*break*/, 14];
523
+ if (!this._oplogQueue.length) return [3 /*break*/, 12];
524
524
  uniqueOplog_1 = common_1.deepCopy(this._oplogQueue);
525
525
  this._oplogQueue = [];
526
526
  uniquePubs = [];
@@ -568,7 +568,7 @@ var SubscriptionManager = /** @class */ (function () {
568
568
  });
569
569
  }
570
570
  else {
571
- _this._mainServer.getMethodManager().callMethodInternal('sendEmail', 'dev@resolveio.com', 'SERVER - Oplog Doc Error Detected - ' + that.serverConfig['CLIENT_NAME'], 'id_doc: ' + id_doc + ', UniqueOplogs: ' + JSON.stringify(uniqueOplog_1, null, 2));
571
+ _this._mainServer.getMethodManager().sendEmail('dev@resolveio.com', 'SERVER - Oplog Doc Error Detected - ' + that.serverConfig['CLIENT_NAME'], 'id_doc: ' + id_doc + ', UniqueOplogs: ' + JSON.stringify(uniqueOplog_1, null, 2));
572
572
  }
573
573
  });
574
574
  return [2 /*return*/];
@@ -587,159 +587,172 @@ var SubscriptionManager = /** @class */ (function () {
587
587
  i++;
588
588
  return [3 /*break*/, 1];
589
589
  case 4:
590
- i = uniqueOplog_1.length - 1;
591
- _a.label = 5;
592
- case 5:
593
- if (!(i >= 0)) return [3 /*break*/, 10];
594
- oplog = uniqueOplog_1[i];
595
- _loop_4 = function (j) {
596
- var _a, sub;
597
- return __generator(this, function (_b) {
598
- switch (_b.label) {
590
+ _loop_4 = function (i) {
591
+ var oplog, _loop_5, j;
592
+ return __generator(this, function (_a) {
593
+ switch (_a.label) {
599
594
  case 0:
600
- sub = that._subscriptions[j];
601
- if (!sub.collections.includes(oplog.collection)) return [3 /*break*/, 16];
602
- if (!sub.preSubscriptionData) return [3 /*break*/, 5];
603
- if (!that._publications[sub.publication].fetchFunction(oplog.doc, sub.preSubscriptionData)) return [3 /*break*/, 5];
604
- if (!!uniquePubs.filter(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData) && JSON.stringify(a.preSubscriptionData) === JSON.stringify(sub.preSubscriptionData); }).length) return [3 /*break*/, 4];
605
- if (!!sub.clients.length) return [3 /*break*/, 2];
606
- that._subscriptions.splice(j, 1);
607
- return [4 /*yield*/, active_subscription_collection_1.ActiveSubscriptions.deleteOne({
608
- $and: [
609
- { publication: sub.publication },
610
- { subData: JSON.stringify(sub.subscriptionData) }
611
- ]
612
- }).exec()];
595
+ oplog = uniqueOplog_1[i];
596
+ _loop_5 = function (j) {
597
+ var _a, sub;
598
+ return __generator(this, function (_b) {
599
+ switch (_b.label) {
600
+ case 0:
601
+ sub = that._subscriptions[j];
602
+ if (!sub.collections.includes(oplog.collection)) return [3 /*break*/, 16];
603
+ if (!sub.preSubscriptionData) return [3 /*break*/, 5];
604
+ if (!that._publications[sub.publication].fetchFunction(oplog.doc, sub.preSubscriptionData)) return [3 /*break*/, 5];
605
+ if (!!uniquePubs.filter(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData); }).length) return [3 /*break*/, 4];
606
+ if (!!sub.clients.length) return [3 /*break*/, 2];
607
+ that._subscriptions.splice(j, 1);
608
+ return [4 /*yield*/, active_subscription_collection_1.ActiveSubscriptions.deleteOne({
609
+ $and: [
610
+ { publication: sub.publication },
611
+ { subData: JSON.stringify(sub.subscriptionData) }
612
+ ]
613
+ }).exec()];
614
+ case 1:
615
+ _b.sent();
616
+ return [3 /*break*/, 3];
617
+ case 2:
618
+ sub['oplog'] = oplog;
619
+ uniquePubs.push(sub);
620
+ _b.label = 3;
621
+ case 3:
622
+ if (this_1._subCache.findIndex(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData); }) >= 0) {
623
+ this_1._nodeCache.del(this_1._subCache.filter(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData); })[0].id);
624
+ this_1._subCache.splice(this_1._subCache.findIndex(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData); }), 1);
625
+ }
626
+ _b.label = 4;
627
+ case 4: return [2 /*return*/, "continue"];
628
+ case 5:
629
+ if (!that._publications[sub.publication].preFunction) return [3 /*break*/, 9];
630
+ if (!!sub.clients.length) return [3 /*break*/, 7];
631
+ that._subscriptions.splice(j, 1);
632
+ return [4 /*yield*/, active_subscription_collection_1.ActiveSubscriptions.deleteOne({
633
+ $and: [
634
+ { publication: sub.publication },
635
+ { subData: JSON.stringify(sub.subscriptionData) }
636
+ ]
637
+ }).exec()];
638
+ case 6:
639
+ _b.sent();
640
+ if (this_1._subCache.findIndex(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData); }) >= 0) {
641
+ this_1._nodeCache.del(this_1._subCache.filter(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData); })[0].id);
642
+ this_1._subCache.splice(this_1._subCache.findIndex(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData); }), 1);
643
+ }
644
+ return [3 /*break*/, 8];
645
+ case 7:
646
+ if (!uniquePubs.filter(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData) && JSON.stringify(oplog) === JSON.stringify(a.oplog); }).length) {
647
+ sub['oplog'] = oplog;
648
+ uniquePubs.push(sub);
649
+ }
650
+ _b.label = 8;
651
+ case 8: return [3 /*break*/, 16];
652
+ case 9:
653
+ if (!that._publications[sub.publication].fetchFunction) return [3 /*break*/, 13];
654
+ if (!(_a = that._publications[sub.publication]).fetchFunction.apply(_a, [oplog.doc].concat(sub.subscriptionData))) return [3 /*break*/, 12];
655
+ if (!!uniquePubs.filter(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData); }).length) return [3 /*break*/, 12];
656
+ if (!!sub.clients.length) return [3 /*break*/, 11];
657
+ that._subscriptions.splice(j, 1);
658
+ return [4 /*yield*/, active_subscription_collection_1.ActiveSubscriptions.deleteOne({
659
+ $and: [
660
+ { publication: sub.publication },
661
+ { subData: JSON.stringify(sub.subscriptionData) }
662
+ ]
663
+ }).exec()];
664
+ case 10:
665
+ _b.sent();
666
+ if (this_1._subCache.findIndex(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData); }) >= 0) {
667
+ this_1._nodeCache.del(this_1._subCache.filter(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData); })[0].id);
668
+ this_1._subCache.splice(this_1._subCache.findIndex(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData); }), 1);
669
+ }
670
+ return [3 /*break*/, 12];
671
+ case 11:
672
+ sub['oplog'] = oplog;
673
+ uniquePubs.push(sub);
674
+ _b.label = 12;
675
+ case 12: return [3 /*break*/, 16];
676
+ case 13:
677
+ if (!!uniquePubs.filter(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData); }).length) return [3 /*break*/, 16];
678
+ if (!!sub.clients.length) return [3 /*break*/, 15];
679
+ that._subscriptions.splice(j, 1);
680
+ return [4 /*yield*/, active_subscription_collection_1.ActiveSubscriptions.deleteOne({
681
+ $and: [
682
+ { publication: sub.publication },
683
+ { subData: JSON.stringify(sub.subscriptionData) }
684
+ ]
685
+ }).exec()];
686
+ case 14:
687
+ _b.sent();
688
+ if (this_1._subCache.findIndex(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData); }) >= 0) {
689
+ this_1._nodeCache.del(this_1._subCache.filter(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData); })[0].id);
690
+ this_1._subCache.splice(this_1._subCache.findIndex(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData); }), 1);
691
+ }
692
+ return [3 /*break*/, 16];
693
+ case 15:
694
+ sub['oplog'] = oplog;
695
+ uniquePubs.push(sub);
696
+ _b.label = 16;
697
+ case 16: return [2 /*return*/];
698
+ }
699
+ });
700
+ };
701
+ j = that._subscriptions.length - 1;
702
+ _a.label = 1;
613
703
  case 1:
614
- _b.sent();
615
- return [3 /*break*/, 3];
704
+ if (!(j >= 0)) return [3 /*break*/, 4];
705
+ return [5 /*yield**/, _loop_5(j)];
616
706
  case 2:
617
- sub['oplog'] = oplog;
618
- uniquePubs.push(sub);
619
- _b.label = 3;
707
+ _a.sent();
708
+ _a.label = 3;
620
709
  case 3:
621
- if (this_1._subCache.findIndex(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData); }) >= 0) {
622
- this_1._nodeCache.del(this_1._subCache.filter(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData); })[0].id);
623
- this_1._subCache.splice(this_1._subCache.findIndex(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData); }), 1);
624
- }
625
- _b.label = 4;
626
- case 4: return [2 /*return*/, "continue"];
627
- case 5:
628
- if (!that._publications[sub.publication].preFunction) return [3 /*break*/, 9];
629
- if (!!sub.clients.length) return [3 /*break*/, 7];
630
- that._subscriptions.splice(j, 1);
631
- return [4 /*yield*/, active_subscription_collection_1.ActiveSubscriptions.deleteOne({
632
- $and: [
633
- { publication: sub.publication },
634
- { subData: JSON.stringify(sub.subscriptionData) }
635
- ]
636
- }).exec()];
637
- case 6:
638
- _b.sent();
639
- if (this_1._subCache.findIndex(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData); }) >= 0) {
640
- this_1._nodeCache.del(this_1._subCache.filter(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData); })[0].id);
641
- this_1._subCache.splice(this_1._subCache.findIndex(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData); }), 1);
642
- }
643
- return [3 /*break*/, 8];
644
- case 7:
645
- if (!uniquePubs.filter(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData) && JSON.stringify(a.preSubscriptionData) === JSON.stringify(sub.preSubscriptionData); }).length) {
646
- sub['oplog'] = oplog;
647
- uniquePubs.push(sub);
648
- }
649
- _b.label = 8;
650
- case 8: return [3 /*break*/, 16];
651
- case 9:
652
- if (!that._publications[sub.publication].fetchFunction) return [3 /*break*/, 13];
653
- if (!(_a = that._publications[sub.publication]).fetchFunction.apply(_a, [oplog.doc].concat(sub.subscriptionData))) return [3 /*break*/, 12];
654
- if (!!uniquePubs.filter(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData) && JSON.stringify(a.preSubscriptionData) === JSON.stringify(sub.preSubscriptionData); }).length) return [3 /*break*/, 12];
655
- if (!!sub.clients.length) return [3 /*break*/, 11];
656
- that._subscriptions.splice(j, 1);
657
- return [4 /*yield*/, active_subscription_collection_1.ActiveSubscriptions.deleteOne({
658
- $and: [
659
- { publication: sub.publication },
660
- { subData: JSON.stringify(sub.subscriptionData) }
661
- ]
662
- }).exec()];
663
- case 10:
664
- _b.sent();
665
- if (this_1._subCache.findIndex(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData); }) >= 0) {
666
- this_1._nodeCache.del(this_1._subCache.filter(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData); })[0].id);
667
- this_1._subCache.splice(this_1._subCache.findIndex(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData); }), 1);
668
- }
669
- return [3 /*break*/, 12];
670
- case 11:
671
- sub['oplog'] = oplog;
672
- uniquePubs.push(sub);
673
- _b.label = 12;
674
- case 12: return [3 /*break*/, 16];
675
- case 13:
676
- if (!!uniquePubs.filter(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData) && JSON.stringify(a.preSubscriptionData) === JSON.stringify(sub.preSubscriptionData); }).length) return [3 /*break*/, 16];
677
- if (!!sub.clients.length) return [3 /*break*/, 15];
678
- that._subscriptions.splice(j, 1);
679
- return [4 /*yield*/, active_subscription_collection_1.ActiveSubscriptions.deleteOne({
680
- $and: [
681
- { publication: sub.publication },
682
- { subData: JSON.stringify(sub.subscriptionData) }
683
- ]
684
- }).exec()];
685
- case 14:
686
- _b.sent();
687
- if (this_1._subCache.findIndex(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData); }) >= 0) {
688
- this_1._nodeCache.del(this_1._subCache.filter(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData); })[0].id);
689
- this_1._subCache.splice(this_1._subCache.findIndex(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData); }), 1);
690
- }
691
- return [3 /*break*/, 16];
692
- case 15:
693
- sub['oplog'] = oplog;
694
- uniquePubs.push(sub);
695
- _b.label = 16;
696
- case 16: return [2 /*return*/];
710
+ j--;
711
+ return [3 /*break*/, 1];
712
+ case 4: return [2 /*return*/];
697
713
  }
698
714
  });
699
715
  };
700
716
  this_1 = this;
701
- j = that._subscriptions.length - 1;
702
- _a.label = 6;
717
+ i = uniqueOplog_1.length - 1;
718
+ _a.label = 5;
719
+ case 5:
720
+ if (!(i >= 0)) return [3 /*break*/, 8];
721
+ return [5 /*yield**/, _loop_4(i)];
703
722
  case 6:
704
- if (!(j >= 0)) return [3 /*break*/, 9];
705
- return [5 /*yield**/, _loop_4(j)];
706
- case 7:
707
723
  _a.sent();
708
- _a.label = 8;
709
- case 8:
710
- j--;
711
- return [3 /*break*/, 6];
712
- case 9:
724
+ _a.label = 7;
725
+ case 7:
713
726
  i--;
714
727
  return [3 /*break*/, 5];
715
- case 10:
728
+ case 8:
716
729
  i = 0;
717
- _a.label = 11;
718
- case 11:
719
- if (!(i < uniquePubs.length)) return [3 /*break*/, 14];
730
+ _a.label = 9;
731
+ case 9:
732
+ if (!(i < uniquePubs.length)) return [3 /*break*/, 12];
720
733
  pub = uniquePubs[i];
721
734
  return [4 /*yield*/, this.checkPubsForChanges(pub['oplog'].collection, pub['oplog'].doc, pub['oplog'].type, pub)];
722
- case 12:
735
+ case 10:
723
736
  _a.sent();
724
- _a.label = 13;
725
- case 13:
737
+ _a.label = 11;
738
+ case 11:
726
739
  i++;
727
- return [3 /*break*/, 11];
728
- case 14: return [2 /*return*/];
740
+ return [3 /*break*/, 9];
741
+ case 12: return [2 /*return*/];
729
742
  }
730
743
  });
731
744
  }); }, 500);
732
745
  };
733
746
  SubscriptionManager.prototype.resendPubsForDelete = function (collection) {
734
747
  return __awaiter(this, void 0, void 0, function () {
735
- var that, subCopy, _loop_5, this_2, jj, _loop_6, zz;
748
+ var that, subCopy, _loop_6, this_2, jj, _loop_7, zz;
736
749
  var _this = this;
737
750
  return __generator(this, function (_a) {
738
751
  switch (_a.label) {
739
752
  case 0:
740
753
  that = this;
741
754
  subCopy = common_1.deepCopy(that._subscriptions.filter(function (a) { return a.collections.includes(collection); }));
742
- _loop_5 = function (jj) {
755
+ _loop_6 = function (jj) {
743
756
  if (this_2._subCache[jj].collection === collection || subCopy.some(function (a) { return a.publication === _this._subCache[jj].publication; })) {
744
757
  this_2._nodeCache.del(this_2._subCache[jj].id);
745
758
  this_2._subCache.splice(jj, 1);
@@ -747,9 +760,9 @@ var SubscriptionManager = /** @class */ (function () {
747
760
  };
748
761
  this_2 = this;
749
762
  for (jj = this._subCache.length - 1; jj >= 0; jj--) {
750
- _loop_5(jj);
763
+ _loop_6(jj);
751
764
  }
752
- _loop_6 = function (zz) {
765
+ _loop_7 = function (zz) {
753
766
  var sub;
754
767
  return __generator(this, function (_a) {
755
768
  switch (_a.label) {
@@ -793,7 +806,7 @@ var SubscriptionManager = /** @class */ (function () {
793
806
  _a.label = 1;
794
807
  case 1:
795
808
  if (!(zz >= 0)) return [3 /*break*/, 4];
796
- return [5 /*yield**/, _loop_6(zz)];
809
+ return [5 /*yield**/, _loop_7(zz)];
797
810
  case 2:
798
811
  _a.sent();
799
812
  _a.label = 3;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@resolveio/server-lib",
3
- "version": "5.2.22",
3
+ "version": "5.2.23",
4
4
  "description": "",
5
5
  "main": "index.ts",
6
6
  "scripts": {