Merge pull request #2682 from Succubyss/messages-cmd_async /messages callback refactored to async

0456d753ded6d8a0ed24b7d57433d30b210a3627

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed

Parents: cfb40cae0b6e6c49c8e44281ecd9ee24e9cb5c30 43e64cffa26bc8d2456fdcc4753db6f13df41eb6

public/scripts/slash-commands.js+22 -21 Viewed

     return String(value);
+}
-function getMessagesCallback(args, value) {
+async function getMessagesCallback(args, value) {
     const includeNames = !isFalseBoolean(args?.names);
     const includeHidden = isTrueBoolean(args?.hidden);
     const role = args?.role;

         throw new Error(`Invalid role provided. Expected one of: system, assistant, user. Got: ${role}`);
     };
-    const messages = [];
+    const processMessage = async (mesId) => {
+        const msg = chat[mesId];
-    for (let messageId = range.start; messageId <= range.end; messageId++) {
+        if (!msg) {
-        const message = chat[messageId];
+            console.warn(`WARN: No message found with ID ${mesId}`);
-        if (!message) {
+            return null;
-            console.warn(`WARN: No message found with ID ${messageId}`);
-            continue;
+        }
-        if (role && !filterByRole(message)) {
+        if (role && !filterByRole(msg)) {
-            console.debug(`/messages: Skipping message with ID ${messageId} due to role filter`);
+            console.debug(`/messages: Skipping message with ID ${mesId} due to role filter`);
-            continue;
+            return null;
+        }
-        if (!includeHidden && message.is_system) {
+        if (!includeHidden && msg.is_system) {
-            console.debug(`/messages: Skipping hidden message with ID ${messageId}`);
+            console.debug(`/messages: Skipping hidden message with ID ${mesId}`);
-            continue;
+            return null;
+        }
-        if (includeNames) {
+        return includeNames ? `${msg.name}: ${msg.mes}` : msg.mes;
-            messages.push(`${message.name}: ${message.mes}`);
+    };
-        } else {
-            messages.push(message.mes);
+    const messagePromises = [];
-        }
-    }
+    for (let rInd = range.start; rInd <= range.end; ++rInd)
+        messagePromises.push(processMessage(rInd));
+    const messages = await Promise.all(messagePromises);
-    return messages.join('\n\n');
+    return messages.filter(m => m !== null).join('\n\n');
+}
 async function runCallback(args, name) {