servyx-cli 0.1.9 → 0.1.11

package/package.json

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

package/src/commands/deploy.js

@@ -5,23 +5,11 @@ import { loadProjectConfig, loadServyxIgnore } from '../lib/project.js';
 import { rsyncDeploy, sshPreflight, DEFAULT_RSYNC_EXCLUDES, preserveServerDotfiles, ensureRemoteDir, verifyRemoteStagingDir } from '../lib/rsync.js';
 
 const TERMINAL_STATUSES = new Set(['success', 'failure', 'cancelled']);
-const MIN_POLL_MS = 3000;
-const MAX_POLL_MS = 10000;
 
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
-function deploymentSnapshot(deployment) {
-  return [
-    deployment.status,
-    deployment.phase,
-    deployment.percent,
-    deployment.message,
-    deployment.error_message,
-  ].join('|');
-}
-
 function formatDeploymentLine(deployment) {
   const pct = deployment.percent != null ? `${deployment.percent}%` : '';
   const phase = deployment.phase || deployment.status || 'unknown';
@@ -161,36 +149,15 @@ export async function runDeploy(options = {}) {
 
   console.log(pc.dim(`Deployment ID: ${deploymentId}`));
 
-  let pollIntervalMs = MIN_POLL_MS;
-  let lastSnapshot = null;
-
   while (true) {
-    let statusResult;
-    try {
-      statusResult = await getDeployment(deploymentId);
-      pollIntervalMs = Math.min(MAX_POLL_MS, pollIntervalMs + 500);
-    } catch (err) {
-      if (err.status === 429 || err.code === 'RATE_LIMITED') {
-        const retryMs = (err.retryAfterSeconds || Math.ceil(pollIntervalMs / 1000)) * 1000;
-        pollIntervalMs = Math.min(MAX_POLL_MS * 2, Math.max(retryMs, pollIntervalMs * 2));
-        console.log(pc.yellow(`Rate limited — retrying in ${Math.ceil(pollIntervalMs / 1000)}s...`));
-        await sleep(pollIntervalMs);
-        continue;
-      }
-      throw err;
-    }
-
+    const statusResult = await getDeployment(appId, deploymentId);
     const current = statusResult?.data?.deployment;
     if (!current) {
       console.error(pc.red('Deployment not found while polling.'));
       process.exit(1);
     }
 
-    const snapshot = deploymentSnapshot(current);
-    if (snapshot !== lastSnapshot) {
-      console.log(formatDeploymentLine(current));
-      lastSnapshot = snapshot;
-    }
+    console.log(formatDeploymentLine(current));
 
     if (TERMINAL_STATUSES.has(current.status)) {
       if (current.status === 'success') {
@@ -205,6 +172,6 @@ export async function runDeploy(options = {}) {
       process.exit(1);
     }
 
-    await sleep(pollIntervalMs);
+    await sleep(2000);
   }
 }

package/src/lib/api.js

@@ -30,17 +30,16 @@ function unwrap(response) {
   if (response.status >= 200 && response.status < 300) {
     return response.data;
   }
-  const err = new Error(response.data?.error || response.statusText || 'Request failed');
+
+  const isHtml = typeof response.data === 'string' && response.data.includes('<html');
+  const message = isHtml
+    ? `API returned ${response.status} (expected JSON). Check SERVYX_API_URL / cli-service routing.`
+    : (response.data?.error || response.data?.message || response.statusText || 'Request failed');
+
+  const err = new Error(message);
   err.status = response.status;
   err.code = response.data?.code;
   err.data = response.data;
-  const retryAfter = response.headers?.['retry-after'];
-  if (retryAfter) {
-    const seconds = Number.parseInt(retryAfter, 10);
-    if (!Number.isNaN(seconds)) {
-      err.retryAfterSeconds = seconds;
-    }
-  }
   throw err;
 }
 
@@ -73,9 +72,9 @@ export async function startDeployment(appId, message, { withEnv = false } = {})
   }
 }
 
-export async function getDeployment(deploymentId) {
+export async function getDeployment(appId, deploymentId) {
   const client = createClient();
-  return unwrap(await client.get(`/deployments/${deploymentId}`));
+  return unwrap(await client.get(`/apps/${appId}/deployments/${deploymentId}`));
 }
 
 export async function listAppDeployments(appId, limit = 10) {