@devkong/cli 0.0.67-alpha.1 → 0.0.67-alpha.3

package/index.js

@@ -60750,10 +60750,8 @@ async function spawnCommand(commandText, logger = null, shell = false) {
 }
 async function spawnCommandWithArgs(command, commandArgs, logger = null, shell = false) {
   return new Promise((resolve2, reject) => {
-    const child = (0, import_child_process.spawn)(command, commandArgs, {
-      shell: shell || process.platform !== "win32",
-      stdio: ["pipe", "pipe", "pipe"]
-    });
+    const useShell = shell || process.platform !== "win32";
+    const child = useShell ? (0, import_child_process.spawn)([command, ...commandArgs].join(" "), { shell: true, stdio: ["pipe", "pipe", "pipe"] }) : (0, import_child_process.spawn)(command, commandArgs, { shell: false, stdio: ["pipe", "pipe", "pipe"] });
     let stdout = "";
     let stderr = "";
     child.stdout.on("data", (data) => {
@@ -60797,13 +60795,6 @@ function printError(message2, error) {
 function escapePathSpaces(sourcePath) {
   return sourcePath.indexOf(" ") <= 0 ? sourcePath : `"${sourcePath}"`;
 }
-function renderProgressBar(elapsedSeconds, timeoutSeconds, status) {
-  const width = 24;
-  const ratio = timeoutSeconds > 0 ? Math.min(1, elapsedSeconds / timeoutSeconds) : 0;
-  const filled = Math.round(width * ratio);
-  const bar = "\u2588".repeat(filled) + "\u2591".repeat(width - filled);
-  return `[${bar}] ${elapsedSeconds}s / ${timeoutSeconds}s \xB7 ${status}`;
-}
 
 // packages/kong-cli/src/common/profile.ts
 var KONG_CONFIG_DIR = import_path3.default.join((0, import_os.homedir)(), ".kong");
@@ -63467,19 +63458,33 @@ async function getDeploymentLog(management, query) {
   ]);
   return [...aliasEvents, ...baseEvents].sort((a, b) => b.created.localeCompare(a.created));
 }
+function deploymentErrorMessage(events) {
+  const failure = events.find(isFailureEvent);
+  if (!failure) {
+    return "Deployment failed.";
+  }
+  const data = failure.eventData;
+  const detail = typeof data?.message === "string" ? data.message : typeof data?.error === "string" ? data.error : void 0;
+  return detail ? `${failure.action}: ${detail}` : failure.action;
+}
 var sleep = (ms) => new Promise((resolve2) => setTimeout(resolve2, ms));
 async function pollDeployment(management, input) {
   const interval = input.intervalMs ?? 2e3;
   const startedAt = Date.now();
   const deadline = startedAt + input.timeoutSeconds * 1e3;
   const elapsed = () => Math.min(input.timeoutSeconds, Math.round((Date.now() - startedAt) / 1e3));
-  const report = (status) => input.onProgress?.({ status, elapsedSeconds: elapsed(), timeoutSeconds: input.timeoutSeconds });
+  const report = (current) => input.onProgress?.({
+    status: current.status,
+    events: current.events,
+    elapsedSeconds: elapsed(),
+    timeoutSeconds: input.timeoutSeconds
+  });
   let result = analyzeDeployment(await getDeploymentLog(management, input));
-  report(result.status);
+  report(result);
   while (!result.terminal && Date.now() < deadline) {
     await sleep(interval);
     result = analyzeDeployment(await getDeploymentLog(management, input));
-    report(result.status);
+    report(result);
   }
   return {
     ...result,
@@ -63566,44 +63571,39 @@ var SetAliasCommand = class {
               updatedBy: ""
             };
             await this.publicClient.assignExtensionAlias(ctx.kongJson.id, alias);
-            task.output = [
-              "Please wait a moment for it to appear in the UI",
-              joinUrlAndPath(this.profile.kongBaseUrl, "/extensions/aliases")
-            ].join("\n");
+            task.output = joinUrlAndPath(this.profile.kongBaseUrl, "/extensions/aliases");
           },
           rendererOptions: { persistentOutput: true }
         },
         {
           title: "Wait for deployment",
           task: async (ctx, task) => {
-            let status = "pending";
-            const startedAt = Date.now();
-            const render = () => {
-              const elapsed = Math.min(timeoutSeconds, Math.round((Date.now() - startedAt) / 1e3));
-              task.output = renderProgressBar(elapsed, timeoutSeconds, status);
-            };
-            render();
-            const ticker = setInterval(render, 1e3);
-            try {
-              const result = await pollDeployment(this.managementClient, {
-                objectType: "extension_alias" /* EXTENSION_ALIAS */,
-                basedOnId: ctx.kongJson.id,
-                aliasName,
-                timeoutSeconds,
-                onProgress: (progress) => {
-                  status = progress.status;
-                  render();
+            const seen = /* @__PURE__ */ new Set();
+            const printNewEvents = (events) => {
+              for (const event of [...events].reverse()) {
+                const key = `${event.created}|${event.action}`;
+                if (seen.has(key)) {
+                  continue;
                 }
-              });
-              if (result.status === "failed") {
-                throw new AppError("Deployment failed. Check the alias logs in the UI.");
+                seen.add(key);
+                task.output = `${event.eventType === "error" ? "\u2717" : "\u2713"} ${event.action}`;
               }
-              task.output = result.timedOut ? `Still deploying after ${result.waitedSeconds}s \u2014 check the UI for completion.` : `Deployment ${result.status} in ${result.waitedSeconds}s.`;
-            } finally {
-              clearInterval(ticker);
+            };
+            const result = await pollDeployment(this.managementClient, {
+              objectType: "EXTENSION_ALIAS",
+              basedOnId: ctx.kongJson.id,
+              aliasName,
+              timeoutSeconds,
+              onProgress: (progress) => printNewEvents(progress.events)
+            });
+            if (result.status === "failed") {
+              throw new AppError(deploymentErrorMessage(result.events));
+            }
+            if (result.timedOut) {
+              task.output = `Still deploying after ${result.waitedSeconds}s \u2014 check the UI for completion.`;
             }
           },
-          rendererOptions: { persistentOutput: true }
+          rendererOptions: { bottomBar: Infinity, persistentOutput: true }
         }
       ],
       {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devkong/cli",
-  "version": "0.0.67-alpha.1",
+  "version": "0.0.67-alpha.3",
   "type": "commonjs",
   "main": "./index.js",
   "typings": "./index.d.ts",

package/packages/kong-cli/src/common/deployment.d.ts

@@ -1,8 +1,13 @@
-import { AppAuditLog, AuditObjectType } from "@kong/contract";
+import { AppAuditLog } from "@kong/contract";
 import { Loading } from "@kong/ts";
 import { ManagementClient } from "../services/managementClient";
-/** Audit object types that carry a deployment trail. */
-export type DeployObjectType = AuditObjectType.EXTENSION_ALIAS | AuditObjectType.PROCESS_ALIAS;
+/**
+ * Audit object types that carry a deployment trail. These are the management
+ * `AuditObjectType` JVM enum *constant names* (not the `extension_alias` JSON
+ * wire value): the `/v1/audit` `objectType` query param is resolved server-side
+ * via `Enum.valueOf`, which matches the constant name.
+ */
+export type DeployObjectType = "EXTENSION_ALIAS" | "PROCESS_ALIAS";
 export interface DeploymentQuery {
     objectType: DeployObjectType;
     basedOnId: string;
@@ -31,9 +36,17 @@ export declare function analyzeDeployment(events: AppAuditLog[]): DeploymentResu
  * `basedOnId`, so both object ids are fetched and merged newest-first.
  */
 export declare function getDeploymentLog(management: ManagementClient, query: DeploymentQuery): Promise<AppAuditLog[]>;
+/**
+ * Best-effort human-readable reason for a failed deployment, pulled from the
+ * first failure event's `eventData` (falling back to its action label) so the
+ * actual backend error can be surfaced to the console.
+ */
+export declare function deploymentErrorMessage(events: AppAuditLog[]): string;
 export interface PollProgress {
     /** Latest analyzed deployment status. */
     status: Loading;
+    /** Full deployment audit log analyzed so far, newest first. */
+    events: AppAuditLog[];
     /** Seconds elapsed since polling started (capped at `timeoutSeconds`). */
     elapsedSeconds: number;
     /** The configured deploy-wait budget. */

package/packages/kong-cli/src/common/utils.d.ts

@@ -1,4 +1,4 @@
-import { Loading, Optional, ShortUUID } from "@kong/ts";
+import { Optional, ShortUUID } from "@kong/ts";
 export interface ILogger {
     info(message: string): void;
     debug(message: string): void;
@@ -14,5 +14,3 @@ export declare function spawnCommand(commandText: string, logger?: ILogger | nul
 export declare function spawnCommandWithArgs(command: string, commandArgs: string[], logger?: ILogger | null, shell?: boolean): Promise<string>;
 export declare function printError(message: string, error: unknown): void;
 export declare function escapePathSpaces(sourcePath: string): string;
-/** Render a fixed-width textual progress bar for live task output. */
-export declare function renderProgressBar(elapsedSeconds: number, timeoutSeconds: number, status: Loading): string;

package/packages/kong-cli/src/services/managementClient.d.ts

@@ -1,5 +1,6 @@
-import { AppAuditLog, AppExtension, AppExtensionAlias, AppSnapshot, AppSnapshotDetails, AuditObjectType } from "@kong/contract";
+import { AppAuditLog, AppExtension, AppExtensionAlias, AppSnapshot, AppSnapshotDetails } from "@kong/contract";
 import { Optional, UrlText } from "@kong/ts";
+import { DeployObjectType } from "../common/deployment";
 import { RequestConfigProvider } from "./api";
 export declare class ManagementClient {
     private requestConfigProvider;
@@ -10,5 +11,5 @@ export declare class ManagementClient {
     getExtensionSnapshot(extensionId: AppExtension["id"], extensionSnapshotVersion: AppSnapshot["version"]): Promise<Optional<AppSnapshotDetails>>;
     getExtensionSnapshotVersions(extensionId: AppExtension["id"]): Promise<AppSnapshot[]>;
     getExtensionSnapshotAliases(extensionId: AppExtension["id"]): Promise<AppExtensionAlias[]>;
-    getAuditLog(objectType: AuditObjectType, objectId: string): Promise<AppAuditLog[]>;
+    getAuditLog(objectType: DeployObjectType, objectId: string): Promise<AppAuditLog[]>;
 }