@gudhub/core 1.2.4-beta.6 → 1.2.4-beta.60

package/GUDHUB/Utils/merge_chunks/merge_chunks.js

@@ -1,31 +1,39 @@
+import { mergeChunks as mergeChunksByMainThread, mergeChunksWorker } from "./merge_chunks.worker.js";
+
+
+// const mergeChunksWorkerSingletone = new Worker('mergeWorker.js'); //TODO
+
+
 export function mergeChunks(chunks) {
-  const result = {};
+  //dont launch new thread because already used in worker.
+  // Main reason is that renderer process allocates memory for structured clones for communication between trheads
+  return mergeChunksByMainThread(chunks);
+
+  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.terminate();
+      };
+    
+      worker.onerror = function(e) {
+        reject();
+        worker.terminate();
+      };
+    
+      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);
+  }
+
+
+globalThis.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/Utils/merge_compare_items/merge_compare_items.js

@@ -140,7 +140,8 @@
                 is_items_diff: false,
                 new_src_items:[],
                 diff_src_items:[],
-                same_items:[]
+                same_items:[],
+                trash_src_items: [],
             };
 
             const differentSrcItemFn = function(item){
@@ -155,11 +156,32 @@
                 result.new_src_items.push(item);
             }
 
+            const trashSrcItemFn = function(item){
+                result.trash_src_items.push(item);
+            }
+
             
             //---------  Compearing Src & Dst Items by item_id  ---------//
-            if(fieldToCompare){
+            if (
+                fieldToCompare
+            ) {
+                //TODO trashSrcItemFn
                 compareItemsByFieldId(src, dst, fieldToCompare, differentSrcItemFn, theSameSrcItemFn, newSrcItemFn)
-            }else compareItemsByItemId(src, dst, differentSrcItemFn, theSameSrcItemFn, newSrcItemFn)
+            }
+
+            if (
+                !fieldToCompare
+            ) {
+                compareItemsByItemId(
+                    src, 
+                    dst, 
+                    differentSrcItemFn, 
+                    theSameSrcItemFn, 
+                    newSrcItemFn, 
+                    null, 
+                    trashSrcItemFn,
+                );
+            } 
 
 
             //--------- Final Report ---------//
@@ -214,16 +236,17 @@
 
 
 
