${indicator}
-
+
${navPill}
${menuHtml}
@@ -1063,8 +866,7 @@ function setImageState(container, state) {
if (dropdown) {
const saveItem = dropdown.querySelector('[data-action="save-image"]');
if (state === ImageState.PREVIEW && !saveItem) {
- const btnStyle = 'width:32px;height:32px;border:none;background:transparent;color:rgba(255,255,255,0.85);cursor:pointer;font-size:14px;border-radius:50%;display:flex;align-items:center;justify-content:center;transition:background 0.15s;';
- dropdown.insertAdjacentHTML('afterbegin', `
`);
+ dropdown.insertAdjacentHTML('afterbegin', `
`);
} else if (state !== ImageState.PREVIEW && saveItem) {
saveItem.remove();
}
@@ -1196,17 +998,19 @@ function setupEventDelegation() {
document.addEventListener('click', async (e) => {
const container = e.target.closest('.xb-nd-img');
+ if (!container) {
+ if (document.querySelector('.xb-nd-menu-wrap.open')) {
+ const clickedMenuWrap = e.target.closest('.xb-nd-menu-wrap');
+ if (!clickedMenuWrap) {
+ document.querySelectorAll('.xb-nd-menu-wrap.open').forEach(w => w.classList.remove('open'));
+ }
+ }
+ return;
+ }
const actionEl = e.target.closest('[data-action]');
const action = actionEl?.dataset?.action;
-
- const clickedMenuWrap = e.target.closest('.xb-nd-menu-wrap');
-
- if (!clickedMenuWrap) {
- document.querySelectorAll('.xb-nd-menu-wrap.open').forEach(w => w.classList.remove('open'));
- }
-
- if (!container || !action) return;
+ if (!action) return;
e.preventDefault();
e.stopImmediatePropagation();
@@ -1215,70 +1019,52 @@ function setupEventDelegation() {
case 'toggle-menu': {
const wrap = container.querySelector('.xb-nd-menu-wrap');
if (!wrap) break;
-
document.querySelectorAll('.xb-nd-menu-wrap.open').forEach(w => {
if (w !== wrap) w.classList.remove('open');
});
-
wrap.classList.toggle('open');
break;
}
-
case 'open-gallery':
await handleImageClick(container);
break;
-
- case 'refresh-image': {
+ case 'refresh-image':
container.querySelector('.xb-nd-menu-wrap')?.classList.remove('open');
await refreshSingleImage(container);
break;
- }
-
- case 'save-image': {
+ case 'save-image':
container.querySelector('.xb-nd-menu-wrap')?.classList.remove('open');
await saveSingleImage(container);
break;
- }
-
- case 'edit-tags': {
+ case 'edit-tags':
container.querySelector('.xb-nd-menu-wrap')?.classList.remove('open');
toggleEditPanel(container, true);
break;
- }
-
case 'save-tags':
await saveEditedTags(container);
break;
-
case 'cancel-edit':
toggleEditPanel(container, false);
break;
-
case 'retry-image':
await retryFailedImage(container);
break;
-
case 'save-tags-retry':
await saveTagsAndRetry(container);
break;
-
case 'remove-placeholder':
await removePlaceholder(container);
break;
-
- case 'delete-image': {
+ case 'delete-image':
container.querySelector('.xb-nd-menu-wrap')?.classList.remove('open');
await deleteCurrentImage(container);
break;
- }
-
case 'nav-prev': {
const i = parseInt(container.dataset.currentIndex) || 0;
const t = parseInt(container.dataset.historyCount) || 1;
if (i < t - 1) await navigateToImage(container, i + 1);
break;
}
-
case 'nav-next': {
const i = parseInt(container.dataset.currentIndex) || 0;
if (i > 0) await navigateToImage(container, i - 1);
@@ -1333,7 +1119,6 @@ async function handleImageClick(container) {
onBecameEmpty: (sid, msgId, lastImageInfo) => {
const cont = document.querySelector(`.xb-nd-img[data-slot-id="${sid}"]`);
if (!cont) return;
-
const failedHtml = buildFailedPlaceholderHtml({
slotId: sid,
messageId: msgId,
@@ -1347,22 +1132,76 @@ async function handleImageClick(container) {
});
}
-function toggleEditPanel(container, show) {
+async function toggleEditPanel(container, show) {
const editPanel = container.querySelector('.xb-nd-edit');
const btnsPanel = container.querySelector('.xb-nd-btns') || container.querySelector('.xb-nd-failed-btns');
+
if (!editPanel) return;
+
+ const origLabel = Array.from(editPanel.children).find(el =>
+ el.tagName === 'DIV' && el.textContent.includes('编辑 TAG')
+ );
+ const origTextarea = Array.from(editPanel.children).find(el =>
+ el.tagName === 'TEXTAREA' && !el.dataset.type
+ );
+
if (show) {
+ const imgId = container.dataset.imgId;
+ const currentTags = container.dataset.tags || '';
+
+ let preview = null;
+ if (imgId) {
+ try { preview = await getPreview(imgId); } catch {}
+ }
+
+ if (origLabel) origLabel.style.display = 'none';
+ if (origTextarea) origTextarea.style.display = 'none';
+
+ let scrollWrap = editPanel.querySelector('.xb-nd-edit-scroll');
+ if (!scrollWrap) {
+ scrollWrap = document.createElement('div');
+ scrollWrap.className = 'xb-nd-edit-scroll';
+ editPanel.insertBefore(scrollWrap, editPanel.firstChild);
+ }
+
+ let html = `
+
`;
+
+ if (preview?.characterPrompts?.length > 0) {
+ preview.characterPrompts.forEach((char, i) => {
+ const name = char.name || `角色 ${i + 1}`;
+ html += `
+
+
👤 ${escapeHtml(name)}
+
+
`;
+ });
+ }
+
+ scrollWrap.innerHTML = html;
editPanel.style.display = 'block';
+
if (btnsPanel) {
btnsPanel.style.opacity = '0.3';
btnsPanel.style.pointerEvents = 'none';
}
- const textarea = editPanel.querySelector('.xb-nd-edit-input');
- if (textarea) {
- textarea.value = container.dataset.tags || '';
- textarea.focus();
- }
+
+ scrollWrap.querySelector('[data-type="scene"]')?.focus();
+
} else {
+
+ const scrollWrap = editPanel.querySelector('.xb-nd-edit-scroll');
+ if (scrollWrap) scrollWrap.remove();
+
+ if (origLabel) origLabel.style.display = '';
+ if (origTextarea) {
+ origTextarea.style.display = '';
+ origTextarea.value = container.dataset.tags || '';
+ }
+
editPanel.style.display = 'none';
if (btnsPanel) {
btnsPanel.style.opacity = '';
@@ -1376,28 +1215,72 @@ async function saveEditedTags(container) {
const slotId = container.dataset.slotId;
const messageId = parseInt(container.dataset.mesid);
const editPanel = container.querySelector('.xb-nd-edit');
- const textarea = editPanel?.querySelector('.xb-nd-edit-input');
- if (!textarea) return;
- const newTags = textarea.value.trim();
- if (!newTags) { alert('TAG 不能为空'); return; }
- container.dataset.tags = newTags;
- const preview = await getPreview(imgId);
- if (preview) {
+
+ if (!editPanel) return;
+
+ const sceneInput = editPanel.querySelector('textarea[data-type="scene"]');
+ if (!sceneInput) return;
+
+ const newSceneTags = sceneInput.value.trim();
+ if (!newSceneTags) {
+ alert('场景 TAG 不能为空');
+ return;
+ }
+
+ let originalPreview = null;
+ try {
+ originalPreview = await getPreview(imgId);
+ } catch (e) {
+ console.error('[NovelDraw] 获取原始预览失败:', e);
+ }
+
+ const charInputs = editPanel.querySelectorAll('textarea[data-type="char"]');
+ let newCharPrompts = null;
+
+ if (charInputs.length > 0 && originalPreview?.characterPrompts?.length > 0) {
+ newCharPrompts = [];
+ charInputs.forEach(input => {
+ const index = parseInt(input.dataset.index);
+ const newPrompt = input.value.trim();
+
+ if (originalPreview.characterPrompts[index]) {
+
+ newCharPrompts.push({
+ ...originalPreview.characterPrompts[index],
+ prompt: newPrompt
+ });
+ }
+ });
+ }
+
+ container.dataset.tags = newSceneTags;
+
+ if (originalPreview) {
const preset = getActiveParamsPreset();
- const newPositive = joinTags(preset?.positivePrefix, newTags);
+ const newPositive = joinTags(preset?.positivePrefix, newSceneTags);
+
await storePreview({
imgId,
- slotId: preview.slotId || slotId,
+ slotId: originalPreview.slotId || slotId,
messageId,
- base64: preview.base64,
- tags: newTags,
+ base64: originalPreview.base64,
+ tags: newSceneTags,
positive: newPositive,
- savedUrl: preview.savedUrl
+ savedUrl: originalPreview.savedUrl,
+ characterPrompts: newCharPrompts || originalPreview.characterPrompts,
+ negativePrompt: originalPreview.negativePrompt,
});
+
container.dataset.positive = escapeHtml(newPositive);
}
+
toggleEditPanel(container, false);
- showToast('TAG 已保存');
+
+ const charCount = newCharPrompts?.length || 0;
+ const msg = charCount > 0
+ ? `TAG 已保存 (场景 + ${charCount} 个角色)`
+ : 'TAG 已保存';
+ showToast(msg);
}
async function refreshSingleImage(container) {
@@ -1405,29 +1288,74 @@ async function refreshSingleImage(container) {
const currentState = container.dataset.state;
const slotId = container.dataset.slotId;
const messageId = parseInt(container.dataset.mesid);
+ const currentImgId = container.dataset.imgId;
+
if (!tags || currentState === ImageState.SAVING || currentState === ImageState.REFRESHING || !slotId) return;
+
toggleEditPanel(container, false);
setImageState(container, ImageState.REFRESHING);
+
try {
const preset = getActiveParamsPreset();
const settings = getSettings();
- const positive = joinTags(preset.positivePrefix, tags);
- const ctx = getContext();
- const message = ctx.chat?.[messageId];
- const presentCharacters = detectPresentCharacters(String(message?.mes || ''), settings.characterTags || []);
- const base64 = await generateNovelImage({ prompt: positive, negativePrompt: preset.negativePrefix || '', params: preset.params || {}, characters: presentCharacters });
+
+ let characterPrompts = null;
+ let negativePrompt = preset.negativePrefix || '';
+
+ if (currentImgId) {
+ const existingPreview = await getPreview(currentImgId);
+ if (existingPreview?.characterPrompts?.length) {
+ characterPrompts = existingPreview.characterPrompts;
+ }
+ if (existingPreview?.negativePrompt) {
+ negativePrompt = existingPreview.negativePrompt;
+ }
+ }
+
+ if (!characterPrompts) {
+ const ctx = getContext();
+ const message = ctx.chat?.[messageId];
+ const presentCharacters = detectPresentCharacters(String(message?.mes || ''), settings.characterTags || []);
+ characterPrompts = presentCharacters.map(c => ({
+ prompt: joinTags(c.type, c.appearance),
+ uc: c.negativeTags || '',
+ center: { x: c.posX ?? 0.5, y: c.posY ?? 0.5 }
+ }));
+ }
+
+ const scene = joinTags(preset.positivePrefix, tags);
+
+ const base64 = await generateNovelImage({
+ scene,
+ characterPrompts,
+ negativePrompt,
+ params: preset.params || {}
+ });
+
const newImgId = generateImgId();
- await storePreview({ imgId: newImgId, slotId, messageId, base64, tags, positive });
+ await storePreview({
+ imgId: newImgId,
+ slotId,
+ messageId,
+ base64,
+ tags,
+ positive: scene,
+ characterPrompts,
+ negativePrompt,
+ });
await setSlotSelection(slotId, newImgId);
+
container.querySelector('img').src = `data:image/png;base64,${base64}`;
container.dataset.imgId = newImgId;
- container.dataset.positive = escapeHtml(positive);
+ container.dataset.positive = escapeHtml(scene);
container.dataset.currentIndex = '0';
setImageState(container, ImageState.PREVIEW);
+
const previews = await getPreviewsBySlot(slotId);
const successPreviews = previews.filter(p => p.status !== 'failed' && p.base64);
container.dataset.historyCount = String(successPreviews.length);
updateNavControls(container, 0, successPreviews.length);
+
showToast(`图片已刷新（共 ${successPreviews.length} 个版本）`);
} catch (e) {
console.error('[NovelDraw] 刷新失败:', e);
@@ -1470,28 +1398,23 @@ async function deleteCurrentImage(container) {
try {
await deletePreview(imgId);
-
const previews = await getPreviewsBySlot(slotId);
const successPreviews = previews.filter(p => p.status !== 'failed' && p.base64);
if (successPreviews.length > 0) {
const latest = successPreviews[0];
await setSlotSelection(slotId, latest.imgId);
-
container.querySelector('img').src = latest.savedUrl || `data:image/png;base64,${latest.base64}`;
container.dataset.imgId = latest.imgId;
container.dataset.tags = escapeHtml(latest.tags || '');
container.dataset.positive = escapeHtml(latest.positive || '');
container.dataset.currentIndex = '0';
container.dataset.historyCount = String(successPreviews.length);
-
setImageState(container, latest.savedUrl ? ImageState.SAVED : ImageState.PREVIEW);
updateNavControls(container, 0, successPreviews.length);
-
showToast(`已删除（剩余 ${successPreviews.length} 张）`);
} else {
await clearSlotSelection(slotId);
-
const failedHtml = buildFailedPlaceholderHtml({
slotId,
messageId,
@@ -1501,7 +1424,6 @@ async function deleteCurrentImage(container) {
errorMessage: '点击重试可重新生成'
});
container.outerHTML = failedHtml;
-
showToast('图片已删除，占位符已保留');
}
} catch (e) {
@@ -1515,27 +1437,86 @@ async function retryFailedImage(container) {
const messageId = parseInt(container.dataset.mesid);
const tags = container.dataset.tags;
if (!slotId) return;
+
container.innerHTML = `
`;
+
try {
const preset = getActiveParamsPreset();
const settings = getSettings();
- const positive = tags ? joinTags(preset.positivePrefix, tags) : preset.positivePrefix;
- const ctx = getContext();
- const message = ctx.chat?.[messageId];
- const presentCharacters = detectPresentCharacters(String(message?.mes || ''), settings.characterTags || []);
- const base64 = await generateNovelImage({ prompt: positive, negativePrompt: preset.negativePrefix || '', params: preset.params || {}, characters: presentCharacters });
+ const scene = tags ? joinTags(preset.positivePrefix, tags) : preset.positivePrefix;
+ const negativePrompt = preset.negativePrefix || '';
+
+ let characterPrompts = null;
+ const failedPreviews = await getPreviewsBySlot(slotId);
+ const latestFailed = failedPreviews.find(p => p.status === 'failed');
+ if (latestFailed?.characterPrompts?.length) {
+ characterPrompts = latestFailed.characterPrompts;
+ }
+
+ if (!characterPrompts) {
+ const ctx = getContext();
+ const message = ctx.chat?.[messageId];
+ const presentCharacters = detectPresentCharacters(String(message?.mes || ''), settings.characterTags || []);
+ characterPrompts = presentCharacters.map(c => ({
+ prompt: joinTags(c.type, c.appearance),
+ uc: c.negativeTags || '',
+ center: { x: c.posX ?? 0.5, y: c.posY ?? 0.5 }
+ }));
+ }
+
+ const base64 = await generateNovelImage({
+ scene,
+ characterPrompts,
+ negativePrompt,
+ params: preset.params || {}
+ });
+
const newImgId = generateImgId();
- await storePreview({ imgId: newImgId, slotId, messageId, base64, tags: tags || '', positive });
+ await storePreview({
+ imgId: newImgId,
+ slotId,
+ messageId,
+ base64,
+ tags: tags || '',
+ positive: scene,
+ characterPrompts,
+ negativePrompt,
+ });
await deleteFailedRecordsForSlot(slotId);
await setSlotSelection(slotId, newImgId);
- const imgHtml = buildImageHtml({ slotId, imgId: newImgId, url: `data:image/png;base64,${base64}`, tags: tags || '', positive, messageId, state: ImageState.PREVIEW, historyCount: 1, currentIndex: 0 });
+
+ const imgHtml = buildImageHtml({
+ slotId,
+ imgId: newImgId,
+ url: `data:image/png;base64,${base64}`,
+ tags: tags || '',
+ positive: scene,
+ messageId,
+ state: ImageState.PREVIEW,
+ historyCount: 1,
+ currentIndex: 0
+ });
container.outerHTML = imgHtml;
showToast('图片生成成功！');
} catch (e) {
console.error('[NovelDraw] 重试失败:', e);
const errorType = classifyError(e);
- await storeFailedPlaceholder({ slotId, messageId, tags: tags || '', positive: container.dataset.positive || '', errorType: errorType.code, errorMessage: errorType.desc });
- container.outerHTML = buildFailedPlaceholderHtml({ slotId, messageId, tags: tags || '', positive: container.dataset.positive || '', errorType: errorType.label, errorMessage: errorType.desc });
+ await storeFailedPlaceholder({
+ slotId,
+ messageId,
+ tags: tags || '',
+ positive: container.dataset.positive || '',
+ errorType: errorType.code,
+ errorMessage: errorType.desc
+ });
+ container.outerHTML = buildFailedPlaceholderHtml({
+ slotId,
+ messageId,
+ tags: tags || '',
+ positive: container.dataset.positive || '',
+ errorType: errorType.label,
+ errorMessage: errorType.desc
+ });
showToast(`重试失败: ${errorType.desc}`, 'error');
}
}
@@ -1581,6 +1562,7 @@ async function renderPreviewsForMessage(messageId) {
if (!$mesText.length) return;
let html = $mesText.html();
let replaced = false;
+
for (const slotId of slotIds) {
if (html.includes(`data-slot-id="${slotId}"`)) continue;
@@ -1588,6 +1570,7 @@ async function renderPreviewsForMessage(messageId) {
const placeholder = createPlaceholder(slotId);
const escapedPlaceholder = placeholder.replace(/[[\]]/g, '\\$&');
if (!new RegExp(escapedPlaceholder).test(html)) continue;
+
let imgHtml;
if (displayData.isFailed) {
imgHtml = buildFailedPlaceholderHtml({
@@ -1627,6 +1610,7 @@ async function renderPreviewsForMessage(messageId) {
html = html.replace(new RegExp(escapedPlaceholder, 'g'), imgHtml);
replaced = true;
}
+
if (replaced && !isMessageBeingEdited(messageId)) {
$mesText.html(html);
}
@@ -1663,150 +1647,213 @@ async function handleMessageModified(data) {
// ═══════════════════════════════════════════════════════════════════════════
async function generateAndInsertImages({ messageId, onStateChange }) {
- onStateChange?.('llm', {});
- let planRaw;
- try {
- planRaw = await generateScenePlan({ messageId });
- } catch (e) {
- throw new NovelDrawError(`场景分析失败: ${e.message}`, ErrorType.LLM);
- }
-
- // [KEEP] ═══════════════════════════════════════════════════════════════
- console.group('%c[NovelDraw] LLM 场景分析输出', 'color: #d4a574; font-weight: bold');
- console.log(planRaw);
- console.groupEnd();
- // [KEEP] ═══════════════════════════════════════════════════════════════
-
- const tasks = parseImagePlan(planRaw);
- if (!tasks.length) throw new NovelDrawError('未解析到图片任务', ErrorType.PARSE);
-
const ctx = getContext();
const message = ctx.chat?.[messageId];
if (!message) throw new NovelDrawError('消息不存在', ErrorType.PARSE);
-
- const initialChatId = ctx.chatId;
-
- const preset = getActiveParamsPreset();
- const settings = getSettings();
- const presentCharacters = detectPresentCharacters(String(message.mes || ''), settings.characterTags || []);
- message.mes = message.mes.replace(PLACEHOLDER_REGEX, '');
-
- onStateChange?.('gen', { current: 0, total: tasks.length });
-
- const results = [];
- const { messageFormatting } = await import('../../../../../../script.js');
- let successCount = 0;
-
- for (let i = 0; i < tasks.length; i++) {
- const currentCtx = getContext();
- if (currentCtx.chatId !== initialChatId) {
- console.warn('[NovelDraw] 聊天已切换，中止生成');
- break;
- }
- if (!currentCtx.chat?.[messageId]) {
- console.warn('[NovelDraw] 消息已删除，中止生成');
- break;
- }
-
- const task = tasks[i];
- const slotId = generateSlotId();
- const positive = joinTags(preset.positivePrefix, task.tags);
-
- onStateChange?.('progress', { current: i + 1, total: tasks.length });
-
+
+ // ▼ 新增：创建中止控制器
+ generationAbortController = new AbortController();
+ const signal = generationAbortController.signal;
+
+ try { // ▼ 新增 try 包裹整个函数体
+ const settings = getSettings();
+ const preset = getActiveParamsPreset();
+ const llmPreset = getActiveLlmPreset();
+
+ const messageText = String(message.mes || '').replace(PLACEHOLDER_REGEX, '').trim();
+ if (!messageText) throw new NovelDrawError('消息内容为空', ErrorType.PARSE);
+
+ const presentCharacters = detectPresentCharacters(messageText, settings.characterTags || []);
+
+ onStateChange?.('llm', {});
+
+ // ▼ 新增：检查中止
+ if (signal.aborted) throw new NovelDrawError('已取消', ErrorType.UNKNOWN);
+
+ let planRaw;
try {
- const base64 = await generateNovelImage({
- prompt: positive,
- negativePrompt: preset.negativePrefix || '',
- params: preset.params || {},
- characters: presentCharacters
+ planRaw = await generateScenePlan({
+ messageText,
+ presentCharacters,
+ llmPreset,
+ llmApi: settings.llmApi,
+ useStream: settings.useStream,
+ timeout: settings.timeout || 120000
});
- const imgId = generateImgId();
- await storePreview({ imgId, slotId, messageId, base64, tags: task.tags, positive });
- await setSlotSelection(slotId, imgId);
- results.push({ slotId, imgId, tags: task.tags, success: true });
- successCount++;
} catch (e) {
- console.error('[NovelDraw] 第 ' + (i + 1) + ' 张失败:', e);
- const errorType = classifyError(e);
- await storeFailedPlaceholder({
- slotId,
- messageId,
- tags: task.tags,
- positive,
- errorType: errorType.code,
- errorMessage: errorType.desc
- });
- results.push({ slotId, tags: task.tags, success: false, error: errorType });
+ // ▼ 新增：中止检查
+ if (signal.aborted) throw new NovelDrawError('已取消', ErrorType.UNKNOWN);
+ if (e instanceof LLMServiceError) {
+ throw new NovelDrawError(`场景分析失败: ${e.message}`, ErrorType.LLM);
+ }
+ throw e;
}
- const msgCheck = getContext().chat?.[messageId];
- if (!msgCheck) {
- console.warn('[NovelDraw] 消息已删除，跳过占位符插入');
- break;
+ // ▼ 新增：检查中止
+ if (signal.aborted) throw new NovelDrawError('已取消', ErrorType.UNKNOWN);
+
+ const tasks = parseImagePlan(planRaw);
+ if (!tasks.length) throw new NovelDrawError('未解析到图片任务', ErrorType.PARSE);
+
+ const initialChatId = ctx.chatId;
+ message.mes = message.mes.replace(PLACEHOLDER_REGEX, '');
+
+ onStateChange?.('gen', { current: 0, total: tasks.length });
+
+ const results = [];
+ const { messageFormatting } = await import('../../../../../../script.js');
+ let successCount = 0;
+
+ for (let i = 0; i < tasks.length; i++) {
+ // ▼ 新增：检查中止
+ if (signal.aborted) {
+ console.log('[NovelDraw] 用户中止，停止生成');
+ break;
+ }
+
+ const currentCtx = getContext();
+ if (currentCtx.chatId !== initialChatId) {
+ console.warn('[NovelDraw] 聊天已切换，中止生成');
+ break;
+ }
+ if (!currentCtx.chat?.[messageId]) {
+ console.warn('[NovelDraw] 消息已删除，中止生成');
+ break;
+ }
+
+ const task = tasks[i];
+ const slotId = generateSlotId();
+
+ onStateChange?.('progress', { current: i + 1, total: tasks.length });
+
+ let position = findAnchorPosition(message.mes, task.anchor);
+ let scene, characterPrompts, tagsForStore;
+
+ if (isLegacyFormat([task])) {
+ scene = joinTags(preset.positivePrefix, task.legacyTags);
+ characterPrompts = presentCharacters.map(c => ({
+ prompt: joinTags(c.type, c.appearance),
+ uc: c.negativeTags || '',
+ center: { x: c.posX ?? 0.5, y: c.posY ?? 0.5 }
+ }));
+ tagsForStore = task.legacyTags;
+ } else {
+ scene = joinTags(preset.positivePrefix, task.scene);
+ characterPrompts = assembleCharacterPrompts(task.chars, settings.characterTags || []);
+ tagsForStore = task.scene;
+ }
+
+ try {
+ const base64 = await generateNovelImage({
+ scene,
+ characterPrompts,
+ negativePrompt: preset.negativePrefix || '',
+ params: preset.params || {},
+ signal // ▼ 新增：传递 signal
+ });
+ const imgId = generateImgId();
+ await storePreview({ imgId, slotId, messageId, base64, tags: tagsForStore, positive: scene, characterPrompts, negativePrompt: preset.negativePrefix });
+ await setSlotSelection(slotId, imgId);
+ results.push({ slotId, imgId, tags: tagsForStore, success: true });
+ successCount++;
+ } catch (e) {
+ // ▼ 新增：中止时不记录失败
+ if (signal.aborted) {
+ console.log('[NovelDraw] 图片生成被中止');
+ break;
+ }
+ console.error(`[NovelDraw] 图${i + 1} 失败:`, e.message);
+ const errorType = classifyError(e);
+ await storeFailedPlaceholder({
+ slotId,
+ messageId,
+ tags: tagsForStore,
+ positive: scene,
+ errorType: errorType.code,
+ errorMessage: errorType.desc,
+ characterPrompts,
+ negativePrompt: preset.negativePrefix,
+ });
+ results.push({ slotId, tags: tagsForStore, success: false, error: errorType });
+ }
+
+ // ▼ 新增：中止时跳过后续
+ if (signal.aborted) break;
+
+ const msgCheck = getContext().chat?.[messageId];
+ if (!msgCheck) {
+ console.warn('[NovelDraw] 消息已删除，跳过占位符插入');
+ break;
+ }
+
+ const placeholder = createPlaceholder(slotId);
+
+ if (position >= 0) {
+ position = findNearestSentenceEnd(message.mes, position);
+ const before = message.mes.slice(0, position);
+ const after = message.mes.slice(position);
+ let insertText = placeholder;
+ if (before.length > 0 && !before.endsWith('\n')) insertText = '\n' + insertText;
+ if (after.length > 0 && !after.startsWith('\n')) insertText = insertText + '\n';
+ message.mes = before + insertText + after;
+ } else {
+ const needNewline = message.mes.length > 0 && !message.mes.endsWith('\n');
+ message.mes += (needNewline ? '\n' : '') + placeholder;
+ }
+
+ // ▼ 新增：中止时跳过冷却
+ if (signal.aborted) break;
+
+ if (i < tasks.length - 1) {
+ const delay = randomDelay(settings.requestDelay?.min, settings.requestDelay?.max);
+ onStateChange?.('cooldown', { duration: delay, nextIndex: i + 2, total: tasks.length });
+
+ // ▼ 修改：可中止的延迟
+ await new Promise(r => {
+ const tid = setTimeout(r, delay);
+ signal.addEventListener('abort', () => { clearTimeout(tid); r(); }, { once: true });
+ });
+ }
}
- const placeholder = createPlaceholder(slotId);
- let position = findAnchorPosition(message.mes, task.anchor);
-
- // [KEEP] ═══════════════════════════════════════════════════════════════
- console.group(`%c[NovelDraw] 图${i + 1} 锚点定位`, 'color: #3ecf8e; font-weight: bold');
- console.log('锚点:', task.anchor);
- console.log('位置:', position);
- if (position >= 0) {
- const s = Math.max(0, position - 40);
- const e = Math.min(message.mes.length, position + 40);
- console.log('上下文:', message.mes.slice(s, position) + '【▶】' + message.mes.slice(position, e));
- } else {
- console.log('状态: 未匹配，插入末尾');
- }
- console.groupEnd();
- // [KEEP] ═══════════════════════════════════════════════════════════════
-
- if (position >= 0) {
- position = findNearestSentenceEnd(message.mes, position);
- const before = message.mes.slice(0, position);
- const after = message.mes.slice(position);
- let insertText = placeholder;
- if (before.length > 0 && !before.endsWith('\n')) insertText = '\n' + insertText;
- if (after.length > 0 && !after.startsWith('\n')) insertText = insertText + '\n';
- message.mes = before + insertText + after;
- } else {
- const needNewline = message.mes.length > 0 && !message.mes.endsWith('\n');
- message.mes += (needNewline ? '\n' : '') + placeholder;
+ // ▼ 新增：中止时的返回处理
+ if (signal.aborted) {
+ onStateChange?.('success', { success: successCount, total: tasks.length, aborted: true });
+ return { success: successCount, total: tasks.length, results, aborted: true };
}
- if (i < tasks.length - 1) {
- const delay = randomDelay(settings.requestDelay?.min, settings.requestDelay?.max);
- onStateChange?.('cooldown', { duration: delay, nextIndex: i + 2, total: tasks.length });
- await new Promise(r => setTimeout(r, delay));
+ const finalCtx = getContext();
+ const shouldUpdateDom = finalCtx.chatId === initialChatId &&
+ finalCtx.chat?.[messageId] &&
+ !isMessageBeingEdited(messageId);
+
+ if (shouldUpdateDom) {
+ const formatted = messageFormatting(
+ message.mes,
+ message.name,
+ message.is_system,
+ message.is_user,
+ messageId
+ );
+ $('[mesid="' + messageId + '"] .mes_text').html(formatted);
+ await renderPreviewsForMessage(messageId);
+
+ try {
+ const { processMessageById } = await import('../iframe-renderer.js');
+ processMessageById(messageId, true);
+ } catch {}
}
+
+ const resultColor = successCount === tasks.length ? '#3ecf8e' : '#f0b429';
+ console.log(`%c[NovelDraw] 完成: ${successCount}/${tasks.length} 张`, `color: ${resultColor}; font-weight: bold`);
+
+ onStateChange?.('success', { success: successCount, total: tasks.length });
+ return { success: successCount, total: tasks.length, results };
+
+ } finally {
+ // ▼ 新增：清理控制器
+ generationAbortController = null;
}
-
- const finalCtx = getContext();
- const shouldUpdateDom = finalCtx.chatId === initialChatId &&
- finalCtx.chat?.[messageId] &&
- !isMessageBeingEdited(messageId);
-
- if (shouldUpdateDom) {
- const formatted = messageFormatting(
- message.mes,
- message.name,
- message.is_system,
- message.is_user,
- messageId
- );
- $('[mesid="' + messageId + '"] .mes_text').html(formatted);
- await renderPreviewsForMessage(messageId);
-
- try {
- const { processMessageById } = await import('../iframe-renderer.js');
- processMessageById(messageId, true);
- } catch (e) {}
- }
-
- onStateChange?.('success', { success: successCount, total: tasks.length });
- return { success: successCount, total: tasks.length, results };
}
// ═══════════════════════════════════════════════════════════════════════════
@@ -1924,7 +1971,7 @@ async function sendInitData() {
iframe.contentWindow.postMessage({
source: 'LittleWhiteBox-NovelDraw',
type: 'INIT_DATA',
- settings: { enabled: moduleInitialized, ...settings, llmApi: settings.llmApi || DEFAULT_SETTINGS.llmApi, useStream: settings.useStream ?? true, characterTags: settings.characterTags || [] },
+ settings: { enabled: moduleInitialized, ...settings },
cacheStats: stats,
gallerySummary,
}, '*');
@@ -1938,45 +1985,49 @@ async function handleFrameMessage(event) {
const data = event.data;
if (!data || data.source !== 'NovelDraw-Frame') return;
- const handlers = {
- 'FRAME_READY': () => { frameReady = true; sendInitData(); },
+ switch (data.type) {
+ case 'FRAME_READY':
+ frameReady = true;
+ sendInitData();
+ break;
- 'CLOSE': hideOverlay,
+ case 'CLOSE':
+ hideOverlay();
+ break;
- 'SAVE_MODE': async () => {
+ case 'SAVE_MODE': {
const s = getSettings();
s.mode = data.mode || s.mode;
- saveSettings(s);
- await NovelDrawStorage.saveNow();
+ await saveSettingsAndToast(s, '已保存');
import('./floating-panel.js').then(m => m.updateAutoModeUI?.());
- },
+ break;
+ }
- 'SAVE_API_KEY': async () => {
+ case 'SAVE_API_KEY': {
const s = getSettings();
s.apiKey = typeof data.apiKey === 'string' ? data.apiKey : s.apiKey;
- saveSettings(s);
- await NovelDrawStorage.saveNow();
- postStatus('success', '已保存');
- },
+ await saveSettingsAndToast(s, '已保存');
+ break;
+ }
- 'SAVE_TIMEOUT': async () => {
+ case 'SAVE_TIMEOUT': {
const s = getSettings();
if (typeof data.timeout === 'number' && data.timeout > 0) s.timeout = data.timeout;
if (data.requestDelay?.min > 0 && data.requestDelay?.max > 0) s.requestDelay = data.requestDelay;
- saveSettings(s);
- await NovelDrawStorage.saveNow();
- postStatus('success', '已保存');
- },
+ await saveSettingsAndToast(s, '已保存');
+ break;
+ }
- 'SAVE_CACHE_DAYS': async () => {
+ case 'SAVE_CACHE_DAYS': {
const s = getSettings();
- if (typeof data.cacheDays === 'number' && data.cacheDays >= 1 && data.cacheDays <= 30) s.cacheDays = data.cacheDays;
- saveSettings(s);
- await NovelDrawStorage.saveNow();
- postStatus('success', '已保存');
- },
+ if (typeof data.cacheDays === 'number' && data.cacheDays >= 1 && data.cacheDays <= 30) {
+ s.cacheDays = data.cacheDays;
+ }
+ await saveSettingsAndToast(s, '已保存');
+ break;
+ }
- 'TEST_API': async () => {
+ case 'TEST_API': {
try {
postStatus('loading', '测试中...');
await testApiConnection(data.apiKey);
@@ -1984,20 +2035,27 @@ async function handleFrameMessage(event) {
} catch (e) {
postStatus('error', e?.message);
}
- },
+ break;
+ }
- 'SAVE_PARAMS_PRESET': async () => {
+ case 'SAVE_PARAMS_PRESET': {
const s = getSettings();
if (data.selectedParamsPresetId) s.selectedParamsPresetId = data.selectedParamsPresetId;
- if (Array.isArray(data.paramsPresets) && data.paramsPresets.length > 0) s.paramsPresets = data.paramsPresets;
- saveSettings(s);
- await NovelDrawStorage.saveNow();
- sendInitData();
- postStatus('success', '已保存');
- try { const { refreshPresetSelect } = await import('./floating-panel.js'); refreshPresetSelect?.(); } catch {}
- },
+ if (Array.isArray(data.paramsPresets) && data.paramsPresets.length > 0) {
+ s.paramsPresets = data.paramsPresets;
+ }
+ const ok = await saveSettingsAndToast(s, '已保存');
+ if (ok) {
+ sendInitData();
+ try {
+ const { refreshPresetSelect } = await import('./floating-panel.js');
+ refreshPresetSelect?.();
+ } catch {}
+ }
+ break;
+ }
- 'ADD_PARAMS_PRESET': async () => {
+ case 'ADD_PARAMS_PRESET': {
const s = getSettings();
const id = generateSlotId();
const base = getActiveParamsPreset() || DEFAULT_PARAMS_PRESET;
@@ -2006,39 +2064,38 @@ async function handleFrameMessage(event) {
copy.name = (typeof data.name === 'string' && data.name.trim()) ? data.name.trim() : `配置-${s.paramsPresets.length + 1}`;
s.paramsPresets.push(copy);
s.selectedParamsPresetId = id;
- saveSettings(s);
- await NovelDrawStorage.saveNow();
- sendInitData();
- try { const { refreshPresetSelect } = await import('./floating-panel.js'); refreshPresetSelect?.(); } catch {}
- },
+ const ok = await saveSettingsAndToast(s, '已创建');
+ if (ok) {
+ sendInitData();
+ try {
+ const { refreshPresetSelect } = await import('./floating-panel.js');
+ refreshPresetSelect?.();
+ } catch {}
+ }
+ break;
+ }
- 'DEL_PARAMS_PRESET': async () => {
+ case 'DEL_PARAMS_PRESET': {
const s = getSettings();
- if (s.paramsPresets.length <= 1) { postStatus('error', '至少保留一个预设'); return; }
+ if (s.paramsPresets.length <= 1) {
+ postStatus('error', '至少保留一个预设');
+ break;
+ }
const idx = s.paramsPresets.findIndex(p => p.id === s.selectedParamsPresetId);
if (idx >= 0) s.paramsPresets.splice(idx, 1);
s.selectedParamsPresetId = s.paramsPresets[0]?.id || null;
- saveSettings(s);
- await NovelDrawStorage.saveNow();
- sendInitData();
- try { const { refreshPresetSelect } = await import('./floating-panel.js'); refreshPresetSelect?.(); } catch {}
- },
-
- 'EXPORT_PARAMS_PRESET': () => { exportParamsPreset(); postStatus('success', '已导出'); },
-
- 'IMPORT_PARAMS_PRESET': async () => {
- try {
- importParamsPreset(data.fileContent);
- await NovelDrawStorage.saveNow();
+ const ok = await saveSettingsAndToast(s, '已删除');
+ if (ok) {
sendInitData();
- postStatus('success', '已导入');
- try { const { refreshPresetSelect } = await import('./floating-panel.js'); refreshPresetSelect?.(); } catch {}
- } catch (e) {
- postStatus('error', e.message);
+ try {
+ const { refreshPresetSelect } = await import('./floating-panel.js');
+ refreshPresetSelect?.();
+ } catch {}
}
- },
+ break;
+ }
- 'SAVE_LLM_PRESET': async () => {
+ case 'SAVE_LLM_PRESET': {
const s = getSettings();
if (data.selectedLlmPresetId) s.selectedLlmPresetId = data.selectedLlmPresetId;
if (Array.isArray(data.llmPresets) && data.llmPresets.length > 0) s.llmPresets = data.llmPresets;
@@ -2046,13 +2103,12 @@ async function handleFrameMessage(event) {
s.llmApi = { ...s.llmApi, ...data.llmApi, modelCache: data.llmApi.modelCache || s.llmApi?.modelCache || [] };
}
if (typeof data.useStream === 'boolean') s.useStream = data.useStream;
- saveSettings(s);
- await NovelDrawStorage.saveNow();
- sendInitData();
- postStatus('success', '已保存');
- },
+ const ok = await saveSettingsAndToast(s, '已保存');
+ if (ok) sendInitData();
+ break;
+ }
- 'ADD_LLM_PRESET': async () => {
+ case 'ADD_LLM_PRESET': {
const s = getSettings();
const id = generateSlotId();
const base = getActiveLlmPreset() || DEFAULT_LLM_PRESET;
@@ -2061,66 +2117,63 @@ async function handleFrameMessage(event) {
copy.name = (typeof data.name === 'string' && data.name.trim()) ? data.name.trim() : `预设-${s.llmPresets.length + 1}`;
s.llmPresets.push(copy);
s.selectedLlmPresetId = id;
- saveSettings(s);
- await NovelDrawStorage.saveNow();
- sendInitData();
- },
+ const ok = await saveSettingsAndToast(s, '已创建');
+ if (ok) sendInitData();
+ break;
+ }
- 'DEL_LLM_PRESET': async () => {
+ case 'DEL_LLM_PRESET': {
const s = getSettings();
- if (s.llmPresets.length <= 1) { postStatus('error', '至少保留一个预设'); return; }
+ if (s.llmPresets.length <= 1) {
+ postStatus('error', '至少保留一个预设');
+ break;
+ }
const idx = s.llmPresets.findIndex(p => p.id === s.selectedLlmPresetId);
if (idx >= 0) s.llmPresets.splice(idx, 1);
s.selectedLlmPresetId = s.llmPresets[0]?.id || null;
- saveSettings(s);
- await NovelDrawStorage.saveNow();
- sendInitData();
- },
+ const ok = await saveSettingsAndToast(s, '已删除');
+ if (ok) sendInitData();
+ break;
+ }
- 'EXPORT_LLM_PRESET': () => { exportLlmPreset(); postStatus('success', '已导出'); },
-
- 'IMPORT_LLM_PRESET': async () => {
- try {
- importLlmPreset(data.fileContent);
- await NovelDrawStorage.saveNow();
- sendInitData();
- postStatus('success', '已导入');
- } catch (e) {
- postStatus('error', e.message);
- }
- },
-
- 'RESET_CURRENT_LLM_PRESET': async () => {
+ case 'RESET_CURRENT_LLM_PRESET': {
const s = getSettings();
const currentId = s.selectedLlmPresetId;
const idx = s.llmPresets.findIndex(p => p.id === currentId);
if (idx >= 0) {
const currentName = s.llmPresets[idx].name;
s.llmPresets[idx] = { ...JSON.parse(JSON.stringify(DEFAULT_LLM_PRESET)), id: currentId, name: currentName || DEFAULT_LLM_PRESET.name };
- saveSettings(s);
- await NovelDrawStorage.saveNow();
- sendInitData();
- postStatus('success', 'LLM 预设已恢复默认');
+ const ok = await saveSettingsAndToast(s, 'LLM 预设已恢复默认');
+ if (ok) sendInitData();
} else {
postStatus('error', '未找到当前预设');
}
- },
+ break;
+ }
- 'RESET_PRESETS': async () => {
+ case 'RESET_PRESETS': {
resetToDefaultPresets();
- await NovelDrawStorage.saveNow();
- sendInitData();
- postStatus('success', '已重置');
- try { const { refreshPresetSelect } = await import('./floating-panel.js'); refreshPresetSelect?.(); } catch {}
- },
+ const ok = await saveSettingsAndToast(getSettings(), '已重置');
+ if (ok) {
+ sendInitData();
+ try {
+ const { refreshPresetSelect } = await import('./floating-panel.js');
+ refreshPresetSelect?.();
+ } catch {}
+ }
+ break;
+ }
- 'FETCH_LLM_MODELS': async () => {
+ case 'FETCH_LLM_MODELS': {
try {
postStatus('loading', '连接中...');
const apiCfg = data.llmApi || {};
let baseUrl = String(apiCfg.url || '').trim().replace(/\/+$/, '');
const apiKey = String(apiCfg.key || '').trim();
- if (!apiKey) { postStatus('error', '请先填写 API KEY'); return; }
+ if (!apiKey) {
+ postStatus('error', '请先填写 API KEY');
+ break;
+ }
const tryFetch = async url => {
const res = await fetch(url, { headers: { Authorization: `Bearer ${apiKey}`, Accept: 'application/json' } });
@@ -2140,44 +2193,51 @@ async function handleFrameMessage(event) {
s.llmApi.modelCache = [...new Set(models)];
if (!s.llmApi.model && models.length) s.llmApi.model = models[0];
- saveSettings(s);
- await NovelDrawStorage.saveNow();
- sendInitData();
- postStatus('success', `获取 ${models.length} 个模型`);
+ const ok = await saveSettingsAndToast(s, `获取 ${models.length} 个模型`);
+ if (ok) sendInitData();
} catch (e) {
postStatus('error', '连接失败：' + (e.message || '请检查配置'));
}
- },
+ break;
+ }
- 'SAVE_CHARACTER_TAGS': async () => {
+ case 'SAVE_CHARACTER_TAGS': {
const s = getSettings();
if (Array.isArray(data.characterTags)) s.characterTags = data.characterTags;
- saveSettings(s);
- await NovelDrawStorage.saveNow();
- postStatus('success', '角色标签已保存');
- },
+ await saveSettingsAndToast(s, '角色标签已保存');
+ break;
+ }
- 'CLEAR_EXPIRED_CACHE': async () => {
+ case 'CLEAR_EXPIRED_CACHE': {
const s = getSettings();
const n = await clearExpiredCache(s.cacheDays || 3);
sendInitData();
postStatus('success', `已清理 ${n} 张`);
- },
+ break;
+ }
- 'CLEAR_ALL_CACHE': async () => {
+ case 'CLEAR_ALL_CACHE':
await clearAllCache();
sendInitData();
postStatus('success', '已清空');
- },
+ break;
- 'REFRESH_CACHE_STATS': () => { sendInitData(); },
+ case 'REFRESH_CACHE_STATS':
+ sendInitData();
+ break;
- 'USE_GALLERY_IMAGE': async () => { sendInitData(); postStatus('success', '已选择'); },
+ case 'USE_GALLERY_IMAGE':
+ sendInitData();
+ postStatus('success', '已选择');
+ break;
- 'SAVE_GALLERY_IMAGE': async () => {
+ case 'SAVE_GALLERY_IMAGE': {
try {
const preview = await getPreview(data.imgId);
- if (!preview?.base64) { postStatus('error', '图片数据不存在'); return; }
+ if (!preview?.base64) {
+ postStatus('error', '图片数据不存在');
+ break;
+ }
const charName = preview.characterName || getChatCharacterName();
const url = await saveBase64AsFile(preview.base64, charName, `novel_${data.imgId}`, 'png');
await updatePreviewSavedUrl(data.imgId, url);
@@ -2193,12 +2253,13 @@ async function handleFrameMessage(event) {
console.error('[NovelDraw] 保存失败:', e);
postStatus('error', '保存失败: ' + e.message);
}
- },
+ break;
+ }
- 'LOAD_CHARACTER_PREVIEWS': async () => {
+ case 'LOAD_CHARACTER_PREVIEWS': {
try {
const charName = data.charName;
- if (!charName) return;
+ if (!charName) break;
const slots = await getCharacterPreviews(charName);
document.getElementById('xiaobaix-novel-draw-iframe')?.contentWindow?.postMessage({
source: 'LittleWhiteBox-NovelDraw',
@@ -2209,9 +2270,10 @@ async function handleFrameMessage(event) {
} catch (e) {
console.error('[NovelDraw] 加载预览失败:', e);
}
- },
+ break;
+ }
- 'DELETE_GALLERY_IMAGE': async () => {
+ case 'DELETE_GALLERY_IMAGE': {
try {
await deletePreview(data.imgId);
document.getElementById('xiaobaix-novel-draw-iframe')?.contentWindow?.postMessage({
@@ -2225,12 +2287,16 @@ async function handleFrameMessage(event) {
console.error('[NovelDraw] 删除失败:', e);
postStatus('error', '删除失败: ' + e.message);
}
- },
+ break;
+ }
- 'GENERATE_IMAGES': async () => {
+ case 'GENERATE_IMAGES': {
try {
const messageId = typeof data.messageId === 'number' ? data.messageId : findLastAIMessageId();
- if (messageId < 0) { postStatus('error', '无AI消息'); return; }
+ if (messageId < 0) {
+ postStatus('error', '无AI消息');
+ break;
+ }
const result = await generateAndInsertImages({
messageId,
onStateChange: (state, d) => {
@@ -2241,16 +2307,17 @@ async function handleFrameMessage(event) {
} catch (e) {
postStatus('error', e?.message);
}
- },
+ break;
+ }
- 'TEST_SINGLE': async () => {
+ case 'TEST_SINGLE': {
try {
postStatus('loading', '生成中...');
const t0 = Date.now();
const preset = getActiveParamsPreset();
const tags = (typeof data.tags === 'string' && data.tags.trim()) ? data.tags.trim() : '1girl, smile';
- const positive = joinTags(preset?.positivePrefix, tags);
- const base64 = await generateNovelImage({ prompt: positive, negativePrompt: preset?.negativePrefix || '', params: preset?.params || {} });
+ const scene = joinTags(preset?.positivePrefix, tags);
+ const base64 = await generateNovelImage({ scene, characterPrompts: [], negativePrompt: preset?.negativePrefix || '', params: preset?.params || {} });
document.getElementById('xiaobaix-novel-draw-iframe')?.contentWindow?.postMessage({
source: 'LittleWhiteBox-NovelDraw',
type: 'TEST_RESULT',
@@ -2260,11 +2327,9 @@ async function handleFrameMessage(event) {
} catch (e) {
postStatus('error', e?.message);
}
- },
- };
-
- const handler = handlers[data.type];
- if (handler) await handler();
+ break;
+ }
+ }
}
// ═══════════════════════════════════════════════════════════════════════════
@@ -2272,19 +2337,18 @@ async function handleFrameMessage(event) {
// ═══════════════════════════════════════════════════════════════════════════
export async function openNovelDrawSettings() {
- await syncSettingsWithServer().catch(e => console.warn('[NovelDraw] sync settings failed', e));
+ await loadSettings();
showOverlay();
}
export async function initNovelDraw() {
if (window?.isXiaobaixEnabled === false) return;
+ await loadSettings();
moduleInitialized = true;
ensureStyles();
- getSettings();
+
await loadTagGuide();
-
- syncSettingsWithServer().catch(e => console.warn('[NovelDraw] sync settings failed', e));
setupEventDelegation();
setupGenerateInterceptor();
@@ -2320,13 +2384,13 @@ export async function initNovelDraw() {
clearExpiredCache,
clearAllCache,
detectPresentCharacters,
- buildCharacterInfoForLLM,
+ assembleCharacterPrompts,
getPreviewsBySlot,
getDisplayPreviewForSlot,
openGallery,
closeGallery,
isEnabled: () => moduleInitialized,
- syncSettingsWithServer,
+ loadSettings,
};
window.registerModuleCleanup?.(MODULE_KEY, cleanupNovelDraw);
@@ -2335,6 +2399,8 @@ export async function initNovelDraw() {
export async function cleanupNovelDraw() {
moduleInitialized = false;
+ settingsCache = null;
+ settingsLoaded = false;
events.cleanup();
hideOverlay();
destroyGalleryCache();
@@ -2358,6 +2424,7 @@ export async function cleanupNovelDraw() {
export {
getSettings,
saveSettings,
+ loadSettings,
getActiveParamsPreset,
getActiveLlmPreset,
isModuleEnabled,
@@ -2366,4 +2433,9 @@ export {
generateNovelImage,
classifyError,
ErrorType,
+ PRESET_VERSION,
+ PROVIDER_MAP,
+ DEFAULT_LLM_PRESET,
+ abortGeneration,
+ isGenerating,
};