fix: 修复日志同步，add: 添加自动暂停功能

Author: lrhh123

.env

@@ -2,5 +2,4 @@ PY_HOSTNAME=localhost
 PY_PORT=9999
 VAR=1234
 BKEXE_PATH=./backend/__main__.exe
-PKG_VERSION=0.0.1
-DEBUG=true
+PKG_VERSION=0.0.1

package.json

@@ -126,7 +126,6 @@
     "ms": "^2.1.3",
     "net": "^1.0.2",
     "node-cron": "^3.0.3",
-    "node-fetch": "2.6.7",
     "openai": "^4.38.3",
     "pg-connection-string": "^2.6.4",
     "pg-hstore": "^2.3.4",

pnpm-lock.yaml

@@ -6,7 +6,6 @@ import http from 'http';
 import { Server } from 'socket.io';
 import { BrowserWindow, shell } from 'electron';
 import { sequelize } from './ormconfig';
-import { StrategyServiceStatusEnum } from './types';
 import { ConfigController } from './controllers/configController';
 import { MessageController } from './controllers/messageController';
 import { KeywordReplyController } from './controllers/keywordReplyController';
@@ -196,7 +195,7 @@ class BKServer {
         const data = {
           appId: appId ? String(appId) : undefined,
           instanceId: instanceId ? String(instanceId) : undefined,
-          type: type ? String(type) : 'generic',
+          type: type ? String(type) : ('generic' as any),
         };
 
         const obj = await configController.getConfigByType(data);
@@ -225,30 +224,15 @@ class BKServer {
         };
 
         await configController.updateConfigByType(data);
+        await this.dispatchService.syncConfig();
         res.json({ success: true });
       }),
     );
 
     // Endpoint to update runner status based on incoming configuration
