node-karin 1.0.8 → 1.0.10

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # 更新日志
 
+## [1.0.10](https://github.com/KarinJS/Karin/compare/core-v1.0.9...core-v1.0.10) (2025-01-15)
+
+
+### 🐛 Bug Fixes
+
+* remove deprecated configuration files and enhance WebSocket client reconnection logic ([1ebec80](https://github.com/KarinJS/Karin/commit/1ebec80515fc6cc0a347b1ae06340db4c7da1054))
+
+## [1.0.9](https://github.com/KarinJS/Karin/compare/core-v1.0.8...core-v1.0.9) (2025-01-15)
+
+
+### 🐛 Bug Fixes
+
+* 哦~该死 ([aee10ea](https://github.com/KarinJS/Karin/commit/aee10eaa6c6b383f9c8e8953a614e49d653970e4))
+
 ## [1.0.8](https://github.com/KarinJS/Karin/compare/core-v1.0.7...core-v1.0.8) (2025-01-15)
 
 

package/default/config/render.json

@@ -4,8 +4,8 @@
   },
   "ws_client": [
     {
-      "enable": false,
-      "url": "ws://127.0.0.1:7005",
+      "enable": true,
+      "url": "ws://127.0.0.1:7005/ws",
       "token": "123456"
     }
   ],

package/dist/index.js

@@ -8898,12 +8898,96 @@ var init_ws2 = __esm({
 
 // src/adapter/render/connect/client.ts
 import WebSocket from "ws";
+import crypto2 from "node:crypto";
+var WebSocketClientRenderer, createWebSocketRenderClient;
 var init_client = __esm({
   async "src/adapter/render/connect/client.ts"() {
     "use strict";
     init_esm_shims();
     init_ws2();
     await init_render();
+    WebSocketClientRenderer = class extends WebSocketRender {
+      /** 重连次数 */
+      reconnectCount = 0;
+      /** 最大重连次数，设为-1表示无限重连 */
+      maxReconnectAttempts = -1;
+      /** 基连延迟(ms) */
+      baseDelay = 5e3;
+      /** WebSocket连接URL */
+      url;
+      /** 连接headers */
+      headers;
+      constructor(socket, url, headers) {
+        super(socket);
+        this.url = url;
+        this.headers = headers;
+      }
+      /**
+       * @description 重连逻辑
+       * @param isPrint 是否打印日志
+       */
+      reconnect = (isPrint = false) => {
+        if (this.maxReconnectAttempts !== -1 && this.reconnectCount >= this.maxReconnectAttempts) {
+          logger.error(`[render][WebSocket] \u8FDE\u63A5\u5931\u8D25\u6B21\u6570\u8FC7\u591A(${this.reconnectCount}\u6B21), \u5DF2\u505C\u6B62\u91CD\u8FDE: ${this.url}`);
+          return;
+        }
+        this.reconnectCount++;
+        const delay = this.baseDelay;
+        const delaySeconds = delay / 1e3;
+        if (isPrint) {
+          logger.warn(`[render][WebSocket][${this.reconnectCount}] \u8FDE\u63A5\u5931\u8D25\uFF0C${delaySeconds}\u79D2\u540E\u5C06\u91CD\u8FDE: ${this.url}`);
+        }
+        setTimeout(() => {
+          try {
+            const socket = new WebSocket(this.url, { headers: this.headers });
+            this.socket = socket;
+            socket.once("open", async () => {
+              logger.info(`[render][WebSocket] \u8FDE\u63A5\u6210\u529F: ${this.url}`);
+              await this.init();
+              this.reconnectCount = 0;
+            });
+            socket.once("error", (error) => {
+              logger.debug(error);
+              logger.error(`[render][WebSocket][${this.reconnectCount}] \u8FDE\u63A5\u9519\u8BEF: ${error.message}\uFF0C${delaySeconds}\u79D2\u540E\u5C06\u91CD\u8FDE: ${this.url}`);
+              socket.removeAllListeners();
+              socket.close();
+              this.reconnect(false);
+            });
+            socket.once("close", () => {
+              this.reconnect(true);
+            });
+          } catch (error) {
+            logger.debug(error);
+            this.reconnect();
+          }
+        }, delay);
+      };
+    };
+    createWebSocketRenderClient = () => {
+      const cfg = render();
+      if (!cfg.ws_client || !Array.isArray(cfg.ws_client) || cfg.ws_client.length === 0) {
+        logger.trace("[render][WebSocket] \u672A\u914D\u7F6E\u4EFB\u4F55\u6B63\u5411WebSocket \u5DF2\u8DF3\u8FC7\u521B\u5EFA");
+        return;
+      }
+      return Promise.allSettled(cfg.ws_client.map(async (item) => {
+        const { url, token, enable } = item;
+        if (!enable) return;
+        const headers = { Authorization: crypto2.createHash("md5").update(`Bearer ${token}`).digest("hex") };
+        const socket = new WebSocket(url, { headers });
+        const renderer = new WebSocketClientRenderer(socket, url, headers);
+        socket.once("open", async () => {
+          logger.info(`[render][WebSocket] \u8FDE\u63A5\u6210\u529F: ${url}`);
+          await renderer.init();
+        });
+        socket.once("close", () => {
+          renderer.reconnect(true);
+        });
+        socket.once("error", (error) => {
+          logger.error(`[render][WebSocket] \u8FDE\u63A5\u9519\u8BEF: ${error.message}`);
+          socket.close();
+        });
+      }));
+    };
   }
 });
 
@@ -8953,7 +9037,7 @@ var init_server2 = __esm({
 
 // src/adapter/render/connect/http.ts
 import axios4 from "axios";
-import crypto2 from "node:crypto";
+import crypto3 from "node:crypto";
 var createHttpRenderClient;
 var init_http = __esm({
   async "src/adapter/render/connect/http.ts"() {
@@ -8971,7 +9055,7 @@ var init_http = __esm({
         let { url, token, enable } = item;
         if (!enable) return;
         url = url.replace("/puppeteer", "");
-        const headers = { authorization: crypto2.createHash("md5").update(`Bearer ${token}`).digest("hex") };
+        const headers = { authorization: crypto3.createHash("md5").update(`Bearer ${token}`).digest("hex") };
         try {
           const result = await axios4.get(`${url}/ping`, { timeout: 5e3 });
           if (result.status !== 200 || String(result.data.status) !== "200") {
@@ -9030,7 +9114,11 @@ var init_render2 = __esm({
     await init_client();
     await init_server2();
     await init_http();
-    createHttpRenderClient();
+    await init_client();
+    setTimeout(() => {
+      createHttpRenderClient();
+      createWebSocketRenderClient();
+    }, 1e3);
   }
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-karin",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "Lightweight, efficient, concise, and stable robot framework.",
   "keywords": [
     "node",

package/default/config/groups.yaml

@@ -1,70 +0,0 @@
-# 详细配置请参考: https://karin.fun/start/file
-
-# 全局默认配置
-default:
-  # 群聊、频道中所有消息冷却时间，单位秒，0则无限制
-  cd: 0
-  # 群聊、频道中 每个人的消息冷却时间，单位秒，0则无限制。注意，开启后所有消息都会进CD，无论是否触发插件。
-  userCD: 1
-  # 机器人响应模式，0-所有 1-仅@机器人 2-仅回应管理员 3-仅回应别名 4-别名或@机器人 5-管理员无限制，成员别名或@机器人 6-仅回应主人
-  mode: 0
-
-  # 机器人别名 设置后别名+指令触发机器人
-  alias:
-    - k
-
-  # 白名单插件、功能，只有在白名单中的插件、功能才会响应 `karin-plugin-test:app.js` `karin-plugin-test:测试转发`
-  enable: []
-
-  # 黑名单插件、功能，黑名单中的插件、功能不会响应 `karin-plugin-test:app.js` `karin-plugin-test:测试转发`
-  disable: []
-
-  # 群、频道成员单独黑名单
-  memberDisable: []
-
-  # 群、频道成员单独白名单
-  memberEnable: []
-
-# 单个Bot全局配置
-Bot:selfId:
-  cd: 0
-  userCD: 1
-  mode: 0
-  alias: []
-  enable: []
-  disable: []
-  memberDisable: []
-  memberEnable: []
-
-# 单个Bot:单个群 配置
-Bot:selfId:groupId:
-  cd: 0
-  userCD: 1
-  mode: 0
-  alias: []
-  enable: []
-  disable: []
-  memberDisable: []
-  memberEnable: []
-
-# 单个Bot:单个频道 配置
-Bot:selfId:guildId:
-  cd: 0
-  userCD: 1
-  mode: 0
-  alias: []
-  enable: []
-  disable: []
-  memberDisable: []
-  memberEnable: []
-
-# 单个Bot:单个频道:单个子频道 配置
-Bot:selfId:guildId:channelId:
-  cd: 0
-  userCD: 1
-  mode: 0
-  alias: []
-  enable: []
-  disable: []
-  memberDisable: []
-  memberEnable: []

package/default/config/privates.yaml

@@ -1,31 +0,0 @@
-# 详细配置请参考: https://karin.fun/start/file
-
-# 全局默认配置
-default:
-  # 好友消息冷却时间，单位秒,0则无限制
-  cd: 0
-  # 机器人响应模式(私聊没有群聊那么多模式)，0-所有 2-仅回应管理员 3-仅回应别名 5-管理员无限制，非管理员别名 6-仅回应主人
-  mode: 0
-  # 机器人别名 设置后别名+指令触发机器人
-  alias:
-    - k
-  # 白名单插件、功能，只有在白名单中的插件、功能才会响应 `karin-plugin-test:app.js` `karin-plugin-test:测试转发`
-  enable: []
-  # 黑名单插件、功能，黑名单中的插件、功能不会响应 `karin-plugin-test:app.js` `karin-plugin-test:测试转发`
-  disable: []
-
-# 单个Bot默认配置
-Bot:selfId:
-  cd: 0
-  mode: 0
-  alias: []
-  enable: []
-  disable: []
-
-# 单个Bot:单个好友、频道成员 配置
-Bot:selfId:userId:
-  cd: 0
-  mode: 0
-  alias: []
-  enable: []
-  disable: []