quick-sh 1.0.4 → 1.0.5

package/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 所有重要的更改都会记录在此文件中。
 
+## [1.0.5] - 2025-06-18
+
+### 更新内容
+
+- refactor: src directory refactor, open ai downgrade to support node 14 (eeef017)
+
+### 详细信息
+- **更新人**: Young6118
+- **更新时间**: 2025-06-18
+- **提交数量**: 1
+- **提交范围**: eeef017..eeef017
+
+---
+
+
 ## [1.0.4] - 2025-06-18
 
 ### 更新内容

package/package.json

@@ -1,27 +1,28 @@
 {
   "name": "quick-sh",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "A local script management tool for quick execution of JavaScript and Shell scripts with alias support",
-  "main": "lib/script-manager.js",
+  "main": "src/lib/script-manager.js",
   "bin": {
-    "q": "bin/cli.js"
+    "q": "src/bin/cli.js"
   },
   "files": [
-    "bin/",
-    "lib/",
+    "src/bin/",
+    "src/lib/",
     "README.md",
     "LICENSE",
-    "locales/"
+    "src/locales/"
   ],
   "scripts": {
-    "test": "node test/run-all.js",
-    "test:legacy": "node test/test.js",
-    "test:basic": "node test/basic.test.js",
-    "test:script": "node test/script-execution.test.js",
-    "test:alias": "node test/alias.test.js",
-    "test:error": "node test/error-handling.test.js",
-    "test:config": "node test/config.test.js",
-    "test:help": "node test/run-all.js --help",
+    "test": "node src/test/run-all.js",
+    "test:legacy": "node src/test/test.js",
+    "test:basic": "node src/test/basic.test.js",
+    "test:script": "node src/test/script-execution.test.js",
+    "test:alias": "node src/test/alias.test.js",
+    "test:error": "node src/test/error-handling.test.js",
+    "test:config": "node src/test/config.test.js",
+    "test:ai": "node src/test/ai.test.js",
+    "test:help": "node src/test/run-all.js --help",
     "test:manual": "echo \"Run manual tests with: q test-args, q test-args.sh, q test-dir\"",
     "prepublishOnly": "npm test"
   },
@@ -53,13 +54,14 @@
   },
   "dependencies": {
     "commander": "^9.0.0",
-    "fs-extra": "^11.0.0"
+    "fs-extra": "^11.0.0",
+    "openai": "^3.3.0"
   },
   "devDependencies": {},
   "preferGlobal": true,
   "directories": {
     "example": "examples",
-    "lib": "lib",
-    "test": "test"
+    "lib": "src/lib",
+    "test": "src/test"
   }
 }

package/{bin → src/bin}/cli.js

@@ -14,11 +14,17 @@ const {
   removeRemoteScript,
   SOURCE_TYPES 
 } = require('../lib/remote-manager');
