@devkong/cli 0.0.67-alpha.5 → 0.0.67-alpha.7

package/index.js

@@ -63432,7 +63432,7 @@ var PublishVersionCommand = class {
 
 // packages/kong-cli/src/common/deployment.ts
 var DEPLOY_SUCCESS_ACTIONS = /* @__PURE__ */ new Set(["deployment completed"]);
-var DEPLOY_FAILURE_ACTIONS = /* @__PURE__ */ new Set(["deployment failed", "save deployment details"]);
+var DEPLOY_FAILURE_ACTIONS = /* @__PURE__ */ new Set(["deployment failed"]);
 function isFailureEvent(event) {
   return event.eventType === "error" || DEPLOY_FAILURE_ACTIONS.has(event.action);
 }
@@ -63520,6 +63520,25 @@ function validateName(value) {
     );
   }
 }
+var DEPLOY_STEPS = [
+  "create deployment",
+  "health check",
+  "save deployment details",
+  "deployment completed"
+];
+function createDeploySteps() {
+  return DEPLOY_STEPS.map((action) => {
+    const handlers = {
+      resolve: () => void 0,
+      reject: () => void 0
+    };
+    const done = new Promise((resolve2, reject) => {
+      handlers.resolve = resolve2;
+      handlers.reject = reject;
+    });
+    return { action, done, settle: (error) => error ? handlers.reject(error) : handlers.resolve() };
+  });
+}
 var SetAliasCommand = class {
   constructor(profile) {
     this.profile = profile;
@@ -63530,6 +63549,7 @@ var SetAliasCommand = class {
   async execute(aliasName, extensionVersion, timeoutSeconds) {
     validateName(aliasName);
     const startedAt = utcNow(DEFAULT_TIMEZONE);
+    const steps = createDeploySteps();
     await new Listr(
       [
         {
@@ -63577,41 +63597,12 @@ var SetAliasCommand = class {
             };
             await this.publicClient.assignExtensionAlias(ctx.kongJson.id, alias);
             task.output = joinUrlAndPath(this.profile.kongBaseUrl, "/extensions/aliases");
+            this.pollDeploymentSteps(steps, ctx.kongJson.id, aliasName, startedAt, timeoutSeconds);
           },
           rendererOptions: { persistentOutput: true }
         },
-        {
-          title: "Wait for deployment",
-          task: async (ctx, task) => {
-            let stopped = false;
-            const result = await pollDeployment(this.managementClient, {
-              objectType: "EXTENSION_ALIAS",
-              basedOnId: ctx.kongJson.id,
-              aliasName,
-              createdAfter: startedAt,
-              timeoutSeconds,
-              onProgress: (progress) => {
-                if (stopped) {
-                  return;
-                }
-                const latest = progress.events[0];
-                if (latest) {
-                  task.output = `${latest.eventType === "error" ? "\u2717" : "\u2713"} ${latest.action}`;
-                }
-                if (progress.status === "failed") {
-                  stopped = true;
-                }
-              }
-            });
-            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 }
-        }
+        // Known deployment steps as a checklist; each ticks off on its event.
+        ...steps.map((step) => ({ title: step.action, task: () => step.done }))
       ],
       {
         renderer: "default",
@@ -63623,6 +63614,47 @@ var SetAliasCommand = class {
       }
     ).run();
   }
+  /**
+   * Poll the deployment audit log and settle one step per matching event. Runs
+   * detached from the task list; it settles a step as its event arrives and
+   * fails the rest on a failed/timed-out deployment, stopping on the failed or
+   * "deployment completed" event (poll terminal).
+   */
+  pollDeploymentSteps(steps, basedOnId, aliasName, createdAfter, timeoutSeconds) {
+    const pending = new Map(steps.map((step) => [step.action, step]));
+    const seen = /* @__PURE__ */ new Set();
+    void pollDeployment(this.managementClient, {
+      objectType: "EXTENSION_ALIAS",
+      basedOnId,
+      aliasName,
+      createdAfter,
+      timeoutSeconds,
+      onProgress: (progress) => {
+        for (const event of [...progress.events].reverse()) {
+          if (seen.has(event.action)) {
+            continue;
+          }
+          seen.add(event.action);
+          pending.get(event.action)?.settle();
+        }
+      }
+    }).then((result) => {
+      if (result.status === "failed") {
+        const error = new AppError(deploymentErrorMessage(result.events));
+        steps.forEach((step) => step.settle(error));
+      } else if (result.timedOut) {
+        const error = new AppError(
+          `Still deploying after ${result.waitedSeconds}s \u2014 check the UI for completion.`
+        );
+        steps.forEach((step) => step.settle(error));
+      } else {
+        steps.forEach((step) => step.settle());
+      }
+    }).catch((error) => {
+      const wrapped = error instanceof Error ? error : new AppError(String(error));
+      steps.forEach((step) => step.settle(wrapped));
+    });
+  }
 };
 
 // packages/kong-cli/src/common/cli.ts

package/package.json

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

package/packages/kong-cli/src/commands/setAliasCommand.d.ts

@@ -5,4 +5,11 @@ export declare class SetAliasCommand {
     private managementClient;
     constructor(profile: Profile);
     execute(aliasName: string, extensionVersion: number, timeoutSeconds: number): Promise<void>;
+    /**
+     * Poll the deployment audit log and settle one step per matching event. Runs
+     * detached from the task list; it settles a step as its event arrives and
+     * fails the rest on a failed/timed-out deployment, stopping on the failed or
+     * "deployment completed" event (poll terminal).
+     */
+    private pollDeploymentSteps;
 }