moontraze 1.0.6 → 1.0.7

package/lib/auth.js

@@ -86,17 +86,36 @@ async function loginWithEmail({ apiUrl, label }) {
 }
 
 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 fetch = require('node-fetch');
+  const nonce = Math.random().toString(36).substring(2, 12);
+  const state = `${nonce}.login`;
+
+  const startRes = await fetch(`${apiUrl}/api/platform/moonid/cli-start`, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ state }),
+  });
+  const startData = await startRes.json().catch(() => ({}));
+  if (!startRes.ok) {
+    throw new Error(startData.error || 'Could not start MoonID CLI 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 appId = 'com.moonstorage.app';
   const deepLink =
     `moonid://auth` +
     `?app_id=${encodeURIComponent(appId)}` +
     `&action=login` +
     `&redirect_uri=${encodeURIComponent(redirectUri)}` +
-    `&state=${encodeURIComponent(state)}`;
+    `&notify_url=${encodeURIComponent(notifyUrl)}` +
+    `&state=${encodeURIComponent(state)}` +
+    `&source=cli`;
 
   const qrImageUrl = `https://api.qrserver.com/v1/create-qr-code/?size=220x220&data=${encodeURIComponent(
     deepLink
@@ -105,7 +124,7 @@ async function loginWithMoonID({ apiUrl, label }) {
   console.log('');
   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('2. Scan the QR code (open the link below in a browser if needed)'));
   console.log(chalk.gray('3. Approve login'));
   console.log('');
   console.log(chalk.yellow('QR code image:'));
@@ -114,12 +133,41 @@ async function loginWithMoonID({ apiUrl, label }) {
   console.log(chalk.gray('Waiting for approval... (Ctrl+C to cancel)'));
   console.log('');
 
-  const token = await waitForMoonIDCallback({ port, state, timeoutMs: 120000 });
+  const token = await pollCliStatus({ 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 }) {
+  const fetch = require('node-fetch');
+  const start = Date.now();
+  const interval = 2000;
+
+  while (Date.now() - start < timeoutMs) {
+    await new Promise((r) => setTimeout(r, interval));
+    try {
+      const res = await fetch(
+        `${apiUrl}/api/platform/moonid/cli-status?state=${encodeURIComponent(state)}`
+      );
+      const data = await res.json().catch(() => ({}));
+
+      if (data.status === 'done' && data.token) {
+        return data.token;
+      }
+      if (data.status === 'denied' || data.status === 'error') {
+        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)) {
+        throw e;
+      }
+    }
+  }
+  return null;
+}
+
 function waitForMoonIDCallback({ port, state, timeoutMs }) {
   return new Promise((resolve) => {
     const server = http.createServer((req, res) => {

package/package.json

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