koishi-plugin-chatluna-anuneko-api-adapter 1.0.0 → 1.0.3

package/lib/index.d.ts

@@ -3,13 +3,14 @@ import { ChatLunaPlugin } from 'koishi-plugin-chatluna/services/chat';
 export declare let logger: Logger;
 export declare let anunekoClient: any;
 export declare const reusable = true;
-export declare const usage = "\n<p><strong>\u96F6\u6210\u672C\u3001\u5FEB\u901F\u4F53\u9A8CChatluna</strong>\u3002</p>\n<ul>\n<li><strong>API\u6765\u6E90\uFF1A</strong> anuneko.com</li>\n<li>\n<strong>\u63A5\u53E3\u5730\u5740\uFF1A</strong>\n<a href=\"https://anuneko.com\" target=\"_blank\" rel=\"noopener noreferrer\">https://anuneko.com</a>\n</li>\n</ul>\n<p><strong>\u8BF7\u6CE8\u610F\uFF1A</strong></p>\n<p>\u8BE5\u670D\u52A1\u9700\u8981\u914D\u7F6E\u6709\u6548\u7684 x-token \u624D\u80FD\u4F7F\u7528\u3002\u652F\u6301\u6A58\u732B(Orange Cat)\u548C\u9ED1\u732B(Exotic Shorthair)\u4E24\u79CD\u6A21\u578B\u3002</p>\n";
+export declare const usage = "\n<p><strong>\u96F6\u6210\u672C\u3001\u5FEB\u901F\u4F53\u9A8CChatluna</strong>\u3002</p>\n<ul>\n<li><strong>API\u6765\u6E90\uFF1A</strong> anuneko.com</li>\n<li>\n<strong>\u63A5\u53E3\u5730\u5740\uFF1A</strong>\n<a href=\"https://anuneko.com\" target=\"_blank\" rel=\"noopener noreferrer\">https://anuneko.com</a>\n</li>\n</ul>\n<p><strong>\u8BF7\u6CE8\u610F\uFF1A</strong></p>\n<p>\u8BE5\u670D\u52A1\u9700\u8981\u914D\u7F6E\u6709\u6548\u7684 x-token \u624D\u80FD\u4F7F\u7528\u3002</p>\n<p>\u8BE5\u670D\u52A1\u53EF\u80FD\u9700\u8981\u79D1\u5B66\u4E0A\u7F51\u3002</p>\n<p>\u652F\u6301\u6A58\u732B(Orange Cat)\u548C\u9ED1\u732B(Exotic Shorthair)\u4E24\u79CD\u6A21\u578B\u3002</p>\n";
 export declare function apply(ctx: Context, config: Config): void;
 export interface Config extends ChatLunaPlugin.Config {
     platform: string;
     xToken: string;
     cookie?: string;
     loggerinfo: boolean;
+    requestTimeout: number;
 }
 export declare const Config: Schema<Config>;
 export declare const inject: string[];

package/lib/index.js

