servyx-cli 0.1.8 → 0.1.9

package/README.md

@@ -72,4 +72,4 @@ Environment variables:
 3. Live dotfiles from `public` are copied into staging so they are not removed on deploy (`.env` is skipped when using `--with-env`)
 4. cli-service calls server-service to queue a CLI deployment (`with_env` tells the agent to sync uploaded env files)
 5. The agent syncs staging → public, preserving `.htaccess` and (by default) `.env` on the server
-6. The CLI listens on a live deploy stream (MQTT → cli-service SSE) until the deployment succeeds or fails, with slow HTTP fallback if streaming is unavailable
+6. The CLI polls until the deployment succeeds or fails

package/package.json

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

package/src/commands/deploy.js

@@ -1,12 +1,12 @@
 import pc from 'picocolors';
 import { getDeployTarget, getDeployment, startDeployment } from '../lib/api.js';
 import { getToken } from '../lib/config.js';
-import { watchDeploymentStream } from '../lib/deploy-stream.js';
 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 FALLBACK_POLL_MS = 15000;
+const MIN_POLL_MS = 3000;
+const MAX_POLL_MS = 10000;
 
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
@@ -161,57 +161,50 @@ export async function runDeploy(options = {}) {
 
   console.log(pc.dim(`Deployment ID: ${deploymentId}`));
 
+  let pollIntervalMs = MIN_POLL_MS;
   let lastSnapshot = null;
-  let current = deployment;
 
-  const handleDeploymentUpdate = (next) => {
-    current = next;
+  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 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;
     }
-  };
 
-  try {
-    await watchDeploymentStream(deploymentId, {
-      onUpdate: (next) => handleDeploymentUpdate(next),
-    });
-  } catch (streamError) {
-    if (streamError.code !== 'MQTT_UNAVAILABLE' && streamError.status !== 404) {
-      console.log(pc.yellow(`Live deploy stream unavailable (${streamError.message}). Falling back to slow status checks...`));
-    } else if (streamError.code === 'MQTT_UNAVAILABLE') {
-      console.log(pc.yellow('MQTT deploy stream unavailable. Falling back to slow status checks...'));
-    } else {
-      throw streamError;
-    }
+    if (TERMINAL_STATUSES.has(current.status)) {
+      if (current.status === 'success') {
+        console.log(pc.green('Deployment succeeded.'));
+        process.exit(0);
+      }
 
-    while (!TERMINAL_STATUSES.has(current?.status)) {
-      const statusResult = await getDeployment(deploymentId);
-      current = statusResult?.data?.deployment;
-      if (!current) {
-        console.error(pc.red('Deployment not found while checking status.'));
-        process.exit(1);
+      console.error(pc.red(`Deployment ${current.status}.`));
+      if (current.error_message) {
+        console.error(pc.red(current.error_message));
       }
-      handleDeploymentUpdate(current);
-      if (TERMINAL_STATUSES.has(current.status)) break;
-      await sleep(FALLBACK_POLL_MS);
+      process.exit(1);
     }
-  }
-
-  if (!current) {
-    console.error(pc.red('Deployment status unavailable.'));
-    process.exit(1);
-  }
-
-  if (current.status === 'success') {
-    console.log(pc.green('Deployment succeeded.'));
-    process.exit(0);
-  }
 
-  console.error(pc.red(`Deployment ${current.status}.`));
-  if (current.error_message) {
-    console.error(pc.red(current.error_message));
+    await sleep(pollIntervalMs);
   }
-  process.exit(1);
 }

package/src/lib/deploy-stream.js

@@ -1,99 +0,0 @@
-import { getApiBaseUrl, getToken } from './config.js';
-
-const TERMINAL_STATUSES = new Set(['success', 'failure', 'cancelled']);
-
-function parseSseChunk(buffer, onEvent) {
-  const blocks = buffer.split('\n\n');
-  const remainder = blocks.pop() || '';
-
-  for (const block of blocks) {
-    if (!block.trim()) continue;
-
-    let event = 'message';
-    let data = '';
-
-    for (const line of block.split('\n')) {
-      if (line.startsWith('event:')) {
-        event = line.slice(6).trim();
-      } else if (line.startsWith('data:')) {
-        data += line.slice(5).trim();
-      }
-    }
-
-    if (!data) continue;
-
-    try {
-      onEvent(event, JSON.parse(data));
-    } catch {
-      // Ignore malformed SSE frames
-    }
-  }
-
-  return remainder;
-}
-
-/**
- * Watch deployment progress over a single long-lived SSE stream backed by MQTT.
- */
-export async function watchDeploymentStream(deploymentId, { onUpdate, signal } = {}) {
-  const token = getToken();
-  if (!token) {
-    throw new Error('Not logged in');
-  }
-
-  const url = `${getApiBaseUrl()}/api/v1/cli/deployments/${deploymentId}/stream`;
-  const response = await fetch(url, {
-    headers: {
-      Authorization: `Bearer ${token}`,
-      Accept: 'text/event-stream',
-    },
-    signal,
-  });
-
-  if (!response.ok) {
-    const err = new Error(`Deploy stream failed (${response.status})`);
-    err.status = response.status;
-    throw err;
-  }
-
-  if (!response.body) {
-    throw new Error('Deploy stream response has no body');
-  }
-
-  const reader = response.body.getReader();
-  const decoder = new TextDecoder();
-  let buffer = '';
-  let latestDeployment = null;
-  let streamError = null;
-
-  while (true) {
-    const { done, value } = await reader.read();
-    if (done) break;
-
-    buffer += decoder.decode(value, { stream: true });
-    buffer = parseSseChunk(buffer, (event, payload) => {
-      if (event === 'snapshot' || event === 'progress' || event === 'done') {
-        latestDeployment = payload?.deployment || latestDeployment;
-        if (latestDeployment) {
-          onUpdate?.(latestDeployment, { event, payload });
-        }
-      }
-
-      if (event === 'error') {
-        const err = new Error(payload?.message || 'Deploy stream error');
-        err.code = payload?.code;
-        streamError = err;
-      }
-    });
-
-    if (streamError) {
-      throw streamError;
-    }
-  }
-
-  return latestDeployment;
-}
-
-export function isTerminalDeployment(deployment) {
-  return TERMINAL_STATUSES.has(deployment?.status);
-}