@glash/cli 0.2.13 → 0.2.15

package/commands/deploy.mjs

@@ -7,6 +7,7 @@ import { join, basename } from 'node:path';
 import { tmpdir } from 'node:os';
 import { openAsBlob } from 'node:fs';
 import { access, readFile, rm, stat } from 'node:fs/promises';
+import { stdout } from 'node:process';
 
 function currentCommit() {
   try {
@@ -179,6 +180,9 @@ export async function deploy({ flags }) {
   const start = Date.now();
   let pollDelayMs = 5000;
   let lastProgressAt = Date.now();
+  let currentPhase = 'queued';
+  const indicator = createDeployIndicator({ start, getPhase: () => currentPhase });
+  indicator.start();
   while (Date.now() - start < 15 * 60 * 1000) {
     let pipe;
     try {
@@ -203,24 +207,32 @@ export async function deploy({ flags }) {
       const key = `${ev.id ?? ev.createdAt}:${ev.step}:${ev.status}`;
       if (seen.has(key)) continue;
       seen.add(key);
+      indicator.clear();
       const tag = stepBadge(ev.status);
       info(`  ${tag} ${color.dim(ev.step.padEnd(8))} ${ev.message ?? ''}`);
       lastProgressAt = Date.now();
+      currentPhase = phaseFromEvent(ev);
     }
 
     const status = pipe.deployStatus ?? pipe.buildStatus ?? '';
     if (status && status !== lastStatus) lastStatus = status;
     if (['ready', 'live', 'success'].includes(status)) {
+      indicator.stop();
       const url = pipe.hostings?.[0]?.domains?.[0]?.domain;
       ok(`Live${url ? ` → ${color.cyan(`https://${url.replace(/^https?:\/\//, '')}`)}` : ''}`);
       return;
     }
     if (['error', 'failed'].includes(status)) {
-      return fail(`Deployment failed (${status}). Run \`glash logs ${dep.id}\` for details.`);
+      indicator.stop();
+      const lastError = [...(pipe.events ?? [])].reverse().find((ev) => ev.status === 'error' || ev.status === 'failed');
+      const detail = lastError?.message ? `: ${lastError.message}` : '';
+      return fail(`Deployment failed (${status})${detail}. Run \`glash logs ${dep.id}\` for details.`);
     }
+    currentPhase = phaseFromPipeline(pipe, currentPhase);
     pollDelayMs = nextPollDelay(pipe);
-    await sleep(pollDelayMs);
+    await indicator.wait(pollDelayMs);
   }
+  indicator.stop();
   warn('Timed out waiting for deployment. Check `glash status <id>`.');
 }
 
@@ -300,4 +312,67 @@ function nextPollDelay(pipe) {
   return 5000;
 }
 
+function phaseFromEvent(ev) {
+  if (ev.step === 'detect') return 'detecting';
+  if (ev.step === 'host') return 'assigning host';
+  if (ev.step === 'package') return ev.status === 'queued' ? 'queued' : 'packaging';
+  if (ev.step === 'build') return 'building';
+  if (ev.step === 'deploy') return ev.status === 'ready' ? 'finalizing' : 'deploying';
+  if (ev.step === 'route' || ev.step === 'edge' || ev.step === 'ssl') return 'routing';
+  if (ev.step === 'runtime') return 'checking runtime';
+  return ev.step || 'deploying';
+}
+
+function phaseFromPipeline(pipe, fallback) {
+  const status = pipe.deployStatus ?? pipe.buildStatus ?? '';
+  if (status === 'queued') return 'queued';
+  if (status === 'building') return 'building';
+  if (status === 'rolling-out') return 'deploying';
+  const last = [...(pipe.events ?? [])].reverse().find(Boolean);
+  return last ? phaseFromEvent(last) : fallback;
+}
+
+function createDeployIndicator({ start, getPhase }) {
+  const interactive = Boolean(stdout.isTTY);
+  let frame = 0;
+  let timer;
+  let plainLast = 0;
+  const frames = ['.', '..', '...'];
+
+  function message() {
+    const elapsed = Math.floor((Date.now() - start) / 1000);
+    const dots = frames[frame++ % frames.length].padEnd(3, ' ');
+    return `  ${color.cyan('•')} ${color.dim('deploy'.padEnd(8))} ${getPhase()}${dots} ${color.dim(`${elapsed}s elapsed`)}`;
+  }
+
+  function render() {
+    if (!interactive) {
+      if (Date.now() - plainLast > 30_000) {
+        plainLast = Date.now();
+        info(message().trimEnd());
+      }
+      return;
+    }
+    stdout.write(`\r\x1b[2K${message()}`);
+  }
+
+  return {
+    start() {
+      render();
+      timer = setInterval(render, 1000);
+    },
+    clear() {
+      if (interactive) stdout.write('\r\x1b[2K');
+    },
+    stop() {
+      if (timer) clearInterval(timer);
+      timer = undefined;
+      if (interactive) stdout.write('\r\x1b[2K');
+    },
+    wait(ms) {
+      return sleep(ms);
+    },
+  };
+}
+
 const sleep = (ms) => new Promise((r) => setTimeout(r, ms));

package/lib/version.mjs

@@ -1 +1 @@
-export const VERSION = '0.2.13';
+export const VERSION = '0.2.15';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glash/cli",
-  "version": "0.2.13",
+  "version": "0.2.15",
   "description": "glashDB command-line interface — deploy projects, pull source + env, manage env vars.",
   "license": "Apache-2.0",
   "homepage": "https://glashdb.com",