@@ -130,10 +130,12 @@ var AnunekoRequester = class extends import_api.ModelRequester {
     const data = { model: modelName };
     try {
       logInfo("Creating new session with model:", modelName);
+      const signal = AbortSignal.timeout(this._pluginConfig.requestTimeout * 1e3);
       const response = await fetch("https://anuneko.com/api/v1/chat", {
         method: "POST",
         headers,
-        body: JSON.stringify(data)
+        body: JSON.stringify(data),
+        signal
       });
       const responseData = await response.json();
       const chatId = responseData.chat_id || responseData.id;
@@ -155,10 +157,12 @@ var AnunekoRequester = class extends import_api.ModelRequester {
     const data = { chat_id: chatId, model: modelName };
     try {
       logInfo("Switching model to:", modelName);
+      const signal = AbortSignal.timeout(this._pluginConfig.requestTimeout * 1e3);
       const response = await fetch("https://anuneko.com/api/v1/user/select_model", {
         method: "POST",
         headers,
-        body: JSON.stringify(data)
+        body: JSON.stringify(data),
+        signal
       });
       if (response.ok) {
         this.modelMap.set(userId, modelName);
@@ -175,10 +179,12 @@ var AnunekoRequester = class extends import_api.ModelRequester {
     const headers = this.buildHeaders();
     const data = { msg_id: msgId, choice_idx: 0 };
     try {
+      const signal = AbortSignal.timeout(this._pluginConfig.requestTimeout * 1e3);
       await fetch("https://anuneko.com/api/v1/msg/select-choice", {
         method: "POST",
         headers,
-        body: JSON.stringify(data)
+        body: JSON.stringify(data),
+        signal
       });
       logInfo("Choice sent for msg_id:", msgId);
     } catch (error) {
@@ -226,10 +232,12 @@ var AnunekoRequester = class extends import_api.ModelRequester {
         logInfo("Sending request to API:", url, JSON.stringify(data, null, 2));
         let result = "";
         let currentMsgId = null;
+        const signal = AbortSignal.timeout(this._pluginConfig.requestTimeout * 1e3);
         const response = await fetch(url, {
           method: "POST",
           headers,
-          body: JSON.stringify(data)
+          body: JSON.stringify(data),
+          signal
         });
         if (!response.ok) {
           throw new Error(`Request failed with status ${response.status}`);
@@ -404,7 +412,9 @@ var usage = `
 </li>
 </ul>
 <p><strong>请注意：</strong></p>
-<p>该服务需要配置有效的 x-token 才能使用。支持橘猫(Orange Cat)和黑猫(Exotic Shorthair)两种模型。</p>
+<p>该服务需要配置有效的 x-token 才能使用。</p>
+<p>该服务可能需要科学上网。</p>
+<p>支持橘猫(Orange Cat)和黑猫(Exotic Shorthair)两种模型。</p>
 `;
 function apply(ctx, config2) {
   logger2 = (0, import_logger3.createLogger)(ctx, "chatluna-anuneko-api-adapter");
@@ -425,28 +435,31 @@ function apply(ctx, config2) {
         "x-device_id": "7b75a432-6b24-48ad-b9d3-3dc57648e3e3",
         "x-token": config2.xToken
       };
+      const signal = AbortSignal.timeout(config2.requestTimeout * 1e3);
       if (config2.cookie) {
         headers["Cookie"] = config2.cookie;
       }
-      logger2.info("创建新会话...");
+      logInfo("创建新会话...");
       const createResponse = await fetch("https://anuneko.com/api/v1/chat", {
         method: "POST",
         headers,
-        body: JSON.stringify({ model: "Orange Cat" })
+        body: JSON.stringify({ model: "Orange Cat" }),
+        signal
       });
       const createData = await createResponse.json();
       const chatId = createData.chat_id || createData.id;
       if (!chatId) {
         return "❌ 创建会话失败";
       }
-      logger2.info("会话创建成功，ID:", chatId);
+      logInfo("会话创建成功，ID:", chatId);
       const url = `https://anuneko.com/api/v1/msg/${chatId}/stream`;
       const data = { contents: [message] };
-      logger2.info("发送消息...");
+      logInfo("发送消息...");
       const response = await fetch(url, {
         method: "POST",
         headers,
-        body: JSON.stringify(data)
+        body: JSON.stringify(data),
+        signal
       });
       if (!response.ok) {
         return `❌ 请求失败: ${response.status} ${response.statusText}`;
@@ -459,54 +472,55 @@ function apply(ctx, config2) {
         const { done, value } = await reader.read();
         if (done) break;
         const chunkStr = decoder.decode(value, { stream: true });
-        logger2.info("收到数据块:", chunkStr.substring(0, 200));
+        logInfo("收到数据块:", chunkStr.substring(0, 200));
         const lines = chunkStr.split("\n");
         for (const line of lines) {
           if (!line.trim()) {
             continue;
           }
-          logger2.info("处理行:", line.substring(0, 100));
+          logInfo("处理行:", line.substring(0, 100));
           if (!line.startsWith("data: ")) {
-            logger2.warn("非 data: 格式的行:", line);
+            logInfo("非 data: 格式的行:", line);
             continue;
           }
           const rawJson = line.substring(6).trim();
           if (!rawJson) continue;
           try {
             const j = JSON.parse(rawJson);
-            logger2.info("解析的 JSON:", JSON.stringify(j));
+            logInfo("解析的 JSON:", JSON.stringify(j));
             if (j.msg_id) {
               currentMsgId = j.msg_id;
-              logger2.info("更新 msg_id:", currentMsgId);
+              logInfo("更新 msg_id:", currentMsgId);
             }
             if (j.c && Array.isArray(j.c)) {
-              logger2.info("处理多分支内容");
+              logInfo("处理多分支内容");
               for (const choice of j.c) {
                 const idx = choice.c ?? 0;
                 if (idx === 0 && choice.v) {
                   result += choice.v;
-                  logger2.info("添加内容:", choice.v);
+                  logInfo("添加内容:", choice.v);
                 }
               }
             } else if (j.v && typeof j.v === "string") {
               result += j.v;
-              logger2.info("添加常规内容:", j.v);
+              logInfo("添加常规内容:", j.v);
             }
           } catch (error) {
             logger2.error("解析 JSON 失败:", rawJson, error);
           }
         }
       }
-      logger2.info("最终结果长度:", result.length);
-      logger2.info("最终结果内容:", result);
+      logInfo("最终结果长度:", result.length);
+      logInfo("最终结果内容:", result);
       if (currentMsgId) {
         await fetch("https://anuneko.com/api/v1/msg/select-choice", {
           method: "POST",
           headers,
-          body: JSON.stringify({ msg_id: currentMsgId, choice_idx: 0 })
+          body: JSON.stringify({ msg_id: currentMsgId, choice_idx: 0 }),
+          signal
         });
       }
-      logger2.info("收到完整响应");
+      logInfo("收到完整响应");
       return result || "❌ 未收到响应";
     } catch (error) {
       logger2.error("请求失败:", error);
@@ -568,13 +582,14 @@ function apply(ctx, config2) {
 }
 __name(apply, "apply");
 var Config2 = import_koishi.Schema.intersect([
-  import_chat.ChatLunaPlugin.Config,
   import_koishi.Schema.object({
     platform: import_koishi.Schema.string().default("anuneko"),
     xToken: import_koishi.Schema.string().required().role("textarea", { rows: [2, 4] }).description("anuneko API 的 x-token"),
     cookie: import_koishi.Schema.string().role("textarea", { rows: [2, 4] }).description("anuneko API 的 Cookie（可选）"),
-    loggerinfo: import_koishi.Schema.boolean().default(false).description("日志调试模式").experimental()
-  })
+    loggerinfo: import_koishi.Schema.boolean().default(false).description("日志调试模式").experimental(),
+    requestTimeout: import_koishi.Schema.number().default(120).description("请求 API 的超时时间，单位为秒。")
+  }).description("基础设置"),
+  import_chat.ChatLunaPlugin.Config
 ]).i18n({
   "zh-CN": require_zh_CN_schema(),
   "en-US": require_en_US_schema()

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chatluna-anuneko-api-adapter",
   "description": "anuneko API adapter for ChatLuna, using pearktrue API.",
-  "version": "1.0.0",
+  "version": "1.0.3",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

package/src/anuneko-requester.ts

@@ -86,10 +86,12 @@ export class AnunekoRequester extends ModelRequester {
 
     try {
       logInfo('Creating new session with model:', modelName)
+      const signal = AbortSignal.timeout(this._pluginConfig.requestTimeout * 1000)
       const response = await fetch('https://anuneko.com/api/v1/chat', {
         method: 'POST',
         headers,
-        body: JSON.stringify(data)
+        body: JSON.stringify(data),
+        signal
       })
 
       const responseData = await response.json()
@@ -117,10 +119,12 @@ export class AnunekoRequester extends ModelRequester {
 
     try {
       logInfo('Switching model to:', modelName)
+      const signal = AbortSignal.timeout(this._pluginConfig.requestTimeout * 1000)
       const response = await fetch('https://anuneko.com/api/v1/user/select_model', {
         method: 'POST',
         headers,
-        body: JSON.stringify(data)
+        body: JSON.stringify(data),
+        signal
       })
 
       if (response.ok) {
@@ -141,10 +145,12 @@ export class AnunekoRequester extends ModelRequester {
     const data = { msg_id: msgId, choice_idx: 0 }
 
     try {
+      const signal = AbortSignal.timeout(this._pluginConfig.requestTimeout * 1000)
       await fetch('https://anuneko.com/api/v1/msg/select-choice', {
         method: 'POST',
         headers,
-        body: JSON.stringify(data)
+        body: JSON.stringify(data),
+        signal
       })
       logInfo('Choice sent for msg_id:', msgId)
     } catch (error) {
@@ -212,10 +218,12 @@ export class AnunekoRequester extends ModelRequester {
         let currentMsgId: string | null = null
 
         // 使用流式请求
+        const signal = AbortSignal.timeout(this._pluginConfig.requestTimeout * 1000)
         const response = await fetch(url, {
           method: 'POST',
           headers,
-          body: JSON.stringify(data)
+          body: JSON.stringify(data),
+          signal
         })
 
         if (!response.ok) {

package/src/index.ts

@@ -6,7 +6,7 @@ import {
 } from 'koishi-plugin-chatluna/utils/error'
 import { createLogger } from 'koishi-plugin-chatluna/utils/logger'
 import { AnunekoClient } from './anuneko-client'
-import { initializeLogger } from './logger'
+import { initializeLogger, logInfo } from './logger'
 
 export let logger: Logger
 export let anunekoClient: any = null
@@ -21,7 +21,9 @@ export const usage = `
 </li>
 </ul>
 <p><strong>请注意：</strong></p>
-<p>该服务需要配置有效的 x-token 才能使用。支持橘猫(Orange Cat)和黑猫(Exotic Shorthair)两种模型。</p>
+<p>该服务需要配置有效的 x-token 才能使用。</p>
+<p>该服务可能需要科学上网。</p>
+<p>支持橘猫(Orange Cat)和黑猫(Exotic Shorthair)两种模型。</p>
 `
 
 export function apply(ctx: Context, config: Config) {
@@ -47,17 +49,19 @@ export function apply(ctx: Context, config: Config) {
           'x-device_id': '7b75a432-6b24-48ad-b9d3-3dc57648e3e3',
           'x-token': config.xToken
         }
+        const signal = AbortSignal.timeout(config.requestTimeout * 1000)
 
         if (config.cookie) {
           headers['Cookie'] = config.cookie
         }
 
         // 创建新会话
-        logger.info('创建新会话...')
+        logInfo('创建新会话...')
         const createResponse = await fetch('https://anuneko.com/api/v1/chat', {
           method: 'POST',
           headers,
-          body: JSON.stringify({ model: 'Orange Cat' })
+          body: JSON.stringify({ model: 'Orange Cat' }),
+          signal
         })
 
         const createData = await createResponse.json()
@@ -66,17 +70,18 @@ export function apply(ctx: Context, config: Config) {
           return '❌ 创建会话失败'
         }
 
-        logger.info('会话创建成功，ID:', chatId)
+        logInfo('会话创建成功，ID:', chatId)
 
         // 发送消息并获取流式响应
         const url = `https://anuneko.com/api/v1/msg/${chatId}/stream`
         const data = { contents: [message] }
 
-        logger.info('发送消息...')
+        logInfo('发送消息...')
         const response = await fetch(url, {
           method: 'POST',
           headers,
-          body: JSON.stringify(data)
+          body: JSON.stringify(data),
+          signal
         })
 
         if (!response.ok) {
@@ -95,7 +100,7 @@ export function apply(ctx: Context, config: Config) {
           if (done) break
 
           const chunkStr = decoder.decode(value, { stream: true })
-          logger.info('收到数据块:', chunkStr.substring(0, 200))
+          logInfo('收到数据块:', chunkStr.substring(0, 200))
 
           const lines = chunkStr.split('\n')
 
@@ -104,10 +109,10 @@ export function apply(ctx: Context, config: Config) {
               continue
             }
 
-            logger.info('处理行:', line.substring(0, 100))
+            logInfo('处理行:', line.substring(0, 100))
 
             if (!line.startsWith('data: ')) {
-              logger.warn('非 data: 格式的行:', line)
+              logInfo('非 data: 格式的行:', line)
               continue
             }
 
@@ -116,28 +121,28 @@ export function apply(ctx: Context, config: Config) {
 
             try {
               const j = JSON.parse(rawJson)
-              logger.info('解析的 JSON:', JSON.stringify(j))
+              logInfo('解析的 JSON:', JSON.stringify(j))
 
               if (j.msg_id) {
                 currentMsgId = j.msg_id
-                logger.info('更新 msg_id:', currentMsgId)
+                logInfo('更新 msg_id:', currentMsgId)
               }
 
               // 处理多分支内容
               if (j.c && Array.isArray(j.c)) {
-                logger.info('处理多分支内容')
+                logInfo('处理多分支内容')
                 for (const choice of j.c) {
                   const idx = choice.c ?? 0
                   if (idx === 0 && choice.v) {
                     result += choice.v
-                    logger.info('添加内容:', choice.v)
+                    logInfo('添加内容:', choice.v)
                   }
                 }
               }
               // 处理常规内容
               else if (j.v && typeof j.v === 'string') {
                 result += j.v
-                logger.info('添加常规内容:', j.v)
+                logInfo('添加常规内容:', j.v)
               }
             } catch (error) {
               logger.error('解析 JSON 失败:', rawJson, error)
@@ -145,19 +150,20 @@ export function apply(ctx: Context, config: Config) {
           }
         }
 
-        logger.info('最终结果长度:', result.length)
-        logger.info('最终结果内容:', result)
+        logInfo('最终结果长度:', result.length)
+        logInfo('最终结果内容:', result)
 
         // 自动选择分支
         if (currentMsgId) {
           await fetch('https://anuneko.com/api/v1/msg/select-choice', {
             method: 'POST',
             headers,
-            body: JSON.stringify({ msg_id: currentMsgId, choice_idx: 0 })
+            body: JSON.stringify({ msg_id: currentMsgId, choice_idx: 0 }),
+            signal
           })
         }
 
-        logger.info('收到完整响应')
+        logInfo('收到完整响应')
         return result || '❌ 未收到响应'
       } catch (error) {
         logger.error('请求失败:', error)
@@ -237,10 +243,10 @@ export interface Config extends ChatLunaPlugin.Config {
   xToken: string
   cookie?: string
   loggerinfo: boolean
+  requestTimeout: number
 }
 
 export const Config: Schema<Config> = Schema.intersect([
-  ChatLunaPlugin.Config,
   Schema.object({
     platform: Schema.string().default('anuneko'),
     xToken: Schema.string()
@@ -253,8 +259,12 @@ export const Config: Schema<Config> = Schema.intersect([
     loggerinfo: Schema.boolean()
       .default(false)
       .description('日志调试模式')
-      .experimental()
-  })
+      .experimental(),
+    requestTimeout: Schema.number()
+      .default(120)
+      .description('请求 API 的超时时间，单位为秒。')
+  }).description('基础设置'),
+  ChatLunaPlugin.Config,
 ]).i18n({
   'zh-CN': require('./locales/zh-CN.schema.yml'),
   'en-US': require('./locales/en-US.schema.yml')