@gudhub/core 1.1.125 → 1.1.127

package/GUDHUB/Utils/FIleHelper/FileHelper.js

@@ -3,67 +3,117 @@ export class FileHelper {
         this.gudhub = gudhub;
     }
 
-    fileInstallerHelper(appId, items, elementId) {
-        const self = this;
-        return new Promise(resolve => {
-            const files = [[]];
-            let chainPromises = Promise.resolve();
-            let results = [];
-
-            items.forEach(item => {
-                const itemId = item.item_id;
-                const field = item.fields.find(field => field.element_id === elementId);
-
-                if(field && field.field_value) {
-                    const fileIds = field.field_value.split('.');
-
-                    fileIds.forEach(fileId => {
-                        const newFile = {
-                            source: fileId,
-                            destination: {
-                                app_id: appId,
-                                item_id: itemId,
-                                element_id: elementId
-                            }
-                        }
+    async fileInstallerHelper(
+        mapAppIds,
+        appId,
+        items,
+        elementId,
+        isInstallFromRemoteServer,
+        remoteServerGudHubInstance
+    ) {
+        const files = [[]];
+        let results = [];
+
+        items.forEach(item => {
+            const itemId = item.item_id;
+            const field = item.fields.find(field => field.element_id === elementId);
+
+            if (field?.field_value) {
+                const fileIds = field.field_value.split('.');
 
-                        if(files[files.length - 1].length !== 10) { // 10 - max duplicate files
-                            files[files.length - 1].push(newFile);
-                        } else {
-                            files.push([newFile]);
+                fileIds.forEach(fileId => {
+                    const newFile = {
+                        source: fileId,
+                        destination: {
+                            app_id: appId,
+                            item_id: itemId,
+                            element_id: elementId
                         }
-                    })
-                }
-            });
-
-            files.forEach(filePack => {
-                chainPromises = chainPromises.then(() => {
-                    return self.gudhub.duplicateFile(filePack);
-                }).then(result => {
-                    results = [
-                        ...results,
-                        ...result
-                    ]
-                })
-            });
-
-            chainPromises.then(() => {
-                items.forEach(item => {
-                    const itemId = item.item_id;
-                    const field = item.fields.find(field => field.element_id === elementId);
-
-                    if(field && field.field_value) {
-                        field.field_value = '';
-                        results.forEach(file => {
-                            if(file.item_id === itemId) {
-                                field.field_value = field.field_value.split(',').filter(fileId => fileId).concat(file.file_id).join(',');
-                            }
-                        })
+                    };
+
+                    if (files[files.length - 1].length !== 10) { // 10 - max duplicate files
+                        files[files.length - 1].push(newFile);
+                    } else {
+                        files.push([newFile]);
                     }
-                })
+                });
+            }
+        });
+
+        for (const filePack of files) {
+            if (!filePack.length) continue;
+
+            let result;
+
+            if (isInstallFromRemoteServer) {
+                result = await this._copyFilesFromRemoteServer(mapAppIds, filePack, remoteServerGudHubInstance);
+            } else {
+                result = await this.gudhub.duplicateFile(filePack);
+            }
+
+            results = [
+                ...results,
+                ...result
+            ];
+        }
+
+        items.forEach(item => {
+            const itemId = item.item_id;
+            const field = item.fields.find(field => field.element_id === elementId);
+
+            if (field?.field_value) {
+                field.field_value = '';
 
-                resolve();
-            })
+                results.forEach(file => {
+                    if (file.item_id === itemId) {
+                        field.field_value = field.field_value
+                            .split(',')
+                            .filter(fileId => fileId)
+                            .concat(file.file_id)
+                            .join(',');
+                    }
+                });
+            }
         });
     }
+
+    async _copyFilesFromRemoteServer(apps, filePack, remoteServerGudHubInstance) {
+        const createdFiles = [];
+
+        for (const file of filePack) {
+            const sourceFileIds = String(file.source)
+                .split(',')
+                .map(fileId => fileId.trim())
+                .filter(Boolean);
+
+            const appMap = apps.find(
+                app => app.new_app_id === file.destination.app_id
+            );
+
+            if (!appMap) {
+                console.warn('App mapping not found for:', file.destination.app_id);
+                continue;
+            }
+
+            const sourceAppId = appMap.old_app_id;
+
+            for (const sourceFileId of sourceFileIds) {
+                const sourceFile = await remoteServerGudHubInstance.getFile(
+                    sourceAppId,
+                    sourceFileId
+                );
+
+                const createdFile = await this.gudhub.uploadFileFromString({
+                    ...sourceFile,
+                    app_id: file.destination.app_id,
+                    item_id: file.destination.item_id,
+                    element_id: file.destination.element_id
+                });
+
+                createdFiles.push(createdFile);
+            }
+        }
+
+        return createdFiles;
+    }
 }

package/GUDHUB/Utils/Utils.js

@@ -178,12 +178,12 @@ export class Utils {
     return compiler(scheme, item, this, variables, appId)
   }
 
-  fileInstallerHelper(appId, items, elementId) {
-    return this.FileHelper.fileInstallerHelper(appId, items, elementId);
+  fileInstallerHelper(mapAppIds, appId, items, elementId, isInstallFromRemoteServer, remoteServerGudHubInstance) {
+    return this.FileHelper.fileInstallerHelper(mapAppIds, appId, items, elementId, isInstallFromRemoteServer, remoteServerGudHubInstance);
   }
-
-  createAppsFromTemplate(pack, maxNumberOfInsstalledItems, progressCallback, installFromMaster) {
-    return this.AppsTemplateService.createAppsFromTemplate(pack, maxNumberOfInsstalledItems, progressCallback, installFromMaster);
+  
+  createAppsFromTemplate(pack, remoteServerUrl, remoteServerAuthKey, isInstallFromRemoteServer, maxNumberOfInstalledItems, progressCallback) {
+    return this.AppsTemplateService.createAppsFromTemplate(pack, remoteServerUrl, remoteServerAuthKey, isInstallFromRemoteServer, maxNumberOfInstalledItems, progressCallback);
   }
 
   createApps(pack) {

package/GUDHUB/gudhub-https-service.js

@@ -5,6 +5,7 @@
 import axios from "axios";
 import { convertObjToUrlParams } from "./utils.js";
 import qs from "qs";
+
 export class GudHubHttpsService {
   constructor(server_url) {
     this.root = server_url;
@@ -34,10 +35,11 @@ export class GudHubHttpsService {
       if(request.externalResource) {
         url = request.url;
       } else {
+        const baseSeparator = /\?/.test(url) ? "&" : "?";
+        const paramsString = convertObjToUrlParams(request.params);
+          
         url = this.root + request.url;
-        url = `${url}${
-         /\?/.test(url) ? "&" : "?"
-       }token=${accessToken}${convertObjToUrlParams(request.params)}`;
+        url = `${url}${baseSeparator}${paramsString}${paramsString ? "&" : ""}token=${accessToken}`;
       }
       axios.get(url, {
         validateStatus: function (status) {
@@ -107,42 +109,77 @@ export class GudHubHttpsService {
     return promise;
   }
 
-  /*************** AXIOS REQUEST ***************/
-  // It's using to send simple requests to custom urls without token
-  // If you want to send application/x-www-form-urlencoded, pass data in 'form' property of request
-  // If you wnt to send any other type of data, just pass it to 'body' property of request
+    /*************** AXIOS REQUEST ***************/
+    // It's using to send simple requests to custom urls without token
+    // If you want to send application/x-www-form-urlencoded, pass data in 'form' property of request
+    // If you wnt to send any other type of data, just pass it to 'body' property of request
 
-  axiosRequest(request) {
-    const hesh = this.getHashCodeForAxiosRequest(request);
+    axiosRequest(request) {
+        const hesh = this.getHashCodeForAxiosRequest(request);
 
-    if (this.requestPromises[hesh]) {
-      return this.requestPromises[hesh].promise;
-    }
+        if (this.requestPromises[hesh]) {
+            return this.requestPromises[hesh].promise;
+        }
 
-    let method = request.method ? request.method.toLowerCase() : 'get';
-    let url = request.url;
-    let headers = request.headers || {};
-    if(request.form) {
-      headers['Content-Type'] = 'application/x-www-form-urlencoded';
-    }
+        const method = request.method ? request.method.toLowerCase() : "get";
+        const url = request.url;
+        const headers = { ...(request.headers || {}) };
 
-    const promise = new Promise(async (resolve, reject) => {
-      try {
-        const { data } = await axios[method](url, method === 'post' ? (qs.stringify(request.form) || request.body) : { headers }, method === 'post' ? {
-          headers
-        } : {});
-        resolve(data);
-      } catch(error) {
-        console.log("ERROR -> GUDHUB HTTP SERVICE -> SIMPLE POST :", error.message);
-        console.log("Request message: ", request);
-        reject(error);
-      }
-    });
+        const promise = new Promise(async (resolve, reject) => {
+            try {
+                let data = request.body;
 
-    this.pushPromise(promise, hesh);
+                if (request.form instanceof URLSearchParams) {
+                    headers["Content-Type"] = "application/x-www-form-urlencoded";
+                    data = request.form;
+                } else if (
+                    typeof FormData !== "undefined" &&
+                    request.form instanceof FormData
+                ) {
+                    data = request.form;
+                    delete headers["Content-Type"];
+                } else if (request.form) {
+                    headers["Content-Type"] = "application/x-www-form-urlencoded";
+                    data = qs.stringify(request.form);
+                }
 
-    return promise;
-  }
+                const config = {
+                    url,
+                    method,
+                    headers,
+                    maxBodyLength: Infinity,
+                    validateStatus(status) {
+                        return status < 400;
+                    },
+                };
+
+                if (["post", "put", "patch"].includes(method)) {
+                    config.data = data;
+                }
+
+                const response = await axios(config);
+
+                resolve(response.data);
+            } catch (error) {
+                console.log(
+                    `ERROR -> GUDHUB HTTP SERVICE -> SIMPLE ${method.toUpperCase()} :`,
+                    error.message
+                );
+
+                console.log("Request message: ", request);
+
+                if (error.response) {
+                    console.log("Error response data:", error.response.data);
+                }
+
+                reject(error);
+            }
+        });
+
+        this.pushPromise(promise, hesh);
+
+        return promise;
+    }
 
   /*************** PUSH PROMISE ***************/
   // It push promise object by hash to this.requestPromises
@@ -225,13 +262,14 @@ export class GudHubHttpsService {
     };
 
     const basis = {
-      url: request.url || "",
-      method: (request.method || request.request_method || "GET").toUpperCase(),
-      headers: request.headers || {},
-      params: request.params || {},
-      query: request.query || {},
-      form: request.form || request.body || null,
-      externalResource: !!request.externalResource
+        url: request.url || "",
+        method: (request.method || request.request_method || "GET").toUpperCase(),
+        headers: request.headers || {},
+        params: request.params || {},
+        query: request.query || {},
+        body: request.body || null, 
+        form: request.form || null, 
+        externalResource: !!request.externalResource
     };
 
     const str = stableStringify(basis);

package/GUDHUB/utils.js

@@ -21,5 +21,5 @@ export function filterFields(fieldsToFilter = []) {
 export function convertObjToUrlParams(obj = {}) {
   const entries = Object.entries(obj);
   if (!entries.length) return "";
-  return `&${entries.map(([key, value]) => `${key}=${value}`).join("&")}`;
-}
+  return entries.map(([key, value]) => `${key}=${value}`).join("&");
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gudhub/core",
-  "version": "1.1.125",
+  "version": "1.1.127",
   "description": "",
   "main": "index.js",
   "scripts": {