sfdx-hardis 5.2.3 → 5.3.0

package/CHANGELOG.md

@@ -4,6 +4,20 @@
 
 Note: Can be used with `sfdx plugins:install sfdx-hardis@beta` and docker image `hardisgroupcom/sfdx-hardis@beta`
 
+## [5.3.0] 2024-10-24
+
+- Update default Monitoring workflow for GitHub
+- Refactor file download code
+  - Display progress
+  - Better error handling
+- hardis:org:diagnose:legacyapi: Fix issue with big log files: Use stream to parse CSV and perform checks
+- Update default API version toto 62.0 (Winter 25 release)
+
+## [5.2.4] 2024-10-21
+
+- Fix hardis:org:fix:listviewmine: Use chrome-launcher to find chrome executable to use with puppeteer-core
+- Remove keyv dependency
+
 ## [5.2.3] 2024-10-19
 
 - Change default `.mega-linter.yml` config

package/defaults/monitoring/.github/workflows/org-monitoring.yml

@@ -39,9 +39,10 @@ jobs:
     runs-on: ubuntu-latest
     name: Backup metadatas
     permissions: write-all
+    timeout-minutes: 360
     strategy:
       fail-fast: false
-      max-parallel: 10
+      max-parallel: 10 # Set to 1 if you have issues with command npm install --no-cache @salesforce/cli --global
       matrix:
         # MANUAL: Add your monitored git branches here
         branch:
@@ -126,9 +127,10 @@ jobs:
     name: Apex tests
     needs: backup
     permissions: write-all
+    timeout-minutes: 360
     strategy:
       fail-fast: false
-      max-parallel: 10
+      max-parallel: 10 # Set to 1 if you have issues with command npm install --no-cache @salesforce/cli --global
       matrix:
         # MANUAL: Add your monitored git branches here
         branch:
@@ -206,13 +208,25 @@ jobs:
     runs-on: ubuntu-latest
     needs: backup
     permissions: read-all
+    timeout-minutes: 360
+    strategy:
+      fail-fast: false
+      max-parallel: 10 # Set to 1 if you have issues with race conditions
+      matrix:
+        # MANUAL: Add your monitored git branches here
+        branch:
+          - monitoring_myclient
+          - monitoring_myclient__integ_sandbox
+          - monitoring_myclient__recette_sandbox
+          - monitoring_myclient__preprod_sandbox
     steps:
-      # Git Checkout
-      - name: Checkout Code
+      # Checkout repo
+      - name: Checkout code
         uses: actions/checkout@v4
         with:
-          token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
-          fetch-depth: 0
+          fetch-depth: 0 # Faster code checkout fetching only latest commit
+          ref: ${{ matrix.branch }}
+          persist-credentials: true
 
       - name: Git pull
         run: git pull origin ${{ matrix.branch }}
@@ -253,9 +267,10 @@ jobs:
     name: Monitoring
     needs: backup
     permissions: read-all
+    timeout-minutes: 360
     strategy:
       fail-fast: false
-      max-parallel: 10
+      max-parallel: 10 # Set to 1 if you have issues with command npm install --no-cache @salesforce/cli --global
       matrix:
         # MANUAL: Add your monitored git branches here
         branch:

package/lib/commands/hardis/org/diagnose/legacyapi.d.ts

