@intecoag/inteco-cli 1.5.0 → 1.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intecoag/inteco-cli",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "CLI-Tools for Inteco",
   "main": "src/index.js",
   "type": "module",

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/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) {