@gudhub/core 1.2.3 → 1.2.4-beta.1

package/.vscode/launch.json

@@ -0,0 +1,31 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Launch Program",
+            "program": "${workspaceFolder}/app.js",
+            "request": "launch",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "type": "node"
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "runtimeVersion": "16",
+            "name": "Launch Program",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${workspaceFolder}/index.js"
+        },
+        {
+            "type": "node-terminal",
+            "name": "Run Script: test",
+            "request": "launch",
+            "command": "npm run test",
+            "cwd": "${workspaceFolder}"
+        }
+    ]
+}

package/GUDHUB/AppProcessor/AppProcessor.js

@@ -78,10 +78,6 @@ export class AppProcessor {
     }
   }
 
-  async getAppApi(app_id) {
-    return this.dataService.getApp(app_id);
-  }
-
   getAppListFromStorage() {
     return this.storage.getAppsList();
   }
@@ -186,7 +182,7 @@ export class AppProcessor {
     for (const app_id of apps_id) {
       if (app_id != undefined) {
         try {
-          const app = await this.getAppApi(app_id);
+          const app = await this.dataService.getApp(app_id);
           if (app) {
             app.items_object = {};
 
@@ -259,7 +255,7 @@ export class AppProcessor {
     let app = this.getAppFromStorage(app_id);
     if (app) return app;
 
-    let receivedApp = await this.getAppApi(app_id);
+    let receivedApp = await this.dataService.getApp(app_id);
     if (!receivedApp) return;
 
     //!!! temporary check !!!! if app has chanks property then we start getting it

package/GUDHUB/DataService/IndexedDB/IndexedDBAppService.js

@@ -23,9 +23,13 @@ export class IndexedDBAppService extends AppDataService {
 
 
     static [Symbol.hasInstance](instance) {
-      if (instance instanceof IndexedDBService) return true;
-      if (instance.chunkDataService instanceof IndexedDBAppService) return true;
+      try {
+        if (instance instanceof IndexedDBAppService) return true;
+        if (instance instanceof IndexedDBService) return true; //TODO requires multiple inheritance, thhink how to overcome it
+        return false;
+      } catch (error) {
       return false;
+      }
     }
 
     //TODO use IndexedDBFacade here
@@ -33,39 +37,55 @@ export class IndexedDBAppService extends AppDataService {
 
 
     async getApp(id) {
+      if (this.requestCache.has(id)) return this.requestCache.get(id);
+
       let dataServiceRequest = this.dataService.getApp(id);
 
       dataServiceRequest.then(data => this.putApp(id, data));
 
       try {
-        const db = await this.openDatabase();
-        const transaction = db.transaction(this.store, "readonly");
-        const store = transaction.objectStore(this.store);
-      
-        const storeRequest = store.get(id);
-      
-        return await new Promise((resolve, reject) => {
-          storeRequest.onsuccess = (e) => {
-      
-            let cachedData = e.target.result;
-      
-            if (
-              !cachedData
-            ) {
-              reject();
-            }
-      
-            if (
-              cachedData
-            ) {
+        let self = this;
 
-              resolve(cachedData);
-            }
-          };
+        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);
+
+            storeRequest.onsuccess = (e) => {
       
-          storeRequest.onerror = reject
+              let cachedData = e.target.result;
+        
+              if (
+                !cachedData
+              ) {
+                reject();
+              }
+        
+              if (
+                cachedData
+              ) {
+                resolve(cachedData);
+              }
+            };
+        
+            storeRequest.onerror = reject
+          } catch (error) {
+            reject();
+          }
         });
+
+        self.requestCache.set(id, pr);
+
+        await pr;
+      
+        return pr;
+
       } catch(e) {
+        this.requestCache.set(id, dataServiceRequest);
+
         return dataServiceRequest;
       }
     }

package/GUDHUB/DataService/IndexedDB/IndexedDBChunkService.js

@@ -34,9 +34,13 @@ export class IndexedDBChunkService extends ChunkDataService {
 
 
     static [Symbol.hasInstance](instance) {
-      if (instance instanceof IndexedDBService) return true;
-      if (instance.chunkDataService instanceof IndexedDBChunkService) return true;
-      return false;
+      try {
+        if (instance instanceof IndexedDBChunkService) return true;
+        if (instance instanceof IndexedDBService) return true; //TODO requires multiple inheritance, thhink how to overcome it
+        return false;
+      } catch (error) {
+        return false;
+      }
     }
 
 
@@ -57,41 +61,59 @@ export class IndexedDBChunkService extends ChunkDataService {
 
 
     async getChunk(app_id, id) {
+      if (this.requestCache.has(id)) return this.requestCache.get(id);
+
       try {
-        const db = await this.openDatabase();
-        const transaction = db.transaction(this.store, "readonly");
-        const store = transaction.objectStore(this.store);
-      
-        const storeRequest = store.get(id);
-      
-        return await new Promise((resolve, reject) => {
-          storeRequest.onsuccess = (e) => {
-      
-            let cachedData = e.target.result;
-      
-            if (
-              !cachedData
-            ) {
-              reject();
-            }
-      
-            if (
-              cachedData
-            ) {
+        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);
 
-              resolve(cachedData);
-            }
-          };
+            storeRequest.onsuccess = (e) => {
       
-          storeRequest.onerror = reject
+              let cachedData = e.target.result;
+        
+              if (
+                !cachedData
+              ) {
+                reject();
+              }
+        
+              if (
+                cachedData
+              ) {
+  
+                resolve(cachedData);
+              }
+            };
+        
+            storeRequest.onerror = reject
+          } catch (error) {
+            reject();
+          }
         });
+
+        self.requestCache.set(id, pr);
+
+        await pr;
+
+        return pr;
+
       } catch(e) {
-        let res = await this.dataService.getChunk(app_id, id);
+        let reqPrms = this.dataService.getChunk(app_id, id);
 
-        await this.putChunk(id, res);
-  
+        this.requestCache.set(id, reqPrms);
+
+        let res = await reqPrms;
+
+        this.putChunk(id, res);
   
-        return res;
+        return reqPrms;
       }
     }
 

package/GUDHUB/DataService/IndexedDB/IndexedDBService.js

@@ -3,5 +3,7 @@ export class IndexedDBService {
         this.store = conf.store;
         this.dbName = conf.dbName;
         this.dbVersion = conf.dbVersion;
+
+        this.requestCache = new Map; // id -> promise
     }
 }

package/GUDHUB/DataService/httpService/AppHttpService.js

@@ -24,8 +24,12 @@ export class AppHttpService extends AppDataService {
     }
   
     static [Symbol.hasInstance](instance) {
-        if (instance instanceof AppHttpService) return true;
-        if (instance.chunkDataService instanceof HttpService) return true;
-        return false;
+        try {
+            if (instance instanceof AppHttpService) return true;
+            if (instance instanceof HttpService) return true; //TODO requires multiple inheritance, thhink how to overcome it
+            return false;
+        } catch (error) {
+            return false;
+        }
     }
 }

package/GUDHUB/DataService/httpService/ChunkHttpService.js

@@ -25,8 +25,12 @@ export class ChunkHttpService extends ChunkDataService {
 
 
     static [Symbol.hasInstance](instance) {
-        if (instance instanceof ChunkHttpService) return true;
-        if (instance.chunkDataService instanceof HttpService) return true;
-        return false;
+        try {
+          if (instance instanceof ChunkHttpService) return true;
+          if (instance instanceof HttpService) return true; //TODO requires multiple inheritance, thhink how to overcome it
+          return false;
+        } catch (error) {
+          return false;
+        }
     }
 }

package/GUDHUB/api/AppApi.js

@@ -5,7 +5,7 @@ export class AppAPI {
   
     async getApp(app_id) {
       return this.req.get({
-        url: `${this.req.root}/api/app/get`,
+        url: `/api/app/get`,
         params: {
           app_id: app_id,
         },

package/package.json

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