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

package/GUDHUB/AppProcessor/AppProcessor.js

@@ -1,4 +1,4 @@
-import { IS_BROWSER, IS_BROWSER_MAIN_THREAD, IS_WEB } from "../consts.js";
+import { IS_BROWSER_MAIN_THREAD } from "../consts.js";
 
 export class AppProcessor {
   constructor(
@@ -6,7 +6,6 @@ export class AppProcessor {
     pipeService,
     req,
     websocket,
-    // chunksManager,
     util,
     activateSW,
     dataService,
@@ -17,15 +16,11 @@ export class AppProcessor {
     this.ws = websocket;
     this.applistReceived = false;
     this.activateSW = activateSW; // we use this flag to check if applist was received. The problem is that if you receive an app it also goes to app_list as a result you have the app_list with one app.
-    // this.chunksManager = chunksManager;
     this.util = util;
     this.appListeners();
     this.dataService = dataService;
 
     this.appRequestCache = new Map;
-
-
-    // this.dataServiceRequestedIdSet = new Set;
   }
 
   async createNewAppApi(app) {
@@ -345,18 +340,6 @@ export class AppProcessor {
     }
   }
 
-  async handleAppChange(id, prevVersion, nextVersion) {
-    let res1 = this.util.areViewListsEqual(prevVersion.views_list, nextVersion.views_list);
-    let res2 = this.util.areFieldListsEqual(prevVersion.field_list, nextVersion.field_list);
-
-    if (
-      res1 ||
-      res2
-    ) {
-      this.updateAppFieldsAndViews({id, views_list: nextVersion.views_list, field_list: nextVersion.field_list});
-    }
-  }
-
   clearAppProcessor() {
     this.getAppListPromises = null;
     this.getAppPromises = {};
@@ -453,7 +436,10 @@ export class AppProcessor {
         appsList
       );
     });
-    if (IS_BROWSER_MAIN_THREAD && this.activateSW) {
+    if (
+      IS_BROWSER_MAIN_THREAD &&
+      this.activateSW
+    ) {
       navigator.serviceWorker.addEventListener("message", async (event) => {
         if (event.data.type === "refresh app") {
           const app = await this.getApp(event.data.payload.app_id);
@@ -495,7 +481,7 @@ export class AppProcessor {
               }
             );
           }
-          event.data.payload.items_list = await this.util.mergeChunks([app, event.data.payload]) //here check Ask Andrew
+          event.data.payload.items_list = await this.util.mergeChunks([app, event.data.payload])
           this.saveAppInStorage(event.data.payload);
         }
         // if (event.data.type === "refresh appList") {

package/GUDHUB/ChunksManager/ChunksManager.test.js

@@ -2,6 +2,9 @@ import should from "should";
 import {GudHub} from './../gudhub.js';
 import { ChunkDataService } from "../DataService/export.js";
 
+throw new Error;
+//TODO test is outdated, Chunks Manager removed, added ChunkDataService
+
 describe("CHUNKS MANAGER", async function() {
     const auth_key = 'Z/lxMHLenEaQTvPjW5U6c3jBDwWFYZrh2F9Kxa3fbt8drvabS2u2lXQ2zI+SRmic';
     const gudhub = new GudHub(auth_key);

package/GUDHUB/DataService/AppDataService.js

@@ -2,12 +2,7 @@ import { DataService } from "./DataService.js";
 import { ChunkDataService, chunkDataServiceConf } from "./export.js";
 
 
-
-//TODO processRequestedApp should be checked that all code is ok !!!!!!!!!!!!!!!! Ive not ended checking
-
 export class AppDataService extends DataService {
-    //interface for indexeddb and http services
-
     constructor(req, conf, gudhub) {
         super();
         this.chunkDataService = new ChunkDataService(req, chunkDataServiceConf, gudhub);
@@ -19,54 +14,13 @@ export class AppDataService extends DataService {
         return false;
     }
 
-
-    //here
     async processRequestedApp(id, sentData) {
-
-
-        // let 
-
-
-        // let chunksHashesToLoad = sentData.chunks;
-
-        // let chunks = [];
-
-
-        // if (
-        //     this.chunkDataService.isWithCache()
-        // ) {
-
-        //     let cachedMergedChunkData = this.chunkDataService.getCached(id);
-
-        // }
-
-
-        
-        // all implementations are without cache for now
         if (
             !this.isWithCache()
         ) {
 
-
-            // let resultedMergedChunks = this.chunkDataService.getMergedChunk(id, sentData.chunks);
-
-
-            ///TODO here chunks could be with cache too
-
-//   async getChunks(app_id, chunk_ids) {
-//     let chunks = [];
-//     if(chunk_ids){
-//       chunks = await Promise.all(chunk_ids.map((chunk_id) => this.getChunk(app_id, chunk_id)));
-//     }
-//     return chunks;
-//   }
-
-            // let res = await this.chunkDataService.getChunks(id, sentData.chunks);
-            // let res = await Promise.all(sentData.chunks.map((chunk_id) => this.chunkDataService.getChunk(id, chunk_id)));
-
             let res = await this.chunkDataService.getMergedChunkForIDList(id, sentData.chunks);
 
-
             if (
                 res
             ) {
@@ -76,162 +30,9 @@ export class AppDataService extends DataService {
                 ]);
             }
 
-            // if (!res) res = [];
-
-
-
-            //TODO should be in new thread too even for Node.js becauses this will block loop
-
-            // sentData.items_list = await this.gudhub.util.mergeChunks([
-            //     ...res,
-            //     sentData,
-            // ]);
-
-
             return sentData;
-  
-        //   this.dataService.putApp(id, nextVersion);
-
-
-            // return this.mergeAndReturnStrategy.handle(sentData, chunks);
-
-
-
         }
 
-
-
-        throw new Error;
-
-
-
-
-
-
-        try {
-
-            // я там собираюсь склеивать все данные в этом методе, надо посмотреть не будет ли проблем для ноды итп там тоже process вызывается
-            let cachedApp = await this.getCached(id); // this should be merged chunk + app from db
-
-
-            // if (
-            //     this.chunkDataService.isWithCache()
-            // ) {
-            //     let cachedMergedChunk = this.chunkDataService.getCached();
-            // }
-
-
-            // let res = await this.chunkDataService.getMergedChunkForIDList(id, sentData.chunks);
-
-
-
-            // let cachedMergedChunk = await this.chunkDataService.getCachedMergedChunk(id, cachedApp.chunks);
-
-            if (
-                !cachedApp
-                // cachedMergedChunk ?
-            ) {
-
-                //TODO maybe dont wait for chunks at first load
-
-                // let res = await this.chunkDataService.getChunks(id, sentData.chunks);
-                // let res = await Promise.all(sentData.chunks.map((chunk_id) => this.chunkDataService.getChunk(id, chunk_id)));
-                let res = await this.chunkDataService.getMergedChunkForIDList(id, sentData.chunks);
-
-
-                if (
-                    res
-                ) {
-                    sentData.items_list = await this.gudhub.util.mergeChunks([
-                        res,
-                        sentData,
-                    ]);
-                }
-
-                // this.putInCache(id, sentData);
-    
-    
-                return sentData;
-            }
-
-
-            // let newHashesList = sentData.chunks.filter(c => !cachedApp.chunks.includes(c));
-
-
-            // let self = this;
-
-
-            // let res = await this.chunkDataService.getChunks(id, newHashesList);
-            // let res = await Promise.all(newHashesList.map((chunk_id) => this.chunkDataService.getChunk(id, chunk_id)));
-
-            let res = await this.chunkDataService.getCachedMergedChunk(id, cachedApp.chunks);
-
-            // if (!res) res = [];
-
-
-
-            if (
-                res
-            ) {
-                sentData.items_list = await this.gudhub.util.mergeChunks([
-                    cachedApp,
-                    res,
-                    sentData,
-                ]);
-            } else {
-                sentData.items_list = await this.gudhub.util.mergeChunks([
-                    cachedApp,
-                    sentData,
-                ]);
-            }
-
-
-
-
-            // this.chunkDataService.getChunks(id, newHashesList).then((res) => {
-
-
-
-
-
-                //TODO check this for AppHttpService, seems isnt necessary
-                // this.gudhub.triggerAppChange(id, cachedVersion, sentData);
-
-
-                // self.putInCache(id, sentData);
-            // });
-
-
-                return sentData;
-
-
-
-            // return cachedVersion;
-            
-        } catch (error) {
-
-            // seems try catch here isnt handling almost anything, almost identical code here
-
-            // res = await this.chunkDataService.getChunks(id, sentData.chunks);
-            // let res = await Promise.all(sentData.chunks.map((chunk_id) => this.chunkDataService.getChunk(id, chunk_id)));
-            let res = await this.chunkDataService.getMergedChunkForIDList(sentData.chunks);
-
-            // if (!res) res = [];
-
-
-            if (
-                res
-            ) {
-                sentData.items_list = await this.gudhub.util.mergeChunks([
-                    res,
-                    sentData,
-                ]);
-            }
-
-            // this.putInCache(id, sentData);
-
-
-            return sentData;
-        }
+        // following code will work for cases with enabled cache
     }
 }

package/GUDHUB/DataService/ChunkDataService.js

@@ -1,10 +1,6 @@
 import { DataService } from "./DataService.js";
 
 export class ChunkDataService extends DataService {
-    //interface for indexeddb and http services
-
-
-    //here
     getMergedChunkForIDList(idList) {
         
     }