@glash/cli 0.2.12 → 0.2.14

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,30 @@ 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)) {
+      indicator.stop();
       return fail(`Deployment failed (${status}). 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 +310,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.12';
+export const VERSION = '0.2.14';

package/lib/zip.mjs

@@ -1,86 +1,91 @@
-import archiver from 'archiver';
+import fg from 'fast-glob';
+import yazl from 'yazl';
 import { createWriteStream } from 'node:fs';
 import { join, relative } from 'node:path';
 import fs from 'fs-extra';
 
 export async function zipDirectory(sourceDir, outPath, { ignore = [] } = {}) {
+  // Default ignores
+  const defaultIgnore = [
+    'node_modules/**',
+    '**/node_modules/**',
+    '.git/**',
+    '**/.git/**',
+    '.next/**',
+    '**/.next/**',
+    '.next*/**',
+    '**/.next*/**',
+    '.nuxt/**',
+    '**/.nuxt/**',
+    '.nuxt*/**',
+    '**/.nuxt*/**',
+    '.output/**',
+    '**/.output/**',
+    '.svelte-kit/**',
+    '**/.svelte-kit/**',
+    '.wrangler/**',
+    '**/.wrangler/**',
+    '.netlify/**',
+    '**/.netlify/**',
+    'dist/**',
+    '**/dist/**',
+    'build/**',
+    '**/build/**',
+    'out/**',
+    '**/out/**',
+    'coverage/**',
+    '**/coverage/**',
+    '.turbo/**',
+    '**/.turbo/**',
+    '.cache/**',
+    '**/.cache/**',
+    '.parcel-cache/**',
+    '**/.parcel-cache/**',
+    '.vite/**',
+    '**/.vite/**',
+    '.glash/**',
+    '**/.glash/**',
+    '*.log',
+    '**/*.log',
+    'npm-debug.log*',
+    '**/npm-debug.log*',
+    'yarn-debug.log*',
+    '**/yarn-debug.log*',
+    'yarn-error.log*',
+    '**/yarn-error.log*',
+    '.env',
+    '**/.env',
+    '.env.local',
+    '**/.env.local',
+    '.env.production',
+    '**/.env.production',
+    '.env.development',
+    '**/.env.development',
+  ];
+  const allIgnore = [...new Set([...defaultIgnore, ...loadIgnorePatterns(sourceDir), ...ignore])];
+  const files = await fg('**/*', {
+    cwd: sourceDir,
+    ignore: allIgnore,
+    dot: true,
+    onlyFiles: true,
+    followSymbolicLinks: false,
+  });
+
   return new Promise((resolve, reject) => {
+    const zip = new yazl.ZipFile();
     const output = createWriteStream(outPath);
-    const rawLevel = Number(process.env.GLASH_ZIP_LEVEL ?? 1);
-    const level = Number.isInteger(rawLevel) && rawLevel >= 0 && rawLevel <= 9 ? rawLevel : 1;
-    const archive = archiver('zip', { zlib: { level } });
-
-    output.on('close', () => resolve(archive.pointer()));
-    archive.on('error', (err) => reject(err));
+    let bytes = 0;
 
-    archive.pipe(output);
+    output.on('close', () => resolve(bytes));
+    output.on('error', reject);
+    zip.outputStream.on('data', (chunk) => { bytes += chunk.length; });
+    zip.outputStream.on('error', reject);
+    zip.outputStream.pipe(output);
 
-    // Default ignores
-    const defaultIgnore = [
-      'node_modules/**',
-      '**/node_modules/**',
-      '.git/**',
-      '**/.git/**',
-      '.next/**',
-      '**/.next/**',
-      '.next*/**',
-      '**/.next*/**',
-      '.nuxt/**',
-      '**/.nuxt/**',
-      '.nuxt*/**',
-      '**/.nuxt*/**',
-      '.output/**',
-      '**/.output/**',
-      '.svelte-kit/**',
-      '**/.svelte-kit/**',
-      '.wrangler/**',
-      '**/.wrangler/**',
-      '.netlify/**',
-      '**/.netlify/**',
-      'dist/**',
-      '**/dist/**',
-      'build/**',
-      '**/build/**',
-      'out/**',
-      '**/out/**',
-      'coverage/**',
-      '**/coverage/**',
-      '.turbo/**',
-      '**/.turbo/**',
-      '.cache/**',
-      '**/.cache/**',
-      '.parcel-cache/**',
-      '**/.parcel-cache/**',
-      '.vite/**',
-      '**/.vite/**',
-      '.glash/**',
-      '**/.glash/**',
-      '*.log',
-      '**/*.log',
-      'npm-debug.log*',
-      '**/npm-debug.log*',
-      'yarn-debug.log*',
-      '**/yarn-debug.log*',
-      'yarn-error.log*',
-      '**/yarn-error.log*',
-      '.env',
-      '**/.env',
-      '.env.local',
-      '**/.env.local',
-      '.env.production',
-      '**/.env.production',
-      '.env.development',
-      '**/.env.development',
-    ];
-    const allIgnore = [...new Set([...defaultIgnore, ...loadIgnorePatterns(sourceDir), ...ignore])];
-
-    archive.glob('**/*', {
-      cwd: sourceDir,
-      ignore: allIgnore,
-      dot: true,
-    });
-
-    archive.finalize();
+    for (const file of files) {
+      zip.addFile(join(sourceDir, file), file);
+    }
+    zip.end();
   });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glash/cli",
-  "version": "0.2.12",
+  "version": "0.2.14",
   "description": "glashDB command-line interface — deploy projects, pull source + env, manage env vars.",
   "license": "Apache-2.0",
   "homepage": "https://glashdb.com",
@@ -30,14 +30,14 @@
     "database"
   ],
   "dependencies": {
-    "archiver": "^7.0.1",
     "chalk": "^5.3.0",
     "commander": "^12.1.0",
     "dotenv": "^16.4.5",
+    "fast-glob": "^3.3.3",
     "fs-extra": "^11.2.0",
-    "node-fetch": "^3.3.2",
     "open": "^10.1.0",
-    "ora": "^8.0.1"
+    "ora": "^8.0.1",
+    "yazl": "^3.3.1"
   },
   "publishConfig": {
     "access": "public"