@intecoag/inteco-cli 1.5.0 → 1.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intecoag/inteco-cli",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "description": "CLI-Tools for Inteco",
   "main": "src/index.js",
   "type": "module",
@@ -24,7 +24,7 @@
     "fast-glob": "^3.3.3",
     "fuzzysort": "^3.1.0",
     "graphql": "^16.6.0",
-    "meow": "^14.0.0",
+    "meow": "^14.1.0",
     "mysql-await": "^2.1.8",
     "n-readlines": "^3.4.0",
     "node-7z": "^3.0.0",
@@ -39,8 +39,8 @@
     "inteco": "src/index.js"
   },
   "devDependencies": {
-    "@commitlint/cli": "^20.4.1",
-    "@commitlint/config-conventional": "^20.4.1",
+    "@commitlint/cli": "^20.4.2",
+    "@commitlint/config-conventional": "^20.4.2",
     "husky": "^9.1.7",
     "semantic-release": "^25.0.3"
   },

package/src/modules/azureSync.js

@@ -366,6 +366,7 @@ async function executeOperations(mode, operations) {
         const operation = operations[index];
         try {
             if (operation.type === "upload") {
+                const totalBytes = operation.localFile.size ?? null;
                 spinner.text = `Uploading ${operation.localFile.relativePath} (${index + 1}/${operations.length})`;
                 const md5Base64 = operation.localFile.md5Base64
                     ?? await getLocalMd5Base64(operation.localFile.filePath);
@@ -373,15 +374,30 @@ async function executeOperations(mode, operations) {
                     operation.containerClient,
                     operation.localFile.blobPath,
                     operation.localFile.filePath,
-                    md5Base64
+                    md5Base64,
+                    progress => {
+                        if (!totalBytes) {
+                            return;
+                        }
+                        const percent = ((progress.loadedBytes / totalBytes) * 100).toFixed(1);
+                        spinner.text = `Uploading ${operation.localFile.relativePath} ${percent}% (${formatBytes(progress.loadedBytes)}/${formatBytes(totalBytes)})`;
+                    }
                 );
             } else if (operation.type === "download") {
+                const totalBytes = operation.localFile.size ?? null;
                 spinner.text = `Downloading ${operation.localFile.relativePath} (${index + 1}/${operations.length})`;
                 await ensureDirectory(path.dirname(operation.localFile.filePath));
                 await operation.azure.downloadToFile(
                     operation.containerClient,
                     operation.localFile.blobPath,
-                    operation.localFile.filePath
+                    operation.localFile.filePath,
+                    progress => {
+                        if (!totalBytes) {
+                            return;
+                        }
+                        const percent = ((progress.loadedBytes / totalBytes) * 100).toFixed(1);
+                        spinner.text = `Downloading ${operation.localFile.relativePath} ${percent}% (${formatBytes(progress.loadedBytes)}/${formatBytes(totalBytes)})`;
+                    }
                 );
             } else if (operation.type === "delete") {
                 spinner.text = `Deleting ${operation.blobPath} (${index + 1}/${operations.length})`;
@@ -504,7 +520,8 @@ async function buildPullOperations(syncState, azure) {
                     localFile: {
                         filePath: localPath,
                         relativePath: path.relative(entry.rootDir, localPath),
-                        blobPath: blob.name
+                        blobPath: blob.name,
+                        size: blob.properties?.contentLength ?? null
                     }
                 });
             }
@@ -537,4 +554,15 @@ async function listRemoteBlobNames(containerClient, includes) {
         remoteBlobs.add(blob.name);
     }
     return remoteBlobs;
+}
+
+function formatBytes(bytes) {
+    if (!bytes || bytes <= 0) {
+        return "0 B";
+    }
+
+    const units = ["B", "KB", "MB", "GB", "TB"];
+    const index = Math.min(Math.floor(Math.log(bytes) / Math.log(1024)), units.length - 1);
+    const value = bytes / Math.pow(1024, index);
+    return `${value.toFixed(value >= 10 || index === 0 ? 0 : 1)} ${units[index]}`;
 }

package/src/modules/syncConfig.js

