@gudhub/core 1.2.4-beta.18 → 1.2.4-beta.20

package/GUDHUB/DataService/IndexedDB/IndexedDBAppService.js

@@ -448,7 +448,7 @@ export class IndexedDBAppServiceForWorker extends AppDataService {
     }
 
     async putApp(id, data) {
-      return this.storeManager.addApp(id, data);
+      return this.storeManager.putApp(id, data);
 
       // try {        
       //   await this.openDatabase();
@@ -502,8 +502,8 @@ export class IndexedDBAppService extends AppDataService {
 
     // this.appRequestAndProcessWorker = new Worker('./appRequestWorker.js');
     // this.appRequestAndProcessWorker = new Worker(new URL('./appRequestWorker.js', import.meta.url));
-    // this.appRequestAndProcessWorker = new Worker('node_modules/@gudhub/core/umd/appRequestWorker.js');
-    this.appRequestAndProcessWorker = new Worker('override_npm/gudhub/umd/appRequestWorker.js');
+    this.appRequestAndProcessWorker = new Worker('node_modules/@gudhub/core/umd/appRequestWorker.js');
+    // this.appRequestAndProcessWorker = new Worker('override_npm/gudhub/umd/appRequestWorker.js');
     // this.appRequestAndProcessWorker = new AppRequestWorker();
 
     // new Worker(new URL('./worker.js', import.meta.url));
@@ -761,7 +761,7 @@ export class IndexedDBAppService extends AppDataService {
   }
 
   async putApp(id, data) { //TODO -> put?
-    return this.storeManager.addApp(id, data);
+    return this.storeManager.putApp(id, data);
 
     // try {        
     //   const db = await this.openDatabase();

package/GUDHUB/DataService/IndexedDB/IndexedDBChunkService.js

@@ -57,7 +57,7 @@ export class IndexedDBChunkService extends ChunkDataService {
 
 
     async putChunk(id, data) {
-      return this.storeManager.addChunk(id, data);
+      return this.storeManager.putChunk(id, data);
 
       // try {        
       //   const db = await this.openDatabase(); //here

package/GUDHUB/DataService/IndexedDB/IndexedDBService.js

@@ -50,6 +50,9 @@ export class IndexedDBManager {
       // });
 
 
+      this.dbPrms = this.openDB();
+
+
       // this.db = this.openDB();
 
       // this 
@@ -132,7 +135,14 @@ 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) => {
+        resolver = resolve;
+        rejecter = reject;
+      });
 
       for (let storeName of this.storeNameList) {
         await this.checkAndCreateStore(storeName);
@@ -142,9 +152,9 @@ export class IndexedDBManager {
 
       let self = this;
   
-      return new Promise((resolve, reject) => {
+      // return new Promise((resolve, reject) => {
         // const request = indexedDB.open(this.dbName, this.dbVersion);
-        const request = indexedDB.open(self.dbName);
+        const request = indexedDB.open(this.dbName);
   
         // request.onupgradeneeded = (event) => {
         //   const db = event.target.result;
@@ -159,20 +169,21 @@ export class IndexedDBManager {
         // };
   
         request.onsuccess = (event) => {
-          self.db = event.target.result;
+          this.db = event.target.result;
 
           // let version = this.db.version;
 
-          resolve(self.db);
+          resolver(this.db);
         };
   
-        request.onerror = reject;
-      });
+        request.onerror = rejecter;
+      // });
     }
   
     async executeOperation(storeName, operation) {
 
-      await this.openDB();
+      //this get executed more than 1 time
+      await this.dbPrms;
 
       // if (
       //   !this.db

package/GUDHUB/DataService/IndexedDB/StoreManager/BaseStoreManager.js

@@ -21,6 +21,19 @@ export class BaseStoreManager {
     });
   }
 
+  async putItem(id, data) {
+    return new Promise(async (resolve, reject) => {
+
+      this.dbManager.executeOperation(this.storeName, (store) => {
+        const request = store.put(data, id);
+
+        request.onsuccess = resolve;
+        request.onerror = reject;
+      });
+
+    });
+  }
+
   async hasItem(id) {
 
     // debugger

package/GUDHUB/DataService/IndexedDB/StoreManager/managers.js

@@ -25,6 +25,12 @@ export class AppStoreManager extends BaseStoreManager {
     // return dbManager.enqueueOperation('apps', 'readwrite', (store) => store.add(app));
   }
 
+  async putApp(id, data) {
+    return this.putItem(id, data);
+
+    // return dbManager.enqueueOperation('apps', 'readwrite', (store) => store.add(app));
+  }
+
   async hasApp(id) {
     return this.hasItem(id);
   }
@@ -57,6 +63,12 @@ export class ChunksStoreManager extends BaseStoreManager {
     // return dbManager.enqueueOperation('apps', 'readwrite', (store) => store.add(app));
   }
 
+  async putChunk(id, chunk) {
+    return this.putItem(id, chunk);
+
+    // return dbManager.enqueueOperation('apps', 'readwrite', (store) => store.add(app));
+  }
+
   async deleteChunk(id) {
     return this.deleteItem(id);
 

package/GUDHUB/DataService/utils.js

@@ -31,4 +31,107 @@ export let objectAssignWithoutOverride = (target, ...sourceList) => {
         if (desc.enumerable) Object.defineProperty(target, key, desc);
       }
     }
-  };
+  };
+
+
+
+//   // Base classes
+// class IndexedDBMixin {
+//   constructor(dbName, version) {
+//       this.dbName = dbName;
+//       this.version = version;
+//       this.dbPromise = this.openConnection();
+//   }
+
+//   openConnection() {
+//       return new Promise((resolve, reject) => {
+//           const request = indexedDB.open(this.dbName, this.version);
+
+//           request.onupgradeneeded = (event) => {
+//               const db = event.target.result;
+//               if (!db.objectStoreNames.contains('storeName')) {
+//                   db.createObjectStore('storeName', { keyPath: 'id' });
+//               }
+//           };
+
+//           request.onsuccess = (event) => resolve(event.target.result);
+//           request.onerror = (event) => reject(event.target.error);
+//       });
+//   }
+
+//   async getDB() {
+//       return await this.dbPromise;
+//   }
+  
+//   async addRecord(storeName, record) {
+//       const db = await this.getDB();
+//       return new Promise((resolve, reject) => {
+//           const transaction = db.transaction(storeName, 'readwrite');
+//           const store = transaction.objectStore(storeName);
+//           const request = store.add(record);
+
+//           request.onsuccess = () => resolve(request.result);
+//           request.onerror = () => reject(request.error);
+//       });
+//   }
+
+//   async getRecord(storeName, key) {
+//       const db = await this.getDB();
+//       return new Promise((resolve, reject) => {
+//           const transaction = db.transaction(storeName, 'readonly');
+//           const store = transaction.objectStore(storeName);
+//           const request = store.get(key);
+
+//           request.onsuccess = () => resolve(request.result);
+//           request.onerror = () => reject(request.error);
+//       });
+//   }
+// }
+
+// class LoggingMixin {
+//   log(message) {
+//       console.log(message);
+//   }
+  
+//   error(message) {
+//       console.error(message);
+//   }
+// }
+
+// // Mixin function
+// function applyMixins(targetClass, baseClasses) {
+//   baseClasses.forEach(baseClass => {
+//       Object.getOwnPropertyDescriptors(baseClass.prototype).forEach(descriptor => {
+//           Object.defineProperty(targetClass.prototype, descriptor[0], descriptor[1]);
+//       });
+//   });
+// }
+
+// // Combined class
+// class EnhancedIndexedDB extends IndexedDBMixin {
+//   constructor(dbName, version) {
+//       super(dbName, version);
+//   }
+// }
+
+// // Apply mixins
+// applyMixins(EnhancedIndexedDB, [LoggingMixin]);
+
+// // Usage example
+// const dbFacade = new EnhancedIndexedDB('myDatabase', 1);
+
+// dbFacade.addRecord('storeName', { id: 1, name: 'Sample' })
+//   .then((id) => {
+//       dbFacade.log('Record added with id: ' + id);
+//   })
+//   .catch((error) => {
+//       dbFacade.error('Error adding record: ' + error);
+//   });
+
+// dbFacade.getRecord('storeName', 1)
+//   .then((record) => {
+//       dbFacade.log('Record retrieved: ' + JSON.stringify(record));
+//   })
+//   .catch((error) => {
+//       dbFacade.error('Error retrieving record: ' + error);
+//   });

package/package.json

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