moontraze 2.0.6 → 2.0.7

package/lib/deploy.js

@@ -6,6 +6,75 @@ const chalk = require('chalk');
 const { getConfig, getProject } = require('./config');
 const { zipCwd } = require('./zip');
 
+/**
+ * Job status poll + Vercel-style gray progress
+ */
+async function waitForDeployJob({ apiUrl, token, jobId }) {
+  const start = Date.now();
+  const timeoutMs = 15 * 60 * 1000; // 15 min
+  let lastMessage = '';
+
+  const printProgress = (msg) => {
+    if (!msg || msg === lastMessage) return;
+    lastMessage = msg;
+    // same line update (gray)
+    process.stdout.write('\r\x1b[K' + chalk.gray('  ' + msg));
+  };
+
+  printProgress('Queued...');
+
+  while (Date.now() - start < timeoutMs) {
+    await new Promise((r) => setTimeout(r, 1500));
+
+    let data = {};
+    try {
+      const res = await fetch(
+        `${apiUrl}/api/hosting/deployments/job/${encodeURIComponent(jobId)}`,
+        { headers: { Authorization: `Bearer ${token}` } }
+      );
+      data = await res.json().catch(() => ({}));
+      if (!res.ok) {
+        throw new Error(data.error || `Status check failed (${res.status})`);
+      }
+    } catch (e) {
+      // network blip — keep polling
+      printProgress('Checking status...');
+      continue;
+    }
+
+    const state = data.state;
+    const progress = data.progress;
+
+    let message = 'Working...';
+    if (typeof progress === 'object' && progress?.message) {
+      message = progress.message;
+    } else if (typeof progress === 'number') {
+      message = `Building... ${progress}%`;
+    } else if (state === 'waiting' || state === 'delayed') {
+      message = 'Queued — waiting for worker...';
+    } else if (state === 'active') {
+      message = 'Building...';
+    } else if (state === 'completed') {
+      message = 'Done';
+    }
+
+    printProgress(message);
+
+    if (state === 'completed') {
+      process.stdout.write('\n');
+      return data.result || {};
+    }
+
+    if (state === 'failed') {
+      process.stdout.write('\n');
+      throw new Error(data.error || 'Deploy failed');
+    }
+  }
+
+  process.stdout.write('\n');
+  throw new Error('Deploy timed out. Check dashboard or try again.');
+}
+
 async function deploy({
   prod = true,
   projectName,
@@ -13,21 +82,19 @@ async function deploy({
   domain: domainArg,
 } = {}) {
   const cfg = getConfig();
-
   const api =
     apiUrlArg ||
     process.env.MOON_API ||
     cfg.apiUrl ||
     'https://api.moontraze.com';
-
   const domain =
     domainArg ||
     process.env.MOON_DOMAIN ||
     cfg.domain ||
     'moontraze.com';
-
   const token = cfg.token || process.env.MOON_TOKEN || null;
-  const label = process.env.MOON_LABEL || process.env.MOON_PLATFORM || 'Moontraze';
+  const label =
+    process.env.MOON_LABEL || process.env.MOON_PLATFORM || 'Moontraze';
 
   if (!token) {
     throw new Error(
@@ -63,7 +130,6 @@ async function deploy({
 
     spinner.text = 'Checking project...';
     let alreadyExists = false;
-
     try {
       const statusRes = await fetch(`${api}/api/hosting/status/${name}`, {
         headers: { Authorization: `Bearer ${token}` },
@@ -72,9 +138,7 @@ async function deploy({
         const statusData = await statusRes.json();
         alreadyExists = !!statusData.exists;
       }
-    } catch (_) {
-      // assume new
-    }
+    } catch (_) {}
 
     spinner.text = `Uploading (${mb} MB)...`;
 
@@ -86,9 +150,9 @@ async function deploy({
     });
     form.append('redeploy', alreadyExists ? 'true' : 'false');
 
-    const endpoint = alreadyExists
-      ? `${api}/api/hosting/redeploy`
-      : `${api}/api/hosting/deploy`;
+    // Always use /deploy — backend queue handle karega
+    // (redeploy bhi same endpoint se queue ho sakta hai)
+    const endpoint = `${api}/api/hosting/deploy`;
 
     const res = await fetch(endpoint, {
       method: 'POST',
@@ -107,15 +171,47 @@ async function deploy({
       data = { error: text };
     }
 
-    const sec = ((Date.now() - t0) / 1000).toFixed(1);
+    // ---------- Queued (new flow) ----------
+    if (res.status === 202 && data.jobId) {
+      spinner.stop();
+      console.log(chalk.gray(`  Upload done — build starting...`));
+      console.log('');
 
+      const result = await waitForDeployJob({
+        apiUrl: api,
+        token,
+        jobId: data.jobId,
+      });
+
+      const sec = ((Date.now() - t0) / 1000).toFixed(1);
+      const url =
+        result?.url || data.url || `https://${name}.${domain}`;
+
+      console.log('');
+      console.log(chalk.green(`  Production  ${url}`));
+      if (result?.version || data.deployment?.version) {
+        console.log(
+          chalk.gray(
+            `  Version     ${result?.version || data.deployment?.version}`
+          )
+        );
+      }
+      console.log(chalk.gray(`  Time        ${sec}s`));
+      console.log(
+        chalk.green(alreadyExists || data.redeploy ? '✓ Redeployed' : '✓ Deployed')
+      );
+      console.log('');
+      return result;
+    }
+
+    // ---------- Old sync success (fallback) ----------
+    const sec = ((Date.now() - t0) / 1000).toFixed(1);
     if (!res.ok) {
       spinner.fail(`Failed (${sec}s)`);
       throw new Error(data.error || `HTTP ${res.status}`);
     }
 
     spinner.succeed(`Ready in ${sec}s`);
-
     const url = data.url || `https://${name}.${domain}`;
     console.log('');
     console.log(chalk.green(`  Production  ${url}`));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "moontraze",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "description": "Deploy to Moontraze hosting",
   "main": "./bin/moontraze.js",
   "bin": {