xuanwu-cli 2.2.0 → 2.3.3

package/__tests__/integration/webhook.integration.test.ts

@@ -0,0 +1,246 @@
+/**
+ * Webhook 集成测试
+ * 测试 Git 和 Jenkins Webhook
+ */
+
+import { generateRandomCode } from '../helpers/test-utils'
+
+const API_URL = process.env.TEST_API_URL || 'https://i.xuanwu.dev.aimstek.cn'
+const TEST_EMAIL = process.env.TEST_USER_EMAIL || ''
+const TEST_PASSWORD = process.env.TEST_USER_PASSWORD || ''
+
+describe('Webhook Integration Tests', () => {
+  let testToken: string
+  let testAppCode: string
+
+  beforeAll(async () => {
+    if (!TEST_EMAIL || !TEST_PASSWORD) {
+      console.warn('Skipping tests: TEST_USER_EMAIL and TEST_USER_PASSWORD not set')
+      return
+    }
+
+    const response = await fetch(`${API_URL}/api/cli/auth/login`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({
+        email: TEST_EMAIL,
+        password: TEST_PASSWORD,
+        deviceName: 'Test CLI',
+        expiresIn: '30d'
+      })
+    })
+
+    if (!response.ok) {
+      throw new Error('Failed to login')
+    }
+
+    const data = await response.json() as { token: string }
+    testToken = data.token
+  })
+
+  describe('Git Webhook', () => {
+    test.skipIf(!TEST_EMAIL || !TEST_PASSWORD)('should handle git push webhook', async () => {
+      testAppCode = generateRandomCode('webhook-test')
+      
+      const createResponse = await fetch(`${API_URL}/api/applications`, {
+        method: 'POST',
+        headers: {
+          'Authorization': `Bearer ${testToken}`,
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify({
+          name: 'Webhook测试应用',
+          code: testAppCode,
+          gitRepo: 'https://github.com/example/test.git'
+        })
+      })
+
+      if (!createResponse.ok) {
+        console.warn('Failed to create application for webhook test')
+        return
+      }
+
+      const pushPayload = {
+        ref: 'refs/heads/main',
+        before: 'abc123',
+        after: 'def456',
+        repository: {
+          clone_url: 'https://github.com/example/test.git'
+        },
+        commits: [
+          {
+            id: 'def456',
+            message: 'Test commit',
+            author: {
+              name: 'Test User',
+              email: 'test@example.com'
+            }
+          }
+        ]
+      }
+
+      const response = await fetch(`${API_URL}/api/webhooks/git/${testAppCode}`, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify(pushPayload)
+      })
+
+      expect(response.ok).toBeTruthy()
+
+      const cleanupResponse = await fetch(`${API_URL}/api/cli/apps/${testAppCode}`, {
+        method: 'DELETE',
+        headers: {
+          'Authorization': `Bearer ${testToken}`
+        }
+      })
+    })
+
+    test.skipIf(!TEST_EMAIL || !TEST_PASSWORD)('should fail for non-existent application', async () => {
+      const response = await fetch(`${API_URL}/api/webhooks/git/non-existent-app`, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify({
+          ref: 'refs/heads/main',
+          commits: []
+        })
+      })
+
+      expect(response.ok).toBeFalsy()
+    })
+
+    test.skipIf(!TEST_EMAIL || !TEST_PASSWORD)('should validate webhook signature', async () => {
+      testAppCode = generateRandomCode('webhook-test')
+      
+      await fetch(`${API_URL}/api/applications`, {
+        method: 'POST',
+        headers: {
+          'Authorization': `Bearer ${testToken}`,
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify({
+          name: 'Webhook测试应用',
+          code: testAppCode,
+          gitRepo: 'https://github.com/example/test.git'
+        })
+      })
+
+      const payload = JSON.stringify({
+        ref: 'refs/heads/main',
+        commits: []
+      })
+
+      const crypto = require('crypto')
+      const secret = 'webhook-secret'
+      const signature = 'sha256=' + crypto.createHmac('sha256', secret).update(payload).digest('hex')
+
+      const response = await fetch(`${API_URL}/api/webhooks/git/${testAppCode}`, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          'X-Hub-Signature-256': signature
+        },
+        body: payload
+      })
+
+      await fetch(`${API_URL}/api/cli/apps/${testAppCode}`, {
+        method: 'DELETE',
+        headers: {
+          'Authorization': `Bearer ${testToken}`
+        }
+      })
+    })
+  })
+
+  describe('Jenkins Webhook', () => {
+    test.skipIf(!TEST_EMAIL || !TEST_PASSWORD)('should handle jenkins build complete webhook', async () => {
+      testAppCode = generateRandomCode('webhook-test')
+      
+      const createResponse = await fetch(`${API_URL}/api/applications`, {
+        method: 'POST',
+        headers: {
+          'Authorization': `Bearer ${testToken}`,
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify({
+          name: 'Webhook测试应用',
+          code: testAppCode,
+          gitRepo: 'https://github.com/example/test.git'
+        })
+      })
+
+      if (!createResponse.ok) {
+        console.warn('Failed to create application for webhook test')
+        return
+      }
+
+      const jenkinsPayload = {
+        buildNumber: 1,
+        status: 'SUCCESS',
+        imageTag: 'registry.example.com/app:v1.0.0',
+        duration: 120
+      }
+
+      const response = await fetch(`${API_URL}/api/webhooks/jenkins/${testAppCode}`, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify(jenkinsPayload)
+      })
+
+      expect(response.ok).toBeTruthy()
+
+      await fetch(`${API_URL}/api/cli/apps/${testAppCode}`, {
+        method: 'DELETE',
+        headers: {
+          'Authorization': `Bearer ${testToken}`
+        }
+      })
+    })
+
+    test.skipIf(!TEST_EMAIL || !TEST_PASSWORD)('should handle jenkins build failed webhook', async () => {
+      testAppCode = generateRandomCode('webhook-test')
+      
+      await fetch(`${API_URL}/api/applications`, {
+        method: 'POST',
+        headers: {
+          'Authorization': `Bearer ${testToken}`,
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify({
+          name: 'Webhook测试应用',
+          code: testAppCode,
+          gitRepo: 'https://github.com/example/test.git'
+        })
+      })
+
+      const jenkinsPayload = {
+        buildNumber: 1,
+        status: 'FAILED',
+        error: 'Build failed',
+        duration: 60
+      }
+
+      const response = await fetch(`${API_URL}/api/webhooks/jenkins/${testAppCode}`, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify(jenkinsPayload)
+      })
+
+      expect(response.ok).toBeTruthy()
+
+      await fetch(`${API_URL}/api/cli/apps/${testAppCode}`, {
+        method: 'DELETE',
+        headers: {
+          'Authorization': `Bearer ${testToken}`
+        }
+      })
+    })
+  })
+})