-    this.app.post('/api/v1/base/runner', async (req, res) => {
-      const {
-        is_paused: isPaused,
-        is_keyword_match: isKeywordMatch,
-        is_use_gpt: isUseGptReply,
-      } = req.body;
+    this.app.post('/api/v1/base/sync', async (req, res) => {
       try {
-        if (isPaused) {
-          await this.dispatchService.updateStatus(
-            StrategyServiceStatusEnum.STOPPED,
-          );
-        } else {
-          await this.dispatchService.updateStatus(
-            StrategyServiceStatusEnum.RUNNING,
-          );
-        }
-
-        this.messageService.updateKeywordMatch(isKeywordMatch, isUseGptReply);
-
+        await this.dispatchService.syncConfig();
         res.json({ success: true });
       } catch (error) {
         if (error instanceof Error) {
@@ -432,9 +416,9 @@ class BKServer {
           data: task,
         });
       } catch (error) {
-        console.error(error);
         res.json({
           success: false,
+          error: error instanceof Error ? error.message : String(error),
           data: null,
         });
       }

src/main/backend/backend.ts

@@ -109,13 +109,13 @@ async function main(ctx, messages) {
   });
 
   // 再检查是否使用关键词匹配
-  if (rp.isKeywordMatch) {
+  if (cfg.has_keyword_match) {
     const data = await rp.matchKeyword(ctx, lastUserMsg);
     if (data) return data;
   }
 
   // 最后检查是否使用 GPT 生成回复
-  if (rp.isUseGptReply) {
+  if (cfg.has_use_gpt) {
     const data = await rp.getLLMResponse(cfg, ctx, messages);
     if (data) return data;
   }

src/main/backend/constants/index.ts

@@ -6,6 +6,7 @@ import {
   LLMConfig,
   AccountConfig,
   PluginConfig,
+  DriverConfig,
 } from '../types';
 import { CTX_APP_ID, CTX_INSTANCE_ID } from '../constants';
 
@@ -41,6 +42,18 @@ export class ConfigController {
       config = await Config.create({
         global: true,
       });
+    } else {
+      const globalConfig = await Config.findOne({
+        where: { global: true },
+      });
+
+      // 这三个配置项是全局配置，需要合并到实例配置中
+      if (globalConfig) {
+        config.has_keyword_match = globalConfig.has_keyword_match;
+        config.has_paused = globalConfig.has_paused;
+        config.has_use_gpt = globalConfig.has_use_gpt;
+        config.has_mouse_close = globalConfig.has_mouse_close;
+      }
     }
 
     return config;
@@ -156,9 +169,14 @@ export class ConfigController {
   }: {
     appId: string | undefined;
     instanceId: string | undefined;
-    type: string;
+    type: 'generic' | 'llm' | 'plugin' | 'driver' | 'account';
   }): Promise<
-    GenericConfig | LLMConfig | AccountConfig | PluginConfig | undefined
+    | GenericConfig
+    | LLMConfig
+    | AccountConfig
+    | PluginConfig
+    | DriverConfig
+    | undefined
   > {
     let config = null;
     if (instanceId) {
@@ -206,6 +224,7 @@ export class ConfigController {
         defaultReply: config?.default_reply || '',
       };
     }
+
     if (type === 'llm') {
       return {
         appId: config?.platform_id || '',
@@ -216,6 +235,7 @@ export class ConfigController {
         model: config?.model || 'gpt-3.5-turbo',
       };
     }
+
     if (type === 'plugin') {
       let pluginCode = '';
 
@@ -232,6 +252,15 @@ export class ConfigController {
       };
     }
 
+    if (type === 'driver') {
+      return {
+        hasPaused: config?.has_paused || false,
+        hasKeywordMatch: config?.has_keyword_match || false,
+        hasUseGpt: config?.has_use_gpt || false,
+        hasMouseClose: config?.has_mouse_close || false,
+      };
+    }
+
     return {
       activationCode: config?.activation_code || '',
     };
@@ -250,7 +279,12 @@ export class ConfigController {
     appId: string | undefined;
     instanceId: string | undefined;
     type: string;
-    cfg: GenericConfig | LLMConfig | AccountConfig | PluginConfig;
+    cfg:
+      | GenericConfig
+      | LLMConfig
+      | AccountConfig
+      | PluginConfig
+      | DriverConfig;
   }) {
     let dbConfig = null;
     if (instanceId) {
@@ -328,11 +362,53 @@ export class ConfigController {
         use_plugin: config.usePlugin,
         plugin_id: pluginId,
       });
+    } else if (type === 'driver') {
+      // TODO: 目前只有全局配置，后续再实现实例配置
+      const config = cfg as DriverConfig;
+      dbConfig = await Config.findOne({
+        where: { global: true },
+      });
+      if (!dbConfig) {
+        throw new Error('Driver config not found');
+      }
+      await dbConfig.update({
+        has_paused: config.hasPaused,
+        has_keyword_match: config.hasKeywordMatch,
+        has_use_gpt: config.hasUseGpt,
+        has_mouse_close: config.hasMouseClose,
+      });
     } else {
       const config = cfg as AccountConfig;
       await dbConfig.update({
         activation_code: config.activationCode,
       });
     }
   }
+
+  /**
+   * 更新配置
+   * @param
+   */
+  public async moveMouseHandler(): Promise<boolean> {
+    const dbConfig = await Config.findOne({
+      where: { global: true },
+    });
+
+    if (!dbConfig) {
+      return false;
+    }
+
+    // 检查是否开启了鼠标移动自动暂停功能
+    if (dbConfig.has_mouse_close) {
+      if (!dbConfig.has_paused) {
+        await dbConfig.update({
+          has_paused: true,
+        });
+
+        return true;
+      }
+    }
+
+    return false;
+  }
 }

src/main/backend/controllers/configController.ts

@@ -45,6 +45,14 @@ export class Config extends Model {
   declare activation_code: string;
 
   declare version: string;
+
+  declare has_paused: boolean;
+
+  declare has_keyword_match: boolean;
+
+  declare has_use_gpt: boolean;
+
+  declare has_mouse_close: boolean; // 鼠标移动时是否自动关闭
 }
 
 export function initConfig(sequelize: Sequelize) {
@@ -111,6 +119,7 @@ export function initConfig(sequelize: Sequelize) {
       default_reply: {
         type: DataTypes.STRING,
         allowNull: true,
+        defaultValue: '当前消息有点多，我稍后再回复你',
       },
       context_count: {
         type: DataTypes.FLOAT,
@@ -147,6 +156,26 @@ export function initConfig(sequelize: Sequelize) {
         defaultValue: '1.0.0',
         allowNull: true,
       },
+      has_paused: {
+        type: DataTypes.BOOLEAN,
+        defaultValue: true,
+        allowNull: true,
+      },
+      has_keyword_match: {
+        type: DataTypes.BOOLEAN,
+        defaultValue: true,
+        allowNull: true,
+      },
+      has_use_gpt: {
+        type: DataTypes.BOOLEAN,
+        defaultValue: true,
+        allowNull: true,
+      },
+      has_mouse_close: {
+        type: DataTypes.BOOLEAN,
+        defaultValue: true,
+        allowNull: true,
+      },
     },
     {
       sequelize,

src/main/backend/entities/config.ts

@@ -60,6 +60,12 @@ export class AppService {
           throw new Error('Failed to update tasks');
         }
 
+        // 遍历 result 检查，判断是否存在 error 属性
+        const err_target = result.find((task) => task.error);
+        if (err_target) {
+          throw new Error(err_target.error);
+        }
+
         const target = result.find(
           (task) => task.task_id === String(instance.id),
         );