yuangs 1.3.23 → 1.3.29

package/README.md

@@ -63,6 +63,60 @@ yuangs ai
 
 Pong 游戏: https://wealth.want.biz/pages/pong.html
 
+## 配置自定义应用 (v1.3.24)
+
+从 v1.3.24 版本开始，您可以自定义应用列表，而无需修改源代码。
+
+### 配置文件格式
+
+创建一个 JSON 或 YAML 配置文件，支持以下格式之一：
+
+1. `yuangs.config.json` - 项目级别的 JSON 配置文件
+2. `.yuangs.json` - 项目级或用户主目录的 JSON 隐藏配置文件
+3. `yuangs.config.yaml` - 项目级别的 YAML 配置文件
+4. `yuangs.config.yml` - 项目级别的 YAML 配置文件
+5. `.yuangs.yaml` - 项目级或用户主目录的 YAML 隐藏配置文件
+6. `.yuangs.yml` - 项目级或用户主目录的 YAML 隐藏配置文件
+7. `~/.yuangs.json` - 全局用户 JSON 配置文件
+8. `~/.yuangs.yaml` - 全局用户 YAML 配置文件
+9. `~/.yuangs.yml` - 全局用户 YAML 配置文件
+
+配置文件示例：
+
+```json
+{
+  "shici": "https://wealth.want.biz/shici/index.html",
+  "dict": "https://wealth.want.biz/pages/dict.html",
+  "pong": "https://wealth.want.biz/pages/pong.html",
+  "github": "https://github.com",
+  "calendar": "https://calendar.google.com",
+  "mail": "https://mail.google.com"
+}
+```
+
+### 配置文件优先级
+
+配置文件按以下优先级顺序查找（高到低）：
+
+1. 当前工作目录下的 `yuangs.config.json`
+2. 当前工作目录下的 `.yuangs.json`
+3. 用户主目录下的 `.yuangs.json`
+4. 项目目录下的 `yuangs.config.json`
+5. 项目目录下的 `.yuangs.json`
+6. 如果没有配置文件，则使用默认应用列表
+
+### 使用自定义应用
+
+创建配置文件后，您可以使用任何定义的应用名称作为命令：
+
+```bash
+yuangs github      # 打开 GitHub
+yuangs calendar    # 打开日历
+yuangs mail        # 打开邮箱
+```
+
+使用 `yuangs list` 命令查看当前加载的所有应用。
+
 ## 近期主要更新日志
 
 ### v1.3.22 (2025-11-30)

package/cli.js

