koishi-plugin-chatluna 1.3.6 → 1.3.7

package/lib/index.cjs

@@ -3269,27 +3269,16 @@ function apply25(ctx, config, chain) {
       const newBatch = {
         messages: [inputMessage],
         userName,
-        resolveWaiters: []
+        resolveWaiters: [],
+        collectWaiters: [],
+        state: config.messageQueueDelay > 0 ? "collecting" : "processing"
       };
       batches.set(conversationId, newBatch);
       if (config.messageQueueDelay > 0) {
-        return await new Promise(
-          (resolve) => {
-            newBatch.processorResolve = resolve;
-            newBatch.timeout = ctx.setTimeout(() => {
-              if (batches.get(conversationId) === newBatch) {
-                logger6.debug(
-                  // eslint-disable-next-line max-len
-                  `Delay timeout (${config.messageQueueDelay}s) for ${conversationId}, processing batch with ${newBatch.messages.length} messages`
-                );
-                context.options.inputMessage = mergeMessages(newBatch.messages);
-                batches.delete(conversationId);
-                resolve(2 /* CONTINUE */);
-              }
-            }, config.messageQueueDelay * 1e3);
-          }
-        );
+        resetBatchTimeout(ctx, config, newBatch, conversationId);
+        return await awaitCollectingBatch(newBatch, context);
       }
+      newBatch.messages = [];
       return 2 /* CONTINUE */;
     }
     if (batch.userName !== userName) {
@@ -3304,34 +3293,27 @@ function apply25(ctx, config, chain) {
         context
       );
     }
-    if (batch.resolveWaiters.length === 0) {
+    if (batch.state === "collecting") {
       logger6.debug(
         `Adding message to batch for ${conversationId}, messageId: ${messageId}, total: ${batch.messages.length + 1}`
       );
       batch.messages.push(inputMessage);
-      if (config.messageQueueDelay > 0 && batch.timeout && batch.processorResolve) {
-        batch.timeout();
-        batch.timeout = ctx.setTimeout(() => {
-          if (batches.get(conversationId) === batch && batch.processorResolve) {
-            logger6.debug(
-              `Delay timeout (${config.messageQueueDelay}s) for ${conversationId}, processing batch with ${batch.messages.length} messages`
-            );
-            context.options.inputMessage = mergeMessages(
-              batch.messages
-            );
-            batches.delete(conversationId);
-            batch.processorResolve(
-              2 /* CONTINUE */
-            );
-          }
-        }, config.messageQueueDelay * 1e3);
+      if (config.messageQueueDelay > 0) {
+        resetBatchTimeout(ctx, config, batch, conversationId);
       }
-      return 1 /* STOP */;
+      return await awaitCollectingBatch(batch, context);
+    }
+    logger6.debug(
+      `Waiting for batch completion for ${conversationId}, messageId: ${messageId}`
+    );
+    const status = await awaitBatchCompletion(batch, inputMessage);
+    if (status === 1 /* STOP */) {
+      return status;
     }
     logger6.debug(
       `Interrupting and merging for ${conversationId}, messageId: ${messageId}`
     );
-    return await interruptAndMerge(batch, inputMessage, context);
+    return interruptAndMerge(batch, context);
   }).after("check_room").after("read_chat_message").before("lifecycle-handle_command");
   const completeBatch = /* @__PURE__ */ __name(async (conversationId) => {
     const batch = batches.get(conversationId);
@@ -3342,16 +3324,16 @@ function apply25(ctx, config, chain) {
       if (batch.timeout) {
         batch.timeout();
       }
-      batch.resolveWaiters.forEach((resolve) => resolve());
-      batches.delete(conversationId);
+      const waiters = batch.resolveWaiters;
+      batch.resolveWaiters = [];
+      waiters.forEach(
+        (resolve) => resolve(2 /* CONTINUE */)
+      );
     } else if (batch) {
       logger6.debug(`Cleaning up batch for ${conversationId}`);
       if (batch.timeout) {
         batch.timeout();
       }
-      if (batch.processorResolve) {
-        batch.processorResolve(1 /* STOP */);
-      }
       batches.delete(conversationId);
     }
   }, "completeBatch");
