xuanwu-cli 2.2.0 → 2.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xuanwu-cli",
-  "version": "2.2.0",
+  "version": "2.3.2",
   "description": "玄武工厂平台 CLI 工具",
   "main": "dist/index.js",
   "bin": {
@@ -10,7 +10,12 @@
   "scripts": {
     "build": "tsc",
     "dev": "tsc --watch",
-    "start": "node dist/index.js"
+    "start": "node dist/index.js",
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "test:coverage": "jest --coverage",
+    "test:integration": "jest --testPathPattern=integration",
+    "test:e2e": "jest --testPathPattern=e2e"
   },
   "keywords": [
     "cli",
@@ -27,7 +32,10 @@
   },
   "devDependencies": {
     "@types/inquirer": "^9.0.7",
+    "@types/jest": "^29.5.11",
     "@types/node": "^20.11.0",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.1.1",
     "typescript": "^5.3.3"
   }
 }

package/src/api/client.ts

@@ -5,11 +5,17 @@
 import axios, { AxiosInstance, AxiosRequestConfig } from 'axios'
 import { Connection, CLIResult, ServiceInfo, NamespaceInfo, DeployOptions, Application, Build, CreateApplicationDto, UpdateApplicationDto, TriggerBuildOptions } from '../config/types'
 import { OutputFormatter } from '../output/formatter'
