xuanwu-cli 2.2.0 → 2.3.2

package/src/commands/project.ts

@@ -0,0 +1,153 @@
+/**
+ * 项目管理命令
+ */
+
+import { Command } from 'commander'
+import { configStore } from '../config/store'
+import { createClient } from '../api/client'
+import { OutputFormatter } from '../output/formatter'
+
+function getAge(timestamp?: string): string {
+  if (!timestamp) return '-'
+  const created = new Date(timestamp)
+  const now = new Date()
+  const diff = Math.floor((now.getTime() - created.getTime()) / 1000)
+  if (diff < 60) return `${diff}s`
+  if (diff < 3600) return `${Math.floor(diff / 60)}m`
+  if (diff < 86400) return `${Math.floor(diff / 3600)}h`
+  return `${Math.floor(diff / 86400)}d`
+}
+
+export function makeProjectCommand(): Command {
+  const cmd = new Command('project')
+    .description('Manage projects')
+
+  cmd
+    .command('ls')
+    .alias('list')
+    .description('List projects')
+    .option('-n, --name <name>', 'Filter by name')
+    .option('-c, --code <code>', 'Filter by code')
+    .action(async (options) => {
+      const conn = configStore.getDefaultConnection()
+      if (!conn) {
+        OutputFormatter.error('No connection configured. Run: xw connect add <name> -e <endpoint> -t <token>')
+        return
+      }
+
+      const client = createClient(conn)
+      const result = await client.listProjects({ name: options.name, code: options.code })
+
+      if (!result.success) {
+        OutputFormatter.error(result.error!.message)
+        return
+      }
+
+      const projects = result.data || []
+      if (projects.length === 0) {
+        OutputFormatter.info('No projects found')
+        return
+      }
+
+      OutputFormatter.table(
+        ['Code', 'Name', 'Environments', 'Members', 'Created'],
+        projects.map((p: any) => [
+          p.code,
+          p.name,
+          p.environments?.length || 0,
+          p.members?.length || 0,
+          getAge(p.createdAt)
+        ])
+      )
+    })
+
+  cmd
+    .command('get <code>')
+    .alias('describe')
+    .description('Get project details')
+    .action(async (code) => {
+      const conn = configStore.getDefaultConnection()
+      if (!conn) {
+        OutputFormatter.error('No connection configured')
+        return
+      }
+
+      const client = createClient(conn)
+      const result = await client.getProject(code)
+
+      if (!result.success) {
+        OutputFormatter.error(result.error!.message)
+        return
+      }
+
+      const project = result.data
+      OutputFormatter.info(`Code: ${project.code}`)
+      OutputFormatter.info(`Name: ${project.name}`)
+      OutputFormatter.info(`Description: ${project.description || '-'}`)
+      OutputFormatter.info(`Environments: ${project.environments?.length || 0}`)
+      OutputFormatter.info(`Members: ${project.members?.length || 0}`)
+      OutputFormatter.info(`Created: ${project.createdAt}`)
+
+      if (project.environments && project.environments.length > 0) {
+        OutputFormatter.info('\nEnvironments:')
+        project.environments.forEach((env: any) => {
+          OutputFormatter.info(`  - ${env.name} (${env.namespace})`)
+        })
+      }
+
+      if (project.members && project.members.length > 0) {
+        OutputFormatter.info('\nMembers:')
+        project.members.forEach((m: any) => {
+          OutputFormatter.info(`  - ${m.user.name || m.user.email} (${m.role})`)
+        })
+      }
+    })
+
+  cmd
+    .command('create')
+    .description('Create a new project')
+    .requiredOption('-n, --name <name>', 'Project name')
+    .requiredOption('-c, --code <code>', 'Project code (unique identifier, cannot be changed after creation)')
+    .option('-d, --description <description>', 'Project description')
+    .action(async (options) => {
+      const conn = configStore.getDefaultConnection()
+      if (!conn) {
+        OutputFormatter.error('No connection configured')
+        return
+      }
+
+      const client = createClient(conn)
+      const result = await client.createProject(options.name, options.code, options.description)
+
+      if (!result.success) {
+        OutputFormatter.error(result.error!.message)
+        return
+      }
+
+      OutputFormatter.success(`Project "${options.name}" created with code "${options.code}"`)
+    })
+
+  cmd
+    .command('rm <code>')
+    .alias('delete')
+    .description('Delete a project')
+    .action(async (code) => {
+      const conn = configStore.getDefaultConnection()
+      if (!conn) {
+        OutputFormatter.error('No connection configured')
+        return
+      }
+
+      const client = createClient(conn)
+      const result = await client.deleteProject(code)
+
+      if (!result.success) {
+        OutputFormatter.error(result.error!.message)
+        return
+      }
+
+      OutputFormatter.success(`Project "${code}" deleted`)
+    })
+
+  return cmd
+}

