servyx-cli 0.1.12 → 0.1.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "servyx-cli",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "description": "Servyx CLI — Upload local projects and deploy via the Servyx platform",
   "type": "module",
   "bin": {

package/src/lib/api.js

@@ -64,18 +64,18 @@ function logApiResponse(response) {
 }
 
 export function logApiError({ method = 'REQUEST', url = 'unknown', err = null, response = null } = {}) {
-  console.error(pc.yellow('--- Servyx API error ---'));
-  console.error(pc.dim(`${method} ${url}`));
-  console.error(pc.dim(`API base: ${getApiBaseUrl()}`));
+  // console.error(pc.yellow('--- Servyx API error ---'));
+  // console.error(pc.dim(`${method} ${url}`));
+  // console.error(pc.dim(`API base: ${getApiBaseUrl()}`));
 
   if (response) {
-    console.error(pc.dim(`Status: ${response.status} ${response.statusText || ''}`));
+    // console.error(pc.dim(`Status: ${response.status} ${response.statusText || ''}`));
     const headers = response.headers || {};
     const contentType = headers['content-type'] || headers['Content-Type'];
     if (contentType) {
-      console.error(pc.dim(`Content-Type: ${contentType}`));
+      // console.error(pc.dim(`Content-Type: ${contentType}`));
     }
-    console.error(pc.dim(`Response body: ${summarizeBody(response.data)}`));
+    // console.error(pc.dim(`Response body: ${summarizeBody(response.data)}`));
   }
 
   if (err) {
@@ -86,9 +86,9 @@ export function logApiError({ method = 'REQUEST', url = 'unknown', err = null, r
     if (err.message) console.error(pc.dim(`Message: ${err.message}`));
     if (err.config && !response) {
       const reqUrl = err.config._servyxFullUrl || buildFullUrl(err.config.baseURL, err.config.url);
-      console.error(pc.dim(`Request: ${err.config.method?.toUpperCase() || 'REQUEST'} ${reqUrl}`));
+      // console.error(pc.dim(`Request: ${err.config.method?.toUpperCase() || 'REQUEST'} ${reqUrl}`));
       if (err.config.data != null) {
-        console.error(pc.dim(`Request body: ${summarizeBody(err.config.data)}`));
+        // console.error(pc.dim(`Request body: ${summarizeBody(err.config.data)}`));
       }
     }
   }
@@ -126,11 +126,37 @@ function attachLogging(client) {
   );
 }
 
-function createClient(token = getToken()) {
+const START_DEPLOY_TIMEOUT_MS = 180000;
+const NETWORK_RETRY_CODES = new Set(['ECONNRESET', 'ETIMEDOUT', 'ECONNABORTED']);
+
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+async function findRecentActiveDeployment(appId, maxAgeMs = 120000) {
+  try {
+    const client = createClient();
+    const response = await client.get(`/apps/${appId}/deployments`, { params: { limit: 5 } });
+    if (response.status < 200 || response.status >= 300) return null;
+
+    const deployments = response.data?.data?.deployments || [];
+    const cutoff = Date.now() - maxAgeMs;
+
+    return deployments.find((deployment) => {
+      if (!['pending', 'in_progress'].includes(deployment.status)) return false;
+      const createdAt = deployment.created_at ? new Date(deployment.created_at).getTime() : 0;
+      return createdAt >= cutoff;
+    }) || null;
+  } catch {
+    return null;
+  }
+}
+
+function createClient(token = getToken(), { timeout = 120000 } = {}) {
   const baseURL = `${getApiBaseUrl()}/api/v1/cli`;
   const client = axios.create({
     baseURL,
-    timeout: 120000,
+    timeout,
     headers: {
       'Content-Type': 'application/json',
       ...(token ? { Authorization: `Bearer ${token}` } : {}),
@@ -152,7 +178,9 @@ function mapNetworkError(err, meta = {}) {
       });
     }
     const hint = new Error(
-      `Cannot reach Servyx API at ${getApiBaseUrl()} (${err.code}). Is cli-service running?`,
+      err.code === 'ECONNRESET'
+        ? `Connection to ${getApiBaseUrl()} was reset (${err.code}). The deploy may still have started — retry status polling or check the dashboard. Common when redeploying cli-service itself.`
+        : `Cannot reach Servyx API at ${getApiBaseUrl()} (${err.code}). Is cli-service running?`,
     );
     hint.code = err.code;
     throw hint;
@@ -205,14 +233,39 @@ export async function startDeployment(appId, message, { withEnv = false } = {})
     message,
     with_env: withEnv || undefined,
   };
+  const url = buildFullUrl(`${getApiBaseUrl()}/api/v1/cli`, path);
+  const client = createClient(undefined, { timeout: START_DEPLOY_TIMEOUT_MS });
+
+  const postDeploy = () => client.post(path, body);
+
   try {
-    const client = createClient();
-    return unwrap(await client.post(path, body));
+    return unwrap(await postDeploy());
   } catch (err) {
+    if (NETWORK_RETRY_CODES.has(err?.code)) {
+      await sleep(1500);
+      try {
+        return unwrap(await postDeploy());
+      } catch (retryErr) {
+        err = retryErr;
+      }
+    }
+
+    if (NETWORK_RETRY_CODES.has(err?.code)) {
+      const deployment = await findRecentActiveDeployment(appId);
+      if (deployment) {
+        console.error(pc.yellow('Connection dropped after deploy was queued; continuing with the active deployment.'));
+        return {
+          success: true,
+          data: { deployment, queue_position: 1 },
+          message: 'CLI deployment queued',
+        };
+      }
+    }
+
     mapNetworkError(err, {
       method: 'POST',
       path,
-      url: buildFullUrl(`${getApiBaseUrl()}/api/v1/cli`, path),
+      url,
     });
   }
 }