@gudhub/core 1.2.4-beta.7 → 1.2.5-beta.1

package/GUDHUB/AppProcessor/AppProcessor.js

@@ -8,8 +8,7 @@ export class AppProcessor {
     websocket,
     chunksManager,
     util,
-    activateSW,
-    dataService,
+    activateSW
   ) {
     this.storage = storage;
     this.pipeService = pipeService;
@@ -20,9 +19,6 @@ export class AppProcessor {
     this.chunksManager = chunksManager;
     this.util = util;
     this.appListeners();
-    this.dataService = dataService;
-
-    this.appRequestCache = new Map;
   }
 
   async createNewAppApi(app) {
@@ -80,6 +76,21 @@ export class AppProcessor {
     }
   }
 
+  async getAppApi(app_id) {
+    try {
+      const response = await this.req.get({
+        url: "/api/app/get",
+        params: {
+          app_id: app_id,
+        },
+      });
+      return response;
+    } catch (err) {
+      console.log(err);
+      return null;
+    }
+  }
+
   getAppListFromStorage() {
     return this.storage.getAppsList();
   }
@@ -184,7 +195,7 @@ export class AppProcessor {
     for (const app_id of apps_id) {
       if (app_id != undefined) {
         try {
-          const app = await this.dataService.getApp(app_id);
+          const app = await this.getAppApi(app_id);
           if (app) {
             app.items_object = {};
 
@@ -255,44 +266,42 @@ export class AppProcessor {
     if (!app_id) return null;
 
     let app = this.getAppFromStorage(app_id);
-    if (app) return app;
-
-    if (this.appRequestCache.has(app_id)) return this.appRequestCache.get(app_id);
-
-    let self = this;
-
-    let pr = new Promise(async (resolve, reject) => {
-      try {
-        let receivedApp = await self.dataService.getApp(app_id);
-        if (!receivedApp) reject();
-    
-        //!!! temporary check !!!! if app has chanks property then we start getting it
-        if (
-          receivedApp.chunks &&
-          receivedApp.chunks.length
-        ) {
-          let chunks = await self.chunksManager.getChunks(app_id, receivedApp.chunks);
-          receivedApp.items_list = self.util.mergeChunks([
-            ...chunks,
-            receivedApp,
-          ]);
+    if (!app) {
+      let receivedApp = await this.getAppApi(app_id);
+      if (!receivedApp) return null;
+
+      //!!! temporary check !!!! if app has chanks property then we start getting it
+      if (receivedApp.chunks && receivedApp.chunks.length) {
+        this.chunksManager
+          .getChunks(app_id, receivedApp.chunks)
+          .then((chunks) => {
+            receivedApp.items_list = this.util.mergeChunks([
+              ...chunks,
+              receivedApp,
+            ]);
+            this.saveAppInStorage(receivedApp);
+            this.pipeService.emit(
+              "gh_items_update",
+              { app_id },
+              receivedApp.items_list
+            );
+          });
+        app = receivedApp
+        this.saveAppInStorage(receivedApp);
+      } else {
+        app = this.getAppFromStorage(app_id);
+        // for oprimization purpose: we check if app was already received in case when there was severals calls at same moment of the getApp one call will overwrite the App from another call with the same App,
+        if (!app) {
+          app = receivedApp;
+          this.saveAppInStorage(receivedApp); //!!! will be saved over several times for each app request
+          this.ws.addSubscription(app_id);
         }
-
-
-        // This code for trash must be changed
-        // return trash ? app : {...app, items_list: app.items_list.filter(item => !item.trash)};
-        resolve(receivedApp);
-    
-        self.saveAppInStorage(receivedApp);
-        self.ws.addSubscription(app_id);
-      } catch (error) {
-        reject();
       }
-    });
-
-    self.appRequestCache.set(app_id, pr);
-  
-    return pr;
+    }
+    
+    // This code for trash must be changed
+    // return trash ? app : {...app, items_list: app.items_list.filter(item => !item.trash)};
+    return app;
   }
 
   async updateApp(app) {
@@ -336,10 +345,6 @@ export class AppProcessor {
     }
   }
 
-  handleAppChange(v1, v2) {
-    // generate required events etc, do job
-  }
-
   clearAppProcessor() {
     this.getAppListPromises = null;
     this.getAppPromises = {};

package/GUDHUB/ChunksManager/ChunksManager.js

@@ -1,48 +1,60 @@
-import { ChunkAPI } from "../api/ChunkApi.js";
 
 
 export class ChunksManager {
-  constructor(
-    storage,
-    pipeService,
-    req,
-    util,
-    dataService,
-  ) {
+  constructor(storage, pipeService, req, util) {
     this.storage = storage;
     this.pipeService = pipeService;
     this.req = req;
     this.util = util;
-    this.dataService = dataService;
-    this.chunkApi = new ChunkAPI(req);
     this.itemListeners();
   }
 
-  async getChunk(app_id, chunk_id) {
+  async getChunkApi(app_id, chunk_id) {
     try {
-      return this.dataService.getChunk(app_id, chunk_id);
+      const response = await this.req.axiosRequest({
+        url: `${this.req.root}/api/get-items-chunk/${app_id}/${chunk_id}`,
+        method: 'GET'
+      });
+      return response;
     } catch (err) {
       console.log(err);
       return null;
     }
   }
 
-  async getLastChunk(app_id) {
+  async getLastChunkApi(app_id) {
     try {
-      return this.chunkApi.getLastChunk(app_id);
+      const response = await this.req.axiosRequest({
+        url: `${this.req.root}/api/get-last-items-chunk/${app_id}`,
+        method: 'GET'
+      });
+      return response;
     } catch (err) {
       console.log(err);
       return null;
     }
   }
 
+
+  getChunk(app_id, chunk_id) {
+   return this.getChunkApi(app_id, chunk_id);
+  }
+
+
   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)));
+      chunks = await Promise.all(chunk_ids.map((chunk_id) => this.getChunkApi(app_id, chunk_id)));
     }
     return chunks;
   }
+
+
+  async getLastChunk(app_id) {
+    let chunk = await this.getLastChunkApi(app_id);
+    return chunk;
+  }
+
  
   itemListeners() {
   }
@@ -64,5 +76,7 @@ export class ChunksManager {
       }
     }
     return app;
-  }  
-}
+  }
+  
+  
+}

package/GUDHUB/FileManager/FileManager.js

@@ -39,7 +39,7 @@ export class FileManager {
     }
   }
 
-  async updateFileFromStringApi(data, file_id, file_name, extension, format) {
+  async updateFileFromStringApi(data, file_id, file_name, extension, format, alt, title) {
     try {
       const fileObj = {
         file_name,
@@ -47,6 +47,8 @@ export class FileManager {
         file_id,
         format,
         source: data,
+        alt,
+        title
       };
 
       const file = await this.req.post({
@@ -198,13 +200,15 @@ async getFiles(app_id, filesId = []) {
     return file;
   }
 
-  async updateFileFromString(data, file_id, file_name, extension, format) {
+  async updateFileFromString(data, file_id, file_name, extension, format, alt, title) {
     const file = await this.updateFileFromStringApi(
       data,
       file_id,
       file_name,
       extension,
-      format
+      format,
+      alt,
+      title
     );
     this.updateFileInStorage(file_id, file.app_id, file);
     return file;

package/GUDHUB/ItemProcessor/ItemProcessor.js

@@ -118,13 +118,6 @@ export class ItemProcessor {
     return items;
   }
 
-  handleItemsChange(v1, v2) {
-    let compareRes = this.util.compareItems(v1.items_list, v2.items_list);
-
-    this.updateItemsInStorage(v1.app_id, compareRes.diff_src_items);
-    this.addItemsToStorage(v1.app_id, compareRes.new_src_items);
-  }
-
   async deleteItemsFromStorage(app_id, itemsForDelete = []) {
     const app = await this.appProcessor.getApp(app_id);
     if (app) {

package/GUDHUB/Storage/ModulesList.js

@@ -958,7 +958,7 @@ export default function generateModulesList(async_modules_path, file_server_url,
             data_type: "text_area",
             name: "Text Area",
             icon: "text_icon",
-            js: "https://gudhub.com/modules/text-area-ghe/dist/main.js?t=1",
+            js: "https://gudhub.com/modules/text-area-ghe/dist/main.js?t=3",
             css: "https://gudhub.com/modules/text-area-ghe/dist/style.css",
             type: "gh_element",
             technology: "class",

package/GUDHUB/config.js

@@ -8,8 +8,5 @@ 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;
-
 // FOR TESTS
 export const port = 9000;

package/GUDHUB/gudhub.js

@@ -18,7 +18,6 @@ import { WebsocketHandler } from './WebSocket/WebsocketHandler.js';
 import { GroupSharing } from './Utils/sharing/GroupSharing.js';
 import { Sharing } from './Utils/sharing/Sharing.js';
 import { WebSocketEmitter } from './WebSocket/WebSocketEmitter.js';
-import { AppDataService, ChunkDataService, appDataServiceConf, chunkDataServiceConf } from "./DataService/export.js";
 
 export class GudHub {
   constructor(
@@ -63,8 +62,7 @@ export class GudHub {
       this.storage,
       this.pipeService,
       this.req,
-      this.util,
-      new ChunkDataService(this.req, chunkDataServiceConf),
+      this.util
     );
     this.appProcessor = new AppProcessor(
       this.storage,
@@ -73,8 +71,7 @@ export class GudHub {
       this.ws,
       this.chunksManager,
       this.util,
-      options.activateSW,
-      new AppDataService(this.req, appDataServiceConf, this),
+      options.activateSW
     );
     this.itemProcessor = new ItemProcessor(
       this.storage,
@@ -234,11 +231,6 @@ export class GudHub {
     return this.util.sortItems(items, options);
   }
 
-  processAppUpd(v1, v2) {
-    this.itemProcessor.handleItemsChange(v1, v2);
-    this.appProcessor.handleAppChange(v1, v2);
-  }
-
   jsonToItems(json, map) {
     return this.util.jsonToItems(json, map);
   }
@@ -418,13 +410,15 @@ export class GudHub {
     );
   }
 
-  updateFileFromString(data, file_id, file_name, extension, format) {
+  updateFileFromString(data, file_id, file_name, extension, format, alt, title) {
     return this.fileManager.updateFileFromString(
       data,
       file_id,
       file_name,
       extension,
-      format
+      format,
+      alt,
+      title
     );
   }
 

package/package.json

@@ -1,28 +1,20 @@
 {
   "name": "@gudhub/core",
-  "version": "1.2.4-beta.7",
+  "version": "1.2.5-beta.1",
   "description": "",
   "main": "index.js",
   "scripts": {
     "test": "NODE_ENV=test mocha $(find ./GUDHUB -print | grep -i test.js)",
-    "prepublishOnly": "webpack",
+    "prepublishOnly": "parcel build ./indexUMD.js --target browser --bundle-node-modules --out-file library.min.js --global GudHubLibrary -d umd",
     "publishPublicly": "npm publish --access public"
   },
-  "babel": {
-    "presets": [
-      [
-        "@babel/preset-env",
-        {
-          "targets": {
-            "esmodules": true
-          },
-          "exclude": [
-            "babel-plugin-transform-classes"
-          ]
-        }
-      ]
-    ]
+  "engines": {
+    "node": "16.13.1"
   },
+  "browserslist": [
+    "last 3 versions",
+    "> 0.5%"
+  ],
   "repository": {
     "type": "git",
     "url": "git+ssh://git@bitbucket.org/AAtlas/gudhub.git"
@@ -41,15 +33,13 @@
     "ws": "^7.3.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.24.7",
-    "@babel/preset-env": "^7.24.7",
     "canvas": "^2.9.3",
     "express": "^4.17.1",
     "jsdom": "^20.0.0",
     "mocha": "^8.1.2",
+    "parcel-bundler": "^1.12.5",
     "should": "^13.2.3",
-    "sinon": "^14.0.0",
-    "webpack": "^5.91.0"
+    "sinon": "^14.0.0"
   },
   "type": "module",
   "publishConfig": {