@@ -20,6 +20,7 @@ export default class LegacyApi extends SfCommand<any> {
     protected ipResultsSorted: any[];
     protected outputFile: any;
     protected outputFilesRes: any;
+    private tempDir;
     run(): Promise<AnyJson>;
     private runJsForce;
     private collectDeprecatedApiCalls;

package/lib/commands/hardis/org/diagnose/legacyapi.js

@@ -2,15 +2,19 @@
 import { SfCommand, Flags, requiredOrgFlagWithDeprecations } from '@salesforce/sf-plugins-core';
 import { Messages } from '@salesforce/core';
 import c from 'chalk';
+import fs from 'fs-extra';
+import * as path from 'path';
 import sortArray from 'sort-array';
-import { uxLog } from '../../../../common/utils/index.js';
+import { createTempDir, uxLog } from '../../../../common/utils/index.js';
 import * as dns from 'dns';
+import Papa from 'papaparse';
 import { getNotificationButtons, getOrgMarkdown, getSeverityIcon } from '../../../../common/utils/notifUtils.js';
 import { soqlQuery } from '../../../../common/utils/apiUtils.js';
 import { WebSocketClient } from '../../../../common/websocketClient.js';
 import { NotifProvider } from '../../../../common/notifProvider/index.js';
 import { generateCsvFile, generateReportPath } from '../../../../common/utils/filesUtils.js';
 import { CONSTANTS } from '../../../../config/index.js';
+import { FileDownloader } from '../../../../common/utils/fileDownloader.js';
 const dnsPromises = dns.promises;
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('sfdx-hardis', 'org');
@@ -93,6 +97,7 @@ This command is part of [sfdx-hardis Monitoring](${CONSTANTS.DOC_URL_ROOT}/sales
     outputFile;
     outputFilesRes = {};
     /* jscpd:ignore-end */
+    tempDir;
     async run() {
         const { flags } = await this.parse(LegacyApi);
         this.debugMode = flags.debug || false;
@@ -105,6 +110,7 @@ This command is part of [sfdx-hardis Monitoring](${CONSTANTS.DOC_URL_ROOT}/sales
         this.outputFile = flags.outputfile || null;
         const limitConstraint = limit ? ` LIMIT ${limit}` : '';
         const conn = flags['target-org'].getConnection();
+        this.tempDir = await createTempDir();
         // Get EventLogFile records with EventType = 'ApiTotalUsage'
         const logCountQuery = `SELECT COUNT() FROM EventLogFile WHERE EventType = '${eventType}'`;
         const logCountRes = await soqlQuery(logCountQuery, conn);
@@ -119,7 +125,7 @@ This command is part of [sfdx-hardis Monitoring](${CONSTANTS.DOC_URL_ROOT}/sales
             uxLog(this, c.yellow(`There are more than ${limit} results, you may consider to increase limit using --limit argument`));
         }
         // Fetch EventLogFiles with ApiTotalUsage entries
-        const logCollectQuery = `SELECT LogFile FROM EventLogFile WHERE EventType = '${eventType}' ORDER BY CreatedDate DESC` + limitConstraint;
+        const logCollectQuery = `SELECT LogFile FROM EventLogFile WHERE EventType = '${eventType}' ORDER BY LogDate DESC` + limitConstraint;
         uxLog(this, c.grey('Query: ' + c.italic(logCollectQuery)));
         const eventLogRes = await soqlQuery(logCollectQuery, conn);
         // Collect legacy api calls from logs
@@ -232,39 +238,63 @@ See article to solve issue before it's too late:
     }
     // GET csv log file and check for legacy API calls within
     async collectDeprecatedApiCalls(logFileUrl, conn) {
-        uxLog(this, c.grey(`- Request info for ${logFileUrl} ...`));
-        const logEntries = await conn.request(logFileUrl);
-        uxLog(this, c.grey(`-- Processing ${logEntries.length} returned entries...`));
+        // Load icons
         const severityIconError = getSeverityIcon('error');
         const severityIconWarning = getSeverityIcon('warning');
         const severityIconInfo = getSeverityIcon('info');
-        for (const logEntry of logEntries) {
-            const apiVersion = logEntry.API_VERSION ? parseFloat(logEntry.API_VERSION) : parseFloat('999.0');
-            // const apiType = logEntry.API_TYPE || null ;
-            const apiFamily = logEntry.API_FAMILY || null;
-            for (const legacyApiDescriptor of this.legacyApiDescriptors) {
-                if (legacyApiDescriptor.apiFamily.includes(apiFamily) &&
-                    legacyApiDescriptor.minApiVersion <= apiVersion &&
-                    legacyApiDescriptor.maxApiVersion >= apiVersion) {
-                    logEntry.SFDX_HARDIS_DEPRECATION_RELEASE = legacyApiDescriptor.deprecationRelease;
-                    logEntry.SFDX_HARDIS_SEVERITY = legacyApiDescriptor.severity;
-                    if (legacyApiDescriptor.severity === 'ERROR') {
-                        logEntry.severity = 'error';
-                        logEntry.severityIcon = severityIconError;
-                    }
-                    else if (legacyApiDescriptor.severity === 'WARNING') {
-                        logEntry.severity = 'warning';
-                        logEntry.severityIcon = severityIconWarning;
-                    }
-                    else {
-                        // severity === 'INFO'
-                        logEntry.severity = 'info';
-                        logEntry.severityIcon = severityIconInfo;
-                    }
-                    legacyApiDescriptor.errors.push(logEntry);
-                    break;
-                }
-            }
+        // Download file as stream, and process chuck by chuck
+        uxLog(this, c.grey(`- processing ${logFileUrl}...`));
+        const fetchUrl = `${conn.instanceUrl}${logFileUrl}`;
+        const outputFile = path.join(this.tempDir, Math.random().toString(36).substring(7) + ".csv");
+        const downloadResult = await new FileDownloader(fetchUrl, { conn: conn, outputFile: outputFile }).download();
+        if (downloadResult.success) {
+            uxLog(this, c.grey(`-- parsing downloaded CSV from ${outputFile} and check for deprecated calls...`));
+            const outputFileStream = fs.createReadStream(outputFile, { encoding: 'utf8' });
+            await new Promise((resolve, reject) => {
+                Papa.parse(outputFileStream, {
+                    header: true,
+                    worker: true,
+                    chunk: (results) => {
+                        // Look in check the entries that match a deprecation description
+                        for (const logEntry of results.data) {
+                            const apiVersion = logEntry.API_VERSION ? parseFloat(logEntry.API_VERSION) : parseFloat('999.0');
+                            const apiFamily = logEntry.API_FAMILY || null;
+                            for (const legacyApiDescriptor of this.legacyApiDescriptors) {
+                                if (legacyApiDescriptor.apiFamily.includes(apiFamily) &&
+                                    legacyApiDescriptor.minApiVersion <= apiVersion &&
+                                    legacyApiDescriptor.maxApiVersion >= apiVersion) {
+                                    logEntry.SFDX_HARDIS_DEPRECATION_RELEASE = legacyApiDescriptor.deprecationRelease;
+                                    logEntry.SFDX_HARDIS_SEVERITY = legacyApiDescriptor.severity;
+                                    if (legacyApiDescriptor.severity === 'ERROR') {
+                                        logEntry.severity = 'error';
+                                        logEntry.severityIcon = severityIconError;
+                                    }
+                                    else if (legacyApiDescriptor.severity === 'WARNING') {
+                                        logEntry.severity = 'warning';
+                                        logEntry.severityIcon = severityIconWarning;
+                                    }
+                                    else {
+                                        // severity === 'INFO'
+                                        logEntry.severity = 'info';
+                                        logEntry.severityIcon = severityIconInfo;
+                                    }
+                                    legacyApiDescriptor.errors.push(logEntry);
+                                    break;
+                                }
+                            }
+                        }
+                    },
+                    complete: function () {
+                        resolve(true);
+                    },
+                    error: function (error) {
+                        reject(error);
+                    },
+                });
+            });
+        }
+        else {
+            uxLog(this, c.yellow(`Warning: Unable to process logs of ${logFileUrl}`));
         }
     }
     async generateSummaryLog(errors, severity) {

package/lib/commands/hardis/org/diagnose/legacyapi.js.map

@@ -1 +1 @@
-{"version":3,"file":"legacyapi.js","sourceRoot":"","sources":["../../../../../src/commands/hardis/org/diagnose/legacyapi.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"legacyapi.js","sourceRoot":"","sources":["../../../../../src/commands/hardis/org/diagnose/legacyapi.ts"],"names":[],"mappings":"AAAA,wBAAwB;AACxB,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,+BAA+B,EAAE,MAAM,6BAA6B,CAAC;AAChG,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,CAAC,MAAM,OAAO,CAAC;AACtB,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AACjH,OAAO,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAiB,MAAM,2CAA2C,CAAC;AACzF,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC7F,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AAC5E,MAAM,WAAW,GAAG,GAAG,CAAC,QAAQ,CAAC;AAEjC,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;AAE7D,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,SAAc;IAC5C,MAAM,CAAC,KAAK,GAAG,0BAA0B,CAAC;IAE1C,MAAM,CAAC,WAAW,GAAG;;;;;;mDAMqB,SAAS,CAAC,YAAY;CACxE,CAAC;IAEO,MAAM,CAAC,QAAQ,GAAG;QACvB,oCAAoC;QACpC,2DAA2D;QAC3D,mFAAmF;QACnF,4FAA4F;KAC7F,CAAC;IAEF,yCAAyC;IAElC,MAAM,CAAC,KAAK,GAAQ;QACzB,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC;YACtB,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,eAAe;YACxB,WAAW,EAAE,uCAAuC;SACrD,CAAC;QACF,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC;YACnB,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,GAAG;YACZ,WAAW,EAAE,iDAAiD;SAC/D,CAAC;QACF,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC;YACvB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,mEAAmE;SACjF,CAAC;QACF,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC;YACnB,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,KAAK;YACd,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC;SAC9C,CAAC;QACF,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC;YACtB,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC;SAC9C,CAAC;QACF,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC;YACtB,WAAW,EAAE,+DAA+D;SAC7E,CAAC;QACF,YAAY,EAAE,+BAA+B;KAC9C,CAAC;IAEK,MAAM,CAAC,eAAe,GAAG,KAAK,CAAC;IAE5B,SAAS,GAAG,KAAK,CAAC;IAClB,kBAAkB,GAC1B,yFAAyF,CAAC;IAClF,oBAAoB,GAAG;QAC/B;YACE,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC;YACvC,aAAa,EAAE,GAAG;YAClB,aAAa,EAAE,GAAG;YAClB,QAAQ,EAAE,OAAO;YACjB,kBAAkB,EAAE,kCAAkC;YACtD,MAAM,EAAE,EAAW;SACpB;QACD;YACE,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC;YACvC,aAAa,EAAE,GAAG;YAClB,aAAa,EAAE,IAAI;YACnB,QAAQ,EAAE,OAAO;YACjB,kBAAkB,EAAE,mCAAmC;YACvD,MAAM,EAAE,EAAW;SACpB;QACD;YACE,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC;YACvC,aAAa,EAAE,IAAI;YACnB,aAAa,EAAE,IAAI;YACnB,QAAQ,EAAE,SAAS;YACnB,kBAAkB,EAAE,oCAAoC;YACxD,MAAM,EAAE,EAAW;SACpB;KACF,CAAC;IAEQ,SAAS,GAAU,EAAE,CAAC;IACtB,eAAe,GAAU,EAAE,CAAC;IAC5B,UAAU,CAAC;IACX,cAAc,GAAQ,EAAE,CAAC;IACnC,sBAAsB;IACd,OAAO,CAAS;IAEjB,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAC9C,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC;QACtC,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IACtC,CAAC;IAED,kEAAkE;IAC1D,KAAK,CAAC,UAAU,CAAC,KAAK;QAC5B,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,IAAI,eAAe,CAAC;QACrD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,IAAI,GAAG,CAAC;QACjC,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,IAAI,IAAI,CAAC;QAE3C,MAAM,eAAe,GAAG,KAAK,CAAC,CAAC,CAAC,UAAU,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACvD,MAAM,IAAI,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,aAAa,EAAE,CAAC;QACjD,IAAI,CAAC,OAAO,GAAG,MAAM,aAAa,EAAE,CAAC;QAErC,4DAA4D;QAC5D,MAAM,aAAa,GAAG,uDAAuD,SAAS,GAAG,CAAC;QAC1F,MAAM,WAAW,GAAG,MAAM,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QACzD,IAAI,WAAW,CAAC,SAAS,KAAK,CAAC,EAAE,CAAC;YAChC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,uCAAuC,SAAS,GAAG,CAAC,CAAC,CAAC;YAC1E,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,iFAAiF,CAAC,CAAC,CAAC;QAC1G,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,GAAG,IAAI,SAAS,wBAAwB,CAAC,CAAC,CAAC;QACxG,CAAC;QAED,IAAI,WAAW,CAAC,SAAS,GAAG,KAAK,EAAE,CAAC;YAClC,KAAK,CACH,IAAI,EACJ,CAAC,CAAC,MAAM,CAAC,uBAAuB,KAAK,qEAAqE,CAAC,CAC5G,CAAC;QACJ,CAAC;QAED,iDAAiD;QACjD,MAAM,eAAe,GACnB,uDAAuD,SAAS,yBAAyB,GAAG,eAAe,CAAC;QAC9G,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;QAC3D,MAAM,WAAW,GAAQ,MAAM,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QAEhE,qCAAqC;QACrC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,8FAA8F,CAAC,CAAC,CAAC;QACpH,KAAK,MAAM,YAAY,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;YAC/C,MAAM,IAAI,CAAC,yBAAyB,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACnE,CAAC;QACD,IAAI,CAAC,SAAS,GAAG;YACf,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,MAAM;YACtC,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,MAAM;YACtC,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,MAAM;SACvC,CAAC;QAEF,kBAAkB;QAClB,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAChB,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;QAChC,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;YACnD,MAAM,WAAW,GACf,UAAU,CAAC,QAAQ,KAAK,OAAO,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC;gBAC7D,CAAC,CAAC,CAAC,CAAC,GAAG;gBACP,CAAC,CAAC,UAAU,CAAC,QAAQ,KAAK,SAAS,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC;oBACjE,CAAC,CAAC,CAAC,CAAC,MAAM;oBACV,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YAChB,KAAK,CAAC,IAAI,EAAE,WAAW,CAAC,KAAK,UAAU,CAAC,kBAAkB,MAAM,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;QACvG,CAAC;QACD,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAEhB,uBAAuB;QACvB,IAAI,GAAG,GAAG,6DAA6D,CAAC;QACxE,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,IACE,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,KAAK,OAAO,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;aAC9G,MAAM,GAAG,CAAC,EACb,CAAC;YACD,GAAG,GAAG,yCAAyC,CAAC;YAChD,UAAU,GAAG,CAAC,CAAC;YACf,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAClC,CAAC;aAAM,IACL,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAC9B,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,KAAK,SAAS,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAClF,CAAC,MAAM,GAAG,CAAC,EACZ,CAAC;YACD,GAAG,GAAG,8FAA8F,CAAC;YACrG,UAAU,GAAG,CAAC,CAAC;YACf,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACrC,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QAC5B,CAAC;QAED,yBAAyB;QACzB,IAAI,CAAC,UAAU,GAAG,MAAM,kBAAkB,CAAC,kBAAkB,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAChF,IAAI,CAAC,cAAc,GAAG,MAAM,eAAe,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAE7E,wCAAwC;QACxC,MAAM,aAAa,GAAU,EAAE,CAAC;QAChC,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;YACnD,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;YACjC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACtB,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;gBAChF,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBACjC,uDAAuD;gBACvD,eAAe,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;YAChD,CAAC;QACH,CAAC;QAED,4CAA4C;QAC5C,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,UAAU,IAAI,IAAI,EAAE,CAAC;YAC9C,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBACnD,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,UAAU,CAAC,kBAAkB,MAAM,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;YAC1G,CAAC;QACH,CAAC;QAED,IAAI,eAAe,GAAG,EAAE,CAAC;QACzB,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;YACnD,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACjC,eAAe,IAAI,KAAK,UAAU,CAAC,QAAQ,sCAAsC,UAAU,CAAC,MAAM,CAAC,MAAM,KAAK,UAAU,CAAC,kBAAkB,KAAK,CAAC;YACnJ,CAAC;QACH,CAAC;QAED,eAAe,IAAI;;;qGAG8E,CAAC;QAElG,sBAAsB;QACtB,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,aAAa,EAAE,EAAE,WAAW,CAAC,CAAC;QAC5F,MAAM,YAAY,GAAG,MAAM,sBAAsB,EAAE,CAAC;QACpD,IAAI,aAAa,GAAkB,KAAK,CAAC;QACzC,IAAI,SAAS,GAAG,qDAAqD,WAAW,EAAE,CAAC;QACnF,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9B,aAAa,GAAG,OAAO,CAAC;YACxB,SAAS,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,mDAAmD,WAAW,EAAE,CAAC;QACvG,CAAC;QACD,qBAAqB;QACrB,UAAU,CAAC,WAAW,GAAG,KAAK,CAAC,YAAY,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC,uDAAuD;QACtH,aAAa,CAAC,iBAAiB,CAAC;YAC9B,IAAI,EAAE,YAAY;YAClB,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC;YACxC,OAAO,EAAE,YAAY;YACrB,QAAQ,EAAE,aAAa;YACvB,aAAa,EAAE,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE;YAChH,WAAW,EAAE,IAAI,CAAC,SAAS;YAC3B,IAAI,EAAE;gBACJ,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM;gBAC7B,gBAAgB,EAAE,IAAI,CAAC,eAAe;aACvC;YACD,OAAO,EAAE;gBACP,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM;aACtC;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YAC5C,OAAO,CAAC,QAAQ,GAAG,UAAU,CAAC;QAChC,CAAC;QAED,+CAA+C;QAC/C,OAAO;YACL,MAAM,EAAE,UAAU;YAClB,OAAO,EAAE,GAAG;YACZ,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,aAAa,EAAE,aAAa;YAC5B,gBAAgB,EAAE,IAAI,CAAC,oBAAoB;SAC5C,CAAC;IACJ,CAAC;IAED,yDAAyD;IACjD,KAAK,CAAC,yBAAyB,CAAC,UAAkB,EAAE,IAAS;QACnE,aAAa;QACb,MAAM,iBAAiB,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;QACnD,MAAM,mBAAmB,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;QACvD,MAAM,gBAAgB,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;QAEjD,sDAAsD;QACtD,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,gBAAgB,UAAU,KAAK,CAAC,CAAC,CAAC;QACrD,MAAM,QAAQ,GAAG,GAAG,IAAI,CAAC,WAAW,GAAG,UAAU,EAAE,CAAC;QACpD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC;QAC7F,MAAM,cAAc,GAAG,MAAM,IAAI,cAAc,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC7G,IAAI,cAAc,CAAC,OAAO,EAAE,CAAC;YAC3B,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,kCAAkC,UAAU,oCAAoC,CAAC,CAAC,CAAC;YACtG,MAAM,gBAAgB,GAAG,EAAE,CAAC,gBAAgB,CAAC,UAAU,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;YAC/E,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACpC,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE;oBAC3B,MAAM,EAAE,IAAI;oBACZ,MAAM,EAAE,IAAI;oBACZ,KAAK,EAAE,CAAC,OAAO,EAAE,EAAE;wBACjB,iEAAiE;wBACjE,KAAK,MAAM,QAAQ,IAAI,OAAO,CAAC,IAAa,EAAE,CAAC;4BAC7C,MAAM,UAAU,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;4BACjG,MAAM,SAAS,GAAG,QAAQ,CAAC,UAAU,IAAI,IAAI,CAAC;4BAC9C,KAAK,MAAM,mBAAmB,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;gCAC5D,IACE,mBAAmB,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC;oCACjD,mBAAmB,CAAC,aAAa,IAAI,UAAU;oCAC/C,mBAAmB,CAAC,aAAa,IAAI,UAAU,EAC/C,CAAC;oCACD,QAAQ,CAAC,+BAA+B,GAAG,mBAAmB,CAAC,kBAAkB,CAAC;oCAClF,QAAQ,CAAC,oBAAoB,GAAG,mBAAmB,CAAC,QAAQ,CAAC;oCAC7D,IAAI,mBAAmB,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;wCAC7C,QAAQ,CAAC,QAAQ,GAAG,OAAO,CAAC;wCAC5B,QAAQ,CAAC,YAAY,GAAG,iBAAiB,CAAC;oCAC5C,CAAC;yCAAM,IAAI,mBAAmB,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;wCACtD,QAAQ,CAAC,QAAQ,GAAG,SAAS,CAAC;wCAC9B,QAAQ,CAAC,YAAY,GAAG,mBAAmB,CAAC;oCAC9C,CAAC;yCAAM,CAAC;wCACN,sBAAsB;wCACtB,QAAQ,CAAC,QAAQ,GAAG,MAAM,CAAC;wCAC3B,QAAQ,CAAC,YAAY,GAAG,gBAAgB,CAAC;oCAC3C,CAAC;oCACD,mBAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oCAC1C,MAAM;gCACR,CAAC;4BACH,CAAC;wBACH,CAAC;oBACH,CAAC;oBACD,QAAQ,EAAE;wBACR,OAAO,CAAC,IAAI,CAAC,CAAC;oBAChB,CAAC;oBACD,KAAK,EAAE,UAAU,KAAK;wBACpB,MAAM,CAAC,KAAK,CAAC,CAAC;oBAChB,CAAC;iBACF,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC;aACI,CAAC;YACJ,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,sCAAsC,UAAU,EAAE,CAAC,CAAC,CAAC;QAC5E,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,MAAM,EAAE,QAAQ;QAC/C,0CAA0C;QAC1C,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,KAAK,MAAM,cAAc,IAAI,MAAM,EAAE,CAAC;YACpC,IAAI,cAAc,CAAC,SAAS,EAAE,CAAC;gBAC7B,MAAM,MAAM,GAAG,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;gBAChE,MAAM,CAAC,KAAK,EAAE,CAAC;gBACf,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC;YAC5C,CAAC;QACH,CAAC;QACD,8BAA8B;QAC9B,MAAM,SAAS,GAAU,EAAE,CAAC;QAC5B,KAAK,MAAM,EAAE,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YACrC,MAAM,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC;YAC1B,IAAI,QAAQ,CAAC;YACb,IAAI,CAAC;gBACH,QAAQ,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;gBACzC,6DAA6D;YAC/D,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,QAAQ,GAAG,SAAS,CAAC;YACvB,CAAC;YACD,MAAM,QAAQ,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,eAAe,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;YAC/F,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3B,CAAC;QACD,IAAI,CAAC,eAAe,GAAG,SAAS,CAAC,SAAS,EAAE;YAC1C,EAAE,EAAE,CAAC,mBAAmB,CAAC;YACzB,KAAK,EAAE,CAAC,MAAM,CAAC;SAChB,CAAC,CAAC;QACH,wCAAwC;QACxC,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC;YACpD,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,EAAE,eAAe,GAAG,QAAQ,GAAG,MAAM,CAAC;YACtE,CAAC,CAAC,IAAI,CAAC,UAAU,GAAG,cAAc,GAAG,QAAQ,GAAG,MAAM,CAAC;QACzD,MAAM,gBAAgB,GAAG,MAAM,eAAe,CAAC,IAAI,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;QACpF,IAAI,gBAAgB,CAAC,QAAQ,EAAE,CAAC;YAC9B,IAAI,CAAC,cAAc,CAAC,SAAS,GAAG,gBAAgB,CAAC,QAAQ,CAAC;QAC5D,CAAC;QACD,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,yBAAyB,QAAQ,mBAAmB,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC3G,OAAO,aAAa,CAAC;IACvB,CAAC"}

package/lib/common/utils/fileDownloader.d.ts

@@ -0,0 +1,20 @@
+import { Connection } from "@salesforce/core";
+import { FetchOptions } from 'make-fetch-happen';
+export declare class FileDownloader {
+    conn: Connection;
+    downloadUrl: string;
+    outputFile: string | null;
+    fetchOptions: any;
+    label: string;
+    constructor(downloadUrl: string, options: {
+        conn?: any;
+        outputFile?: string;
+        fetchOptions?: FetchOptions;
+        label?: 'url' | 'file' | 'both';
+    });
+    download(): Promise<{
+        success: boolean;
+        outputFile: string;
+        error?: any;
+    }>;
+}

package/lib/common/utils/fileDownloader.js

@@ -0,0 +1,86 @@
+import { SfError } from "@salesforce/core";
+import fs from 'fs-extra';
+import ora from "ora";
+import * as path from "path";
+import { createTempDir } from "./index.js";
+import makeFetchHappen from 'make-fetch-happen';
+export class FileDownloader {
+    conn;
+    downloadUrl;
+    outputFile = null;
+    fetchOptions = {};
+    label;
+    constructor(downloadUrl, options) {
+        this.conn = options.conn || null;
+        this.downloadUrl = downloadUrl;
+        this.outputFile = options.outputFile || null;
+        this.label = options?.label === 'file'
+            ? (path.relative(process.cwd(), this.outputFile || "")) || this.downloadUrl
+            : options?.label === 'both'
+                ? `${this.outputFile} from ${this.downloadUrl}`
+                : this.downloadUrl;
+        // Build fetch options for HTTP calls to retrieve document files
+        this.fetchOptions = options.fetchOptions || {
+            method: 'GET',
+            headers: {
+                Authorization: 'Bearer ' + this.conn.accessToken,
+                'Content-Type': 'blob',
+                // "X-PrettyPrint": '1'
+            },
+            retry: {
+                retries: 20,
+                factor: 3,
+                randomize: true,
+            },
+        };
+    }
+    async download() {
+        const spinnerCustom = ora({
+            text: `Downloading ${this.label}...`,
+            spinner: 'moon',
+        }).start();
+        if (this.outputFile == null) {
+            const tempDir = await createTempDir();
+            this.outputFile = path.join(tempDir, Math.random().toString(36).substring(7));
+        }
+        try {
+            this.fetchOptions.onRetry = (cause) => {
+                spinnerCustom.text = `Retrying ${this.label} (${cause})...`;
+            };
+            const fetchRes = await makeFetchHappen(this.downloadUrl, this.fetchOptions);
+            if (!fetchRes.ok) {
+                throw new SfError(`Fetch error: ${JSON.stringify(fetchRes.body)}`);
+            }
+            const stream = fs.createWriteStream(this.outputFile);
+            const totalSize = Number(fetchRes.headers.get('content-length'));
+            let downloadedSize = 0;
+            // Set up piping first
+            fetchRes.body.pipe(stream);
+            fetchRes.body.on('data', (chunk) => {
+                downloadedSize += chunk.length;
+                const percentComplete = totalSize ? (downloadedSize / totalSize * 100).toFixed(2) : null;
+                spinnerCustom.text = totalSize
+                    ? `Downloaded ${downloadedSize} bytes of ${totalSize} bytes (${percentComplete}%) of ${this.label}`
+                    : `Downloaded ${downloadedSize} bytes of ${this.label}`;
+            });
+            // Handle end of download, or error
+            await new Promise((resolve, reject) => {
+                fetchRes.body.on("error", reject);
+                stream.on("error", reject);
+                stream.on("finish", resolve);
+            });
+            const fileExists = await fs.exists(this.outputFile);
+            if (!fileExists) {
+                throw new SfError(`Download error: Download stream ok but no created file at ${this.outputFile}`);
+            }
+            spinnerCustom.succeed(`Downloaded ${this.label}`);
+            stream.destroy();
+        }
+        catch (err) {
+            spinnerCustom.fail(`Error while downloading ${this.downloadUrl}: ${err.message}`);
+            return { success: false, outputFile: this.outputFile, error: err };
+        }
+        return { success: true, outputFile: this.outputFile };
+    }
+}
+//# sourceMappingURL=fileDownloader.js.map

package/lib/common/utils/fileDownloader.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fileDownloader.js","sourceRoot":"","sources":["../../../src/common/utils/fileDownloader.ts"],"names":[],"mappings":"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"}

package/lib/common/utils/filesUtils.d.ts

@@ -7,7 +7,6 @@ export declare class FilesExporter {
     private recordsChunkSize;
     private startChunkNumber;
     private commandThis;
-    private fetchOptions;
     private dtl;
     private exportedFilesFolder;
     private recordsChunk;

package/lib/common/utils/filesUtils.js

@@ -2,7 +2,6 @@
 import fs from 'fs-extra';
 import * as path from 'path';
 import c from 'chalk';
-import makeFetchHappen from 'make-fetch-happen';
 import * as split from 'split';
 import { PromisePool } from '@supercharge/promise-pool';
 // Salesforce Specific and Other Specific Libraries
@@ -15,7 +14,7 @@ import { bulkQuery, soqlQuery } from './apiUtils.js';
 import { prompts } from './prompts.js';
 import { CONSTANTS, getReportDirectory } from '../../config/index.js';
 import { WebSocketClient } from '../websocketClient.js';
-import ora from 'ora';
+import { FileDownloader } from './fileDownloader.js';
 export const filesFolderRoot = path.join('.', 'scripts', 'files');
 export class FilesExporter {
     filesPath;
@@ -24,7 +23,6 @@ export class FilesExporter {
     recordsChunkSize;
     startChunkNumber;
     commandThis;
-    fetchOptions;
     dtl = null; // export config
     exportedFilesFolder = '';
     recordsChunk = [];
@@ -54,19 +52,6 @@ export class FilesExporter {
         if (options.exportConfig) {
             this.dtl = options.exportConfig;
         }
-        // Build fetch options for HTTP calls to retrieve document files
-        this.fetchOptions = {
-            method: 'GET',
-            headers: {
-                Authorization: 'Bearer ' + this.conn.accessToken,
-                'Content-Type': 'blob',
-            },
-            retry: {
-                retries: 20,
-                factor: 3,
-                randomize: true,
-            },
-        };
     }
     async processExport() {
         // Get config
@@ -251,7 +236,6 @@ export class FilesExporter {
             outputFile =
                 outputFile + '.' + (contentVersion.FileExtension !== 'snote' ? contentVersion.FileExtension : 'html');
         }
-        const outputFileLabel = path.relative(process.cwd(), outputFile);
         // Check file extension
         if (this.dtl.fileTypes !== 'all' && !this.dtl.fileTypes.includes(contentVersion.FileType)) {
             uxLog(this, c.grey(`Skipped - ${outputFile.replace(this.exportedFilesFolder, '')} - File type ignored`));
@@ -267,36 +251,12 @@ export class FilesExporter {
         // Create directory if not existing
         await fs.ensureDir(parentRecordFolderForFiles);
         // Download file locally
-        const spinnerCustom = ora({
-            text: `(${(this.filesDownloaded + 1)}) Downloading ${outputFileLabel}...`,
-            spinner: 'moon',
-        }).start();
         const fetchUrl = `${this.conn.instanceUrl}/services/data/v${CONSTANTS.API_VERSION}/sobjects/ContentVersion/${contentVersion.Id}/VersionData`;
-        try {
-            this.fetchOptions.onRetry = (cause) => {
-                spinnerCustom.text = `(${this.filesDownloaded}) Retrying ${outputFileLabel} (${cause})...`;
-            };
-            const fetchRes = await makeFetchHappen(fetchUrl, this.fetchOptions);
-            if (fetchRes.ok !== true) {
-                throw new SfError(`Fetch error - ${fetchUrl} - + ${JSON.stringify(fetchRes.body)}`);
-            }
-            // Wait for file to be written
-            const stream = fs.createWriteStream(outputFile);
-            fetchRes.body.pipe(stream);
-            /*
-            await new Promise(resolve => {
-              stream.on('finish', function() {
-                resolve(true);
-              });
-            }) */
-            // uxLog(this, c.green(`Success - ${path.relative(process.cwd(), outputFile)}`));
+        const downloadResult = await new FileDownloader(fetchUrl, { conn: this.conn, outputFile: outputFile, label: 'file' }).download();
+        if (downloadResult.success) {
             this.filesDownloaded++;
-            spinnerCustom.succeed(`(${this.filesDownloaded}) Downloaded ${outputFileLabel}`);
         }
-        catch (err) {
-            // Download failure
-            // uxLog(this, c.red(`Error   - ${path.relative(process.cwd(), outputFile)} - ${err}`));
-            spinnerCustom.fail(`(${this.filesDownloaded}) Error while downloading ${outputFileLabel}: ${err.message}`);
+        else {
             this.filesErrors++;
         }
     }