cloud-function-cli 1.0.1 → 1.1.0

package/README.md

@@ -28,6 +28,37 @@ yarn global add cloud-function-cli
 pnpm add -g cloud-function-cli
 ```
 
+## 🧰 在项目中使用（推荐）
+
+如果你不想全局安装，推荐把它安装为项目依赖，并通过 `npx` / `pnpm exec` 来调用（会自动从 `node_modules/.bin` 解析到 `cf` 命令）。
+
+### npm
+
+```bash
+npm i -D cloud-function-cli
+
+npx cf login
+npx cf create user/hello
+npx cf list
+```
+
+### pnpm
+
+```bash
+pnpm add -D cloud-function-cli
+
+pnpm exec cf login
+pnpm exec cf create user/hello
+pnpm exec cf list
+```
+
+### 临时执行（不安装到项目）
+
+```bash
+pnpm dlx cloud-function-cli cf login
+pnpm dlx cloud-function-cli cf create user/hello
+```
+
 ## 🚀 快速开始
 
 ### 1. 登录
@@ -209,30 +240,60 @@ cf list user --env prod
 
 ## ⚙️ 配置
 
-登录后，配置文件会自动创建在用户目录下的 `.cloud-function/config.json`：
+配置优先级（从高到低）：
+1. 项目根目录 `cf.config.json`
+2. 环境变量 `BASE_URL`
+3. 用户目录 `~/.cloud-function/config.json`（登录后自动生成）
+4. 默认值 `http://localhost:3000`
+
+### 1) 项目配置文件（推荐）
+
+在你的项目根目录创建 `cf.config.json`：
 
 ```json
 {
-  "apiBaseUrl": "http://localhost:3000",
-  "token": "your-jwt-token-here",
-  "username": "admin",
+  "apiBaseUrl": "https://your-server.com",
   "environment": "dev"
 }
 ```
 
-### 自定义后端地址
+之后在该项目内执行（本地安装时用 `pnpm exec` / `npx`）：
+
+```bash
+pnpm exec cf login
+```
+
+### 2) 登录时直接指定
 
-如果你的后端不在 `localhost:3000`，可以手动修改配置文件：
+```bash
+cf login --api https://your-server.com
+```
+
+### 3) 用户目录配置文件（自动生成）
+
+登录成功后，会在用户目录下创建 `.cloud-function/config.json`：
 
 ```json
 {
-  "apiBaseUrl": "https://your-server.com"
+  "apiBaseUrl": "http://localhost:3000",
+  "token": "your-jwt-token-here",
+  "username": "admin",
+  "environment": "dev"
 }
 ```
 
-或使用环境变量：
+### 4) 环境变量
+
 ```bash
-export CLOUD_FUNCTION_API_BASE_URL="https://your-server.com"
+export BASE_URL="https://your-server.com"
+cf login
+```
+
+Windows PowerShell：
+
+```powershell
+$env:BASE_URL="https://your-server.com"
+cf login
 ```
 
 ## 🏗️ API 模板结构

package/dist/cli/login.js

@@ -8,7 +8,11 @@ const inquirer_1 = __importDefault(require("inquirer"));
 const apiClient_1 = require("../services/apiClient");
 const config_1 = require("../utils/config");
 const logger_1 = require("../utils/logger");
-const login = async () => {
+const login = async (options) => {
+    const apiBaseUrl = options?.api?.trim();
+    if (apiBaseUrl) {
+        config_1.config.set({ apiBaseUrl });
+    }
     const answers = await inquirer_1.default.prompt([
         {
             type: 'input',
@@ -30,7 +34,13 @@ const login = async () => {
         logger_1.logger.success('Login successful!');
     }
     catch (error) {
-        logger_1.logger.error(`Login failed: ${error.response?.data?.error || error.message}`);
+        const cfg = config_1.config.get();
+        const status = error.response?.status;
+        const statusText = error.response?.statusText;
+        const details = error.response?.data?.error || error.response?.data?.message || error.message;
+        const statusPart = status ? ` (HTTP ${status}${statusText ? ` ${statusText}` : ''})` : '';
+        logger_1.logger.error(`Login failed${statusPart}: ${details}`);
+        logger_1.logger.error(`apiBaseUrl: ${cfg.apiBaseUrl}`);
     }
 };
 exports.login = login;

package/dist/index.js

@@ -17,7 +17,8 @@ program
 program
     .command('login')
     .description('Login to the system')
-    .action(login_1.login);
+    .option('--api <url>', 'API base URL (e.g., http://localhost:3000)')
+    .action((options) => (0, login_1.login)(options));
 program
     .command('create <name>')
     .description('Create a new API (e.g., group/api)')

package/dist/utils/config.js

@@ -9,27 +9,29 @@ const path_1 = __importDefault(require("path"));
 const os_1 = __importDefault(require("os"));
 const CONFIG_DIR = path_1.default.join(os_1.default.homedir(), '.cloud-function');
 const CONFIG_FILE = path_1.default.join(CONFIG_DIR, 'config.json');
+const PROJECT_CONFIG_FILE = path_1.default.join(process.cwd(), 'cf.config.json');
 const defaultConfig = {
     apiBaseUrl: 'http://localhost:3000',
     environment: 'dev'
 };
 exports.config = {
     get: () => {
-        if (!fs_1.default.existsSync(CONFIG_FILE)) {
-            return defaultConfig;
-        }
-        try {
-            return { ...defaultConfig, ...JSON.parse(fs_1.default.readFileSync(CONFIG_FILE, 'utf-8')) };
-        }
-        catch {
-            return defaultConfig;
-        }
+        const globalConfig = readJsonFile(CONFIG_FILE);
+        const projectConfig = readJsonFile(PROJECT_CONFIG_FILE);
+        const envApiBaseUrl = process.env.BASE_URL?.trim() || process.env.CLOUD_FUNCTION_API_BASE_URL?.trim();
+        const envConfig = envApiBaseUrl ? { apiBaseUrl: envApiBaseUrl } : {};
+        return {
+            ...defaultConfig,
+            ...globalConfig,
+            ...envConfig,
+            ...projectConfig
+        };
     },
     set: (newConfig) => {
         if (!fs_1.default.existsSync(CONFIG_DIR)) {
             fs_1.default.mkdirSync(CONFIG_DIR, { recursive: true });
         }
-        const current = exports.config.get();
+        const current = { ...defaultConfig, ...readJsonFile(CONFIG_FILE) };
         fs_1.default.writeFileSync(CONFIG_FILE, JSON.stringify({ ...current, ...newConfig }, null, 2));
     },
     clear: () => {
@@ -38,3 +40,14 @@ exports.config = {
         }
     }
 };
+const readJsonFile = (filePath) => {
+    if (!fs_1.default.existsSync(filePath)) {
+        return {};
+    }
+    try {
+        return JSON.parse(fs_1.default.readFileSync(filePath, 'utf-8'));
+    }
+    catch {
+        return {};
+    }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloud-function-cli",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "CLI for Cloud Function System - Create, deploy, and manage serverless functions",
   "main": "dist/index.js",
   "bin": {