@resolveio/server-lib 5.0.11-newrole → 5.0.12-debug

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 (5) hide show
  1. package/collections/user.collection.js +32 -39
  2. package/fixtures/init.js +1 -1
  3. package/managers/subscription.manager.js +10 -4
  4. package/package.json +1 -1
  5. package/server-app.js +13 -0
package/collections/user.collection.js CHANGED
@@ -22,6 +22,13 @@ var schema = {
22
22
  type: Date,
23
23
  optional: true
24
24
  },
25
+ readonly: {
26
+ type: Boolean,
27
+ optional: true
28
+ },
29
+ active: {
30
+ type: Boolean
31
+ },
25
32
  attempts: {
26
33
  type: Number,
27
34
  optional: true
@@ -58,67 +65,53 @@ var schema = {
58
65
  type: String
59
66
  },
60
67
  roles: {
61
- type: Object
62
- },
63
- 'roles.super_admin': {
64
- type: Boolean
65
- },
66
- 'roles.approvals': {
67
68
  type: Array
68
69
  },
69
- 'roles.approvals.$': {
70
- type: Object
71
- },
72
- 'roles.approvals.$.name': {
70
+ 'roles.$': {
73
71
  type: String
74
72
  },
75
- 'roles.approvals.$.type': {
76
- type: String
73
+ phonenumber: {
74
+ type: String,
75
+ optional: true
77
76
  },
78
- 'roles.approvals.$.accounting_code': {
79
- type: String
77
+ other: {
78
+ type: Object,
79
+ blackbox: true,
80
+ optional: true
80
81
  },
81
- 'roles.groups': {
82
- type: Array
82
+ assets: {
83
+ type: Array,
84
+ optional: true
83
85
  },
84
- 'roles.groups.$': {
86
+ 'assets.$': {
85
87
  type: Object
86
88
  },
87
- 'roles.groups.$.name': {
89
+ 'assets.$.type': {
88
90
  type: String
89
91
  },
90
- 'roles.groups.$.views': {
91
- type: Array
92
- },
93
- 'roles.groups.$.views.$': {
92
+ 'assets.$.id_asset': {
94
93
  type: String
95
94
  },
96
- 'roles.groups.$.yard': {
97
- type: String,
98
- optional: true
95
+ 'assets.$.asset_number': {
96
+ type: String
99
97
  },
100
- 'roles.notifications': {
101
- type: Array
98
+ 'assets.$.ownership': {
99
+ type: String
102
100
  },
103
- 'roles.notifications.$': {
101
+ 'assets.$.ownership_driver': {
104
102
  type: String
105
103
  },
106
- 'roles.miscs': {
107
- type: Array
104
+ 'assets.$.date_start': {
105
+ type: Date
108
106
  },
109
- 'roles.miscs.$': {
110
- type: String
107
+ 'assets.$.date_end': {
108
+ type: Date,
109
+ optional: true
111
110
  },
112
- active: Boolean,
113
- phonenumber: {
111
+ id_function: {
114
112
  type: String,
115
113
  optional: true
116
114
  },
117
- other: {
118
- type: Object,
119
- optional: true,
120
- blackbox: true
121
- },
122
115
  customers: {
123
116
  type: Array,
124
117
  optional: true,
package/fixtures/init.js CHANGED
@@ -37,8 +37,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
37
37
  Object.defineProperty(exports, "__esModule", { value: true });
38
38
  var app_version_collection_1 = require("../collections/app-version.collection");
39
39
  var logged_in_users_collection_1 = require("../collections/logged-in-users.collection");
40
- var mongoose_1 = require("mongoose");
41
40
  var active_subscription_collection_1 = require("../collections/active-subscription.collection");
41
+ var mongoose_1 = require("mongoose");
42
42
  function loadServerInit() {
43
43
  return __awaiter(this, void 0, void 0, function () {
44
44
  var appVersion;
package/managers/subscription.manager.js CHANGED
@@ -933,6 +933,7 @@ var SubscriptionManager = /** @class */ (function () {
933
933
  hasError: false,
934
934
  data: this._subCache.filter(function (a) { return a.publication === subscription.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(subscription.subscriptionData); })[0].res
935
935
  };
936
+ console.log('Cache1: ' + 'Found - ' + subscription.publication);
936
937
  this.sendWS(ws, serverRes);
937
938
  }
938
939
  else {
@@ -940,8 +941,8 @@ var SubscriptionManager = /** @class */ (function () {
940
941
  that._mainServer.getMethodManager().callMethodInternal('insertSubscriptionLog', type, subscription.publication, collection, JSON.stringify(subscription.subscriptionData));
941
942
  }
942
943
  (_a = that._publications[subscription.publication].function).call.apply(_a, [Object.assign({}, that, SubscriptionManager.prototype)].concat(subscription.subscriptionData)).then(function (res) {
943
- if (common_1.getBinarySize(JSON.stringify(_this._subCache)) > 750000000) {
944
- var neededSize = (common_1.getBinarySize(JSON.stringify(_this._subCache))) - 750000000;
944
+ if (common_1.getBinarySize(JSON.stringify(_this._subCache)) > 500000000) {
945
+ var neededSize = (common_1.getBinarySize(JSON.stringify(_this._subCache))) - 500000000;
945
946
  var neededSizeIndex = 0;
946
947
  for (var zz = 0; zz < _this._subCache.length; zz++) {
947
948
  neededSize -= (common_1.getBinarySize(JSON.stringify(_this._subCache[zz])));
@@ -950,9 +951,11 @@ var SubscriptionManager = /** @class */ (function () {
950
951
  break;
951
952
  }
952
953
  }
954
+ console.log('Cache1: ' + 'Too Big - ' + subscription.publication);
953
955
  _this._subCache.splice(0, neededSizeIndex);
954
956
  }
955
957
  _this._subCache.push({ collection: collection, publication: subscription.publication, subscriptionData: subscription.subscriptionData, res: res });
958
+ console.log('Cache1: ' + 'Create - ' + subscription.publication + ' - ' + common_1.getBinarySize(JSON.stringify(_this._subCache)));
956
959
  var serverRes = {
957
960
  messageId: messageId,
958
961
  hasError: false,
@@ -1008,6 +1011,7 @@ var SubscriptionManager = /** @class */ (function () {
1008
1011
  hasError: false,
1009
1012
  data: _this._subCache.filter(function (a) { return a.publication === subscription.publication && JSON.stringify(a.subscriptionData) === JSON.stringify(subscription.subscriptionData); })[0].res
1010
1013
  };
1014
+ console.log('Cache: ' + 'Found - ' + subscription.publication);
1011
1015
  _this.sendWS(ws, serverRes);
1012
1016
  }
1013
1017
  });
@@ -1018,8 +1022,8 @@ var SubscriptionManager = /** @class */ (function () {
1018
1022
  that._mainServer.getMethodManager().callMethodInternal('insertSubscriptionLog', type, subscription.publication, collection, JSON.stringify(subscription.subscriptionData));
1019
1023
  }
1020
1024
  (_a = that._publications[subscription.publication].function).call.apply(_a, [Object.assign({}, that, SubscriptionManager.prototype)].concat(subscription.subscriptionData)).then(function (res) {
1021
- if (common_1.getBinarySize(JSON.stringify(_this._subCache)) > 750000000) {
1022
- var neededSize = (common_1.getBinarySize(JSON.stringify(_this._subCache))) - 750000000;
1025
+ if (common_1.getBinarySize(JSON.stringify(_this._subCache)) > 500000000) {
1026
+ var neededSize = (common_1.getBinarySize(JSON.stringify(_this._subCache))) - 500000000;
1023
1027
  var neededSizeIndex = 0;
1024
1028
  for (var zz = 0; zz < _this._subCache.length; zz++) {
1025
1029
  neededSize -= (common_1.getBinarySize(JSON.stringify(_this._subCache[zz])));
@@ -1028,9 +1032,11 @@ var SubscriptionManager = /** @class */ (function () {
1028
1032
  break;
1029
1033
  }
1030
1034
  }
1035
+ console.log('Cache: ' + 'Too Big - ' + subscription.publication);
1031
1036
  _this._subCache.splice(0, neededSizeIndex);
1032
1037
  }
1033
1038
  _this._subCache.push({ collection: collection, publication: subscription.publication, subscriptionData: subscription.subscriptionData, res: res });
1039
+ console.log('Cache: ' + 'Create - ' + subscription.publication + ' - ' + common_1.getBinarySize(JSON.stringify(_this._subCache)));
1034
1040
  subscription.clients.forEach(function (client) {
1035
1041
  that._wss.clients.forEach(function (ws) {
1036
1042
  if (ws['id_socket'] === client.id_socket) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@resolveio/server-lib",
3
- "version": "5.0.11-newrole",
3
+ "version": "5.0.12-debug",
4
4
  "description": "",
5
5
  "main": "index.ts",
6
6
  "scripts": {
package/server-app.js CHANGED
@@ -334,6 +334,19 @@ var ResolveIOMainServer = /** @class */ (function () {
334
334
  ws.terminate();
335
335
  });
336
336
  });
337
+ process.stdout.on('error', function (err) {
338
+ if (err.code === "EPIPE") {
339
+ console.log('EPIPE error found => ignoring');
340
+ _this._wss.clients.forEach(function (ws) {
341
+ if (ws['isAlive'] === false) {
342
+ if (ws['retryCnt'] >= 60) {
343
+ _this.unsubscribeWS(ws);
344
+ ws.terminate();
345
+ }
346
+ }
347
+ });
348
+ }
349
+ });
337
350
  // Keep alive timer to ping/pong
338
351
  setInterval(function () {
339
352
  _this._wss.clients.forEach(function (ws) {