@resolveio/server-lib 22.2.46 → 22.2.48

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 (6) hide show
  1. package/managers/mongo.manager.js +52 -37
  2. package/managers/mongo.manager.js.map +1 -1
  3. package/methods/support.js +21 -1
  4. package/methods/support.js.map +1 -1
  5. package/package.json +1 -1
  6. package/private/email-templates/support-ticket-modified.html +0 -1
package/managers/mongo.manager.js CHANGED
@@ -150,6 +150,31 @@ function buildQueryMetaFromFindOptions(options) {
150
150
  }
151
151
  return Object.keys(meta).length ? meta : null;
152
152
  }
153
+ function stripManagedVersionFields(update) {
154
+ var e_1, _a;
155
+ if (!update) {
156
+ return;
157
+ }
158
+ try {
159
+ for (var _b = __values(['$set', '$setOnInsert']), _c = _b.next(); !_c.done; _c = _b.next()) {
160
+ var operator = _c.value;
161
+ var modifier = update[operator];
162
+ if (modifier && typeof modifier === 'object' && '__v' in modifier) {
163
+ delete modifier.__v;
164
+ if (Object.keys(modifier).length === 0) {
165
+ delete update[operator];
166
+ }
167
+ }
168
+ }
169
+ }
170
+ catch (e_1_1) { e_1 = { error: e_1_1 }; }
171
+ finally {
172
+ try {
173
+ if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
174
+ }
175
+ finally { if (e_1) throw e_1.error; }
176
+ }
177
+ }
153
178
  var MongoManager = /** @class */ (function () {
154
179
  function MongoManager() {
155
180
  this._collections = [];
@@ -206,7 +231,7 @@ var MongoManager = /** @class */ (function () {
206
231
  });
207
232
  };
208
233
  MongoManager.prototype.resolveWatchedDatabases = function () {
209
- var e_1, _a;
234
+ var e_2, _a;
210
235
  var config = resolveio_server_app_1.ResolveIOServer.getServerConfig ? resolveio_server_app_1.ResolveIOServer.getServerConfig() : null;
211
236
  var watchSet = new Set();
212
237
  if (this._mainDatabaseName) {
@@ -222,12 +247,12 @@ var MongoManager = /** @class */ (function () {
222
247
  }
223
248
  }
224
249
  }
225
- catch (e_1_1) { e_1 = { error: e_1_1 }; }
250
+ catch (e_2_1) { e_2 = { error: e_2_1 }; }
226
251
  finally {
227
252
  try {
228
253
  if (configValue_1_1 && !configValue_1_1.done && (_a = configValue_1.return)) _a.call(configValue_1);
229
254
  }
230
- finally { if (e_1) throw e_1.error; }
255
+ finally { if (e_2) throw e_2.error; }
231
256
  }
232
257
  }
233
258
  else if (typeof configValue === 'string' && configValue.trim()) {
@@ -936,7 +961,7 @@ var MongoManager = /** @class */ (function () {
936
961
  return undefined;
937
962
  };
938
963
  MongoManager.prototype.addToCache = function (collections, cacheKey, data) {
939
- var e_2, _a;
964
+ var e_3, _a;
940
965
  if ((0, common_1.getBinarySize)(JSON.stringify(data)) < 1000000 &&
941
966
  !collections.includes('logs') &&
942
967
  !collections.find(function (a) { return a.endsWith('.versions'); }) &&
@@ -956,12 +981,12 @@ var MongoManager = /** @class */ (function () {
956
981
  }
957
982
  }
958
983
  }
959
- catch (e_2_1) { e_2 = { error: e_2_1 }; }
984
+ catch (e_3_1) { e_3 = { error: e_3_1 }; }
960
985
  finally {
961
986
  try {
962
987
  if (keys_1_1 && !keys_1_1.done && (_a = keys_1.return)) _a.call(keys_1);
963
988
  }
964
- finally { if (e_2) throw e_2.error; }
989
+ finally { if (e_3) throw e_3.error; }
965
990
  }
966
991
  console.log('Query Cache: ' + 'Too Big, - Deleted: ' + deleteCount + ' - ' + nodeCacheSize);
967
992
  }
@@ -970,7 +995,7 @@ var MongoManager = /** @class */ (function () {
970
995
  }
971
996
  };
972
997
  MongoManager.prototype.invalidateQueryCache = function (collection, bypassLocalOplog) {
973
- var e_3, _a, e_4, _b;
998
+ var e_4, _a, e_5, _b;
974
999
  if (bypassLocalOplog === void 0) { bypassLocalOplog = false; }
975
1000
  var collectionCacheMap = this._cacheMap.filter(function (a) { return a.collections.includes(collection); });
976
1001
  if (resolveio_server_app_1.ResolveIOServer.getMainServer().getSubscriptionManager() && resolveio_server_app_1.ResolveIOServer.getMainServer().getSubscriptionManager().getEnableDebug()) {
@@ -988,12 +1013,12 @@ var MongoManager = /** @class */ (function () {
988
1013
  }
989
1014
  }
990
1015
  }
991
- catch (e_3_1) { e_3 = { error: e_3_1 }; }
1016
+ catch (e_4_1) { e_4 = { error: e_4_1 }; }
992
1017
  finally {
993
1018
  try {
994
1019
  if (collectionCacheMap_1_1 && !collectionCacheMap_1_1.done && (_a = collectionCacheMap_1.return)) _a.call(collectionCacheMap_1);
995
1020
  }
996
- finally { if (e_3) throw e_3.error; }
1021
+ finally { if (e_4) throw e_4.error; }
997
1022
  }
998
1023
  try {
999
1024
  // eslint-disable-next-line no-unused-vars
@@ -1007,12 +1032,12 @@ var MongoManager = /** @class */ (function () {
1007
1032
  }
1008
1033
  }
1009
1034
  }
1010
- catch (e_4_1) { e_4 = { error: e_4_1 }; }
1035
+ catch (e_5_1) { e_5 = { error: e_5_1 }; }
1011
1036
  finally {
1012
1037
  try {
1013
1038
  if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
1014
1039
  }
1015
- finally { if (e_4) throw e_4.error; }
1040
+ finally { if (e_5) throw e_5.error; }
1016
1041
  }
1017
1042
  this._cacheMap = this._cacheMap.filter(function (a) { return !a.collections.includes(collection); });
1018
1043
  if (!bypassLocalOplog && resolveio_server_app_1.ResolveIOServer.getMainServer().getSubscriptionManager() && resolveio_server_app_1.ResolveIOServer.getMainServer().getSubscriptionManager().getUseLocalOplog()) {
@@ -1020,7 +1045,7 @@ var MongoManager = /** @class */ (function () {
1020
1045
  }
1021
1046
  };
1022
1047
  MongoManager.prototype.clearQueryCache = function (reason) {
1023
- var e_5, _a;
1048
+ var e_6, _a;
1024
1049
  if (resolveio_server_app_1.ResolveIOServer.getMainServer().getSubscriptionManager() && resolveio_server_app_1.ResolveIOServer.getMainServer().getSubscriptionManager().getEnableDebug()) {
1025
1050
  console.log(new Date(), 'Mongo Clear Cache', reason || '');
1026
1051
  }
@@ -1039,12 +1064,12 @@ var MongoManager = /** @class */ (function () {
1039
1064
  operation.invalidatedDuringExecution = true;
1040
1065
  }
1041
1066
  }
1042
- catch (e_5_1) { e_5 = { error: e_5_1 }; }
1067
+ catch (e_6_1) { e_6 = { error: e_6_1 }; }
1043
1068
  finally {
1044
1069
  try {
1045
1070
  if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
1046
1071
  }
1047
- finally { if (e_5) throw e_5.error; }
1072
+ finally { if (e_6) throw e_6.error; }
1048
1073
  }
1049
1074
  };
1050
1075
  MongoManager.prototype.handleMongoReconnect = function (reason) {
@@ -1707,7 +1732,7 @@ var MongoManagerCollection = /** @class */ (function () {
1707
1732
  _a = options || {}, session = _a.session, safeOptions = __rest(_a, ["session"]);
1708
1733
  _loop_2 = function () {
1709
1734
  var batchOps, logs, versionOps, batchOps_1, batchOps_1_1, op, opType, doc, validationContext, isValid, affectedDocs, versionFilters, versionInserts, _c, _d, monitor, err_13, bwOptions, affectedDocIds, pipeline, oldVersions, _e;
1710
- var e_6, _f;
1735
+ var e_7, _f;
1711
1736
  return __generator(this, function (_g) {
1712
1737
  switch (_g.label) {
1713
1738
  case 0:
@@ -1715,7 +1740,7 @@ var MongoManagerCollection = /** @class */ (function () {
1715
1740
  logs = [];
1716
1741
  versionOps = [];
1717
1742
  try {
1718
- for (batchOps_1 = (e_6 = void 0, __values(batchOps)), batchOps_1_1 = batchOps_1.next(); !batchOps_1_1.done; batchOps_1_1 = batchOps_1.next()) {
1743
+ for (batchOps_1 = (e_7 = void 0, __values(batchOps)), batchOps_1_1 = batchOps_1.next(); !batchOps_1_1.done; batchOps_1_1 = batchOps_1.next()) {
1719
1744
  op = batchOps_1_1.value;
1720
1745
  opType = Object.keys(op)[0];
1721
1746
  doc = op[opType];
@@ -1886,12 +1911,12 @@ var MongoManagerCollection = /** @class */ (function () {
1886
1911
  }
1887
1912
  }
1888
1913
  }
1889
- catch (e_6_1) { e_6 = { error: e_6_1 }; }
1914
+ catch (e_7_1) { e_7 = { error: e_7_1 }; }
1890
1915
  finally {
1891
1916
  try {
1892
1917
  if (batchOps_1_1 && !batchOps_1_1.done && (_f = batchOps_1.return)) _f.call(batchOps_1);
1893
1918
  }
1894
- finally { if (e_6) throw e_6.error; }
1919
+ finally { if (e_7) throw e_7.error; }
1895
1920
  }
1896
1921
  affectedDocs = [];
1897
1922
  if (!(!bypassVersions && this_2.useVersions && versionOps.length > 0)) return [3 /*break*/, 9];
@@ -3315,8 +3340,8 @@ var MongoManagerCollection = /** @class */ (function () {
3315
3340
  };
3316
3341
  MongoManagerCollection.prototype.insertMany = function (docs_1, options_1) {
3317
3342
  return __awaiter(this, arguments, void 0, function (docs, options, bypassLogs, bypassCheckSchema, bypassMonitor, bypassSession) {
3318
- var validationResults, docs_2, docs_2_1, doc, validation, isValid, e_7_1, validDocs, mongoSession, _a, session, safeOptions, i, doc, date, monitor, err_31;
3319
- var e_7, _b;
3343
+ var validationResults, docs_2, docs_2_1, doc, validation, isValid, e_8_1, validDocs, mongoSession, _a, session, safeOptions, i, doc, date, monitor, err_31;
3344
+ var e_8, _b;
3320
3345
  var _this = this;
3321
3346
  if (bypassLogs === void 0) { bypassLogs = false; }
3322
3347
  if (bypassCheckSchema === void 0) { bypassCheckSchema = false; }
@@ -3355,14 +3380,14 @@ var MongoManagerCollection = /** @class */ (function () {
3355
3380
  return [3 /*break*/, 2];
3356
3381
  case 6: return [3 /*break*/, 9];
3357
3382
  case 7:
3358
- e_7_1 = _c.sent();
3359
- e_7 = { error: e_7_1 };
3383
+ e_8_1 = _c.sent();
3384
+ e_8 = { error: e_8_1 };
3360
3385
  return [3 /*break*/, 9];
3361
3386
  case 8:
3362
3387
  try {
3363
3388
  if (docs_2_1 && !docs_2_1.done && (_b = docs_2.return)) _b.call(docs_2);
3364
3389
  }
3365
- finally { if (e_7) throw e_7.error; }
3390
+ finally { if (e_8) throw e_8.error; }
3366
3391
  return [7 /*endfinally*/];
3367
3392
  case 9:
3368
3393
  validDocs = this.checkSchema ? docs.filter(function (a, idx) { return validationResults[idx]; }) : docs;
@@ -4260,13 +4285,8 @@ var MongoManagerCollection = /** @class */ (function () {
4260
4285
  if (typeof update.$inc.__v !== 'number') {
4261
4286
  update.$inc.__v = 1;
4262
4287
  }
4263
- // If someone mistakenly put __v in $set, remove it
4264
- if (update.$set && '__v' in update.$set) {
4265
- delete update.$set.__v;
4266
- if (Object.keys(update.$set).length === 0) {
4267
- delete update.$set;
4268
- }
4269
- }
4288
+ // Managed versioned collections own __v updates.
4289
+ stripManagedVersionFields(update);
4270
4290
  _c.label = 14;
4271
4291
  case 14:
4272
4292
  i++;
@@ -4434,13 +4454,8 @@ var MongoManagerCollection = /** @class */ (function () {
4434
4454
  if (typeof update.$inc.__v !== 'number') {
4435
4455
  update.$inc.__v = 1;
4436
4456
  }
4437
- // If someone mistakenly put __v in $set, remove it
4438
- if (update.$set && '__v' in update.$set) {
4439
- delete update.$set.__v;
4440
- if (Object.keys(update.$set).length === 0) {
4441
- delete update.$set;
4442
- }
4443
- }
4457
+ // Managed versioned collections own __v updates.
4458
+ stripManagedVersionFields(update);
4444
4459
  monitor = monitor_manager_1.MonitorMongo.create('updateOne', this.collectionName, JSON.stringify([filter, update, safeOptions]));
4445
4460
  _c.label = 12;
4446
4461
  case 12: