xuanwu-cli 2.1.0 → 2.2.0

package/dist/commands/auth/login.js

@@ -11,22 +11,23 @@ const formatter_1 = require("../../output/formatter");
 function makeLoginCommand() {
     const cmd = new commander_1.Command('login')
         .description('Login to xuanwu factory')
+        .option('-u, --api-url <url>', 'API server URL', 'https://i.xuanwu.dev.aimstek.cn')
         .option('-e, --email <email>', 'Email address (for non-interactive login)')
         .option('-p, --password <password>', 'Password (for non-interactive login)')
         .option('--expires-in <duration>', 'Token expiration (30d, 90d, never)', '30d')
         .action(async (options) => {
         const sessionManager = new session_1.SessionManager();
         if (options.email && options.password) {
-            await loginWithCredentials(sessionManager, options.email, options.password, options.expiresIn);
+            await loginWithCredentials(sessionManager, options.email, options.password, options.expiresIn, options.apiUrl);
             return;
         }
-        await loginWithBrowser(sessionManager);
+        await loginWithBrowser(sessionManager, options.apiUrl);
     });
     return cmd;
 }
-async function loginWithBrowser(sessionManager) {
-    const apiUrl = process.env.XW_API_URL || 'http://localhost:3000';
-    const deviceAuthRes = await fetch(`${apiUrl}/api/cli/auth/device-code`, {
+async function loginWithBrowser(sessionManager, apiUrl) {
+    const finalApiUrl = process.env.XW_API_URL || apiUrl;
+    const deviceAuthRes = await fetch(`${finalApiUrl}/api/cli/auth/device-code`, {
         method: 'POST'
     });
     if (!deviceAuthRes.ok) {
@@ -49,7 +50,7 @@ async function loginWithBrowser(sessionManager) {
     let attempts = 0;
     while (attempts < maxAttempts) {
         await new Promise(resolve => setTimeout(resolve, 3000));
-        const pollRes = await fetch(`${apiUrl}/api/cli/auth/poll?session_id=${sessionId}`);
+        const pollRes = await fetch(`${finalApiUrl}/api/cli/auth/poll?session_id=${sessionId}`);
         if (!pollRes.ok) {
             formatter_1.OutputFormatter.error('Failed to poll auth status');
             process.exit(1);
@@ -66,7 +67,7 @@ async function loginWithBrowser(sessionManager) {
                 userRole: user.role,
                 deviceId: 'CLI Device',
                 expiresAt: new Date(Date.now() + expiresIn).toISOString(),
-                apiUrl
+                apiUrl: finalApiUrl
             });
             console.log('');
             formatter_1.OutputFormatter.success('授权成功！');
@@ -88,10 +89,10 @@ async function loginWithBrowser(sessionManager) {
     formatter_1.OutputFormatter.error('授权超时，请重新尝试');
     process.exit(1);
 }
-async function loginWithCredentials(sessionManager, email, password, expiresIn) {
-    const apiUrl = process.env.XW_API_URL || 'http://localhost:3000';
+async function loginWithCredentials(sessionManager, email, password, expiresIn, apiUrl) {
+    const finalApiUrl = process.env.XW_API_URL || apiUrl;
     console.log(`使用邮箱密码登录: ${email}`);
-    const res = await fetch(`${apiUrl}/api/cli/auth/login`, {
+    const res = await fetch(`${finalApiUrl}/api/cli/auth/login`, {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({
@@ -121,7 +122,7 @@ async function loginWithCredentials(sessionManager, email, password, expiresIn)
         userRole: user.role,
         deviceId,
         expiresAt,
-        apiUrl
+        apiUrl: finalApiUrl
     });
     formatter_1.OutputFormatter.success('登录成功！');
     console.log(`  用户: ${user.name} (${user.email})`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xuanwu-cli",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "玄武工厂平台 CLI 工具",
   "main": "dist/index.js",
   "bin": {

package/src/commands/auth/login.ts

@@ -6,6 +6,7 @@ import { OutputFormatter } from '../../output/formatter'
 export function makeLoginCommand(): Command {
   const cmd = new Command('login')
     .description('Login to xuanwu factory')
+    .option('-u, --api-url <url>', 'API server URL', 'https://i.xuanwu.dev.aimstek.cn')
     .option('-e, --email <email>', 'Email address (for non-interactive login)')
     .option('-p, --password <password>', 'Password (for non-interactive login)')
     .option('--expires-in <duration>', 'Token expiration (30d, 90d, never)', '30d')
@@ -17,21 +18,22 @@ export function makeLoginCommand(): Command {
           sessionManager,
           options.email,
           options.password,
-          options.expiresIn
+          options.expiresIn,
+          options.apiUrl
         )
         return
       }
 
-      await loginWithBrowser(sessionManager)
+      await loginWithBrowser(sessionManager, options.apiUrl)
     })
 
   return cmd
 }
 
-async function loginWithBrowser(sessionManager: SessionManager): Promise<void> {
-  const apiUrl = process.env.XW_API_URL || 'http://localhost:3000'
+async function loginWithBrowser(sessionManager: SessionManager, apiUrl: string): Promise<void> {
+  const finalApiUrl = process.env.XW_API_URL || apiUrl
 
-  const deviceAuthRes = await fetch(`${apiUrl}/api/cli/auth/device-code`, {
+  const deviceAuthRes = await fetch(`${finalApiUrl}/api/cli/auth/device-code`, {
     method: 'POST'
   })
 
@@ -61,7 +63,7 @@ async function loginWithBrowser(sessionManager: SessionManager): Promise<void> {
     await new Promise(resolve => setTimeout(resolve, 3000))
 
     const pollRes = await fetch(
-      `${apiUrl}/api/cli/auth/poll?session_id=${sessionId}`
+      `${finalApiUrl}/api/cli/auth/poll?session_id=${sessionId}`
     )
 
     if (!pollRes.ok) {
@@ -82,7 +84,7 @@ async function loginWithBrowser(sessionManager: SessionManager): Promise<void> {
         userRole: user.role,
         deviceId: 'CLI Device',
         expiresAt: new Date(Date.now() + expiresIn).toISOString(),
-        apiUrl
+        apiUrl: finalApiUrl
       })
 
       console.log('')
@@ -114,13 +116,14 @@ async function loginWithCredentials(
   sessionManager: SessionManager,
   email: string,
   password: string,
-  expiresIn: string
+  expiresIn: string,
+  apiUrl: string
 ): Promise<void> {
-  const apiUrl = process.env.XW_API_URL || 'http://localhost:3000'
+  const finalApiUrl = process.env.XW_API_URL || apiUrl
 
   console.log(`使用邮箱密码登录: ${email}`)
 
-  const res = await fetch(`${apiUrl}/api/cli/auth/login`, {
+  const res = await fetch(`${finalApiUrl}/api/cli/auth/login`, {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
     body: JSON.stringify({
@@ -155,7 +158,7 @@ async function loginWithCredentials(
     userRole: user.role,
     deviceId,
     expiresAt,
-    apiUrl
+    apiUrl: finalApiUrl
   })
 
   OutputFormatter.success('登录成功！')