xuanwu-cli 1.0.0 → 2.1.0

package/src/config/types.ts

@@ -97,3 +97,108 @@ export interface CLIResult<T = any> {
     duration?: number
   }
 }
+
+// ===================
+// Application Types
+// ===================
+
+export interface Application {
+  id: string
+  code: string
+  name: string
+  gitRepo: string
+  gitBranch: string
+  buildPath: string
+  dockerfile: string
+  buildArgs?: Record<string, string>
+  imageName: string
+  jenkinsConfigId?: string
+  jenkinsJobName?: string
+  createdAt: string
+  updatedAt: string
+}
+
+export interface CreateApplicationDto {
+  name: string
+  code?: string
+  gitRepo: string
+  gitBranch?: string
+  imageName?: string
+  buildPath?: string
+  dockerfile?: string
+  buildArgs?: Record<string, string>
+  jenkinsConfigId?: string
+  jenkinsJobName?: string
+}
+
+export interface UpdateApplicationDto {
+  name?: string
+  gitRepo?: string
+  gitBranch?: string
+  imageName?: string
+  buildPath?: string
+  dockerfile?: string
+  buildArgs?: Record<string, string>
+  jenkinsConfigId?: string
+  jenkinsJobName?: string
+}
+
+// ===================
+// Build Types
+// ===================
+
+export interface Build {
+  id: string
+  buildNumber: number
+  status: string
+  imageTag: string
+  commitSha?: string
+  commitMessage?: string
+  commitAuthor?: string
+  createdAt: string
+  completedAt?: string
+}
+
+export interface TriggerBuildOptions {
+  gitBranch?: string
+  commitSha?: string
+  commitMessage?: string
+  commitAuthor?: string
+}
+
+// ===================
+// Service Types (K8s)
+// ===================
+
+export interface K8sService {
+  name: string
+  namespace: string
+  type: string
+  clusterIP: string
+  externalIP?: string
+  ports: { port: number; targetPort: number; protocol: string }[]
+  age: string
+}
+
+export interface K8sDeployment {
+  name: string
+  namespace: string
+  replicas: number
+  readyReplicas: number
+  availableReplicas: number
+  image: string
+  labels?: Record<string, string>
+  createdAt: string
+}
+
+export interface K8sPod {
+  name: string
+  namespace: string
+  status: string
+  ready: string
+  restarts: number
+  age: string
+  ip: string
+  node: string
+  containers: { name: string; image: string }[]
+}

package/src/index.ts

@@ -7,121 +7,37 @@ import { configStore } from './config/store'
 import { makeConnectCommand } from './commands/connect'
 import { makeEnvCommand } from './commands/env'
 import { makeDeployCommand } from './commands/deploy'
+import { makeAppCommand } from './commands/app'
 import { makeSvcCommand } from './commands/svc'
 import { makeBuildCommand } from './commands/build'
 import { makeScaleCommand } from './commands/scale'
 import { makeLogsCommand } from './commands/logs'
 import { makePodsCommand } from './commands/pods'
+import { makeLoginCommand } from './commands/auth/login'
+import { makeLogoutCommand } from './commands/auth/logout'
+import { makeWhoamiCommand } from './commands/auth/whoami'
+import { makeTokensCommand } from './commands/auth/tokens'
 
 const program = new Command()
 
 program
-  .name('xuanwu')
+  .name('xw')
   .description('玄武工厂平台 CLI 工具')
-  .version('1.0.0')
+  .version('2.0.0')
   .option('-o, --output <format>', 'Output format (human|json)', 'human')
 
-// 添加子命令
 program.addCommand(makeConnectCommand())
 program.addCommand(makeEnvCommand())
-program.addCommand(makeDeployCommand())
+program.addCommand(makeAppCommand())
 program.addCommand(makeSvcCommand())
 program.addCommand(makeBuildCommand())
+program.addCommand(makeDeployCommand())
 program.addCommand(makeScaleCommand())
 program.addCommand(makeLogsCommand())
 program.addCommand(makePodsCommand())
+program.addCommand(makeLoginCommand())
+program.addCommand(makeLogoutCommand())
+program.addCommand(makeWhoamiCommand())
+program.addCommand(makeTokensCommand())
 
