moontraze 1.0.4 → 1.0.6

package/bin/moontraze.js

@@ -2,31 +2,37 @@
 const { Command } = require('commander');
 const chalk = require('chalk');
 const { login } = require('../lib/auth');
-const { getConfig, getProject, setProject } = require('../lib/config');
+const { getConfig, setConfig, getProject, setProject } = require('../lib/config');
 const { deploy } = require('../lib/deploy');
 
 const program = new Command();
 
+// Moon CLI se aata hai
+const platformName = process.env.MOON_PLATFORM || 'moontraze';
+const apiUrl = process.env.MOON_API || getConfig().apiUrl || 'https://api.moontraze.com';
+const domain = process.env.MOON_DOMAIN || getConfig().domain || 'moontraze.com';
+
 program
-  .name('moontraze')
-  .description('Deploy sites to Moontraze hosting (moontraze.com)')
-  .version('1.0.3');
+  .name(platformName)
+  .description(`Deploy sites using ${platformName}`)
+  .version('1.0.5');
 
-// moon moontraze login  |  npx moontraze login
+// login
 program
   .command('login')
   .description('Log in with email/password or token')
-  .option('--token <jwt>', 'JWT token (advanced, skip interactive login)')
+  .option('--token <jwt>', 'JWT token (skip interactive login)')
   .action(async (opts) => {
     try {
-      await login(opts.token);
+      await login(opts.token, { apiUrl });
+      console.log(chalk.green(`✓ Logged in to ${platformName}`));
     } catch (e) {
       console.error(chalk.red('Login failed:'), e.message);
       process.exit(1);
     }
   });
 
-// moon moontraze link [name]
+// link
 program
   .command('link [name]')
   .description('Link this folder to a hosting project name')
@@ -49,22 +55,22 @@ program
       if (!projectName) process.exit(1);
       projectName = projectName.toLowerCase().replace(/[^a-z0-9-]/g, '');
       setProject({ projectName });
-      const domain = getConfig().domain || 'moontraze.com';
       console.log(chalk.green(`Linked → ${projectName}.${domain}`));
-      console.log(
-        chalk.gray('(saved .moontraze/project.json — same as .vercel)')
-      );
+      console.log(chalk.gray('(saved .moontraze/project.json)'));
     } catch (e) {
       console.error(chalk.red(e.message));
       process.exit(1);
     }
   });
 
