moontraze 2.0.7 → 2.0.8

package/lib/deploy.js

@@ -17,7 +17,6 @@ async function waitForDeployJob({ apiUrl, token, jobId }) {
   const printProgress = (msg) => {
     if (!msg || msg === lastMessage) return;
     lastMessage = msg;
-    // same line update (gray)
     process.stdout.write('\r\x1b[K' + chalk.gray('  ' + msg));
   };
 
@@ -37,15 +36,14 @@ async function waitForDeployJob({ apiUrl, token, jobId }) {
         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') {
@@ -64,7 +62,6 @@ async function waitForDeployJob({ apiUrl, token, jobId }) {
       process.stdout.write('\n');
       return data.result || {};
     }
-
     if (state === 'failed') {
       process.stdout.write('\n');
       throw new Error(data.error || 'Deploy failed');
@@ -105,7 +102,10 @@ async function deploy({
   const linked = getProject();
   const name = (projectName || linked?.projectName || '')
     .toLowerCase()
-    .replace(/[^a-z0-9-]/g, '');
+    .trim()
+    .replace(/[^a-z0-9-]/g, '-')
+    .replace(/-+/g, '-')
+    .replace(/^-|-$/g, '');
 
   if (!name || name.length < 3) {
     throw new Error(
@@ -117,8 +117,6 @@ async function deploy({
   console.log(chalk.cyan(label));
   console.log(`  API      ${api}`);
   console.log(`  Project  ${name}`);
-  console.log(`  Target   https://${name}.${domain}`);
-  console.log('');
 
   const spinner = ora('Packaging...').start();
   const t0 = Date.now();
@@ -128,19 +126,47 @@ async function deploy({
     zipPath = await zipCwd();
     const mb = (fs.statSync(zipPath).size / 1024 / 1024).toFixed(2);
 
+    // -------- Check if project already exists --------
     spinner.text = 'Checking project...';
     let alreadyExists = false;
+    let existingUrl = null;
+    let hostLabel = null;
+
     try {
-      const statusRes = await fetch(`${api}/api/hosting/status/${name}`, {
-        headers: { Authorization: `Bearer ${token}` },
-      });
-      if (statusRes.ok) {
-        const statusData = await statusRes.json();
-        alreadyExists = !!statusData.exists;
+      const statusRes = await fetch(
+        `${api}/api/hosting/status/${encodeURIComponent(name)}`,
+        { headers: { Authorization: `Bearer ${token}` } }
+      );
+      const statusData = await statusRes.json().catch(() => ({}));
+
+      // exists true = deployed / building / failed (status API fix ke baad)
+      if (statusRes.ok && statusData.exists) {
+        alreadyExists = true;
+        existingUrl = statusData.primaryUrl || statusData.url || null;
+        hostLabel = statusData.hostLabel || null;
       }
-    } catch (_) {}
+    } catch (_) {
+      // network fail → backend khud decide karega
+    }
+
+    // Target URL dikhao
+    const previewUrl =
+      existingUrl ||
+      (hostLabel
+        ? `https://${hostLabel}.${domain}`
+        : `https://${name}.${domain}`);
+    spinner.stop();
+    console.log(`  Target   ${previewUrl}`);
+    console.log(
+      chalk.gray(
+        alreadyExists
+          ? '  Mode     Redeploy (existing project)'
+          : '  Mode     New deploy'
+      )
+    );
+    console.log('');
 
-    spinner.text = `Uploading (${mb} MB)...`;
+    spinner.start(`Uploading (${mb} MB)...`);
 
     const form = new FormData();
     form.append('projectName', name);
@@ -148,12 +174,10 @@ async function deploy({
       filename: `${name}.zip`,
       contentType: 'application/zip',
     });
+    // Backend bhi force-redeploy karta hai agar same name exist kare
     form.append('redeploy', alreadyExists ? 'true' : 'false');
 
-    // 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',
       headers: {
@@ -171,10 +195,10 @@ async function deploy({
       data = { error: text };
     }
 
-    // ---------- Queued (new flow) ----------
+    // ---------- Queued flow ----------
     if (res.status === 202 && data.jobId) {
       spinner.stop();
-      console.log(chalk.gray(`  Upload done — build starting...`));
+      console.log(chalk.gray('  Upload done — build starting...'));
       console.log('');
 
       const result = await waitForDeployJob({
@@ -185,7 +209,13 @@ async function deploy({
 
       const sec = ((Date.now() - t0) / 1000).toFixed(1);
       const url =
-        result?.url || data.url || `https://${name}.${domain}`;
+        result?.url ||
+        existingUrl ||
+        data.url ||
+        `https://${name}.${domain}`;
+
+      const wasRedeploy =
+        alreadyExists || data.redeploy === true || result?.redeploy === true;
 
       console.log('');
       console.log(chalk.green(`  Production  ${url}`));
@@ -197,14 +227,12 @@ async function deploy({
         );
       }
       console.log(chalk.gray(`  Time        ${sec}s`));
-      console.log(
-        chalk.green(alreadyExists || data.redeploy ? '✓ Redeployed' : '✓ Deployed')
-      );
+      console.log(chalk.green(wasRedeploy ? '✓ Redeployed' : '✓ Deployed'));
       console.log('');
       return result;
     }
 
-    // ---------- Old sync success (fallback) ----------
+    // ---------- Sync fallback ----------
     const sec = ((Date.now() - t0) / 1000).toFixed(1);
     if (!res.ok) {
       spinner.fail(`Failed (${sec}s)`);
@@ -212,14 +240,17 @@ async function deploy({
     }
 
     spinner.succeed(`Ready in ${sec}s`);
-    const url = data.url || `https://${name}.${domain}`;
+    const url = data.url || existingUrl || `https://${name}.${domain}`;
     console.log('');
     console.log(chalk.green(`  Production  ${url}`));
     if (data.deployment?.version) {
       console.log(chalk.gray(`  Version     ${data.deployment.version}`));
     }
-    console.log(chalk.green(alreadyExists ? '✓ Redeployed' : '✓ Deployed'));
+    console.log(
+      chalk.green(alreadyExists || data.redeploy ? '✓ Redeployed' : '✓ Deployed')
+    );
     console.log('');
+    return data;
   } finally {
     if (zipPath && fs.existsSync(zipPath)) {
       try {

package/package.json

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