@dahawa/hawa-cli-analysis 1.0.6 → 1.0.7

package/claude/claude-openai-proxy.js

@@ -178,6 +178,16 @@ async function handel(request, reply, endpoint){
          return fetch(url, fetchOptions);
       }
 
+      if (request.body && request.body.model) {
+        // Filter out undefined/null values from models array
+        const validModels = models.filter(model => model != null && model !== '');
+        
+        if (!validModels.includes(request.body.model)) {
+          logger.system.debug(`Model "${request.body.model}" not in allowed models, changing to "${process.env["MODEL"]}"`);
+          request.body.model = process.env["MODEL"];
+        }
+      }
+
       //console.log("请求地址: " + url);
           //转换前的请求
           let initBody    = request.body;

package/claude/claude-proxy.js

@@ -175,8 +175,24 @@ async function handel(request, reply, endpoint){
 
          return fetch(url, fetchOptions);
       }
-  
-      //打印请求信息 request.body
+      
+      const models = [process.env["MODEL"] , process.env["SMALL_FAST_MODEL"]]
+
+     
+      if (request.body && request.body.model) {
+        // Filter out undefined/null values from models array
+        const validModels = models.filter(model => model != null && model !== '');
+        
+        if (!validModels.includes(request.body.model)) {
+          logger.system.debug(`Model "${request.body.model}" not in allowed models, changing to "${process.env["MODEL"]}"`);
+          request.body.model = process.env["MODEL"];
+        }
+      }
+
+
+
+
+      //打印请求 //判断 request.body 中的模型如果模型,如果不属于 models 类型，修改为 process.env["MODEL"]信息 request.body
       let processedBody = JSON.stringify(request.body);
 
       logger.system.debug('请求 body' + processedBody);
@@ -332,7 +348,7 @@ const startServer = async () => {
     logger.system.debug(`✅ Server started on port ${port}`);
 
     // 输出端口信息到标准输出，供父进程读取
-    console.log(`PROXY_PORT:${port}`);
+    logger.system.debug(`PROXY_PORT:${port}`);
   } catch (err) {
     fastify.log.error(err);
     process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dahawa/hawa-cli-analysis",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "main": "index",
   "bin": {
     "uclaude": "uclaude.js",

package/tests/test.js

@@ -1,30 +1,30 @@
-import {} from "../clogger.js"
-import Anthropic from "@anthropic-ai/sdk";
-
-
-const anthropic = new Anthropic({
-   apiKey: "sk-c1GF5uhjQpEcfqYZE3XvGf85XGpG7Rhj6E5829M3qoawzDzu",                         // 你的 key
-  // 如果你走 DeepSeek 的 Anthropic 兼容端点，也加上 baseURL：
-   baseURL: "https://api.moonshot.cn/anthropic",
-});
-
-const message = await anthropic.messages.create({
-  model: "kimi-k2-0905-preview",        // 用冒号
-  max_tokens: 1000,
-  system: "You are a helpful assistant.",
-  messages: [
-    {
-      role: "user",
-      content: [
-        { type: "text", text: "Hi, how are you?" }
-      ]
-    }
-  ]
-});
-
-console.log(message.content);    // 用 console.log 而不是 print
-
-
-
-
-
+import {} from "../clogger.js"
+import Anthropic from "@anthropic-ai/sdk";
+
+
+const anthropic = new Anthropic({
+   apiKey: "sk-c1GF5uhjQpEcfqYZE3XvGf85XGpG7Rhj6E5829M3qoawzDzu",                         // 你的 key
+  // 如果你走 DeepSeek 的 Anthropic 兼容端点，也加上 baseURL：
+   baseURL: "https://api.moonshot.cn/anthropic",
+});
+
+const message = await anthropic.messages.create({
+  model: "kimi-k2-0905-preview",        // 用冒号
+  max_tokens: 1000,
+  system: "You are a helpful assistant.",
+  messages: [
+    {
+      role: "user",
+      content: [
+        { type: "text", text: "Hi, how are you?" }
+      ]
+    }
+  ]
+});
+
+console.log(message.content);    // 用 console.log 而不是 print
+
+
+
+
+

package/uclaude.js

@@ -14,7 +14,7 @@ import portManager from './port-manager.js';
 import { join } from 'path';
 
 
-const startServer = async (openai, base_url, port = null) => {
+const startServer = async (openai, base_url, port = null ,MODEL , SMALL_FAST_MODEL) => {
   let dir = path.dirname(fileURLToPath(import.meta.url));
   const child = spawn('node ' + path.join(dir, "claude" , openai?"claude-openai-proxy.js":'claude-proxy.js'), [],{
     stdio: ['ignore', 'pipe', 'pipe'],
@@ -22,7 +22,9 @@ const startServer = async (openai, base_url, port = null) => {
     env:{
       ...process.env,
       BASE_URL: base_url,
-      PROXY_PORT: port
+      PROXY_PORT: port,
+      MODEL:MODEL,
+      SMALL_FAST_MODEL:SMALL_FAST_MODEL
     }
   });
 
@@ -102,7 +104,7 @@ function start(){
                 logger.error("无法获取可用端口，程序退出");
                 process.exit(1);
             }
-            startServer(true, BASE_URL, proxyPort);
+            startServer(true, BASE_URL, proxyPort , env['MODEL'], env['SMALL_FAST_MODEL']);
         }else{
             //启动 claude-proxy.js 代理
             proxyPort = await portManager.getAvailablePort();
@@ -111,7 +113,7 @@ function start(){
                 logger.error("无法获取可用端口，程序退出");
                 process.exit(1);
             }
-            startServer(false, BASE_URL, proxyPort);
+            startServer(false, BASE_URL, proxyPort, env['MODEL'], env['SMALL_FAST_MODEL']);
         }
 
         // 设置代理地址
@@ -121,7 +123,7 @@ function start(){
 
          logger.debug(`启动 Claude 进程: ${claudePath}`);
 
-        const child = spawn(claudePath,process.argv.slice(2),{
+        const child = spawn(claudePath,[],{
                 env:{
                     ...process.env,  //包含原先环境变量
                     ...anthropicEnv,