@gudhub/core 1.2.4-beta.7 → 1.2.4-beta.9

package/GUDHUB/Utils/Utils.js

@@ -24,6 +24,7 @@ import { FileHelper } from "./FIleHelper/FileHelper.js";
 import { compareObjects } from "./compareObjects/compareObjects.js";
 import { dynamicPromiseAll } from "./dynamicPromiseAll/dynamicPromiseAll.js";
 import { sortItems } from './filter/sortItems.js';
+import { mergeChunksWorker } from "./merge_chunks/merge_chunks.worker.js";
 
 export class Utils {
   constructor(gudhub) {
@@ -142,8 +143,19 @@ export class Utils {
     return makeNestedList(arr, id, parent_id, children_property, priority_property);
   }
 
-  mergeChunks(chunks) {
-    return mergeChunks(chunks);
+  async mergeChunks(chunks) {
+    // return mergeChunks(chunks);
+
+
+    const chunkWorkerBlob = new Blob([mergeChunksWorker()], {
+      type: "application/javascript",
+    });
+    this.worker = new Worker(URL.createObjectURL(chunkWorkerBlob));
+    this.worker.postMessage(chunks);
+    this.worker.addEventListener("message", (event) => {
+      const { diff } = event.data;
+      callback(event.data);
+    });
   }
 
   mergeFieldLists(fieldsToView, fieldList) {

package/GUDHUB/Utils/merge_chunks/merge_chunks.js

@@ -1,31 +1,31 @@
+import { mergeChunks as mergeChunksByMainThread, mergeChunksWorker } from "./merge_chunks.worker.js";
+
+
+// const mergeChunksWorkerSingletone = new Worker('mergeWorker.js'); //TODO
+
+
 export function mergeChunks(chunks) {
-  const result = {};
+  if (
+    typeof Worker !== 'undefined'
+  ) {
+    return new Promise((resolve, reject) => {
+      const chunkWorkerBlob = new Blob([mergeChunksWorker()], {
+        type: "application/javascript",
+      });
+  
+      let worker = new Worker(URL.createObjectURL(chunkWorkerBlob));
+  
+      worker.postMessage(chunks);  
 
-  chunks.forEach((chunk) => {
-    chunk.items_list.forEach((item) => {
-      const dstItem = result[item.item_id];
-      if (dstItem) {
-        dstItem.trash = item.trash;
-        return item.fields.forEach((srcField) => {
-          let isFieldNonExist = true;
-          dstItem.fields = dstItem.fields.map((dstField) => {
-            if (Number(dstField.field_id) === Number(srcField.field_id)) {
-              isFieldNonExist = false;
-              if (dstField.field_value != srcField.field_value) {
-                return {
-                  ...srcField,
-                  history: srcField.history.concat(dstField.history),
-                };
-              }
-              return dstField;
-            }
-            return dstField;
-          });
-          if (isFieldNonExist) dstItem.fields.push(srcField);
-        });
-      }
-      return (result[item.item_id] = item);
+      worker.onmessage = function(e) {
+        resolve(e.data);
+      };
+    
+      worker.onerror = reject;
+    
+      worker.postMessage(chunks);
     });
-  });
-  return Object.values(result);
-}
+  } else {
+    return mergeChunksByMainThread(chunks);
+  }
+}

package/GUDHUB/Utils/merge_chunks/merge_chunks.worker.js

@@ -0,0 +1,78 @@
+export function mergeChunks(chunks) {
+    const result = {};
+  
+    chunks.forEach((chunk) => {
+      chunk.items_list.forEach((item) => {
+        const dstItem = result[item.item_id];
+        if (dstItem) {
+          dstItem.trash = item.trash;
+          return item.fields.forEach((srcField) => {
+            let isFieldNonExist = true;
+            dstItem.fields = dstItem.fields.map((dstField) => {
+              if (Number(dstField.field_id) === Number(srcField.field_id)) {
+                isFieldNonExist = false;
+                if (dstField.field_value != srcField.field_value) {
+                  return {
+                    ...srcField,
+                    history: srcField.history.concat(dstField.history),
+                  };
+                }
+                return dstField;
+              }
+              return dstField;
+            });
+            if (isFieldNonExist) dstItem.fields.push(srcField);
+          });
+        }
+        return (result[item.item_id] = item);
+      });
+    });
+    return Object.values(result);
+  }
+
+
+self.onmessage = function(e) {      
+    const mergedChunks = mergeChunks(e.data);
+    self.postMessage(mergedChunks);
+}
+
+
+export function mergeChunksWorker() {
+  return `function mergeChunks(chunks) {
+    const result = {};
+  
+    chunks.forEach((chunk) => {
+      chunk.items_list.forEach((item) => {
+        const dstItem = result[item.item_id];
+        if (dstItem) {
+          dstItem.trash = item.trash;
+          return item.fields.forEach((srcField) => {
+            let isFieldNonExist = true;
+            dstItem.fields = dstItem.fields.map((dstField) => {
+              if (Number(dstField.field_id) === Number(srcField.field_id)) {
+                isFieldNonExist = false;
+                if (dstField.field_value != srcField.field_value) {
+                  return {
+                    ...srcField,
+                    history: srcField.history.concat(dstField.history),
+                  };
+                }
+                return dstField;
+              }
+              return dstField;
+            });
+            if (isFieldNonExist) dstItem.fields.push(srcField);
+          });
+        }
+        return (result[item.item_id] = item);
+      });
+    });
+    return Object.values(result);
+  }
+
+
+  self.onmessage = function(e) {      
+    const mergedChunks = mergeChunks(e.data);
+    self.postMessage(mergedChunks);
+  }`;
+}

package/GUDHUB/gudhub.js

@@ -10,7 +10,7 @@ import { AppProcessor } from "./AppProcessor/AppProcessor.js";
 import { ItemProcessor } from "./ItemProcessor/ItemProcessor.js";
 import { FieldProcessor } from "./FieldProcessor/FieldProcessor.js";
 import { FileManager } from "./FileManager/FileManager.js";
-import { ChunksManager } from "./ChunksManager/ChunksManager.js";
+// import { ChunksManager } from "./ChunksManager/ChunksManager.js";
 import { DocumentManager } from "./DocumentManager/DocumentManager.js";
 import { Interpritate } from './GHConstructor/interpritate.js'
 import { IS_WEB } from "./consts.js";
@@ -59,19 +59,21 @@ export class GudHub {
     this.req.init(this.auth.getToken.bind(this.auth));
 
     this.ws = new WebSocketApi(options.wss_url, this.auth);
-    this.chunksManager = new ChunksManager(
-      this.storage,
-      this.pipeService,
-      this.req,
-      this.util,
-      new ChunkDataService(this.req, chunkDataServiceConf),
-    );
+
+    //todo
+    // this.chunksManager = new ChunksManager(
+    //   this.storage,
+    //   this.pipeService,
+    //   this.req,
+    //   this.util,
+    //   new ChunkDataService(this.req, chunkDataServiceConf, this),
+    // );
     this.appProcessor = new AppProcessor(
       this.storage,
       this.pipeService,
       this.req,
       this.ws,
-      this.chunksManager,
+      // this.chunksManager,
       this.util,
       options.activateSW,
       new AppDataService(this.req, appDataServiceConf, this),
@@ -234,9 +236,9 @@ export class GudHub {
     return this.util.sortItems(items, options);
   }
 
-  processAppUpd(v1, v2) {
-    this.itemProcessor.handleItemsChange(v1, v2);
-    this.appProcessor.handleAppChange(v1, v2);
+  triggerAppChange(id, prevVersion, newVersion) {
+    this.itemProcessor.handleItemsChange(id, prevVersion, newVersion);
+    this.appProcessor.handleAppChange(id, prevVersion, newVersion);
   }
 
   jsonToItems(json, map) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gudhub/core",
-  "version": "1.2.4-beta.7",
+  "version": "1.2.4-beta.9",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -38,6 +38,7 @@
     "jsonpath": "^1.0.2",
     "qs": "^6.9.4",
     "regenerator-runtime": "^0.13.9",
+    "worker-loader": "^3.0.8",
     "ws": "^7.3.1"
   },
   "devDependencies": {