Fix streams getting stuck on regen

807487ce853197bed409e4b058f4af7bdecf97bd

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

public/script.js+20 -5 Viewed

+    }
     #checkDomElements(messageId) {
-        if (this.messageDom === null) {
+        if (this.messageDom === null || this.messageTextDom === null) {
             this.messageDom = document.querySelector(`#chat .mes[mesid="${messageId}"]`);
             this.messageTextDom = this.messageDom?.querySelector('.mes_text');
             this.messageTimerDom = this.messageDom?.querySelector('.mes_timer');

             this.sendTextarea.dispatchEvent(new Event('input', { bubbles: true }));
+        }
         else {
+            this.#checkDomElements(messageId);
             const currentTime = new Date();
             // Don't waste time calculating token count for streaming
             const currentTokenCount = isFinal && power_user.message_token_count_enabled ? getTokenCount(processedText, 0) : 0;

                 chat[messageId].is_user,
                 messageId,
             );
-            this.#checkDomElements(messageId);
             if (this.messageTextDom instanceof HTMLElement) {
                 this.messageTextDom.innerHTML = formattedText;
+            }

+}
 /**
+ * Removes last message from the chat DOM.
+ * @returns {Promise<void>} Resolves when the message is removed.
+ */
+function removeLastMessage() {
+    return new Promise((resolve) => {
+        const lastMes = $('#chat').children('.mes').last();
+        if (lastMes.length === 0) {
+            return resolve();
+        }
+        lastMes.hide(animation_duration, function () {
+            $(this).remove();
+            resolve();
+        });
+    });
+}
+/**
  * Runs a generation using the current chat context.
  * @param {string} type Generation type
  * @param {GenerateOptions} options Generation options

@@ -3346,9 +3363,7 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
3346	}	3363	}
3347	else if (type !== 'quiet' && type !== 'swipe' && !isImpersonate && !dryRun && chat.length) {	3364	else if (type !== 'quiet' && type !== 'swipe' && !isImpersonate && !dryRun && chat.length) {
3348	chat.length = chat.length - 1;	3365	chat.length = chat.length - 1;
3349	$('#chat').children().last().hide(250, function () {	3366	await removeLastMessage();
3350	$(this).remove();
3351	});
3352	await eventSource.emit(event_types.MESSAGE_DELETED, chat.length);	3367	await eventSource.emit(event_types.MESSAGE_DELETED, chat.length);
3353	}	3368	}
3354	}	3369	}