node-karin 1.15.0 → 1.15.2

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # 更新日志
 
+## [1.15.2](https://github.com/KarinJS/Karin/compare/core-v1.15.1...core-v1.15.2) (2026-03-30)
+
+
+### 🐛 Bug Fixes
+
+* 上下文(ctx)方法添加 `超时后是否抛出错误` 选项，默认 true ([#634](https://github.com/KarinJS/Karin/issues/634)) ([9f2ac76](https://github.com/KarinJS/Karin/commit/9f2ac7679770878495825e7d450fff31857a9c51))
+
+## [1.15.1](https://github.com/KarinJS/Karin/compare/core-v1.15.0...core-v1.15.1) (2026-03-24)
+
+
+### 🐛 Bug Fixes
+
+* ffmpeg initialization priority order ([#629](https://github.com/KarinJS/Karin/issues/629)) ([5510219](https://github.com/KarinJS/Karin/commit/5510219de2dc199d1dfe71dd024524b9cf45ff87))
+
 ## [1.15.0](https://github.com/KarinJS/Karin/compare/core-v1.14.4...core-v1.15.0) (2026-03-24)
 
 

package/dist/index.d.ts

@@ -7499,7 +7499,9 @@ declare const ctx: <T = Message>(e: Event, options?: {
     reply?: boolean;
     /** 超时回复文本 默认为'操作超时已取消' */
     replyMsg?: string;
-}) => Promise<T>;
+    /** 超时后是否抛出错误 默认为 true */
+    throwOnTimeout?: boolean;
+}) => Promise<T | null>;
 
 interface HandlerOptions {
     /** 插件名称 */

package/dist/index.mjs

@@ -7543,26 +7543,23 @@ var init_ffmpeg = __esm({
     ffprobePath2 = "ffprobe";
     ffplayPath2 = "ffplay";
     setTimeout(async () => {
-      const env3 = await exec("ffmpeg -version", { booleanResult: true });
-      if (!env3) {
-        try {
-          const name = "@karinjs/plugin-ffmpeg";
-          const plugin = await import(name);
-          const ffmpeg2 = plugin.default.ffmpegPath;
-          const ffprobe2 = plugin.default.ffprobePath;
-          const ffplay2 = plugin.default.ffplayPath;
-          ffmpegPath2 = ffmpeg2 ? `"${ffmpeg2}"` : ffmpegPath2;
-          ffprobePath2 = ffprobe2 ? `"${ffprobe2}"` : ffprobePath2;
-          ffplayPath2 = ffplay2 ? `"${ffplay2}"` : ffplayPath2;
-        } catch {
-          const cfg = await Promise.resolve().then(() => (init_config(), config_exports));
-          const ffmpeg2 = cfg.ffmpegPath();
-          const ffprobe2 = cfg.ffprobePath();
-          const ffplay2 = cfg.ffplayPath();
-          ffmpegPath2 = ffmpeg2 ? `"${ffmpeg2}"` : ffmpegPath2;
-          ffprobePath2 = ffprobe2 ? `"${ffprobe2}"` : ffprobePath2;
-          ffplayPath2 = ffplay2 ? `"${ffplay2}"` : ffplayPath2;
-        }
+      try {
+        const name = "@karinjs/plugin-ffmpeg";
+        const plugin = await import(name);
+        const ffmpeg2 = plugin.default.ffmpegPath;
+        const ffprobe2 = plugin.default.ffprobePath;
+        const ffplay2 = plugin.default.ffplayPath;
+        ffmpegPath2 = ffmpeg2 ? `"${ffmpeg2}"` : ffmpegPath2;
+        ffprobePath2 = ffprobe2 ? `"${ffprobe2}"` : ffprobePath2;
+        ffplayPath2 = ffplay2 ? `"${ffplay2}"` : ffplayPath2;
+      } catch {
+        const cfg = await Promise.resolve().then(() => (init_config(), config_exports));
+        const ffmpeg2 = cfg.ffmpegPath();
+        const ffprobe2 = cfg.ffprobePath();
+        const ffplay2 = cfg.ffplayPath();
+        ffmpegPath2 = ffmpeg2 ? `"${ffmpeg2}"` : ffmpegPath2;
+        ffprobePath2 = ffprobe2 ? `"${ffprobe2}"` : ffprobePath2;
+        ffplayPath2 = ffplay2 ? `"${ffplay2}"` : ffplayPath2;
       }
     }, 1e3);
     ffmpeg = async (cmd, options) => {
@@ -24240,8 +24237,8 @@ var command = (reg, second, options = {}) => {
 init_internal();
 init_context();
 var ctx2 = async (e, options) => {
-  const time2 = options?.time || 120;
-  const userId = options?.userId || e.userId || e.user_id;
+  const { time: time2 = 120, userId: optionUserId, reply: reply2, replyMsg, throwOnTimeout = true } = options ?? {};
+  const userId = optionUserId || e.userId || e.user_id;
   const key = e.contact.subPeer ? `${e.contact.peer}:${e.contact.subPeer}:${userId}` : `${e.contact.peer}:${userId}`;
   ctx.set(key, e);
   return new Promise((resolve, reject) => {
@@ -24249,9 +24246,14 @@ var ctx2 = async (e, options) => {
       const data = ctx.get(key);
       if (data?.eventId === e.eventId) {
         ctx.delete(key);
-        if (options?.reply) e.reply(options.replyMsg || "\u64CD\u4F5C\u8D85\u65F6\u5DF2\u53D6\u6D88");
+        if (reply2) e.reply(replyMsg || "\u64CD\u4F5C\u8D85\u65F6\u5DF2\u53D6\u6D88");
         listeners.removeAllListeners(`ctx:${key}`);
-        reject(new Error(`\u63A5\u6536\u4E0B\u6587\u4E8B\u4EF6\u8D85\u65F6\uFF0C\u5DF2\u53D6\u6D88\u4E0B\u6587\u76D1\u542C: ${key}`));
+        if (throwOnTimeout) {
+          reject(new Error(`\u63A5\u6536\u4E0B\u6587\u4E8B\u4EF6\u8D85\u65F6\uFF0C\u5DF2\u53D6\u6D88\u4E0B\u6587\u76D1\u542C: ${key}`));
+        } else {
+          logger.debug(`\u63A5\u6536\u4E0B\u6587\u4E8B\u4EF6\u8D85\u65F6\uFF0C\u5DF2\u53D6\u6D88\u4E0B\u6587\u76D1\u542C: ${key}`);
+          resolve(null);
+        }
         return true;
       }
     }, time2 * 1e3);

package/package.json

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