-// 快捷命令：直接 deploy 也支持
-program
-  .command('up <namespace> <service-name>')
-  .description('Build and deploy a service')
-  .action(async (namespace, serviceName) => {
-    const { makeBuildCommand } = await import('./commands/build')
-    const buildCmd = makeBuildCommand()
-    // 简化：只调用部署
-    console.log('Use: xuanwu build <namespace> <service-name> && xuanwu deploy <namespace> <service-name>')
-  })
-
-// restart 命令
-program
-  .command('restart <namespace> <service-name>')
-  .description('Restart a service')
-  .action(async (namespace, serviceName) => {
-    console.log('Restarting service... (not implemented)')
-  })
-
-// exec 命令
-program
-  .command('exec <namespace> <service-name>')
-  .description('Execute command in container')
-  .option('-c, --command <cmd>', 'Command to execute', 'ls -la')
-  .option('-p, --pod <pod-name>', 'Specific pod name')
-  .action(async (namespace, serviceName, options) => {
-    const { configStore } = await import('./config/store')
-    const { createClient } = await import('./api/client')
-    const { OutputFormatter } = await import('./output/formatter')
-    
-    const conn = configStore.getDefaultConnection()
-    if (!conn) {
-      OutputFormatter.error('No connection configured')
-      return
-    }
-
-    const client = createClient(conn)
-    const result = await client.exec(namespace, serviceName, options.command, options.pod)
-
-    if (!result.success) {
-      OutputFormatter.error(result.error!.message)
-      return
-    }
-
-    const data = result.data
-    if (data.stdout) console.log(data.stdout)
-    if (data.stderr) console.error(data.stderr)
-    if (data.exitCode !== 0) {
-      process.exit(data.exitCode)
-    }
-  })
-
-// top 命令
-program
-  .command('top <namespace> <service-name>')
-  .description('Show resource usage')
-  .option('-p, --pod <pod-name>', 'Specific pod name')
-  .action(async (namespace, serviceName, options) => {
-    const { configStore } = await import('./config/store')
-    const { createClient } = await import('./api/client')
-    const { OutputFormatter } = await import('./output/formatter')
-    
-    const conn = configStore.getDefaultConnection()
-    if (!conn) {
-      OutputFormatter.error('No connection configured')
-      return
-    }
-
-    const client = createClient(conn)
-    const result = await client.getMetrics(namespace, serviceName, options.pod)
-
-    if (!result.success) {
-      OutputFormatter.error(result.error!.message)
-      return
-    }
-
-    const pods = result.data?.pods || []
-    if (pods.length === 0) {
-      OutputFormatter.info('No pod metrics found')
-      return
-    }
-
-    OutputFormatter.table(
-      ['Pod Name', 'CPU', 'Memory'],
-      pods.map((p: any) => [
-        p.name,
-        p.containers?.[0]?.cpuRaw || 'N/A',
-        p.containers?.[0]?.memoryRaw || 'N/A'
-      ])
-    )
-  })
-
-// 解析参数
 program.parse(process.argv)

package/src/lib/auth.ts

@@ -0,0 +1,41 @@
+import { SessionManager } from './session'
+
+export interface ApiOptions {
+  method?: string
+  body?: any
+  headers?: Record<string, string>
+}
+
+export async function authenticatedFetch(
+  url: string,
+  options: ApiOptions = {}
+): Promise<Response> {
+  const sessionManager = new SessionManager()
+  const session = await sessionManager.loadSession()
+
+  if (!session) {
+    throw new Error('Not logged in. Please run: xw login')
+  }
+
+  if (sessionManager.isExpired(session)) {
+    await sessionManager.clearSession()
+    throw new Error('Session expired. Please run: xw login')
+  }
+
+  const response = await fetch(url, {
+    method: options.method || 'GET',
+    headers: {
+      'Authorization': `Bearer ${session.token}`,
+      'Content-Type': 'application/json',
+      ...options.headers
+    },
+    body: options.body ? JSON.stringify(options.body) : undefined
+  })
+
+  if (response.status === 401) {
+    await sessionManager.clearSession()
+    throw new Error('Authentication failed. Please run: xw login')
+  }
+
+  return response
+}

package/src/lib/session.ts