package/__tests__/run-e2e.js

@@ -0,0 +1,360 @@
+#!/usr/bin/env node
+/**
+ * E2E 测试独立运行器
+ * 不依赖 Jest，直接运行端到端测试
+ */
+
+const { spawn } = require('child_process')
+const path = require('path')
+
+const API_URL = process.env.TEST_API_URL || 'https://i.xuanwu.dev.aimstek.cn'
+const TEST_EMAIL = process.env.TEST_USER_EMAIL || ''
+const TEST_PASSWORD = process.env.TEST_USER_PASSWORD || ''
+
+class CLIExecutor {
+  constructor() {
+    this.cliPath = path.join(__dirname, '..', 'bin', 'xuanwu')
+  }
+
+  async execute(args, options = {}) {
+    return new Promise((resolve, reject) => {
+      const timeout = options.timeout || 30000
+      const env = { ...process.env, ...options.env }
+      
+      const proc = spawn('node', [this.cliPath, ...args], {
+        env,
+        timeout
+      })
+
+      let stdout = ''
+      let stderr = ''
+
+      proc.stdout.on('data', (data) => {
+        stdout += data.toString()
+      })
+
+      proc.stderr.on('data', (data) => {
+        stderr += data.toString()
+      })
+
+      proc.on('close', (code) => {
+        resolve({
+          stdout,
+          stderr,
+          exitCode: code || 0
+        })
+      })
+
+      proc.on('error', (error) => {
+        reject(error)
+      })
+    })
+  }
+}
+
+function sleep(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms))
+}
+
+function generateRandomCode(prefix = 'test') {
+  return `${prefix}-${Date.now()}-${Math.random().toString(36).substring(7)}`
+}
+
+async function runTests() {
+  const cli = new CLIExecutor()
+  let passed = 0
+  let failed = 0
+  let skipped = 0
+
+  console.log('========================================')
+  console.log('玄武工厂 CLI E2E 测试')
+  console.log('========================================\n')
+
+  console.log(`API URL: ${API_URL}`)
+  console.log(`Test Email: ${TEST_EMAIL || '(未设置)'}\n`)
+
+  // 测试 1: 帮助命令
+  console.log('测试 1: 显示帮助信息')
+  try {
+    const result = await cli.execute(['--help'])
+    if (result.exitCode === 0 && result.stdout.includes('玄武工厂')) {
+      console.log('✅ 通过 - 帮助命令正常工作')
+      passed++
+    } else {
+      console.log('❌ 失败 - 帮助命令输出不正确')
+      failed++
+    }
+  } catch (error) {
+    console.log('❌ 失败 - 帮助命令执行出错:', error.message)
+    failed++
+  }
+
+  // 测试 2: 版本命令
+  console.log('\n测试 2: 显示版本信息')
+  try {
+    const result = await cli.execute(['--version'])
+    if (result.exitCode === 0) {
+      console.log('✅ 通过 - 版本命令正常工作')
+      console.log(`   输出: ${result.stdout.trim()}`)
+      passed++
+    } else {
+      console.log('❌ 失败 - 版本命令返回非零退出码')
+      failed++
+    }
+  } catch (error) {
+    console.log('❌ 失败 - 版本命令执行出错:', error.message)
+    failed++
+  }
+
+  // 测试 3: 无效命令
+  console.log('\n测试 3: 无效命令处理')
+  try {
+    const result = await cli.execute(['invalid-command'])
+    if (result.exitCode !== 0) {
+      console.log('✅ 通过 - 无效命令正确返回错误')
+      passed++
+    } else {
+      console.log('❌ 失败 - 无效命令应该返回错误')
+      failed++
+    }
+  } catch (error) {
+    console.log('❌ 失败 - 无效命令执行出错:', error.message)
+    failed++
+  }
+
+  // 测试 4: 登录（如果提供了凭据）
+  if (TEST_EMAIL && TEST_PASSWORD) {
+    console.log('\n测试 4: 邮箱密码登录')
+    try {
+      const result = await cli.execute([
+        'login',
+        '--email', TEST_EMAIL,
+        '--password', TEST_PASSWORD,
+        '--api-url', API_URL,
+        '--expires-in', '30d'
+      ], { timeout: 60000 })
+      
+      if (result.exitCode === 0 && result.stdout.includes('登录成功')) {
+        console.log('✅ 通过 - 登录成功')
+        console.log(`   用户: ${TEST_EMAIL}`)
+        passed++
+      } else {
+        console.log('❌ 失败 - 登录失败')
+        console.log(`   错误: ${result.stderr || result.stdout}`)
+        failed++
+      }
+    } catch (error) {
+      console.log('❌ 失败 - 登录执行出错:', error.message)
+      failed++
+    }
+
+    // 测试 5: 查看当前用户
+    console.log('\n测试 5: 查看当前用户信息 (whoami)')
+    try {
+      const result = await cli.execute(['whoami'])
+      if (result.exitCode === 0 && result.stdout.includes(TEST_EMAIL)) {
+        console.log('✅ 通过 - whoami 命令正常')
+        passed++
+      } else {
+        console.log('❌ 失败 - whoami 命令返回错误')
+        failed++
+      }
+    } catch (error) {
+      console.log('❌ 失败 - whoami 执行出错:', error.message)
+      failed++
+    }
+
+    // 测试 6: 列出应用
+    console.log('\n测试 6: 列出应用')
+    try {
+      const result = await cli.execute(['app', 'ls'])
+      if (result.exitCode === 0) {
+        console.log('✅ 通过 - 应用列表命令正常')
+        passed++
+      } else {
+        console.log('❌ 失败 - 应用列表命令返回错误')
+        failed++
+      }
+    } catch (error) {
+      console.log('❌ 失败 - 应用列表执行出错:', error.message)
+      failed++
+    }
+
+    // 测试 7: 创建应用
+    console.log('\n测试 7: 创建应用')
+    const testAppCode = generateRandomCode('e2e-test')
+    try {
+      const result = await cli.execute([
+        'app', 'create',
+        '--name', 'E2E测试应用',
+        '--code', testAppCode,
+        '--git', 'https://github.com/example/test.git'
+      ], { timeout: 60000 })
+      
+      if (result.exitCode === 0 && result.stdout.includes('created')) {
+        console.log('✅ 通过 - 应用创建成功')
+        console.log(`   Code: ${testAppCode}`)
+        passed++
+        
+        // 测试 8: 获取应用详情
+        console.log('\n测试 8: 获取应用详情')
+        await sleep(1000)
+        const getResult = await cli.execute(['app', 'get', testAppCode])
+        if (getResult.exitCode === 0 && getResult.stdout.includes(testAppCode)) {
+          console.log('✅ 通过 - 应用详情查询成功')
+          passed++
+        } else {
+          console.log('❌ 失败 - 应用详情查询失败')
+          failed++
+        }
+
+        // 测试 9: 更新应用
+        console.log('\n测试 9: 更新应用')
+        const updateResult = await cli.execute([
+          'app', 'update', testAppCode,
+          '--name', '更新后的应用名'
+        ])
+        if (updateResult.exitCode === 0 && updateResult.stdout.includes('updated')) {
+          console.log('✅ 通过 - 应用更新成功')
+          passed++
+        } else {
+          console.log('❌ 失败 - 应用更新失败')
+          failed++
+        }
+
+        // 测试 10: 触发构建
+        console.log('\n测试 10: 触发构建')
+        const buildResult = await cli.execute(['app', 'build', testAppCode], { timeout: 60000 })
+        if (buildResult.exitCode === 0 && buildResult.stdout.includes('started')) {
+          console.log('✅ 通过 - 构建触发成功')
+          passed++
+        } else {
+          console.log('❌ 失败 - 构建触发失败')
+          console.log(`   错误: ${buildResult.stderr || buildResult.stdout}`)
+          failed++
+        }
+
+        // 测试 11: 删除应用
+        console.log('\n测试 11: 删除应用')
+        const deleteResult = await cli.execute(['app', 'delete', testAppCode])
+        if (deleteResult.exitCode === 0 && deleteResult.stdout.includes('deleted')) {
+          console.log('✅ 通过 - 应用删除成功')
+          passed++
+        } else {
+          console.log('❌ 失败 - 应用删除失败')
+          failed++
+        }
+      } else {
+        console.log('❌ 失败 - 应用创建失败')
+        console.log(`   错误: ${result.stderr || result.stdout}`)
+        failed++
+      }
+    } catch (error) {
+      console.log('❌ 失败 - 应用创建执行出错:', error.message)
+      failed++
+    }
+
+    // 测试 12: 列出服务
+    console.log('\n测试 12: 列出服务')
+    try {
+      const result = await cli.execute(['svc', 'ls'])
+      if (result.exitCode === 0) {
+        console.log('✅ 通过 - 服务列表命令正常')
+        passed++
+      } else {
+        console.log('❌ 失败 - 服务列表命令返回错误')
+        failed++
+      }
+    } catch (error) {
+      console.log('❌ 失败 - 服务列表执行出错:', error.message)
+      failed++
+    }
+
+    // 测试 13: 列出构建
+    console.log('\n测试 13: 列出构建')
+    try {
+      const result = await cli.execute(['build', 'ls'])
+      if (result.exitCode === 0) {
+        console.log('✅ 通过 - 构建列表命令正常')
+        passed++
+      } else {
+        console.log('❌ 失败 - 构建列表命令返回错误')
+        failed++
+      }
+    } catch (error) {
+      console.log('❌ 失败 - 构建列表执行出错:', error.message)
+      failed++
+    }
+
+    // 测试 14: 列出Tokens
+    console.log('\n测试 14: 列出Tokens')
+    try {
+      const result = await cli.execute(['tokens'])
+      if (result.exitCode === 0) {
+        console.log('✅ 通过 - Tokens列表命令正常')
+        passed++
+      } else {
+        console.log('❌ 失败 - Tokens列表命令返回错误')
+        failed++
+      }
+    } catch (error) {
+      console.log('❌ 失败 - Tokens列表执行出错:', error.message)
+      failed++
+    }
+
+    // 测试 15: 登出
+    console.log('\n测试 15: 登出')
+    try {
+      const result = await cli.execute(['logout'])
+      if (result.exitCode === 0) {
+        console.log('✅ 通过 - 登出成功')
+        passed++
+      } else {
+        console.log('❌ 失败 - 登出失败')
+        failed++
+      }
+    } catch (error) {
+      console.log('❌ 失败 - 登出执行出错:', error.message)
+      failed++
+    }
+  } else {
+    console.log('\n测试 4-15: 跳过（需要 TEST_USER_EMAIL 和 TEST_USER_PASSWORD）')
+    skipped += 12
+  }
+
+  // 测试不存在的应用
+  console.log('\n测试 16: 查询不存在的应用')
+  try {
+    const result = await cli.execute(['app', 'get', 'non-existent-app'])
+    if (result.exitCode !== 0) {
+      console.log('✅ 通过 - 正确返回错误')
+      passed++
+    } else {
+      console.log('❌ 失败 - 应该返回错误')
+      failed++
+    }
+  } catch (error) {
+    console.log('✅ 通过 - 正确抛出错误')
+    passed++
+  }
+
+  // 输出测试结果
+  console.log('\n========================================')
+  console.log('测试结果汇总')
+  console.log('========================================')
+  console.log(`✅ 通过: ${passed}`)
+  console.log(`❌ 失败: ${failed}`)
+  console.log(`⏭️  跳过: ${skipped}`)
+  console.log(`📊 总计: ${passed + failed + skipped}`)
+  console.log(`\n通过率: ${((passed / (passed + failed)) * 100).toFixed(1)}%`)
+  console.log('========================================\n')
+
+  // 退出码
+  process.exit(failed > 0 ? 1 : 0)
+}
+
+// 运行测试
+runTests().catch(error => {
+  console.error('测试运行失败:', error)
+  process.exit(1)
+})

