@meet-im/lxcli 0.0.4 → 0.0.5

package/dist/commands/services/kb/rpc.js

@@ -2,13 +2,14 @@ import { outputCliError } from '../../../core/error.js';
 import { request } from '../../../core/http.js';
 import { getNextRequestId } from './utils.js';
 export async function jsonRpcCall(gateway, method, params, pat) {
+    const requestId = getNextRequestId();
     const requestBody = {
         jsonrpc: '2.0',
         method,
-        id: getNextRequestId(),
+        id: requestId,
         params,
     };
-    const response = await request({
+    const result = await request({
         gateway,
         path: '/jsonrpc.php',
         method: 'POST',
@@ -16,11 +17,26 @@ export async function jsonRpcCall(gateway, method, params, pat) {
         headers: {
             Authorization: `meet ${pat}`,
         },
+        throwOnError: false,
     });
+    // HTTP 层错误
+    if (result.error) {
+        outputCliError('NETWORK_ERROR', result.error.message, {
+            code: result.error.code,
+            details: result.error.details,
+            requestId,
+        });
+        return undefined;
+    }
+    const response = result.data;
+    // JSON-RPC 层错误
     if (response.error) {
         outputCliError('NETWORK_ERROR', response.error.message, {
             code: response.error.code,
             data: response.error.data,
+            requestId,
+            // 服务端返回的 id（可能为 null）
+            responseId: response.id,
         });
         return undefined;
     }
@@ -28,6 +44,7 @@ export async function jsonRpcCall(gateway, method, params, pat) {
         outputCliError('NETWORK_ERROR', 'No result returned from Kanboard API', {
             method,
             params,
+            requestId,
         });
         return undefined;
     }

package/dist/commands/services/kb/types.d.ts

@@ -33,6 +33,7 @@ export interface KanboardTask {
     date_due?: string;
     date_started?: string;
     priority: string;
+    priority_name?: string;
     score: string;
     reference: string;
     url: string;
@@ -43,6 +44,17 @@ export interface KanboardTask {
     };
     tags?: string[];
 }
+export interface KanboardSubtask {
+    id: string;
+    title: string;
+    status: string;
+    status_name?: string;
+    time_estimated: string;
+    time_spent: string;
+    task_id: string;
+    user_id: string;
+    position: string;
+}
 export interface GetTaskParams {
     task_id: number;
 }

package/dist/commands/upgrade.d.ts

@@ -1,2 +1,6 @@
 import { Command } from 'commander';
+import { spawn } from 'child_process';
+export declare const upgradeDeps: {
+    spawn: typeof spawn;
+};
 export declare function registerUpgradeCommand(program: Command): void;

package/dist/commands/upgrade.js

@@ -1,8 +1,12 @@
 // src/commands/upgrade.ts
+import { spawn } from 'child_process';
 import { outputCliError } from '../core/error.js';
 import { outputJson } from '../utils/index.js';
 const PACKAGE_NAME = '@meet-im/lxcli';
 const NPM_REGISTRY = 'https://registry.npmjs.org';
+export const upgradeDeps = {
+    spawn,
+};
 async function getLatestVersion() {
     const res = await fetch(`${NPM_REGISTRY}/${PACKAGE_NAME}/latest`);
     if (!res.ok) {
@@ -11,22 +15,52 @@ async function getLatestVersion() {
     const data = await res.json();
     return data.version;
 }
+async function runNpmUpgrade() {
+    const command = process.platform === 'win32' ? 'cmd.exe' : 'npm';
+    const args = process.platform === 'win32'
+        ? ['/c', 'npm', 'install', '-g', `${PACKAGE_NAME}@latest`]
+        : ['install', '-g', `${PACKAGE_NAME}@latest`];
+    await new Promise((resolve, reject) => {
+        const child = upgradeDeps.spawn(command, args, {
+            stdio: 'inherit',
+        });
+        child.on('error', reject);
+        child.on('exit', (code) => {
+            if (code === 0) {
+                resolve();
+                return;
+            }
+            reject(new Error(`npm install exited with code ${code ?? 'unknown'}`));
+        });
+    });
+}
 export function registerUpgradeCommand(program) {
     program
         .command('upgrade')
         .description('Check for updates and show upgrade instructions')
-        .action(async () => {
+        .option('--check', 'Only check for updates without installing')
+        .action(async (options) => {
         try {
             const currentVersion = program.version() || '1.0.0';
             const latestVersion = await getLatestVersion();
             const isLatest = currentVersion === latestVersion;
+            if (options.check || isLatest) {
+                outputJson({
+                    currentVersion,
+                    latestVersion,
+                    isLatest,
+                    message: isLatest
+                        ? 'Already on the latest version'
+                        : `Run "npm install -g ${PACKAGE_NAME}@latest" to upgrade`,
+                });
+                return;
+            }
+            await runNpmUpgrade();
             outputJson({
-                currentVersion,
+                previousVersion: currentVersion,
                 latestVersion,
-                isLatest,
-                message: isLatest
-                    ? 'Already on the latest version'
-                    : `Run "npm install -g ${PACKAGE_NAME}@latest" to upgrade`,
+                upgraded: true,
+                message: `Upgraded ${PACKAGE_NAME} to ${latestVersion}`,
             });
         }
         catch (error) {

package/dist/core/http.d.ts

@@ -1,4 +1,16 @@
-export interface RequestOptions {
+export interface RequestResult<T> {
+    /** HTTP 状态码 */
+    status: number;
+    /** 响应数据（成功时） */
+    data?: T;
+    /** 错误信息（失败时） */
+    error?: {
+        code: number;
+        message: string;
+        details?: unknown;
+    };
+}
+export interface RequestOptionsWithThrow {
     /** gateway 地址（必填） */
     gateway: string;
     /** 请求路径（不含域名） */
@@ -15,7 +27,30 @@ export interface RequestOptions {
     userAgent?: string;
     /** 最大重试次数，默认 3 */
     maxRetries?: number;
+    /** 错误时抛出异常而非直接退出，默认 true */
+    throwOnError?: true;
 }
+export interface RequestOptionsWithoutThrow {
+    /** gateway 地址（必填） */
+    gateway: string;
+    /** 请求路径（不含域名） */
+    path: string;
+    /** HTTP 方法，默认 GET */
+    method?: 'GET' | 'POST' | 'PUT' | 'DELETE';
+    /** URL query 参数 */
+    query?: Record<string, string | number | boolean>;
+    /** 请求体 */
+    body?: Record<string, unknown>;
+    /** 自定义 headers（会覆盖默认 headers） */
+    headers?: Record<string, string>;
+    /** User-Agent，默认 lxcli/版本号 */
+    userAgent?: string;
+    /** 最大重试次数，默认 3 */
+    maxRetries?: number;
+    /** 错误时返回 RequestResult 而非退出 */
+    throwOnError: false;
+}
+export type RequestOptions = RequestOptionsWithThrow | RequestOptionsWithoutThrow;
 /**
  * 通用请求函数
  *
@@ -24,5 +59,8 @@ export interface RequestOptions {
  * 支持自动重试：
  * - 429 (rate limit) 响应时重试，尊重 Retry-After header
  * - 网络错误时重试，使用指数退避
+ *
+ * 当 throwOnError 为 false 时，返回 RequestResult<T> 而非直接退出。
  */
-export declare function request<T>(options: RequestOptions): Promise<T>;
+export declare function request<T>(options: RequestOptionsWithThrow): Promise<T>;
+export declare function request<T>(options: RequestOptionsWithoutThrow): Promise<RequestResult<T>>;

package/dist/core/http.js

@@ -40,17 +40,8 @@ function joinUrl(gateway, path) {
     const normalizedPath = path.startsWith('/') ? path : `/${path}`;
     return `${normalizedGateway}${normalizedPath}`;
 }
-/**
- * 通用请求函数
- *
- * 支持灵活传递 gateway、路径、方法、参数、UA 等。
- *
- * 支持自动重试：
- * - 429 (rate limit) 响应时重试，尊重 Retry-After header
- * - 网络错误时重试，使用指数退避
- */
 export async function request(options) {
-    const { gateway, path, method = 'GET', query, body, headers = {}, userAgent = `lxcli/${pkg.version}`, maxRetries = MAX_RETRIES, } = options;
+    const { gateway, path, method = 'GET', query, body, headers = {}, userAgent = `lxcli/${pkg.version}`, maxRetries = MAX_RETRIES, throwOnError = true, } = options;
     // 构建 URL（gateway + path + query）
     let url = joinUrl(gateway, path);
     if (query && Object.keys(query).length > 0) {
@@ -65,6 +56,13 @@ export async function request(options) {
     };
     const requestBody = body ? JSON.stringify(body) : undefined;
     let lastError = null;
+    // 辅助函数：处理错误响应
+    const makeErrorResult = (status, code, message, details) => {
+        if (throwOnError) {
+            outputApiError(code, message, details, status);
+        }
+        return { status, error: { code, message, details } };
+    };
     // 发送请求（带重试）
     for (let attempt = 0; attempt < maxRetries; attempt++) {
         try {
@@ -94,19 +92,32 @@ export async function request(options) {
                     await sleep(delay);
                     continue;
                 }
-                outputApiError(errorResponse?.error?.code || response.status, errorResponse?.error?.message || 'Request failed', errorResponse?.error?.details, response.status);
+                const result = makeErrorResult(response.status, errorResponse?.error?.code || response.status, errorResponse?.error?.message || 'Request failed', errorResponse?.error?.details);
+                if (!throwOnError)
+                    return result;
+                // throwOnError 为 true 时 makeErrorResult 已经调用 outputApiError 退出了
             }
             let responseData;
             try {
                 responseData = parseJsonResponse(responseText);
             }
             catch {
-                outputApiError(response.status, `Invalid JSON response: ${responseText}`, undefined, response.status);
+                const result = makeErrorResult(response.status, response.status, `Invalid JSON response: ${responseText}`);
+                if (!throwOnError)
+                    return result;
+                // throwOnError 为 true 时 makeErrorResult 已经调用 outputApiError 退出了
             }
             logger.debug('Response', { status: response.status, data: responseData, attempt });
             if (!response.ok) {
                 const errorResponse = responseData;
-                outputApiError(errorResponse.error?.code || response.status, errorResponse.error?.message || 'Request failed', errorResponse.error?.details, response.status);
+                const result = makeErrorResult(response.status, errorResponse?.error?.code || response.status, errorResponse?.error?.message || 'Request failed', errorResponse?.error?.details);
+                if (!throwOnError)
+                    return result;
+                // throwOnError 为 true 时 makeErrorResult 已经调用 outputApiError 退出了
+            }
+            // throwOnError 为 false 时返回完整结果
+            if (!throwOnError) {
+                return { status: response.status, data: responseData };
             }
             return responseData;
         }
@@ -125,7 +136,9 @@ export async function request(options) {
             }
             if (isNetworkError) {
                 logger.error('Request failed', error);
-                outputApiError(500, error.message, undefined, 500);
+                const result = makeErrorResult(500, 500, error.message);
+                if (!throwOnError)
+                    return result;
             }
             throw error;
         }
@@ -133,7 +146,9 @@ export async function request(options) {
     // 所有重试都失败了
     if (lastError) {
         logger.error('All retries failed', lastError);
-        outputApiError(500, lastError.message, undefined, 500);
+        const result = makeErrorResult(500, 500, lastError.message);
+        if (!throwOnError)
+            return result;
     }
     // 不应该到达这里，但 TypeScript 需要返回值
     throw new Error('Request failed after all retries');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meet-im/lxcli",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "连续科技命令行工具",
   "type": "module",
   "main": "dist/index.js",