mincomk/risuai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix structuredclone

Browse Source
This commit is contained in:
kwaroran
2024-10-25 18:11:00 +09:00
parent b3fddb814e
commit 0f6246bef6
28 changed files with 114 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/lang/index.ts
View File

@@ -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

10
src/lib/ChatScreens/DefaultChatScreen.svelte
View File

@@ -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) {

4
src/lib/Setting/Pages/CustomGUISettingMenu.svelte
View File

@@ -253,14 +253,14 @@
{#if subMenu === 0}
{#each builtComponentTrees as component, i}
<button class="p-2 border border-black rounded" onclick={() => {
addContainerToTree(structuredClone(component), selectedContatiner)
addContainerToTree(safeStructuredClone(component), selectedContatiner)
renderMainTree(tree)
}}>{component.type}</button>
{/each}
{:else if subMenu === 1}
{#each builtContainerTrees as container, i}
<button class="p-2 border border-black rounded" onclick={() => {
addContainerToTree(structuredClone(container), selectedContatiner)
addContainerToTree(safeStructuredClone(container), selectedContatiner)
renderMainTree(tree)
}}>{container.type}</button>
{/each}

2
src/lib/Setting/botpreset.svelte
View File

@@ -85,7 +85,7 @@
<div class="flex mt-2 items-center">
<button class="text-textcolor2 hover:text-green-500 cursor-pointer mr-1" onclick={() => {
let botPresets = DBState.db.botPresets
let newPreset = structuredClone(prebuiltPresets.OAI2)
let newPreset = safeStructuredClone(prebuiltPresets.OAI2)
newPreset.name = `New Preset`
botPresets.push(newPreset)

2
src/lib/SideBars/DevTool.svelte
View File

@@ -38,7 +38,7 @@
"system": "⚙️ System",
"assistant": "✨ Assistant",
}
let formated = structuredClone(previewFormated)
let formated = safeStructuredClone(previewFormated)
if(previewJoin === 'yes'){
let newFormated = []

2
src/lib/SideBars/SideChatList.svelte
View File

@@ -107,7 +107,7 @@
const option = await alertChatOptions()
switch(option){
case 0:{
const newChat = structuredClone($state.snapshot(chara.chats[i]))
const newChat = safeStructuredClone($state.snapshot(chara.chats[i]))
newChat.name = `Copy of ${newChat.name}`
chara.chats.unshift(newChat)
chara.chatPage = 0

2
src/lib/SideBars/Sidebar.svelte
View File

@@ -137,7 +137,7 @@
const da = db.characterOrder[mainIndex.index]
if(typeof(da) !== 'string'){
mainId = da.id
movingFolder = structuredClone($state.snapshot(da))
movingFolder = safeStructuredClone($state.snapshot(da))
if(targetIndex.folder){
return
}

6
src/main.ts
View File

@@ -1,10 +1,10 @@
import "./styles.css";
import "./ts/polyfill";
import "core-js/actual"
import "./ts/storage/database.svelte"
import App from "./App.svelte";
import { loadData } from "./ts/storage/globalApi";
import { initHotkey } from "./ts/hotkey";
import { polyfill } from "./ts/polyfill";
import { preLoadCheck } from "./preload";
import { mount } from "svelte";
@@ -25,12 +25,10 @@ export const removeDefaultHandler = () => {
window.removeEventListener('unhandledrejection', rejectHandler)
}
let app: App;
let app: any;
if(preLoadCheck()){
try {
polyfill()
app = mount(App, {
target: document.getElementById("app"),
});

14
src/ts/characterCards.ts
View File

@@ -569,7 +569,7 @@ function convertOffSpecCards(charaData:OldTavernChar|CharacterCardV2Risu, imgp:s
export async function exportChar(charaID:number):Promise<string> {
const db = getDatabase({snapshot: true})
let char = structuredClone(db.characters[charaID])
let char = safeStructuredClone(db.characters[charaID])
if(char.type === 'group'){
return ''
@@ -607,7 +607,7 @@ async function importCharacterCardSpec(card:CharacterCardV2Risu|CharacterCardV3,
let im = img ? await saveAsset(await reencodeImage(img)) : undefined
let db = getDatabase()
const risuext = structuredClone(data.extensions.risuai)
const risuext = safeStructuredClone(data.extensions.risuai)
let emotions:[string, string][] = []
let bias:[string, number][] = []
let viewScreen: "none" | "emotion" | "imggen" = 'none'
@@ -827,7 +827,7 @@ async function importCharacterCardSpec(card:CharacterCardV2Risu|CharacterCardV3,
}
let ext = structuredClone(data?.extensions ?? {})
let ext = safeStructuredClone(data?.extensions ?? {})
for(const key in ext){
if(key === 'risuai'){
@@ -931,7 +931,7 @@ async function createBaseV2(char:character) {
key:string
data:string[]
}
} = structuredClone(lore.extentions ?? {})
} = safeStructuredClone(lore.extentions ?? {})
let caseSensitive = ext.risu_case_sensitive ?? false
ext.risu_activationPercent = lore.activationPercent
@@ -1261,7 +1261,7 @@ export function createBaseV3(char:character){
uri: string
name: string
ext: string
}> = structuredClone(char.ccAssets ?? [])
}> = safeStructuredClone(char.ccAssets ?? [])
if(char.additionalAssets){
for(const asset of char.additionalAssets){
@@ -1300,7 +1300,7 @@ export function createBaseV3(char:character){
key:string
data:string[]
}
} = structuredClone(lore.extentions ?? {})
} = safeStructuredClone(lore.extentions ?? {})
let caseSensitive = ext.risu_case_sensitive ?? false
ext.risu_activationPercent = lore.activationPercent
@@ -1400,7 +1400,7 @@ export async function shareRisuHub2(char:character, arg:{
update: boolean
}) {
try {
char = structuredClone(char)
char = safeStructuredClone(char)
char.license = arg.license
let tagList = arg.tag.split(',')

2
src/ts/drive/drive.ts
View File

@@ -108,7 +108,7 @@ let BackupDb:Database = null
export async function syncDrive() {
BackupDb = structuredClone(getDatabase())
BackupDb = safeStructuredClone(getDatabase())
return
}

6
src/ts/gui/colorscheme.ts
View File

@@ -117,7 +117,7 @@ export const colorSchemeList = Object.keys(colorShemes) as (keyof typeof colorSh
export function changeColorScheme(colorScheme: string){
let db = getDatabase()
if(colorScheme !== 'custom'){
db.colorScheme = structuredClone(colorShemes[colorScheme])
db.colorScheme = safeStructuredClone(colorShemes[colorScheme])
}
db.colorSchemeName = colorScheme
setDatabase(db)
@@ -130,11 +130,11 @@ export function updateColorScheme(){
let colorScheme = db.colorScheme
if(colorScheme == null){
colorScheme = structuredClone(defaultColorScheme)
colorScheme = safeStructuredClone(defaultColorScheme)
}
if(get(isLite)){
colorScheme = structuredClone(colorShemes.lite)
colorScheme = safeStructuredClone(colorShemes.lite)
}
//set css variables

2
src/ts/persona.ts
View File

@@ -69,7 +69,7 @@ export async function exportUserPersona(){
let img = await readImage(db.userIcon)
let card:PersonaCard = structuredClone({
let card:PersonaCard = safeStructuredClone({
name: db.username,
personaPrompt: db.personaPrompt,
})

2
src/ts/plugins/embedscript.ts
View File

@@ -82,7 +82,7 @@ addWorkerFunction('getChat', async () => {
})
const selectedChar = get(selectedCharID)
const char = db.characters[selectedChar]
return structuredClone(char.chats[char.chatPage].message)
return safeStructuredClone(char.chats[char.chatPage].message)
})
addWorkerFunction('setChat', async (data:Message[]) => {

15
src/ts/polyfill.ts
View File

@@ -3,7 +3,14 @@ import { Buffer as BufferPolyfill } from 'buffer'
import { polyfill as dragPolyfill} from "mobile-drag-drop"
import {scrollBehaviourDragImageTranslateOverride} from 'mobile-drag-drop/scroll-behaviour'
export function polyfill() {
function safeStructuredClone<T>(data:T):T{
try {
return structuredClone(data)
} catch (error) {
return JSON.parse(JSON.stringify(data))
}
}
try {
const testDom = document.createElement('div');
const supports = ('draggable' in testDom) || ('ondragstart' in testDom && 'ondrop' in testDom);
@@ -22,9 +29,13 @@ export function polyfill() {
} catch (error) {
}
globalThis.safeStructuredClone = safeStructuredClone
globalThis.Buffer = BufferPolyfill
//@ts-ignore
globalThis.WritableStream = globalThis.WritableStream ?? WritableStream
//@ts-ignore
globalThis.ReadableStream = globalThis.ReadableStream ?? ReadableStream
//@ts-ignore
globalThis.TransformStream = globalThis.TransformStream ?? TransformStream
}

18
src/ts/process/index.ts
View File

@@ -229,7 +229,7 @@ export async function sendChat(chatProcessIndex = -1,arg:{
'personaPrompt':([] as OpenAIChat[])
}
let promptTemplate = structuredClone(db.promptTemplate)
let promptTemplate = safeStructuredClone(db.promptTemplate)
const usingPromptTemplate = !!promptTemplate
if(promptTemplate){
let hasPostEverything = false
@@ -466,7 +466,7 @@ export async function sendChat(chatProcessIndex = -1,arg:{
for(const card of template){
switch(card.type){
case 'persona':{
let pmt = structuredClone(unformated.personaPrompt)
let pmt = safeStructuredClone(unformated.personaPrompt)
if(card.innerFormat && pmt.length > 0){
for(let i=0;i<pmt.length;i++){
pmt[i].content = risuChatParser(positionParser(card.innerFormat), {chara: currentChar}).replace('{{slot}}', pmt[i].content)
@@ -477,7 +477,7 @@ export async function sendChat(chatProcessIndex = -1,arg:{
break
}
case 'description':{
let pmt = structuredClone(unformated.description)
let pmt = safeStructuredClone(unformated.description)
if(card.innerFormat && pmt.length > 0){
for(let i=0;i<pmt.length;i++){
pmt[i].content = risuChatParser(positionParser(card.innerFormat), {chara: currentChar}).replace('{{slot}}', pmt[i].content)
@@ -488,7 +488,7 @@ export async function sendChat(chatProcessIndex = -1,arg:{
break
}
case 'authornote':{
let pmt = structuredClone(unformated.authorNote)
let pmt = safeStructuredClone(unformated.authorNote)
if(card.innerFormat && pmt.length > 0){
for(let i=0;i<pmt.length;i++){
pmt[i].content = risuChatParser(positionParser(card.innerFormat), {chara: currentChar}).replace('{{slot}}', pmt[i].content || card.defaultText || '')
@@ -883,7 +883,7 @@ export async function sendChat(chatProcessIndex = -1,arg:{
//make into one
let formated:OpenAIChat[] = []
const formatOrder = structuredClone(db.formatingOrder)
const formatOrder = safeStructuredClone(db.formatingOrder)
if(formatOrder){
formatOrder.push('postEverything')
}
@@ -927,7 +927,7 @@ export async function sendChat(chatProcessIndex = -1,arg:{
for(const card of template){
switch(card.type){
case 'persona':{
let pmt = structuredClone(unformated.personaPrompt)
let pmt = safeStructuredClone(unformated.personaPrompt)
if(card.innerFormat && pmt.length > 0){
for(let i=0;i<pmt.length;i++){
pmt[i].content = risuChatParser(positionParser(card.innerFormat), {chara: currentChar}).replace('{{slot}}', pmt[i].content)
@@ -938,7 +938,7 @@ export async function sendChat(chatProcessIndex = -1,arg:{
break
}
case 'description':{
let pmt = structuredClone(unformated.description)
let pmt = safeStructuredClone(unformated.description)
if(card.innerFormat && pmt.length > 0){
for(let i=0;i<pmt.length;i++){
pmt[i].content = risuChatParser(positionParser(card.innerFormat), {chara: currentChar}).replace('{{slot}}', pmt[i].content)
@@ -949,7 +949,7 @@ export async function sendChat(chatProcessIndex = -1,arg:{
break
}
case 'authornote':{
let pmt = structuredClone(unformated.authorNote)
let pmt = safeStructuredClone(unformated.authorNote)
if(card.innerFormat && pmt.length > 0){
for(let i=0;i<pmt.length;i++){
pmt[i].content = risuChatParser(positionParser(card.innerFormat), {chara: currentChar}).replace('{{slot}}', pmt[i].content || card.defaultText || '')
@@ -1041,7 +1041,7 @@ export async function sendChat(chatProcessIndex = -1,arg:{
break
}
case 'memory':{
let pmt = structuredClone(memories)
let pmt = safeStructuredClone(memories)
if(card.innerFormat && pmt.length > 0){
for(let i=0;i<pmt.length;i++){
pmt[i].content = risuChatParser(card.innerFormat, {chara: currentChar}).replace('{{slot}}', pmt[i].content)

2
src/ts/process/lorebook.ts
View File

@@ -214,7 +214,7 @@ export async function loadLoreBookV3Prompt(){
const characterLore = char.globalLore ?? []
const chatLore = char.chats[page].localLore ?? []
const moduleLorebook = getModuleLorebooks()
const fullLore = structuredClone(characterLore.concat(chatLore).concat(moduleLorebook))
const fullLore = safeStructuredClone(characterLore.concat(chatLore).concat(moduleLorebook))
const currentChat = char.chats[page].message
const loreDepth = char.loreSettings?.scanDepth ?? db.loreBookDepth
const loreToken = char.loreSettings?.tokenBudget ?? db.loreBookToken

2
src/ts/process/memory/supaMemory.ts
View File

@@ -73,7 +73,7 @@ export async function supaMemory(
for(let j=0;j<HypaData.length;j++){
let i =0;
let countTokens = currentTokens
let countChats = structuredClone(chats)
let countChats = safeStructuredClone(chats)
while(true){
if(countChats.length === 0){
break

4
src/ts/process/modules.ts
View File

@@ -44,7 +44,7 @@ export async function exportModule(module:RisuModule, arg:{
}
const assets = module.assets ?? []
module = structuredClone(module)
module = safeStructuredClone(module)
module.assets ??= []
module.assets = module.assets.map((asset) => {
return [asset[0], '', asset[2]] as [string,string,string]
@@ -360,7 +360,7 @@ export async function applyModule() {
return
}
const module = structuredClone(getModuleById(sel))
const module = safeStructuredClone(getModuleById(sel))
if (!module) {
return
}

2
src/ts/process/prompt.ts
View File

@@ -256,7 +256,7 @@ export const OobaParams = [
]
export function promptConvertion(files:{ name: string, content: string, type:string }[]){
let preset = structuredClone(presetTemplate)
let preset = safeStructuredClone(presetTemplate)
let instData = {
"system_prompt": "",
"input_sequence": "",

4
src/ts/process/request.ts
View File

@@ -179,7 +179,7 @@ export interface OpenAIChatExtra {
export async function requestChatDataMain(arg:requestDataArgument, model:'model'|'submodel', abortSignal:AbortSignal=null):Promise<requestDataResponse> {
const db = getDatabase()
let formated = structuredClone(arg.formated)
let formated = safeStructuredClone(arg.formated)
let maxTokens = arg.maxTokens ??db.maxResponse
let temperature = arg.temperature ?? (db.temperature / 100)
let bias = arg.bias
@@ -245,7 +245,7 @@ export async function requestChatDataMain(arg:requestDataArgument, model:'model'
for(let i=0;i<formated.length;i++){
const m = formated[i]
if(m.multimodals && m.multimodals.length > 0 && m.role === 'user'){
let v:OpenAIChatExtra = structuredClone(m)
let v:OpenAIChatExtra = safeStructuredClone(m)
let contents:OpenAIContents[] = []
for(let j=0;j<m.multimodals.length;j++){
contents.push({

2
src/ts/process/scripts.ts
View File

@@ -231,7 +231,7 @@ export async function processScriptFull(char:character|groupChat|simpleCharacter
for (const script of scripts){
if(script.ableFlag && script.flag?.includes('<')){
const rregex = /<(.+?)>/g
const scriptData = structuredClone(script)
const scriptData = safeStructuredClone(script)
let order = 0
const actions:string[] = []
scriptData.flag = scriptData.flag?.replace(rregex, (v:string, p1:string) => {

2
src/ts/process/templates/chatTemplate.ts
View File

@@ -34,7 +34,7 @@ export const applyChatTemplate = (messages:OpenAIChat[], arg:{
if(!type){
throw new Error('Template type is not set')
}
let clonedMessages = structuredClone(messages)
let clonedMessages = safeStructuredClone(messages)
const template = type === 'jinja' ? (new Template(arg.custom ?? db.JinjaTemplate)) :(new Template(chatTemplates[type]))
let formatedMessages:{
"role": 'user'|'assistant'|'system',

4
src/ts/process/triggers.ts
View File

@@ -152,7 +152,7 @@ export async function runTrigger(char:character,mode:triggerMode, arg:{
manualName?: string
}){
arg.recursiveCount ??= 0
char = structuredClone(char)
char = safeStructuredClone(char)
let varChanged = false
let stopSending = arg.stopSending ?? false
const CharacterlowLevelAccess = char.lowLevelAccess ?? false
@@ -169,7 +169,7 @@ export async function runTrigger(char:character,mode:triggerMode, arg:{
}).concat(getModuleTriggers())
const db = getDatabase()
const defaultVariables = parseKeyValue(char.defaultVariables).concat(parseKeyValue(db.templateDefaultVariables))
let chat = structuredClone(arg.chat ?? char.chats[char.chatPage])
let chat = safeStructuredClone(arg.chat ?? char.chats[char.chatPage])
if((!triggers) || (triggers.length === 0)){
return null
}

2
src/ts/realm.ts
View File

@@ -15,7 +15,7 @@ window.addEventListener("message", (event) => {
});
export async function shareRealmCardData():Promise<{ name: ArrayBuffer; data: ArrayBuffer; }> {
const char = structuredClone(getCurrentCharacter({snapshot:true})) as character
const char = safeStructuredClone(getCurrentCharacter({snapshot:true})) as character
const trimedName = char.name.replace(/[^a-zA-Z0-9]/g, '') || 'character';
const writer = new VirtualWriter()
const namebuf = new TextEncoder().encode(trimedName + '.png')

40
src/ts/storage/database.svelte.ts
View File

@@ -319,16 +319,16 @@ export function setDatabase(data:Database){
largePortrait: false
}]
data.classicMaxWidth ??= false
data.ooba ??= structuredClone(defaultOoba)
data.ainconfig ??= structuredClone(defaultAIN)
data.ooba ??= safeStructuredClone(defaultOoba)
data.ainconfig ??= safeStructuredClone(defaultAIN)
data.openrouterKey ??= ''
data.openrouterRequestModel ??= 'openai/gpt-3.5-turbo'
data.toggleConfirmRecommendedPreset ??= true
data.officialplugins ??= {}
data.NAIsettings ??= structuredClone(prebuiltNAIpresets)
data.NAIsettings ??= safeStructuredClone(prebuiltNAIpresets)
data.assetWidth ??= -1
data.animationSpeed ??= 0.4
data.colorScheme ??= structuredClone(defaultColorScheme)
data.colorScheme ??= safeStructuredClone(defaultColorScheme)
data.colorSchemeName ??= 'default'
data.NAIsettings.starter ??= ""
data.hypaModel ??= 'MiniLM'
@@ -1304,8 +1304,8 @@ export const presetTemplate:botPreset = {
promptPreprocess: false,
proxyKey: '',
bias: [],
ooba: structuredClone(defaultOoba),
ainconfig: structuredClone(defaultAIN),
ooba: safeStructuredClone(defaultOoba),
ainconfig: safeStructuredClone(defaultAIN),
reverseProxyOobaArgs: {
mode: 'instruct'
},
@@ -1324,7 +1324,7 @@ const defaultSdData:[string,string][] = [
]
export const defaultSdDataFunc = () =>{
return structuredClone(defaultSdData)
return safeStructuredClone(defaultSdData)
}
export function saveCurrentPreset(){
@@ -1354,20 +1354,20 @@ export function saveCurrentPreset(){
bias: db.bias,
koboldURL: db.koboldURL,
proxyKey: db.proxyKey,
ooba: structuredClone(db.ooba),
ainconfig: structuredClone(db.ainconfig),
ooba: safeStructuredClone(db.ooba),
ainconfig: safeStructuredClone(db.ainconfig),
proxyRequestModel: db.proxyRequestModel,
openrouterRequestModel: db.openrouterRequestModel,
NAISettings: structuredClone(db.NAIsettings),
NAISettings: safeStructuredClone(db.NAIsettings),
promptTemplate: db.promptTemplate ?? null,
NAIadventure: db.NAIadventure ?? false,
NAIappendName: db.NAIappendName ?? false,
localStopStrings: db.localStopStrings,
autoSuggestPrompt: db.autoSuggestPrompt,
customProxyRequestModel: db.customProxyRequestModel,
reverseProxyOobaArgs: structuredClone(db.reverseProxyOobaArgs) ?? null,
reverseProxyOobaArgs: safeStructuredClone(db.reverseProxyOobaArgs) ?? null,
top_p: db.top_p ?? 1,
promptSettings: structuredClone(db.promptSettings) ?? null,
promptSettings: safeStructuredClone(db.promptSettings) ?? null,
repetition_penalty: db.repetition_penalty,
min_p: db.min_p,
top_a: db.top_a,
@@ -1394,7 +1394,7 @@ export function copyPreset(id:number){
saveCurrentPreset()
let db = getDatabase()
let pres = db.botPresets
const newPres = structuredClone(pres[id])
const newPres = safeStructuredClone(pres[id])
newPres.name += " Copy"
db.botPresets.push(newPres)
setDatabase(db)
@@ -1434,8 +1434,8 @@ export function setPreset(db:Database, newPres: botPreset){
db.bias = newPres.bias ?? db.bias
db.koboldURL = newPres.koboldURL ?? db.koboldURL
db.proxyKey = newPres.proxyKey ?? db.proxyKey
db.ooba = structuredClone(newPres.ooba ?? db.ooba)
db.ainconfig = structuredClone(newPres.ainconfig ?? db.ainconfig)
db.ooba = safeStructuredClone(newPres.ooba ?? db.ooba)
db.ainconfig = safeStructuredClone(newPres.ainconfig ?? db.ainconfig)
db.openrouterRequestModel = newPres.openrouterRequestModel ?? db.openrouterRequestModel
db.proxyRequestModel = newPres.proxyRequestModel ?? db.proxyRequestModel
db.NAIsettings = newPres.NAISettings ?? db.NAIsettings
@@ -1450,12 +1450,12 @@ export function setPreset(db:Database, newPres: botPreset){
db.NAIsettings.mirostat_lr ??= 1
db.localStopStrings = newPres.localStopStrings
db.customProxyRequestModel = newPres.customProxyRequestModel ?? ''
db.reverseProxyOobaArgs = structuredClone(newPres.reverseProxyOobaArgs) ?? {
db.reverseProxyOobaArgs = safeStructuredClone(newPres.reverseProxyOobaArgs) ?? {
mode: 'instruct'
}
db.top_p = newPres.top_p ?? 1
//@ts-ignore //for legacy mistpings
db.promptSettings = structuredClone(newPres.promptSettings) ?? {
db.promptSettings = safeStructuredClone(newPres.promptSettings) ?? {
assistantPrefill: '',
postEndInnerFormat: '',
sendChatAsSystem: false,
@@ -1493,7 +1493,7 @@ import { selectedCharID } from '../stores';
export async function downloadPreset(id:number, type:'json'|'risupreset'|'return' = 'json'){
saveCurrentPreset()
let db = getDatabase()
let pres = structuredClone(db.botPresets[id])
let pres = safeStructuredClone(db.botPresets[id])
console.log(pres)
pres.openAIKey = ''
pres.forceReplaceUrl = ''
@@ -1566,7 +1566,7 @@ export async function importPreset(f:{
let db = getDatabase()
if(pre.presetVersion && pre.presetVersion >= 3){
//NAI preset
const pr = structuredClone(prebuiltPresets.NAI2)
const pr = safeStructuredClone(prebuiltPresets.NAI2)
pr.temperature = pre.parameters.temperature * 100
pr.maxResponse = pre.parameters.max_length
pr.NAISettings.topK = pre.parameters.top_k
@@ -1591,7 +1591,7 @@ export async function importPreset(f:{
if(Array.isArray(pre?.prompt_order?.[0]?.order) && Array.isArray(pre?.prompts)){
//ST preset
const pr = structuredClone(presetTemplate)
const pr = safeStructuredClone(presetTemplate)
pr.promptTemplate = []
function findPrompt(identifier:number){

6
src/ts/sync/multiuser.ts
View File

@@ -83,7 +83,7 @@ export async function createMultiuserRoom(){
snapshot: true
})
const selectedCharId = get(selectedCharID)
const char = structuredClone(db.characters[selectedCharId])
const char = safeStructuredClone(db.characters[selectedCharId])
if(char.type === 'group'){
return
}
@@ -133,7 +133,7 @@ export async function createMultiuserRoom(){
snapshot: true
})
const selectedCharId = get(selectedCharID)
const char = structuredClone(db.characters[selectedCharId])
const char = safeStructuredClone(db.characters[selectedCharId])
const recivedChar = data.data
if(char.type === 'group'){
return
@@ -317,7 +317,7 @@ export async function joinMultiuserRoom(){
snapshot: true
})
const selectedCharId = get(selectedCharID)
const char = structuredClone(db.characters[selectedCharId])
const char = safeStructuredClone(db.characters[selectedCharId])
char.chats[char.chatPage] = data.data
db.characters[selectedCharId] = char
latestSyncChat = data.data

1
src/vite-env.d.ts vendored
View File

@@ -3,3 +3,4 @@
declare var Buffer: BufferConstructor
declare var safeStructuredClone: <T>(data: T) => T

2
tsconfig.json
View File

@@ -1,6 +1,6 @@
{
"compilerOptions": {
"target": "ES2022",
"target": "ES2023",
"useDefineForClassFields": true,
"module": "ES2022",
"moduleResolution": "node",