@gudhub/core 1.1.77 → 1.1.79

package/GUDHUB/AppProcessor/AppProcessor.js

@@ -239,6 +239,11 @@ export class AppProcessor {
       this.updateAppsListInStorage(received_app_list);
       this.applistReceived = true;
       app_list = received_app_list;
+      
+      // Here we get default user's app
+      // We do it here to do it only once
+      // We do it because we need to initialize WebSockets, which we do in getApp method
+      this.getApp(this.storage.getUser().app_init);
     }
 
     return app_list;

package/GUDHUB/Auth/Auth.js

@@ -5,19 +5,75 @@ export class Auth {
   }
 
   async login({ username, password } = {}) {
-    let user = await this.req.axiosRequest({
-      method: 'POST',
-      url: `${this.req.root}/auth/login`,
-      form: {
-        username,
-        password,
-      },
-    });
+    const user = await this.loginApi(username, password);
+    this.storage.updateUser(user);
+    return user;
+  }
+
+  async logout(token) {
+    const response = await this.logoutApi(token);
+    return response;
+  }
+
+  async signup(user) {
+    const newUser = await this.signupApi(user);
+    return newUser;
+  }
+
+  async updateToken(auth_key) {
+    const user = await this.updateTokenApi(auth_key);
+    return user;
+  }
+
+  async updateUser(userData) {
+    const user = await this.updateUserApi(userData);
+    this.storage.updateUser(user);
+    return user;
+  }
+
+  async updateAvatar(imageData) {
+    const user = await this.avatarUploadApi(imageData);
     this.storage.updateUser(user);
     return user;
   }
 
