change globalApi path

src/ts/alert.ts

@@ -1,7 +1,7 @@
 import { get, writable } from "svelte/store"
 import { sleep } from "./util"
 import { language } from "../lang"
-import { isNodeServer, isTauri } from "./storage/globalApi"
+import { isNodeServer, isTauri } from "./globalApi"
 import { Capacitor } from "@capacitor/core"
 import { getDatabase, type MessageGenerationInfo } from "./storage/database.svelte"
 import { alertStore as alertStoreImported } from "./stores"

src/ts/characterCards.ts

@@ -5,7 +5,7 @@ import { checkNullish, decryptBuffer, encryptBuffer, isKnownUri, selectFileByDom
 import { language } from "src/lang"
 import { v4 as uuidv4, v4 } from 'uuid';
 import { characterFormatUpdate } from "./characters"
-import { AppendableBuffer, BlankWriter, checkCharOrder, downloadFile, isNodeServer, isTauri, loadAsset, LocalWriter, openURL, readImage, saveAsset, VirtualWriter } from "./storage/globalApi"
+import { AppendableBuffer, BlankWriter, checkCharOrder, downloadFile, isNodeServer, isTauri, loadAsset, LocalWriter, openURL, readImage, saveAsset, VirtualWriter } from "./globalApi"
 import { SettingsMenuIndex, ShowRealmFrameStore, selectedCharID, settingsOpen } from "./stores"
 import { convertImage, hasher } from "./parser.svelte"
 import { CCardLib, type CharacterCardV3, type LorebookEntry } from '@risuai/ccardlib'

src/ts/characters.ts

@@ -6,7 +6,7 @@ import { decode as decodeMsgpack } from "msgpackr";
 import { checkNullish, findCharacterbyId, getUserName, selectMultipleFile, selectSingleFile, sleep } from "./util";
 import { v4 as uuidv4 } from 'uuid';
 import { MobileGUIStack, OpenRealmStore, selectedCharID } from "./stores";
-import { checkCharOrder, downloadFile, getFileSrc } from "./storage/globalApi";
+import { checkCharOrder, downloadFile, getFileSrc } from "./globalApi";
 import { reencodeImage } from "./process/files/image";
 import { updateInlayScreen } from "./process/inlayScreen";
 import { PngChunk } from "./pngChunk";

src/ts/creation/creator.ts

@@ -1,7 +1,7 @@
 import { language } from "src/lang";
 import { alertError, alertInput, alertNormal, alertSelect, alertStore } from "../alert";
 import { requestChatData } from "../process/request";
-import { checkCharOrder, globalFetch, isNodeServer, isTauri, saveAsset } from "../storage/globalApi";
+import { checkCharOrder, globalFetch, isNodeServer, isTauri, saveAsset } from "../globalApi";
 import { tokenize } from "../tokenizer";
 import { createBlankChar } from "../characters";
 import { getDatabase, setDatabase, type character } from "../storage/database.svelte";

src/ts/drive/backuplocal.ts

@@ -1,6 +1,6 @@
 import { BaseDirectory, readFile, readDir, writeFile } from "@tauri-apps/plugin-fs";
 import { alertError, alertNormal, alertStore, alertWait } from "../alert";
-import { LocalWriter, forageStorage, isTauri } from "../storage/globalApi";
+import { LocalWriter, forageStorage, isTauri } from "../globalApi";
 import { decodeRisuSave, encodeRisuSave } from "../storage/risuSave";
 import { getDatabase, setDatabaseLite } from "../storage/database.svelte";
 import { relaunch } from "@tauri-apps/plugin-process";

src/ts/drive/drive.ts

@@ -1,6 +1,6 @@
 import { alertError, alertInput, alertNormal, alertSelect, alertStore } from "../alert";
 import { getDatabase, type Database } from "../storage/database.svelte";
-import { forageStorage, getUnpargeables, isTauri, openURL } from "../storage/globalApi";
+import { forageStorage, getUnpargeables, isTauri, openURL } from "../globalApi";
 import { BaseDirectory, exists, readFile, readDir, writeFile } from "@tauri-apps/plugin-fs";
 import { language } from "../../lang";
 import { relaunch } from '@tauri-apps/plugin-process';

src/ts/globalApi.ts

@@ -7,41 +7,41 @@ import {
     readDir,
     remove
 } from "@tauri-apps/plugin-fs"
-import { changeFullscreen, checkNullish, findCharacterbyId, sleep } from "../util"
+import { changeFullscreen, checkNullish, findCharacterbyId, sleep } from "./util"
 import { convertFileSrc, invoke } from "@tauri-apps/api/core"
 import { v4 as uuidv4, v4 } from 'uuid';
 import { appDataDir, join } from "@tauri-apps/api/path";
 import { get } from "svelte/store";
 import {open} from '@tauri-apps/plugin-shell'
-import { setDatabase, type Database, defaultSdDataFunc, getDatabase } from "./database.svelte";
+import { setDatabase, type Database, defaultSdDataFunc, getDatabase } from "./storage/database.svelte";
 import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
-import { checkRisuUpdate } from "../update";
-import { MobileGUI, botMakerMode, selectedCharID, loadedStore } from "../stores";
-import { loadPlugins } from "../plugins/plugins";
-import { alertConfirm, alertError, alertNormal, alertNormalWait, alertSelect, alertTOS, alertWait } from "../alert";
-import { checkDriverInit, syncDrive } from "../drive/drive";
-import { hasher } from "../parser.svelte";
-import { characterURLImport, hubURL } from "../characterCards";
-import { defaultJailbreak, defaultMainPrompt, oldJailbreak, oldMainPrompt } from "./defaultPrompts";
-import { loadRisuAccountData } from "../drive/accounter";
-import { decodeRisuSave, encodeRisuSave } from "./risuSave";
-import { AutoStorage } from "./autoStorage";
-import { updateAnimationSpeed } from "../gui/animation";
-import { updateColorScheme, updateTextThemeAndCSS } from "../gui/colorscheme";
-import { saveDbKei } from "../kei/backup";
+import { checkRisuUpdate } from "./update";
+import { MobileGUI, botMakerMode, selectedCharID, loadedStore } from "./stores";
+import { loadPlugins } from "./plugins/plugins";
+import { alertConfirm, alertError, alertNormal, alertNormalWait, alertSelect, alertTOS, alertWait } from "./alert";
+import { checkDriverInit, syncDrive } from "./drive/drive";
+import { hasher } from "./parser.svelte";
+import { characterURLImport, hubURL } from "./characterCards";
+import { defaultJailbreak, defaultMainPrompt, oldJailbreak, oldMainPrompt } from "./storage/defaultPrompts";
+import { loadRisuAccountData } from "./drive/accounter";
+import { decodeRisuSave, encodeRisuSave } from "./storage/risuSave";
+import { AutoStorage } from "./storage/autoStorage";
+import { updateAnimationSpeed } from "./gui/animation";
+import { updateColorScheme, updateTextThemeAndCSS } from "./gui/colorscheme";
+import { saveDbKei } from "./kei/backup";
 import { Capacitor, CapacitorHttp } from '@capacitor/core';
 import * as CapFS from '@capacitor/filesystem'
 import { save } from "@tauri-apps/plugin-dialog";
-import type { RisuModule } from "../process/modules";
+import type { RisuModule } from "./process/modules";
 import { listen } from '@tauri-apps/api/event'
 import { registerPlugin } from '@capacitor/core';
 import { language } from "src/lang";
-import { startObserveDom } from "../observer";
+import { startObserveDom } from "./observer";
 import { removeDefaultHandler } from "src/main";
-import { updateGuisize } from "../gui/guisize";
-import { encodeCapKeySafe } from "./mobileStorage";
-import { updateLorebooks } from "../characters";
-import { initMobileGesture } from "../hotkey";
+import { updateGuisize } from "./gui/guisize";
+import { encodeCapKeySafe } from "./storage/mobileStorage";
+import { updateLorebooks } from "./characters";
+import { initMobileGesture } from "./hotkey";
 import { fetch as TauriHTTPFetch } from '@tauri-apps/plugin-http';
 
 //@ts-ignore

src/ts/gui/colorscheme.ts

@@ -1,6 +1,6 @@
 import { get, writable } from "svelte/store";
 import { getDatabase, setDatabase } from "../storage/database.svelte";
-import { downloadFile } from "../storage/globalApi";
+import { downloadFile } from "../globalApi";
 import { BufferToText, selectSingleFile } from "../util";
 import { alertError } from "../alert";
 import { isLite } from "../lite";

src/ts/parser.svelte.ts

@@ -1,7 +1,7 @@
 import DOMPurify from 'isomorphic-dompurify';
 import markdownit from 'markdown-it'
 import { getCurrentCharacter, DBState, type Database, type Message, type character, type customscript, type groupChat, type triggerscript } from './storage/database.svelte';
-import { getFileSrc } from './storage/globalApi';
+import { getFileSrc } from './globalApi';
 import { processScriptFull } from './process/scripts';
 import { get } from 'svelte/store';
 import css, { type CssAtRuleAST } from '@adobe/css-tools'

src/ts/persona.ts

@@ -2,7 +2,7 @@ import { get } from "svelte/store"
 import { getDatabase, saveImage, setDatabase } from "./storage/database.svelte"
 import { getUserName, selectSingleFile, sleep } from "./util"
 import { alertError, alertNormal, alertStore } from "./alert"
-import { downloadFile, readImage } from "./storage/globalApi"
+import { downloadFile, readImage } from "./globalApi"
 import { language } from "src/lang"
 import { reencodeImage } from "./process/files/image"
 import { PngChunk } from "./pngChunk"

src/ts/plugins/plugins.ts

@@ -4,7 +4,7 @@ import { alertError } from "../alert";
 import { getDatabase, setDatabaseLite } from "../storage/database.svelte";
 import { checkNullish, selectSingleFile, sleep } from "../util";
 import type { OpenAIChat } from "../process/index.svelte";
-import { globalFetch } from "../storage/globalApi";
+import { globalFetch } from "../globalApi";
 import { selectedCharID } from "../stores";
 import { addAdditionalCharaJS } from "./embedscript";
 

src/ts/pngChunk.ts

@@ -1,6 +1,6 @@
 import { Buffer } from 'buffer';
 import crc32 from 'crc/crc32';
-import { AppendableBuffer, VirtualWriter, type LocalWriter } from './storage/globalApi';
+import { AppendableBuffer, VirtualWriter, type LocalWriter } from './globalApi';
 import { blobToUint8Array } from './util';
 
 class StreamChunkWriter{

src/ts/process/files/multisend.ts

@@ -2,7 +2,7 @@ import { getDatabase, setDatabase } from 'src/ts/storage/database.svelte';
 import { selectedCharID } from 'src/ts/stores';
 import { get } from 'svelte/store';
 import { doingChat, sendChat } from '../index.svelte';
-import { downloadFile, isTauri } from 'src/ts/storage/globalApi';
+import { downloadFile, isTauri } from 'src/ts/globalApi';
 import { HypaProcesser } from '../memory/hypamemory';
 import { BufferToText as BufferToText, selectSingleFile, sleep } from 'src/ts/util';
 import { postInlayImage } from './image';

src/ts/process/lorebook.svelte.ts

@@ -5,7 +5,7 @@ import { tokenize } from "../tokenizer";
 import { checkNullish, selectSingleFile } from "../util";
 import { alertError, alertNormal } from "../alert";
 import { language } from "../../lang";
-import { downloadFile } from "../storage/globalApi";
+import { downloadFile } from "../globalApi";
 import { getModuleLorebooks } from "./modules";
 import { CCardLib } from "@risuai/ccardlib";
 

src/ts/process/memory/hypamemory.ts

@@ -1,5 +1,5 @@
 import localforage from "localforage";
-import { globalFetch } from "src/ts/storage/globalApi";
+import { globalFetch } from "src/ts/globalApi";
 import { runEmbedding } from "../transformers";
 import { alertError } from "src/ts/alert";
 import { appendLastPath } from "src/ts/util";

src/ts/process/memory/hypav2.ts

@@ -3,7 +3,7 @@ import type { OpenAIChat } from "../index.svelte";
 import type { ChatTokenizer } from "src/ts/tokenizer";
 import { requestChatData } from "../request";
 import { HypaProcesser } from "./hypamemory";
-import { globalFetch } from "src/ts/storage/globalApi";
+import { globalFetch } from "src/ts/globalApi";
 import { runSummarizer } from "../transformers";
 
 export interface HypaV2Data {

src/ts/process/memory/supaMemory.ts

@@ -4,7 +4,7 @@ import { tokenize, type ChatTokenizer } from "../../tokenizer";
 import { requestChatData } from "../request";
 import { HypaProcesser } from "./hypamemory";
 import { stringlizeChat } from "../stringlize";
-import { globalFetch } from "src/ts/storage/globalApi";
+import { globalFetch } from "src/ts/globalApi";
 import { runSummarizer } from "../transformers";
 import { getUserName } from "src/ts/util";
 

src/ts/process/models/local.ts

@@ -1,5 +1,5 @@
 import { invoke } from "@tauri-apps/api/core";
-import { globalFetch } from "src/ts/storage/globalApi";
+import { globalFetch } from "src/ts/globalApi";
 import { sleep } from "src/ts/util";
 import * as path from "@tauri-apps/api/path";
 import { exists, readTextFile } from "@tauri-apps/plugin-fs";

src/ts/process/models/nai.ts

@@ -1,6 +1,6 @@
 import { getDatabase, setDatabase } from "src/ts/storage/database.svelte"
 import type { OpenAIChat } from "../index.svelte"
-import { globalFetch } from "src/ts/storage/globalApi"
+import { globalFetch } from "src/ts/globalApi"
 import { alertError, alertInput, alertNormal, alertWait } from "src/ts/alert"
 import { getUserName, sleep } from "src/ts/util"
 

src/ts/process/modules.ts

@@ -1,7 +1,7 @@
 import { language } from "src/lang"
 import { alertConfirm, alertError, alertModuleSelect, alertNormal, alertStore } from "../alert"
 import { getCurrentCharacter, getCurrentChat, getDatabase, setCurrentCharacter, setDatabase, type customscript, type loreBook, type triggerscript } from "../storage/database.svelte"
-import { AppendableBuffer, downloadFile, isNodeServer, isTauri, readImage, saveAsset } from "../storage/globalApi"
+import { AppendableBuffer, downloadFile, isNodeServer, isTauri, readImage, saveAsset } from "../globalApi"
 import { selectSingleFile, sleep } from "../util"
 import { v4 } from "uuid"
 import { convertExternalLorebook } from "./lorebook.svelte"

src/ts/process/processzip.ts

@@ -1,4 +1,4 @@
-import { AppendableBuffer, isNodeServer, isTauri, saveAsset, type LocalWriter, type VirtualWriter } from "../storage/globalApi";
+import { AppendableBuffer, isNodeServer, isTauri, saveAsset, type LocalWriter, type VirtualWriter } from "../globalApi";
 import * as fflate from "fflate";
 import { sleep } from "../util";
 import { alertStore } from "../alert";

src/ts/process/request.ts

@@ -4,7 +4,7 @@ import { getDatabase, type character } from "../storage/database.svelte";
 import { pluginProcess } from "../plugins/plugins";
 import { language } from "../../lang";
 import { stringlizeAINChat, stringlizeChat, getStopStrings, unstringlizeAIN, unstringlizeChat } from "./stringlize";
-import { addFetchLog, fetchNative, globalFetch, isNodeServer, isTauri, textifyReadableStream } from "../storage/globalApi";
+import { addFetchLog, fetchNative, globalFetch, isNodeServer, isTauri, textifyReadableStream } from "../globalApi";
 import { sleep } from "../util";
 import { NovelAIBadWordIds, stringlizeNAIChat } from "./models/nai";
 import { strongBan, tokenize, tokenizeNum } from "../tokenizer";

src/ts/process/scripts.ts

@@ -1,7 +1,7 @@
 import { get } from "svelte/store";
 import { CharEmotion, selectedCharID } from "../stores";
 import { type character, type customscript, type groupChat, type Database, getDatabase } from "../storage/database.svelte";
-import { downloadFile } from "../storage/globalApi";
+import { downloadFile } from "../globalApi";
 import { alertError, alertNormal } from "../alert";
 import { language } from "src/lang";
 import { selectSingleFile } from "../util";

src/ts/process/stableDiff.ts

@@ -2,7 +2,7 @@ import { get } from "svelte/store"
 import { getDatabase, type character } from "../storage/database.svelte"
 import { requestChatData } from "./request"
 import { alertError } from "../alert"
-import { globalFetch, readImage } from "../storage/globalApi"
+import { globalFetch, readImage } from "../globalApi"
 import { CharEmotion } from "../stores"
 import type { OpenAIChat } from "./index.svelte"
 import { processZip } from "./processzip"

src/ts/process/transformers.ts

@@ -1,6 +1,6 @@
 import {env, AutoTokenizer, pipeline, type SummarizationOutput, type TextGenerationConfig, type TextGenerationOutput, FeatureExtractionPipeline, TextToAudioPipeline, type ImageToTextOutput } from '@xenova/transformers';
 import { unzip } from 'fflate';
-import { globalFetch, loadAsset, saveAsset } from 'src/ts/storage/globalApi';
+import { globalFetch, loadAsset, saveAsset } from 'src/ts/globalApi';
 import { selectSingleFile } from 'src/ts/util';
 import { v4 } from 'uuid';
 let tfCache:Cache = null

src/ts/process/tts.ts

@@ -1,7 +1,7 @@
 import { alertError } from "../alert";
 import { getCurrentCharacter, getDatabase, type character } from "../storage/database.svelte";
 import { runTranslator, translateVox } from "../translator/translator";
-import { globalFetch, loadAsset } from "../storage/globalApi";
+import { globalFetch, loadAsset } from "../globalApi";
 import { language } from "src/lang";
 import { sleep } from "../util";
 import { runVITS } from "./transformers";

src/ts/realm.ts

@@ -1,6 +1,6 @@
 import { get } from "svelte/store";
 import { exportCharacterCard } from "./characterCards";
-import { VirtualWriter, isTauri, openURL } from "./storage/globalApi";
+import { VirtualWriter, isTauri, openURL } from "./globalApi";
 import { getCurrentCharacter, getDatabase, type character } from "./storage/database.svelte";
 import { alertStore } from "./alert";
 

src/ts/storage/accountStorage.ts

@@ -3,7 +3,7 @@ import { getDatabase } from "./database.svelte"
 import { hubURL } from "../characterCards"
 import localforage from "localforage"
 import { alertLogin, alertStore, alertWait } from "../alert"
-import { forageStorage, getUnpargeables } from "./globalApi"
+import { forageStorage, getUnpargeables } from "../globalApi"
 import { encodeRisuSave } from "./risuSave"
 import { v4 } from "uuid"
 import { language } from "src/lang"

src/ts/storage/autoStorage.ts

@@ -1,5 +1,5 @@
 import localforage from "localforage"
-import { isNodeServer, replaceDbResources } from "./globalApi"
+import { isNodeServer, replaceDbResources } from "../globalApi"
 import { NodeStorage } from "./nodeStorage"
 import { OpfsStorage } from "./opfsStorage"
 import { alertInput, alertSelect, alertStore } from "../alert"

src/ts/storage/database.svelte.ts

@@ -3,7 +3,7 @@ import { checkNullish, decryptBuffer, encryptBuffer, selectSingleFile } from '..
 import { changeLanguage, language } from '../../lang';
 import type { RisuPlugin } from '../plugins/plugins';
 import type {triggerscript as triggerscriptMain} from '../process/triggers';
-import { downloadFile, saveAsset as saveImageGlobal } from './globalApi';
+import { downloadFile, saveAsset as saveImageGlobal } from '../globalApi';
 import { defaultAutoSuggestPrompt, defaultJailbreak, defaultMainPrompt } from './defaultPrompts';
 import { alertNormal, alertSelect } from '../alert';
 import type { NAISettings } from '../process/models/nai';

src/ts/storage/exportAsDataset.ts

@@ -1,6 +1,6 @@
 import { get } from "svelte/store";
 import { getDatabase } from "./database.svelte";
-import { downloadFile } from "./globalApi";
+import { downloadFile } from "../globalApi";
 import { alertNormal } from "../alert";
 import { language } from "src/lang";
 

src/ts/storage/persistant.ts

@@ -2,7 +2,7 @@ import { get } from "svelte/store";
 import { getDatabase } from "./database.svelte";
 import { alertNormal } from "../alert";
 import { language } from "src/lang";
-import { isNodeServer, isTauri } from "./globalApi";
+import { isNodeServer, isTauri } from "../globalApi";
 
 async function requestPersistantStorageMain() {
     

src/ts/storage/risuSave.ts

@@ -1,6 +1,6 @@
 import { Packr, Unpackr, decode } from "msgpackr";
 import * as fflate from "fflate";
-import { isTauri } from "./globalApi";
+import { isTauri } from "../globalApi";
 
 const packr = new Packr({
     useRecords:false

src/ts/sync/multiuser.ts

@@ -5,7 +5,7 @@ import { setDatabase, type character, saveImage, type Chat, getCurrentChat, setC
 import { selectedCharID } from '../stores';
 import { findCharacterIndexbyId, sleep } from '../util';
 import type { DataConnection, Peer } from 'peerjs';
-import { readImage } from '../storage/globalApi';
+import { readImage } from '../globalApi';
 import { doingChat } from '../process/index.svelte';
 
 async function importPeerJS(){

src/ts/tokenizer.ts

@@ -5,7 +5,7 @@ import type { MultiModal, OpenAIChat } from "./process/index.svelte";
 import { supportsInlayImage } from "./process/files/image";
 import { risuChatParser } from "./parser.svelte";
 import { tokenizeGGUFModel } from "./process/models/local";
-import { globalFetch } from "./storage/globalApi";
+import { globalFetch } from "./globalApi";
 
 
 export const tokenizerList = [

src/ts/translator/translator.ts

@@ -1,7 +1,7 @@
 import { get } from "svelte/store"
 import { translatorPlugin } from "../plugins/plugins"
 import { getDatabase, type character, type customscript, type groupChat } from "../storage/database.svelte"
-import { globalFetch, isTauri } from "../storage/globalApi"
+import { globalFetch, isTauri } from "../globalApi"
 import { alertError } from "../alert"
 import { requestChatData } from "../process/request"
 import { doingChat, type OpenAIChat } from "../process/index.svelte"

src/ts/util.ts

@@ -7,7 +7,7 @@ import { readFile } from "@tauri-apps/plugin-fs"
 import { basename } from "@tauri-apps/api/path"
 import { createBlankChar, getCharImage } from "./characters"
 import { getCurrentWebviewWindow } from '@tauri-apps/api/webviewWindow';
-import { isTauri } from "./storage/globalApi"
+import { isTauri } from "./globalApi"
 const appWindow = isTauri ? getCurrentWebviewWindow() : null
 
 export const isFirefox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1