koishi-plugin-chatluna 1.3.32 → 1.3.34

package/lib/chains/chain.d.ts

@@ -46,7 +46,7 @@ export declare class ChainMiddleware {
     constructor(name: string, execute: ChainMiddlewareFunction, graph: ChatChainDependencyGraph);
     before<T extends keyof ChainMiddlewareName>(name: T): this;
     after<T extends keyof ChainMiddlewareName>(name: T): this;
-    run(session: Session, options: ChainMiddlewareContext): Promise<string | ChainMiddlewareRunStatus | h[] | h[][]>;
+    run(session: Session, options: ChainMiddlewareContext): Promise<string | h[] | h[][] | ChainMiddlewareRunStatus>;
 }
 export interface ChainMiddlewareContext {
     config: Config;
@@ -64,7 +64,7 @@ export interface ChainMiddlewareContextOptions {
 export interface ChainMiddlewareName {
 }
 export type ChainMiddlewareFunction = (session: Session, context: ChainMiddlewareContext) => Promise<string | h[] | h[][] | ChainMiddlewareRunStatus | null>;
-export type ChatChainSender = (session: Session, message: (h[] | h | string)[]) => Promise<void>;
+export type ChatChainSender = (session: Session, message: (h[] | h | string)[], context?: ChainMiddlewareContext) => Promise<void>;
 export declare enum ChainMiddlewareRunStatus {
     SKIPPED = 0,
     STOP = 1,

package/lib/chains/index.cjs

@@ -65,6 +65,26 @@ var lifecycleNames = [
   "lifecycle-send"
 ];
 
+// src/utils/time.ts
+function formatDuration(ms) {
+  if (ms < 1e3) {
+    return `${ms}ms`;
+  }
+  const totalSeconds = Math.floor(ms / 1e3);
+  const hours = Math.floor(totalSeconds / 3600);
+  const minutes = Math.floor(totalSeconds % 3600 / 60);
+  const seconds = totalSeconds % 60;
+  if (hours > 0) {
+    return `${hours}h ${minutes}m ${seconds}s`;
+  }
+  if (minutes > 0) {
+    return `${minutes}m ${seconds}s`;
+  }
+  const decimal = (ms / 1e3).toFixed(2);
+  return `${decimal}s`;
+}
+__name(formatDuration, "formatDuration");
+
 // src/chains/chain.ts
 var logger;
 var ChatChain = class {
@@ -76,7 +96,7 @@ var ChatChain = class {
     this._senders = [];
     const defaultChatChainSender = new DefaultChatChainSender(config);
     this._senders.push(
-      (session, messages) => defaultChatChainSender.send(session, messages)
+      (session, messages, context) => defaultChatChainSender.send(session, messages, context)
     );
   }
   static {
@@ -102,8 +122,10 @@ var ChatChain = class {
       message: session.content,
       ctx: ctx ?? this.ctx,
       session,
-      options: {},
-      send: /* @__PURE__ */ __name((message) => this.sendMessage(session, message), "send"),
+      options: {
+        startedAt: Date.now()
+      },
+      send: /* @__PURE__ */ __name((message) => this.sendMessage(session, message, context), "send"),
       recallThinkingMessage: this._createRecallThinkingMessage(
         {}
       )
@@ -120,11 +142,14 @@ var ChatChain = class {
       ctx,
       session,
       command,
-      send: /* @__PURE__ */ __name((message) => this.sendMessage(session, message), "send"),
+      send: /* @__PURE__ */ __name((message) => this.sendMessage(session, message, context), "send"),
       recallThinkingMessage: this._createRecallThinkingMessage(
         {}
       ),
-      options
+      options: {
+        ...options,
+        startedAt: Date.now()
+      }
     };
     context.recallThinkingMessage = this._createRecallThinkingMessage(context);
     const result = await this._runMiddleware(session, context);
@@ -184,7 +209,7 @@ var ChatChain = class {
       logger.debug("-".repeat(40) + "\n");
     }
     if (context.message != null && context.message !== originMessage) {
-      await this.sendMessage(session, context.message);
+      await this.sendMessage(session, context.message, context);
     }
     return true;
   }
@@ -253,9 +278,9 @@ var ChatChain = class {
       const shouldLogTime = !middleware.name.startsWith("lifecycle-") && result !== 0 /* SKIPPED */ && middleware.name !== "allow_reply" && executionTime > 100;
       if (shouldLogTime) {
         logger.debug(
-          `middleware %c executed in %d ms`,
+          `middleware %c executed in %s`,
           middleware.name,
-          executionTime
+          formatDuration(executionTime)
         );
       }
       if (result === 1 /* STOP */) {
@@ -280,15 +305,15 @@ var ChatChain = class {
       };
     }
   }
-  async sendMessage(session, message) {
+  async sendMessage(session, message, context) {
     const messages = message instanceof Array ? message : [message];
     for (const sender of this._senders) {
-      await sender(session, messages);
+      await sender(session, messages, context);
     }
   }
   async _handleStopStatus(session, context, originMessage, isOutputLog) {
     if (context.message != null && context.message !== originMessage) {
-      await this.sendMessage(session, context.message);
+      await this.sendMessage(session, context.message, context);
     }
     if (isOutputLog) {
       logger.debug("-".repeat(40) + "\n");
@@ -297,7 +322,7 @@ var ChatChain = class {
   async _handleMiddlewareError(session, middlewareName, error) {
     if (error instanceof import_error.ChatLunaError) {
       const message = error.errorCode === import_error.ChatLunaErrorCode.ABORTED ? session.text("chatluna.aborted") : error.message;
-      await this.sendMessage(session, message);
+      await this.sendMessage(session, message, void 0);
       return;
     }
     logger.error(`chat-chain: ${middlewareName} error ${error}`);
@@ -309,7 +334,8 @@ var ChatChain = class {
       session.text("chatluna.middleware_error", [
         middlewareName,
         error.message
-      ])
+      ]),
+      void 0
     );
   }
 };
@@ -580,7 +606,7 @@ var DefaultChatChainSender = class {
       return element;
     });
   }
-  async send(session, messages) {
+  async send(session, messages, context) {
     if (!messages?.length) return;
     if (isElementArray(messages?.[0]) && messages[0][1]?.type === "markdown-qq") {
       await this.sendAsQQMarkdown(session, messages[0][0]);
@@ -590,18 +616,21 @@ var DefaultChatChainSender = class {
       await this.sendAsForward(session, messages);
       return;
     }
-    await this.sendAsNormal(session, messages);
+    await this.sendAsNormal(session, messages, context);
   }
   async sendAsQQMarkdown(session, message) {
     const { user } = session.event;
-    await session.bot.internal.sendPrivateMessage(user.id, {
-      msg_type: 2,
-      msg_seq: 1,
-      msg_id: session.messageId,
-      markdown: {
-        content: message.attrs["content"]
+    await session.bot.internal.sendPrivateMessage(
+      user.id,
+      {
+        msg_type: 2,
+        msg_seq: 1,
+        msg_id: session.messageId,
+        markdown: {
+          content: message.attrs["content"]
+        }
       }
-    });
+    );
   }
   async sendAsForward(session, messages) {
     const sendMessages = this.convertToForwardMessages(messages);
@@ -625,19 +654,23 @@ var DefaultChatChainSender = class {
     }
     throw new Error(`Unsupported message type: ${typeof firstMsg}`);
   }
-  async sendAsNormal(session, messages) {
+  async sendAsNormal(session, messages, context) {
     for (const message of messages) {
       const messageFragment = await this.buildMessageFragment(
         session,
-        message
+        message,
+        context
       );
       if (!messageFragment?.length) continue;
       const processedFragment = this.processElements(messageFragment);
       await session.sendQueued(processedFragment);
     }
   }
-  async buildMessageFragment(session, message) {
-    const shouldAddQuote = this.config.isReplyWithAt && session.isDirect === false && session.messageId;
+  async buildMessageFragment(session, message, context) {
+    const start = context?.options?.startedAt;
+    const elapsed = start ? Date.now() - start : 0;
+    const threshold = (this.config.replyQuoteThreshold ?? 0) * 1e3;
+    const shouldAddQuote = this.config.isReplyWithAt && session.isDirect === false && session.messageId && elapsed >= threshold;
     const messageContent = this.convertMessageToArray(message);
     if (messageContent == null || messageContent.length < 1 || messageContent.length === 1 && messageContent.join().length === 0) {
       return;

package/lib/chains/index.mjs

@@ -20,6 +20,26 @@ var lifecycleNames = [
   "lifecycle-send"
 ];
 
+// src/utils/time.ts
+function formatDuration(ms) {
+  if (ms < 1e3) {
+    return `${ms}ms`;
+  }
+  const totalSeconds = Math.floor(ms / 1e3);
+  const hours = Math.floor(totalSeconds / 3600);
+  const minutes = Math.floor(totalSeconds % 3600 / 60);
+  const seconds = totalSeconds % 60;
+  if (hours > 0) {
+    return `${hours}h ${minutes}m ${seconds}s`;
+  }
+  if (minutes > 0) {
+    return `${minutes}m ${seconds}s`;
+  }
+  const decimal = (ms / 1e3).toFixed(2);
+  return `${decimal}s`;
+}
+__name(formatDuration, "formatDuration");
+
 // src/chains/chain.ts
 var logger;
 var ChatChain = class {
@@ -31,7 +51,7 @@ var ChatChain = class {
     this._senders = [];
     const defaultChatChainSender = new DefaultChatChainSender(config);
     this._senders.push(
-      (session, messages) => defaultChatChainSender.send(session, messages)
+      (session, messages, context) => defaultChatChainSender.send(session, messages, context)
     );
   }
   static {
@@ -57,8 +77,10 @@ var ChatChain = class {
       message: session.content,
       ctx: ctx ?? this.ctx,
       session,
-      options: {},
-      send: /* @__PURE__ */ __name((message) => this.sendMessage(session, message), "send"),
+      options: {
+        startedAt: Date.now()
+      },
+      send: /* @__PURE__ */ __name((message) => this.sendMessage(session, message, context), "send"),
       recallThinkingMessage: this._createRecallThinkingMessage(
         {}
       )
@@ -75,11 +97,14 @@ var ChatChain = class {
       ctx,
       session,
       command,
-      send: /* @__PURE__ */ __name((message) => this.sendMessage(session, message), "send"),
+      send: /* @__PURE__ */ __name((message) => this.sendMessage(session, message, context), "send"),
       recallThinkingMessage: this._createRecallThinkingMessage(
         {}
       ),
-      options
+      options: {
+        ...options,
+        startedAt: Date.now()
+      }
     };
     context.recallThinkingMessage = this._createRecallThinkingMessage(context);
     const result = await this._runMiddleware(session, context);
@@ -139,7 +164,7 @@ var ChatChain = class {
       logger.debug("-".repeat(40) + "\n");
     }
     if (context.message != null && context.message !== originMessage) {
-      await this.sendMessage(session, context.message);
+      await this.sendMessage(session, context.message, context);
     }
     return true;
   }
@@ -208,9 +233,9 @@ var ChatChain = class {
       const shouldLogTime = !middleware.name.startsWith("lifecycle-") && result !== 0 /* SKIPPED */ && middleware.name !== "allow_reply" && executionTime > 100;
       if (shouldLogTime) {
         logger.debug(
-          `middleware %c executed in %d ms`,
+          `middleware %c executed in %s`,
           middleware.name,
-          executionTime
+          formatDuration(executionTime)
         );
       }
       if (result === 1 /* STOP */) {
@@ -235,15 +260,15 @@ var ChatChain = class {
       };
     }
   }
-  async sendMessage(session, message) {
+  async sendMessage(session, message, context) {
     const messages = message instanceof Array ? message : [message];
     for (const sender of this._senders) {
-      await sender(session, messages);
+      await sender(session, messages, context);
     }
   }
   async _handleStopStatus(session, context, originMessage, isOutputLog) {
     if (context.message != null && context.message !== originMessage) {
-      await this.sendMessage(session, context.message);
+      await this.sendMessage(session, context.message, context);
     }
     if (isOutputLog) {
       logger.debug("-".repeat(40) + "\n");
@@ -252,7 +277,7 @@ var ChatChain = class {
   async _handleMiddlewareError(session, middlewareName, error) {
     if (error instanceof ChatLunaError) {
       const message = error.errorCode === ChatLunaErrorCode.ABORTED ? session.text("chatluna.aborted") : error.message;
-      await this.sendMessage(session, message);
+      await this.sendMessage(session, message, void 0);
       return;
     }
     logger.error(`chat-chain: ${middlewareName} error ${error}`);
@@ -264,7 +289,8 @@ var ChatChain = class {
       session.text("chatluna.middleware_error", [
         middlewareName,
         error.message
-      ])
+      ]),
+      void 0
     );
   }
 };
@@ -535,7 +561,7 @@ var DefaultChatChainSender = class {
       return element;
     });
   }
-  async send(session, messages) {
+  async send(session, messages, context) {
     if (!messages?.length) return;
     if (isElementArray(messages?.[0]) && messages[0][1]?.type === "markdown-qq") {
       await this.sendAsQQMarkdown(session, messages[0][0]);
@@ -545,18 +571,21 @@ var DefaultChatChainSender = class {
       await this.sendAsForward(session, messages);
       return;
     }
-    await this.sendAsNormal(session, messages);
+    await this.sendAsNormal(session, messages, context);
   }
   async sendAsQQMarkdown(session, message) {
     const { user } = session.event;
-    await session.bot.internal.sendPrivateMessage(user.id, {
-      msg_type: 2,
-      msg_seq: 1,
-      msg_id: session.messageId,
-      markdown: {
-        content: message.attrs["content"]
+    await session.bot.internal.sendPrivateMessage(
+      user.id,
+      {
+        msg_type: 2,
+        msg_seq: 1,
+        msg_id: session.messageId,
+        markdown: {
+          content: message.attrs["content"]
+        }
       }
-    });
+    );
   }
   async sendAsForward(session, messages) {
     const sendMessages = this.convertToForwardMessages(messages);
@@ -580,19 +609,23 @@ var DefaultChatChainSender = class {
     }
     throw new Error(`Unsupported message type: ${typeof firstMsg}`);
   }
-  async sendAsNormal(session, messages) {
+  async sendAsNormal(session, messages, context) {
     for (const message of messages) {
       const messageFragment = await this.buildMessageFragment(
         session,
-        message
+        message,
+        context
       );
       if (!messageFragment?.length) continue;
       const processedFragment = this.processElements(messageFragment);
       await session.sendQueued(processedFragment);
     }
   }
-  async buildMessageFragment(session, message) {
-    const shouldAddQuote = this.config.isReplyWithAt && session.isDirect === false && session.messageId;
+  async buildMessageFragment(session, message, context) {
+    const start = context?.options?.startedAt;
+    const elapsed = start ? Date.now() - start : 0;
+    const threshold = (this.config.replyQuoteThreshold ?? 0) * 1e3;
+    const shouldAddQuote = this.config.isReplyWithAt && session.isDirect === false && session.messageId && elapsed >= threshold;
     const messageContent = this.convertMessageToArray(message);
     if (messageContent == null || messageContent.length < 1 || messageContent.length === 1 && messageContent.join().length === 0) {
       return;

package/lib/config.d.ts

@@ -13,6 +13,7 @@ export interface Config {
     attachForwardMsgIdToContext: boolean;
     isLog: boolean;
     isReplyWithAt: boolean;
+    replyQuoteThreshold?: number;
     allowQuoteReply: boolean;
     proxyAddress: string;
     isProxy: boolean;