rockcarver#192 - better error handling and reporting in frodo-cli

vscheuber · Jan 27, 2023 · 311ecb7 · 311ecb7
1 parent 848d5f9
commit 311ecb7
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+-   Update to frodo-lib 0.18.3
+-   \#192: Better error handling and reporting in frodo-cli
+
 ## [0.21.0] - 2023-01-25
 
 ### Added

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -104,7 +104,7 @@
     ]
   },
   "dependencies": {
-    "@rockcarver/frodo-lib": "0.18.2",
+    "@rockcarver/frodo-lib": "0.18.3",
     "chokidar": "^3.5.3",
     "cli-progress": "^3.11.2",
     "cli-table3": "^0.6.3",

diff --git a/src/ops/Saml2Ops.ts b/src/ops/Saml2Ops.ts
@@ -159,6 +159,7 @@ export async function exportSaml2MetadataToFile(entityId, file = null) {
     updateProgressBar(`Writing file ${fileName}`);
     const metaData = await getProviderMetadata(entityId);
     saveTextToFile(metaData, fileName);
+    updateProgressBar(`Exported provider ${entityId}`);
     stopProgressBar(
       `Exported ${entityId.brightCyan} metadata to ${fileName.brightCyan}.`
     );
@@ -185,6 +186,7 @@ export async function exportSaml2ProviderToFile(entityId, file = null) {
     createProgressBar(1, `Exporting provider ${entityId}`);
     const fileData = await exportSaml2Provider(entityId);
     saveJsonToFile(fileData, fileName);
+    updateProgressBar(`Exported provider ${entityId}`);
     stopProgressBar(
       `Exported ${entityId.brightCyan} to ${fileName.brightCyan}.`
     );
@@ -228,10 +230,10 @@ export async function exportSaml2ProvidersToFiles() {
   if (stubs.length > 0) {
     createProgressBar(stubs.length, 'Exporting providers');
     for (const stub of stubs) {
-      updateProgressBar(`Exporting provider ${stub.entityId}`);
       const fileName = getTypedFilename(stub.entityId, 'saml');
       const fileData = await exportSaml2Provider(stub.entityId);
       saveJsonToFile(fileData, fileName);
+      updateProgressBar(`Exported provider ${stub.entityId}`);
     }
     stopProgressBar(`${stubs.length} providers exported.`);
   } else {

diff --git a/src/utils/Console.ts b/src/utils/Console.ts
@@ -1,5 +1,5 @@
 /* eslint-disable no-console */
-import { SingleBar, Presets } from 'cli-progress';
+import { MultiBar, Presets } from 'cli-progress';
 import { createSpinner } from 'nanospinner';
 import Table from 'cli-table3';
 import { ExportImportUtils, state } from '@rockcarver/frodo-lib';
@@ -9,6 +9,7 @@ Color.enable();
 
 const { appendTextToFile } = ExportImportUtils;
 
+let multiBarContainer = null;
 let progressBar = null;
 let spinner = null;
 
@@ -209,8 +210,12 @@ export function createProgressBar(
       noTTYOutput: true,
     };
   }
-  progressBar = new SingleBar(opt, Presets.legacy); // create only when needed
-  progressBar.start(total, 0, {
+  // progressBar = new SingleBar(opt, Presets.legacy); // create only when needed
+  // progressBar.start(total, 0, {
+  //   data: message,
+  // });
+  multiBarContainer = new MultiBar(opt, Presets.legacy);
+  progressBar = multiBarContainer.create(total, 0, {
     data: message,
   });
 }
@@ -237,7 +242,9 @@ export function stopProgressBar(message = null) {
     progressBar.update({
       data: message,
     });
-  progressBar.stop();
+  // progressBar.stop();
+  multiBarContainer.stop();
+  multiBarContainer = null;
 }
 
 /**