@resolveio/server-lib 5.3.4 → 6.0.0-newrole
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.
- package/client-server-app.js +3 -3
- package/client-server-app.js.map +1 -1
- package/collections/user.collection.js +39 -32
- package/collections/user.collection.js.map +1 -1
- package/fixtures/cron-jobs.js +2 -1
- package/fixtures/cron-jobs.js.map +1 -1
- package/fixtures/init.js +3 -2
- package/fixtures/init.js.map +1 -1
- package/http/auth.js +2 -1
- package/http/auth.js.map +1 -1
- package/index.d.ts +1 -1
- package/index.js +5 -4
- package/index.js.map +1 -1
- package/managers/cron.manager.js +2 -1
- package/managers/cron.manager.js.map +1 -1
- package/managers/method.manager.d.ts +3 -3
- package/managers/method.manager.js +15 -7
- package/managers/method.manager.js.map +1 -1
- package/managers/queue-method.manager.js +2 -1
- package/managers/queue-method.manager.js.map +1 -1
- package/managers/subscription.manager.js +40 -26
- package/managers/subscription.manager.js.map +1 -1
- package/managers/support.manager.d.ts +2 -2
- package/managers/support.manager.js +11 -4
- package/managers/support.manager.js.map +1 -1
- package/methods/accounts.js +2 -1
- package/methods/accounts.js.map +1 -1
- package/methods/aws.js +2 -1
- package/methods/aws.js.map +1 -1
- package/methods/counters.js +2 -1
- package/methods/counters.js.map +1 -1
- package/methods/cron-jobs.js +2 -1
- package/methods/cron-jobs.js.map +1 -1
- package/methods/logs.js +2 -1
- package/methods/logs.js.map +1 -1
- package/methods/report-builder.js +2 -1
- package/methods/report-builder.js.map +1 -1
- package/package.json +25 -25
- package/publications/support-tickets.js +2 -1
- package/publications/support-tickets.js.map +1 -1
- package/server-app.js +17 -7
- package/server-app.js.map +1 -1
- package/support-methods/aws.js +2 -1
- package/support-methods/aws.js.map +1 -1
- package/support-methods/counters.js +2 -1
- package/support-methods/counters.js.map +1 -1
- package/support-methods/support.js +2 -1
- package/support-methods/support.js.map +1 -1
- package/util/common.js +8 -1
- package/util/common.js.map +1 -1
- package/util/schema-report-builder.js +9 -8
- package/util/schema-report-builder.js.map +1 -1
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
5
|
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
6
|
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) :
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
9
|
});
|
|
9
10
|
};
|
|
@@ -34,6 +35,13 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
34
35
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
35
36
|
}
|
|
36
37
|
};
|
|
38
|
+
var __spreadArrays = (this && this.__spreadArrays) || function () {
|
|
39
|
+
for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
|
|
40
|
+
for (var r = Array(s), k = 0, i = 0; i < il; i++)
|
|
41
|
+
for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
|
|
42
|
+
r[k] = a[j];
|
|
43
|
+
return r;
|
|
44
|
+
};
|
|
37
45
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
46
|
var MongoOplog = require("mongo-oplog");
|
|
39
47
|
var logs_1 = require("../publications/logs");
|
|
@@ -218,7 +226,8 @@ var SubscriptionManager = /** @class */ (function () {
|
|
|
218
226
|
subscriptionData[_i - 4] = arguments[_i];
|
|
219
227
|
}
|
|
220
228
|
return __awaiter(this, void 0, void 0, function () {
|
|
221
|
-
var
|
|
229
|
+
var that, pub, valObj, valKeys, rootKeys, i, sub, _a, newActiveSub, newLoggedInUser, begDate, endDate, billUser;
|
|
230
|
+
var _b;
|
|
222
231
|
return __generator(this, function (_c) {
|
|
223
232
|
switch (_c.label) {
|
|
224
233
|
case 0:
|
|
@@ -284,10 +293,10 @@ var SubscriptionManager = /** @class */ (function () {
|
|
|
284
293
|
// Send pub data to client who just subscribed only, don't want to send to existing clients since nothing has changed
|
|
285
294
|
that.sendPubDataOnce(ws, messageId, sub, 'newSub', that.getPublicationCollections(publication)[0]);
|
|
286
295
|
if (!(that._publications[sub.publication].preFunction && !sub.preSubscriptionData)) return [3 /*break*/, 3];
|
|
287
|
-
|
|
288
|
-
return [4 /*yield*/, (
|
|
296
|
+
_a = sub;
|
|
297
|
+
return [4 /*yield*/, (_b = that._publications[sub.publication]).preFunction.apply(_b, sub.subscriptionData)];
|
|
289
298
|
case 2:
|
|
290
|
-
|
|
299
|
+
_a.preSubscriptionData = _c.sent();
|
|
291
300
|
_c.label = 3;
|
|
292
301
|
case 3:
|
|
293
302
|
newActiveSub = new active_subscription_collection_1.ActiveSubscriptions({
|
|
@@ -693,7 +702,8 @@ var SubscriptionManager = /** @class */ (function () {
|
|
|
693
702
|
case 0:
|
|
694
703
|
oplog = uniqueOplog_1[i];
|
|
695
704
|
_loop_6 = function (j) {
|
|
696
|
-
var
|
|
705
|
+
var sub;
|
|
706
|
+
var _a;
|
|
697
707
|
return __generator(this, function (_b) {
|
|
698
708
|
switch (_b.label) {
|
|
699
709
|
case 0:
|
|
@@ -750,7 +760,7 @@ var SubscriptionManager = /** @class */ (function () {
|
|
|
750
760
|
case 8: return [3 /*break*/, 16];
|
|
751
761
|
case 9:
|
|
752
762
|
if (!that._publications[sub.publication].fetchFunction) return [3 /*break*/, 13];
|
|
753
|
-
if (!(_a = that._publications[sub.publication]).fetchFunction.apply(_a, [oplog.doc]
|
|
763
|
+
if (!(_a = that._publications[sub.publication]).fetchFunction.apply(_a, __spreadArrays([oplog.doc], sub.subscriptionData))) return [3 /*break*/, 12];
|
|
754
764
|
if (!!uniquePubs.filter(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData); }).length) return [3 /*break*/, 12];
|
|
755
765
|
if (!!sub.clients.length) return [3 /*break*/, 11];
|
|
756
766
|
that._subscriptions.splice(j, 1);
|
|
@@ -933,7 +943,8 @@ var SubscriptionManager = /** @class */ (function () {
|
|
|
933
943
|
// Check to see if any pubs need to refetch due to Mongo operation
|
|
934
944
|
SubscriptionManager.prototype.checkPubsForChanges = function (collection, document, type, sub) {
|
|
935
945
|
return __awaiter(this, void 0, void 0, function () {
|
|
936
|
-
var
|
|
946
|
+
var that, _a, k, client, j, ws, j, ws;
|
|
947
|
+
var _b, _c;
|
|
937
948
|
return __generator(this, function (_d) {
|
|
938
949
|
switch (_d.label) {
|
|
939
950
|
case 0:
|
|
@@ -950,10 +961,10 @@ var SubscriptionManager = /** @class */ (function () {
|
|
|
950
961
|
return [2 /*return*/];
|
|
951
962
|
case 2:
|
|
952
963
|
if (!that._publications[sub.publication].preFunction) return [3 /*break*/, 6];
|
|
953
|
-
|
|
964
|
+
_a = sub;
|
|
954
965
|
return [4 /*yield*/, that._publications[sub.publication].preFunction(sub.subscriptionData)];
|
|
955
966
|
case 3:
|
|
956
|
-
|
|
967
|
+
_a.preSubscriptionData = _d.sent();
|
|
957
968
|
if (!that._publications[sub.publication].fetchFunction(document, sub.preSubscriptionData)) return [3 /*break*/, 5];
|
|
958
969
|
if (this._subCache.findIndex(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData); }) >= 0) {
|
|
959
970
|
this._nodeCache.del(this._subCache.filter(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData); })[0].id);
|
|
@@ -976,7 +987,7 @@ var SubscriptionManager = /** @class */ (function () {
|
|
|
976
987
|
if (!(k < sub.clients.length)) return [3 /*break*/, 17];
|
|
977
988
|
client = sub.clients[k];
|
|
978
989
|
if (!that._publications[sub.publication].fetchFunction) return [3 /*break*/, 12];
|
|
979
|
-
if (!(
|
|
990
|
+
if (!(_b = that._publications[sub.publication]).fetchFunction.apply(_b, __spreadArrays([document, client.id_user], sub.subscriptionData))) return [3 /*break*/, 11];
|
|
980
991
|
j = 0;
|
|
981
992
|
_d.label = 8;
|
|
982
993
|
case 8:
|
|
@@ -1011,7 +1022,7 @@ var SubscriptionManager = /** @class */ (function () {
|
|
|
1011
1022
|
case 17: return [3 /*break*/, 23];
|
|
1012
1023
|
case 18:
|
|
1013
1024
|
if (!that._publications[sub.publication].fetchFunction) return [3 /*break*/, 21];
|
|
1014
|
-
if (!(
|
|
1025
|
+
if (!(_c = that._publications[sub.publication]).fetchFunction.apply(_c, __spreadArrays([document], sub.subscriptionData))) return [3 /*break*/, 20];
|
|
1015
1026
|
if (this._subCache.findIndex(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData); }) >= 0) {
|
|
1016
1027
|
this._nodeCache.del(this._subCache.filter(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData); })[0].id);
|
|
1017
1028
|
this._subCache.splice(this._subCache.findIndex(function (a) { return a.publication === sub.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(sub.subscriptionData); }), 1);
|
|
@@ -1039,7 +1050,8 @@ var SubscriptionManager = /** @class */ (function () {
|
|
|
1039
1050
|
var _this = this;
|
|
1040
1051
|
var that = this;
|
|
1041
1052
|
that._subscriptions.filter(function (a) { return a.collections.includes(collection); }).forEach(function (sub) { return __awaiter(_this, void 0, void 0, function () {
|
|
1042
|
-
var
|
|
1053
|
+
var schemaErrors, _a, _b;
|
|
1054
|
+
var _c, _d, _e;
|
|
1043
1055
|
return __generator(this, function (_f) {
|
|
1044
1056
|
switch (_f.label) {
|
|
1045
1057
|
case 0:
|
|
@@ -1059,17 +1071,17 @@ var SubscriptionManager = /** @class */ (function () {
|
|
|
1059
1071
|
if (!sub.preSubscriptionData) return [3 /*break*/, 4];
|
|
1060
1072
|
if (!that._publications[sub.publication].fetchFunction(document, sub.preSubscriptionData)) return [3 /*break*/, 4];
|
|
1061
1073
|
that.sendPubData(sub, 'support', collection);
|
|
1062
|
-
|
|
1063
|
-
return [4 /*yield*/, (
|
|
1074
|
+
_a = sub;
|
|
1075
|
+
return [4 /*yield*/, (_c = that._publications[sub.publication]).preFunction.apply(_c, sub.subscriptionData)];
|
|
1064
1076
|
case 3:
|
|
1065
|
-
|
|
1077
|
+
_a.preSubscriptionData = _f.sent();
|
|
1066
1078
|
return [2 /*return*/];
|
|
1067
1079
|
case 4:
|
|
1068
1080
|
if (!that._publications[sub.publication].preFunction) return [3 /*break*/, 6];
|
|
1069
|
-
|
|
1070
|
-
return [4 /*yield*/, (
|
|
1081
|
+
_b = sub;
|
|
1082
|
+
return [4 /*yield*/, (_d = that._publications[sub.publication]).preFunction.apply(_d, sub.subscriptionData)];
|
|
1071
1083
|
case 5:
|
|
1072
|
-
|
|
1084
|
+
_b.preSubscriptionData = _f.sent();
|
|
1073
1085
|
if (that._publications[sub.publication].fetchFunction(document, sub.preSubscriptionData)) {
|
|
1074
1086
|
that.sendPubData(sub, 'support', collection);
|
|
1075
1087
|
}
|
|
@@ -1079,7 +1091,7 @@ var SubscriptionManager = /** @class */ (function () {
|
|
|
1079
1091
|
sub.clients.forEach(function (client) {
|
|
1080
1092
|
var _a;
|
|
1081
1093
|
if (that._publications[sub.publication].fetchFunction) {
|
|
1082
|
-
if ((_a = that._publications[sub.publication]).fetchFunction.apply(_a, [document, client.id_user]
|
|
1094
|
+
if ((_a = that._publications[sub.publication]).fetchFunction.apply(_a, __spreadArrays([document, client.id_user], sub.subscriptionData))) {
|
|
1083
1095
|
that._wss.clients.forEach(function (ws) {
|
|
1084
1096
|
if (ws['id_socket'] === client.id_socket) {
|
|
1085
1097
|
that.sendPubDataOnce(ws, client.messageId, sub, 'support', collection);
|
|
@@ -1098,7 +1110,7 @@ var SubscriptionManager = /** @class */ (function () {
|
|
|
1098
1110
|
}
|
|
1099
1111
|
else {
|
|
1100
1112
|
if (that._publications[sub.publication].fetchFunction) {
|
|
1101
|
-
if ((
|
|
1113
|
+
if ((_e = that._publications[sub.publication]).fetchFunction.apply(_e, __spreadArrays([document], sub.subscriptionData))) {
|
|
1102
1114
|
that.sendPubData(sub, 'support', collection);
|
|
1103
1115
|
}
|
|
1104
1116
|
}
|
|
@@ -1116,7 +1128,8 @@ var SubscriptionManager = /** @class */ (function () {
|
|
|
1116
1128
|
SubscriptionManager.prototype.sendPubDataOnce = function (ws, messageId, subscription, type, collection) {
|
|
1117
1129
|
var _this = this;
|
|
1118
1130
|
return new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
|
|
1119
|
-
var
|
|
1131
|
+
var that, serverRes;
|
|
1132
|
+
var _a, _b;
|
|
1120
1133
|
var _this = this;
|
|
1121
1134
|
return __generator(this, function (_c) {
|
|
1122
1135
|
that = this;
|
|
@@ -1134,7 +1147,7 @@ var SubscriptionManager = /** @class */ (function () {
|
|
|
1134
1147
|
if (subscription.publication !== 'superadminAPM' && subscription.publication !== 'loggedInUsers') {
|
|
1135
1148
|
that._mainServer.getMethodManager().callMethodInternal('insertSubscriptionLog', type, subscription.publication, collection, JSON.stringify(subscription.subscriptionData));
|
|
1136
1149
|
}
|
|
1137
|
-
(_a = that._publications[subscription.publication].function).call.apply(_a, [Object.assign({}, that, SubscriptionManager.prototype)]
|
|
1150
|
+
(_a = that._publications[subscription.publication].function).call.apply(_a, __spreadArrays([Object.assign({}, that, SubscriptionManager.prototype)], subscription.subscriptionData)).then(function (res) {
|
|
1138
1151
|
var nodeCacheSize = _this._nodeCache.getStats().vsize;
|
|
1139
1152
|
if (nodeCacheSize > 500000000) {
|
|
1140
1153
|
var neededSizeIndex = 0;
|
|
@@ -1174,7 +1187,7 @@ var SubscriptionManager = /** @class */ (function () {
|
|
|
1174
1187
|
}
|
|
1175
1188
|
}
|
|
1176
1189
|
else { // Pub is different for each user (Look at users publication) [MUCH SLOWER, RE-RUNS FOR EACH USER]
|
|
1177
|
-
(_b = that._publications[subscription.publication].function).call.apply(_b, [Object.assign({}, that, SubscriptionManager.prototype), ws['id_user']]
|
|
1190
|
+
(_b = that._publications[subscription.publication].function).call.apply(_b, __spreadArrays([Object.assign({}, that, SubscriptionManager.prototype), ws['id_user']], subscription.subscriptionData)).then(function (res) {
|
|
1178
1191
|
var serverRes = {
|
|
1179
1192
|
messageId: messageId,
|
|
1180
1193
|
hasError: false,
|
|
@@ -1202,7 +1215,8 @@ var SubscriptionManager = /** @class */ (function () {
|
|
|
1202
1215
|
SubscriptionManager.prototype.sendPubData = function (subscription, type, collection) {
|
|
1203
1216
|
var _this = this;
|
|
1204
1217
|
return new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
|
|
1205
|
-
var
|
|
1218
|
+
var that;
|
|
1219
|
+
var _a;
|
|
1206
1220
|
var _this = this;
|
|
1207
1221
|
return __generator(this, function (_b) {
|
|
1208
1222
|
that = this;
|
|
@@ -1226,7 +1240,7 @@ var SubscriptionManager = /** @class */ (function () {
|
|
|
1226
1240
|
if (subscription.publication !== 'superadminAPM' && subscription.publication !== 'loggedInUsers') {
|
|
1227
1241
|
that._mainServer.getMethodManager().callMethodInternal('insertSubscriptionLog', type, subscription.publication, collection, JSON.stringify(subscription.subscriptionData));
|
|
1228
1242
|
}
|
|
1229
|
-
(_a = that._publications[subscription.publication].function).call.apply(_a, [Object.assign({}, that, SubscriptionManager.prototype)]
|
|
1243
|
+
(_a = that._publications[subscription.publication].function).call.apply(_a, __spreadArrays([Object.assign({}, that, SubscriptionManager.prototype)], subscription.subscriptionData)).then(function (res) {
|
|
1230
1244
|
var nodeCacheSize = _this._nodeCache.getStats().vsize;
|
|
1231
1245
|
if (nodeCacheSize > 500000000) {
|
|
1232
1246
|
var neededSizeIndex = 0;
|