node-karin 1.3.17 → 1.3.19

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # 更新日志
 
+## [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)
+
+
+### 🐛 Bug Fixes
+
+* 兼容性提升 ([d22b68a](https://github.com/KarinJS/Karin/commit/d22b68a7600d419c4c2571e21893d2d36011df25))
+
 ## [1.3.17](https://github.com/KarinJS/Karin/compare/core-v1.3.16...core-v1.3.17) (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

@@ -3400,8 +3400,6 @@ var init_list = __esm({
         if (fs15.existsSync(`${pluginDir}/${v.name}/package.json`)) return;
         list2.push(`app:${v.name}`);
       }));
-      const root2 = await requireFile("./package.json");
-      if (root2.name && root2.karin) list2.push(`root:${root2.name}`);
     };
     filterGit = async (files, list2) => {
       await Promise.all(files.map(async (v) => {
@@ -3410,6 +3408,8 @@ var init_list = __esm({
         if (!fs15.existsSync(path9.join(pluginDir, v.name, "package.json"))) return;
         list2.push(`git:${v.name}`);
       }));
+      const root2 = await requireFile("./package.json");
+      if (root2.name && root2.karin) list2.push(`root:${root2.name}`);
     };
     filterPkg = async (list2) => {
       const exclude = [
@@ -5686,13 +5686,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 +5706,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 +5722,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 +7802,9 @@ var init_messaeg = __esm({
         });
         if (isPromise2(result)) await result;
         if (!isNext) return false;
+        isNext = false;
       }
-      return isNext;
+      return true;
     };
     hooksMessageEmit = {
       /**
@@ -7931,8 +7936,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 +7973,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 +8112,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 +8141,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);
@@ -10880,31 +10917,35 @@ var init_local = __esm({
         var _a, _b;
         const pkg2 = val.pkgData;
         if (isTs() && ((_a = pkg2.karin) == null ? void 0 : _a["ts-web"])) {
-          const config2 = await getWebConfig(val.type, val.name);
-          if (config2 && config2.info) {
-            result.push({
-              ...config2.info,
-              id: val.name,
-              version: config2.info.version ?? pkg2.version,
-              description: config2.info.description ?? pkg2.description,
-              hasConfig: true,
-              type: val.type
-            });
+          let config2 = await getWebConfig(val.type, val.name);
+          if (!config2 && isDev()) {
+            config2 = await getWebConfig("git", val.name);
           }
+          if (!config2 || !config2.info) return;
+          result.push({
+            ...config2.info,
+            id: val.name,
+            version: config2.info.version ?? pkg2.version,
+            description: config2.info.description ?? pkg2.description,
+            hasConfig: true,
+            type: val.type
+          });
           return;
         }
         if ((_b = pkg2.karin) == null ? void 0 : _b.web) {
-          const config2 = await getWebConfig(val.type, val.name);
-          if (config2 && config2.info) {
-            result.push({
-              ...config2.info,
-              id: val.name,
-              version: config2.info.version ?? pkg2.version,
-              description: config2.info.description ?? pkg2.description,
-              hasConfig: true,
-              type: val.type
-            });
+          let config2 = await getWebConfig(val.type, val.name);
+          if (!config2 && isDev()) {
+            config2 = await getWebConfig("git", val.name);
           }
+          if (!config2 || !config2.info) return;
+          result.push({
+            ...config2.info,
+            id: val.name,
+            version: config2.info.version ?? pkg2.version,
+            description: config2.info.description ?? pkg2.description,
+            hasConfig: true,
+            type: val.type
+          });
         }
       }));
       createSuccessResponse(res, result);

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};