-  logout(token) {
+  async getUsersList(keyword) {
+    const usersList = await this.getUsersListApi(keyword);
+    return usersList;
+  }
+
+  async loginApi(username, password) {
+    try {
+      const user = await this.req.axiosRequest({
+        method: 'POST',
+        url: `${this.req.root}/auth/login`,
+        form: {
+          username,
+          password,
+        },
+      });
+      return user;
+    } catch (error) {
+      console.log(error);
+    }
+  }
+
+  async updateTokenApi(auth_key) {
+    try {
+      const user = await this.req.axiosRequest({
+        method: 'POST',
+        url: `${this.req.root}/auth/login`,
+        form: {
+          auth_key,
+        },
+      });
+      return user;
+    } catch (error) {
+      console.log(error);
+    }
+  }
+
+  logoutApi(token) {
     return this.req.post({
       url: "/auth/logout",
       form: {
@@ -26,7 +82,7 @@ export class Auth {
     });
   }
 
-  signup(user) {
+  signupApi(user) {
     return this.req.axiosRequest({
       method: 'POST',
       url: `${this.req.root}/auth/singup`,
@@ -34,7 +90,7 @@ export class Auth {
     });
   }
 
-  getUsersList(keyword) {
+  getUsersListApi(keyword) {
     return this.req.get({
       url: "/auth/userlist",
       params: {
@@ -52,16 +108,6 @@ export class Auth {
     });
   }
 
-  updateToken(auth_key) {
-    return this.req.axiosRequest({
-      method: 'POST',
-      url: `${this.req.root}/auth/login`,
-      form: {
-        auth_key,
-      },
-    });
-  }
-
   avatarUploadApi(image) {
     return this.req.post({
       url: "/auth/avatar-upload",
@@ -130,15 +176,4 @@ export class Auth {
     return accesstoken;
   }
 
-  async updateUser(userData) {
-    const user = await this.updateUserApi(userData);
-    this.storage.updateUser(user);
-    return user;
-  }
-
-  async updateAvatar(imageData) {
-    const user = await this.avatarUploadApi(imageData);
-    this.storage.updateUser(user);
-    return user;
-  }
 }

package/GUDHUB/GHConstructor/createAngularModuleInstance.js

@@ -273,6 +273,19 @@ export default async function createAngularModuleInstance(gudhub, module_id, mod
                     }
                 });
             },
+
+            //*************** ON MESSAGE ****************//
+
+            onMessage: function(appId, userId, response) {
+                return new Promise(async (resolve) => {
+                    const onMessageFunction = importedClass.onMessage;
+                    if(onMessageFunction) {
+                        const result = await onMessageFunction(appId, userId, response);
+                        resolve(result);
+                    }
+                    resolve(null);
+                })
+            },
         }
 
         // We need these methods in browser environment only

package/GUDHUB/GHConstructor/createClassInstance.js

@@ -165,6 +165,19 @@ export default async function createClassInstance(gudhub, module_id, js_url, css
                 });
             },
 
+            //*************** ON MESSAGE ****************//
+
+            onMessage: function(appId, userId, response) {
+                return new Promise(async (resolve) => {
+                    const onMessageFunction = importedClass.onMessage;
+                    if(onMessageFunction) {
+                        const result = await onMessageFunction(appId, userId, response);
+                        resolve(result);
+                    }
+                    resolve(null);
+                })
+            },
+
             //*************** EXTEND CONTROLLER ****************//
 
             extendController: function (actionScope) {

package/GUDHUB/GHConstructor/interpritate.js

@@ -27,7 +27,7 @@ export class Interpritate {
             }
 
             for(var i = 0; i < currentIntrpr.length; i++) {
-                if(currentIntrpr[i].settings.condition_filter && currentIntrpr[i].settings.filters_list.length > 0) {
+                if(currentIntrpr[i].settings && currentIntrpr[i].settings.condition_filter && currentIntrpr[i].settings.filters_list.length > 0) {
                     const item = await gudhub.getItem(appId, itemId);
                     if(item) {
                         const filteredItems = gudhub.filter([item], currentIntrpr[i].settings.filters_list);

package/GUDHUB/Storage/ModulesList.js

@@ -142,7 +142,7 @@ export default function generateModulesList(async_modules_path, file_server_url,
             data_type: "calendar",
             name: 'Calendar',
             icon: 'calendar',
-            js: 'https://gudhub.com/modules/FullCalendar-Gh-Element/dist/main.js?t=1',
+            js: 'https://gudhub.com/modules/FullCalendar-Gh-Element/dist/main.js?t=2',
             css: 'https://gudhub.com/modules/FullCalendar-Gh-Element/dist/style.css?t=1',
             type: 'gh_element',
             technology: "class"
@@ -918,6 +918,15 @@ export default function generateModulesList(async_modules_path, file_server_url,
             type: 'gh_element',
             technology: 'class'
         },
+        {
+            data_type: 'conversations',
+            name: 'Conversations',
+            icon: 'timeline',
+            js: 'https://gudhub.com/modules/conversation/dist/main.js',
+            css: 'https://gudhub.com/modules/conversation/dist/style.css',
+            type: 'gh_element',
+            technology: 'class'
+        },
         /* AUTOMATION MODULES */
         /*
             We have next types for automations:

package/GUDHUB/WebSocket/WebSocketEmitter.js

@@ -0,0 +1,42 @@
+export class WebSocketEmitter {
+
+    constructor(gudhub) {
+        this.gudhub = gudhub;
+    }
+
+    async emitToUser(user_id, data) {
+
+        const message = {
+            user_id,
+            data: typeof data === 'object' ? JSON.stringify(data) : data
+        }
+
+        const response = await this.gudhub.req.post({
+            url: '/ws/emit-to-user',
+            form: message
+        });
+
+        return response;
+
+    }
+
+    async broadcastToAppSubscribers(app_id, data_type, data) {
+        
+        const message = {
+            app_id,
+            data: JSON.stringify({
+                data_type,
+                data
+            })
+        }
+
+        const response = await this.gudhub.req.post({
+            url: '/ws/broadcast-to-app-subscribers',
+            form: message
+        });
+
+        return response;
+
+    }
+
+}

package/GUDHUB/WebSocket/WebsocketHandler.js

@@ -52,6 +52,17 @@ export function WebsocketHandler(gudhub, message) {
             gudhub.documentManager.emitDocumentInsert(message.response);
             console.log('/api/new/document/insert-one - ', message);
             break;
+        case '/ws/emit-to-user':
+            console.log('/ws/emit-to-user - ', message);
+            break;
+        case '/ws/broadcast-to-app-subscribers':
+            console.log('/ws/broadcast-to-app-subscribers - ', message);
+            const response = JSON.parse(message.response);
+            if(!response.data_type) return;
+            gudhub.ghconstructor.getInstance(response.data_type).then(instance => {
+                instance.onMessage(message.app_id, message.user_id, response);
+            });
+            break;
         default:
             console.warn("WEBSOCKETS is not process this API:", message.api);
     }

package/GUDHUB/gudhub.js

@@ -17,6 +17,7 @@ import { IS_WEB } from "./consts.js";
 import { WebsocketHandler } from './WebSocket/WebsocketHandler.js';
 import { GroupSharing } from './Utils/sharing/GroupSharing.js';
 import { Sharing } from './Utils/sharing/Sharing.js';
+import { WebSocketEmitter } from './WebSocket/WebSocketEmitter.js';
 
 export class GudHub {
   constructor(
@@ -76,6 +77,7 @@ export class GudHub {
     );
     this.fileManager = new FileManager(this.storage, this.pipeService, this.req, this.appProcessor);
     this.documentManager = new DocumentManager(this.req, this.pipeService);
+    this.websocketsemitter = new WebSocketEmitter(this);
 
     if (options.initWebsocket) {
       const gudhub = this;
@@ -148,6 +150,16 @@ export class GudHub {
     );
   }
 
+  //************************* WEBSOCKETS EMITTER ****************************//
+
+  emitToUser(user_id, data) {
+    return this.websocketsemitter.emitToUser(user_id, data);
+  }
+
+  broadcastToAppSubscribers(app_id, data_type, data) {
+    return this.websocketsemitter.broadcastToAppSubscribers(app_id, data_type, data);
+  }
+
   /******************* INTERPRITATE *******************/
 
   getInterpretation(value, field, dataType, source, itemId, appId, containerId) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gudhub/core",
-  "version": "1.1.77",
+  "version": "1.1.79",
   "description": "",
   "main": "index.js",
   "scripts": {