@gudhub/core 1.0.64 → 1.0.67

package/GUDHUB/DocumentManager/DocumentManager.js

@@ -10,8 +10,9 @@
 */
 
 export class DocumentManager {
-  constructor(req) {
+  constructor(req, pipeService) {
     this.req = req;
+    this.pipeService = pipeService;
   }
 
   createDocument(documentObject) {
@@ -22,6 +23,10 @@ export class DocumentManager {
     });
   }
 
+  emitDocumentInsert(data) {
+    this.pipeService.emit("gh_document_insert_one", { app_id: data.app_id, item_id: data.item_id, element_id: data.element_id });
+  }
+
   getDocument(documentAddress) {
     return this.req.post({
       url: "/api/new/document/find-one",

package/GUDHUB/FileManager/FileManager.js

@@ -210,7 +210,7 @@ async getFiles(app_id, filesId = []) {
     return file;
   }
 
-  async deleteFile(id, app_id) {
+  async deleteFile(app_id, id) {
     await this.deleteFileApi(id);
     this.deleteFileFromStorage(id, app_id);
     return true;

package/GUDHUB/PipeService/PipeService.js

@@ -54,6 +54,7 @@ import { checkParams, createId } from "./utils.js";
 export class PipeService {
   constructor() {
     this.subscribers = {};
+    this.messageBox = {}; 
   }
 
   //============================== ON PIPE ====================================//
@@ -84,6 +85,9 @@ export class PipeService {
           }
 
           this.subscribers[typeWithId].add(fn);
+
+          //checking for messeges those were sent before subscription created
+          this.checkMessageBox(typeWithId);
         });
     }
     return this;
@@ -103,14 +107,26 @@ export class PipeService {
        |    'value' - Any (require). Emiter value to  subscribers
        |-------------------------------------------------------------------------------*/
 
-  emit(types, destination, address, params) {
+  emit(types, destination, value, params) {
     types.split(" ").forEach((type) => {
       const listenerName = type + ":" + createId(destination);
 
       if (this.subscribers[listenerName]) {
+        
+        // if subscribers list is empty we put message to messageBox
+        if (this.subscribers[listenerName].size == 0){
+          this.messageBox[listenerName] = [types, destination, value, params];
+          return this;
+        }
+
+        // sending messege to subscribers
         this.subscribers[listenerName].forEach(function (fn) {
-          fn(null, address, params);
+          fn(null, value, params);
         });
+
+      }else {
+        // if there no subscribers list we put message to messageBox
+        this.messageBox[listenerName] = [types, destination, value, params];
       }
     });
     return this;
@@ -158,10 +174,27 @@ export class PipeService {
 
       //if we are not passing a function then we remove a subscriber property
       if (this.subscribers[listenerName] && !func) {
-        delete this.subscribers[listenerName]
+        delete this.subscribers[listenerName];
       }
     });
 
     return this;
   }
+
+  
+  //============================== MESSAGE BOX ====================================//
+  /*---------------------------------------------------------------------------------
+       |  If emitting event started erlier then subscriber apears then we save it to the MessageBox
+       |  After subscriber is created we update check MessageBox for encomming messendges
+       |
+       |---------------------------------------------------------------------------------*/
+
+       checkMessageBox(listenerName) {
+        if (this.messageBox[listenerName]) {
+          this.emit(...this.messageBox[listenerName]);
+
+          //we delete message after it was readed
+          delete this.messageBox[listenerName];
+        }
+      }
 }

package/GUDHUB/PipeService/PipeService.test.js

@@ -61,4 +61,17 @@ describe("PipeService", () => {
     gudhub.pipeService.subscribers.should.not.have.property("gh_model_update:22.333");
   });
 
+
+  it("Emitting event and then adding new subscriber", () => {
+    let incomeData = null;
+    
+    gudhub
+      .emit("test",  { app_id: 4, item_id: 3, field_id: 2 }, {"message" : "this is the data"})
+      .on("test",  { app_id: 4, item_id: 3, field_id: 2 }, (event, data) => {
+        incomeData = data.message;
+      });
+      incomeData.should.equal("this is the data");
+  });
+  
+
 });

package/GUDHUB/Utils/get_date/get_date.js

@@ -12,6 +12,7 @@
 */
 import add from "date-fns/add/index.js";
 import setDay from "date-fns/setDay/index.js";
+import isSameWeek from "date-fns/isSameWeek/index.js";
 
 //********************** POPULATE WITH DATE ************************//
 export function populateWithDate(items, model) {
@@ -105,11 +106,9 @@ export function checkRecurringDate(date, option) {
         return false;
       }
     case 'week':
-      if(getWeek(currentDate) === getWeek(date)) {
-        return true;
-      } else {
-        return false;
-      }
+      let currentYear = new Date().getFullYear();
+      let shiftedYearDate = new Date(currentYear, date.getMonth(), date.getDate());
+      return isSameWeek(shiftedYearDate, currentDate);
     case 'month':
       if(date.getMonth() === currentDate.getMonth()) {
         return true;
@@ -120,13 +119,4 @@ export function checkRecurringDate(date, option) {
       return true;
   }
 
-  function getWeek(date) {
-    let d = new Date(date.getFullYear(), date.getMonth(), date.getDate());
-    let dayNumber = d.getDay();
-    d.setDate(d.getDate() + 4 - dayNumber);
-    let firstJanuary = new Date(date.getFullYear(), 0, 1);
-    let weekNumber = Math.ceil((((d- firstJanuary) / 86400000) + 1) / 7);
-    return weekNumber;
-  }
-
 }

package/GUDHUB/WebSocket/WebsocketHandler.js

@@ -0,0 +1,58 @@
+export function WebsocketHandler(gudhub, message) {
+    switch (message.api) {
+        case "/items/update":
+            console.log("/items/update - ", message);
+            gudhub.itemProcessor.updateItemsInStorage(
+                message.app_id,
+                message.response
+            );
+            break;
+        case "/items/add":
+            console.log("/items/add - ", message);
+            gudhub.itemProcessor.addItemsToStorage(message.app_id, message.response);
+            break;
+        case "/items/delete":
+            console.log("/items/delete - ", message);
+            gudhub.itemProcessor.deleteItemsFromStorage(
+                message.app_id,
+                message.response
+            );
+            break;
+        case "/app/update":
+            console.log("/app/update - ", message);
+            gudhub.appProcessor.updatingAppInStorage(message.response);
+            break;
+        case "/file/delete":
+            console.log("file/delete - ", message);
+            gudhub.fileManager.deleteFileFromStorage(
+                message.response.file_id,
+                message.app_id
+            );
+            break;
+        case "/file/upload":
+            console.log("file/upload - ", message);
+            gudhub.fileManager.addFileToStorage(message.app_id, message.response);
+            break;
+        case "/file/formupload": //I'm not shure if we are using it (probably in contact form)
+            console.log("file/formupload - ", message);
+            break;
+        case "/file/update": //I'm not shure if we are using it (probably in contact form)
+            gudhub.fileManager.updateFileInStorage(
+                message.response.file_id,
+                message.response.app_id,
+                message.response
+            );
+            console.log("file/update - ", message);
+            break;
+        case "/new/file/duplicate": //I'm not shure if we are using it (probably in contact form)
+            gudhub.fileManager.addFilesToStorage(message.app_id, message.response);
+            console.log("new/file/duplicate - ", message);
+            break;
+        case '/api/new/document/insert-one':
+            gudhub.documentManager.emitDocumentInsert(message.response);
+            console.log('/api/new/document/insert-one - ', message);
+            break;
+        default:
+            console.warn("WEBSOCKETS is not process this API:", message.api);
+    }
+}

package/GUDHUB/config.js

@@ -1,7 +1,7 @@
-export const server_url = "https://gudhub.com/GudHub";
+//export const server_url = "https://gudhub.com/GudHub";
 //export const server_url = "https://gudhub.com/GudHub_Temp";
 //export const server_url = "https://integration.gudhub.com/GudHub_Test";
-//export const server_url = "http://localhost:9000";
+export const server_url = "http://localhost:9000";
 export const wss_url = "wss://gudhub.com/GudHub/ws/app/";
 
 // FOR TESTS

package/GUDHUB/gudhub.js

@@ -14,6 +14,7 @@ import { ChunksManager } from "./ChunksManager/ChunksManager.js";
 import { DocumentManager } from "./DocumentManager/DocumentManager.js";
 import { Interpritate } from './GHConstructor/interpritate.js'
 import { IS_WEB } from "./consts.js";
+import { WebsocketHandler } from './WebSocket/WebsocketHandler.js';
 
 export class GudHub {
   constructor(
@@ -69,11 +70,12 @@ export class GudHub {
       this.pipeService
     );
     this.fileManager = new FileManager(this.storage, this.pipeService, this.req, this.appProcessor);
-    this.documentManager = new DocumentManager(this.req);
+    this.documentManager = new DocumentManager(this.req, this.pipeService);
 
     if (options.initWebsocket) {
+      const gudhub = this;
       this.ws.initWebSocket(
-        this.websocketHandler.bind(this),
+        WebsocketHandler.bind(this, gudhub),
         this.appProcessor.refreshApps.bind(this.appProcessor)
       );
     }
@@ -456,59 +458,4 @@ export class GudHub {
   updateAvatar(imageData) {
     return this.auth.updateAvatar(imageData);
   }
-
-  websocketHandler(message) {
-    switch (message.api) {
-      case "/items/update":
-        console.log("/items/update - ", message);
-        this.itemProcessor.updateItemsInStorage(
-          message.app_id,
-          message.response
-        );
-        break;
-      case "/items/add":
-        console.log("/items/add - ", message);
-        this.itemProcessor.addItemsToStorage(message.app_id, message.response);
-        break;
-      case "/items/delete":
-        console.log("/items/delete - ", message);
-        this.itemProcessor.deleteItemsFromStorage(
-          message.app_id,
-          message.response
-        );
-        break;
-      case "/app/update":
-        console.log("/app/update - ", message);
-        this.appProcessor.updatingAppInStorage(message.response);
-        break;
-      case "/file/delete":
-        console.log("file/delete - ", message);
-        this.fileManager.deleteFileFromStorage(
-          message.response.file_id,
-          message.app_id
-        );
-        break;
-      case "/file/upload":
-        console.log("file/upload - ", message);
-        this.fileManager.addFileToStorage(message.app_id, message.response);
-        break;
-      case "/file/formupload": //I'm not shure if we are using it (probably in contact form)
-        console.log("file/formupload - ", message);
-        break;
-      case "/file/update": //I'm not shure if we are using it (probably in contact form)
-        this.fileManager.updateFileInStorage(
-          message.response.file_id,
-          message.response.app_id,
-          message.response
-        );
-        console.log("file/update - ", message);
-        break;
-      case "/new/file/duplicate": //I'm not shure if we are using it (probably in contact form)
-        this.fileManager.addFilesToStorage(message.app_id, message.response);
-        console.log("new/file/duplicate - ", message);
-        break;
-      default:
-        console.warn("WEBSOCKETS is not process this API:", message.api);
-    }
-  }
 }

package/package.json

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