xuanwu-cli 2.2.0 → 2.3.3

package/dist/commands/project.js

@@ -0,0 +1,134 @@
+"use strict";
+/**
+ * 项目管理命令
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeProjectCommand = makeProjectCommand;
+const commander_1 = require("commander");
+const store_1 = require("../config/store");
+const client_1 = require("../api/client");
+const formatter_1 = require("../output/formatter");
+function getAge(timestamp) {
+    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`;
+}
+function makeProjectCommand() {
+    const cmd = new commander_1.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 = store_1.configStore.getDefaultConnection();
+        if (!conn) {
+            formatter_1.OutputFormatter.error('No connection configured. Run: xw connect add <name> -e <endpoint> -t <token>');
+            return;
+        }
+        const client = (0, client_1.createClient)(conn);
+        const result = await client.listProjects({ name: options.name, code: options.code });
+        if (!result.success) {
+            formatter_1.OutputFormatter.error(result.error.message);
+            return;
+        }
+        const projects = result.data || [];
+        if (projects.length === 0) {
+            formatter_1.OutputFormatter.info('No projects found');
+            return;
+        }
+        formatter_1.OutputFormatter.table(['Code', 'Name', 'Environments', 'Members', 'Created'], projects.map((p) => [
+            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 = store_1.configStore.getDefaultConnection();
+        if (!conn) {
+            formatter_1.OutputFormatter.error('No connection configured');
+            return;
+        }
+        const client = (0, client_1.createClient)(conn);
+        const result = await client.getProject(code);
+        if (!result.success) {
+            formatter_1.OutputFormatter.error(result.error.message);
+            return;
+        }
+        const project = result.data;
+        formatter_1.OutputFormatter.info(`Code: ${project.code}`);
+        formatter_1.OutputFormatter.info(`Name: ${project.name}`);
+        formatter_1.OutputFormatter.info(`Description: ${project.description || '-'}`);
+        formatter_1.OutputFormatter.info(`Environments: ${project.environments?.length || 0}`);
+        formatter_1.OutputFormatter.info(`Members: ${project.members?.length || 0}`);
+        formatter_1.OutputFormatter.info(`Created: ${project.createdAt}`);
+        if (project.environments && project.environments.length > 0) {
+            formatter_1.OutputFormatter.info('\nEnvironments:');
+            project.environments.forEach((env) => {
+                formatter_1.OutputFormatter.info(`  - ${env.name} (${env.namespace})`);
+            });
+        }
+        if (project.members && project.members.length > 0) {
+            formatter_1.OutputFormatter.info('\nMembers:');
+            project.members.forEach((m) => {
+                formatter_1.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 = store_1.configStore.getDefaultConnection();
+        if (!conn) {
+            formatter_1.OutputFormatter.error('No connection configured');
+            return;
+        }
+        const client = (0, client_1.createClient)(conn);
+        const result = await client.createProject(options.name, options.code, options.description);
+        if (!result.success) {
+            formatter_1.OutputFormatter.error(result.error.message);
+            return;
+        }
+        formatter_1.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 = store_1.configStore.getDefaultConnection();
+        if (!conn) {
+            formatter_1.OutputFormatter.error('No connection configured');
+            return;
+        }
+        const client = (0, client_1.createClient)(conn);
+        const result = await client.deleteProject(code);
+        if (!result.success) {
+            formatter_1.OutputFormatter.error(result.error.message);
+            return;
+        }
+        formatter_1.OutputFormatter.success(`Project "${code}" deleted`);
+    });
+    return cmd;
+}

package/dist/commands/svc.js

@@ -268,6 +268,42 @@ function makeSvcCommand() {
             p.ip || '-'
         ]));
     });
+    cmd
+        .command('update <ns>/<name>')
+        .description('Update service configuration')
+        .option('-i, --image <image>', 'Container image')
+        .option('-r, --replicas <num>', 'Number of replicas')
+        .option('--port <port>', 'Container port')
+        .action(async (nsName, options) => {
+        const parsed = parseNamespaceName(nsName);
+        if (!parsed) {
+            formatter_1.OutputFormatter.error('Invalid format. Use: <namespace>/<service-name>');
+            return;
+        }
+        const conn = store_1.configStore.getDefaultConnection();
+        if (!conn) {
+            formatter_1.OutputFormatter.error('No connection configured');
+            return;
+        }
+        const updateData = {};
+        if (options.image)
+            updateData.image = options.image;
+        if (options.replicas)
+            updateData.replicas = parseInt(options.replicas);
+        if (options.port)
+            updateData.port = parseInt(options.port);
+        if (Object.keys(updateData).length === 0) {
+            formatter_1.OutputFormatter.error('No update options provided. Use --image, --replicas, or --port');
+            return;
+        }
+        const client = (0, client_1.createClient)(conn);
+        const result = await client.updateK8sService(parsed.namespace, parsed.name, updateData);
+        if (!result.success) {
+            formatter_1.OutputFormatter.error(result.error.message);
+            return;
+        }
+        formatter_1.OutputFormatter.success(`Service "${nsName}" updated`);
+    });
     cmd
         .command('delete <ns>/<name>')
         .alias('rm')

package/dist/config/types.d.ts

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

package/dist/index.js

@@ -5,6 +5,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const commander_1 = require("commander");
 const connect_1 = require("./commands/connect");
+const project_1 = require("./commands/project");
 const env_1 = require("./commands/env");
 const deploy_1 = require("./commands/deploy");
 const app_1 = require("./commands/app");
@@ -24,6 +25,7 @@ program
     .version('2.0.0')
     .option('-o, --output <format>', 'Output format (human|json)', 'human');
 program.addCommand((0, connect_1.makeConnectCommand)());
+program.addCommand((0, project_1.makeProjectCommand)());
 program.addCommand((0, env_1.makeEnvCommand)());
 program.addCommand((0, app_1.makeAppCommand)());
 program.addCommand((0, svc_1.makeSvcCommand)());

package/jest.config.js

@@ -0,0 +1,18 @@
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  roots: ['<rootDir>/src', '<rootDir>/__tests__'],
+  testMatch: ['**/*.test.ts', '**/*.spec.ts'],
+  collectCoverageFrom: [
+    'src/**/*.ts',
+    '!src/**/*.d.ts',
+    '!src/index.ts'
+  ],
+  coverageDirectory: 'coverage',
+  coverageReporters: ['text', 'lcov', 'html'],
+  moduleFileExtensions: ['ts', 'js', 'json', 'node'],
+  testTimeout: 30000,
+  setupFilesAfterEnv: ['<rootDir>/__tests__/setup.ts'],
+  globalSetup: '<rootDir>/__tests__/global-setup.ts',
+  globalTeardown: '<rootDir>/__tests__/global-teardown.ts'
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xuanwu-cli",
-  "version": "2.2.0",
+  "version": "2.3.3",
   "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)
   // ===================