@@ -3375,52 +3357,102 @@ function apply25(ctx, config, chain) {
       batch.resolveWaiters.forEach(
         (resolve) => resolve(1 /* STOP */)
       );
-      if (batch.processorResolve) {
-        batch.processorResolve(1 /* STOP */);
-      }
+      batch.collectWaiters.forEach(
+        (resolve) => resolve(1 /* STOP */)
+      );
       batches.delete(conversationId);
     }
   });
 }
 __name(apply25, "apply");
-async function interruptAndMerge(batch, message, context) {
-  const oldWaiters = batch.resolveWaiters;
-  const oldProcessor = batch.processorResolve;
-  batch.resolveWaiters = [];
-  batch.processorResolve = void 0;
-  batch.messages.push(message);
+function interruptAndMerge(batch, context) {
+  if (batch.messages.length === 0) {
+    return 1 /* STOP */;
+  }
+  context.options.inputMessage = mergeMessages(batch.messages);
+  batch.messages = [];
+  batch.state = "processing";
+  return 2 /* CONTINUE */;
+}
+__name(interruptAndMerge, "interruptAndMerge");
+async function awaitCollectingBatch(batch, context) {
+  resolveCollectWaiters(batch, 1 /* STOP */);
+  return await new Promise((resolve) => {
+    batch.collectWaiters.push((status) => {
+      if (status === 1 /* STOP */) {
+        resolve(1 /* STOP */);
+        return;
+      }
+      context.options.inputMessage = mergeMessages(batch.messages);
+      batch.messages = [];
+      batch.state = "processing";
+      resolve(2 /* CONTINUE */);
+    });
+  });
+}
+__name(awaitCollectingBatch, "awaitCollectingBatch");
+function resolveCollectWaiters(batch, status) {
+  const waiters = batch.collectWaiters;
+  batch.collectWaiters = [];
+  waiters.forEach((resolve) => resolve(status));
+}
+__name(resolveCollectWaiters, "resolveCollectWaiters");
+function resetBatchTimeout(ctx, config, batch, conversationId) {
   if (batch.timeout) {
     batch.timeout();
-    batch.timeout = void 0;
   }
-  oldWaiters.forEach((resolve) => resolve(1 /* STOP */));
-  if (oldProcessor) {
-    oldProcessor(1 /* STOP */);
+  batch.timeout = ctx.setTimeout(() => {
+    if (batches.get(conversationId) === batch) {
+      logger6.debug(
+        // eslint-disable-next-line max-len
+        `Delay timeout (${config.messageQueueDelay}s) for ${conversationId}, processing batch with ${batch.messages.length} messages`
+      );
+      batch.timeout = void 0;
+      resolveCollectWaiters(batch, 2 /* CONTINUE */);
+    }
+  }, config.messageQueueDelay * 1e3);
+}
+__name(resetBatchTimeout, "resetBatchTimeout");
+async function awaitBatchCompletion(batch, message) {
+  if (batch.resolveWaiters.length === 0) {
+    batch.messages = [message];
+  } else {
+    batch.messages.push(message);
   }
-  return new Promise((resolve) => {
-    batch.resolveWaiters.push(() => {
-      context.options.inputMessage = mergeMessages(batch.messages);
-      resolve(2 /* CONTINUE */);
+  return await new Promise((resolve) => {
+    batch.resolveWaiters.push((status) => {
+      resolve(status ?? 2 /* CONTINUE */);
     });
   });
 }
-__name(interruptAndMerge, "interruptAndMerge");
+__name(awaitBatchCompletion, "awaitBatchCompletion");
 async function waitForBatchCompletion(batch, conversationId, message, userName, context) {
   return new Promise((resolve) => {
-    batch.resolveWaiters.push(() => {
+    batch.resolveWaiters.push((status) => {
+      if (status === 1 /* STOP */) {
+        resolve(1 /* STOP */);
+        return;
+      }
       batches.set(conversationId, {
         messages: [message],
         userName,
         resolveWaiters: [
-          () => {
+          (nextStatus) => {
+            if (nextStatus === 1 /* STOP */) {
+              resolve(1 /* STOP */);
+              return;
+            }
             const newBatch = batches.get(conversationId);
             context.options.inputMessage = mergeMessages(
               newBatch.messages
             );
+            newBatch.messages = [];
             batches.delete(conversationId);
             resolve(2 /* CONTINUE */);
           }
-        ]
+        ],
+        collectWaiters: [],
+        state: "processing"
       });
     });
   });

package/lib/index.mjs

@@ -3264,27 +3264,16 @@ function apply25(ctx, config, chain) {
       const newBatch = {
         messages: [inputMessage],
         userName,
-        resolveWaiters: []
+        resolveWaiters: [],
+        collectWaiters: [],
+        state: config.messageQueueDelay > 0 ? "collecting" : "processing"
       };
       batches.set(conversationId, newBatch);
       if (config.messageQueueDelay > 0) {
-        return await new Promise(
-          (resolve) => {
-            newBatch.processorResolve = resolve;
-            newBatch.timeout = ctx.setTimeout(() => {
-              if (batches.get(conversationId) === newBatch) {
-                logger6.debug(
-                  // eslint-disable-next-line max-len
-                  `Delay timeout (${config.messageQueueDelay}s) for ${conversationId}, processing batch with ${newBatch.messages.length} messages`
-                );
-                context.options.inputMessage = mergeMessages(newBatch.messages);
-                batches.delete(conversationId);
-                resolve(2 /* CONTINUE */);
-              }
-            }, config.messageQueueDelay * 1e3);
-          }
-        );
+        resetBatchTimeout(ctx, config, newBatch, conversationId);
+        return await awaitCollectingBatch(newBatch, context);
       }
+      newBatch.messages = [];
       return 2 /* CONTINUE */;
     }
     if (batch.userName !== userName) {
@@ -3299,34 +3288,27 @@ function apply25(ctx, config, chain) {
         context
       );
     }
-    if (batch.resolveWaiters.length === 0) {
+    if (batch.state === "collecting") {
       logger6.debug(
         `Adding message to batch for ${conversationId}, messageId: ${messageId}, total: ${batch.messages.length + 1}`
       );
       batch.messages.push(inputMessage);
-      if (config.messageQueueDelay > 0 && batch.timeout && batch.processorResolve) {
-        batch.timeout();
-        batch.timeout = ctx.setTimeout(() => {
-          if (batches.get(conversationId) === batch && batch.processorResolve) {
-            logger6.debug(
-              `Delay timeout (${config.messageQueueDelay}s) for ${conversationId}, processing batch with ${batch.messages.length} messages`
-            );
-            context.options.inputMessage = mergeMessages(
-              batch.messages
-            );
-            batches.delete(conversationId);
-            batch.processorResolve(
-              2 /* CONTINUE */
-            );
-          }
-        }, config.messageQueueDelay * 1e3);
+      if (config.messageQueueDelay > 0) {
+        resetBatchTimeout(ctx, config, batch, conversationId);
       }
-      return 1 /* STOP */;
+      return await awaitCollectingBatch(batch, context);
+    }
+    logger6.debug(
+      `Waiting for batch completion for ${conversationId}, messageId: ${messageId}`
+    );
+    const status = await awaitBatchCompletion(batch, inputMessage);
+    if (status === 1 /* STOP */) {
+      return status;
     }
     logger6.debug(
       `Interrupting and merging for ${conversationId}, messageId: ${messageId}`
     );
-    return await interruptAndMerge(batch, inputMessage, context);
+    return interruptAndMerge(batch, context);
   }).after("check_room").after("read_chat_message").before("lifecycle-handle_command");
   const completeBatch = /* @__PURE__ */ __name(async (conversationId) => {
     const batch = batches.get(conversationId);
@@ -3337,16 +3319,16 @@ function apply25(ctx, config, chain) {
       if (batch.timeout) {
         batch.timeout();
       }
-      batch.resolveWaiters.forEach((resolve) => resolve());
-      batches.delete(conversationId);
+      const waiters = batch.resolveWaiters;
+      batch.resolveWaiters = [];
+      waiters.forEach(
+        (resolve) => resolve(2 /* CONTINUE */)
+      );
     } else if (batch) {
       logger6.debug(`Cleaning up batch for ${conversationId}`);
       if (batch.timeout) {
         batch.timeout();
       }
-      if (batch.processorResolve) {
-        batch.processorResolve(1 /* STOP */);
-      }
       batches.delete(conversationId);
     }
   }, "completeBatch");
@@ -3370,52 +3352,102 @@ function apply25(ctx, config, chain) {
       batch.resolveWaiters.forEach(
         (resolve) => resolve(1 /* STOP */)
       );
-      if (batch.processorResolve) {
-        batch.processorResolve(1 /* STOP */);
-      }
+      batch.collectWaiters.forEach(
+        (resolve) => resolve(1 /* STOP */)
+      );
       batches.delete(conversationId);
     }
   });
 }
 __name(apply25, "apply");
-async function interruptAndMerge(batch, message, context) {
-  const oldWaiters = batch.resolveWaiters;
-  const oldProcessor = batch.processorResolve;
-  batch.resolveWaiters = [];
-  batch.processorResolve = void 0;
-  batch.messages.push(message);
+function interruptAndMerge(batch, context) {
+  if (batch.messages.length === 0) {
+    return 1 /* STOP */;
+  }
+  context.options.inputMessage = mergeMessages(batch.messages);
+  batch.messages = [];
+  batch.state = "processing";
+  return 2 /* CONTINUE */;
+}
+__name(interruptAndMerge, "interruptAndMerge");
+async function awaitCollectingBatch(batch, context) {
+  resolveCollectWaiters(batch, 1 /* STOP */);
+  return await new Promise((resolve) => {
+    batch.collectWaiters.push((status) => {
+      if (status === 1 /* STOP */) {
+        resolve(1 /* STOP */);
+        return;
+      }
+      context.options.inputMessage = mergeMessages(batch.messages);
+      batch.messages = [];
+      batch.state = "processing";
+      resolve(2 /* CONTINUE */);
+    });
+  });
+}
+__name(awaitCollectingBatch, "awaitCollectingBatch");
+function resolveCollectWaiters(batch, status) {
+  const waiters = batch.collectWaiters;
+  batch.collectWaiters = [];
+  waiters.forEach((resolve) => resolve(status));
+}
+__name(resolveCollectWaiters, "resolveCollectWaiters");
+function resetBatchTimeout(ctx, config, batch, conversationId) {
   if (batch.timeout) {
     batch.timeout();
-    batch.timeout = void 0;
   }
-  oldWaiters.forEach((resolve) => resolve(1 /* STOP */));
-  if (oldProcessor) {
-    oldProcessor(1 /* STOP */);
+  batch.timeout = ctx.setTimeout(() => {
+    if (batches.get(conversationId) === batch) {
+      logger6.debug(
+        // eslint-disable-next-line max-len
+        `Delay timeout (${config.messageQueueDelay}s) for ${conversationId}, processing batch with ${batch.messages.length} messages`
+      );
+      batch.timeout = void 0;
+      resolveCollectWaiters(batch, 2 /* CONTINUE */);
+    }
+  }, config.messageQueueDelay * 1e3);
+}
+__name(resetBatchTimeout, "resetBatchTimeout");
+async function awaitBatchCompletion(batch, message) {
+  if (batch.resolveWaiters.length === 0) {
+    batch.messages = [message];
+  } else {
+    batch.messages.push(message);
   }
-  return new Promise((resolve) => {
-    batch.resolveWaiters.push(() => {
-      context.options.inputMessage = mergeMessages(batch.messages);
-      resolve(2 /* CONTINUE */);
+  return await new Promise((resolve) => {
+    batch.resolveWaiters.push((status) => {
+      resolve(status ?? 2 /* CONTINUE */);
     });
   });
 }
-__name(interruptAndMerge, "interruptAndMerge");
+__name(awaitBatchCompletion, "awaitBatchCompletion");
 async function waitForBatchCompletion(batch, conversationId, message, userName, context) {
   return new Promise((resolve) => {
-    batch.resolveWaiters.push(() => {
+    batch.resolveWaiters.push((status) => {
+      if (status === 1 /* STOP */) {
+        resolve(1 /* STOP */);
+        return;
+      }
       batches.set(conversationId, {
         messages: [message],
         userName,
         resolveWaiters: [
-          () => {
+          (nextStatus) => {
+            if (nextStatus === 1 /* STOP */) {
+              resolve(1 /* STOP */);
+              return;
+            }
             const newBatch = batches.get(conversationId);
             context.options.inputMessage = mergeMessages(
               newBatch.messages
             );
+            newBatch.messages = [];
             batches.delete(conversationId);
             resolve(2 /* CONTINUE */);
           }
-        ]
+        ],
+        collectWaiters: [],
+        state: "processing"
       });
     });
   });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chatluna",
   "description": "chatluna for koishi",
-  "version": "1.3.6",
+  "version": "1.3.7",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
   "typings": "lib/index.d.ts",