moontraze 1.0.7 → 1.0.9

package/bin/moontraze.js

@@ -4,6 +4,7 @@ const chalk = require('chalk');
 const { login } = require('../lib/auth');
 const { getConfig, setConfig, getProject, setProject } = require('../lib/config');
 const { deploy } = require('../lib/deploy');
+const { selfUpdate } = require('../lib/selfUpdate');
 
 const program = new Command();
 
@@ -15,9 +16,9 @@ const domain = process.env.MOON_DOMAIN || getConfig().domain || 'moontraze.com';
 program
   .name(platformName)
   .description(`Deploy sites using ${platformName}`)
-  .version('1.0.5');
+  .version('1.0.6');
 
-// login
+// ---------- login ----------
 program
   .command('login')
   .description('Log in with email/password or token')
@@ -25,14 +26,14 @@ program
   .action(async (opts) => {
     try {
       await login(opts.token, { apiUrl });
-      console.log(chalk.green(`✓ Logged in to ${platformName}`));
+      // auth.js already prints ✓ Logged in — avoid double line if you want
     } catch (e) {
       console.error(chalk.red('Login failed:'), e.message);
       process.exit(1);
     }
   });
 
-// link
+// ---------- link ----------
 program
   .command('link [name]')
   .description('Link this folder to a hosting project name')
@@ -63,7 +64,40 @@ program
     }
   });
 
-// deploy
+// ---------- list ----------
+program
+  .command('list')
+  .description('Show login + linked project status')
+  .action(() => {
+    const cfg = getConfig();
+    const proj = getProject();
+    console.log('');
+    console.log(chalk.bold('Moontraze'));
+    console.log(` API: ${cfg.apiUrl || apiUrl}`);
+    console.log(` Domain: ${cfg.domain || domain}`);
+    console.log(` Logged in: ${cfg.token ? 'yes' : 'no'}`);
+    console.log(
+      ` Linked project: ${
+        proj?.projectName || '(none — run: moon moontraze link <name>)'
+      }`
+    );
+    console.log('');
+  });
+
+// ---------- update (own server tarball — no npm registry for code) ----------
+program
+  .command('update')
+  .description('Download latest Moontraze CLI from api.moontraze.com')
+  .action(async () => {
+    try {
+      await selfUpdate();
+    } catch (e) {
+      console.error(chalk.red('Update failed:'), e.message);
+      process.exit(1);
+    }
+  });
+
+// ---------- deploy ----------
 async function runDeploy(opts) {
   try {
     await deploy({
@@ -105,8 +139,13 @@ program.addHelpText(
 Examples:
   moon ${platformName} login
   moon ${platformName} link my-site
+  moon ${platformName} list
   moon ${platformName} deploy --prod
+  moon ${platformName} update
   moon ${platformName} --prod
+
+  npx moontraze login
+  npx moontraze deploy --prod
 `
 );
 

package/lib/auth.js

@@ -1,7 +1,5 @@
 const prompts = require('prompts');
 const chalk = require('chalk');
-const http = require('http');
-const { URL } = require('url');
 const { getConfig, setConfig } = require('./config');
 
 async function login(tokenArg, options = {}) {
@@ -10,10 +8,8 @@ async function login(tokenArg, options = {}) {
     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(), { apiUrl, label });
   }
@@ -72,16 +68,14 @@ async function loginWithEmail({ apiUrl, label }) {
   });
 
   const data = await res.json().catch(() => ({}));
-
   if (!res.ok) throw new Error(data.error || 'Invalid email or password');
   if (!data.token) throw new Error('Login succeeded but no token returned');
 
   setConfig({ token: data.token, apiUrl });
-
   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`));
+  if (data.user?.email) console.log(chalk.gray(` ${data.user.email}`));
+  console.log(chalk.gray(` Config: ~/.moontraze/config.json`));
   console.log('');
 }
 
@@ -90,22 +84,21 @@ async function loginWithMoonID({ apiUrl, label }) {
   const nonce = Math.random().toString(36).substring(2, 12);
   const state = `${nonce}.login`;
 
-  const startRes = await fetch(`${apiUrl}/api/platform/moonid/cli-start`, {
+  // ★ Same flow as website (working)
+  const startRes = await fetch(`${apiUrl}/api/platform/moonid/web-start`, {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify({ state }),
+    body: JSON.stringify({ state, action: 'login' }),
   });
   const startData = await startRes.json().catch(() => ({}));
   if (!startRes.ok) {
-    throw new Error(startData.error || 'Could not start MoonID CLI session');
+    throw new Error(startData.error || 'Could not start MoonID session');
   }
 
-  const redirectUri =
-    startData.redirectUri ||
-    `${apiUrl}/api/platform/moonid/cli-callback`;
-
-  // App POST yahan karegi (web jaisa)
-  const notifyUrl = `${apiUrl}/api/platform/moonid/cli-complete`;
+  const notifyUrl = `${apiUrl}/api/platform/moonid/web-complete`;
+  const redirectUri = `${apiUrl}/api/platform/moonid/done?state=${encodeURIComponent(
+    state
+  )}`;
 
   const appId = 'com.moonstorage.app';
   const deepLink =
@@ -133,13 +126,13 @@ async function loginWithMoonID({ apiUrl, label }) {
   console.log(chalk.gray('Waiting for approval... (Ctrl+C to cancel)'));
   console.log('');
 
-  const token = await pollCliStatus({ apiUrl, state, timeoutMs: 180000 });
+  const token = await pollWebStatus({ apiUrl, state, timeoutMs: 180000 });
   if (!token) throw new Error('MoonID login timed out or denied');
 
   await saveAndValidateToken(token, { apiUrl, label });
 }
 
-async function pollCliStatus({ apiUrl, state, timeoutMs }) {
+async function pollWebStatus({ apiUrl, state, timeoutMs }) {
   const fetch = require('node-fetch');
   const start = Date.now();
   const interval = 2000;
@@ -148,19 +141,25 @@ async function pollCliStatus({ apiUrl, state, timeoutMs }) {
     await new Promise((r) => setTimeout(r, interval));
     try {
       const res = await fetch(
-        `${apiUrl}/api/platform/moonid/cli-status?state=${encodeURIComponent(state)}`
+        `${apiUrl}/api/platform/moonid/status?state=${encodeURIComponent(state)}`
       );
       const data = await res.json().catch(() => ({}));
 
-      if (data.status === 'done' && data.token) {
+      // web endpoint returns status: "success"
+      if (
+        (data.status === 'success' || data.status === 'done') &&
+        data.token
+      ) {
         return data.token;
       }
-      if (data.status === 'denied' || data.status === 'error') {
+      if (data.status === 'error' || data.status === 'denied') {
         throw new Error(data.error || 'MoonID login denied');
       }
-      // pending / unknown → keep waiting
     } catch (e) {
-      if (e.message && /denied|failed|not found|mismatch|expired/i.test(e.message)) {
+      if (
+        e.message &&
+        /denied|failed|not found|mismatch|expired|signup/i.test(e.message)
+      ) {
         throw e;
       }
     }
@@ -168,86 +167,18 @@ async function pollCliStatus({ apiUrl, state, timeoutMs }) {
   return null;
 }
 
-function waitForMoonIDCallback({ port, state, timeoutMs }) {
-  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');
-          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></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.</p></body></html>'
-        );
-        server.close();
-        resolve(token);
-      } 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, { apiUrl, label }) {
   const fetch = require('node-fetch');
   const res = await fetch(`${apiUrl}/api/hosting/quota`, {
     headers: { Authorization: `Bearer ${token}` },
   });
-
   if (res.status === 401) {
     throw new Error('Invalid or expired token');
   }
-
   setConfig({ token, apiUrl });
-
   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('');
 }
 

package/lib/selfUpdate.js

@@ -0,0 +1,152 @@
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+const { execSync } = require('child_process');
+const fetch = require('node-fetch');
+const chalk = require('chalk');
+
+const API = process.env.MOON_API || 'https://api.moontraze.com';
+
+// Moontraze platform ka apna install folder
+const INSTALL_DIR = path.join(os.homedir(), '.moontraze', 'cli');
+const MOON_CFG = path.join(os.homedir(), '.moon', 'config.json');
+
+// ★ Sirf yahan change — moontraze ka apna manifest
+async function fetchManifest() {
+  const res = await fetch(`${API}/cli/platforms/moontraze/manifest.json`);
+  if (!res.ok) {
+    throw new Error(`Could not fetch moontraze manifest (${res.status})`);
+  }
+  return res.json();
+}
+
+async function downloadTo(url, dest) {
+  const res = await fetch(url);
+  if (!res.ok) throw new Error('Download failed: ' + url);
+  const buf = Buffer.from(await res.arrayBuffer());
+  fs.writeFileSync(dest, buf);
+}
+
+function extractTarball(tgz, destDir) {
+  const tmp = path.join(os.tmpdir(), 'moontraze-extract-' + Date.now());
+  fs.mkdirSync(tmp, { recursive: true });
+
+  execSync(`tar -xzf "${tgz}" -C "${tmp}"`, { stdio: 'inherit', shell: true });
+
+  const entries = fs.readdirSync(tmp).map(n => path.join(tmp, n));
+  const pkg = entries.find(p => fs.statSync(p).isDirectory());
+
+  if (!pkg) {
+    console.error('Extracted contents:', entries);
+    throw new Error('Invalid tarball layout (expected package/ directory)');
+  }
+
+  if (fs.existsSync(destDir)) {
+    fs.rmSync(destDir, { recursive: true, force: true });
+  }
+  fs.mkdirSync(path.dirname(destDir), { recursive: true });
+  fs.renameSync(pkg, destDir);
+
+  fs.rmSync(tmp, { recursive: true, force: true });
+}
+
+function pointMoonPlatformToInstall() {
+  const pkgJsonPath = path.join(INSTALL_DIR, 'package.json');
+  if (!fs.existsSync(pkgJsonPath)) {
+    throw new Error('package.json missing after extract');
+  }
+
+  const pkg = JSON.parse(fs.readFileSync(pkgJsonPath, 'utf8'));
+
+  // bin field se runner path nikaalo
+  let runnerRel = 'bin/moontraze.js';
+  if (pkg.bin) {
+    if (typeof pkg.bin === 'string') {
+      runnerRel = pkg.bin;
+    } else if (pkg.bin.moontraze) {
+      runnerRel = pkg.bin.moontraze;
+    } else {
+      const first = Object.values(pkg.bin)[0];
+      if (first) runnerRel = first;
+    }
+  }
+
+  const runner = path.join(INSTALL_DIR, runnerRel);
+
+  if (!fs.existsSync(runner)) {
+    console.error(chalk.red('\n--- Debug: files after extract ---'));
+    console.error('INSTALL_DIR:', INSTALL_DIR);
+    try {
+      console.error(fs.readdirSync(INSTALL_DIR));
+      const binDir = path.join(INSTALL_DIR, 'bin');
+      if (fs.existsSync(binDir)) {
+        console.error('bin/ →', fs.readdirSync(binDir));
+      }
+    } catch (_) {}
+    console.error('----------------------------------\n');
+    throw new Error('Runner missing after extract: ' + runner);
+  }
+
+  // moon global config update (sirf moontraze entry)
+  let cfg = { defaultPlatform: null, platforms: {} };
+  try {
+    if (fs.existsSync(MOON_CFG)) {
+      cfg = JSON.parse(fs.readFileSync(MOON_CFG, 'utf8'));
+    }
+  } catch (_) {}
+
+  if (!cfg.platforms) cfg.platforms = {};
+
+  cfg.platforms.moontraze = {
+    label: 'Moontraze',
+    runner,
+    apiUrl: API,
+    addedAt: new Date().toISOString(),
+  };
+
+  if (!cfg.defaultPlatform) {
+    cfg.defaultPlatform = 'moontraze';
+  }
+
+  fs.mkdirSync(path.dirname(MOON_CFG), { recursive: true });
+  fs.writeFileSync(MOON_CFG, JSON.stringify(cfg, null, 2));
+
+  return runner;
+}
+
+async function selfUpdate() {
+  console.log(chalk.cyan('Checking Moontraze CLI updates...'));
+
+  const manifest = await fetchManifest();
+  const ver = manifest.version;
+  const url = manifest.tarball;
+
+  console.log(chalk.gray(` Latest: v${ver}`));
+  console.log(chalk.gray(` ${url}`));
+
+  const tgz = path.join(os.tmpdir(), `moontraze-${ver}.tgz`);
+  await downloadTo(url, tgz);
+
+  console.log(chalk.cyan('Extracting...'));
+  extractTarball(tgz, INSTALL_DIR);
+
+  console.log(chalk.cyan('Installing dependencies...'));
+  execSync('npm install --omit=dev', {
+    cwd: INSTALL_DIR,
+    stdio: 'inherit',
+    shell: true,
+  });
+
+  const runner = pointMoonPlatformToInstall();
+
+  try { fs.unlinkSync(tgz); } catch (_) {}
+
+  console.log('');
+  console.log(chalk.green(`✓ Moontraze CLI v${ver} installed`));
+  console.log(chalk.gray(`  ${INSTALL_DIR}`));
+  console.log(chalk.gray(`  Runner: ${runner}`));
+  console.log(chalk.gray('  Try: moon moontraze list'));
+  console.log('');
+}
+
+module.exports = { selfUpdate, INSTALL_DIR };

package/package.json

@@ -1,9 +1,8 @@
 {
   "name": "moontraze",
-  "version": "1.0.7",
-  "description": "Deploy to Moontraze hosting — like vercel CLI",
+  "version": "1.0.9",
+  "description": "Deploy to Moontraze hosting",
   "bin": {
-    "moon": "./bin/moon.js",
     "moontraze": "./bin/moontraze.js"
   },
   "files": [