@@ -459,6 +554,14 @@ export class APIClient {
     return this.request('GET', `/api/cli/services/${namespace}/${name}/pods`)
   }
 
+  async updateK8sService(namespace: string, name: string, options: {
+    image?: string
+    replicas?: number
+    port?: number
+  }): Promise<CLIResult<any>> {
+    return this.request('PUT', `/api/cli/services/${namespace}/${name}`, options)
+  }
+
   async deleteK8sService(namespace: string, name: string): Promise<CLIResult<void>> {
     return this.request<void>('DELETE', `/api/cli/services/${namespace}/${name}`)
   }
@@ -483,6 +586,12 @@ export class APIClient {
   async cancelBuild(id: string): Promise<CLIResult<void>> {
     return this.request<void>('POST', `/api/cli/builds/${id}/cancel`)
   }
+
+  async getBuildLogs(id: string, follow?: boolean): Promise<CLIResult<any>> {
+    let url = `/api/cli/builds/${id}/logs`
+    if (follow) url += '?follow=true'
+    return this.request('GET', url)
+  }
 }
 
 export function createClient(connection: Connection): APIClient {

package/src/commands/app.ts

@@ -265,5 +265,58 @@ export function makeAppCommand(): Command {
       )
     })
 
+  cmd
+    .command('logs <code>')
+    .description('View application build logs')
+    .option('-b, --build <buildNumber>', 'Specific build number (default: latest)')
+    .option('-f, --follow', 'Follow log output in real-time')
+    .action(async (code, options) => {
+      const conn = configStore.getDefaultConnection()
+      if (!conn) {
+        OutputFormatter.error('No connection configured')
+        return
+      }
+
+      const client = createClient(conn)
+
+      const buildsResult = await client.listApplicationBuilds(code)
+      if (!buildsResult.success) {
+        OutputFormatter.error(buildsResult.error!.message)
+        return
+      }
+
+      const builds = buildsResult.data || []
+      if (builds.length === 0) {
+        OutputFormatter.info('No builds found for this application')
+        return
+      }
+
+      let targetBuild: any
+      if (options.build) {
+        targetBuild = builds.find((b: any) => b.buildNumber === parseInt(options.build))
+        if (!targetBuild) {
+          OutputFormatter.error(`Build #${options.build} not found`)
+          return
+        }
+      } else {
+        targetBuild = builds[0]
+      }
+
+      OutputFormatter.info(`Viewing logs for build #${targetBuild.buildNumber} (ID: ${targetBuild.id})`)
+
+      if (options.follow) {
+        OutputFormatter.info('Following logs... (Ctrl+C to exit)')
+      }
+
+      const result = await client.getBuildLogs(targetBuild.id, options.follow)
+
+      if (!result.success) {
+        OutputFormatter.error(result.error!.message)
+        return
+      }
+
+      console.log(result.data?.logs || 'No logs available')
+    })
+
   return cmd
 }

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