slvccans/ST-Amily2-Chat-Optimisation-SecFix
1
0
Fork 0
mirror of https://github.com/SilenceLurker/ST-Amily2-Chat-Optimisation.git synced 2026-06-07 10:35:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update cwb_apiService.js

Browse Source
This commit is contained in:
Wx-2025
2025-10-23 22:19:04 +08:00
committed by GitHub
parent d57221ee63
commit 4789d2da19
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
CharacterWorldBook/src/cwb_apiService.js
View File

@@ -3,6 +3,7 @@ import { logError, showToastr, escapeHtml } from './cwb_utils.js';
import { getRequestHeaders } from '/script.js'; import { getRequestHeaders } from '/script.js';
import { extensionName } from '../../utils/settings.js'; import { extensionName } from '../../utils/settings.js';
import { extension_settings, getContext } from "/scripts/extensions.js"; import { extension_settings, getContext } from "/scripts/extensions.js";
import { compatibleTriggerSlash } from '../../core/tavernhelper-compatibility.js';
function normalizeApiResponse(responseData) { function normalizeApiResponse(responseData) {
let data = responseData; let data = responseData;
@@ -51,10 +52,6 @@ function getCwbApiSettings() {
async function callCwbSillyTavernPreset(messages, options) { async function callCwbSillyTavernPreset(messages, options) {
console.log('[CWB-ST预设] 使用SillyTavern预设调用'); console.log('[CWB-ST预设] 使用SillyTavern预设调用');
if (!window.TavernHelper || !window.TavernHelper.triggerSlash) {
throw new Error('TavernHelper不可用，无法使用SillyTavern预设模式');
}
const context = getContext(); const context = getContext();
if (!context) { if (!context) {
throw new Error('无法获取SillyTavern上下文'); throw new Error('无法获取SillyTavern上下文');
@@ -69,7 +66,7 @@ async function callCwbSillyTavernPreset(messages, options) {
let responsePromise; let responsePromise;
try { try {
originalProfile = await window.TavernHelper.triggerSlash('/profile'); originalProfile = await compatibleTriggerSlash('/profile');
console.log(`[CWB-ST预设] 当前配置文件: ${originalProfile}`); console.log(`[CWB-ST预设] 当前配置文件: ${originalProfile}`);
const targetProfile = context.extensionSettings?.connectionManager?.profiles?.find(p => p.id === profileId); const targetProfile = context.extensionSettings?.connectionManager?.profiles?.find(p => p.id === profileId);
@@ -80,11 +77,11 @@ async function callCwbSillyTavernPreset(messages, options) {
const targetProfileName = targetProfile.name; const targetProfileName = targetProfile.name;
console.log(`[CWB-ST预设] 目标配置文件: ${targetProfileName}`); console.log(`[CWB-ST预设] 目标配置文件: ${targetProfileName}`);
const currentProfile = await window.TavernHelper.triggerSlash('/profile'); const currentProfile = await compatibleTriggerSlash('/profile');
if (currentProfile !== targetProfileName) { if (currentProfile !== targetProfileName) {
console.log(`[CWB-ST预设] 切换配置文件: ${currentProfile} -> ${targetProfileName}`); console.log(`[CWB-ST预设] 切换配置文件: ${currentProfile} -> ${targetProfileName}`);
const escapedProfileName = targetProfileName.replace(/"/g, '\\"'); const escapedProfileName = targetProfileName.replace(/"/g, '\\"');
await window.TavernHelper.triggerSlash(`/profile await=true "${escapedProfileName}"`); await compatibleTriggerSlash(`/profile await=true "${escapedProfileName}"`);
} }
if (!context.ConnectionManagerRequestService) { if (!context.ConnectionManagerRequestService) {
@@ -100,11 +97,11 @@ async function callCwbSillyTavernPreset(messages, options) {
} finally { } finally {
try { try {
const currentProfileAfterCall = await window.TavernHelper.triggerSlash('/profile'); const currentProfileAfterCall = await compatibleTriggerSlash('/profile');
if (originalProfile && originalProfile !== currentProfileAfterCall) { if (originalProfile && originalProfile !== currentProfileAfterCall) {
console.log(`[CWB-ST预设] 恢复原始配置文件: ${currentProfileAfterCall} -> ${originalProfile}`); console.log(`[CWB-ST预设] 恢复原始配置文件: ${currentProfileAfterCall} -> ${originalProfile}`);
const escapedOriginalProfile = originalProfile.replace(/"/g, '\\"'); const escapedOriginalProfile = originalProfile.replace(/"/g, '\\"');
await window.TavernHelper.triggerSlash(`/profile await=true "${escapedOriginalProfile}"`); await compatibleTriggerSlash(`/profile await=true "${escapedOriginalProfile}"`);
} }
} catch (restoreError) { } catch (restoreError) {
console.error('[CWB-ST预设] 恢复配置文件失败:', restoreError); console.error('[CWB-ST预设] 恢复配置文件失败:', restoreError);