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

package/GUDHUB/DataService/IndexedDB/appRequestWorker.js

@@ -1,6 +1,6 @@
 
-import { appDataServiceConf } from "../export.js";
-import { IndexedDBAppServiceForWorker } from "../IndexedDB/IndexedDBAppService.js";
+import { appDataServiceConf, AppDataServiceForWorker, ChunkDataServiceForWorker } from "../export.js";
+import { WORKER_EVENTS } from "../IndexedDB/IndexedDBAppService.js";
 import { appsConf } from "../IndexedDB/appDataConf.js";
 import { IndexedDBChunkService } from "./IndexedDBChunkService.js";
 import { chunksConf } from "./chunkDataConf.js";
@@ -14,28 +14,36 @@ let appDataService = {};
 let chunkDataService = {};
 
 
-
-//TODO also ChunkDataService !!!!!!!!!!!!!!!!!!!!!!!
-
-
 self.onmessage = async function(e) {
-  if (e.data.type === 'init') {
-
-
+  if (
+    e.data.type === WORKER_EVENTS.INIT
+  ) {
     e.data.gudhubSerialized.options.initWebsocket = false;
 
     gudhub = new GudHubForAppRequestWorker(e.data.gudhubSerialized.authKey, e.data.gudhubSerialized.options);
-    appDataService = new IndexedDBAppServiceForWorker(gudhub.req, appsConf, gudhub);
-    chunkDataService = new IndexedDBChunkService(gudhub.req, chunksMergeConf, gudhub);
+    appDataService = new AppDataServiceForWorker(gudhub.req, appsConf, gudhub);
+    chunkDataService = new ChunkDataServiceForWorker(gudhub.req, chunksMergeConf, gudhub);
+  }
 
+  if (
+    e.data.type == WORKER_EVENTS.PROCESS_DATA
+  ) {
 
-  }
 
-  if (e.data.type === 'processData') {
+    //TODO тут может прийти запрос и данные не кешируются. тогда нужно вернуть пустые данные и как-то убрать в пендинге запрос или промис в клиентском коде !!!!!!!!!!
+    //TODO pass parameter is cached version exist
 
 
 
-        //todo cached could not exist !!!!!!!!!!!!!!!!!!!
+    if (
+      !e.data.usedCachedDataVersion
+    ) {
+      this.postMessage({id: e.data.id, type: WORKER_EVENTS.DECLINE_PROCESS_DATA_REQUEST});
+      return;
+    }
+
+
+    //todo cached could not exist !!!!!!!!!!!!!!!!!!!
 
     let cached = await appDataService.getCached(e.data.id); // merge ?
 
@@ -100,12 +108,6 @@ self.onmessage = async function(e) {
     }
 
 
-
-
-
-
-
-
     // let comparison = gudhub.compareItems(cached.items_list, newVersion.items_list);
     let comparison = gudhub.compareItems(nextVersion.items_list, cached.items_list);
 
@@ -146,80 +148,13 @@ self.onmessage = async function(e) {
 
 
   if (
-    e.data.type === 'requestApp'
+    e.data.type == WORKER_EVENTS.REQUEST_APP
   ) {
 
-    // //todo cached could not exist !!!!!!!!!!!!!!!!!!!
-
-    // let cached = await appDataService.getCached(e.data.id); // merge ?
-
-
-    // let cachedChunksList = cached.chunks;
-
-
-    // let nextVersion = await appDataService.getAppWithoutProcessing(e.data.id);
-
-
-    // let isMergedChunkUpdated = true;
-
-
-    // if (
-    //   cachedChunksList.length != nextVersion.chunks.length
-    // ) isMergedChunkUpdated = false;
-
-
-    // //TODO here old chunks should be exactly with ids that came from app get request
-    // if (
-    //   nextVersion.chunks.some(entry => !cachedChunksList.includes(entry))
-    // ) isMergedChunkUpdated = false;
-
-
-    // if (
-    //   !isMergedChunkUpdated
-    // ) {
-
-    //   // 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 data = await appDataService.getApp(e.data.id); //todo check process request method seems there i return cahced version not most recent data from server
 
 
     this.postMessage({id: e.data.id, type: e.data.type, data});
 
   }
-
-
-  // this.appRequestAndProcessWorker.postMessage({ type: 'requestApp', id: id });
 };

package/GUDHUB/DataService/IndexedDB/consts.js

@@ -1,4 +1,2 @@
 export const dbName = "gudhub";
-// export const dbVersion = 7;
-
-//todo dynamic version change chatgpt used, maybe isnt good to use static  version
+// export const dbVersion = 7;

package/GUDHUB/DataService/IndexedDB/init.js

@@ -1,4 +1,4 @@
-import { IS_BROWSER, IS_WEB } from "../../consts.js";
+import { IS_BROWSER } from "../../consts.js";
 import { appsConf } from "./appDataConf.js";
 import { chunksConf } from "./chunkDataConf.js";
 import { dbName, dbVersion } from "./consts.js";

package/GUDHUB/DataService/IndexedDB/storeManagerConf/init.js

@@ -1 +1 @@
-//move appsdbcons chunksdbconf and chunkcacheconf to here
+//move appsdbcons chunksdbconf and chunkcacheconf to here maybe

package/GUDHUB/DataService/export.js

@@ -1,6 +1,6 @@
-import { cache_app_requests, cache_chunk_requests } from "../config.js";
-import { IS_BROWSER, IS_WEB } from "../consts.js";
-import { IndexedDBAppService } from "./IndexedDB/IndexedDBAppService.js";
+import { cache_app_requests, cache_chunk_requests, useWorkerToProcessRequestsData } from "../config.js"; //TODO maybe this constants are not necessary! seems still required
+import { IS_BROWSER } from "../consts.js";
+import { AppHttpWorkerService, AppIndexedDBWorkerService, AppThroughWebWorkerService, IndexedDBAppService, IndexedDBAppServiceForWorker } from "./IndexedDB/IndexedDBAppService.js";
 import { IndexedDBChunkService } from "./IndexedDB/IndexedDBChunkService.js";
 import { appsConf } from "./IndexedDB/appDataConf.js";
 import { chunksConf } from "./IndexedDB/chunkDataConf.js";
@@ -8,7 +8,7 @@ import { AppHttpService } from "./httpService/AppHttpService.js";
 import { ChunkHttpService } from "./httpService/ChunkHttpService.js";
 
 
-import "./IndexedDB/init.js";
+import "./IndexedDB/init.js"; // <-----------------------------------------
 
 
 //TODO confs should be used only for appropriate classes therefore it doesnt make sense to export them here
@@ -20,32 +20,92 @@ let appDataServiceConf;
 let chunkDataServiceConf;
 
 
+
+if (
+    !IS_BROWSER
+) {
+    useWorkerToProcessRequestsData = false;
+}
+
+if (
+    IS_BROWSER &&
+    cache_app_requests &&
+    !useWorkerToProcessRequestsData
+) {
+    AppDataService = IndexedDBAppService;
+    appDataServiceConf = appsConf;
+}
+
+
+if (
+    IS_BROWSER &&
+    useWorkerToProcessRequestsData &&
+    !cache_app_requests
+) {
+    AppDataService = AppThroughWebWorkerService;
+    appDataServiceConf = appsConf; // todo seems isnt required for picked class
+}
+
+
+if (
+    !IS_BROWSER
+) {
+    AppDataService = AppHttpService;
+}
+
+if (
+    useWorkerToProcessRequestsData &&
+    !cache_app_requests
+) {
+    AppDataServiceForWorker = AppHttpWorkerService;
+}
+
+
+if (
+    useWorkerToProcessRequestsData &&
+    cache_app_requests
+) {
+    throw new Error;
+    // not implemented
+}
+
+
 if (
     IS_BROWSER &&
-    cache_chunk_requests
+    cache_chunk_requests &&
+    !useWorkerToProcessRequestsData
 ) {
     ChunkDataService = IndexedDBChunkService;
     chunkDataServiceConf = chunksConf;
+}
 
-} else {
-    ChunkDataService = ChunkHttpService;
+if (
+    IS_BROWSER &&
+    cache_chunk_requests &&
+    useWorkerToProcessRequestsData
+) {
+    // here should be http instead, but should be revised variable ChunkDataService usage
+    ChunkDataService = IndexedDBChunkService;
+    chunkDataServiceConf = chunksConf;
 }
 
 
 if (
-    IS_BROWSER &&
-    cache_app_requests // todo here outdated approach
+    !IS_BROWSER
 ) {
-    AppDataService = IndexedDBAppService; // here will be AppHttpService for browser too, check compatability. Checked. seems different code. IndexedDBAppService uses worker
-    appDataServiceConf = appsConf;
-} else {
-    AppDataService = AppHttpService;
+    ChunkDataService = ChunkHttpService;
 }
 
 
+let AppDataServiceForWorker = AppHttpWorkerService;
+let ChunkDataServiceForWorker = IndexedDBChunkService;
+
+
 export {
     AppDataService,
     ChunkDataService,
     appDataServiceConf,
     chunkDataServiceConf,
+    AppDataServiceForWorker,
+    ChunkDataServiceForWorker,
 };

package/GUDHUB/DataService/httpService/AppHttpService.js

@@ -1,6 +1,5 @@
 import { AppAPI } from "../../api/AppApi.js";
 import { AppDataService } from "../AppDataService.js";
-import { ChunkDataService } from "../export.js";
 import { objectAssignWithOverride } from "../utils.js";
 import { HttpService } from "./HttpService.js";
 
@@ -10,29 +9,20 @@ export class AppHttpService extends AppDataService {
   
       this.appApi = new AppAPI(req);
 
-      let indexDBService = new HttpService(conf);
-
-
-    //   this.chunkDataService = new ChunkDataService; //TODO move to 
+      let httpService = new HttpService(conf);
     
-      objectAssignWithOverride(this, indexDBService);
+      objectAssignWithOverride(this, httpService);
     }
 
 
+    // TODO getApp -> getAppAndProcessData
     async getApp(id) {
         let sentData = await this.appApi.getApp(id);
-        return this.processRequestedApp(id, sentData); //TODO check is it ok to trigger change isnide method for AppHttpService
+        return this.processRequestedApp(id, sentData);
     }
 
-    //TODO should be getApp and getAppAndProcessData - refactor whole code to use them
-
-
-
-
-    //TODO андрей говорил про то что там надо фильтровать айтемы удаленные, я так и не доделал
-
-
 
+    // TODO -> getApp
     async getAppWithoutProcessing(id) {
         return this.appApi.getApp(id);
     }

package/GUDHUB/DataService/httpService/ChunkHttpService.js

@@ -4,50 +4,48 @@ import { objectAssignWithOverride } from "../utils.js";
 import { HttpService } from "./HttpService.js";
 
 export class ChunkHttpService extends ChunkDataService {
-    constructor(req, conf) {
-      super();
-  
-      this.chunkApi = new ChunkAPI(req);
+  constructor(req, conf) {
+    super();
 
-      let httpService = new HttpService(conf);
-    
-      objectAssignWithOverride(this, httpService);
-    }
+    this.chunkApi = new ChunkAPI(req);
+
+    let httpService = new HttpService(conf);
   
-    async getChunk(app_id, id) {
-      return this.chunkApi.getChunk(app_id, id);
-    }
+    objectAssignWithOverride(this, httpService);
+  }
 
-    async getChunksForId(app_id) {
-      // maybe use app get api for now and return app.chunks from there
+  async getChunk(app_id, id) {
+    return this.chunkApi.getChunk(app_id, id);
+  }
 
-      return []; // list of chunks
-    }
+  async getChunksForId(app_id) {
+    // maybe use app get api for now and return app.chunks from there
 
+    return []; // list of chunks
+  }
 
-    getCachedMergedChunk(id, chunkHashesList) {
 
-    }
+  getCachedMergedChunk(id, chunkHashesList) {
+    // implementation doesnt have cached
+  }
 
+  getMergedChunkForIDList(id, chunkHashesList) {
+    
+  }
 
-    //here
-    getMergedChunkForIDList(id, chunkHashesList) {
-      
-    }
-  
-  
-    putChunk() {
-      //do nothing
-    }
-
-
-    static [Symbol.hasInstance](instance) {
-        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;
-        }
-    }
+
+  putChunk() {
+    //do nothing
+  }
+
+
+  static [Symbol.hasInstance](instance) {
+      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/DataService/utils.js

@@ -1,137 +1,34 @@
 
 export let objectAssignWithoutOverride = (target, ...sourceList) => {
-    for (let source of sourceList) {
-      if (!source) continue;
-      for(let key of Object.keys(source)) {//this doesnt iterate over class like source properties
-        if (!(key in target)) {//checks own and inherited keys, works fine also for class prototypes and instances
-          const desc = Object.getOwnPropertyDescriptor(source, key);
-          if (desc.enumerable) Object.defineProperty(target, key, desc);
-        }
-      }
-    }
-  };
-  
-  export let objectAssignWithOverride = (target, ...sourceList) => {
-    for (let source of sourceList) {
-      if (!source) continue;
-      for(let key of Object.keys(source)) {//this doesnt iterate over class like source properties
+  for (let source of sourceList) {
+    if (!source) continue;
+    for(let key of Object.keys(source)) {//this doesnt iterate over class like source properties
+      if (!(key in target)) {//checks own and inherited keys, works fine also for class prototypes and instances
         const desc = Object.getOwnPropertyDescriptor(source, key);
         if (desc.enumerable) Object.defineProperty(target, key, desc);
       }
     }
-  };
-  
-  
-  
-  export let checkInstanceModifier = (target, ...sourceList) => {
-    for (let source of sourceList) {
-      if (!source) continue;
-      for(let key of Object.keys(source)) {//this doesnt iterate over class like source properties
-        const desc = Object.getOwnPropertyDescriptor(source, key);
-        if (desc.enumerable) Object.defineProperty(target, key, desc);
-      }
+  }
+};
+
+export let objectAssignWithOverride = (target, ...sourceList) => {
+  for (let source of sourceList) {
+    if (!source) continue;
+    for(let key of Object.keys(source)) {//this doesnt iterate over class like source properties
+      const desc = Object.getOwnPropertyDescriptor(source, key);
+      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);
-//   });
+export let checkInstanceModifier = (target, ...sourceList) => {
+  for (let source of sourceList) {
+    if (!source) continue;
+    for(let key of Object.keys(source)) {//this doesnt iterate over class like source properties
+      const desc = Object.getOwnPropertyDescriptor(source, key);
+      if (desc.enumerable) Object.defineProperty(target, key, desc);
+    }
+  }
+};

package/GUDHUB/GHConstructor/createAngularModuleInstance.js

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import { IS_BROWSER_MAIN_THREAD, IS_WEB } from './../consts.js';
+import { IS_BROWSER_MAIN_THREAD } from './../consts.js';
 
 /*************** FAKE ANGULAR $Q ***************/
 // It's needed when we import angular code.
@@ -85,8 +85,9 @@ export default async function createAngularModuleInstance(gudhub, module_id, mod
         let angularModule;
         let importedClass;
 
-        // todo IS_BROWSER_MAIN_PROCESS ?
-        if (IS_BROWSER_MAIN_THREAD) {
+        if (
+            IS_BROWSER_MAIN_THREAD
+        ) {
 
             if(window.angular) {
 
@@ -296,7 +297,9 @@ export default async function createAngularModuleInstance(gudhub, module_id, mod
 
         // We need these methods in browser environment only
 
-        if (IS_BROWSER_MAIN_THREAD) {
+        if (
+            IS_BROWSER_MAIN_THREAD
+        ) {
 
             //*************** EXTEND CONTROLLER ****************//
 

package/GUDHUB/GHConstructor/createClassInstance.js

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import { IS_BROWSER_MAIN_THREAD, IS_WEB } from './../consts.js';
+import { IS_BROWSER, IS_BROWSER_MAIN_THREAD } from './../consts.js';
 
 export default async function createClassInstance(gudhub, module_id, js_url, css_url, nodeWindow) {
 
@@ -14,7 +14,9 @@ export default async function createClassInstance(gudhub, module_id, js_url, css
         // Import module using dynamic import
 
         let downloadModule = (url) => {
-            if (!IS_BROWSER_MAIN_THREAD && !global.hasOwnProperty('window')) {
+            if (
+                !IS_BROWSER_MAIN_THREAD
+            ) {
                 global.window = proxy;
                 global.document = nodeWindow.document;
                 global.Element = nodeWindow.Element;
@@ -67,7 +69,10 @@ export default async function createClassInstance(gudhub, module_id, js_url, css
         // Check if there is url to css file of module
         // If true, and there is no css for this data type, than create link tag to this css in head
 
-        if (css_url && IS_BROWSER_MAIN_THREAD) {
+        if (
+            css_url &&
+            IS_BROWSER
+        ) {
             const linkTag = document.createElement('link');
             linkTag.href = css_url;
             linkTag.setAttribute('data-module', module_id);

package/GUDHUB/ItemProcessor/ItemProcessor.js

@@ -118,24 +118,6 @@ export class ItemProcessor {
     return items;
   }
 
-  //here
-
-  /////
-  handleItemsChange(id, prevVersion, nextVersion) {
-    let compareRes = this.util.compareItems(prevVersion.items_list, nextVersion.items_list);
-
-    this.updateItemsInStorage(id, compareRes.diff_src_items);
-    this.addItemsToStorage(id, compareRes.new_src_items);
-  }
-
-
-  //
-  triggerItemsChange(id, compareRes) {
-    this.updateItemsInStorage(id, compareRes.diff_src_items);
-    this.addItemsToStorage(id, compareRes.new_src_items);
-  }
-
-  //
   handleDiff(id, compare) {
     this.updateItemsInStorage(id, compare.diff_src_items);
     this.addItemsToStorage(id, compare.new_src_items);