fix: 修复连接相关的问题

Author: lrhh123

src/main/backend/backend.ts

@@ -212,10 +212,7 @@ class BKServer {
           );
         }
 
-        if (isKeywordMatch) {
-          this.messageService.updateKeywordMatch(isKeywordMatch, isUseGptReply);
-        }
-
+        this.messageService.updateKeywordMatch(isKeywordMatch, isUseGptReply);
         await this.strategyService.updateStrategies(ids);
 
         res.json({ success: true });

src/main/backend/services/configService.ts

@@ -33,30 +33,31 @@ export class ConfigService {
       await this.platformConfigController.getByPlatformId(platformId);
 
     const { settings } = platformConfig;
-    if (!settings || !settings.active) {
+    const settingsVal =
+      typeof settings === 'string' ? JSON.parse(settings) : settings;
+    if (!settingsVal || !settingsVal.active) {
       return this.configController.getConfig();
     }
 
     const config = await this.configController.getConfig();
 
     return {
       id: config.id,
-      extract_phone: settings.extract_phone ?? config.extract_phone,
-      extract_product: settings.extract_product ?? config.extract_product,
-      save_path: settings.save_path ?? config.save_path,
-      reply_speed: settings.reply_speed ?? config.reply_speed,
-      reply_random_speed:
-        settings.reply_random_speed ?? config.reply_random_speed,
-      context_count: settings.context_count ?? config.context_count,
-      wait_humans_time: settings.wait_humans_time ?? config.wait_humans_time,
-      gpt_base_url: settings.gpt_base_url ?? config.gpt_base_url,
-      gpt_key: settings.gpt_key ?? config.gpt_key,
-      use_dify: settings.use_dify ?? config.use_dify,
-      gpt_model: settings.gpt_model ?? config.gpt_model,
-      gpt_temperature: settings.gpt_temperature ?? config.gpt_temperature,
-      gpt_top_p: settings.gpt_top_p ?? config.gpt_top_p,
-      stream: settings.stream ?? config.stream,
-      default_reply: settings.default_reply ?? config.default_reply,
+      extract_phone: config.extract_phone,
+      extract_product: config.extract_product,
+      save_path: config.save_path,
+      reply_speed: config.reply_speed,
+      reply_random_speed: config.reply_random_speed,
+      wait_humans_time: config.wait_humans_time,
+      context_count: settingsVal.contextCount ?? config.context_count,
+      gpt_base_url: settingsVal.proxyAddress ?? config.gpt_base_url,
+      gpt_key: settingsVal.apiKey ?? config.gpt_key,
+      use_dify: settingsVal.useDify ?? config.use_dify,
+      gpt_model: settingsVal.model ?? config.gpt_model,
+      default_reply: settingsVal.defaultReply ?? config.default_reply,
+      gpt_temperature: config.gpt_temperature,
+      gpt_top_p: config.gpt_top_p,
+      stream: config.stream,
     } as any;
   }
 

src/main/backend/services/messageService.ts

@@ -316,6 +316,8 @@ export class MessageService {
     messages: MessageDTO[],
     session: Session,
   ) {
+    console.warn('getReplyTask', messages, session);
+
     // 提前定义好回复内容
     let replyContent = null;
 
@@ -333,29 +335,31 @@ export class MessageService {
       }
     }
 
-    // 如果关键词匹配无效或未启用关键词匹配，调用 OpenAI 生成回复
-    if (!replyContent && this.isUseGptReply) {
-      console.log(
-        'Keyword matching failed or not used, using OpenAI to generate reply...',
-      );
-      if (config.use_dify) {
-        replyContent = await this.getDifyResponse(
-          config,
-          messages,
-          session.platform_id,
+    if (!replyContent) {
+      // 如果关键词匹配无效或未启用关键词匹配，调用 OpenAI 生成回复
+      if (this.isUseGptReply) {
+        console.log(
+          'Keyword matching failed or not used, using OpenAI to generate reply...',
         );
+        if (config.use_dify) {
+          replyContent = await this.getDifyResponse(
+            config,
+            messages,
+            session.platform_id,
+          );
+        } else {
+          replyContent = await this.getOpenAIResponse(
+            config,
+            messages,
+            session.platform_id,
+          );
+        }
       } else {
-        replyContent = await this.getOpenAIResponse(
-          config,
-          messages,
-          session.platform_id,
-        );
+        replyContent = {
+          content: config.default_reply,
+          msg_type: 'text' as MessageType,
+        };
       }
-    } else {
-      replyContent = {
-        content: config.default_reply,
-        msg_type: 'text' as MessageType,
-      };
     }
 
     replyContent.msg_type = this.getMsgType(replyContent);
@@ -478,6 +482,7 @@ export class MessageService {
         found: true,
       };
     }
+
     return {
       content: { content: '', msg_type: 'text' },
       found: false,
@@ -494,22 +499,40 @@ export class MessageService {
     return this.matchKeyword(pattern, msg);
   }
 
-  private matchKeyword(pattern: string, msg: string) {
+  private matchKeyword(ptt: string, msg: string): boolean {
+    let pattern = ptt.trim();
+
+    // 如果模式只是一个星号，它应该匹配任何消息。
+    if (pattern === '*') {
+      return true;
+    }
+
+    // 合并连续的 '*' 字符为一个 '*'
+    pattern = pattern.replace(/\*+/g, '*');
+
+    // 如果模式不包含 '*'，则直接比较是否相等
     if (!pattern.includes('*')) {
       return pattern === msg;
     }
 
     const parts = pattern.split('*');
     let lastIndex = 0;
+
     // eslint-disable-next-line no-restricted-syntax
     for (const part of parts) {
-      // eslint-disable-next-line no-continue
+      // 跳过空字符串（它们来自模式开始、结束或连续 '*'）
       if (part === '') continue;
+
       const index = msg.indexOf(part, lastIndex);
-      if (index === -1 || index < lastIndex) return false;
+      // 如果找不到部分或部分不是按顺序出现，则匹配失败
+      if (index === -1 || index < lastIndex) {
+        return false;
+      }
       lastIndex = index + part.length;
     }
-    return true;
+
+    // 确保消息的剩余部分可以被模式尾部的 '*' 匹配
+    return parts[parts.length - 1] === '' || lastIndex <= msg.length;
   }
 
   private replaceSpecialTokens(replyMsg: string) {

src/renderer/pages/Settings/GptSettings.tsx

@@ -15,7 +15,6 @@ import {
   SliderFilledTrack,
   SliderThumb,
   SliderTrack,
-  HStack,
   InputGroup,
   InputRightElement,
   Button,
@@ -200,24 +199,6 @@ const GptSettings = () => {
                 <SliderThumb />
               </Slider>
             </FormControl>
-
-            <FormControl>
-              <HStack mb="4" mt="8px">
-                <FormLabel htmlFor="stream" width="30%">
-                  Stream(可选)
-                </FormLabel>
-                <Switch
-                  id="stream"
-                  isChecked={gptSettings.stream}
-                  onChange={(e) => {
-                    setGptSettings({
-                      ...gptSettings,
-                      stream: e.target.checked,
-                    });
-                  }}
-                />
-              </HStack>
-            </FormControl>
           </>
 
           <FormControl>