@gudhub/core 1.2.4-beta.25 → 1.2.4-beta.27

package/GUDHUB/DataService/IndexedDB/IndexedDBAppService.js

@@ -307,6 +307,27 @@ export class IndexedDBAppServiceForWorker extends AppDataService {
     //   });
     // }
 
+
+    async getAppWithoutProcessing(id) {
+      let data = await this.dataService.getAppWithoutProcessing(id);
+
+      await this.putApp(id, data);
+
+      return data;
+    }
+
+    // this returns data for specific chunks + app request data
+    // async getAppWithSpecificChunksList(id, list) {
+    //   let data = await this.dataService.getAppWithoutProcessing(id);
+      
+    //   await self.putApp(id, data);
+
+
+    //   let processedData = await self.processRequestedApp(id, data);//here нужно пересмотреть
+
+    //   return processedData;
+    // }
+
     async getApp(id) {
       // if (this.requestCache.has(id)) return this.requestCache.get(id);
 

package/GUDHUB/DataService/IndexedDB/IndexedDBService.js

@@ -50,7 +50,9 @@ export class IndexedDBManager {
       // });
 
 
-      this.dbPrms = this.openDB();
+      // this.dbPrms = this.openDB();
+
+      this.db = null;
 
 
       // this.db = this.openDB();
@@ -135,11 +137,11 @@ export class IndexedDBManager {
       // TODO remove outdated stores before also
 
 
-      // if (this.db) return this.db;
+      if (this.db) return this.db;
 
       let resolver, rejecter;
 
-      this.dbPrms = new Promise((resolve, reject) => {
+      let dbPrms = new Promise((resolve, reject) => {
         resolver = resolve;
         rejecter = reject;
       });
@@ -169,7 +171,7 @@ export class IndexedDBManager {
         // };
   
         request.onsuccess = (event) => {
-          this.db = event.target.result;
+          self.db = event.target.result;
 
           // let version = this.db.version;
 
@@ -177,13 +179,15 @@ export class IndexedDBManager {
         };
   
         request.onerror = rejecter;
+
+        return dbPrms;
       // });
     }
   
     async executeOperation(storeName, operation) {
 
       //this get executed more than 1 time
-      await this.dbPrms;
+      let db = await this.openDB();
 
       // if (
       //   !this.db
@@ -195,12 +199,12 @@ export class IndexedDBManager {
       // await this.db;
 
 
-      let self = this;
+      // let self = this;
 
       // await this.db;
   
       return new Promise((resolve, reject) => {
-        const transaction = self.db.transaction(storeName, 'readwrite'); //TODO not all operations readwrite
+        const transaction = db.transaction(storeName, 'readwrite'); //TODO not all operations readwrite
         const store = transaction.objectStore(storeName);
   
         transaction.oncomplete = () => resolve();

package/GUDHUB/DataService/IndexedDB/appRequestWorker.js

@@ -40,33 +40,66 @@ self.onmessage = async function(e) {
     let cached = await appDataService.getCached(e.data.id); // merge ?
 
 
+    let cachedChunksList = cached.chunks;
 
-    // TODO this is repetitive operation for getCached, maybe put all code in process or in getCached
 
-    let res = await chunkDataService.getCachedMergedChunk(e.data.id, cached.chunks);
+    let nextVersion = await appDataService.getAppWithoutProcessing(e.data.id);
 
-    // if (!res) res = [];
 
+    let isMergedChunkUpdated = true;
 
-    // TODO check that res always exists
+
+    if (
+      cachedChunksList.length != nextVersion.chunks.length
+    ) isMergedChunkUpdated = false;
+
+
+    if (
+      nextVersion.chunks.some(entry => !cachedChunksList.includes(entry))
+    ) isMergedChunkUpdated = false;
 
 
     if (
-        res
+      !isMergedChunkUpdated
     ) {
-        cached.items_list = await gudhub.util.mergeChunks([
-            // cachedApp,
-            res,
-            cached,
-        ]);
-    } else {
-        // sentData.items_list = await this.gudhub.util.mergeChunks([
-        //     cachedApp,
-        //     sentData,
-        // ]);
+
+      // TODO this is repetitive operation for getCached, maybe put all code in process or in getCached
+
+      let res = await chunkDataService.getCachedMergedChunk(e.data.id, cached.chunks);
+
+      // if (!res) res = [];
+
+
+      // // TODO check that res always exists
+
+
+      if (
+          res
+      ) {
+          cached.items_list = await gudhub.util.mergeChunks([
+              // cachedApp,
+              res,
+              cached,
+          ]);
+      } else {
+          // sentData.items_list = await this.gudhub.util.mergeChunks([
+          //     cachedApp,
+          //     sentData,
+          // ]);
+      }
+
+      // nextVersion = await appDataService.getAppWithSpecificChunksList(e.data.id, newChunksList); //todo check that here most recent always
+      nextVersion = await appDataService.getApp(e.data.id); //todo check that here most recent always
+
+
+      //TODO тут достаточно сравнить новые чанки+апп и закешированный апп, тогда будет сгенерирована вся инфа о новых данных
+
+
+      // return;
     }
 
-    let nextVersion = await appDataService.getApp(e.data.id); //todo check that here most recent always
+
+
 
 
 

package/package.json

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