+import { SessionManager } from '../lib/session'
 
 export class APIClient {
   private client: AxiosInstance
+  private connection: Connection
+  private sessionManager: SessionManager
 
   constructor(connection: Connection) {
+    this.connection = connection
+    this.sessionManager = new SessionManager()
+    
     this.client = axios.create({
       baseURL: connection.endpoint,
       headers: {
@@ -22,6 +28,7 @@ export class APIClient {
 
   private async request<T>(method: string, url: string, data?: any, config?: AxiosRequestConfig): Promise<CLIResult<T>> {
     const startTime = Date.now()
+    
     try {
       const response = await this.client.request({
         method,
@@ -39,8 +46,25 @@ export class APIClient {
         }
       }
     } catch (error: any) {
+      const status = error.response?.status
       const duration = Date.now() - startTime
-      const message = error.response?.data?.message || error.message
+      
+      if (status === 401) {
+        return {
+          success: false,
+          error: {
+            code: '401',
+            message: '登录已过期，请运行 "xw login" 重新登录',
+            details: { needLogin: true }
+          },
+          meta: {
+            timestamp: new Date().toISOString(),
+            duration
+          }
+        }
+      }
+      
+      const message = error.response?.data?.error || error.response?.data?.message || error.message
       
       return {
         success: false,
@@ -82,31 +106,6 @@ export class APIClient {
     return this.request('GET', `/api/deploy-spaces?identifier=${identifier}`)
   }
 
-  async getProjects(): Promise<CLIResult<any[]>> {
-    return this.request<any[]>('GET', '/api/projects')
-  }
-
-  async createProject(name: string, description?: string): Promise<CLIResult<any>> {
-    return this.request('POST', '/api/projects', {
-      name,
-      description: description || ''
-    })
-  }
-
-  async deleteProject(projectId: string): Promise<CLIResult<void>> {
-    return this.request('DELETE', `/api/projects/${projectId}`)
-  }
-
-  async createNamespaceWithProject(name: string, projectId: string, environment: string = 'development'): Promise<CLIResult<any>> {
-    return this.request('POST', '/api/deploy-spaces', {
-      name,
-      identifier: name,
-      namespace: name,
-      environment,
-      project_id: projectId
-    })
-  }
-
   // ===================
   // Service
   // ===================
@@ -128,16 +127,26 @@ export class APIClient {
   // ===================
 
   async deploy(options: DeployOptions): Promise<CLIResult<any>> {
-    const { namespace, serviceName, type, ...rest } = options
+    const { namespace, serviceName, type, projectCode, ...rest } = options
     
     // 获取 namespace 对应的 project_id
     let projectId: string | undefined
     
+    // 如果提供了 projectCode，直接通过 projectCode 获取项目
+    if (projectCode) {
+      const projectResult = await this.getProject(projectCode)
+      if (projectResult.success && projectResult.data) {
+        projectId = projectResult.data.id
+      }
+    }
+    
     // 尝试通过 identifier 查询
-    const envResult = await this.getNamespaceInfo(namespace)
-    if (envResult.success && envResult.data) {
-      const envData = Array.isArray(envResult.data) ? envResult.data[0] : envResult.data
-      projectId = envData.project?.id || envData.projectId
+    if (!projectId) {
+      const envResult = await this.getNamespaceInfo(namespace)
+      if (envResult.success && envResult.data) {
+        const envData = Array.isArray(envResult.data) ? envResult.data[0] : envResult.data
+        projectId = envData.project?.id || envData.projectId
+      }
     }
     
     // 如果没找到，尝试从列表中查找
@@ -153,7 +162,7 @@ export class APIClient {
     
     // 如果还是没有，使用第一个项目的 ID
     if (!projectId) {
-      const projectsResult = await this.getProjects()
+      const projectsResult = await this.listProjects()
       if (projectsResult.success && projectsResult.data && projectsResult.data.length > 0) {
         projectId = projectsResult.data[0].id
       }
@@ -398,7 +407,7 @@ export class APIClient {
   }
 
   async createApplication(dto: CreateApplicationDto): Promise<CLIResult<Application>> {
-    return this.request<Application>('POST', '/api/applications', dto)
+    return this.request<Application>('POST', '/api/cli/apps', dto)
   }
 
   async updateApplication(code: string, dto: UpdateApplicationDto): Promise<CLIResult<Application>> {
@@ -417,6 +426,92 @@ export class APIClient {
     return this.request<Build[]>('GET', `/api/cli/apps/${code}/builds`)
   }
 
+  // ===================
+  // Project (CLI API - using code)
+  // ===================
+
+  async listProjects(options?: { name?: string; code?: string }): Promise<CLIResult<any[]>> {
+    let url = '/api/cli/projects'
+    const params: string[] = []
+    if (options?.name) params.push(`name=${options.name}`)
+    if (options?.code) params.push(`code=${options.code}`)
+    if (params.length > 0) url += '?' + params.join('&')
+    return this.request<any[]>('GET', url)
+  }
+
+  async getProject(code: string): Promise<CLIResult<any>> {
+    return this.request<any>('GET', `/api/cli/projects/${code}`)
+  }
+
+  async createProject(name: string, code: string, description?: string): Promise<CLIResult<any>> {
+    return this.request<any>('POST', '/api/cli/projects', {
+      name,
+      code,
+      description: description || ''
+    })
+  }
+
+  async deleteProject(code: string): Promise<CLIResult<void>> {
+    return this.request<void>('DELETE', `/api/cli/projects/${code}`)
+  }
+
+  // ===================
+  // Environment (CLI API - using namespace)
+  // ===================
+
+  async listEnvironments(options?: { project?: string; name?: string }): Promise<CLIResult<any[]>> {
+    let url = '/api/cli/envs'
+    const params: string[] = []
+    if (options?.project) params.push(`project=${options.project}`)
+    if (options?.name) params.push(`name=${options.name}`)
+    if (params.length > 0) url += '?' + params.join('&')
+    return this.request<any[]>('GET', url)
+  }
+
+  async getEnvironment(namespace: string): Promise<CLIResult<any>> {
+    return this.request<any>('GET', `/api/cli/envs/${namespace}`)
+  }
+
+  async createEnvironment(name: string, namespace: string, projectCode?: string): Promise<CLIResult<any>> {
+    return this.request<any>('POST', '/api/cli/envs', {
+      name,
+      namespace,
+      projectCode
+    })
+  }
+
+  async deleteEnvironment(namespace: string): Promise<CLIResult<void>> {
+    return this.request<void>('DELETE', `/api/cli/envs/${namespace}`)
+  }
+
+  // ===================
+  // Deployment (CLI API)
+  // ===================
+
+  async deployService(
+    namespace: string, 
+    name: string, 
+    image: string, 
+    options?: {
+      projectCode?: string
+      replicas?: number
+      port?: number
+      env?: Record<string, string>
+    }
+  ): Promise<CLIResult<any>> {
+    return this.request<any>('POST', `/api/cli/services/${namespace}/${name}/deploy`, {
+      image,
+      projectCode: options?.projectCode,
+      replicas: options?.replicas,
+      port: options?.port,
+      env: options?.env
+    })
+  }
+
+  async listServiceDeployments(namespace: string, name: string): Promise<CLIResult<any>> {
+    return this.request<any>('GET', `/api/cli/services/${namespace}/${name}/deployments`)
+  }
+
   // ===================
   // Service (CLI API - using ns/name)
   // ===================

package/src/commands/auth/login.ts

@@ -6,7 +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('-u, --api-url <url>', 'API server URL', 'http://xw.xuanwu-prod.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')
@@ -44,16 +44,18 @@ async function loginWithBrowser(sessionManager: SessionManager, apiUrl: string):
 
   const { sessionId, loginUrl, code } = await deviceAuthRes.json() as { sessionId: string; loginUrl: string; code: string }
 
+  const fullLoginUrl = loginUrl.startsWith('http') ? loginUrl : `${finalApiUrl}${loginUrl}`
+
   OutputFormatter.info('正在生成设备授权码...')
   console.log(`授权码: ${code}`)
-  console.log(`已打开浏览器: ${loginUrl}`)
+  console.log(`已打开浏览器: ${fullLoginUrl}`)
   OutputFormatter.info('请在浏览器中完成授权')
   OutputFormatter.info('等待授权...')
 
   try {
-    await open(loginUrl)
+    await open(fullLoginUrl)
   } catch (error) {
-    console.log(`如果浏览器未打开，请手动访问: ${loginUrl}`)
+    console.log(`如果浏览器未打开，请手动访问: ${fullLoginUrl}`)
   }
 
   const maxAttempts = 60

package/src/commands/deploy.ts

@@ -6,27 +6,22 @@ import { Command } from 'commander'
 import { configStore } from '../config/store'
 import { createClient } from '../api/client'
 import { OutputFormatter } from '../output/formatter'
-import { DeployOptions } from '../config/types'
+
+function parseNamespaceName(input: string): { namespace: string; name: string } | null {
+  const parts = input.split('/')
+  if (parts.length !== 2) {
+    return null
+  }
+  return { namespace: parts[0], name: parts[1] }
+}
 
 export function makeDeployCommand(): Command {
   const cmd = new Command('deploy')
-    .description('Deploy services to environment')
-    .argument('<namespace>', 'Target namespace')
-    .argument('<service-name>', 'Service name')
-    .option('-t, --type <type>', 'Service type (application|database|image)', 'image')
-    .option('--git <url>', 'Git repository URL')
-    .option('--git-branch <branch>', 'Git branch', 'main')
-    .option('--build-type <type>', 'Build type (template|dockerfile)', 'template')
-    .option('--language <lang>', 'Language (java-springboot|nodejs|python|golang)')
-    .option('--dockerfile-path <path>', 'Dockerfile path')
-    .option('--db-type <type>', 'Database type (mysql|redis|postgres|elasticsearch)')
-    .option('--db-version <version>', 'Database version')
-    .option('--root-password <password>', 'Root password')
-    .option('--password <password>', 'Password')
-    .option('--user <user>', 'Username')
-    .option('--database <name>', 'Database name')
-    .option('--image <image>', 'Container image')
-    .option('-p, --port <port>', 'Container port')
+    .description('Deploy services to environment (auto-creates service if not exists)')
+    .argument('<ns-name>', 'Target namespace and service name (format: namespace/service-name)')
+    .requiredOption('-i, --image <image>', 'Container image (required)')
+    .option('-p, --project <code>', 'Project code')
+    .option('--port <port>', 'Container port', '80')
     .option('-r, --replicas <num>', 'Number of replicas', '1')
     .option('--cpu <value>', 'CPU limit')
     .option('--memory <value>', 'Memory limit')
@@ -36,47 +31,35 @@ export function makeDeployCommand(): Command {
       memo[key] = value
       return memo
     }, {})
-    .action(async (namespace, serviceName, options) => {
+    .action(async (nsName, options) => {
       const conn = configStore.getDefaultConnection()
       if (!conn) {
         OutputFormatter.error('No connection configured')
         return
       }
 
-      const type = options.type as 'application' | 'database' | 'image'
-      
-      const deployOptions: DeployOptions = {
-        namespace,
-        serviceName,
-        type,
-        port: options.port ? parseInt(options.port) : undefined,
-        replicas: options.replicas ? parseInt(options.replicas) : undefined,
-        cpu: options.cpu,
-        memory: options.memory,
-        domain: options.domain,
-        envVars: options.env
+      const parsed = parseNamespaceName(nsName)
+      if (!parsed) {
+        OutputFormatter.error('Invalid format. Use: <namespace>/<service-name>')
+        return
       }
 
-      // 根据类型添加配置
-      if (type === 'application') {
-        deployOptions.git = options.git
-        deployOptions.gitBranch = options.gitBranch
-        deployOptions.buildType = options.buildType
-        deployOptions.language = options.language
-        deployOptions.dockerfilePath = options.dockerfilePath
-      } else if (type === 'database') {
-        deployOptions.dbType = options.dbType
-        deployOptions.dbVersion = options.dbVersion
-        deployOptions.rootPassword = options.rootPassword
-        deployOptions.password = options.password
-        deployOptions.user = options.user
-        deployOptions.database = options.database
-      } else if (type === 'image') {
-        deployOptions.image = options.image
-      }
+      const { namespace, name: serviceName } = parsed
 
       const client = createClient(conn)
-      const result = await client.deploy(deployOptions)
+      
+      // 使用 CLI API 进行部署
+      const result = await client.deployService(
+        namespace,
+        serviceName,
+        options.image,
+        {
+          projectCode: options.project,
+          replicas: options.replicas ? parseInt(options.replicas) : 1,
+          port: options.port ? parseInt(options.port) : 80,
+          env: options.env
+        }
+      )
 
       if (!result.success) {
         OutputFormatter.error(result.error!.message)

package/src/commands/env.ts

@@ -13,16 +13,18 @@ export function makeEnvCommand(): Command {
 
   cmd
     .command('ls')
+    .alias('list')
     .description('List accessible environments')
-    .action(async () => {
+    .option('-p, --project <project-code>', 'Filter by project code')
+    .action(async (options) => {
       const conn = configStore.getDefaultConnection()
       if (!conn) {
-        OutputFormatter.error('No connection configured. Run: xuanwu connect add <name> -e <endpoint> -t <token>')
+        OutputFormatter.error('No connection configured. Run: xw connect add <name> -e <endpoint> -t <token>')
         return
       }
 
       const client = createClient(conn)
-      const result = await client.listNamespaces()
+      const result = await client.listEnvironments({ project: options.project })
 
       if (!result.success) {
         OutputFormatter.error(result.error!.message)
@@ -36,22 +38,20 @@ export function makeEnvCommand(): Command {
       }
 
       OutputFormatter.table(
-        ['Name', 'Identifier', 'Environment', 'Status'],
+        ['Name', 'Namespace', 'Project', 'Services'],
         spaces.map((s: any) => [
-          s.name || s.identifier,
-          s.identifier,
-          s.environment,
-          s.status || 'active'
+          s.name,
+          s.namespace,
+          s.project?.name || '-',
+          s._count?.services || 0
         ])
       )
     })
 
   cmd
-    .command('create <namespace>')
-    .description('Create a new environment (K8s namespace)')
-    .option('-p, --project-id <id>', 'Project ID')
-    .option('-e, --environment <env>', 'Environment type (development|staging|production)', 'development')
-    .action(async (namespace, options) => {
+    .command('get <namespace>')
+    .description('Get environment details')
+    .action(async (namespace) => {
       const conn = configStore.getDefaultConnection()
       if (!conn) {
         OutputFormatter.error('No connection configured')
@@ -59,34 +59,26 @@ export function makeEnvCommand(): Command {
       }
 
       const client = createClient(conn)
-      
-      let projectId = options.projectId
-      
-      // 如果没有指定 project-id，尝试获取第一个项目
-      if (!projectId) {
-        const projectsResult = await client.getProjects()
-        if (!projectsResult.success || !projectsResult.data || projectsResult.data.length === 0) {
-          OutputFormatter.error('No projects found. Please specify --project-id')
-          return
-        }
-        projectId = projectsResult.data[0].id
-        OutputFormatter.info(`Using project: ${projectsResult.data[0].name}`)
-      }
-
-      const result = await client.createNamespaceWithProject(namespace, projectId, options.environment)
+      const result = await client.getEnvironment(namespace)
 
       if (!result.success) {
         OutputFormatter.error(result.error!.message)
         return
       }
 
-      OutputFormatter.success(`Environment "${namespace}" created`)
+      const env = result.data
+      OutputFormatter.info(`Name: ${env.name}`)
+      OutputFormatter.info(`Namespace: ${env.namespace}`)
+      OutputFormatter.info(`Project: ${env.project?.name || '-'}`)
+      OutputFormatter.info(`Services: ${env.services?.length || 0}`)
     })
 
   cmd
-    .command('rm <namespace>')
-    .description('Delete an environment')
-    .action(async (namespace) => {
+    .command('create <namespace>')
+    .description('Create a new environment (K8s namespace)')
+    .option('-n, --name <name>', 'Environment name')
+    .option('-p, --project <project-code>', 'Project code')
+    .action(async (namespace, options) => {
       const conn = configStore.getDefaultConnection()
       if (!conn) {
         OutputFormatter.error('No connection configured')
@@ -95,28 +87,24 @@ export function makeEnvCommand(): Command {
 
       const client = createClient(conn)
       
-      // 先获取 namespace ID
-      const infoResult = await client.getNamespaceInfo(namespace)
-      if (!infoResult.success || !infoResult.data) {
-        OutputFormatter.error(`Environment "${namespace}" not found`)
-        return
-      }
-
-      const envData = Array.isArray(infoResult.data) ? infoResult.data[0] : infoResult.data
-      const id = envData.id
-      const result = await client.deleteNamespace(id)
+      const result = await client.createEnvironment(
+        options.name || namespace,
+        namespace,
+        options.project
+      )
 
       if (!result.success) {
         OutputFormatter.error(result.error!.message)
         return
       }
 
-      OutputFormatter.success(`Environment "${namespace}" deleted`)
+      OutputFormatter.success(`Environment "${namespace}" created`)
     })
 
   cmd
-    .command('info <namespace>')
-    .description('Show environment details')
+    .command('rm <namespace>')
+    .alias('delete')
+    .description('Delete an environment')
     .action(async (namespace) => {
       const conn = configStore.getDefaultConnection()
       if (!conn) {
@@ -125,19 +113,14 @@ export function makeEnvCommand(): Command {
       }
 
       const client = createClient(conn)
-      const result = await client.getNamespaceInfo(namespace)
+      const result = await client.deleteEnvironment(namespace)
 
       if (!result.success) {
         OutputFormatter.error(result.error!.message)
         return
       }
 
-      const info = result.data
-      OutputFormatter.info(`Name: ${info.name}`)
-      OutputFormatter.info(`Identifier: ${info.identifier}`)
-      OutputFormatter.info(`Namespace: ${info.namespace}`)
-      OutputFormatter.info(`Environment: ${info.environment}`)
-      OutputFormatter.info(`Status: ${info.status}`)
+      OutputFormatter.success(`Environment "${namespace}" deleted`)
     })
 
   return cmd