@gudhub/core 1.2.4-beta.38 → 1.2.4-beta.42

package/.parcelrc.appRequestWorker

@@ -0,0 +1,4 @@
+{
+  "extends": "@parcel/config-default",
+  "resolvers": ["parcel-resolver-ignore", "..."]
+}

package/.vscode/launch.json

@@ -0,0 +1,31 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Launch Program",
+            "program": "${workspaceFolder}/app.js",
+            "request": "launch",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "type": "node"
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "runtimeVersion": "16",
+            "name": "Launch Program",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${workspaceFolder}/index.js"
+        },
+        {
+            "type": "node-terminal",
+            "name": "Run Script: test",
+            "request": "launch",
+            "command": "npm run test",
+            "cwd": "${workspaceFolder}"
+        }
+    ]
+}

package/GUDHUB/DataService/IndexedDB/IndexedDBAppService.js

@@ -12,6 +12,8 @@ import { appsConf } from "./appDataConf.js";
 import { chunksMergeConf } from "./storeManagerConf/chunkCacheStoreManagerConf.js";
 
 
+import AppRequestWorkerScript from '../../../dist/PARCEL_APP_REQUEST_WORKER_FILENAME.js?worker&inline';
+
 //this should be global in project
 // class IndexedDBFacade extends CacheService {
 
