@resolveio/server-lib 1.0.17 → 1.0.18

package/managers/support.manager.d.ts

@@ -12,7 +12,8 @@ export declare class SupportManager {
     getMainServer(): ResolveIOMainServer;
     supportMethods(supportMethod: SupportMethodModel): void;
     callSupportMethod(ws: WebSocket, messageId: any, supportMethod: any, ...methodData: any[]): void;
-    callMethodInternal(supportMethod: any, ...methodData: any[]): Promise<any>;
+    callSupportMethodInternal(supportMethod: any, ...methodData: any[]): Promise<any>;
+    callMethodInternal(method: any, ...methodData: any[]): Promise<any>;
     private sendWS;
     sendEmail(sendTo: string, subject: string, text?: string, html?: string, attachments?: any[]): void;
 }

package/managers/support.manager.js

@@ -8,6 +8,7 @@ var counters_1 = require("../support-methods/counters");
 var mongoose_1 = require("mongoose");
 var common_1 = require("../util/common");
 var log_collection_1 = require("../collections/log.collection");
+var method_manager_1 = require("./method.manager");
 var SupportManager = /** @class */ (function () {
     function SupportManager(mainServer, serverConfig) {
         var _this = this;
@@ -180,7 +181,7 @@ var SupportManager = /** @class */ (function () {
             _this.sendWS(ws, supportMethod, methodData, serverRes);
         });
     };
-    SupportManager.prototype.callMethodInternal = function (supportMethod) {
+    SupportManager.prototype.callSupportMethodInternal = function (supportMethod) {
         var methodData = [];
         for (var _i = 1; _i < arguments.length; _i++) {
             methodData[_i - 1] = arguments[_i];
@@ -207,6 +208,33 @@ var SupportManager = /** @class */ (function () {
         }
         return promise;
     };
+    SupportManager.prototype.callMethodInternal = function (method) {
+        var methodData = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            methodData[_i - 1] = arguments[_i];
+        }
+        var _a;
+        var that = this;
+        if (!that._mainServer.getMethodManager()._methods[method]) {
+            console.log('No Method: ' + method);
+            return;
+        }
+        if ((methodData.length > 1 || (methodData[0] && typeof (methodData[0]) !== 'function')) && !that._mainServer.getMethodManager()._methods[method].skipValidation) {
+            if (!that._mainServer.getMethodManager()._methods[method].check) {
+                console.error('No Check Function For Method ' + method);
+                return;
+            }
+            else if (!that._mainServer.getMethodManager()._methods[method].check._schema) {
+                console.error('No Check Schema For Method ' + method);
+                return;
+            }
+        }
+        var promise = (_a = that._mainServer.getMethodManager()._methods[method].function).call.apply(_a, [Object.assign({}, that, method_manager_1.MethodManager.prototype)].concat(methodData));
+        if (methodData[methodData.length - 1] && typeof (methodData[methodData.length - 1]) === 'function') {
+            promise.then(function (res) { return methodData[methodData.length - 1](null, res); }, function (err) { return methodData[methodData.length - 1](err, null); });
+        }
+        return promise;
+    };
     SupportManager.prototype.sendWS = function (ws, method, methodData, data) {
         this._sendQueue.splice(0, 0, {
             id_ws: ws['id_socket'],

package/package.json

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

package/support-methods/cron-jobs.js

@@ -59,7 +59,7 @@ function loadSupportCronJobMethods(methodManager) {
                                 count = 0;
                                 interval = setInterval(function () {
                                     var updateChunk = users.slice(count * 10, Math.min(users.length, (count + 1) * 10));
-                                    _this.callMethodInternal.call(_this, 'updateClientUserChunk', updateChunk);
+                                    _this.callSupportMethodInternal.call(_this, 'updateClientUserChunk', updateChunk);
                                     count++;
                                     if (count * 10 > users.length) {
                                         clearInterval(interval);