package/__tests__/setup.ts

@@ -0,0 +1,9 @@
+import '@jest/globals'
+
+beforeAll(() => {
+  process.env.XW_API_URL = process.env.TEST_API_URL || 'https://i.xuanwu.dev.aimstek.cn'
+})
+
+afterEach(() => {
+  jest.clearAllMocks()
+})

package/dist/api/client.d.ts

@@ -4,16 +4,14 @@
 import { Connection, CLIResult, ServiceInfo, NamespaceInfo, DeployOptions, Application, Build, CreateApplicationDto, UpdateApplicationDto, TriggerBuildOptions } from '../config/types';
 export declare class APIClient {
     private client;
+    private connection;
+    private sessionManager;
     constructor(connection: Connection);
     private request;
     listNamespaces(): Promise<CLIResult<NamespaceInfo[]>>;
     createNamespace(name: string): Promise<CLIResult<any>>;
     deleteNamespace(id: string): Promise<CLIResult<void>>;
     getNamespaceInfo(identifier: string): Promise<CLIResult<any>>;
-    getProjects(): Promise<CLIResult<any[]>>;
-    createProject(name: string, description?: string): Promise<CLIResult<any>>;
-    deleteProject(projectId: string): Promise<CLIResult<void>>;
-    createNamespaceWithProject(name: string, projectId: string, environment?: string): Promise<CLIResult<any>>;
     listServices(namespace: string): Promise<CLIResult<ServiceInfo[]>>;
     getServiceStatus(namespace: string, name: string): Promise<CLIResult<any>>;
     deleteService(namespace: string, name: string): Promise<CLIResult<void>>;
@@ -35,6 +33,27 @@ export declare class APIClient {
     deleteApplication(code: string): Promise<CLIResult<void>>;
     triggerApplicationBuild(code: string, options?: TriggerBuildOptions): Promise<CLIResult<Build>>;
     listApplicationBuilds(code: string): Promise<CLIResult<Build[]>>;
+    listProjects(options?: {
+        name?: string;
+        code?: string;
+    }): Promise<CLIResult<any[]>>;
+    getProject(code: string): Promise<CLIResult<any>>;
+    createProject(name: string, code: string, description?: string): Promise<CLIResult<any>>;
+    deleteProject(code: string): Promise<CLIResult<void>>;
+    listEnvironments(options?: {
+        project?: string;
+        name?: string;
+    }): Promise<CLIResult<any[]>>;
+    getEnvironment(namespace: string): Promise<CLIResult<any>>;
+    createEnvironment(name: string, namespace: string, projectCode?: string): Promise<CLIResult<any>>;
+    deleteEnvironment(namespace: string): Promise<CLIResult<void>>;
+    deployService(namespace: string, name: string, image: string, options?: {
+        projectCode?: string;
+        replicas?: number;
+        port?: number;
+        env?: Record<string, string>;
+    }): Promise<CLIResult<any>>;
+    listServiceDeployments(namespace: string, name: string): Promise<CLIResult<any>>;
     listK8sServices(namespace?: string): Promise<CLIResult<any>>;
     getK8sService(namespace: string, name: string): Promise<CLIResult<any>>;
     getK8sServiceStatus(namespace: string, name: string): Promise<CLIResult<any>>;
@@ -43,6 +62,11 @@ export declare class APIClient {
     scaleK8sService(namespace: string, name: string, replicas: number): Promise<CLIResult<any>>;
     execK8sService(namespace: string, name: string, command: string, podName?: string): Promise<CLIResult<any>>;
     listK8sServicePods(namespace: string, name: string): Promise<CLIResult<any>>;
+    updateK8sService(namespace: string, name: string, options: {
+        image?: string;
+        replicas?: number;
+        port?: number;
+    }): Promise<CLIResult<any>>;
     deleteK8sService(namespace: string, name: string): Promise<CLIResult<void>>;
     listBuilds(options?: {
         appCode?: string;
@@ -50,5 +74,6 @@ export declare class APIClient {
     }): Promise<CLIResult<Build[]>>;
     getBuild(id: string): Promise<CLIResult<Build>>;
     cancelBuild(id: string): Promise<CLIResult<void>>;
+    getBuildLogs(id: string, follow?: boolean): Promise<CLIResult<any>>;
 }
 export declare function createClient(connection: Connection): APIClient;