@@ -13,10 +13,24 @@ function printHelp() {
     console.log(chalk.gray('仓库地址: https://www.npmjs.com/package/yuangs?activeTab=readme\n'));
     console.log(chalk.white('使用方法:') + chalk.gray(' yuangs <命令> [参数]\n'));
     console.log(chalk.bold('命令列表:'));
+
+    // Show default commands
     console.log(`  ${chalk.green('shici')}             打开古诗词 PWA`);
     console.log(`  ${chalk.green('dict')}              打开英语词典`);
     console.log(`  ${chalk.green('pong')}              打开 Pong 游戏`);
     console.log(`  ${chalk.green('list')}              列出所有应用链接`);
+
+    // Show dynamically configured apps
+    const dynamicApps = Object.keys(yuangs.urls).filter(key =>
+        !['shici', 'dict', 'pong'].includes(key)
+    );
+    if (dynamicApps.length > 0) {
+        console.log(chalk.bold('\n自定义应用:'));
+        dynamicApps.forEach(app => {
+            console.log(`  ${chalk.green(app)}              打开 ${app} 应用`);
+        });
+    }
+
     console.log(`  ${chalk.green('ai')} "<问题>"      向 AI 提问（不写问题进入交互模式）`);
     console.log(`    ${chalk.gray('--model, -m <模型名称>')}  指定 AI 模型 (可选)`);
     console.log(`    ${chalk.gray('-p -f -l')}  指定 pro,flash,lite 模型 (可选)`);
@@ -26,6 +40,7 @@ function printHelp() {
     console.log(`    ${chalk.gray('/history')}         查看对话历史\n`);
     console.log(chalk.gray('AI 示例: yuangs ai "你好" --model gemini-pro-latest'));
     console.log(chalk.gray('普通示例: yuangs shici\n'));
+    console.log(chalk.gray('配置文件: 您可以通过创建 yuangs.config.json 或 ~/.yuangs.json 来自定义应用列表\n'));
 }
 
 function printSuccess(app, url) {
@@ -185,17 +200,20 @@ async function handleAICommand() {
     await askOnce(question, model);
 }
 
+// Check if the command matches one of the configured apps
+const isAppCommand = Object.keys(yuangs.urls).includes(command);
+
 switch (command) {
     case 'shici':
-        printSuccess('古诗词应用', yuangs.urls.shici);
+        printSuccess('古诗词应用', yuangs.urls.shici || 'N/A');
         yuangs.openShici();
         break;
     case 'dict':
-        printSuccess('英语词典', yuangs.urls.dict);
+        printSuccess('英语词典', yuangs.urls.dict || 'N/A');
         yuangs.openDict();
         break;
     case 'pong':
-        printSuccess('Pong 游戏', yuangs.urls.pong);
+        printSuccess('Pong 游戏', yuangs.urls.pong || 'N/A');
         yuangs.openPong();
         break;
     case 'list':
@@ -212,7 +230,18 @@ switch (command) {
     case 'help':
     case '--help':
     case '-h':
-    default:
         printHelp();
         break;
+    default:
+        // If it's an app command but not one of the named ones, handle it with the dynamic function
+        if (isAppCommand) {
+            printSuccess(command, yuangs.urls[command]);
+            yuangs.openApp(command);
+        } else if (command) {
+            console.log(chalk.red(`\n错误: 未知命令 '${command}'\n`));
+            printHelp();
+        } else {
+            printHelp();
+        }
+        break;
 }

package/index.js

@@ -1,15 +1,75 @@
 const { exec } = require('child_process');
 const axios = require('axios');
+const fs = require('fs');
+const path = require('path');
 
 // Store conversation history
+// 存储结构标准为: [{ role: 'user', content: '...' }, { role: 'assistant', content: '...' }]
 let conversationHistory = [];
 
-const APPS = {
+// Default apps (fallback if no config file exists)
+const DEFAULT_APPS = {
     shici: 'https://wealth.want.biz/shici/index.html',
     dict: 'https://wealth.want.biz/pages/dict.html',
     pong: 'https://wealth.want.biz/pages/pong.html'
 };
 
+// Load apps from configuration file
+function loadAppsConfig() {
+    // Define possible config file locations (JSON and YAML)
+    const configPaths = [
+        path.join(process.cwd(), 'yuangs.config.json'),           // Current working directory
+        path.join(process.cwd(), '.yuangs.json'),                // Current working directory dot file
+        path.join(process.cwd(), 'yuangs.config.yaml'),          // Current working directory YAML
+        path.join(process.cwd(), 'yuangs.config.yml'),           // Current working directory YAML
+        path.join(process.cwd(), '.yuangs.yaml'),                // Current working directory dot YAML
+        path.join(process.cwd(), '.yuangs.yml'),                 // Current working directory dot YAML
+        path.join(require('os').homedir(), '.yuangs.json'),      // User home directory
+        path.join(require('os').homedir(), '.yuangs.yaml'),      // User home directory YAML
+        path.join(require('os').homedir(), '.yuangs.yml'),       // User home directory YAML
+        path.join(__dirname, 'yuangs.config.json'),              // Project directory
+        path.join(__dirname, '.yuangs.json'),                     // Project directory dot file
+        path.join(__dirname, 'yuangs.config.yaml'),              // Project directory YAML
+        path.join(__dirname, 'yuangs.config.yml')                // Project directory YAML
+    ];
+
+    for (const configPath of configPaths) {
+        if (fs.existsSync(configPath)) {
+            try {
+                const configContent = fs.readFileSync(configPath, 'utf8');
+
+                // Determine if it's JSON or YAML based on file extension
+                let config;
+                if (configPath.endsWith('.json')) {
+                    config = JSON.parse(configContent);
+                } else {
+                    // For YAML files, we need to require the yaml parser
+                    let yaml;
+                    try {
+                        yaml = require('js-yaml');
+                    } catch (yamlError) {
+                        console.warn(`Warning: js-yaml not installed, skipping YAML file ${configPath}`);
+                        console.warn('Install js-yaml with: npm install js-yaml');
+                        continue; // Skip this file and try the next config file
+                    }
+                    config = yaml.load(configContent);
+                }
+
+                // If config has an 'apps' property, use it, otherwise use the whole config as apps
+                return config.apps || config;
+            } catch (error) {
+                console.warn(`Warning: Could not parse config file at ${configPath}:`, error.message);
+                // Continue to next config file
+            }
+        }
+    }
+
+    // If no config file is found, use default apps
+    return DEFAULT_APPS;
+}
+
+const APPS = loadAppsConfig();
+
 function openUrl(url) {
     let command;
     switch (process.platform) {
@@ -40,60 +100,87 @@ function getConversationHistory() {
     return conversationHistory;
 }
 
+/**
+ * 获取 AI 回复 (OpenAI 兼容接口版)
+ */
 async function getAIAnswer(question, model, includeHistory = true) {
-    const url = 'https://aiproxy.want.biz/ai/explain';
-
-    // Prepare the prompt with conversation history if enabled
-    let prompt;
-    if (includeHistory) {
-        prompt = JSON.stringify({
-            history: conversationHistory,
-            query: question
-        }, null, 2);
-    } else {
-        // If not including history, still use JSON format for consistency but with empty history
-        prompt = JSON.stringify({
-            history: [],
-            query: question
-        }, null, 2);
-    }
+    // 1. 修改接口地址为 OpenAI 标准兼容路径
+    const url = 'https://aiproxy.want.biz/v1/chat/completions';
 
+    // 2. 准备 Headers (包含客户端标识)
     const headers = {
+        'Content-Type': 'application/json',
+        'X-Client-ID': 'npm_yuangs', // 客户端 标识
+        'Origin': 'https://cli.want.biz', // 配合后端白名单
         'Referer': 'https://cli.want.biz/',
         'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 18_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.5 Mobile/15E148 Safari/604.1',
-        'Accept': 'application/json',
-        'Content-Type': 'application/json'
+        'Accept': 'application/json'
     };
 
+    // 3. 构建 messages 数组 (上下文 + 当前问题)
+    let messages = [];
+    if (includeHistory) {
+        // history 已经是 [{role, content}, ...] 格式，直接展开
+        messages = [...conversationHistory];
+    }
+    
+    // 添加当前用户提问
+    messages.push({ role: 'user', content: question });
+
+    // 4. 构建 OpenAI 标准请求体
     const data = {
-        text: prompt,
-        model: model || "gemini-flash-lite-latest"
+        model: model || "gemini-flash-lite-latest",
+        messages: messages,
+        stream: false
     };
 
     try {
+        // 发送请求
         const response = await axios.post(url, data, { headers });
-        const answer = response.data;
+        
+        // 5. 解析 OpenAI 格式响应 (choices[0].message.content)
+        const aiContent = response.data?.choices?.[0]?.message?.content;
+
+        if (!aiContent) {
+            throw new Error('Invalid response structure from AI API');
+        }
 
-        // Add the user's question to the conversation history
+        // 6. 更新历史记录
+        // 只有请求成功才记录
         addToConversationHistory('user', question);
+        addToConversationHistory('assistant', aiContent);
 
-        // Add the AI response to the conversation history
-        if (answer && answer.explanation) {
-            addToConversationHistory('assistant', answer.explanation);
-        }
+        // 返回结果
+        // 为了兼容旧代码可能使用的 .explanation 属性，这里做一层包装
+        return {
+            explanation: aiContent, // 兼容字段
+            content: aiContent,     // 标准字段建议
+            raw: response.data      // 原始响应
+        };
 
-        return answer;
     } catch (error) {
-        console.error('AI 请求失败:', error.response?.data?.message || error.message || '未知错误');
+        const errorMsg = error.response?.data?.error?.message || error.response?.data?.message || error.message || '未知错误';
+        console.error('AI 请求失败:', errorMsg);
         return null;
     }
 }
 
 module.exports = {
     urls: APPS,
-    openShici: () => openUrl(APPS.shici),
-    openDict: () => openUrl(APPS.dict),
-    openPong: () => openUrl(APPS.pong),
+    // Dynamic function to open any app by key
+    openApp: (appKey) => {
+        const url = APPS[appKey];
+        if (url) {
+            openUrl(url);
+            return true;
+        }
+        console.error(`App '${appKey}' not found`);
+        return false;
+    },
+    // Specific functions for default apps (for backward compatibility)
+    openShici: () => openUrl(APPS.shici || DEFAULT_APPS.shici),
+    openDict: () => openUrl(APPS.dict || DEFAULT_APPS.dict),
+    openPong: () => openUrl(APPS.pong || DEFAULT_APPS.pong),
     listApps: () => {
         console.log('--- YGS Apps ---');
         Object.entries(APPS).forEach(([key, url]) => console.log(`${key}: ${url}`));
@@ -102,4 +189,4 @@ module.exports = {
     addToConversationHistory,
     clearConversationHistory,
     getConversationHistory
-};
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yuangs",
-  "version": "1.3.23",
+  "version": "1.3.29",
   "description": "苑广山的个人应用集合 CLI（彩色版）",
   "main": "index.js",
   "bin": {
@@ -15,7 +15,7 @@
     "tools",
     "colorful"
   ],
-  "homepage": "https://github.com/yuanguangshan/npm_yuangs#readme",
+  "homepage": "https://github.com/yauangshan/npm_yuangs#readme",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/yuanguangshan/npm_yuangs.git"
@@ -27,7 +27,8 @@
   "license": "ISC",
   "dependencies": {
     "axios": "^1.13.2",
-    "chalk": "^4.1.2"
+    "chalk": "^4.1.2",
+    "js-yaml": "^4.1.0"
   },
   "devDependencies": {
     "jest": "^29.7.0"

package/test/index.test.js

@@ -14,6 +14,16 @@ describe('Module: index.js', () => {
         expect(yuangs.urls.shici).toContain('shici/index.html');
     });
 
+    test('should have openApp function', () => {
+        expect(typeof yuangs.openApp).toBe('function');
+    });
+
+    test('should have backward compatibility functions', () => {
+        expect(typeof yuangs.openShici).toBe('function');
+        expect(typeof yuangs.openDict).toBe('function');
+        expect(typeof yuangs.openPong).toBe('function');
+    });
+
     test('should manage conversation history correctly', () => {
         yuangs.addToConversationHistory('user', 'hello');
         let history = yuangs.getConversationHistory();

package/yuangs.config.example.json

@@ -0,0 +1,8 @@
+{
+  "shici": "https://wealth.want.biz/shici/index.html",
+  "dict": "https://wealth.want.biz/pages/dict.html",
+  "pong": "https://wealth.want.biz/pages/pong.html",
+  "github": "https://github.com",
+  "calendar": "https://calendar.google.com",
+  "mail": "https://mail.google.com"
+}

package/yuangs.config.example.yaml

@@ -0,0 +1,18 @@
+# Example configuration file for yuangs CLI
+# Add your custom applications here
+
+shici: "https://wealth.want.biz/shici/index.html"
+dict: "https://wealth.want.biz/pages/dict.html"
+pong: "https://wealth.want.biz/pages/pong.html"
+github: "https://github.com"
+calendar: "https://calendar.google.com"
+mail: "https://mail.google.com"
+
+# You can also use the apps property if you prefer to group them
+# apps:
+#   shici: "https://wealth.want.biz/shici/index.html"
+#   dict: "https://wealth.want.biz/pages/dict.html"
+#   pong: "https://wealth.want.biz/pages/pong.html"
+#   github: "https://github.com"
+#   calendar: "https://calendar.google.com"
+#   mail: "https://mail.google.com"

package/yuangs.config.json

@@ -0,0 +1,9 @@
+{
+  "shici": "https://wealth.want.biz/shici/index.html",
+  "dict": "https://wealth.want.biz/pages/dict.html",
+  "pong": "https://wealth.want.biz/pages/pong.html",
+  "mail": "https://mail.google.com",
+  "github": "https://github.com",
+  "calendar": "https://calendar.google.com",
+  "homepage": "https://i.want.biz"
+}