@@ -0,0 +1,50 @@
+import * as fs from 'fs/promises'
+import * as path from 'path'
+import * as os from 'os'
+
+export interface Session {
+  token: string
+  userId: string
+  userName: string
+  userEmail: string
+  userRole: string
+  deviceId: string
+  expiresAt: string | null
+  apiUrl: string
+}
+
+export class SessionManager {
+  private sessionPath: string
+
+  constructor() {
+    this.sessionPath = path.join(os.homedir(), '.xw', 'session.json')
+  }
+
+  async saveSession(session: Session): Promise<void> {
+    const dir = path.dirname(this.sessionPath)
+    await fs.mkdir(dir, { recursive: true })
+    await fs.writeFile(this.sessionPath, JSON.stringify(session, null, 2))
+  }
+
+  async loadSession(): Promise<Session | null> {
+    try {
+      const content = await fs.readFile(this.sessionPath, 'utf-8')
+      return JSON.parse(content)
+    } catch {
+      return null
+    }
+  }
+
+  async clearSession(): Promise<void> {
+    try {
+      await fs.unlink(this.sessionPath)
+    } catch {
+      // Ignore errors
+    }
+  }
+
+  isExpired(session: Session): boolean {
+    if (!session.expiresAt) return false
+    return new Date(session.expiresAt) < new Date()
+  }
+}

package/test/REPORT.md

@@ -0,0 +1,78 @@
+# 集成测试报告 - CLI API v2.0
+
+> 测试时间: 2026-03-11 06:13:57
+> 测试环境: localhost:3000
+> 测试用户: test@cli.local (ADMIN)
+
+## 执行摘要
+
+| 指标 | 数值 |
+|------|------|
+| 总测试数 | 17 |
+| 通过 | 17 ✅ |
+| 失败 | 0 ❌ |
+| **通过率** | **100.0%** |
+
+## 测试结果详情
+
+### Application API (使用 code 标识)
+
+| # | 测试项 | 状态 | 说明 |
+|---|--------|------|------|
+| 1 | listApplications | ✅ PASS | 列出所有应用 |
+| 2 | createApplication | ✅ PASS | 创建应用 (code: xw-cli-test-app) |
+| 3 | getApplication | ✅ PASS | 获取应用详情 |
+| 4 | updateApplication | ✅ PASS | 更新应用 |
+| 5 | triggerApplicationBuild | ✅ PASS | 触发构建 (buildNumber: 1, status: QUEUED) |
+| 6 | listApplicationBuilds | ✅ PASS | 列出应用构建 |
+| 7 | listBuilds | ✅ PASS | 列出所有构建 |
+
+### Build API
+
+| # | 测试项 | 状态 | 说明 |
+|---|--------|------|------|
+| 8 | getBuild | ✅ PASS | 获取构建详情 |
+
+### Service API (使用 ns/name 路径)
+
+| # | 测试项 | 状态 | 说明 |
+|---|--------|------|------|
+| 9 | listK8sServices | ✅ PASS | 列出所有 K8s 服务 |
+| 10 | listK8sServices (namespace) | ✅ PASS | 列出指定 namespace 服务 |
+| 11 | getK8sService | ✅ PASS | 获取服务详情 (cli-test-fix/nginx) |
+| 12 | getK8sServiceStatus | ✅ PASS | 获取部署状态 |
+| 13 | getK8sServiceLogs | ✅ PASS | 获取服务日志 |
+| 14 | listK8sServicePods | ✅ PASS | 列出 Pods |
+| 15 | scaleK8sService | ✅ PASS | 扩缩容 (扩到 2 副本) |
+| 16 | restartK8sService | ✅ PASS | 重启服务 |
+| 17 | scaleK8sService (restore) | ✅ PASS | 恢复扩缩容 (缩到 1 副本) |
+
+## 测试数据
+
+- **应用**: xw-cli-test-app
+- **命名空间**: cli-test-fix
+- **服务**: nginx (image: nginx:latest)
+
+## API 路由验证
+
+所有设计文档中定义的 CLI API 路由均已实现并正常工作：
+
+- `GET /api/cli/apps` ✅
+- `POST /api/applications` ✅
+- `GET /api/cli/apps/:code` ✅
+- `PUT /api/cli/apps/:code` ✅
+- `POST /api/cli/apps/:code/build` ✅
+- `GET /api/cli/apps/:code/builds` ✅
+- `GET /api/cli/builds` ✅
+- `GET /api/cli/builds/:id` ✅
+- `GET /api/cli/services` ✅
+- `GET /api/cli/services/:ns/:name` ✅
+- `GET /api/cli/services/:ns/:name/status` ✅
+- `GET /api/cli/services/:ns/:name/logs` ✅
+- `POST /api/cli/services/:ns/:name/restart` ✅
+- `POST /api/cli/services/:ns/:name/scale` ✅
+- `GET /api/cli/services/:ns/:name/pods` ✅
+
+## 结论
+
+CLI v2.0 重构成功！所有 17 个集成测试全部通过，API 功能完整可用。