From 0f6246bef63caa2a935ad3a20915559bc9083d63 Mon Sep 17 00:00:00 2001 From: kwaroran Date: Fri, 25 Oct 2024 18:11:00 +0900 Subject: [PATCH] fix structuredclone --- src/lang/index.ts | 12 ++-- src/lib/ChatScreens/DefaultChatScreen.svelte | 10 ++-- .../Setting/Pages/CustomGUISettingMenu.svelte | 4 +- src/lib/Setting/botpreset.svelte | 2 +- src/lib/SideBars/DevTool.svelte | 2 +- src/lib/SideBars/SideChatList.svelte | 2 +- src/lib/SideBars/Sidebar.svelte | 2 +- src/main.ts | 8 +-- src/ts/characterCards.ts | 14 ++--- src/ts/drive/drive.ts | 2 +- src/ts/gui/colorscheme.ts | 6 +- src/ts/persona.ts | 2 +- src/ts/plugins/embedscript.ts | 2 +- src/ts/polyfill.ts | 57 +++++++++++-------- src/ts/process/index.ts | 18 +++--- src/ts/process/lorebook.ts | 2 +- src/ts/process/memory/supaMemory.ts | 2 +- src/ts/process/modules.ts | 4 +- src/ts/process/prompt.ts | 2 +- src/ts/process/request.ts | 4 +- src/ts/process/scripts.ts | 2 +- src/ts/process/templates/chatTemplate.ts | 2 +- src/ts/process/triggers.ts | 4 +- src/ts/realm.ts | 2 +- src/ts/storage/database.svelte.ts | 40 ++++++------- src/ts/sync/multiuser.ts | 6 +- src/vite-env.d.ts | 3 +- tsconfig.json | 2 +- 28 files changed, 114 insertions(+), 104 deletions(-) diff --git a/src/lang/index.ts b/src/lang/index.ts index 3ec2c78b..542215eb 100644 --- a/src/lang/index.ts +++ b/src/lang/index.ts @@ -13,22 +13,22 @@ export let language:typeof languageEnglish = languageEnglish export function changeLanguage(lang:string){ if(lang === 'cn'){ - language = merge(structuredClone(languageEnglish), languageChinese) + language = merge(safeStructuredClone(languageEnglish), languageChinese) } else if(lang === 'de'){ - language = merge(structuredClone(languageEnglish), languageGerman) + language = merge(safeStructuredClone(languageEnglish), languageGerman) } else if(lang === 'ko'){ - language = merge(structuredClone(languageEnglish), languageKorean) + language = merge(safeStructuredClone(languageEnglish), languageKorean) } else if(lang === 'vi'){ - language = merge(structuredClone(languageEnglish), LanguageVietnamese) + language = merge(safeStructuredClone(languageEnglish), LanguageVietnamese) } else if(lang === 'zh-Hant'){ - language = merge(structuredClone(languageEnglish), languageChineseTraditional) + language = merge(safeStructuredClone(languageEnglish), languageChineseTraditional) } else if(lang === 'es'){ - language = merge(structuredClone(languageEnglish), languageSpanish) + language = merge(safeStructuredClone(languageEnglish), languageSpanish) } else{ language = languageEnglish diff --git a/src/lib/ChatScreens/DefaultChatScreen.svelte b/src/lib/ChatScreens/DefaultChatScreen.svelte index 39b25c96..944654f1 100644 --- a/src/lib/ChatScreens/DefaultChatScreen.svelte +++ b/src/lib/ChatScreens/DefaultChatScreen.svelte @@ -141,7 +141,7 @@ if(rerollid < rerolls.length - 1){ if(Array.isArray(rerolls[rerollid + 1])){ rerollid += 1 - let rerollData = structuredClone(rerolls[rerollid]) + let rerollData = safeStructuredClone(rerolls[rerollid]) let msgs = DBState.db.characters[$selectedCharID].chats[DBState.db.characters[$selectedCharID].chatPage].message for(let i = 0; i < rerollData.length; i++){ msgs[msgs.length - rerollData.length + i] = rerollData[i] @@ -151,10 +151,10 @@ return } if(rerolls.length === 0){ - rerolls.push(structuredClone([DBState.db.characters[$selectedCharID].chats[DBState.db.characters[$selectedCharID].chatPage].message.at(-1)])) + rerolls.push(safeStructuredClone([DBState.db.characters[$selectedCharID].chats[DBState.db.characters[$selectedCharID].chatPage].message.at(-1)])) rerollid = rerolls.length - 1 } - let cha = structuredClone(DBState.db.characters[$selectedCharID].chats[DBState.db.characters[$selectedCharID].chatPage].message) + let cha = safeStructuredClone(DBState.db.characters[$selectedCharID].chats[DBState.db.characters[$selectedCharID].chatPage].message) if(cha.length === 0 ){ return } @@ -198,7 +198,7 @@ } if(Array.isArray(rerolls[rerollid - 1])){ rerollid -= 1 - let rerollData = structuredClone(rerolls[rerollid]) + let rerollData = safeStructuredClone(rerolls[rerollid]) let msgs = DBState.db.characters[$selectedCharID].chats[DBState.db.characters[$selectedCharID].chatPage].message for(let i = 0; i < rerollData.length; i++){ msgs[msgs.length - rerollData.length + i] = rerollData[i] @@ -220,7 +220,7 @@ continue:continued }) if(previousLength < DBState.db.characters[$selectedCharID].chats[DBState.db.characters[$selectedCharID].chatPage].message.length){ - rerolls.push(structuredClone(DBState.db.characters[$selectedCharID].chats[DBState.db.characters[$selectedCharID].chatPage].message).slice(previousLength)) + rerolls.push(safeStructuredClone(DBState.db.characters[$selectedCharID].chats[DBState.db.characters[$selectedCharID].chatPage].message).slice(previousLength)) rerollid = rerolls.length - 1 } } catch (error) { diff --git a/src/lib/Setting/Pages/CustomGUISettingMenu.svelte b/src/lib/Setting/Pages/CustomGUISettingMenu.svelte index c7548110..be5a327b 100644 --- a/src/lib/Setting/Pages/CustomGUISettingMenu.svelte +++ b/src/lib/Setting/Pages/CustomGUISettingMenu.svelte @@ -253,14 +253,14 @@ {#if subMenu === 0} {#each builtComponentTrees as component, i} {/each} {:else if subMenu === 1} {#each builtContainerTrees as container, i} {/each} diff --git a/src/lib/Setting/botpreset.svelte b/src/lib/Setting/botpreset.svelte index 3121c040..9df8870a 100644 --- a/src/lib/Setting/botpreset.svelte +++ b/src/lib/Setting/botpreset.svelte @@ -85,7 +85,7 @@