@@ -526,9 +528,36 @@ export class IndexedDBAppService extends AppDataService {
 
 
 
+    //TODO replace by worker-loader when it will work in webpack 5, take a look to webpack config
+    // let csvWorkerFileAsString = require('./csv.worker.js');
+    // let worker = new Blob([AppRequestWorkerScript], {type: 'application/javascript'});
+
+    // angular.module('csvService', [
+    //   'itemDataProcessor'
+    // ])
+
+    // .service('csvService', ['itemsDataProcessing', 'PipeService', function(itemsDataProcessing, PipeService) {
+
+      // var self = this,
+    // this.appRequestAndProcessWorker = new Worker(URL.createObjectURL(worker));//TODO URL.createObjectURL - revoke isn't called
+
+
+
     // 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('node_modules/@gudhub/core/umd/appRequestWorker.js');
+    // this.appRequestAndProcessWorker = new Worker('dist/appRequestWorker.built.js', import.meta.url);
+
+
+    // const workerBlob = new Blob([atob(AppRequestWorkerScript.split(',')[1])], { type: 'application/javascript' });
+    // const workerUrl = URL.createObjectURL(workerBlob);
+    // this.appRequestAndProcessWorker = new Worker(workerUrl);
+
+    this.appRequestAndProcessWorker = new AppRequestWorkerScript;
+    // this.appRequestAndProcessWorker = new Worker(
+    //   // parcel bundler specific syntax. Check https://parceljs.org/features/bundle-inlining/
+    //   {type: 'module'}
+    // );
     // this.appRequestAndProcessWorker = new Worker('override_npm/gudhub/umd/appRequestWorker.js');
     // this.appRequestAndProcessWorker = new AppRequestWorker();
 

package/GUDHUB/DataService/IndexedDB/appRequestWorker.js

@@ -1,11 +1,11 @@
 
 import { appDataServiceConf } from "../export.js";
-import { GudHub } from "../../gudhub.js";
 import { IndexedDBAppServiceForWorker } from "../IndexedDB/IndexedDBAppService.js";
 import { appsConf } from "../IndexedDB/appDataConf.js";
 import { IndexedDBChunkService } from "./IndexedDBChunkService.js";
 import { chunksConf } from "./chunkDataConf.js";
 import { chunksMergeConf } from "./storeManagerConf/chunkCacheStoreManagerConf.js";
+import { GudHubForAppRequestWorker } from "../../gudhubAppRequestWorker.js";
 
 
 
@@ -24,7 +24,7 @@ self.onmessage = async function(e) {
 
     e.data.gudhubSerialized.options.initWebsocket = false;
 
-    gudhub = new GudHub(e.data.gudhubSerialized.authKey, e.data.gudhubSerialized.options);
+    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);
 

package/GUDHUB/Storage/ModulesList.js

@@ -979,15 +979,6 @@ export default function generateModulesList(async_modules_path, file_server_url,
             type: 'gh_element',
             technology: 'angular'
         },
-        {
-            data_type: "svg_to_pdf",
-            name: "SVG To PDF",
-            icon: "box",
-            js: "https://gudhub.com/modules/SVG-to-PDF-Gh-Element/dist/main.js",
-            css: "https://gudhub.com/modules/SVG-to-PDF-Gh-Element/dist/style.css",
-            type: "gh_element",
-            technology: "class",
-        },
         /* AUTOMATION MODULES */
         /*
             We have next types for automations:

package/GUDHUB/Utils/AppsTemplateService/AppsTemplateService.js

@@ -443,14 +443,7 @@ export default class AppsTemplateService {
             });
 
             self.crawling(app.field_list, function (prop, value, parent) {
-                const fieldProps = ["field_id", "FieldId", "destination_field", "element_id"];
-                const appProps = ["app_id", "AppId", "destination_app"];
-                const viewProps = ["view_id"];
-                const srcProps = ["src"];
-
-                const hasProp = (prop, propArray) => propArray.some(key => prop.indexOf(key) !== -1);
-
-                if (hasProp(prop, fieldProps)) {
+                if (prop.indexOf("field_id") !== -1 || prop.indexOf("FieldId") !== -1 || prop.indexOf("destination_field") !== -1) {
                     let fieldsArr = String(value).split(','), newFieldsArr = [];
 
                     appsConnectingMap.fields.forEach(field => {
@@ -466,7 +459,7 @@ export default class AppsTemplateService {
                     }
                 }
 
-                if (hasProp(prop, appProps)) {
+                if (prop.indexOf("app_id") != -1 || prop.indexOf("AppId") != -1 || prop.indexOf("destination_app") != -1) {
                     appsConnectingMap.apps.forEach(app => {
                         if (value == app.old_app_id) {
                             parent[prop] = app.new_app_id;
@@ -474,7 +467,7 @@ export default class AppsTemplateService {
                     })
                 }
 
-                if (hasProp(prop, viewProps)) {
+                if (prop.indexOf("view_id") !== -1) {
                     appsConnectingMap.views.forEach(view => {
                         if (value == view.old_view_id) {
                             parent[prop] = view.new_view_id;
@@ -482,7 +475,7 @@ export default class AppsTemplateService {
                     })
                 }
 
-                if (hasProp(prop, srcProps) && isFinite(value)) {
+                if (prop.indexOf("src") !== -1 && isFinite(value)) {
                     const pron_name = 'container_id';
                     const old_app_id = appsConnectingMap.apps.find(appMap => appMap.new_app_id === app.app_id).old_app_id;
                     const path = self.findPath(source_apps[old_app_id].views_list, pron_name, value);

package/GUDHUB/Utils/get_date/get_date.test.js

@@ -53,7 +53,7 @@ describe("GET DATE", function () {
     day.getDay().should.equal(6);
   });
 
-  it("CHECK RECURRING DATE / today", function() {
+  it("CHECK IF DATE TODAY", function() {
     let today = new Date();
     let result = gudhub.checkRecurringDate(today, 'day');
     result.should.equal(true);
@@ -64,7 +64,7 @@ describe("GET DATE", function () {
     result.should.equal(false);
   })
 
-  it("CHECK RECURRING DATE / week", function() {
+  it("CHECK IF DATE IN THIS WEEK", function() {
     let today = new Date();
     let result = gudhub.checkRecurringDate(today, 'week');
     result.should.equal(true);
@@ -75,7 +75,16 @@ describe("GET DATE", function () {
     result.should.equal(false);
   });
 
-  it("CHECK RECURRING DATE / month", function() {
+  it('CHECK IF DATE IN THIS WEEK / Compare this wednesday with wednesday two years ago', function(){
+    let day = gudhub.getDate('this_wednesday');
+    let dayTwoYearsBefore = subYears(day, 2);
+
+    // console.log(dayTwoYearsBefore);
+    let result = gudhub.checkRecurringDate(dayTwoYearsBefore, 'week');
+    result.should.equal(true);
+  });
+
+  it("CHECK IF DATE IN THIS MONTH", function() {
     let today = new Date();
     let result = gudhub.checkRecurringDate(today, 'month');
     result.should.equal(true);

package/GUDHUB/Utils/nested_list/nested_list.js

@@ -1,55 +1,52 @@
-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]]);
+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);
         }
-    });
-
-    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;
-            });
+      });
+    }
+  }
+
+  function findIdsOfChildren(parent) {
+    parent[children].forEach((child) => {
+      if (child[id] == array[i][parent_id]) {
+        if (!child[children]) {
+          child[children] = [];
         }
-    };
-
-    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;
-};
+        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;
+}

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

@@ -29,35 +29,6 @@ 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 = [
@@ -179,8 +150,7 @@ let complicatedInput = [
         parent_id: "26553.2884361",
         title: "Child of second parent"
     }
-];
-
+]
 let parentInput = [
     {
         "id": "27026.2937695",
@@ -212,112 +182,4 @@ 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/gudhub.js

@@ -74,16 +74,9 @@ export class GudHub {
     //   this.util,
     //   new ChunkDataService(this.req, chunkDataServiceConf, this),
     // );
-    this.appProcessor = new AppProcessor(
-      this.storage,
-      this.pipeService,
-      this.req,
-      this.ws,
-      // this.chunksManager,
-      this.util,
-      options.activateSW,
-      new AppDataService(this.req, appDataServiceConf, this),
-    );
+
+    this.initializeAppProcessor();
+
     this.itemProcessor = new ItemProcessor(
       this.storage,
       this.pipeService,
@@ -114,6 +107,19 @@ export class GudHub {
     }
   }
 
+  initializeAppProcessor() {
+    this.appProcessor = new AppProcessor(
+      this.storage,
+      this.pipeService,
+      this.req,
+      this.ws,
+      // this.chunksManager,
+      this.util,
+      this.config.activateSW,
+      new AppDataService(this.req, appDataServiceConf, this),
+    );
+  }
+
   async activateSW(swLink) {
     if (IS_BROWSER_MAIN_THREAD && "serviceWorker" in window.navigator) {
       try {

package/GUDHUB/gudhubAppRequestWorker.js

@@ -0,0 +1,18 @@
+import { AppProcessor } from "./AppProcessor/AppProcessor";
+import { AppHttpService } from "./DataService/httpService/AppHttpService";
+import { GudHub } from "./gudhub";
+
+export class GudHubForAppRequestWorker extends GudHub {
+  initializeAppProcessor() {
+    this.appProcessor = new AppProcessor(
+      this.storage,
+      this.pipeService,
+      this.req,
+      this.ws,
+      // this.chunksManager,
+      this.util,
+      false,
+      new AppHttpService(this.req, null, this),
+    );
+  }
+}

package/build.sh

@@ -0,0 +1,55 @@
+#!/bin/bash
+
+
+export PATH=$PATH:node_modules/.bin
+
+
+export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
+
+nvm ls 16 >/dev/null 2>&1
+if [ $? -ne 0 ]; then
+  echo "Node.js version 16 is not installed. Installing Node.js version 16..."
+  nvm install 16
+else
+  echo "Node.js version 16 is already installed."
+fi
+
+
+nvm ls 18 >/dev/null 2>&1
+if [ $? -ne 0 ]; then
+  echo "Node.js version 18 is not installed. Installing Node.js version 18..."
+  nvm install 18
+else
+  echo "Node.js version 18 is already installed."
+fi
+
+
+sed -i '/PARCEL_APP_REQUEST_WORKER_FILENAME/d' GUDHUB/DataService/IndexedDB/IndexedDBAppService.js
+
+
+nvm use 16
+
+
+# builds appRequestWorker bundle
+./node_modules/.bin/parcel build --config .parcelrc.appRequestWorker --target appRequestWorker
+
+
+git checkout -- GUDHUB/DataService/IndexedDB/IndexedDBAppService.js
+
+
+sed -i 's|PARCEL_APP_REQUEST_WORKER_FILENAME.js|PARCEL_APP_REQUEST_WORKER_FILENAME.js?worker\&inline|g' GUDHUB/DataService/IndexedDB/IndexedDBAppService.js
+
+
+nvm use 18
+
+
+node_modules/.bin/vite -c vite.config.esm.js build
+
+
+node_modules/.bin/vite -c vite.config.umd.js build
+
+
+git checkout -- GUDHUB/DataService/IndexedDB/IndexedDBAppService.js
+
+rm ./dist/PARCEL_APP_REQUEST_WORKER_FILENAME.js