node-karin 1.3.18 → 1.3.20

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # 更新日志
 
+## [1.3.20](https://github.com/KarinJS/Karin/compare/core-v1.3.19...core-v1.3.20) (2025-02-26)
+
+
+### 🐛 Bug Fixes
+
+* cause error ([140831f](https://github.com/KarinJS/Karin/commit/140831fe99da39506278838ca7afc3a7deca92b8))
+* middleware ([8a7896e](https://github.com/KarinJS/Karin/commit/8a7896ebec77716069d9a31dc3db2da6669ca0c4))
+
+## [1.3.19](https://github.com/KarinJS/Karin/compare/core-v1.3.18...core-v1.3.19) (2025-02-25)
+
+
+### 🐛 Bug Fixes
+
+* hook ([3647bb2](https://github.com/KarinJS/Karin/commit/3647bb2db51d09a7ad94c33a78abb42455300abe))
+
 ## [1.3.18](https://github.com/KarinJS/Karin/compare/core-v1.3.17...core-v1.3.18) (2025-02-24)
 
 

package/dist/index.d.ts

@@ -11212,8 +11212,9 @@ interface MessageHookItem<T extends UnionMessage> {
  * @param contact 联系人
  * @param elements 消息元素
  * @param retryCount 重试次数
+ * @param next 继续执行下一个钩子的函数
  */
-type BaseMessageCallback<T> = (contact: Contact, elements: Array<Elements>, retryCount?: number) => T | Promise<T>;
+type BaseMessageCallback<T> = (contact: Contact, elements: Array<Elements>, retryCount: number, next: HookNext) => T | Promise<T>;
 /**
  * 接收普通消息发送回调类型 这个由开发者调用
  */
@@ -11227,8 +11228,9 @@ type HookEmitMessage = BaseMessageCallback<boolean>;
  * @param contact 联系人
  * @param elements 消息元素
  * @param options 转发选项
+ * @param next 继续执行下一个钩子的函数
  */
-type BaseForwardCallback<T> = (contact: Contact, elements: Array<NodeElement>, options?: ForwardOptions) => T | Promise<T>;
+type BaseForwardCallback<T> = (contact: Contact, elements: Array<NodeElement>, options: ForwardOptions | undefined, next: HookNext) => T | Promise<T>;
 /**
  * 接收转发消息回调类型 这个由开发者调用
  */

package/dist/index.js

@@ -3043,15 +3043,14 @@ headers: ${JSON.stringify(req.headers)}
 body: ${JSON.stringify(req.body)}
 `
       );
-      if (req.path.startsWith("/api")) {
-        if (req.path === "/api/v1/ping" || req.path.startsWith("/api/v1/console")) {
-          next();
-          return;
-        }
-        if (!auth.getAuth(req)) {
-          createUnauthorizedResponse(res, "\u9519\u8BEF\u7684token");
-          return;
-        }
+      if (req.path === "/ping" || req.path.startsWith("/console")) {
+        next();
+        return;
+      }
+      if (!auth.getAuth(req)) {
+        createUnauthorizedResponse(res, "\u9519\u8BEF\u7684token");
+        logger.error(`[express][${req.ip}] \u9274\u6743\u9519\u8BEF: /api/v1/${req.path}`);
+        return;
       }
       next();
     };
@@ -4481,78 +4480,6 @@ var init_console = __esm({
   }
 });
 
-// src/utils/system/restart.ts
-var restart, restartDirect;
-var init_restart = __esm({
-  "src/utils/system/restart.ts"() {
-    "use strict";
-    init_esm_shims();
-    init_exec();
-    restart = async (selfId, contact3, messageId, isFront = true) => {
-      const options = {
-        selfId,
-        contact: contact3,
-        messageId,
-        time: Date.now()
-      };
-      const key = `karin:restart:${selfId}`;
-      const { level: level2 } = await Promise.resolve().then(() => (init_index(), index_exports));
-      await level2.set(key, options);
-      if (isFront && process.send) {
-        process.send("restart");
-        return { status: "success", data: "\u5DF2\u53D1\u9001\u91CD\u542F\u4FE1\u53F7" };
-      }
-      if (process.env.PM2_RESTART === "true") process.exit();
-      if (process.env.pm_id) {
-        const { error: error2 } = await exec("npx karin rs");
-        if (error2) return { status: "failed", data: error2 };
-        process.exit();
-      }
-      const { error } = await exec("npx karin pm2");
-      if (error) return { status: "failed", data: error };
-      process.exit();
-    };
-    restartDirect = async () => {
-      logger.mark("\u6536\u5230\u91CD\u542F\u8BF7\u6C42\uFF0C\u6B63\u5728\u91CD\u542F...");
-      if (process.env.RUNTIME === "pm2") {
-        await exec(`pm2 restart ${process.env.pm_id}`);
-        return;
-      }
-      if (process.env.RUNTIME === "tsx") {
-        throw new Error("tsx \u4E0D\u652F\u6301\u91CD\u542F");
-      }
-      if (process == null ? void 0 : process.send) {
-        process.send("restart");
-        logger.mark("\u53D1\u9001\u91CD\u542F\u4FE1\u53F7\u6210\u529F");
-      }
-    };
-  }
-});
-
-// src/server/api/manage.ts
-var restartRouter, exitRouter;
-var init_manage = __esm({
-  "src/server/api/manage.ts"() {
-    "use strict";
-    init_esm_shims();
-    init_router();
-    init_restart();
-    init_response();
-    restartRouter = async (_req, res) => {
-      createSuccessResponse(res, null, "\u6307\u4EE4\u53D1\u9001\u6210\u529F");
-      restartDirect();
-    };
-    exitRouter = async (_req, res) => {
-      logger.mark("\u6536\u5230\u9000\u51FA\u8BF7\u6C42\uFF0C\u6B63\u5728\u9000\u51FA...");
-      createSuccessResponse(res, null, "\u9000\u51FA\u6210\u529F");
-      const { processExit: processExit3 } = await Promise.resolve().then(() => (init_process2(), process_exports));
-      await processExit3(0);
-    };
-    router.post("/exit", exitRouter);
-    router.post("/restart", restartRouter);
-  }
-});
-
 // src/server/api/file/get.ts
 var arrayTotext, getBasicConfig, getAdapterConfig, getGroupsConfig, getPrivatesConfig, getRendersConfig, getPM2Config, getRedisConfig, getEnvConfig, getFileRouter;
 var init_get = __esm({
@@ -5505,28 +5432,85 @@ var init_file3 = __esm({
   }
 });
 
-// src/server/api/login.ts
-var loginRouter;
-var init_login = __esm({
-  "src/server/api/login.ts"() {
+// src/utils/system/restart.ts
+var restart, restartDirect;
+var init_restart = __esm({
+  "src/utils/system/restart.ts"() {
+    "use strict";
+    init_esm_shims();
+    init_exec();
+    restart = async (selfId, contact3, messageId, isFront = true) => {
+      const options = {
+        selfId,
+        contact: contact3,
+        messageId,
+        time: Date.now()
+      };
+      const key = `karin:restart:${selfId}`;
+      const { level: level2 } = await Promise.resolve().then(() => (init_index(), index_exports));
+      await level2.set(key, options);
+      if (isFront && process.send) {
+        process.send("restart");
+        return { status: "success", data: "\u5DF2\u53D1\u9001\u91CD\u542F\u4FE1\u53F7" };
+      }
+      if (process.env.PM2_RESTART === "true") process.exit();
+      if (process.env.pm_id) {
+        const { error: error2 } = await exec("npx karin rs");
+        if (error2) return { status: "failed", data: error2 };
+        process.exit();
+      }
+      const { error } = await exec("npx karin pm2");
+      if (error) return { status: "failed", data: error };
+      process.exit();
+    };
+    restartDirect = async () => {
+      logger.mark("\u6536\u5230\u91CD\u542F\u8BF7\u6C42\uFF0C\u6B63\u5728\u91CD\u542F...");
+      if (process.env.RUNTIME === "pm2") {
+        await exec(`pm2 restart ${process.env.pm_id}`);
+        return;
+      }
+      if (process.env.RUNTIME === "tsx") {
+        throw new Error("tsx \u4E0D\u652F\u6301\u91CD\u542F");
+      }
+      if (process == null ? void 0 : process.send) {
+        process.send("restart");
+        logger.mark("\u53D1\u9001\u91CD\u542F\u4FE1\u53F7\u6210\u529F");
+      }
+    };
+  }
+});
+
+// src/server/api/system/manage.ts
+var restartRouter, exitRouter;
+var init_manage = __esm({
+  "src/server/api/system/manage.ts"() {
     "use strict";
     init_esm_shims();
-    init_response();
     init_router();
-    loginRouter = async (_req, res) => {
-      createSuccessResponse(res, null, "\u767B\u5F55\u6210\u529F");
+    init_restart();
+    init_response();
+    restartRouter = async (_req, res) => {
+      createSuccessResponse(res, null, "\u6307\u4EE4\u53D1\u9001\u6210\u529F");
+      restartDirect();
     };
-    router.post("/login", loginRouter);
+    exitRouter = async (_req, res) => {
+      logger.mark("\u6536\u5230\u9000\u51FA\u8BF7\u6C42\uFF0C\u6B63\u5728\u9000\u51FA...");
+      createSuccessResponse(res, null, "\u9000\u51FA\u6210\u529F");
+      const { processExit: processExit3 } = await Promise.resolve().then(() => (init_process2(), process_exports));
+      await processExit3(0);
+    };
+    router.post("/exit", exitRouter);
+    router.post("/restart", restartRouter);
   }
 });
 
-// src/server/api/log.ts
+// src/server/api/system/log.ts
 import fs18 from "node:fs";
 import moment from "moment";
 import path12 from "node:path";
 var logRouter, activeConnections, getLogRouter;
 var init_log = __esm({
-  "src/server/api/log.ts"() {
+  "src/server/api/system/log.ts"() {
     "use strict";
     init_esm_shims();
     init_root();
@@ -5596,6 +5580,32 @@ var init_log = __esm({
   }
 });
 
+// src/server/api/system/login.ts
+var loginRouter;
+var init_login = __esm({
+  "src/server/api/system/login.ts"() {
+    "use strict";
+    init_esm_shims();
+    init_router();
+    init_response();
+    loginRouter = async (_req, res) => {
+      createSuccessResponse(res, null, "\u767B\u5F55\u6210\u529F");
+    };
+    router.post("/login", loginRouter);
+  }
+});
+
+// src/server/api/system/index.ts
+var init_system = __esm({
+  "src/server/api/system/index.ts"() {
+    "use strict";
+    init_esm_shims();
+    init_manage();
+    init_log();
+    init_login();
+  }
+});
+
 // src/utils/message/index.ts
 var init_message2 = __esm({
   "src/utils/message/index.ts"() {
@@ -5686,13 +5696,17 @@ var init_sendMsg = __esm({
       }
     };
     emitHooks = async (hooks2, callback) => {
-      const isNext = false;
+      let shouldContinue = false;
       for (const hook of hooks2) {
-        const result = callback(hook);
+        const next = () => {
+          shouldContinue = true;
+        };
+        const result = callback(hook, next);
         if (isPromise(result)) await result;
-        if (!isNext) return false;
+        if (!shouldContinue) return false;
+        shouldContinue = false;
       }
-      return isNext;
+      return true;
     };
     hooksSendMsgEmit = {
       /**
@@ -5702,10 +5716,10 @@ var init_sendMsg = __esm({
        * @param retryCount 重试次数
        * @returns 是否继续正常流程
        */
-      message: async (contact3, elements, retryCount) => {
+      message: async (contact3, elements, retryCount = 0) => {
         return emitHooks(
           cache10.sendMsg.message,
-          (hook) => hook.callback(contact3, elements, retryCount)
+          (hook, next) => hook.callback(contact3, elements, retryCount, next)
         );
       },
       /**
@@ -5718,7 +5732,7 @@ var init_sendMsg = __esm({
       forward: async (contact3, elements, options) => {
         return emitHooks(
           cache10.sendMsg.forward,
-          (hook) => hook.callback(contact3, elements, options)
+          (hook, next) => hook.callback(contact3, elements, options, next)
         );
       }
     };
@@ -7798,8 +7812,9 @@ var init_messaeg = __esm({
         });
         if (isPromise2(result)) await result;
         if (!isNext) return false;
+        isNext = false;
       }
-      return isNext;
+      return true;
     };
     hooksMessageEmit = {
       /**
@@ -7931,8 +7946,16 @@ var init_groups4 = __esm({
       initAlias(ctx3, group.alias);
       initEmit(ctx3);
       initPrint2(ctx3, "group", "\u7FA4\u6D88\u606F", isPrint ? "info" : "debug");
-      hooksMessageEmit.group(ctx3);
-      hooksMessageEmit.message(ctx3);
+      const hook = await hooksMessageEmit.group(ctx3);
+      if (!hook) {
+        logger.debug(`[${ctx3.logFnc}] \u7FA4\u6D88\u606F\u94A9\u5B50\u8FD4\u56DEfalse \u8DF3\u8FC7\u5F53\u524D\u4E8B\u4EF6: ${ctx3.eventId}`);
+        return;
+      }
+      const hook2 = await hooksMessageEmit.message(ctx3);
+      if (!hook2) {
+        logger.debug(`[${ctx3.logFnc}] \u6D88\u606F\u94A9\u5B50\u8FD4\u56DEfalse \u8DF3\u8FC7\u5F53\u524D\u4E8B\u4EF6: ${ctx3.eventId}`);
+        return;
+      }
       const context2 = context(ctx3);
       if (context2) return ctx3;
       const cd = groupsCD(group, ctx3.groupId, ctx3.userId);
@@ -7960,8 +7983,16 @@ var init_groups4 = __esm({
       initAlias(ctx3, group.alias);
       initEmit(ctx3);
       initPrint2(ctx3, "groupTemp", "\u7FA4\u4E34\u65F6\u6D88\u606F");
-      hooksMessageEmit.groupTemp(ctx3);
-      hooksMessageEmit.message(ctx3);
+      const hook = await hooksMessageEmit.groupTemp(ctx3);
+      if (!hook) {
+        logger.debug(`[${ctx3.logFnc}] \u7FA4\u4E34\u65F6\u6D88\u606F\u94A9\u5B50\u8FD4\u56DEfalse \u8DF3\u8FC7\u5F53\u524D\u4E8B\u4EF6: ${ctx3.eventId}`);
+        return;
+      }
+      const hook2 = await hooksMessageEmit.message(ctx3);
+      if (!hook2) {
+        logger.debug(`[${ctx3.logFnc}] \u6D88\u606F\u94A9\u5B50\u8FD4\u56DEfalse \u8DF3\u8FC7\u5F53\u524D\u4E8B\u4EF6: ${ctx3.eventId}`);
+        return;
+      }
       const context2 = context(ctx3);
       if (context2) return ctx3;
       const cd = groupsCD(group, ctx3.groupId, ctx3.userId);
@@ -8091,8 +8122,16 @@ var init_private3 = __esm({
       initAlias(ctx3, friend.alias);
       initEmit(ctx3);
       initPrint3(ctx3, "friend", "\u597D\u53CB\u6D88\u606F");
-      hooksMessageEmit.friend(ctx3);
-      hooksMessageEmit.message(ctx3);
+      const hook = await hooksMessageEmit.friend(ctx3);
+      if (!hook) {
+        logger.debug(`[${ctx3.logFnc}] \u597D\u53CB\u6D88\u606F\u94A9\u5B50\u8FD4\u56DEfalse \u8DF3\u8FC7\u5F53\u524D\u4E8B\u4EF6: ${ctx3.eventId}`);
+        return;
+      }
+      const hook2 = await hooksMessageEmit.message(ctx3);
+      if (!hook2) {
+        logger.debug(`[${ctx3.logFnc}] \u6D88\u606F\u94A9\u5B50\u8FD4\u56DEfalse \u8DF3\u8FC7\u5F53\u524D\u4E8B\u4EF6: ${ctx3.eventId}`);
+        return;
+      }
       const context2 = context(ctx3);
       if (context2) return ctx3;
       const filter = privateFilterEvent(ctx3, config2, friend, privateCD(friend, ctx3.userId));
@@ -8112,8 +8151,16 @@ var init_private3 = __esm({
       initAlias(ctx3, friend.alias);
       initEmit(ctx3);
       initPrint3(ctx3, "direct", "\u9891\u9053\u79C1\u4FE1");
-      hooksMessageEmit.direct(ctx3);
-      hooksMessageEmit.message(ctx3);
+      const hook = await hooksMessageEmit.direct(ctx3);
+      if (!hook) {
+        logger.debug(`[${ctx3.logFnc}] \u9891\u9053\u79C1\u4FE1\u6D88\u606F\u94A9\u5B50\u8FD4\u56DEfalse \u8DF3\u8FC7\u5F53\u524D\u4E8B\u4EF6: ${ctx3.eventId}`);
+        return;
+      }
+      const hook2 = await hooksMessageEmit.message(ctx3);
+      if (!hook2) {
+        logger.debug(`[${ctx3.logFnc}] \u6D88\u606F\u94A9\u5B50\u8FD4\u56DEfalse \u8DF3\u8FC7\u5F53\u524D\u4E8B\u4EF6: ${ctx3.eventId}`);
+        return;
+      }
       const context2 = context(ctx3);
       if (context2) return ctx3;
       const cd = privateCD(friend, ctx3.userId);
@@ -11855,10 +11902,8 @@ var init_api = __esm({
     init_info();
     init_root2();
     init_console();
-    init_manage();
     init_file3();
-    init_login();
-    init_log();
+    init_system();
     init_sandbox();
     init_plugins();
   }
@@ -16236,7 +16281,7 @@ var init_button = __esm({
 import os3 from "node:os";
 import fs29 from "node:fs";
 var isWin2, isLinux, isMac, isDocker, isRoot;
-var init_system = __esm({
+var init_system2 = __esm({
   "src/utils/system/system.ts"() {
     "use strict";
     init_esm_shims();
@@ -16255,7 +16300,7 @@ var init_pid = __esm({
     "use strict";
     init_esm_shims();
     init_exec();
-    init_system();
+    init_system2();
     getPid = async (port2) => {
       const command2 = isWin2 ? `netstat -ano | findstr :${port2}` : `lsof -i:${port2} | grep LISTEN | awk '{print $2}'`;
       const { stdout } = await exec(command2);
@@ -16374,7 +16419,7 @@ __export(system_exports, {
   updatePkg: () => updatePkg,
   uptime: () => uptime2
 });
-var init_system2 = __esm({
+var init_system3 = __esm({
   "src/utils/system/index.ts"() {
     "use strict";
     init_esm_shims();
@@ -16386,7 +16431,7 @@ var init_system2 = __esm({
     init_error();
     init_ffmpeg();
     init_import();
-    init_system();
+    init_system2();
     init_update();
     init_restart();
     init_fileToUrl();
@@ -16401,10 +16446,10 @@ var init_utils = __esm({
     init_button();
     init_fs2();
     init_logger();
-    init_system2();
+    init_system3();
     init_message2();
     init_fs2();
-    init_system2();
+    init_system3();
     init_common();
     init_config2();
     init_changelog();
@@ -16527,7 +16572,7 @@ var init_client2 = __esm({
           this.registerBot();
         } catch (error) {
           this.socket.close();
-          throw new Error(`[onebot11][${this.adapter.communication}] \u8FDE\u63A5\u5931\u8D25: ${this.adapter.address}`);
+          throw new Error(`[onebot11][${this.adapter.communication}] \u8FDE\u63A5\u5931\u8D25: ${this.adapter.address}`, { cause: error });
         }
       }
     };
@@ -16602,7 +16647,7 @@ var init_server2 = __esm({
           });
         } catch (error) {
           this.socket.close();
-          throw new Error(`[onebot11][${this.adapter.communication}] \u8FDE\u63A5\u5931\u8D25: ${this.adapter.address}`);
+          throw new Error(`[onebot11][${this.adapter.communication}] \u8FDE\u63A5\u5931\u8D25: ${this.adapter.address}`, { cause: error });
         }
       }
       /**

package/dist/web/assets/index-B-8W3ik9.js

@@ -0,0 +1 @@
+import{d as a}from"./index-Wy6xtsbt.js";var r=a;export{r as default};