@glash/cli 0.2.21 → 0.2.22

package/commands/deploy.mjs

@@ -153,6 +153,7 @@ export async function deploy({ flags }) {
       formData.append('gitBranch', gitBranch || '');
       formData.append('target', target);
 
+      info(color.dim('→ uploading bundle to glashDB…'));
       dep = await apiPost('/deployments/upload', formData);
       await rm(zipPath, { force: true }).catch(() => {});
     } catch (e) {

package/lib/api.mjs

@@ -28,6 +28,12 @@ const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 // proxies across machines.
 const RETRYABLE_STATUS = new Set([408, 425, 429, 500, 502, 503, 504, 522, 524]);
 const DEFAULT_RETRIES = 4;
+// Per-request wall-clock ceiling. Without this a contended/wedged backend
+// leaves `glash deploy` hanging forever after "source bundle X MB" with no
+// output. On timeout we abort and retry instead of hanging. Uploads (FormData)
+// stream a bundle and register a deployment, so they get a longer ceiling.
+const DEFAULT_TIMEOUT_MS = 60_000;
+const UPLOAD_TIMEOUT_MS = 180_000;
 
 function backoffMs(attempt, retryAfter) {
   if (retryAfter && Number.isFinite(retryAfter)) return Math.min(Math.max(retryAfter, 1000), 60000);
@@ -37,7 +43,7 @@ function backoffMs(attempt, retryAfter) {
   return Math.round(jitter);
 }
 
-export async function api(method, path, { body, token, query, retries = DEFAULT_RETRIES, signal } = {}) {
+export async function api(method, path, { body, token, query, retries = DEFAULT_RETRIES, signal, timeoutMs } = {}) {
   const headers = {
     Accept: 'application/json',
     'User-Agent': `glash-cli/${VERSION}`,
@@ -62,25 +68,44 @@ export async function api(method, path, { body, token, query, retries = DEFAULT_
   // re-streamable — fetch reads them fresh on each attempt, which lets us
   // retry uploads without re-zipping.
   const requestBody = isForm ? body : (body === undefined ? undefined : JSON.stringify(body));
+  const effectiveTimeout = timeoutMs ?? (isForm ? UPLOAD_TIMEOUT_MS : DEFAULT_TIMEOUT_MS);
 
   let attempt = 0;
   // eslint-disable-next-line no-constant-condition
   while (true) {
+    // Each attempt gets a fresh AbortController so the timeout can fire
+    // independently. If the caller passed their own signal, chain it.
+    const ctrl = new AbortController();
+    let timedOut = false;
+    const timer = setTimeout(() => { timedOut = true; ctrl.abort(); }, effectiveTimeout);
+    const onCallerAbort = () => ctrl.abort();
+    if (signal) {
+      if (signal.aborted) ctrl.abort();
+      else signal.addEventListener('abort', onCallerAbort, { once: true });
+    }
+
     let res;
     try {
-      res = await fetch(url, { method, headers, body: requestBody, signal });
+      res = await fetch(url, { method, headers, body: requestBody, signal: ctrl.signal });
     } catch (e) {
-      if (signal?.aborted) throw e;
-      const detail = e?.cause?.message || e?.message || String(e);
-      // Network-level failure: the request did not complete, so retrying is
-      // always safe. This covers DNS, TLS, connection-reset and timeout errors.
+      clearTimeout(timer);
+      signal?.removeEventListener?.('abort', onCallerAbort);
+      // A caller-initiated cancel (not our timeout) must not be retried.
+      if (signal?.aborted && !timedOut) throw e;
+      const detail = timedOut
+        ? `timed out after ${Math.round(effectiveTimeout / 1000)}s`
+        : (e?.cause?.message || e?.message || String(e));
+      // Network failure or timeout: the request did not complete, so retrying
+      // is safe. Covers DNS, TLS, connection-reset, and wedged-server hangs.
       if (attempt < retries) {
         await sleep(backoffMs(attempt));
         attempt += 1;
         continue;
       }
-      throw new GlashApiError(0, `Network request failed while calling ${method} ${path}: ${detail}`);
+      throw new GlashApiError(0, `Request failed while calling ${method} ${path}: ${detail}`);
     }
+    clearTimeout(timer);
+    signal?.removeEventListener?.('abort', onCallerAbort);
 
     if (!res.ok) {
       const retryAfter = retryAfterMs(res.headers);

package/lib/version.mjs

@@ -1 +1 @@
-export const VERSION = '0.2.21';
+export const VERSION = '0.2.22';

package/package.json

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