@resolveio/server-lib 3.2.12 → 4.0.1

package/collections/user.collection.js

@@ -111,13 +111,26 @@ var schema = {
         type: String,
         optional: true
     },
-    customer: {
-        type: String,
+    customers: {
+        type: Array,
         optional: true,
     },
+    'customers.$': {
+        type: Object
+    },
+    'customers.$.id_customer': {
+        type: String
+    },
+    'customers.$.customer': {
+        type: String
+    },
     id_customer: {
         type: String,
-        optional: true,
+        optional: true
+    },
+    customer: {
+        type: String,
+        optional: true
     }
 };
 var DefaultSchema = new mongoose_1.Schema(schema, {

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<unknown>;
+    static connectAndRun(): Promise<{}>;
     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<unknown>;
+    callMethodQueue(update: QueueMethodModel): Promise<{}>;
     callMethod(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<unknown>;
-    readImage(fileName: any): Promise<unknown>;
+    readFile(fileName: any): Promise<{}>;
+    readImage(fileName: any): Promise<{}>;
 }

package/managers/method.manager.js

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

package/managers/subscription.manager.js

@@ -137,8 +137,7 @@ var SubscriptionManager = /** @class */ (function () {
             subscriptionData[_i - 3] = arguments[_i];
         }
         return __awaiter(this, void 0, void 0, function () {
-            var that, pub, valObj, valKeys, rootKeys, i, sub, _a, newActiveSub, begDate, endDate, billUser;
-            var _b;
+            var _a, that, pub, valObj, valKeys, rootKeys, i, sub, _b, newActiveSub, begDate, endDate, billUser;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -203,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);
                         if (!(that._publications[sub.publication].preFunction && !sub.preSubscriptionData)) return [3 /*break*/, 3];
-                        _a = sub;
-                        return [4 /*yield*/, (_b = that._publications[sub.publication]).preFunction.apply(_b, sub.subscriptionData)];
+                        _b = sub;
+                        return [4 /*yield*/, (_a = that._publications[sub.publication]).preFunction.apply(_a, sub.subscriptionData)];
                     case 2:
-                        _a.preSubscriptionData = _c.sent();
+                        _b.preSubscriptionData = _c.sent();
                         _c.label = 3;
                     case 3:
                         newActiveSub = new active_subscription_collection_1.ActiveSubscriptions({
@@ -554,8 +553,7 @@ 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 schemaErrors, _a, _b;
-            var _c, _d;
+            var _a, _b, schemaErrors, _c, _d;
             return __generator(this, function (_e) {
                 switch (_e.label) {
                     case 0:
@@ -575,18 +573,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);
-                        _a = sub;
-                        return [4 /*yield*/, (_c = that._publications[sub.publication]).preFunction.apply(_c, sub.subscriptionData)];
+                        _c = sub;
+                        return [4 /*yield*/, (_a = that._publications[sub.publication]).preFunction.apply(_a, sub.subscriptionData)];
                     case 3:
-                        _a.preSubscriptionData = _e.sent();
+                        _c.preSubscriptionData = _e.sent();
                         return [2 /*return*/];
                     case 4:
                         if (!that._publications[sub.publication].preFunction) return [3 /*break*/, 7];
                         if (!!noFetchFunction) return [3 /*break*/, 6];
-                        _b = sub;
+                        _d = sub;
                         return [4 /*yield*/, that._publications[sub.publication].preFunction(sub.subscriptionData)];
                     case 5:
-                        _b.preSubscriptionData = _e.sent();
+                        _d.preSubscriptionData = _e.sent();
                         if (that._publications[sub.publication].fetchFunction(document, sub.preSubscriptionData)) {
                             that.sendPubData(sub);
                         }
@@ -619,7 +617,7 @@ var SubscriptionManager = /** @class */ (function () {
                         else {
                             if (that._publications[sub.publication].fetchFunction) {
                                 if (!noFetchFunction) {
-                                    if ((_d = that._publications[sub.publication]).fetchFunction.apply(_d, [document].concat(sub.subscriptionData))) {
+                                    if ((_b = that._publications[sub.publication]).fetchFunction.apply(_b, [document].concat(sub.subscriptionData))) {
                                         that.sendPubData(sub);
                                     }
                                 }
@@ -638,8 +636,7 @@ 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 schemaErrors, _a, _b;
-            var _c, _d, _e;
+            var _a, _b, _c, schemaErrors, _d, _e;
             return __generator(this, function (_f) {
                 switch (_f.label) {
                     case 0:
@@ -659,17 +656,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);
-                        _a = sub;
-                        return [4 /*yield*/, (_c = that._publications[sub.publication]).preFunction.apply(_c, sub.subscriptionData)];
+                        _d = sub;
+                        return [4 /*yield*/, (_a = that._publications[sub.publication]).preFunction.apply(_a, sub.subscriptionData)];
                     case 3:
-                        _a.preSubscriptionData = _f.sent();
+                        _d.preSubscriptionData = _f.sent();
                         return [2 /*return*/];
                     case 4:
                         if (!that._publications[sub.publication].preFunction) return [3 /*break*/, 6];
-                        _b = sub;
-                        return [4 /*yield*/, (_d = that._publications[sub.publication]).preFunction.apply(_d, sub.subscriptionData)];
+                        _e = sub;
+                        return [4 /*yield*/, (_b = that._publications[sub.publication]).preFunction.apply(_b, sub.subscriptionData)];
                     case 5:
-                        _b.preSubscriptionData = _f.sent();
+                        _e.preSubscriptionData = _f.sent();
                         if (that._publications[sub.publication].fetchFunction(document, sub.preSubscriptionData)) {
                             that.sendPubData(sub);
                         }
@@ -698,7 +695,7 @@ var SubscriptionManager = /** @class */ (function () {
                         }
                         else {
                             if (that._publications[sub.publication].fetchFunction) {
-                                if ((_e = that._publications[sub.publication]).fetchFunction.apply(_e, [document].concat(sub.subscriptionData))) {
+                                if ((_c = that._publications[sub.publication]).fetchFunction.apply(_c, [document].concat(sub.subscriptionData))) {
                                     that.sendPubData(sub);
                                 }
                             }
@@ -715,8 +712,7 @@ var SubscriptionManager = /** @class */ (function () {
     // Fetch pub once, send to all clients linked to this pub
     SubscriptionManager.prototype.sendPubDataOnce = function (ws, messageId, subscription) {
         return __awaiter(this, void 0, void 0, function () {
-            var that;
-            var _a, _b;
+            var _a, _b, that;
             var _this = this;
             return __generator(this, function (_c) {
                 that = this;
@@ -761,8 +757,7 @@ var SubscriptionManager = /** @class */ (function () {
     // Fetch pub once, send to all clients linked to this pub
     SubscriptionManager.prototype.sendPubData = function (subscription) {
         return __awaiter(this, void 0, void 0, function () {
-            var that;
-            var _a;
+            var _a, that;
             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[]): void;
-    readFile(fileName: any): Promise<unknown>;
-    readImage(fileName: any): Promise<unknown>;
+    readFile(fileName: any): Promise<{}>;
+    readImage(fileName: any): Promise<{}>;
 }

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 _a;
         var _this = this;
+        var _a;
         var methodData = [];
         for (var _i = 3; _i < arguments.length; _i++) {
             methodData[_i - 3] = arguments[_i];

package/models/user.model.d.ts

@@ -11,4 +11,11 @@ export interface UserModel extends CollectionDocument {
     readonly?: boolean;
     phonenumber?: string;
     other?: object;
+    id_customer?: string;
+    customer?: string;
+    customers: UserCustomersModel[];
+}
+export interface UserCustomersModel {
+    id_customer: string;
+    customer: string;
 }

package/package.json

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

package/server-app.js

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