-const { initI18n } = require('../lib/i18n');
+const { initI18n, forceReinitI18n } = require('../lib/i18n');
+const packageJson = require('../../package.json');
 
 // 初始化国际化系统
 (async () => {
-  await initI18n();
+  // 如果在测试环境中，强制重新初始化
+  if (process.env.QUICK_SH_TEST_LANG) {
+    await forceReinitI18n();
+  } else {
+    await initI18n();
+  }
   
   // 自定义命令处理 - 在 commander.js 解析之前拦截
   const args = process.argv.slice(2);
@@ -175,7 +181,7 @@ if (args.length > 0) {
 program
   .name('q')
   .description('quick sh - Local script management tool')
-  .version('1.0.0');
+  .version(packageJson.version);
 
 // 默认命令：执行脚本
 program

package/{lib → src/lib}/ai.js

@@ -1,5 +1,5 @@
 const readline = require('readline');
-const https = require('https');
+const { Configuration, OpenAIApi } = require('openai');
 const { t } = require('./i18n');
 const { readConfig, writeConfig } = require('./config');
 
@@ -511,55 +511,42 @@ async function handleUserInput(input, model, promptCallback) {
 }
 
 // 调用AI API
-function callAI(messages, model) {
-  return new Promise((resolve, reject) => {
-    const postData = JSON.stringify({
+async function callAI(messages, model) {
+  try {
+    // 构建基础URL
+    let basePath = model.apiUrl;
+    if (!basePath.startsWith('http://') && !basePath.startsWith('https://')) {
+      basePath = `https://${basePath}`;
+    }
+    
+    // 创建 OpenAI 配置
+    const configuration = new Configuration({
+      apiKey: model.apiKey,
+      basePath: basePath,
+    });
+    
+    // 创建 OpenAI API 实例
+    const openai = new OpenAIApi(configuration);
+
+    // 调用 chat completions API
+    const response = await openai.createChatCompletion({
       model: model.model,
       messages: messages,
       max_tokens: model.maxTokens,
-      temperature: model.temperature
-    });
-
-    const options = {
-      hostname: model.apiUrl,
-      port: 443,
-      path: model.apiPath,
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        'Authorization': `Bearer ${model.apiKey}`,
-        'Content-Length': Buffer.byteLength(postData)
-      }
-    };
-
-    const req = https.request(options, (res) => {
-      let data = '';
-
-      res.on('data', (chunk) => {
-        data += chunk;
-      });
-
-      res.on('end', () => {
-        try {
-          const response = JSON.parse(data);
-          if (response.error) {
-            reject(new Error(response.error.message));
-          } else {
-            resolve(response);
-          }
-        } catch (error) {
-          reject(new Error(t('ai.parseError')));
-        }
-      });
-    });
-
-    req.on('error', (error) => {
-      reject(error);
+      temperature: model.temperature,
     });
 
-    req.write(postData);
-    req.end();
-  });
+    return response.data;
+  } catch (error) {
+    // 处理不同类型的错误
+    if (error.code === 'ENOTFOUND') {
+      throw new Error(`${t('ai.connectionError')}: ${error.message}`);
+    } else if (error.response && error.response.status) {
+      throw new Error(`${t('ai.apiError')}: ${error.response.status} - ${error.response.statusText}`);
+    } else {
+      throw new Error(`${t('ai.error', { error: error.message })}`);
+    }
+  }
 }
 
 // 显示聊天帮助

package/{lib → src/lib}/i18n.js

@@ -22,6 +22,11 @@ let translations = {};
 // 检测系统语言
 function detectSystemLanguage() {
   try {
+    // 检查是否在测试环境中
+    if (process.env.QUICK_SH_TEST_LANG) {
+      return process.env.QUICK_SH_TEST_LANG;
+    }
+    
     // 获取系统语言环境
     const locale = process.env.LC_ALL || process.env.LC_MESSAGES || process.env.LANG || process.env.LANGUAGE || 'en_US';
     
@@ -49,6 +54,11 @@ async function loadLanguage(lang = null) {
   try {
     let targetLang = lang;
     
+    // 在测试环境中，优先使用测试语言设置
+    if (!targetLang && process.env.QUICK_SH_TEST_LANG) {
+      targetLang = process.env.QUICK_SH_TEST_LANG;
+    }
+    
     // 如果没有指定语言，先尝试获取用户设置的语言
     if (!targetLang) {
       try {
@@ -143,11 +153,19 @@ async function initI18n() {
   await loadLanguage();
 }
 
+// 强制重新初始化（用于测试）
+async function forceReinitI18n() {
+  currentLanguage = DEFAULT_LANG;
+  translations = {};
+  await loadLanguage();
+}
+
 module.exports = {
   t,
   getCurrentLanguage,
   getSupportedLanguages,
   setLanguage,
   initI18n,
-  detectSystemLanguage
+  detectSystemLanguage,
+  forceReinitI18n
 }; 

package/{locales → src/locales}/en.json

@@ -241,6 +241,8 @@
     "noResponse": "No response from AI",
     "error": "Error: {{error}}",
     "parseError": "Failed to parse API response",
+    "connectionError": "Connection Error",
+    "apiError": "API Error",
     "chatHelp": "AI Chat Help",
     "justTypeMessage": "Just type your message and press Enter to chat with AI",
     "currentModelConfig": "Current Model Configuration",

package/{locales → src/locales}/ja.json

@@ -241,6 +241,8 @@
     "noResponse": "AI からの応答がありません",
     "error": "エラー: {{error}}",
     "parseError": "API レスポンスの解析に失敗しました",
+    "connectionError": "接続エラー",
+    "apiError": "API エラー",
     "chatHelp": "AI チャットヘルプ",
     "justTypeMessage": "メッセージを入力してエンターを押すだけで AI とチャットできます",
     "currentModelConfig": "現在のモデル設定",

package/{locales → src/locales}/zh.json

@@ -241,6 +241,8 @@
     "noResponse": "AI 没有响应",
     "error": "错误: {{error}}",
     "parseError": "解析 API 响应失败",
+    "connectionError": "连接错误",
+    "apiError": "API 错误",
     "chatHelp": "AI 聊天帮助",
     "justTypeMessage": "只需输入消息然后按回车即可与 AI 聊天",
     "currentModelConfig": "当前模型配置",