-        function compareItemsByItemId(src, dst, differentSrcItemFn, theSameSrcItemFn, newSrcItemFn, uniqDestItemFn){
+        function compareItemsByItemId(src, dst, differentSrcItemFn, theSameSrcItemFn, newSrcItemFn, uniqDestItemFn, trashSrcItemFn){
             let dstItemsMap = new ItemsMapper(dst);
 
             src.forEach(srcItem => {
                 let destIndex = dstItemsMap.pullItemIndex(srcItem.item_id);
 
                 if(destIndex != undefined){
-                    compareTwoItems(srcItem, dst[destIndex], differentSrcItemFn, theSameSrcItemFn);
+                    compareTwoItems(srcItem, dst[destIndex], differentSrcItemFn, theSameSrcItemFn, trashSrcItemFn);
                 }else{
-                    newSrcItemFn(srcItem);
+                    if (srcItem.trash) trashSrcItemFn(srcItem);
+                    if (!srcItem.trash) newSrcItemFn(srcItem);
                 };
             });
             
@@ -236,7 +259,7 @@
 
 
 
-        function compareTwoItems (src, dst, differentSrcItemFn, theSameSrcItemFn ){
+        function compareTwoItems (src, dst, differentSrcItemFn, theSameSrcItemFn, trashSrcItemFn){
             let sameItem = true;
 
             for(let i=0; i<src.fields.length; i++){
@@ -254,8 +277,16 @@
             
             //-- Sending Compearing Result
             if (sameItem){
-                theSameSrcItemFn(src, dst);
-            }else differentSrcItemFn(src, dst);
+                if (src.trash) trashSrcItemFn(src, dst);
+                if (!src.trash) theSameSrcItemFn(src, dst);
+            }
+
+            if (
+                !sameItem
+            ) {
+                if (src.trash) trashSrcItemFn(src, dst);
+                if (!src.trash) differentSrcItemFn(src, dst);
+            }
         }
 
 

package/GUDHUB/Utils/nested_list/nested_list.js

@@ -1,52 +1,55 @@
-export function makeNestedList(arr, id, parent_id, children_property, priority_property) {
-  let array = JSON.parse(JSON.stringify(arr));
-  let children = Boolean(children_property) ? children_property : 'children';
-  let priority = Boolean(priority_property) ? priority_property : false;
-  let i;
-  for (i = 0; i < array.length; i++) {
-    if (array[i][parent_id] && array[i][parent_id] !== 0) {
-      array.forEach((parent) => {
-        if (array[i][parent_id] == parent[id]) {
-          if (!parent[children]) {
-            parent[children] = [];
-          }
-          parent[children].push(array[i]);
-          array.splice(i, 1);
-          i == 0 ? i = 0 : i--;
-        } else if (parent[children]) {
-          findIdsOfChildren(parent);
-        }
-      });
-    }
-  }
-
-  function findIdsOfChildren(parent) {
-    parent[children].forEach((child) => {
-      if (child[id] == array[i][parent_id]) {
-        if (!child[children]) {
-          child[children] = [];
+export function makeNestedList(
+    arr,
+    id,
+    parent_id,
+    children_property = "children",
+    priority_property = null
+) {
+    let map = {};
+    let roots = [];
+
+    arr.forEach((item) => {
+        map[item[id]] = { ...item, [children_property]: [] };
+    });
+
+    arr.forEach((item) => {
+        const parentId = item[parent_id];
+        if (parentId && map[parentId]) {
+            map[parentId][children_property].push(map[item[id]]);
+        } else {
+            roots.push(map[item[id]]);
         }
-        child[children].push(array[i]);
-        array.splice(i, 1);
-        i == 0 ? i = 0 : i--;
-      } else if (child[children]) {
-        findIdsOfChildren(child);
-      }
     });
-  }
-
-  function sortChildrensByPriority(unsorted_array) {
-    unsorted_array.sort( (a, b) => a[priority] - b[priority])
-    unsorted_array.forEach(element => {
-      if(element[children]) {
-        sortChildrensByPriority(element[children])
-      }
-    })
-  }
-
-  if(priority) {
-    sortChildrensByPriority(array);
-  }
-  
-  return array;
-}
+
+    const sortTreeByPriority = (nodes) => {
+        nodes.forEach((node) => {
+            if (node[children_property].length > 0) {
+                sortTreeByPriority(node[children_property]);
+            }
+        });
+
+        if (priority_property) {
+            nodes.sort((a, b) => {
+                const priorityA = a[priority_property] ?? Infinity;
+                const priorityB = b[priority_property] ?? Infinity;
+                return priorityA - priorityB;
+            });
+        }
+    };
+
+    sortTreeByPriority(roots);
+
+    const cleanEmptyChildren = (nodes) => {
+        nodes.forEach((node) => {
+            if (node[children_property].length === 0) {
+                delete node[children_property];
+            } else {
+                cleanEmptyChildren(node[children_property]);
+            }
+        });
+    };
+
+    cleanEmptyChildren(roots);
+
+    return roots;
+};

package/GUDHUB/Utils/nested_list/nested_list.test.js

@@ -29,6 +29,35 @@ describe("NESTED LIST", function () {
         nestedList[0].title.should.equal('Nineth');
     })
 
+    it("Should return correct nested structure with children", function () {
+        let nestedList = gudhub.makeNestedList(nestedComplicatedListWithDocs, 'id', 'parent_id', 'children');
+        
+        nestedList.should.be.an.Array().and.have.length(1);
+        nestedList[0].should.have.property('children');
+        nestedList[0].children.should.be.an.Array().and.have.length(4);
+    });
+    
+    it("Should correctly sort children by priority", function () {
+        let nestedList = gudhub.makeNestedList(nestedComplicatedListWithDocs, 'id', 'parent_id', 'children', 'priority');
+        
+        nestedList[0].children[0].title.should.equal('Intro');
+        nestedList[0].children[1].title.should.equal('Getting Started');
+        nestedList[0].children[2].title.should.equal('Node Installing');
+    });
+    
+    it("Should correctly handle deeply nested structures", function () {
+        let nestedList = gudhub.makeNestedList(nestedComplicatedListWithDocs, 'id', 'parent_id', 'children', 'priority');
+        let featuresChildren = nestedList[0].children[3].children[4].children;
+        
+        featuresChildren.should.be.an.Array().and.have.length(8);
+        featuresChildren[0].title.should.equal("Bundler");
+        featuresChildren[7].title.should.equal("SSR-Menu");
+    });
+    
+    it("Should return empty array for items without parents when parent_id is not found", function () {
+        let nestedList = gudhub.makeNestedList([], 'id', 'parent_id', 'children');
+        nestedList.should.be.an.Array().and.have.length(0);
+    });
 });
 
 let input = [
@@ -150,7 +179,8 @@ let complicatedInput = [
         parent_id: "26553.2884361",
         title: "Child of second parent"
     }
-]
+];
+
 let parentInput = [
     {
         "id": "27026.2937695",
@@ -182,4 +212,112 @@ let parentInput = [
         "title": "Nineth",
         "priority": "0"
     }
-]
+];
+
+let nestedComplicatedListWithDocs = [
+    {
+        id: "123001.1237001",
+        parent_id: "",
+        title: "SSR/SSG - Parent"
+    },
+    {
+        id: "123002.1237002",
+        parent_id: "123001.1237001",
+        title: "Intro",
+        priority: 1
+    },
+    {
+        id: "123003.1237003",
+        parent_id: "123001.1237001",
+        title: "Getting Started",
+        priority: 2
+    },
+    {
+        id: "123004.1237004",
+        parent_id: "123001.1237001",
+        title: "Node Installing",
+        priority: 3
+    },
+    {
+        id: "123005.1237005",
+        parent_id: "123001.1237001",
+        title: "Server - Parent 2"
+    },
+    {
+        id: "123006.1237006",
+        parent_id: "123005.1237005",
+        title: "Server",
+        priority: 4
+    },
+    {
+        id: "123007.1237007",
+        parent_id: "123005.1237005",
+        title: "Install",
+        priority: 5
+    },
+    {
+        id: "123008.1237008",
+        parent_id: "123005.1237005",
+        title: "Endpoints",
+        priority: 6
+    },
+    {
+        id: "123009.1237009",
+        parent_id: "123005.1237005",
+        title: "Configure",
+        priority: 7
+    },
+    {
+        id: "123010.1237010",
+        parent_id: "123005.1237005",
+        title: "Features - Parent 3"
+    },
+    {
+        id: "123011.1237011",
+        parent_id: "123010.1237010",
+        title: "Bundler",
+        priority: 8
+    },
+    {
+        id: "123012.1237012",
+        parent_id: "123010.1237010",
+        title: "RedirectsHandler",
+        priority: 9
+    },
+    {
+        id: "123013.1237013",
+        parent_id: "123010.1237010",
+        title: "SSG",
+        priority: 10
+    },
+    {
+        id: "123014.1237014",
+        parent_id: "123010.1237010",
+        title: "SSR",
+        priority: 11
+    },
+    {
+        id: "123015.1237015",
+        parent_id: "123010.1237010",
+        title: "RouteHandler",
+        priority: 12
+    },
+    {
+        id: "123016.1237016",
+        parent_id: "123010.1237010",
+        title: "SitemapGenerator",
+        priority: 13
+    },
+    {
+        id: "123017.1237017",
+        parent_id: "123010.1237010",
+        title: "ImageHandler",
+        priority: 14
+    },
+    {
+        id: "123018.1237018",
+        parent_id: "123010.1237010",
+        title: "SSR-Menu",
+        priority: 15
+    },
+];

package/GUDHUB/WebSocket/WebSocket.js

@@ -1,4 +1,5 @@
 import Websocket from "ws";
+import { IS_BROWSER_MAIN_THREAD } from "../consts.js";
 
 export class WebSocketApi {
   constructor(url, auth) {
@@ -11,7 +12,7 @@ export class WebSocketApi {
     this.ALLOWED_HEART_BEAT_DELEY = 12000;
     this.firstHeartBeat = true;
     this.reload = true;
-    this.isBrowser = ![typeof window, typeof document].includes("undefined");
+    this.isBrowser = IS_BROWSER_MAIN_THREAD;
   }
 
   async addSubscription(app_id) {

package/GUDHUB/api/AppApi.js

@@ -1,14 +1,14 @@
 export class AppAPI {
-    constructor(req) {
-      this.req = req;
-    }
-  
-    async getApp(app_id) {
-      return this.req.get({
-        url: `/api/app/get`,
-        params: {
-          app_id: app_id,
-        },
-      });
-    }
-  }
+  constructor(req) {
+    this.req = req;
+  }
+
+  async getApp(app_id) {
+    return this.req.get({
+      url: `/api/app/get`,
+      params: {
+        app_id: app_id,
+      },
+    });
+  }
+};

package/GUDHUB/api/ChunkApi.js

@@ -4,16 +4,16 @@ export class ChunkAPI {
   }
 
   async getChunk(app_id, chunk_id) {
-    return this.req.get({
+    return this.req.axiosRequest({
       url: `${this.req.root}/api/get-items-chunk/${app_id}/${chunk_id}`,
       method: 'GET'
     });
   }
 
   async getLastChunk(app_id) {
-      return this.req.axiosRequest({
-          url: `${this.req.root}/api/get-last-items-chunk/${app_id}`,
-          method: 'GET'
-      });
+    return this.req.axiosRequest({
+        url: `${this.req.root}/api/get-last-items-chunk/${app_id}`,
+        method: 'GET'
+    });
   }
-}
+};

package/GUDHUB/config.js

@@ -1,3 +1,5 @@
+import { IS_BROWSER } from "./consts";
+
 export const server_url = "https://gudhub.com/GudHub_Test";
 //export const server_url = "https://gudhub.com/GudHub_Temp";
 //export const server_url = "https://integration.gudhub.com/GudHub_Test";
@@ -8,8 +10,15 @@ export const async_modules_path = 'build/latest/async_modules_node/';
 export const automation_modules_path = 'build/latest/automation_modules/'
 export const file_server_url = 'https://gudhub.com'
 
-export const cache_chunk_requests = true;
-export const cache_app_requests = true;
+export const cache_chunk_requests = true; // todo cahce could be not only indexeddb, take into account that further
+export const cache_app_requests = false;
+
+export let useWorkerToProcessRequestsData = true;
+if (
+    !IS_BROWSER
+) {
+    useWorkerToProcessRequestsData = false;
+}
 
 // FOR TESTS
 export const port = 9000;

package/GUDHUB/consts.js

@@ -1 +1,15 @@
-export const IS_WEB = ![typeof window, typeof document].includes("undefined");
+export const IS_BROWSER_MAIN_THREAD =
+  typeof window != 'undefined' &&
+  typeof document != 'undefined'
+
+export const IS_BROWSER_WORKER_THREAD =
+    typeof self === "object" &&
+    typeof WorkerGlobalScope != 'undefined'
+
+
+export const IS_BROWSER = IS_BROWSER_MAIN_THREAD || IS_BROWSER_WORKER_THREAD;
+
+export const IS_NODE =
+  typeof process !== "undefined" &&
+  process.versions != null &&
+  process.versions.node != null;