@gudhub/core 1.2.4-beta.5 → 1.2.4-beta.7

package/GUDHUB/AppProcessor/AppProcessor.js

@@ -21,6 +21,8 @@ export class AppProcessor {
     this.util = util;
     this.appListeners();
     this.dataService = dataService;
+
+    this.appRequestCache = new Map;
   }
 
   async createNewAppApi(app) {
@@ -255,27 +257,42 @@ export class AppProcessor {
     let app = this.getAppFromStorage(app_id);
     if (app) return app;
 
-    let receivedApp = await this.dataService.getApp(app_id);
-    if (!receivedApp) return;
-
-    //!!! temporary check !!!! if app has chanks property then we start getting it
-    if (
-      receivedApp.chunks &&
-      receivedApp.chunks.length
-    ) {
-      let chunks = await this.chunksManager.getChunks(app_id, receivedApp.chunks);
-      receivedApp.items_list = this.util.mergeChunks([
-        ...chunks,
-        receivedApp,
-      ]);
-    }
+    if (this.appRequestCache.has(app_id)) return this.appRequestCache.get(app_id);
+
+    let self = this;
+
+    let pr = new Promise(async (resolve, reject) => {
+      try {
+        let receivedApp = await self.dataService.getApp(app_id);
+        if (!receivedApp) reject();
+    
+        //!!! temporary check !!!! if app has chanks property then we start getting it
+        if (
+          receivedApp.chunks &&
+          receivedApp.chunks.length
+        ) {
+          let chunks = await self.chunksManager.getChunks(app_id, receivedApp.chunks);
+          receivedApp.items_list = self.util.mergeChunks([
+            ...chunks,
+            receivedApp,
+          ]);
+        }
+
 
-    this.saveAppInStorage(receivedApp);
-    this.ws.addSubscription(app_id);
+        // This code for trash must be changed
+        // return trash ? app : {...app, items_list: app.items_list.filter(item => !item.trash)};
+        resolve(receivedApp);
+    
+        self.saveAppInStorage(receivedApp);
+        self.ws.addSubscription(app_id);
+      } catch (error) {
+        reject();
+      }
+    });
 
-    // This code for trash must be changed
-    // return trash ? app : {...app, items_list: app.items_list.filter(item => !item.trash)};
-    return receivedApp;
+    self.appRequestCache.set(app_id, pr);
+  
+    return pr;
   }
 
   async updateApp(app) {
@@ -319,6 +336,10 @@ export class AppProcessor {
     }
   }
 
+  handleAppChange(v1, v2) {
+    // generate required events etc, do job
+  }
+
   clearAppProcessor() {
     this.getAppListPromises = null;
     this.getAppPromises = {};

package/GUDHUB/DataService/IndexedDB/IndexedDBAppService.js

@@ -11,13 +11,15 @@ import { IndexedDBService } from "./IndexedDBService.js";
 // }
 
 export class IndexedDBAppService extends AppDataService {
-    constructor(req, conf) {
+    constructor(req, conf, gudhub) {
       super(req, conf);
   
       this.dataService = new AppHttpService(req);
 
       let indexDBService = new IndexedDBService(conf);
 
+      this.gudhub = gudhub;
+
       objectAssignWithOverride(this, indexDBService);
     }
 
@@ -28,7 +30,7 @@ export class IndexedDBAppService extends AppDataService {
         if (instance instanceof IndexedDBService) return true; //TODO requires multiple inheritance, thhink how to overcome it
         return false;
       } catch (error) {
-      return false;
+        return false;
       }
     }
 
@@ -39,55 +41,54 @@ export class IndexedDBAppService extends AppDataService {
     async getApp(id) {
       if (this.requestCache.has(id)) return this.requestCache.get(id);
 
-      let dataServiceRequest = this.dataService.getApp(id);
+      let self = this;
 
-      dataServiceRequest.then(data => this.putApp(id, data));
-
-      try {
-        let self = this;
-
-        let pr = new Promise(async (resolve, reject) => {
-          try {
-            const db = await self.openDatabase();
-            const transaction = db.transaction(self.store, "readonly");
-            const store = transaction.objectStore(self.store);
-          
-            const storeRequest = store.get(id);
+      let dataServiceRequest = this.dataService.getApp(id);
 
-            storeRequest.onsuccess = (e) => {
-      
-              let cachedData = e.target.result;
-        
-              if (
-                !cachedData
-              ) {
-                reject();
-              }
+      let pr = new Promise(async (resolve, reject) => {
+        try {
+          const db = await self.openDatabase();
+          const transaction = db.transaction(self.store, "readonly");
+          const store = transaction.objectStore(self.store);
         
-              if (
-                cachedData
-              ) {
-                resolve(cachedData);
-              }
-            };
-        
-            storeRequest.onerror = reject
-          } catch (error) {
-            reject();
-          }
-        });
-
-        self.requestCache.set(id, pr);
+          const storeRequest = store.get(id);
 
-        await pr;
+          storeRequest.onsuccess = (e) => {
+    
+            let cachedData = e.target.result;
       
-        return pr;
-
-      } catch(e) {
-        this.requestCache.set(id, dataServiceRequest);
+            if (
+              !cachedData
+            ) {
+              dataServiceRequest.then(resolve, reject);
+              dataServiceRequest.then(data => self.putApp(id, data));
+            }
+      
+            if (
+              cachedData
+            ) {
+              resolve(cachedData);
+
+              dataServiceRequest.then(data => {
+                self.gudhub.processAppUpd(data, cachedData);
+                self.putApp(id, data);
+              });
+            }
+          };
+      
+          storeRequest.onerror = () => {
+            dataServiceRequest.then(resolve, reject);
+            dataServiceRequest.then(data => self.putApp(id, data));
+          }
+        } catch (error) {
+          dataServiceRequest.then(resolve, reject);
+          dataServiceRequest.then(data => self.putApp(id, data));
+        }
+      });
 
-        return dataServiceRequest;
-      }
+      self.requestCache.set(id, pr);
+    
+      return pr;
     }
 
     async putApp(id, data) {

package/GUDHUB/DataService/httpService/AppHttpService.js

@@ -4,7 +4,7 @@ import { objectAssignWithOverride } from "../utils.js";
 import { HttpService } from "./HttpService.js";
 
 export class AppHttpService extends AppDataService {
-    constructor(req, conf) {
+    constructor(req, conf, gudhub) {
       super();
   
       this.appApi = new AppAPI(req);

package/GUDHUB/ItemProcessor/ItemProcessor.js

@@ -118,6 +118,13 @@ export class ItemProcessor {
     return items;
   }
 
+  handleItemsChange(v1, v2) {
+    let compareRes = this.util.compareItems(v1.items_list, v2.items_list);
+
+    this.updateItemsInStorage(v1.app_id, compareRes.diff_src_items);
+    this.addItemsToStorage(v1.app_id, compareRes.new_src_items);
+  }
+
   async deleteItemsFromStorage(app_id, itemsForDelete = []) {
     const app = await this.appProcessor.getApp(app_id);
     if (app) {

package/GUDHUB/gudhub.js

@@ -74,7 +74,7 @@ export class GudHub {
       this.chunksManager,
       this.util,
       options.activateSW,
-      new AppDataService(this.req, appDataServiceConf),
+      new AppDataService(this.req, appDataServiceConf, this),
     );
     this.itemProcessor = new ItemProcessor(
       this.storage,
@@ -234,6 +234,11 @@ export class GudHub {
     return this.util.sortItems(items, options);
   }
 
+  processAppUpd(v1, v2) {
+    this.itemProcessor.handleItemsChange(v1, v2);
+    this.appProcessor.handleAppChange(v1, v2);
+  }
+
   jsonToItems(json, map) {
     return this.util.jsonToItems(json, map);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gudhub/core",
-  "version": "1.2.4-beta.5",
+  "version": "1.2.4-beta.7",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -17,7 +17,7 @@
             "esmodules": true
           },
           "exclude": [
-            "plugin-transform-classes"
+            "babel-plugin-transform-classes"
           ]
         }
       ]