@resolveio/server-lib 4.0.23 → 4.0.24-newrole

package/collections/user.collection.js

@@ -21,13 +21,6 @@ var schema = {
         type: Date,
         optional: true
     },
-    readonly: {
-        type: Boolean,
-        optional: true
-    },
-    active: {
-        type: Boolean
-    },
     attempts: {
         type: Number,
         optional: true
@@ -64,53 +57,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/fixtures/init.js

@@ -37,8 +37,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var app_version_collection_1 = require("../collections/app-version.collection");
 var logged_in_users_collection_1 = require("../collections/logged-in-users.collection");
-var active_subscription_collection_1 = require("../collections/active-subscription.collection");
 var mongoose_1 = require("mongoose");
+var active_subscription_collection_1 = require("../collections/active-subscription.collection");
 function loadServerInit() {
     return __awaiter(this, void 0, void 0, function () {
         var appVersion;

package/index.d.ts

@@ -8,7 +8,7 @@ export declare class ResolveIOServer {
     private static _clientDir;
     private static _dontRunSupport;
     constructor(serverConfig: any, client: string, clientDir: any, _dontRunSupport?: any);
-    static connectAndRun(): Promise<{}>;
+    static connectAndRun(): Promise<unknown>;
     static getClientName(): string;
     static getMainServer(): ResolveIOMainServer;
     static getMainDB(): any;

package/managers/method.manager.d.ts

@@ -16,13 +16,13 @@ export declare class MethodManager {
     getMainServer(): ResolveIOMainServer;
     methods(method: MethodModel): void;
     callMethodCron(method: string, ...methodData: any[]): void;
-    callMethodQueue(update: QueueMethodModel): Promise<{}>;
+    callMethodQueue(update: QueueMethodModel): Promise<unknown>;
     callMethod(id_methodLatency: string, ws: WebSocket, messageDate: Date, messageId: number, method: string, ...methodData: any[]): void;
     callMethodInternal(method: any, ...methodData: any[]): Promise<any>;
     callSupportMethodInternal(supportMethod: any, ...methodData: any[]): Promise<any>;
     private sendWS;
     sendEmail(sendTo: string, subject: string, text?: string, html?: string, attachments?: any[], send_from?: string): void;
     getAWS(): aws.S3;
-    readFile(fileName: any): Promise<{}>;
-    readImage(fileName: any): Promise<{}>;
+    readFile(fileName: any): Promise<unknown>;
+    readImage(fileName: any): Promise<unknown>;
 }

package/managers/method.manager.js

@@ -416,8 +416,8 @@ var MethodManager = /** @class */ (function () {
     };
     // Call/run method (Emit on Socket)
     MethodManager.prototype.callMethod = function (id_methodLatency, ws, messageDate, messageId, method) {
-        var _this = this;
         var _a;
+        var _this = this;
         var methodData = [];
         for (var _i = 5; _i < arguments.length; _i++) {
             methodData[_i - 5] = arguments[_i];

package/managers/subscription.manager.js

@@ -136,7 +136,8 @@ var SubscriptionManager = /** @class */ (function () {
             subscriptionData[_i - 3] = 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 that, pub, valObj, valKeys, rootKeys, i, sub, _a, newActiveSub, begDate, endDate, billUser;
+            var _b;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -201,10 +202,10 @@ var SubscriptionManager = /** @class */ (function () {
                         // Send pub data to client who just subscribed only, don't want to send to existing clients since nothing has changed
                         that.sendPubDataOnce(ws, messageId, sub, 'newSub', that.getPublicationCollections(publication)[0]);
                         if (!(that._publications[sub.publication].preFunction && !sub.preSubscriptionData)) return [3 /*break*/, 3];
-                        _b = sub;
-                        return [4 /*yield*/, (_a = that._publications[sub.publication]).preFunction.apply(_a, sub.subscriptionData)];
+                        _a = sub;
+                        return [4 /*yield*/, (_b = that._publications[sub.publication]).preFunction.apply(_b, sub.subscriptionData)];
                     case 2:
-                        _b.preSubscriptionData = _c.sent();
+                        _a.preSubscriptionData = _c.sent();
                         _c.label = 3;
                     case 3:
                         newActiveSub = new active_subscription_collection_1.ActiveSubscriptions({
@@ -556,7 +557,8 @@ var SubscriptionManager = /** @class */ (function () {
         if (noFetchFunction === void 0) { noFetchFunction = false; }
         var that = this;
         that._subscriptions.filter(function (a) { return a.collections.includes(collection); }).forEach(function (sub) { return __awaiter(_this, void 0, void 0, function () {
-            var _a, _b, schemaErrors, _c, _d;
+            var schemaErrors, _a, _b;
+            var _c, _d;
             return __generator(this, function (_e) {
                 switch (_e.label) {
                     case 0:
@@ -576,18 +578,18 @@ var SubscriptionManager = /** @class */ (function () {
                         if (!sub.preSubscriptionData) return [3 /*break*/, 4];
                         if (!that._publications[sub.publication].fetchFunction(document, sub.preSubscriptionData)) return [3 /*break*/, 4];
                         that.sendPubData(sub, type, collection);
-                        _c = sub;
-                        return [4 /*yield*/, (_a = that._publications[sub.publication]).preFunction.apply(_a, sub.subscriptionData)];
+                        _a = sub;
+                        return [4 /*yield*/, (_c = that._publications[sub.publication]).preFunction.apply(_c, sub.subscriptionData)];
                     case 3:
-                        _c.preSubscriptionData = _e.sent();
+                        _a.preSubscriptionData = _e.sent();
                         return [2 /*return*/];
                     case 4:
                         if (!that._publications[sub.publication].preFunction) return [3 /*break*/, 7];
                         if (!!noFetchFunction) return [3 /*break*/, 6];
-                        _d = sub;
+                        _b = sub;
                         return [4 /*yield*/, that._publications[sub.publication].preFunction(sub.subscriptionData)];
                     case 5:
-                        _d.preSubscriptionData = _e.sent();
+                        _b.preSubscriptionData = _e.sent();
                         if (that._publications[sub.publication].fetchFunction(document, sub.preSubscriptionData)) {
                             that.sendPubData(sub, type, collection);
                         }
@@ -620,7 +622,7 @@ var SubscriptionManager = /** @class */ (function () {
                         else {
                             if (that._publications[sub.publication].fetchFunction) {
                                 if (!noFetchFunction) {
-                                    if ((_b = that._publications[sub.publication]).fetchFunction.apply(_b, [document].concat(sub.subscriptionData))) {
+                                    if ((_d = that._publications[sub.publication]).fetchFunction.apply(_d, [document].concat(sub.subscriptionData))) {
                                         that.sendPubData(sub, type, collection);
                                     }
                                 }
@@ -639,7 +641,8 @@ var SubscriptionManager = /** @class */ (function () {
         var _this = this;
         var that = this;
         that._subscriptions.filter(function (a) { return a.collections.includes(collection); }).forEach(function (sub) { return __awaiter(_this, void 0, void 0, function () {
-            var _a, _b, _c, schemaErrors, _d, _e;
+            var schemaErrors, _a, _b;
+            var _c, _d, _e;
             return __generator(this, function (_f) {
                 switch (_f.label) {
                     case 0:
@@ -659,17 +662,17 @@ var SubscriptionManager = /** @class */ (function () {
                         if (!sub.preSubscriptionData) return [3 /*break*/, 4];
                         if (!that._publications[sub.publication].fetchFunction(document, sub.preSubscriptionData)) return [3 /*break*/, 4];
                         that.sendPubData(sub, 'support', collection);
-                        _d = sub;
-                        return [4 /*yield*/, (_a = that._publications[sub.publication]).preFunction.apply(_a, sub.subscriptionData)];
+                        _a = sub;
+                        return [4 /*yield*/, (_c = that._publications[sub.publication]).preFunction.apply(_c, sub.subscriptionData)];
                     case 3:
-                        _d.preSubscriptionData = _f.sent();
+                        _a.preSubscriptionData = _f.sent();
                         return [2 /*return*/];
                     case 4:
                         if (!that._publications[sub.publication].preFunction) return [3 /*break*/, 6];
-                        _e = sub;
-                        return [4 /*yield*/, (_b = that._publications[sub.publication]).preFunction.apply(_b, sub.subscriptionData)];
+                        _b = sub;
+                        return [4 /*yield*/, (_d = that._publications[sub.publication]).preFunction.apply(_d, sub.subscriptionData)];
                     case 5:
-                        _e.preSubscriptionData = _f.sent();
+                        _b.preSubscriptionData = _f.sent();
                         if (that._publications[sub.publication].fetchFunction(document, sub.preSubscriptionData)) {
                             that.sendPubData(sub, 'support', collection);
                         }
@@ -698,7 +701,7 @@ var SubscriptionManager = /** @class */ (function () {
                         }
                         else {
                             if (that._publications[sub.publication].fetchFunction) {
-                                if ((_c = that._publications[sub.publication]).fetchFunction.apply(_c, [document].concat(sub.subscriptionData))) {
+                                if ((_e = that._publications[sub.publication]).fetchFunction.apply(_e, [document].concat(sub.subscriptionData))) {
                                     that.sendPubData(sub, 'support', collection);
                                 }
                             }
@@ -715,7 +718,8 @@ var SubscriptionManager = /** @class */ (function () {
     // Fetch pub once, send to all clients linked to this pub
     SubscriptionManager.prototype.sendPubDataOnce = function (ws, messageId, subscription, type, collection) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, _b, that;
+            var that;
+            var _a, _b;
             var _this = this;
             return __generator(this, function (_c) {
                 that = this;
@@ -761,7 +765,8 @@ var SubscriptionManager = /** @class */ (function () {
     // Fetch pub once, send to all clients linked to this pub
     SubscriptionManager.prototype.sendPubData = function (subscription, type, collection) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, that;
+            var that;
+            var _a;
             var _this = this;
             return __generator(this, function (_b) {
                 that = this;

package/managers/support.manager.d.ts

@@ -17,6 +17,6 @@ export declare class SupportManager {
     callMethodInternal(method: any, ...methodData: any[]): Promise<any>;
     private sendWS;
     sendEmail(sendTo: string, subject: string, text?: string, html?: string, attachments?: any[], from?: string): void;
-    readFile(fileName: any): Promise<{}>;
-    readImage(fileName: any): Promise<{}>;
+    readFile(fileName: any): Promise<unknown>;
+    readImage(fileName: any): Promise<unknown>;
 }

package/managers/support.manager.js

@@ -102,8 +102,8 @@ var SupportManager = /** @class */ (function () {
     };
     // Call/run method (Emit on Socket)
     SupportManager.prototype.callSupportMethod = function (ws, messageId, supportMethod) {
-        var _this = this;
         var _a;
+        var _this = this;
         var methodData = [];
         for (var _i = 3; _i < arguments.length; _i++) {
             methodData[_i - 3] = arguments[_i];

package/methods/logs.js

@@ -53,6 +53,33 @@ function loadLogMethods(methodManager) {
                 });
             },
             skipValidation: true
+        },
+        superadminAPM: {
+            skipQueue: true,
+            function: function (date_start, date_end) {
+                return log_method_latency_collection_1.LogMethodLatencies.aggregate([
+                    {
+                        $match: {
+                            $and: [
+                                {
+                                    createdAt: { $gte: date_start }
+                                },
+                                {
+                                    createdAt: { $lte: date_end }
+                                }
+                            ]
+                        }
+                    },
+                    {
+                        $group: {
+                            _id: '$method',
+                            count: { $sum: 1 },
+                            latency_avg: { $avg: '$latency_ms' }
+                        }
+                    }
+                ]).exec();
+            },
+            skipValidation: true
         }
     });
 }

package/package.json

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

package/publications/logs.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var simpl_schema_1 = require("simpl-schema");
 var log_collection_1 = require("../collections/log.collection");
+var log_method_latency_collection_1 = require("src/collections/log-method-latency.collection");
 function loadLogPublications(subscriptionManager) {
     subscriptionManager.publications({
         logsWithType: {
@@ -20,6 +21,12 @@ function loadLogPublications(subscriptionManager) {
             fetchFunction: function (document, type) {
                 return document['type'] === type;
             }
+        },
+        methodlatencies: {
+            function: function () {
+                return log_method_latency_collection_1.LogMethodLatencies.find({}).sort({ date_start: -1 }).exec();
+            },
+            collections: ['log-method-latencies'],
         }
     });
 }

package/server-app.js

@@ -254,7 +254,8 @@ var ResolveIOMainServer = /** @class */ (function () {
             }, 10000);
             // On data received (message)
             ws.on('message', function (message) { return __awaiter(_this, void 0, void 0, function () {
-                var _a, _b, socketData, data, messageDate, messageId, type, subType, pub;
+                var socketData, data, messageDate, messageId, type, subType, pub;
+                var _a, _b;
                 var _this = this;
                 return __generator(this, function (_c) {
                     socketData = JSON.parse(message, common_1.dateReviver);
@@ -329,7 +330,8 @@ var ResolveIOMainServer = /** @class */ (function () {
                         if (!!this._msgQueueRunning) return [3 /*break*/, 5];
                         this._msgQueueRunning = true;
                         _loop_1 = function (i) {
-                            var _a, _b, msg, data, ws, messageDate, messageId, type, method, methodLatency, serverRes, query, methodCall, supportMethod, serverRes;
+                            var msg, data, ws, messageDate, messageId, type, method, methodLatency, serverRes, query, methodCall, supportMethod, serverRes;
+                            var _a, _b;
                             return __generator(this, function (_c) {
                                 switch (_c.label) {
                                     case 0: