moontraze 1.0.10 → 2.0.0

package/bin/moontraze.js

@@ -1,10 +1,11 @@
 #!/usr/bin/env node
 const { Command } = require('commander');
 const chalk = require('chalk');
+const path = require('path');
 const { login } = require('../lib/auth');
-const { getConfig, setConfig, getProject, setProject } = require('../lib/config');
+const { getConfig, setConfig, getProject, setProject, GLOBAL_FILE } = require('../lib/config');
 const { deploy } = require('../lib/deploy');
-const { selfUpdate } = require('../lib/selfUpdate');
+const { selfUpdate, INSTALL_DIR } = require('../lib/selfUpdate');
 
 const program = new Command();
 
@@ -13,10 +14,16 @@ 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';
 
+// version package.json se (update ke baad naya version dikhe)
+let version = '1.0.6';
+try {
+  version = require('../package.json').version || version;
+} catch (_) {}
+
 program
   .name(platformName)
   .description(`Deploy sites using ${platformName}`)
-  .version('1.0.6');
+  .version(version);
 
 // ---------- login ----------
 program
@@ -26,7 +33,6 @@ program
   .action(async (opts) => {
     try {
       await login(opts.token, { apiUrl });
-      // 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);
@@ -73,6 +79,7 @@ program
     const proj = getProject();
     console.log('');
     console.log(chalk.bold('Moontraze'));
+    console.log(` Version: ${version}`);
     console.log(` API: ${cfg.apiUrl || apiUrl}`);
     console.log(` Domain: ${cfg.domain || domain}`);
     console.log(` Logged in: ${cfg.token ? 'yes' : 'no'}`);
@@ -81,10 +88,12 @@ program
         proj?.projectName || '(none — run: moon moontraze link <name>)'
       }`
     );
+    console.log(chalk.gray(` Config: ${GLOBAL_FILE}`));
+    console.log(chalk.gray(` Install: ${INSTALL_DIR}`));
     console.log('');
   });
 
-// ---------- update (own server tarball — no npm registry for code) ----------
+// ---------- update ----------
 program
   .command('update')
   .description('Download latest Moontraze CLI from api.moontraze.com')
@@ -143,7 +152,6 @@ Examples:
   moon ${platformName} deploy --prod
   moon ${platformName} update
   moon ${platformName} --prod
-
   npx moontraze login
   npx moontraze deploy --prod
 `

package/lib/auth.js

@@ -1,6 +1,6 @@
 const prompts = require('prompts');
 const chalk = require('chalk');
-const { getConfig, setConfig } = require('./config');
+const { getConfig, setConfig, GLOBAL_FILE } = require('./config');
 
 async function login(tokenArg, options = {}) {
   const apiUrl =
@@ -72,10 +72,11 @@ async function loginWithEmail({ apiUrl, label }) {
   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`));
+  console.log(chalk.gray(` Config: ${GLOBAL_FILE}`));
   console.log('');
 }
 
@@ -84,23 +85,21 @@ async function loginWithMoonID({ apiUrl, label }) {
   const nonce = Math.random().toString(36).substring(2, 12);
   const state = `${nonce}.login`;
 
-  // ★ 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, action: 'login' }),
   });
+
   const startData = await startRes.json().catch(() => ({}));
   if (!startRes.ok) {
     throw new Error(startData.error || 'Could not start MoonID session');
   }
 
   const notifyUrl = `${apiUrl}/api/platform/moonid/web-complete`;
-  const redirectUri = `${apiUrl}/api/platform/moonid/done?state=${encodeURIComponent(
-    state
-  )}`;
-
+  const redirectUri = `${apiUrl}/api/platform/moonid/done?state=${encodeURIComponent(state)}`;
   const appId = 'com.moonstorage.app';
+
   const deepLink =
     `moonid://auth` +
     `?app_id=${encodeURIComponent(appId)}` +
@@ -110,9 +109,7 @@ async function loginWithMoonID({ apiUrl, label }) {
     `&state=${encodeURIComponent(state)}` +
     `&source=cli`;
 
-  const qrImageUrl = `https://api.qrserver.com/v1/create-qr-code/?size=220x220&data=${encodeURIComponent(
-    deepLink
-  )}`;
+  const qrImageUrl = `https://api.qrserver.com/v1/create-qr-code/?size=220x220&data=${encodeURIComponent(deepLink)}`;
 
   console.log('');
   console.log(chalk.cyan(`${label} — MoonID Login`));
@@ -145,7 +142,6 @@ async function pollWebStatus({ apiUrl, state, timeoutMs }) {
       );
       const data = await res.json().catch(() => ({}));
 
-      // web endpoint returns status: "success"
       if (
         (data.status === 'success' || data.status === 'done') &&
         data.token
@@ -172,13 +168,16 @@ async function saveAndValidateToken(token, { apiUrl, label }) {
   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: ${GLOBAL_FILE}`));
   console.log('');
 }
 

package/lib/config.js

@@ -1,12 +1,18 @@
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
+const { MOONTRAZE_HOME } = require('./paths');
 
-const GLOBAL_DIR = path.join(os.homedir(), '.moontraze');
+const GLOBAL_DIR = MOONTRAZE_HOME;
 const GLOBAL_FILE = path.join(GLOBAL_DIR, 'config.json');
+
 const LOCAL_DIR = path.join(process.cwd(), '.moontraze');
 const LOCAL_FILE = path.join(LOCAL_DIR, 'project.json');
 
+/** Purana location (migration) */
+const OLD_GLOBAL_DIR = path.join(os.homedir(), '.moontraze');
+const OLD_GLOBAL_FILE = path.join(OLD_GLOBAL_DIR, 'config.json');
+
 function ensureDir(d) {
   if (!fs.existsSync(d)) fs.mkdirSync(d, { recursive: true });
 }
@@ -17,7 +23,22 @@ const DEFAULTS = {
   domain: process.env.MOON_DOMAIN || 'moontraze.com',
 };
 
+/**
+ * Purane ~/.moontraze/config.json se naya location pe migrate
+ * (sirf tab jab naya config pehle se exist na karta ho)
+ */
+function migrateOldConfig() {
+  if (fs.existsSync(GLOBAL_FILE)) return;
+  if (!fs.existsSync(OLD_GLOBAL_FILE)) return;
+
+  try {
+    ensureDir(GLOBAL_DIR);
+    fs.copyFileSync(OLD_GLOBAL_FILE, GLOBAL_FILE);
+  } catch (_) {}
+}
+
 function getConfig() {
+  migrateOldConfig();
   try {
     if (fs.existsSync(GLOBAL_FILE)) {
       return { ...DEFAULTS, ...JSON.parse(fs.readFileSync(GLOBAL_FILE, 'utf8')) };
@@ -45,6 +66,7 @@ function getProject() {
 function setProject(data) {
   ensureDir(LOCAL_DIR);
   fs.writeFileSync(LOCAL_FILE, JSON.stringify(data, null, 2));
+
   const ignore = path.join(process.cwd(), '.gitignore');
   try {
     let g = fs.existsSync(ignore) ? fs.readFileSync(ignore, 'utf8') : '';
@@ -52,7 +74,17 @@ function setProject(data) {
       fs.appendFileSync(ignore, '\n.moontraze/\n');
     }
   } catch (_) {}
+
   return data;
 }
 
-module.exports = { getConfig, setConfig, getProject, setProject, GLOBAL_DIR };
+module.exports = {
+  getConfig,
+  setConfig,
+  getProject,
+  setProject,
+  GLOBAL_DIR,
+  GLOBAL_FILE,
+  LOCAL_DIR,
+  LOCAL_FILE,
+};

package/lib/paths.js

@@ -0,0 +1,25 @@
+const path = require('path');
+const os = require('os');
+
+function dataHome() {
+  // Windows: AppData\Local
+  if (process.platform === 'win32') {
+    return process.env.LOCALAPPDATA || path.join(os.homedir(), 'AppData', 'Local');
+  }
+  // Linux / mac
+  return (
+    process.env.XDG_DATA_HOME ||
+    path.join(os.homedir(), '.local', 'share')
+  );
+}
+
+const MOON_HOME = path.join(dataHome(), 'Moon');           // global moon CLI
+const MOONTRAZE_HOME = path.join(dataHome(), 'Moontraze'); // is platform ka data
+const MOONTRAZE_CLI = path.join(MOONTRAZE_HOME, 'cli');
+
+module.exports = {
+  dataHome,
+  MOON_HOME,
+  MOONTRAZE_HOME,
+  MOONTRAZE_CLI,
+};

package/lib/selfUpdate.js

@@ -2,18 +2,30 @@ 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 { MOON_HOME, MOONTRAZE_CLI } = require('./paths');
+
+// Node 18+ global fetch; fallback node-fetch
+const fetchFn = global.fetch
+  ? global.fetch.bind(global)
+  : (...args) => require('node-fetch')(...args);
 
 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');
+/** Moontraze CLI install folder */
+const INSTALL_DIR = MOONTRAZE_CLI;
+
+/** Global Moon config (platforms yahan store hote hain) */
+const MOON_CFG = path.join(MOON_HOME, 'config.json');
+
+/** Purane locations (migration) */
+const OLD_INSTALL_DIR = path.join(os.homedir(), '.moontraze', 'cli');
+const OLD_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/moontraze-manifest.json`);
+  const res = await fetchFn(`${API}/cli/moontraze-manifest.json`, {
+    headers: { Accept: 'application/json' },
+  });
   if (!res.ok) {
     throw new Error(`Could not fetch moontraze manifest (${res.status})`);
   }
@@ -21,21 +33,36 @@ async function fetchManifest() {
 }
 
 async function downloadTo(url, dest) {
-  const res = await fetch(url);
+  const res = await fetchFn(url);
   if (!res.ok) throw new Error('Download failed: ' + url);
   const buf = Buffer.from(await res.arrayBuffer());
   fs.writeFileSync(dest, buf);
 }
 
+/**
+ * Purane ~/.moontraze/cli se kuch bhi nahi laana — pure extract se naya code aata hai.
+ * Sirf global moon config migrate karo agar naya location pe config nahi hai.
+ */
+function migrateOldMoonConfig() {
+  if (fs.existsSync(MOON_CFG)) return; // naya already hai
+  if (!fs.existsSync(OLD_MOON_CFG)) return;
+
+  try {
+    fs.mkdirSync(MOON_HOME, { recursive: true });
+    fs.copyFileSync(OLD_MOON_CFG, MOON_CFG);
+    console.log(chalk.gray(`Migrated moon config: ~/.moon → ${MOON_HOME}`));
+  } catch (err) {
+    console.log(chalk.yellow('Could not migrate old moon config:'), err.message);
+  }
+}
+
 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());
-
+  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)');
@@ -46,7 +73,6 @@ function extractTarball(tgz, destDir) {
   }
   fs.mkdirSync(path.dirname(destDir), { recursive: true });
   fs.renameSync(pkg, destDir);
-
   fs.rmSync(tmp, { recursive: true, force: true });
 }
 
@@ -72,7 +98,6 @@ function pointMoonPlatformToInstall() {
   }
 
   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);
@@ -117,12 +142,16 @@ function pointMoonPlatformToInstall() {
 async function selfUpdate() {
   console.log(chalk.cyan('Checking Moontraze CLI updates...'));
 
+  // pehle purane moon config migrate kar do
+  migrateOldMoonConfig();
+
   const manifest = await fetchManifest();
   const ver = manifest.version;
   const url = manifest.tarball;
 
   console.log(chalk.gray(` Latest: v${ver}`));
   console.log(chalk.gray(` ${url}`));
+  console.log(chalk.gray(` Install dir: ${INSTALL_DIR}`));
 
   const tgz = path.join(os.tmpdir(), `moontraze-${ver}.tgz`);
   await downloadTo(url, tgz);
@@ -139,14 +168,20 @@ async function selfUpdate() {
 
   const runner = pointMoonPlatformToInstall();
 
-  try { fs.unlinkSync(tgz); } catch (_) {}
+  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(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 };
+module.exports = {
+  selfUpdate,
+  INSTALL_DIR,
+  MOON_CFG,
+};

package/package.json

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