moontraze 1.0.0 → 1.0.2

package/bin/moontraze.js

@@ -10,13 +10,13 @@ const program = new Command();
 program
   .name('moontraze')
   .description('Deploy sites to Moontraze hosting')
-  .version('1.0.0');
+  .version('1.0.2');
 
 // npx moontraze login
 program
   .command('login')
-  .description('Save your API token (from app dashboard)')
-  .option('--token <jwt>', 'JWT token (or prompt)')
+  .description('Log in with email/password or MoonID')
+  .option('--token <jwt>', 'JWT token (advanced, skip interactive login)')
   .action(async (opts) => {
     try {
       await login(opts.token);
@@ -49,8 +49,14 @@ program
       if (!projectName) process.exit(1);
       projectName = projectName.toLowerCase().replace(/[^a-z0-9-]/g, '');
       setProject({ projectName });
-      console.log(chalk.green(`Linked → ${projectName}.${getConfig().domain || 'frelanceo.com'}`));
-      console.log(chalk.gray('(saved .moontraze/project.json — same as .vercel)'));
+      console.log(
+        chalk.green(
+          `Linked → ${projectName}.${getConfig().domain || 'frelanceo.com'}`
+        )
+      );
+      console.log(
+        chalk.gray('(saved .moontraze/project.json — same as .vercel)')
+      );
     } catch (e) {
       console.error(chalk.red(e.message));
       process.exit(1);
@@ -58,7 +64,6 @@ program
   });
 
 // npx moontraze deploy --prod
-// also: npx moontraze --prod  (vercel style)
 async function runDeploy(opts) {
   try {
     await deploy({
@@ -85,7 +90,6 @@ program
   .option('--production', 'Deploy to production')
   .option('-p, --project <name>', 'Project name')
   .action(async (opts, cmd) => {
-    // only if no subcommand
     if (cmd.args?.length) return;
     if (opts.prod || opts.production || opts.project) {
       await runDeploy(opts);

package/lib/auth.js

@@ -1,38 +1,221 @@
 const prompts = require('prompts');
 const chalk = require('chalk');
+const http = require('http');
+const { URL } = require('url');
 const { setConfig, getConfig } = require('./config');
 
 async function login(tokenArg) {
-  let token = tokenArg;
-  if (!token) {
-    console.log(chalk.cyan('Moontraze Login'));
-    console.log(chalk.gray('Open app → copy JWT from localStorage "token" (or Settings)'));
-    console.log('');
-    const a = await prompts({
+  // Power user: --token still works (hidden)
+  if (tokenArg && String(tokenArg).trim()) {
+    return saveAndValidateToken(String(tokenArg).trim());
+  }
+
+  console.log('');
+  console.log(chalk.cyan('Moontraze Login'));
+  console.log('');
+
+  const { method } = await prompts({
+    type: 'select',
+    name: 'method',
+    message: 'How do you want to log in?',
+    choices: [
+      { title: 'Email & Password', value: 'email' },
+      { title: 'MoonID (scan QR with app)', value: 'moonid' },
+    ],
+  });
+
+  if (!method) {
+    throw new Error('Login cancelled');
+  }
+
+  if (method === 'email') {
+    await loginWithEmail();
+  } else {
+    await loginWithMoonID();
+  }
+}
+
+async function loginWithEmail() {
+  const answers = await prompts([
+    {
+      type: 'text',
+      name: 'email',
+      message: 'Email',
+      validate: (v) =>
+        v && v.includes('@') ? true : 'Enter a valid email',
+    },
+    {
       type: 'password',
-      name: 'token',
-      message: 'Paste token',
-    });
-    token = a.token;
+      name: 'password',
+      message: 'Password',
+      validate: (v) => (v && v.length >= 1 ? true : 'Password required'),
+    },
+  ]);
+
+  if (!answers.email || !answers.password) {
+    throw new Error('Login cancelled');
   }
-  if (!token || !String(token).trim()) {
-    throw new Error('Token required');
+
+  const cfg = getConfig();
+  const fetch = require('node-fetch');
+
+  const res = await fetch(`${cfg.apiUrl}/api/platform/login`, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({
+      email: answers.email.trim(),
+      password: answers.password,
+    }),
+  });
+
+  const data = await res.json().catch(() => ({}));
+
+  if (!res.ok) {
+    throw new Error(data.error || 'Invalid email or password');
   }
-  token = String(token).trim();
 
+  if (!data.token) {
+    throw new Error('Login succeeded but no token returned');
+  }
+
+  setConfig({ token: data.token });
+  console.log('');
+  console.log(chalk.green('✓ Logged in'));
+  if (data.user?.email) {
+    console.log(chalk.gray(`  ${data.user.email}`));
+  }
+  console.log(chalk.gray(`  Config: ~/.moontraze/config.json`));
+  console.log('');
+}
+
+async function loginWithMoonID() {
+  const cfg = getConfig();
+  const state = Math.random().toString(36).substring(2, 12);
+  const port = 17321 + Math.floor(Math.random() * 100);
+  const redirectUri = `http://127.0.0.1:${port}/callback`;
+
+  const appId = 'com.moonstorage.app';
+  const deepLink =
+    `moonid://auth` +
+    `?app_id=${encodeURIComponent(appId)}` +
+    `&action=login` +
+    `&redirect_uri=${encodeURIComponent(redirectUri)}` +
+    `&state=${encodeURIComponent(state)}`;
+
+  const qrImageUrl = `https://api.qrserver.com/v1/create-qr-code/?size=220x220&data=${encodeURIComponent(
+    deepLink
+  )}`;
+
+  console.log('');
+  console.log(chalk.cyan('MoonID Login'));
+  console.log(chalk.gray('1. Open MoonID app on your phone'));
+  console.log(chalk.gray('2. Scan the QR code (open link below in browser)'));
+  console.log(chalk.gray('3. Approve login'));
+  console.log('');
+  console.log(chalk.yellow('QR code image:'));
+  console.log(chalk.underline(qrImageUrl));
+  console.log('');
+  console.log(chalk.gray('Deep link (if needed):'));
+  console.log(chalk.gray(deepLink));
+  console.log('');
+  console.log(chalk.gray('Waiting for approval... (Ctrl+C to cancel)'));
+  console.log('');
+
+  // Local server — MoonID redirect yahan aayega
+  const token = await waitForMoonIDCallback({ port, state, timeoutMs: 120000 });
+
+  if (!token) {
+    throw new Error('MoonID login timed out or denied');
+  }
+
+  await saveAndValidateToken(token);
+}
+
+function waitForMoonIDCallback({ port, state, timeoutMs }) {
+  return new Promise((resolve, reject) => {
+    const server = http.createServer((req, res) => {
+      try {
+        const u = new URL(req.url, `http://127.0.0.1:${port}`);
+
+        if (u.pathname !== '/callback') {
+          res.writeHead(404);
+          res.end('Not found');
+          return;
+        }
+
+        const returnedState = u.searchParams.get('state');
+        const token =
+          u.searchParams.get('token') ||
+          u.searchParams.get('access_token') ||
+          u.searchParams.get('jwt');
+        const error = u.searchParams.get('error');
+
+        if (error) {
+          res.writeHead(200, { 'Content-Type': 'text/html' });
+          res.end(
+            '<html><body style="font-family:sans-serif;text-align:center;padding:40px"><h2>Login denied</h2><p>You can close this tab.</p></body></html>'
+          );
+          server.close();
+          resolve(null);
+          return;
+        }
+
+        if (returnedState && returnedState !== state) {
+          res.writeHead(400, { 'Content-Type': 'text/plain' });
+          res.end('Invalid state');
+          return;
+        }
+
+        if (!token) {
+          res.writeHead(400, { 'Content-Type': 'text/html' });
+          res.end(
+            '<html><body style="font-family:sans-serif;text-align:center;padding:40px"><h2>No token received</h2><p>Close this tab and try again.</p></body></html>'
+          );
+          return;
+        }
+
+        res.writeHead(200, { 'Content-Type': 'text/html' });
+        res.end(
+          '<html><body style="font-family:sans-serif;text-align:center;padding:40px"><h2>✓ Login successful</h2><p>You can close this tab and return to the terminal.</p></body></html>'
+        );
+        server.close();
+        resolve(token);
+      } catch (e) {
+        res.writeHead(500);
+        res.end('Error');
+      }
+    });
+
+    server.listen(port, '127.0.0.1');
+
+    const timer = setTimeout(() => {
+      try {
+        server.close();
+      } catch (_) {}
+      resolve(null);
+    }, timeoutMs);
+
+    server.on('close', () => clearTimeout(timer));
+  });
+}
+
+async function saveAndValidateToken(token) {
   const cfg = getConfig();
-  // optional: validate token
   const fetch = require('node-fetch');
+
   const res = await fetch(`${cfg.apiUrl}/api/hosting/quota`, {
     headers: { Authorization: `Bearer ${token}` },
   });
+
   if (res.status === 401) {
     throw new Error('Invalid or expired token');
   }
-  // 403/200 both ok enough for login store
+
   setConfig({ token });
+  console.log('');
   console.log(chalk.green('✓ Logged in'));
-  console.log(chalk.gray(`Config: ~/.moontraze/config.json`));
+  console.log(chalk.gray(`  Config: ~/.moontraze/config.json`));
+  console.log('');
 }
 
 module.exports = { login };

package/lib/deploy.js

@@ -14,7 +14,10 @@ async function deploy({ prod = true, projectName } = {}) {
   }
 
   const linked = getProject();
-  const name = (projectName || linked?.projectName || '').toLowerCase().replace(/[^a-z0-9-]/g, '');
+  const name = (projectName || linked?.projectName || '')
+    .toLowerCase()
+    .replace(/[^a-z0-9-]/g, '');
+
   if (!name || name.length < 3) {
     throw new Error('No project linked. Run: npx moontraze link my-site');
   }
@@ -24,28 +27,54 @@ async function deploy({ prod = true, projectName } = {}) {
 
   console.log('');
   console.log(chalk.cyan('Moontraze'));
-  console.log(`  Inspect  ${api}`);
-  console.log(`  Project  ${name}`);
-  console.log(`  Target   https://${name}.${domain}`);
+  console.log(` Inspect ${api}`);
+  console.log(` Project ${name}`);
+  console.log(` Target https://${name}.${domain}`);
   console.log('');
 
   const spinner = ora('Packaging...').start();
   const t0 = Date.now();
   let zipPath;
+
   try {
     zipPath = await zipCwd();
     const mb = (fs.statSync(zipPath).size / 1024 / 1024).toFixed(2);
+    spinner.text = `Checking project...`;
+
+    // 1. Pehle check karo project already exist karta hai ya nahi
+    let alreadyExists = false;
+    try {
+      const statusRes = await fetch(`${api}/api/hosting/status/${name}`, {
+        headers: { Authorization: `Bearer ${cfg.token}` },
+      });
+      if (statusRes.ok) {
+        const statusData = await statusRes.json();
+        alreadyExists = !!statusData.exists;
+      }
+    } catch (_) {
+      // status fail → assume new
+    }
+
     spinner.text = `Uploading (${mb} MB)...`;
 
     const form = new FormData();
     form.append('projectName', name);
-    form.append('redeploy', prod ? 'true' : 'true'); // always overwrite for existing
     form.append('file', fs.createReadStream(zipPath), {
       filename: `${name}.zip`,
       contentType: 'application/zip',
     });
 
-    const res = await fetch(`${api}/api/hosting/deploy`, {
+    // 2. Exist karta hai to /redeploy, nahi to /deploy
+    const endpoint = alreadyExists
+      ? `${api}/api/hosting/redeploy`
+      : `${api}/api/hosting/deploy`;
+
+    // /deploy pe redeploy flag bhejo (safety)
+    if (!alreadyExists) {
+      form.append('redeploy', 'false');
+    }
+
+    const res = await fetch(endpoint, {
       method: 'POST',
       headers: {
         Authorization: `Bearer ${cfg.token}`,
@@ -71,12 +100,15 @@ async function deploy({ prod = true, projectName } = {}) {
 
     spinner.succeed(`Ready in ${sec}s`);
     const url = data.url || `https://${name}.${domain}`;
+
     console.log('');
-    console.log(chalk.green(`  Production ${url}`));
+    console.log(chalk.green(` Production ${url}`));
     if (data.deployment?.version) {
-      console.log(chalk.gray(`  Version    ${data.deployment.version}`));
+      console.log(chalk.gray(` Version ${data.deployment.version}`));
     }
-    console.log(chalk.green(`✓ Deployed`));
+    console.log(
+      chalk.green(alreadyExists ? '✓ Redeployed' : '✓ Deployed')
+    );
     console.log('');
   } finally {
     if (zipPath && fs.existsSync(zipPath)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "moontraze",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Deploy to Moontraze hosting — like vercel CLI",
   "bin": {
     "moontraze": "./bin/moontraze.js"