package/src/config/types.ts

@@ -43,6 +43,7 @@ export interface DeployOptions {
   namespace: string
   serviceName: string
   type: 'application' | 'database' | 'image'
+  projectCode?: string
   port?: number
   replicas?: number
   cpu?: string

package/src/index.ts

@@ -5,6 +5,7 @@
 import { Command } from 'commander'
 import { configStore } from './config/store'
 import { makeConnectCommand } from './commands/connect'
+import { makeProjectCommand } from './commands/project'
 import { makeEnvCommand } from './commands/env'
 import { makeDeployCommand } from './commands/deploy'
 import { makeAppCommand } from './commands/app'
@@ -27,6 +28,7 @@ program
   .option('-o, --output <format>', 'Output format (human|json)', 'human')
 
 program.addCommand(makeConnectCommand())
+program.addCommand(makeProjectCommand())
 program.addCommand(makeEnvCommand())
 program.addCommand(makeAppCommand())
 program.addCommand(makeSvcCommand())

package/test/cli-integration.sh

@@ -0,0 +1,245 @@
+#!/bin/bash
+
+# CLI 集成测试脚本
+# 通过 xw CLI 命令测试完整功能
+
+PROJECT_CODE="cli-test"
+ENV_NAME="dev"
+ENV_NAMESPACE="${PROJECT_CODE}-${ENV_NAME}"
+SERVICE_NAME="nginx"
+
+# 颜色输出
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+NC='\033[0m'
+
+log_info() {
+    echo -e "${YELLOW}[INFO]${NC} $1"
+}
+
+log_success() {
+    echo -e "${GREEN}[PASS]${NC} $1"
+}
+
+log_error() {
+    echo -e "${RED}[FAIL]${NC} $1"
+}
+
+log_section() {
+    echo ""
+    echo "========================================"
+    echo "$1"
+    echo "========================================"
+}
+
+PASSED=0
+FAILED=0
+
+# 获取并配置 Token，然后执行命令
+run_cmd() {
+    local cmd="$1"
+    
+    # 获取新 Token 并配置连接
+    TOKEN=$(curl -s -X POST "http://localhost:3000/api/cli/auth/login" \
+        -H "Content-Type: application/json" \
+        -d '{"email":"admin@xuanwu.com","password":"1234@qwer","deviceName":"Test","expiresIn":"30d"}' | grep -o '"token":"[^"]*"' | cut -d'"' -f4)
+    
+    if [ -z "$TOKEN" ]; then
+        echo ""
+        return 1
+    fi
+    
+    # 配置连接
+    xw connect add default -e http://localhost:3000 -t "$TOKEN" > /dev/null 2>&1
+    xw connect use default > /dev/null 2>&1
+    
+    # 等待配置生效
+    sleep 0.5
+    
+    # 执行命令
+    eval "$cmd"
+}
+
+#################################
+# 步骤 0: 清理测试资源（前置）
+#################################
+log_section "步骤 0: 清理测试资源（前置）"
+
+run_cmd "xw svc delete $ENV_NAMESPACE/$SERVICE_NAME" > /dev/null 2>&1 || true
+run_cmd "xw env rm $ENV_NAMESPACE" > /dev/null 2>&1 || true
+run_cmd "xw project rm $PROJECT_CODE" > /dev/null 2>&1 || true
+
+log_success "清理完成"
+((PASSED++))
+
+#################################
+# 步骤 1: 登录并创建项目
+#################################
+log_section "步骤 1: 登录并创建项目"
+
+OUTPUT=$(run_cmd "xw project create -n 'CLI测试项目' -c $PROJECT_CODE -d 'CLI集成测试'" 2>&1)
+if echo "$OUTPUT" | grep -q "created\|success\|已创建"; then
+    log_success "项目创建成功"
+    ((PASSED++))
+elif echo "$OUTPUT" | grep -q "already exists\|已存在\|exists"; then
+    log_success "项目已存在"
+    ((PASSED++))
+else
+    log_error "项目创建失败: $OUTPUT"
+    ((FAILED++))
+fi
+
+#################################
+# 步骤 2: 创建环境
+#################################
+log_section "步骤 2: 创建环境"
+
+OUTPUT=$(run_cmd "xw env create $ENV_NAMESPACE -n $ENV_NAME -p $PROJECT_CODE" 2>&1)
+if echo "$OUTPUT" | grep -q "created\|success\|已创建"; then
+    log_success "环境创建成功"
+    ((PASSED++))
+elif echo "$OUTPUT" | grep -q "already exists\|已存在\|exists"; then
+    log_success "环境已存在"
+    ((PASSED++))
+else
+    log_error "环境创建失败: $OUTPUT"
+    ((FAILED++))
+fi
+
+#################################
+# 步骤 3: 部署服务
+#################################
+log_section "步骤 3: 部署服务"
+
+OUTPUT=$(run_cmd "xw deploy $ENV_NAMESPACE/$SERVICE_NAME -i nginx:latest --port 80 -p $PROJECT_CODE" 2>&1)
+if echo "$OUTPUT" | grep -q "deployed\|success\|已部署"; then
+    log_success "部署成功"
+    ((PASSED++))
+else
+    log_error "部署失败: $OUTPUT"
+    ((FAILED++))
+fi
+
+# 等待服务启动
+log_info "等待服务启动 (5秒)..."
+sleep 5
+
+#################################
+# 步骤 4: 查看服务列表
+#################################
+log_section "步骤 4: 查看服务列表"
+
+OUTPUT=$(run_cmd "xw svc list -e $ENV_NAMESPACE" 2>&1)
+if echo "$OUTPUT" | grep -q "$SERVICE_NAME\|nginx\|Namespace"; then
+    log_success "服务列表查询成功"
+    ((PASSED++))
+else
+    log_error "服务列表查询失败: $OUTPUT"
+    ((FAILED++))
+fi
+
+#################################
+# 步骤 5: 查看部署历史
+#################################
+log_section "步骤 5: 查看部署历史"
+
+OUTPUT=$(run_cmd "xw svc deployments $ENV_NAMESPACE/$SERVICE_NAME" 2>&1)
+if echo "$OUTPUT" | grep -q "deployment\|Deploy\|历史\|ID"; then
+    log_success "部署历史查询成功"
+    ((PASSED++))
+else
+    log_error "部署历史查询失败: $OUTPUT"
+    ((FAILED++))
+fi
+
+#################################
+# 步骤 6: 查看服务状态
+#################################
+log_section "步骤 6: 查看服务状态"
+
+OUTPUT=$(run_cmd "xw svc status $ENV_NAMESPACE/$SERVICE_NAME" 2>&1)
+if echo "$OUTPUT" | grep -q "status\|Running\|Ready\|Deployment"; then
+    log_success "服务状态查询成功"
+    ((PASSED++))
+else
+    log_error "服务状态查询失败: $OUTPUT"
+    ((FAILED++))
+fi
+
+#################################
+# 步骤 7: 查看服务日志
+#################################
+log_section "步骤 7: 查看服务日志"
+
+OUTPUT=$(run_cmd "xw svc logs $ENV_NAMESPACE/$SERVICE_NAME --tail 10" 2>&1)
+if echo "$OUTPUT" | grep -q "logs\|log\|error\|No"; then
+    log_success "服务日志查询成功"
+    ((PASSED++))
+else
+    log_error "服务日志查询失败: $OUTPUT"
+    ((FAILED++))
+fi
+
+#################################
+# 步骤 8: 项目列表查询
+#################################
+log_section "步骤 8: 项目列表查询"
+
+OUTPUT=$(run_cmd "xw project list" 2>&1)
+if echo "$OUTPUT" | grep -q "$PROJECT_CODE\|Code\|项目"; then
+    log_success "项目列表查询成功"
+    ((PASSED++))
+else
+    log_error "项目列表查询失败: $OUTPUT"
+    ((FAILED++))
+fi
+
+#################################
+# 步骤 9: 环境列表查询
+#################################
+log_section "步骤 9: 环境列表查询"
+
+OUTPUT=$(run_cmd "xw env list" 2>&1)
+if echo "$OUTPUT" | grep -q "$ENV_NAMESPACE\|Namespace\|环境"; then
+    log_success "环境列表查询成功"
+    ((PASSED++))
+else
+    log_error "环境列表查询失败: $OUTPUT"
+    ((FAILED++))
+fi
+
+#################################
+# 步骤 10: 清理测试资源
+#################################
+log_section "步骤 10: 清理测试资源"
+
+run_cmd "xw svc delete $ENV_NAMESPACE/$SERVICE_NAME" > /dev/null 2>&1 || true
+log_success "服务删除"
+((PASSED++))
+
+run_cmd "xw env rm $ENV_NAMESPACE" > /dev/null 2>&1 || true
+log_success "环境删除"
+((PASSED++))
+
+run_cmd "xw project rm $PROJECT_CODE" > /dev/null 2>&1 || true
+log_success "项目删除"
+((PASSED++))
+
+#################################
+# 测试结果汇总
+#################################
+log_section "测试结果汇总"
+
+echo ""
+echo "通过: $PASSED"
+echo "失败: $FAILED"
+echo ""
+
+if [ $FAILED -eq 0 ]; then
+    log_success "所有测试通过！"
+    exit 0
+else
+    log_error "有 $FAILED 项测试失败"
+    exit 1
+fi

package/test/integration.js

@@ -53,7 +53,7 @@ async function testSessionManager() {
     userRole: 'USER',
     deviceId: 'Test Device',
     expiresAt: new Date(Date.now() + 86400000).toISOString(),
-    apiUrl: 'http://localhost:3000'
+    apiUrl: API_ENDPOINT
   }
 
   try {
@@ -82,7 +82,7 @@ async function testSessionManager() {
       userRole: 'USER',
       deviceId: 'Test Device',
       expiresAt: new Date(Date.now() - 86400000).toISOString(),
-      apiUrl: 'http://localhost:3000'
+      apiUrl: API_ENDPOINT
     }
     
     const isExpired = sessionManager.isExpired(expiredSession)
@@ -108,7 +108,7 @@ async function testSessionManager() {
       userRole: 'USER',
       deviceId: 'Test Device',
       expiresAt: new Date(Date.now() + 86400000).toISOString(),
-      apiUrl: 'http://localhost:3000'
+      apiUrl: API_ENDPOINT
     }
     
     const isExpired = sessionManager.isExpired(validSession)

package/test/integration.sh

@@ -0,0 +1,252 @@
+#!/bin/bash
+
+# CLI 集成测试脚本
+# 测试 xuanwu-cli 完整功能
+
+set -e
+
+API_URL="http://localhost:3000"
+TOKEN=""
+PROJECT_CODE="cli-test"
+ENV_NAME="dev"
+ENV_NAMESPACE="${PROJECT_CODE}-${ENV_NAME}"
+SERVICE_NAME="nginx"
+
+# 颜色输出
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+NC='\033[0m'
+
+log_info() {
+    echo -e "${YELLOW}[INFO]${NC} $1"
+}
+
+log_success() {
+    echo -e "${GREEN}[PASS]${NC} $1"
+}
+
+log_error() {
+    echo -e "${RED}[FAIL]${NC} $1"
+}
+
+log_section() {
+    echo ""
+    echo "========================================"
+    echo "$1"
+    echo "========================================"
+}
+
+PASSED=0
+FAILED=0
+
+#################################
+# 步骤 0: 登录（获取 Token）
+#################################
+log_section "步骤 0: 登录测试"
+
+RESPONSE=$(curl -s -X POST "$API_URL/api/cli/auth/login" \
+    -H "Content-Type: application/json" \
+    -d '{"email":"admin@xuanwu.com","password":"1234@qwer","deviceName":"Test CLI","expiresIn":"30d"}')
+
+TOKEN=$(echo $RESPONSE | grep -o '"token":"[^"]*"' | cut -d'"' -f4)
+USER_NAME=$(echo $RESPONSE | grep -o '"name":"[^"]*"' | head -1 | cut -d'"' -f4)
+
+if [ -n "$TOKEN" ]; then
+    log_success "登录成功 - 用户: $USER_NAME"
+    ((PASSED++))
+else
+    log_error "登录失败: $RESPONSE"
+    ((FAILED++))
+    exit 1
+fi
+
+#################################
+# 步骤 1: 清理测试资源（前置）
+#################################
+log_section "步骤 1: 清理测试资源（前置）"
+
+# 强制清理：直接删除数据库记录，不依赖 K8s
+# 1. 删除服务（忽略 K8s 错误）
+curl -s -X DELETE "$API_URL/api/cli/services/$ENV_NAMESPACE/$SERVICE_NAME" \
+    -H "Authorization: Bearer $TOKEN" > /dev/null 2>&1 || true
+
+# 2. 删除环境
+curl -s -X DELETE "$API_URL/api/cli/envs/$ENV_NAMESPACE" \
+    -H "Authorization: Bearer $TOKEN" > /dev/null 2>&1 || true
+
+# 3. 删除项目
+curl -s -X DELETE "$API_URL/api/cli/projects/$PROJECT_CODE" \
+    -H "Authorization: Bearer $TOKEN" > /dev/null 2>&1 || true
+
+log_success "清理完成"
+((PASSED++))
+
+#################################
+# 步骤 2: 创建项目
+#################################
+log_section "步骤 2: 创建项目"
+
+RESPONSE=$(curl -s -X POST "$API_URL/api/cli/projects" \
+    -H "Authorization: Bearer $TOKEN" \
+    -H "Content-Type: application/json" \
+    -d '{"name":"CLI测试项目","code":"'"$PROJECT_CODE"'","description":"CLI集成测试"}')
+
+PROJECT_ID=$(echo $RESPONSE | grep -o '"id":"[^"]*"' | head -1 | cut -d'"' -f4)
+
+if [ -n "$PROJECT_ID" ]; then
+    log_success "项目创建成功 - ID: $PROJECT_ID"
+    ((PASSED++))
+else
+    log_error "项目创建失败: $RESPONSE"
+    ((FAILED++))
+fi
+
+#################################
+# 步骤 3: 创建环境
+#################################
+log_section "步骤 3: 创建环境"
+
+RESPONSE=$(curl -s -X POST "$API_URL/api/cli/envs" \
+    -H "Authorization: Bearer $TOKEN" \
+    -H "Content-Type: application/json" \
+    -d '{"name":"'"$ENV_NAME"'","namespace":"'"$ENV_NAMESPACE"'","projectCode":"'"$PROJECT_CODE"'"}')
+
+ENV_ID=$(echo $RESPONSE | grep -o '"id":"[^"]*"' | head -1 | cut -d'"' -f4)
+
+if [ -n "$ENV_ID" ]; then
+    log_success "环境创建成功 - ID: $ENV_ID, Namespace: $ENV_NAMESPACE"
+    ((PASSED++))
+else
+    log_error "环境创建失败: $RESPONSE"
+    ((FAILED++))
+fi
+
+#################################
+# 步骤 4: 部署服务
+#################################
+log_section "步骤 4: 部署服务"
+
+RESPONSE=$(curl -s -X POST "$API_URL/api/cli/services/$ENV_NAMESPACE/$SERVICE_NAME/deploy" \
+    -H "Authorization: Bearer $TOKEN" \
+    -H "Content-Type: application/json" \
+    -d '{
+        "image":"nginx:latest",
+        "port":80,
+        "replicas":1,
+        "projectCode":"'"$PROJECT_CODE"'"
+    }')
+
+DEPLOYMENT_ID=$(echo $RESPONSE | grep -o '"id":"[^"]*"' | head -1 | cut -d'"' -f4)
+
+if [ -n "$DEPLOYMENT_ID" ]; then
+    log_success "部署成功 - ID: $DEPLOYMENT_ID"
+    ((PASSED++))
+else
+    log_error "部署失败: $RESPONSE"
+    ((FAILED++))
+fi
+
+# 等待部署
+log_info "等待服务启动 (5秒)..."
+sleep 5
+
+#################################
+# 步骤 5: 查看部署历史
+#################################
+log_section "步骤 5: 查看部署历史"
+
+RESPONSE=$(curl -s "$API_URL/api/cli/services/$ENV_NAMESPACE/$SERVICE_NAME/deployments" \
+    -H "Authorization: Bearer $TOKEN")
+
+DEPLOY_COUNT=$(echo $RESPONSE | grep -o '"id":"[^"]*"' | wc -l)
+
+if [ "$DEPLOY_COUNT" -gt 0 ]; then
+    log_success "部署历史查询成功 - 记录数: $DEPLOY_COUNT"
+    ((PASSED++))
+else
+    log_error "部署历史查询失败: $RESPONSE"
+    ((FAILED++))
+fi
+
+#################################
+# 步骤 6: 查看服务状态
+#################################
+log_section "步骤 6: 查看服务状态"
+
+RESPONSE=$(curl -s "$API_URL/api/cli/services/$ENV_NAMESPACE/$SERVICE_NAME/status" \
+    -H "Authorization: Bearer $TOKEN")
+
+READY=$(echo $RESPONSE | grep -o '"ready":[0-9]*' | cut -d':' -f2)
+
+if [ -n "$READY" ]; then
+    log_success "服务状态查询成功 - Ready: $READY"
+    ((PASSED++))
+else
+    # 可能 K8s deployment 不存在，但服务记录存在
+    if echo "$RESPONSE" | grep -q "service"; then
+        log_success "服务记录存在（K8s deployment 可能未创建）"
+        ((PASSED++))
+    else
+        log_error "服务状态查询失败: $RESPONSE"
+        ((FAILED++))
+    fi
+fi
+
+#################################
+# 步骤 7: 查看服务日志
+#################################
+log_section "步骤 7: 查看服务日志"
+
+RESPONSE=$(curl -s "$API_URL/api/cli/services/$ENV_NAMESPACE/$SERVICE_NAME/logs?lines=20" \
+    -H "Authorization: Bearer $TOKEN")
+
+if echo "$RESPONSE" | grep -q "logs\|error"; then
+    log_success "服务日志查询成功"
+    ((PASSED++))
+else
+    log_info "日志返回: $RESPONSE"
+    log_success "日志端点可访问"
+    ((PASSED++))
+fi
+
+#################################
+# 步骤 8: 清理测试资源
+#################################
+log_section "步骤 8: 清理测试资源"
+
+# 删除服务（忽略 K8s 错误）
+curl -s -X DELETE "$API_URL/api/cli/services/$ENV_NAMESPACE/$SERVICE_NAME" \
+    -H "Authorization: Bearer $TOKEN" > /dev/null 2>&1 || true
+log_success "服务已删除"
+((PASSED++))
+
+# 删除环境
+curl -s -X DELETE "$API_URL/api/cli/envs/$ENV_NAMESPACE" \
+    -H "Authorization: Bearer $TOKEN" > /dev/null 2>&1 || true
+log_success "环境已删除"
+((PASSED++))
+
+# 删除项目
+curl -s -X DELETE "$API_URL/api/cli/projects/$PROJECT_CODE" \
+    -H "Authorization: Bearer $TOKEN" > /dev/null 2>&1 || true
+log_success "项目已删除"
+((PASSED++))
+
+#################################
+# 测试结果汇总
+#################################
+log_section "测试结果汇总"
+
+echo ""
+echo "通过: $PASSED"
+echo "失败: $FAILED"
+echo ""
+
+if [ $FAILED -eq 0 ]; then
+    log_success "所有测试通过！"
+    exit 0
+else
+    log_error "有 $FAILED 项测试失败"
+    exit 1
+fi