@robinmordasiewicz/f5xc-xcsh 6.40.0 → 6.42.0

package/dist/index.js

@@ -45354,8 +45354,8 @@ function getLogoModeFromEnv(envPrefix) {
 var CLI_NAME = "xcsh";
 var CLI_FULL_NAME = "F5 Distributed Cloud Shell";
 function getVersion() {
-  if ("6.40.0") {
-    return "6.40.0";
+  if ("6.42.0") {
+    return "6.42.0";
   }
   if (process.env.XCSH_VERSION) {
     return process.env.XCSH_VERSION;
@@ -45821,6 +45821,9 @@ var APIClient = class {
       this._validationError = "No API token configured";
       return { valid: false, error: this._validationError };
     }
+    if (this.debug) {
+      console.error(`DEBUG: Validating token against ${this.serverUrl}`);
+    }
     try {
       await this.get("/api/web/namespaces");
       this._isValidated = true;
@@ -45839,7 +45842,7 @@ var APIClient = class {
           this._validationError = `Validation failed: HTTP ${error.statusCode}`;
         }
       } else {
-        this._validationError = "Validation failed: Unknown error";
+        this._validationError = `Validation failed: ${error instanceof Error ? error.message : "Unknown error"}`;
       }
       return { valid: false, error: this._validationError };
     }
@@ -49024,6 +49027,21 @@ function colorizeLogoLine(line) {
   }
   return result;
 }
+function wrapText4(text, maxWidth) {
+  const words = text.split(" ");
+  const lines = [];
+  let currentLine = "";
+  for (const word of words) {
+    if (currentLine.length + word.length + 1 <= maxWidth) {
+      currentLine += (currentLine ? " " : "") + word;
+    } else {
+      if (currentLine) lines.push(currentLine);
+      currentLine = word;
+    }
+  }
+  if (currentLine) lines.push(currentLine);
+  return lines;
+}
 function printImageBanner(imageSeq, imageHeight, imageWidth) {
   const BOX = {
     topLeft: "\u256D",
@@ -49037,11 +49055,7 @@ function printImageBanner(imageSeq, imageHeight, imageWidth) {
   const INNER_WIDTH = TOTAL_WIDTH - 2;
   const IMAGE_COL_WIDTH = 1 + imageWidth + 1;
   const TEXT_COL_WIDTH = INNER_WIDTH - IMAGE_COL_WIDTH;
-  const HELP_LINES = [
-    "Type 'help' for commands",
-    "Run 'namespace <ns>' to set",
-    "Press Ctrl+C twice to exit"
-  ];
+  const HELP_LINES = wrapText4(CLI_DESCRIPTION_MEDIUM, TEXT_COL_WIDTH - 2);
   const helpStartRow = Math.floor((imageHeight - HELP_LINES.length) / 2);
   const title = ` ${CLI_FULL_NAME} v${CLI_VERSION} `;
   const leftDashes = 3;
@@ -49091,11 +49105,8 @@ function printAsciiBanner() {
   const logoWidth = Math.max(...logoLines.map((l) => [...l].length));
   const TOTAL_WIDTH = Math.max(80, logoWidth + 4);
   const INNER_WIDTH = TOTAL_WIDTH - 2;
-  const HELP_LINES = [
-    "Type 'help' for commands",
-    "Run 'namespace <ns>' to set",
-    "Press Ctrl+C twice to exit"
-  ];
+  const helpColumnWidth = INNER_WIDTH - logoWidth - 1;
+  const HELP_LINES = wrapText4(CLI_DESCRIPTION_MEDIUM, helpColumnWidth - 2);
   const HELP_START_ROW = 8;
   const title = ` ${CLI_FULL_NAME} v${CLI_VERSION} `;
   const leftDashes = 3;
@@ -49112,7 +49123,6 @@ function printAsciiBanner() {
     const helpText = helpIndex >= 0 && helpIndex < HELP_LINES.length ? HELP_LINES[helpIndex] ?? "" : "";
     const paddedLogo = logoLine.padEnd(logoWidth);
     const coloredLogo = colorizeLogoLine(paddedLogo);
-    const helpColumnWidth = INNER_WIDTH - logoWidth - 1;
     const paddedHelp = helpText.padEnd(helpColumnWidth);
     output.push(
       colorRed(BOX.vertical) + coloredLogo + " " + colorBoldWhite(paddedHelp) + colorRed(BOX.vertical)
@@ -49143,11 +49153,7 @@ function getBannerLines(logoMode, useImage) {
   const logoWidth = Math.max(...logoLines.map((l) => [...l].length));
   const TOTAL_WIDTH = Math.max(80, logoWidth + 4);
   const INNER_WIDTH = TOTAL_WIDTH - 2;
-  const HELP_LINES = [
-    "Type 'help' for commands",
-    "Run 'namespace <ns>' to set",
-    "Press Ctrl+C twice to exit"
-  ];
+  const helpColumnWidth = INNER_WIDTH - logoWidth - 1;
   const title = ` ${CLI_FULL_NAME} v${CLI_VERSION} `;
   const leftDashes = 3;
   const rightDashes = TOTAL_WIDTH - 1 - leftDashes - title.length - 1;
@@ -49168,8 +49174,12 @@ function getBannerLines(logoMode, useImage) {
       const imageWidth = F5_LOGO_DISPLAY_WIDTH;
       const IMAGE_COL_WIDTH = 1 + imageWidth + 1;
       const TEXT_COL_WIDTH = INNER_WIDTH - IMAGE_COL_WIDTH;
+      const HELP_LINES2 = wrapText4(
+        CLI_DESCRIPTION_MEDIUM,
+        TEXT_COL_WIDTH - 2
+      );
       const helpStartRow = Math.floor(
-        (imageHeight - HELP_LINES.length) / 2
+        (imageHeight - HELP_LINES2.length) / 2
       );
       let bannerStr = "";
       bannerStr += "\n";
@@ -49179,7 +49189,7 @@ function getBannerLines(logoMode, useImage) {
       bannerStr += colorRed(BOX.vertical) + " ".repeat(INNER_WIDTH) + colorRed(BOX.vertical) + "\n";
       for (let row = 0; row < imageHeight; row++) {
         const helpIndex = row - helpStartRow;
-        const helpText = helpIndex >= 0 && helpIndex < HELP_LINES.length ? HELP_LINES[helpIndex] ?? "" : "";
+        const helpText = helpIndex >= 0 && helpIndex < HELP_LINES2.length ? HELP_LINES2[helpIndex] ?? "" : "";
         const imageSpace = " ".repeat(IMAGE_COL_WIDTH);
         const paddedHelp = helpText.padEnd(TEXT_COL_WIDTH);
         bannerStr += colorRed(BOX.vertical) + imageSpace + colorBoldWhite(paddedHelp) + colorRed(BOX.vertical) + "\n";
@@ -49198,6 +49208,7 @@ function getBannerLines(logoMode, useImage) {
     }
   }
   const HELP_START_ROW = 8;
+  const HELP_LINES = wrapText4(CLI_DESCRIPTION_MEDIUM, helpColumnWidth - 2);
   output.push("");
   output.push(
     colorRed(BOX.topLeft + BOX.horizontal.repeat(leftDashes)) + colorBoldWhite(title) + colorRed(
@@ -49210,7 +49221,6 @@ function getBannerLines(logoMode, useImage) {
     const helpText = helpIndex >= 0 && helpIndex < HELP_LINES.length ? HELP_LINES[helpIndex] ?? "" : "";
     const paddedLogo = logoLine.padEnd(logoWidth);
     const coloredLogo = colorizeLogoLine(paddedLogo);
-    const helpColumnWidth = INNER_WIDTH - logoWidth - 1;
     const paddedHelp = helpText.padEnd(helpColumnWidth);
     output.push(
       colorRed(BOX.vertical) + coloredLogo + " " + colorBoldWhite(paddedHelp) + colorRed(BOX.vertical)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@robinmordasiewicz/f5xc-xcsh",
-  "version": "6.40.0",
+  "version": "6.42.0",
   "description": "F5 Distributed Cloud Shell - Interactive CLI for F5 XC",
   "type": "module",
   "bin": {