@@ -265,7 +265,7 @@ function processMultiple(responses, dryRun, sourcePaths, destPaths) {
             let deletedCount = 0;
             for(let i = 0; i < sourcePaths.length && i < destPaths.length; i++) {
                 if (existsSync(destPaths[i])) {
-                    deletedCount += countAndDeleteDir(destPaths[i], dryRun);
+                    deletedCount += countAndDeleteDir(destPaths[i], dryRun, ["wegas.properties", "path.yaml"]);
                     if (!dryRun) {
                         console.log(chalk.gray(`Deleted existing folder: ${destPaths[i]}`));
                     }
@@ -293,27 +293,47 @@ function processMultiple(responses, dryRun, sourcePaths, destPaths) {
     }
 }
 
-function countAndDeleteDir(dirPath, dryRun = false) {
+function countAndDeleteDir(dirPath, dryRun = false, filenameBlacklist = []) {
     let deletedCount = 0;
 
     if (existsSync(dirPath)) {
-        if (dryRun) {
-            console.log(chalk.red(`[DryRun] Would delete directory: ${dirPath}`));
-            // For dry run, recursively count files/directories without deleting
-            const entries = readdirSync(dirPath, { withFileTypes: true });
-            for (const entry of entries) {
-                const entryPath = path.join(dirPath, entry.name);
-                if (entry.isDirectory()) {
-                    deletedCount += countAndDeleteDir(entryPath, dryRun);
-                } else {
-                    deletedCount++;
+
+        let shouldKeepDirectory = false;
+
+        // For dry run, recursively count files/directories without deleting
+        const entries = readdirSync(dirPath, { withFileTypes: true });
+        for (const entry of entries) {
+            if(filenameBlacklist.includes(entry.name)){
+                shouldKeepDirectory = true; // Directory will not empty
+                continue;
+            }
+
+            const entryPath = path.join(dirPath, entry.name);
+            if (entry.isDirectory()) {
+                deletedCount += countAndDeleteDir(entryPath, dryRun, filenameBlacklist);
+                shouldKeepDirectory |= deletedCount != 0;
+            } else {
+                deletedCount++;
+                if(dryRun) {
                     console.log(chalk.red(`[DryRun] Would delete file: ${entryPath}`));
                 }
+                else {
+                    console.log(chalk.red(`Deleting file: ${entryPath}`));
+                    rmSync(entryPath, { recursive: false, force: true });
+                }
+            }
+        }
+
+        if(!shouldKeepDirectory) {
+            if(dryRun) {
+                console.log(chalk.red(`[DryRun] Would delete directory: ${dirPath}`));
+            }
+            else {
+                console.log(chalk.red(`Deleting directory: ${dirPath}`));
+                rmSync(dirPath, { recursive: true, force: true });
             }
+
             deletedCount++; // counting the directory itself
-        } else {
-            rmSync(dirPath, { recursive: true, force: true });
-            // Can't count after delete, so you may skip or count before if desired
         }
     }
     return deletedCount;

package/src/utils/azure/azure.js

@@ -56,18 +56,19 @@ export class AzureHelper {
         }
     }
 
-    async uploadFile(containerClient, blobPath, filePath, md5Base64) {
+    async uploadFile(containerClient, blobPath, filePath, md5Base64, onProgress) {
         const blockBlobClient = containerClient.getBlockBlobClient(blobPath);
         const md5Buffer = md5Base64 ? Buffer.from(md5Base64, "base64") : undefined;
 
         await blockBlobClient.uploadFile(filePath, {
-            blobHTTPHeaders: md5Buffer ? { blobContentMD5: md5Buffer } : undefined
+            blobHTTPHeaders: md5Buffer ? { blobContentMD5: md5Buffer } : undefined,
+            onProgress
         });
     }
 
-    async downloadToFile(containerClient, blobPath, filePath) {
+    async downloadToFile(containerClient, blobPath, filePath, onProgress) {
         const blockBlobClient = containerClient.getBlockBlobClient(blobPath);
-        await blockBlobClient.downloadToFile(filePath);
+        await blockBlobClient.downloadToFile(filePath, 0, 0, { onProgress });
     }
 
     async deleteBlob(containerClient, blobPath) {