+// deploy
 async function runDeploy(opts) {
   try {
     await deploy({
       prod: !!(opts.prod || opts.production),
       projectName: opts.project || opts.name,
+      apiUrl,
+      domain,
     });
   } catch (e) {
     console.error(chalk.red('\nDeploy failed:'), e.message);
@@ -80,7 +86,6 @@ program
   .option('-p, --project <name>', 'Project name (or use link)')
   .action(runDeploy);
 
-// moon moontraze --prod
 program
   .option('--prod', 'Deploy to production')
   .option('--production', 'Deploy to production')
@@ -98,14 +103,10 @@ program.addHelpText(
   'after',
   `
 Examples:
-  npx moontraze login
-  npx moontraze link my-site
-  npx moontraze deploy --prod
-
-  moon moontraze login
-  moon moontraze link my-site
-  moon moontraze deploy --prod
-  moon moontraze --prod
+  moon ${platformName} login
+  moon ${platformName} link my-site
+  moon ${platformName} deploy --prod
+  moon ${platformName} --prod
 `
 );
 

package/lib/auth.js

@@ -2,16 +2,24 @@ const prompts = require('prompts');
 const chalk = require('chalk');
 const http = require('http');
 const { URL } = require('url');
-const { setConfig, getConfig } = require('./config');
+const { getConfig, setConfig } = require('./config');
 
-async function login(tokenArg) {
-  // Power user: --token still works (hidden)
+async function login(tokenArg, options = {}) {
+  const apiUrl =
+    options.apiUrl ||
+    process.env.MOON_API ||
+    getConfig().apiUrl ||
+    'https://api.moontraze.com';
+
+  const label = process.env.MOON_LABEL || process.env.MOON_PLATFORM || 'Moontraze';
+
+  // --token (hidden power user)
   if (tokenArg && String(tokenArg).trim()) {
-    return saveAndValidateToken(String(tokenArg).trim());
+    return saveAndValidateToken(String(tokenArg).trim(), { apiUrl, label });
   }
 
   console.log('');
-  console.log(chalk.cyan('Moontraze Login'));
+  console.log(chalk.cyan(`${label} Login`));
   console.log('');
 
   const { method } = await prompts({
@@ -24,25 +32,22 @@ async function login(tokenArg) {
     ],
   });
 
-  if (!method) {
-    throw new Error('Login cancelled');
-  }
+  if (!method) throw new Error('Login cancelled');
 
   if (method === 'email') {
-    await loginWithEmail();
+    await loginWithEmail({ apiUrl, label });
   } else {
-    await loginWithMoonID();
+    await loginWithMoonID({ apiUrl, label });
   }
 }
 
-async function loginWithEmail() {
+async function loginWithEmail({ apiUrl, label }) {
   const answers = await prompts([
     {
       type: 'text',
       name: 'email',
       message: 'Email',
-      validate: (v) =>
-        v && v.includes('@') ? true : 'Enter a valid email',
+      validate: (v) => (v && v.includes('@') ? true : 'Enter a valid email'),
     },
     {
       type: 'password',
@@ -56,10 +61,8 @@ async function loginWithEmail() {
     throw new Error('Login cancelled');
   }
 
-  const cfg = getConfig();
   const fetch = require('node-fetch');
-
-  const res = await fetch(`${cfg.apiUrl}/api/platform/login`, {
+  const res = await fetch(`${apiUrl}/api/platform/login`, {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
     body: JSON.stringify({
@@ -70,31 +73,24 @@ async function loginWithEmail() {
 
   const data = await res.json().catch(() => ({}));
 
-  if (!res.ok) {
-    throw new Error(data.error || 'Invalid email or password');
-  }
+  if (!res.ok) throw new Error(data.error || 'Invalid email or password');
+  if (!data.token) throw new Error('Login succeeded but no token returned');
 
-  if (!data.token) {
-    throw new Error('Login succeeded but no token returned');
-  }
+  setConfig({ token: data.token, apiUrl });
 
-  setConfig({ token: data.token });
   console.log('');
   console.log(chalk.green('✓ Logged in'));
-  if (data.user?.email) {
-    console.log(chalk.gray(`  ${data.user.email}`));
-  }
+  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();
+async function loginWithMoonID({ apiUrl, label }) {
   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)}` +
@@ -107,7 +103,7 @@ async function loginWithMoonID() {
   )}`;
 
   console.log('');
-  console.log(chalk.cyan('MoonID Login'));
+  console.log(chalk.cyan(`${label} — 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'));
@@ -115,28 +111,20 @@ async function loginWithMoonID() {
   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');
 
-  if (!token) {
-    throw new Error('MoonID login timed out or denied');
-  }
-
-  await saveAndValidateToken(token);
+  await saveAndValidateToken(token, { apiUrl, label });
 }
 
 function waitForMoonIDCallback({ port, state, timeoutMs }) {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve) => {
     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');
@@ -169,41 +157,37 @@ function waitForMoonIDCallback({ port, state, timeoutMs }) {
         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>'
+            '<html><body style="font-family:sans-serif;text-align:center;padding:40px"><h2>No token received</h2></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>'
+          '<html><body style="font-family:sans-serif;text-align:center;padding:40px"><h2>✓ Login successful</h2><p>You can close this tab.</p></body></html>'
         );
         server.close();
         resolve(token);
-      } catch (e) {
+      } catch {
         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();
+async function saveAndValidateToken(token, { apiUrl, label }) {
   const fetch = require('node-fetch');
-
-  const res = await fetch(`${cfg.apiUrl}/api/hosting/quota`, {
+  const res = await fetch(`${apiUrl}/api/hosting/quota`, {
     headers: { Authorization: `Bearer ${token}` },
   });
 
@@ -211,7 +195,8 @@ async function saveAndValidateToken(token) {
     throw new Error('Invalid or expired token');
   }
 
-  setConfig({ token });
+  setConfig({ token, apiUrl });
+
   console.log('');
   console.log(chalk.green('✓ Logged in'));
   console.log(chalk.gray(`  Config: ~/.moontraze/config.json`));

package/lib/config.js

@@ -13,27 +13,14 @@ function ensureDir(d) {
 
 const DEFAULTS = {
   token: null,
-  apiUrl: process.env.MOONTRAZE_API || 'https://api.moontraze.com',
-  domain: process.env.MOONTRAZE_DOMAIN || 'moontraze.com',
+  apiUrl: process.env.MOON_API || 'https://api.moontraze.com',
+  domain: process.env.MOON_DOMAIN || 'moontraze.com',
 };
 
-function migrate(cfg) {
-  const next = { ...DEFAULTS, ...cfg };
-  // old frelanceo → moontraze
-  if (next.apiUrl && String(next.apiUrl).includes('frelanceo')) {
-    next.apiUrl = DEFAULTS.apiUrl;
-  }
-  if (next.domain && String(next.domain).includes('frelanceo')) {
-    next.domain = DEFAULTS.domain;
-  }
-  return next;
-}
-
 function getConfig() {
   try {
     if (fs.existsSync(GLOBAL_FILE)) {
-      const saved = JSON.parse(fs.readFileSync(GLOBAL_FILE, 'utf8'));
-      return migrate(saved);
+      return { ...DEFAULTS, ...JSON.parse(fs.readFileSync(GLOBAL_FILE, 'utf8')) };
     }
   } catch (_) {}
   return { ...DEFAULTS };
@@ -41,7 +28,7 @@ function getConfig() {
 
 function setConfig(partial) {
   ensureDir(GLOBAL_DIR);
-  const next = migrate({ ...getConfig(), ...partial });
+  const next = { ...getConfig(), ...partial };
   fs.writeFileSync(GLOBAL_FILE, JSON.stringify(next, null, 2));
   return next;
 }

package/lib/deploy.js

@@ -1,5 +1,4 @@
 const fs = require('fs');
-const path = require('path');
 const fetch = require('node-fetch');
 const FormData = require('form-data');
 const ora = require('ora');
@@ -7,11 +6,32 @@ const chalk = require('chalk');
 const { getConfig, getProject } = require('./config');
 const { zipCwd } = require('./zip');
 
-async function deploy({ prod = true, projectName } = {}) {
+async function deploy({
+  prod = true,
+  projectName,
+  apiUrl: apiUrlArg,
+  domain: domainArg,
+} = {}) {
   const cfg = getConfig();
-  if (!cfg.token) {
+
+  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';
+
+  if (!token) {
     throw new Error(
-      'Not logged in. Run: moon moontraze login  (or: npx moontraze login)'
+      'Not logged in. Run: moon moontraze login\n  or: npx moontraze login'
     );
   }
 
@@ -19,18 +39,16 @@ async function deploy({ prod = true, projectName } = {}) {
   const name = (projectName || linked?.projectName || '')
     .toLowerCase()
     .replace(/[^a-z0-9-]/g, '');
+
   if (!name || name.length < 3) {
     throw new Error(
-      'No project linked. Run: moon moontraze link my-site  (or: npx moontraze link my-site)'
+      'No project linked. Run: moon moontraze link my-site\n  or: npx moontraze link my-site'
     );
   }
 
-  const domain = cfg.domain || 'moontraze.com';
-  const api = cfg.apiUrl || 'https://api.moontraze.com';
-
   console.log('');
-  console.log(chalk.cyan('Moontraze'));
-  console.log(`  Inspect  ${api}`);
+  console.log(chalk.cyan(label));
+  console.log(`  API      ${api}`);
   console.log(`  Project  ${name}`);
   console.log(`  Target   https://${name}.${domain}`);
   console.log('');
@@ -45,9 +63,10 @@ async function deploy({ prod = true, projectName } = {}) {
 
     spinner.text = 'Checking project...';
     let alreadyExists = false;
+
     try {
       const statusRes = await fetch(`${api}/api/hosting/status/${name}`, {
-        headers: { Authorization: `Bearer ${cfg.token}` },
+        headers: { Authorization: `Bearer ${token}` },
       });
       if (statusRes.ok) {
         const statusData = await statusRes.json();
@@ -65,22 +84,16 @@ async function deploy({ prod = true, projectName } = {}) {
       filename: `${name}.zip`,
       contentType: 'application/zip',
     });
+    form.append('redeploy', alreadyExists ? 'true' : 'false');
 
-    // existing → redeploy; new → deploy
     const endpoint = alreadyExists
       ? `${api}/api/hosting/redeploy`
       : `${api}/api/hosting/deploy`;
 
-    if (alreadyExists) {
-      form.append('redeploy', 'true');
-    } else {
-      form.append('redeploy', 'false');
-    }
-
     const res = await fetch(endpoint, {
       method: 'POST',
       headers: {
-        Authorization: `Bearer ${cfg.token}`,
+        Authorization: `Bearer ${token}`,
         ...form.getHeaders(),
       },
       body: form,
@@ -102,15 +115,14 @@ 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}`));
     if (data.deployment?.version) {
       console.log(chalk.gray(`  Version     ${data.deployment.version}`));
     }
-    console.log(
-      chalk.green(alreadyExists ? '✓ Redeployed' : '✓ Deployed')
-    );
+    console.log(chalk.green(alreadyExists ? '✓ Redeployed' : '✓ Deployed'));
     console.log('');
   } finally {
     if (zipPath && fs.existsSync(zipPath)) {

package/lib/zip.js

@@ -11,7 +11,8 @@ const SKIP = new Set([
   'build',
   'out',
   '.vercel',
-  '.moontraze',
+  '.moon',
+  '.moontraze',   // purana bhi skip
   '.netlify',
   'coverage',
 ]);
@@ -25,8 +26,9 @@ function zipCwd() {
   return new Promise((resolve, reject) => {
     const outPath = path.join(
       os.tmpdir(),
-      `moontraze-${Date.now()}.zip`
+      `moon-${Date.now()}.zip`
     );
+
     const output = fs.createWriteStream(outPath);
     const archive = archiver('zip', { zlib: { level: 9 } });
 
@@ -38,10 +40,15 @@ function zipCwd() {
       for (const name of fs.readdirSync(dir)) {
         const full = path.join(dir, name);
         const rel = base ? path.join(base, name) : name;
+
         if (shouldSkip(rel)) continue;
+
         const st = fs.statSync(full);
-        if (st.isDirectory()) walk(full, rel);
-        else archive.file(full, { name: rel.replace(/\\/g, '/') });
+        if (st.isDirectory()) {
+          walk(full, rel);
+        } else {
+          archive.file(full, { name: rel.replace(/\\/g, '/') });
+        }
       }
     };
 

package/package.json

@@ -1,13 +1,18 @@
 {
   "name": "moontraze",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Deploy to Moontraze hosting — like vercel CLI",
   "bin": {
-    "moontraze": "./bin/moontraze.js",
-    "moon": "./bin/moon.js"
+    "moon": "./bin/moon.js",
+    "moontraze": "./bin/moontraze.js"
+  },
+  "files": [
+    "bin",
+    "lib"
+  ],
+  "engines": {
+    "node": ">=18"
   },
-  "files": ["bin", "lib"],
-  "engines": { "node": ">=18" },
   "dependencies": {
     "archiver": "^7.0.1",
     "commander": "^12.1.0",
@@ -17,6 +22,12 @@
     "chalk": "^4.1.2",
     "prompts": "^2.4.2"
   },
-  "keywords": ["moontraze", "deploy", "hosting", "moon"],
+  "keywords": [
+    "moontraze",
+    "deploy",
+    "hosting",
+    "moon",
+    "cli"
+  ],
   "license": "MIT"
 }

package/bin/moon.js

@@ -1,68 +0,0 @@
-#!/usr/bin/env node
-/**
- * moon <platform> <command>
- * Example: moon moontraze login
- *          moon moontraze deploy --prod
- */
-const chalk = require('chalk');
-const path = require('path');
-
-const PLATFORMS = {
-  moontraze: {
-    label: 'Moontraze',
-    runner: path.join(__dirname, 'moontraze.js'),
-  },
-  // future:
-  // otherapp: { label: 'Other', runner: path.join(__dirname, 'other.js') },
-};
-
-function printRootHelp() {
-  console.log(`
-${chalk.bold('moon')} — multi-platform CLI
-
-Usage:
-  moon <platform> <command>
-
-Platforms:
-  moontraze     Moontraze hosting (moontraze.com)
-
-Examples:
-  moon moontraze login
-  moon moontraze link my-site
-  moon moontraze deploy --prod
-  moon moontraze --prod
-
-Same as:
-  npx moontraze login
-  npx moontraze deploy --prod
-`);
-}
-
-const args = process.argv.slice(2);
-const platform = (args[0] || '').toLowerCase();
-
-if (!platform || platform === '-h' || platform === '--help' || platform === 'help') {
-  printRootHelp();
-  process.exit(0);
-}
-
-if (platform === '-v' || platform === '--version') {
-  try {
-    console.log(require('../package.json').version);
-  } catch {
-    console.log('0.0.0');
-  }
-  process.exit(0);
-}
-
-const meta = PLATFORMS[platform];
-if (!meta) {
-  console.error(chalk.red(`Unknown platform: "${platform}"`));
-  console.error(chalk.gray('Known: ' + Object.keys(PLATFORMS).join(', ')));
-  console.error(chalk.gray('Example: moon moontraze login'));
-  process.exit(1);
-}
-
-// Forward remaining args to platform CLI
-process.argv = [process.argv[0], meta.runner, ...args.slice(1)];
-require(meta.runner);