Merge branch 'kwaroran:main' into main

src/ts/storage/database.ts

@@ -9,10 +9,12 @@ import { defaultAutoSuggestPrompt, defaultJailbreak, defaultMainPrompt } from '.
 import { alertNormal } from '../alert';
 import type { NAISettings } from '../process/models/nai';
 import { prebuiltNAIpresets } from '../process/templates/templates';
+import { defaultColorScheme, type ColorScheme } from '../gui/colorscheme';
+import type { Proompt } from '../process/proompt';
 
 export const DataBase = writable({} as any as Database)
 export const loadedStore = writable(false)
-export let appVer = '1.44.2'
+export let appVer = '1.45.0'
 export let webAppSubVer = ''
 
 export function setDatabase(data:Database){
@@ -294,6 +296,8 @@ export function setDatabase(data:Database){
     data.NAIsettings ??= cloneDeep(prebuiltNAIpresets)
     data.assetWidth ??= -1
     data.animationSpeed ??= 0.4
+    data.colorScheme ??= cloneDeep(defaultColorScheme)
+    data.colorSchemeName ??= 'default'
     
     changeLanguage(data.language)
     DataBase.set(data)
@@ -604,6 +608,9 @@ export interface Database{
     botSettingAtStart:false
     NAIsettings:NAISettings
     hideRealm:boolean
+    colorScheme:ColorScheme
+    colorSchemeName:string
+    promptTemplate?:Proompt[]
 }
 
 interface hordeConfig{
@@ -789,37 +796,6 @@ export const defaultSdDataFunc = () =>{
     return cloneDeep(defaultSdData)
 }
 
-export function updateTextTheme(){
-    let db = get(DataBase)
-    const root = document.querySelector(':root') as HTMLElement;
-    if(!root){
-        return
-    }
-    switch(db.textTheme){
-        case "standard":{
-            root.style.setProperty('--FontColorStandard', '#fafafa');
-            root.style.setProperty('--FontColorItalic', '#8C8D93');
-            root.style.setProperty('--FontColorBold', '#fafafa');
-            root.style.setProperty('--FontColorItalicBold', '#8C8D93');
-            break
-        }
-        case "highcontrast":{
-            root.style.setProperty('--FontColorStandard', '#f8f8f2');
-            root.style.setProperty('--FontColorItalic', '#F1FA8C');
-            root.style.setProperty('--FontColorBold', '#8BE9FD');
-            root.style.setProperty('--FontColorItalicBold', '#FFB86C');
-            break
-        }
-        case "custom":{
-            root.style.setProperty('--FontColorStandard', db.customTextTheme.FontColorStandard);
-            root.style.setProperty('--FontColorItalic', db.customTextTheme.FontColorItalic);
-            root.style.setProperty('--FontColorBold', db.customTextTheme.FontColorBold);
-            root.style.setProperty('--FontColorItalicBold', db.customTextTheme.FontColorItalicBold);
-            break
-        }
-    }
-}
-
 export function saveCurrentPreset(){
     let db = get(DataBase)
     let pres = db.botPresets

src/ts/storage/globalApi.ts

@@ -5,7 +5,7 @@ import { v4 as uuidv4 } from 'uuid';
 import { appDataDir, join } from "@tauri-apps/api/path";
 import { get } from "svelte/store";
 import {open} from '@tauri-apps/api/shell'
-import { DataBase, loadedStore, setDatabase, type Database, updateTextTheme, defaultSdDataFunc } from "./database";
+import { DataBase, loadedStore, setDatabase, type Database, defaultSdDataFunc } from "./database";
 import { appWindow } from "@tauri-apps/api/window";
 import { checkOldDomain, checkUpdate } from "../update";
 import { botMakerMode, selectedCharID } from "../stores";
@@ -21,6 +21,7 @@ import { loadRisuAccountData } from "../drive/accounter";
 import { decodeRisuSave, encodeRisuSave } from "./risuSave";
 import { AutoStorage } from "./autoStorage";
 import { updateAnimationSpeed } from "../gui/animation";
+import { updateColorScheme, updateTextTheme } from "../gui/colorscheme";
 
 //@ts-ignore
 export const isTauri = !!window.__TAURI__
@@ -425,6 +426,7 @@ export async function loadData() {
             }
             await checkNewFormat()
             const db = get(DataBase);
+            updateColorScheme()
             updateTextTheme()
             updateAnimationSpeed()
             if(db.botSettingAtStart){
@@ -441,6 +443,23 @@ export async function loadData() {
 
 const knownHostes = ["localhost","127.0.0.1"]
 
+export function addFetchLog(arg:{
+    body:any,
+    headers?:{[key:string]:string},
+    response:any,
+    success:boolean,
+    url:string
+}){
+    fetchLog.unshift({
+        body: JSON.stringify(arg.body, null, 2),
+        header: JSON.stringify(arg.headers ?? {}, null, 2),
+        response: JSON.stringify(arg.response, null, 2),
+        success: arg.success,
+        date: (new Date()).toLocaleTimeString(),
+        url: arg.url
+    })
+}
+
 export async function globalFetch(url:string, arg:{
     plainFetchForce?:boolean,
     body?:any,
@@ -492,6 +511,17 @@ export async function globalFetch(url:string, arg:{
     
         const urlHost = (new URL(url)).hostname
         let forcePlainFetch = (knownHostes.includes(urlHost) && (!isTauri)) || db.usePlainFetch || arg.plainFetchForce
+
+        console.log(urlHost)
+        //check if the url is a local url like localhost
+        if(urlHost.includes("localhost") || urlHost.includes("172.0.0.1") || urlHost.includes("0.0.0.0")){
+            return {
+                ok: false,
+                data: 'You are trying local request on web version. this is not allowed dude to browser security policy. use the desktop version instead, or use tunneling service like ngrok and set the cors to allow all.',
+                headers: {}
+            }
+        }
+
         if(forcePlainFetch){
             try {
                 let headers = arg.headers ?? {}