vtlab-generic-functions 1.0.33 → 1.0.35

package/customers/marketplace/bringg/auth.js

@@ -47,7 +47,7 @@ const getAuthToken = async ({
     } catch (err) {
         let {res} = utils.dataToString(err);
         await cloudwatch.putLogEvents(
-            logId + "Finsish BRINGG LOGIN Process with errors: " + res,
+            logId + "Finished BRINGG LOGIN Process with errors: " + res,
             logGroupName
         );
         throw err;

package/ftp/ftpClientClass.js

@@ -1,6 +1,10 @@
 
 const promiseFTP = require("promise-ftp");
 const promiseSFTP = require("ssh2-sftp-client");
+// For FTP, we need to create a temporary file and upload it
+const fs = require('fs');
+const os = require('os');
+const path = require('path');
 
 
 /**
@@ -241,8 +245,48 @@ class FTPClientV2 {
 			if (!this._isConnected) {
 				await this.connect(this._ftpCredentials);
 			}
-			await this._ftpInstance.put(ftpPathOrigin, ftpPathDestination);
+
+			// Check if source file exists
+			const fileExists = await this.isFileExists(ftpPathOrigin);
+			if (!fileExists) {
+				throw new Error(`Source file does not exist: ${ftpPathOrigin}`);
+			}
+
+			// Download the file from origin
+			const fileContent = await this.downloadFile(ftpPathOrigin);
+
+			// Upload the file to destination
+			switch (this._ftpCredentials.type) {
+				case 'sftpWithKey':
+					// For SFTP, we can use the buffer directly
+					await this._ftpInstance.put(Buffer.concat(fileContent), ftpPathDestination);
+					break;
+				default:					
+					// Create a temporary file
+					const tempFile = path.join(os.tmpdir(), `temp_${Date.now()}_${path.basename(ftpPathOrigin)}`);
+					
+					try {
+						// Write the downloaded content to temp file
+						fs.writeFileSync(tempFile, Buffer.concat(fileContent));
+						
+						// Upload the temp file to destination
+						await this._ftpInstance.put(tempFile, ftpPathDestination);
+						
+						// Clean up temp file
+						fs.unlinkSync(tempFile);
+					} catch (tempError) {
+						// Clean up temp file if it exists
+						if (fs.existsSync(tempFile)) {
+							fs.unlinkSync(tempFile);
+						}
+						throw tempError;
+					}
+					break;
+			}
+
+			// Delete the original file
 			await this.deleteFile(ftpPathOrigin);
+
 			return { code: 200, message: "FTP successful moved" };
 		} catch (error) {
 			throw new Error(`Failed to move file inside FTP server: ${error.message}`);

package/lambdaClass/index.js

@@ -56,6 +56,15 @@ module.exports = class Lambda {
     this.DEBUG = DEBUG;
   }
 
+  recoverFullPayload = async () => {
+    if (this.event?.s3PayloadPath) {
+      let contentResponse = await this.s3.download(this.event.s3PayloadPath);
+      this.jobs = JSON.parse(contentResponse.Body.toString());
+    } else {
+      this.jobs = this.event?.payload || [];
+    }
+  };
+
   s3 = {
     upload: async (data, path, options = {}) => {
       return await s3bucket.uploadToS3(path, data, {
@@ -225,9 +234,9 @@ module.exports = class Lambda {
   logFinishProcess = async ({error} = {}) => {
     if (this.results.totalError || error) {
       error = error && error.message ? error.message : error;
-      await this.logMessage("Finsish Process with errors: " + (error || "") + " " + JSON.stringify(this.results));
+      await this.logMessage("Finished Process with errors: " + (error || "") + " " + JSON.stringify(this.results));
     } else {
-      await this.logMessage("Finsish Process Sucessfully: " + JSON.stringify(this.results));
+      await this.logMessage("Finished Process Sucessfully: " + JSON.stringify(this.results));
     }
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vtlab-generic-functions",
-  "version": "1.0.33",
+  "version": "1.0.35",
   "scripts": {
     "test": "jest"
   },

package/utils/index.js

@@ -635,6 +635,45 @@ const getMessageAndCodeFromError = (err) => {
   return returnData;
 };
 
+const normalizeString = (_str) => {
+  // Handle null/undefined
+  if (_str === null || _str === undefined) return _str;
+  
+  // Handle numbers
+  if (typeof _str === 'number') return _str;
+  
+  // Handle arrays
+  if (Array.isArray(_str)) {
+      return _str.map(item => normalizeString(item));
+  }
+  
+  // Handle objects
+  if (typeof _str === 'object') {
+      const normalizedObj = {};
+      for (const [key, value] of Object.entries(_str)) {
+          normalizedObj[key] = normalizeString(value);
+      }
+      return normalizedObj;
+  }
+  
+  // Handle strings
+  if (typeof _str === 'string') {
+      if (!_str.length) return _str;
+      if (_str.trim() === "-") return "-";
+      
+      let str = _str.trim();
+      str = str.replace(/&/g, "&");
+      str = str.replace(/</g, "&lt;");
+      str = str.replace(/>/g, "&gt;");
+      str = str.replace(/"/g, "&quot;");
+      str = str.replace(/'/g, "&apos;");
+      return str;
+  }
+  
+  // Return as is for any other type
+  return _str;
+};
+
 module.exports = {
   dataToString,
   getMessageFromValidator,
@@ -659,4 +698,5 @@ module.exports = {
   getValueOrNullControlWithFallback,
   getMimeTypeFromBase64,
   getTipoPortes,
+  normalizeString,
 };