xuanwu-cli 2.2.0 → 2.3.3

package/dist/api/client.js

@@ -10,8 +10,11 @@ exports.APIClient = void 0;
 exports.createClient = createClient;
 const axios_1 = __importDefault(require("axios"));
 const formatter_1 = require("../output/formatter");
+const session_1 = require("../lib/session");
 class APIClient {
     constructor(connection) {
+        this.connection = connection;
+        this.sessionManager = new session_1.SessionManager();
         this.client = axios_1.default.create({
             baseURL: connection.endpoint,
             headers: {
@@ -40,8 +43,23 @@ class APIClient {
             };
         }
         catch (error) {
+            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,
                 error: {
@@ -76,27 +94,6 @@ class APIClient {
     async getNamespaceInfo(identifier) {
         return this.request('GET', `/api/deploy-spaces?identifier=${identifier}`);
     }
-    async getProjects() {
-        return this.request('GET', '/api/projects');
-    }
-    async createProject(name, description) {
-        return this.request('POST', '/api/projects', {
-            name,
-            description: description || ''
-        });
-    }
-    async deleteProject(projectId) {
-        return this.request('DELETE', `/api/projects/${projectId}`);
-    }
-    async createNamespaceWithProject(name, projectId, environment = 'development') {
-        return this.request('POST', '/api/deploy-spaces', {
-            name,
-            identifier: name,
-            namespace: name,
-            environment,
-            project_id: projectId
-        });
-    }
     // ===================
     // Service
     // ===================
@@ -113,14 +110,23 @@ class APIClient {
     // Deploy
     // ===================
     async deploy(options) {
-        const { namespace, serviceName, type, ...rest } = options;
+        const { namespace, serviceName, type, projectCode, ...rest } = options;
         // 获取 namespace 对应的 project_id
         let projectId;
+        // 如果提供了 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;
+            }
         }
         // 如果没找到，尝试从列表中查找
         if (!projectId) {
@@ -134,7 +140,7 @@ 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;
             }
@@ -344,7 +350,7 @@ class APIClient {
         return this.request('GET', `/api/cli/apps/${code}`);
     }
     async createApplication(dto) {
-        return this.request('POST', '/api/applications', dto);
+        return this.request('POST', '/api/cli/apps', dto);
     }
     async updateApplication(code, dto) {
         return this.request('PUT', `/api/cli/apps/${code}`, dto);
@@ -359,6 +365,75 @@ class APIClient {
         return this.request('GET', `/api/cli/apps/${code}/builds`);
     }
     // ===================
+    // Project (CLI API - using code)
+    // ===================
+    async listProjects(options) {
+        let url = '/api/cli/projects';
+        const params = [];
+        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('GET', url);
+    }
+    async getProject(code) {
+        return this.request('GET', `/api/cli/projects/${code}`);
+    }
+    async createProject(name, code, description) {
+        return this.request('POST', '/api/cli/projects', {
+            name,
+            code,
+            description: description || ''
+        });
+    }
+    async deleteProject(code) {
+        return this.request('DELETE', `/api/cli/projects/${code}`);
+    }
+    // ===================
+    // Environment (CLI API - using namespace)
+    // ===================
+    async listEnvironments(options) {
+        let url = '/api/cli/envs';
+        const params = [];
+        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('GET', url);
+    }
+    async getEnvironment(namespace) {
+        return this.request('GET', `/api/cli/envs/${namespace}`);
+    }
+    async createEnvironment(name, namespace, projectCode) {
+        return this.request('POST', '/api/cli/envs', {
+            name,
+            namespace,
+            projectCode
+        });
+    }
+    async deleteEnvironment(namespace) {
+        return this.request('DELETE', `/api/cli/envs/${namespace}`);
+    }
+    // ===================
+    // Deployment (CLI API)
+    // ===================
+    async deployService(namespace, name, image, options) {
+        return this.request('POST', `/api/cli/services/${namespace}/${name}/deploy`, {
+            image,
+            projectCode: options?.projectCode,
+            replicas: options?.replicas,
+            port: options?.port,
+            env: options?.env
+        });
+    }
+    async listServiceDeployments(namespace, name) {
+        return this.request('GET', `/api/cli/services/${namespace}/${name}/deployments`);
+    }
+    // ===================
     // Service (CLI API - using ns/name)
     // ===================
     async listK8sServices(namespace) {
@@ -394,6 +469,9 @@ class APIClient {
     async listK8sServicePods(namespace, name) {
         return this.request('GET', `/api/cli/services/${namespace}/${name}/pods`);
     }
+    async updateK8sService(namespace, name, options) {
+        return this.request('PUT', `/api/cli/services/${namespace}/${name}`, options);
+    }
     async deleteK8sService(namespace, name) {
         return this.request('DELETE', `/api/cli/services/${namespace}/${name}`);
     }
@@ -417,6 +495,12 @@ class APIClient {
     async cancelBuild(id) {
         return this.request('POST', `/api/cli/builds/${id}/cancel`);
     }
+    async getBuildLogs(id, follow) {
+        let url = `/api/cli/builds/${id}/logs`;
+        if (follow)
+            url += '?follow=true';
+        return this.request('GET', url);
+    }
 }
 exports.APIClient = APIClient;
 function createClient(connection) {

package/dist/commands/app.js

@@ -237,5 +237,49 @@ function makeAppCommand() {
             getAge(b.createdAt)
         ]));
     });
+    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 = store_1.configStore.getDefaultConnection();
+        if (!conn) {
+            formatter_1.OutputFormatter.error('No connection configured');
+            return;
+        }
+        const client = (0, client_1.createClient)(conn);
+        const buildsResult = await client.listApplicationBuilds(code);
+        if (!buildsResult.success) {
+            formatter_1.OutputFormatter.error(buildsResult.error.message);
+            return;
+        }
+        const builds = buildsResult.data || [];
+        if (builds.length === 0) {
+            formatter_1.OutputFormatter.info('No builds found for this application');
+            return;
+        }
+        let targetBuild;
+        if (options.build) {
+            targetBuild = builds.find((b) => b.buildNumber === parseInt(options.build));
+            if (!targetBuild) {
+                formatter_1.OutputFormatter.error(`Build #${options.build} not found`);
+                return;
+            }
+        }
+        else {
+            targetBuild = builds[0];
+        }
+        formatter_1.OutputFormatter.info(`Viewing logs for build #${targetBuild.buildNumber} (ID: ${targetBuild.id})`);
+        if (options.follow) {
+            formatter_1.OutputFormatter.info('Following logs... (Ctrl+C to exit)');
+        }
+        const result = await client.getBuildLogs(targetBuild.id, options.follow);
+        if (!result.success) {
+            formatter_1.OutputFormatter.error(result.error.message);
+            return;
+        }
+        console.log(result.data?.logs || 'No logs available');
+    });
     return cmd;
 }

package/dist/commands/auth/login.js

@@ -11,7 +11,7 @@ const formatter_1 = require("../../output/formatter");
 function makeLoginCommand() {
     const cmd = new commander_1.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')
@@ -35,16 +35,17 @@ async function loginWithBrowser(sessionManager, apiUrl) {
         process.exit(1);
     }
     const { sessionId, loginUrl, code } = await deviceAuthRes.json();
+    const fullLoginUrl = loginUrl.startsWith('http') ? loginUrl : `${finalApiUrl}${loginUrl}`;
     formatter_1.OutputFormatter.info('正在生成设备授权码...');
     console.log(`授权码: ${code}`);
-    console.log(`已打开浏览器: ${loginUrl}`);
+    console.log(`已打开浏览器: ${fullLoginUrl}`);
     formatter_1.OutputFormatter.info('请在浏览器中完成授权');
     formatter_1.OutputFormatter.info('等待授权...');
     try {
-        await (0, open_1.default)(loginUrl);
+        await (0, open_1.default)(fullLoginUrl);
     }
     catch (error) {
-        console.log(`如果浏览器未打开，请手动访问: ${loginUrl}`);
+        console.log(`如果浏览器未打开，请手动访问: ${fullLoginUrl}`);
     }
     const maxAttempts = 60;
     let attempts = 0;

package/dist/commands/deploy.js

@@ -8,25 +8,73 @@ const commander_1 = require("commander");
 const store_1 = require("../config/store");
 const client_1 = require("../api/client");
 const formatter_1 = require("../output/formatter");
+function parseNamespaceName(input) {
+    const parts = input.split('/');
+    if (parts.length !== 2) {
+        return null;
+    }
+    return { namespace: parts[0], name: parts[1] };
+}
+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 makeDeployCommand() {
     const cmd = new commander_1.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');
+    cmd
+        .command('history <ns-name>')
+        .description('Show deployment history for a service')
+        .action(async (nsName) => {
+        const conn = store_1.configStore.getDefaultConnection();
+        if (!conn) {
+            formatter_1.OutputFormatter.error('No connection configured');
+            return;
+        }
+        const parsed = parseNamespaceName(nsName);
+        if (!parsed) {
+            formatter_1.OutputFormatter.error('Invalid format. Use: <namespace>/<service-name>');
+            return;
+        }
+        const { namespace, name: serviceName } = parsed;
+        const client = (0, client_1.createClient)(conn);
+        const result = await client.listServiceDeployments(namespace, serviceName);
+        if (!result.success) {
+            formatter_1.OutputFormatter.error(result.error.message);
+            return;
+        }
+        const data = result.data;
+        const deployments = data?.deployments || data || [];
+        if (deployments.length === 0) {
+            formatter_1.OutputFormatter.info('No deployments found');
+            return;
+        }
+        formatter_1.OutputFormatter.table(['ID', 'Image', 'Status', 'Build', 'Created'], deployments.map((d) => [
+            d.id.substring(0, 8),
+            d.image?.substring(0, 40) || '-',
+            d.status || '-',
+            d.build?.buildNumber ? `#${d.build.buildNumber}` : '-',
+            getAge(d.createdAt)
+        ]));
+        if (data?.pagination) {
+            formatter_1.OutputFormatter.info(`Page ${data.pagination.page}/${data.pagination.totalPages}, Total: ${data.pagination.total}`);
+        }
+    });
+    cmd
+        .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,45 +84,25 @@ function makeDeployCommand() {
         memo[key] = value;
         return memo;
     }, {})
-        .action(async (namespace, serviceName, options) => {
+        .action(async (nsName, options) => {
         const conn = store_1.configStore.getDefaultConnection();
         if (!conn) {
             formatter_1.OutputFormatter.error('No connection configured');
             return;
         }
-        const type = options.type;
-        const 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
-        };
-        // 根据类型添加配置
-        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 parsed = parseNamespaceName(nsName);
+        if (!parsed) {
+            formatter_1.OutputFormatter.error('Invalid format. Use: <namespace>/<service-name>');
+            return;
         }
+        const { namespace, name: serviceName } = parsed;
         const client = (0, client_1.createClient)(conn);
-        const result = await client.deploy(deployOptions);
+        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) {
             formatter_1.OutputFormatter.error(result.error.message);
             return;

package/dist/commands/env.js

@@ -13,15 +13,17 @@ function makeEnvCommand() {
         .description('Manage environments (K8s namespaces)');
     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 = store_1.configStore.getDefaultConnection();
         if (!conn) {
-            formatter_1.OutputFormatter.error('No connection configured. Run: xuanwu connect add <name> -e <endpoint> -t <token>');
+            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.listNamespaces();
+        const result = await client.listEnvironments({ project: options.project });
         if (!result.success) {
             formatter_1.OutputFormatter.error(result.error.message);
             return;
@@ -31,71 +33,57 @@ function makeEnvCommand() {
             formatter_1.OutputFormatter.info('No environments found');
             return;
         }
-        formatter_1.OutputFormatter.table(['Name', 'Identifier', 'Environment', 'Status'], spaces.map((s) => [
-            s.name || s.identifier,
-            s.identifier,
-            s.environment,
-            s.status || 'active'
+        formatter_1.OutputFormatter.table(['Name', 'Namespace', 'Project', 'Services'], spaces.map((s) => [
+            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 = store_1.configStore.getDefaultConnection();
         if (!conn) {
             formatter_1.OutputFormatter.error('No connection configured');
             return;
         }
         const client = (0, client_1.createClient)(conn);
-        let projectId = options.projectId;
-        // 如果没有指定 project-id，尝试获取第一个项目
-        if (!projectId) {
-            const projectsResult = await client.getProjects();
-            if (!projectsResult.success || !projectsResult.data || projectsResult.data.length === 0) {
-                formatter_1.OutputFormatter.error('No projects found. Please specify --project-id');
-                return;
-            }
-            projectId = projectsResult.data[0].id;
-            formatter_1.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) {
             formatter_1.OutputFormatter.error(result.error.message);
             return;
         }
-        formatter_1.OutputFormatter.success(`Environment "${namespace}" created`);
+        const env = result.data;
+        formatter_1.OutputFormatter.info(`Name: ${env.name}`);
+        formatter_1.OutputFormatter.info(`Namespace: ${env.namespace}`);
+        formatter_1.OutputFormatter.info(`Project: ${env.project?.name || '-'}`);
+        formatter_1.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 = store_1.configStore.getDefaultConnection();
         if (!conn) {
             formatter_1.OutputFormatter.error('No connection configured');
             return;
         }
         const client = (0, client_1.createClient)(conn);
-        // 先获取 namespace ID
-        const infoResult = await client.getNamespaceInfo(namespace);
-        if (!infoResult.success || !infoResult.data) {
-            formatter_1.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) {
             formatter_1.OutputFormatter.error(result.error.message);
             return;
         }
-        formatter_1.OutputFormatter.success(`Environment "${namespace}" deleted`);
+        formatter_1.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 = store_1.configStore.getDefaultConnection();
         if (!conn) {
@@ -103,17 +91,12 @@ function makeEnvCommand() {
             return;
         }
         const client = (0, client_1.createClient)(conn);
-        const result = await client.getNamespaceInfo(namespace);
+        const result = await client.deleteEnvironment(namespace);
         if (!result.success) {
             formatter_1.OutputFormatter.error(result.error.message);
             return;
         }
-        const info = result.data;
-        formatter_1.OutputFormatter.info(`Name: ${info.name}`);
-        formatter_1.OutputFormatter.info(`Identifier: ${info.identifier}`);
-        formatter_1.OutputFormatter.info(`Namespace: ${info.namespace}`);
-        formatter_1.OutputFormatter.info(`Environment: ${info.environment}`);
-        formatter_1.OutputFormatter.info(`Status: ${info.status}`);
+        formatter_1.OutputFormatter.success(`Environment "${namespace}" deleted`);
     });
     return cmd;
 }

package/dist/commands/project.d.ts

@@ -0,0 +1,5 @@
+/**
+ * 项目管理命令
+ */
+import { Command } from 'commander';
+export declare function makeProjectCommand(): Command;