Merge pull request #2445 from Risenafis/fix-initvoicemap Prevent concurrent execution of initVoiceMap

cee304fe29e8b599230970c8001719802b19c555

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

Signed

Parents: 4828bd95f31a5d874609bb8f9be24d156331b31d 2a3e71bf6e2eeb83fd13223f76104ef9164e25f7

public/scripts/extensions/tts/index.js+32 -1 Viewed

 import { cancelTtsPlay, eventSource, event_types, getCurrentChatId, isStreamingEnabled, name2, saveSettingsDebounced, substituteParams } from '../../../script.js';
 import { ModuleWorkerWrapper, doExtrasFetch, extension_settings, getApiUrl, getContext, modules, renderExtensionTemplateAsync } from '../../extensions.js';
 import { delay, escapeRegex, getBase64Async, getStringHash, onlyUnique } from '../../utils.js';
 import { EdgeTtsProvider } from './edge.js';

 let lastMessageHash = null;
 let periodicMessageGenerationTimer = null;
 let lastPositionOfParagraphEnd = -1;
 +let currentInitVoiceMapPromise = null;
 const DEFAULT_VOICE_MARKER = '[Default Voice]';
 const DISABLED_VOICE_MARKER = 'disabled';

 /**
  * Init voiceMapEntries for character select list.
 + * If an initialization is already in progress, it returns the existing Promise instead of starting a new one.
  * @param {boolean} unrestricted - If true, will include all characters in voiceMapEntries, even if they are not in the current chat.
 + * @returns {Promise} A promise that resolves when the initialization is complete.
  */
 export async function initVoiceMap(unrestricted = false) {
 +    // Preventing parallel execution
 +    if (currentInitVoiceMapPromise) {
 +        return currentInitVoiceMapPromise;
 +    }
++
 +    currentInitVoiceMapPromise = (async () => {
 +        const initialChatId = getCurrentChatId();
 +        try {
 +            await initVoiceMapInternal(unrestricted);
 +        } finally {
 +            currentInitVoiceMapPromise = null;
 +        }
 +        const currentChatId = getCurrentChatId();
++
 +        if (initialChatId !== currentChatId) {
 +            // Chat changed during initialization, reinitialize
 +            await initVoiceMap(unrestricted);
 +        }
 +    })();
++
 +    return currentInitVoiceMapPromise;
 +}
++
 +/**
 + * Init voiceMapEntries for character select list.
 + * @param {boolean} unrestricted - If true, will include all characters in voiceMapEntries, even if they are not in the current chat.
 + */
 +async function initVoiceMapInternal(unrestricted) {
     // Gate initialization if not enabled or TTS Provider not ready. Prevents error popups.
     const enabled = $('#tts_enabled').is(':checked');
     if (!enabled) {