@gudhub/core 1.2.4-beta.45 → 1.2.4-beta.47

package/GUDHUB/DataService/IndexedDB/IndexedDBChunkService.js

@@ -1,56 +1,26 @@
-import { ChunkDataService } from "../ChunkDataService.js"; // removed "ChunkCacheDataService" from imported because it was causing an error "{ ChunkCacheDataService } not found in exported names" in "gudhub-node-server"
+import { ChunkDataService } from "../ChunkDataService.js";
 import { ChunkHttpService } from "../httpService/ChunkHttpService.js";
-import { objectAssignWithOverride } from "../utils.js";
-import { IndexedDBService } from "./IndexedDBService.js";
 import { ChunksStoreManager, MergedChunksStoreManager } from "./StoreManager/managers.js";
 
 
-//this should be global in project
-// class IndexedDBFacade extends CacheService {
-
-// }
-
-
-
-// class ChunkCachedDataService extends ChunkDataService {
-//     dataService;
-// }
-
-
 export class IndexedDBChunkService extends ChunkDataService {
     constructor(req, conf, gudhub) {
       super(req, conf);
   
       this.dataService = new ChunkHttpService(req);
 
-      // let indexDBService = new IndexedDBService(conf);
-
-      this.requestCache = new Map; // id -> promise ///TODO seems irrelevant to class IndexedDBManager (could be renamed to Facade already)
+      this.requestCache = new Map;
 
 
       this.gudhub = gudhub;
 
-
-      // this.storeManager = new ChunksStoreManager;
       this.storeManager = new MergedChunksStoreManager;
-
-
-      // this.storeManager = new ChunksStoreManager;
-
-
-      // objectAssignWithOverride(this, indexDBService);
-      // objectAssignWithOverride(this, new ChunksStoreManager);
     }
 
-    //TODO use IndexedDBFacade here
-    // indexDBAccess = new IndexedDBFacade;
-
-
-
     static [Symbol.hasInstance](instance) {
       try {
         if (instance instanceof IndexedDBChunkService) return true;
-        if (instance instanceof IndexedDBService) return true; //TODO requires multiple inheritance, thhink how to overcome it
+        // if (instance instanceof IndexedDBService) return true; //TODO requires multiple inheritance, thhink how to overcome it
         return false;
       } catch (error) {
         return false;
@@ -63,9 +33,6 @@ export class IndexedDBChunkService extends ChunkDataService {
 
         return cachedData.mergedData;
       } catch (error) {
-        // let newHashes = chunkHashesList.filter(c => !cachedData.hashes.includes(c));
-
-
         const requests = chunkHashesList.map(hash => this.dataService.getChunk(id, hash));
     
         const newChunks = await Promise.all(requests);
@@ -92,13 +59,6 @@ export class IndexedDBChunkService extends ChunkDataService {
 
     //here // TODO replace this with getMergedChunkForApp in future
     async getMergedChunkForIDList(id, chunkHashesList) {
-
-
-      //TODO promise cache
-
-      // TODO also try catch maybe
-
-
       try {
 
         
@@ -185,8 +145,6 @@ export class IndexedDBChunkService extends ChunkDataService {
 
         return {items_list: mergedData};
       } catch (error) {
-        // let newHashes = chunkHashesList.filter(c => !cachedData.hashes.includes(c));
-
 
         const requests = chunkHashesList.map(hash => this.dataService.getChunk(id, hash));
     
@@ -201,189 +159,7 @@ export class IndexedDBChunkService extends ChunkDataService {
       }
     }
 
-
-
-    // async function fetchAndMergeArrays(urls) {
-    //   try {
-    //     // Create an array of fetch promises
-    //     const requests = urls.map(url => fetch(url).then(response => response.json()));
-    
-    //     // Wait for all requests to complete
-    //     const results = await Promise.all(requests);
-    
-    //     // Merge all arrays
-    //     const mergedArray = results.flat(); // or use reduce: results.reduce((acc, arr) => acc.concat(arr), []);
-    
-    //     return mergedArray;
-    //   } catch (error) {
-    //     console.error('Error fetching data:', error);
-    //     throw error;
-    //   }
-    // }
-    
-    // // Example usage:
-    // const urls = ['https://api.example.com/data1', 'https://api.example.com/data2'];
-    // fetchAndMergeArrays(urls)
-    //   .then(mergedArray => console.log(mergedArray))
-    //   .catch(error => console.error('Error:', error));
-    
-
-    //todo also optimize chunks transactions etc
-
-
-
     async putMergedChunks(id, data) {
       return this.storeManager.put(id, data);
     }
-
-
-    // async getMergedChunks(id, data) {
-    //   return this.storeManager.get(id, data);
-    // }
-
-
-    async putChunk(id, data) {
-      return this.storeManager.putChunk(id, data);
-
-      // try {        
-      //   const db = await this.openDatabase(); //here
-
-      //   const transaction = db.transaction(this.store, "readwrite");
-      //   const store = transaction.objectStore(this.store);
-
-      //   store.put(data, id);
-      // } catch (error) {
-
-      // }
-    }
-
-
-    // async getApp(id) {
-    //   if (this.requestCache.has(id)) return this.requestCache.get(id);
-
-    //   let self = this;
-
-    //   let dataServiceRequest = this.dataService.getApp(id);
-
-    //   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) => {
-    
-    //         let cachedData = e.target.result;
-      
-    //         if (
-    //           !cachedData
-    //         ) {
-    //           dataServiceRequest.then(resolve, reject);
-    //           dataServiceRequest.then(data => self.putApp(id, data));
-    //         }
-      
-    //         if (
-    //           cachedData
-    //         ) {
-    //           resolve(cachedData);
-
-    //           dataServiceRequest.then(async (data) => {
-    //             // self.gudhub.processAppUpd(data, cachedData);//
-    //             await self.putApp(id, data);
-    //             self.gudhub.triggerAppUpdate(id, prevVersion, newVersion);
-    //           });
-    //         }
-    //       };
-      
-    //       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));
-    //     }
-    //   });
-
-    //   self.requestCache.set(id, pr);
-    
-    //   return pr;
-    // }
-
-
-    async getChunk(app_id, id) {
-      if (this.requestCache.has(id)) return this.requestCache.get(id);
-
-      try {
-
-        let pr = this.storeManager.getChunk(id);
-
-        // 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);
-
-        //     storeRequest.onsuccess = (e) => {
-      
-        //       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 reqPrms = this.dataService.getChunk(app_id, id);
-
-        this.requestCache.set(id, reqPrms);
-
-        let res = await reqPrms;
-
-        this.putChunk(id, res);
-        // putPrms.then(() => self.gudhub.triggerAppUpdate(id));
-  
-        return reqPrms;
-      }
-    }
-
-    // async openDatabase() {
-    //   return new Promise((resolve, reject) => {
-    //     const request = indexedDB.open(this.dbName, this.dbVersion);
-
-    //     request.onsuccess = event => {
-    //       resolve(event.target.result);
-    //     };
-    //     request.onerror = event => {
-    //       reject(event.target.error);
-    //     };
-    //   });
-    // }
 }