@resolveio/server-lib 5.2.25 → 5.2.26-newrole

package/collections/logged-in-users.collection.js

@@ -56,6 +56,7 @@ var DefaultSchema = new mongoose_1.Schema(schema, {
     versionKey: false,
     timestamps: true
 });
+DefaultSchema.index({ id_ws: 1 });
 exports.LoggedInUsers = index_1.ResolveIOServer.getMainDB().model('logged-in-users', DefaultSchema);
 var vSchema = __assign({}, schema);
 vSchema._id = {

package/collections/user.collection.js

@@ -22,13 +22,6 @@ var schema = {
         type: Date,
         optional: true
     },
-    readonly: {
-        type: Boolean,
-        optional: true
-    },
-    active: {
-        type: Boolean
-    },
     attempts: {
         type: Number,
         optional: true
@@ -65,53 +58,67 @@ var schema = {
         type: String
     },
     roles: {
+        type: Object
+    },
+    'roles.super_admin': {
+        type: Boolean
+    },
+    'roles.approvals': {
         type: Array
     },
-    'roles.$': {
+    'roles.approvals.$': {
+        type: Object
+    },
+    'roles.approvals.$.name': {
         type: String
     },
-    phonenumber: {
-        type: String,
-        optional: true
+    'roles.approvals.$.type': {
+        type: String
     },
-    other: {
-        type: Object,
-        blackbox: true,
-        optional: true
+    'roles.approvals.$.accounting_code': {
+        type: String
     },
-    assets: {
-        type: Array,
-        optional: true
+    'roles.groups': {
+        type: Array
     },
-    'assets.$': {
+    'roles.groups.$': {
         type: Object
     },
-    'assets.$.type': {
+    'roles.groups.$.name': {
         type: String
     },
-    'assets.$.id_asset': {
-        type: String
+    'roles.groups.$.views': {
+        type: Array
     },
-    'assets.$.asset_number': {
+    'roles.groups.$.views.$': {
         type: String
     },
-    'assets.$.ownership': {
-        type: String
+    'roles.groups.$.yard': {
+        type: String,
+        optional: true
+    },
+    'roles.notifications': {
+        type: Array
     },
-    'assets.$.ownership_driver': {
+    'roles.notifications.$': {
         type: String
     },
-    'assets.$.date_start': {
-        type: Date
+    'roles.miscs': {
+        type: Array
     },
-    'assets.$.date_end': {
-        type: Date,
-        optional: true
+    'roles.miscs.$': {
+        type: String
     },
-    id_function: {
+    active: Boolean,
+    phonenumber: {
         type: String,
         optional: true
     },
+    other: {
+        type: Object,
+        optional: true,
+        blackbox: true
+    },
     customers: {
         type: Array,
         optional: true,

package/managers/subscription.manager.d.ts

@@ -5,6 +5,7 @@ export declare class SubscriptionManager {
     private _publications;
     private _subscriptions;
     private _wss;
+    private _loggedInUsers;
     private _oplogQueue;
     private _subCache;
     private _nodeCache;

package/managers/subscription.manager.js

@@ -62,6 +62,7 @@ var SubscriptionManager = /** @class */ (function () {
         var _this = this;
         this._publications = {};
         this._subscriptions = [];
+        this._loggedInUsers = [];
         this._oplogQueue = [];
         this._subCache = [];
         this._cacheId = 0;
@@ -124,6 +125,17 @@ var SubscriptionManager = /** @class */ (function () {
                 }
             }
         }, 25);
+        logged_in_users_collection_1.LoggedInUsers.find().then(function (loggedInUsers) {
+            _this._loggedInUsers = loggedInUsers;
+        });
+        setInterval(function () {
+            for (var i = 0; i < _this._loggedInUsers.length; i++) {
+                var loggedInUser = _this._loggedInUsers[i];
+                if (!loggedInUser.updatedAt || moment().diff(moment(loggedInUser.updatedAt), 'minutes', true) > 1) {
+                    _this.unsubscribeAll(_this._mainServer.getWS(loggedInUser.id_ws));
+                }
+            }
+        }, 60000);
     }
     // Add all files to publications private object
     SubscriptionManager.prototype.publications = function (method) {
@@ -149,7 +161,7 @@ var SubscriptionManager = /** @class */ (function () {
             subscriptionData[_i - 4] = arguments[_i];
         }
         return __awaiter(this, void 0, void 0, function () {
-            var _a, that, pub, valObj, valKeys, rootKeys, i, sub, _b, newActiveSub, begDate, endDate, billUser;
+            var _a, that, pub, valObj, valKeys, rootKeys, i, sub, _b, newActiveSub, newLoggedInUser, begDate, endDate, billUser;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -237,14 +249,16 @@ var SubscriptionManager = /** @class */ (function () {
                         _c.label = 4;
                     case 4:
                         if (!(publication === 'appversion')) return [3 /*break*/, 6];
-                        logged_in_users_collection_1.LoggedInUsers.create({
+                        newLoggedInUser = {
                             _id: mongoose_1.Types.ObjectId().toHexString(),
                             __v: 0,
                             date: new Date(),
                             id_user: ws['id_user'],
                             user: ws['user'],
                             id_ws: ws['id_socket']
-                        });
+                        };
+                        this._loggedInUsers.push(newLoggedInUser);
+                        logged_in_users_collection_1.LoggedInUsers.create(newLoggedInUser);
                         if (!(ws['user'] !== 'Admin' && index_1.ResolveIOServer.getSupportDB())) return [3 /*break*/, 6];
                         begDate = moment().startOf('month');
                         endDate = moment().endOf('month');
@@ -340,6 +354,9 @@ var SubscriptionManager = /** @class */ (function () {
                     case 1:
                         loggedInUser = _a.sent();
                         if (loggedInUser) {
+                            if (this._loggedInUsers.map(function (a) { return a._id; }).indexOf(loggedInUser._id) >= 0) {
+                                this._loggedInUsers.splice(this._loggedInUsers.map(function (a) { return a._id; }).indexOf(loggedInUser._id), 1);
+                            }
                             logged_in_users_collection_1.LoggedInUsers.deleteOne({ _id: loggedInUser._id }).exec();
                         }
                         userSubs = that._subscriptions.filter(function (a) { return a.clients.some(function (b) { return b.id_user === ws['id_user'] && b.id_socket === ws['id_socket']; }); });
@@ -375,6 +392,7 @@ var SubscriptionManager = /** @class */ (function () {
                                 active_subscription_collection_1.ActiveSubscriptions.updateOne({ _id: sub._id }, { $set: { clients: sub.clients } }).exec();
                             }
                         });
+                        ws.terminate();
                         return [2 /*return*/];
                 }
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@resolveio/server-lib",
-  "version": "5.2.25",
+  "version": "5.2.26-newrole",
   "description": "",
   "main": "index.ts",
   "scripts": {

package/server-app.js

@@ -281,7 +281,6 @@ var ResolveIOMainServer = /** @class */ (function () {
             });
             ws['versionTimer'] = setTimeout(function () {
                 _this.unsubscribeWS(ws);
-                ws.terminate();
             }, 10000);
             // On data received (message)
             ws.on('message', function (message) { return __awaiter(_this, void 0, void 0, function () {
@@ -345,23 +344,8 @@ var ResolveIOMainServer = /** @class */ (function () {
             ws.on('error', function (error) {
                 console.log(error);
                 _this.unsubscribeWS(ws);
-                ws.terminate();
             });
         });
-        // Seems to cause issues
-        // process.stdout.on('error', (err) => {
-        // 	if (err.code === "EPIPE") {
-        // 		console.log('EPIPE error found => ignoring');
-        // 		this._wss.clients.forEach((ws: WebSocket) => {
-        // 			if (ws['isAlive'] === false) {
-        // 				if (ws['retryCnt'] >= 60) {
-        // 					this.unsubscribeWS(ws);
-        // 					ws.terminate();
-        // 				}
-        // 			}
-        // 		});
-        // 	}
-        // });
         process.on('unhandledRejection', function (reason, p) {
             console.error(reason, 'Unhandled Rejection at Promise', p);
             _this._methodManager.sendEmail('dev@resolveio.com', 'SERVER - Unhandled Rejection - ' + _this._serverConfig['CLIENT_NAME'], JSON.stringify([reason, p]));
@@ -378,7 +362,6 @@ var ResolveIOMainServer = /** @class */ (function () {
                     ws['retryCnt']++;
                     if (ws['retryCnt'] >= 60) {
                         _this.unsubscribeWS(ws);
-                        ws.terminate();
                     }
                     else {
                         ws['pingTime'] = new Date();
@@ -421,7 +404,6 @@ var ResolveIOMainServer = /** @class */ (function () {
                                         if (method === 'disconnectWSCommand') {
                                             setTimeout(function () {
                                                 _this.unsubscribeWS(ws);
-                                                ws.terminate();
                                             }, 5000);
                                         }
                                         if (ws['user_readonly']) {