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

Migrate to Tauri V2

Browse Source
This commit is contained in:
kwaroran
2024-10-09 20:07:59 +09:00
parent 0e99d96088
commit 5a931d4ba0
23 changed files with 13225 additions and 1601 deletions
Download Patch File Download Diff File Expand all files Collapse all files

150
src/ts/storage/globalApi.ts
View File

@@ -1,16 +1,22 @@
import { writeBinaryFile,BaseDirectory, readBinaryFile, exists, createDir, readDir, removeFile } from "@tauri-apps/api/fs"
import {
writeFile,
BaseDirectory,
readFile,
exists,
mkdir,
readDir,
remove
} from "@tauri-apps/plugin-fs"
import { changeFullscreen, checkNullish, findCharacterbyId, sleep } from "../util"
import { convertFileSrc, invoke } from "@tauri-apps/api/tauri"
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/api/shell'
import {open} from '@tauri-apps/plugin-shell'
import { DataBase, loadedStore, setDatabase, type Database, defaultSdDataFunc } from "./database";
import { appWindow } from "@tauri-apps/api/window";
import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
import { checkRisuUpdate } from "../update";
import { MobileGUI, botMakerMode, selectedCharID } from "../stores";
import { Body, ResponseType, fetch as TauriFetch } from "@tauri-apps/api/http";
import { loadPlugins } from "../plugins/plugins";
import { alertConfirm, alertError, alertNormal, alertNormalWait, alertSelect, alertTOS, alertWait } from "../alert";
import { checkDriverInit, syncDrive } from "../drive/drive";
@@ -25,7 +31,7 @@ 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/api/dialog";
import { save } from "@tauri-apps/plugin-dialog";
import type { RisuModule } from "../process/modules";
import { listen } from '@tauri-apps/api/event'
import { registerPlugin } from '@capacitor/core';
@@ -36,9 +42,11 @@ import { updateGuisize } from "../gui/guisize";
import { encodeCapKeySafe } from "./mobileStorage";
import { updateLorebooks } from "../characters";
import { initMobileGesture } from "../hotkey";
import { fetch as TauriHTTPFetch } from '@tauri-apps/plugin-http';
const appWindow = getCurrentWebviewWindow()
//@ts-ignore
export const isTauri = !!window.__TAURI__
export const isTauri = !!window.__TAURI_INTERNALS__
//@ts-ignore
export const isNodeServer = !!globalThis.__NODE__
export const forageStorage = new AutoStorage()
@@ -58,26 +66,6 @@ interface fetchLog{
let fetchLog:fetchLog[] = []
async function writeBinaryFileFast(appPath: string, data: Uint8Array) {
const secret = await invoke('get_http_secret') as string;
const port = await invoke('get_http_port') as number;
const apiUrl = `http://127.0.0.1:${port}/?path=${encodeURIComponent(appPath)}`;
const response = await fetch(apiUrl, {
method: 'POST',
headers: {
'Content-Type': 'application/octet-stream',
'x-tauri-secret': secret
},
body: new Blob([data])
});
if (!response.ok) {
throw new Error(`HTTP error! status: ${response.status}`);
}
}
export async function downloadFile(name:string, dat:Uint8Array|ArrayBuffer|string) {
if(typeof(dat) === 'string'){
dat = Buffer.from(dat, 'utf-8')
@@ -94,7 +82,7 @@ export async function downloadFile(name:string, dat:Uint8Array|ArrayBuffer|strin
}
if(isTauri){
await writeBinaryFile(name, data, {dir: BaseDirectory.Download})
await writeFile(name, data, {baseDir: BaseDirectory.Download})
}
else{
downloadURL(`data:png/image;base64,${Buffer.from(data).toString('base64')}`, name)
@@ -172,7 +160,7 @@ export async function getFileSrc(loc:string) {
return "/sw/img/" + encoded
}
else{
const f:Uint8Array = await forageStorage.getItem(loc)
const f:Uint8Array = await forageStorage.getItem(loc) as unknown as Uint8Array
await fetch("/sw/register/" + encoded, {
method: "POST",
body: f
@@ -201,7 +189,7 @@ export async function getFileSrc(loc:string) {
ind = fileCache.origin.length
fileCache.origin.push(loc)
fileCache.res.push('loading')
const f:Uint8Array = await forageStorage.getItem(loc)
const f:Uint8Array = await forageStorage.getItem(loc) as unknown as Uint8Array
fileCache.res[ind] = f
return `data:image/png;base64,${Buffer.from(f).toString('base64')}`
}
@@ -230,12 +218,12 @@ export async function readImage(data:string) {
if(appDataDirPath === ''){
appDataDirPath = await appDataDir();
}
return await readBinaryFile(await join(appDataDirPath,data))
return await readFile(await join(appDataDirPath,data))
}
return await readBinaryFile(data)
return await readFile(data)
}
else{
return (await forageStorage.getItem(data) as Uint8Array)
return (await forageStorage.getItem(data) as unknown as Uint8Array)
}
}
@@ -256,7 +244,9 @@ export async function saveAsset(data:Uint8Array, customId:string = '', fileName:
fileExtension = fileName.split('.').pop()
}
if(isTauri){
await writeBinaryFileFast(`assets/${id}.${fileExtension}`, data);
await writeFile(`assets/${id}.${fileExtension}`, data, {
baseDir: BaseDirectory.AppData
});
return `assets/${id}.${fileExtension}`
}
else{
@@ -271,10 +261,10 @@ export async function saveAsset(data:Uint8Array, customId:string = '', fileName:
export async function loadAsset(id:string){
if(isTauri){
return await readBinaryFile(id,{dir: BaseDirectory.AppData})
return await readFile(id,{baseDir: BaseDirectory.AppData})
}
else{
return await forageStorage.getItem(id) as Uint8Array
return await forageStorage.getItem(id) as unknown as Uint8Array
}
}
@@ -322,8 +312,8 @@ export async function saveDb(){
db.saveTime = Math.floor(Date.now() / 1000)
if(isTauri){
const dbData = encodeRisuSave(db)
await writeBinaryFileFast('database/database.bin', dbData);
await writeBinaryFileFast(`database/dbbackup-${(Date.now()/100).toFixed()}.bin`, dbData);
await writeFile('database/database.bin', dbData, {baseDir: BaseDirectory.AppData});
await writeFile(`database/dbbackup-${(Date.now()/100).toFixed()}.bin`, dbData, {baseDir: BaseDirectory.AppData});
}
else{
if(!forageStorage.isAccount){
@@ -365,7 +355,7 @@ async function getDbBackups() {
return []
}
if(isTauri){
const keys = await readDir('database', {dir: BaseDirectory.AppData})
const keys = await readDir('database', {baseDir: BaseDirectory.AppData})
let backups:number[] = []
for(const key of keys){
if(key.name.startsWith("dbbackup-")){
@@ -377,7 +367,7 @@ async function getDbBackups() {
backups.sort((a, b) => b - a)
while(backups.length > 20){
const last = backups.pop()
await removeFile(`database/dbbackup-${last}.bin`,{dir: BaseDirectory.AppData})
await remove(`database/dbbackup-${last}.bin`,{baseDir: BaseDirectory.AppData})
}
return backups
}
@@ -407,27 +397,27 @@ export async function loadData() {
try {
if(isTauri){
appWindow.maximize()
if(!await exists('', {dir: BaseDirectory.AppData})){
await createDir('', {dir: BaseDirectory.AppData})
if(!await exists('', {baseDir: BaseDirectory.AppData})){
await mkdir('', {baseDir: BaseDirectory.AppData})
}
if(!await exists('database', {dir: BaseDirectory.AppData})){
await createDir('database', {dir: BaseDirectory.AppData})
if(!await exists('database', {baseDir: BaseDirectory.AppData})){
await mkdir('database', {baseDir: BaseDirectory.AppData})
}
if(!await exists('assets', {dir: BaseDirectory.AppData})){
await createDir('assets', {dir: BaseDirectory.AppData})
if(!await exists('assets', {baseDir: BaseDirectory.AppData})){
await mkdir('assets', {baseDir: BaseDirectory.AppData})
}
if(!await exists('database/database.bin', {dir: BaseDirectory.AppData})){
await writeBinaryFileFast('database/database.bin', encodeRisuSave({}));
if(!await exists('database/database.bin', {baseDir: BaseDirectory.AppData})){
await writeFile('database/database.bin', encodeRisuSave({}), {baseDir: BaseDirectory.AppData});
}
try {
const decoded = decodeRisuSave(await readBinaryFile('database/database.bin',{dir: BaseDirectory.AppData}))
const decoded = decodeRisuSave(await readFile('database/database.bin',{baseDir: BaseDirectory.AppData}))
setDatabase(decoded)
} catch (error) {
const backups = await getDbBackups()
let backupLoaded = false
for(const backup of backups){
try {
const backupData = await readBinaryFile(`database/dbbackup-${backup}.bin`,{dir: BaseDirectory.AppData})
const backupData = await readFile(`database/dbbackup-${backup}.bin`,{baseDir: BaseDirectory.AppData})
setDatabase(
decodeRisuSave(backupData)
)
@@ -445,7 +435,7 @@ export async function loadData() {
}
else{
let gotStorage:Uint8Array = await forageStorage.getItem('database/database.bin')
let gotStorage:Uint8Array = await forageStorage.getItem('database/database.bin') as unknown as Uint8Array
if(checkNullish(gotStorage)){
gotStorage = encodeRisuSave({})
await forageStorage.setItem('database/database.bin', gotStorage)
@@ -460,7 +450,7 @@ export async function loadData() {
let backupLoaded = false
for(const backup of backups){
try {
const backupData:Uint8Array = await forageStorage.getItem(`database/dbbackup-${backup}.bin`)
const backupData:Uint8Array = await forageStorage.getItem(`database/dbbackup-${backup}.bin`) as unknown as Uint8Array
setDatabase(
decodeRisuSave(backupData)
)
@@ -472,7 +462,7 @@ export async function loadData() {
}
}
if(await forageStorage.checkAccountSync()){
let gotStorage:Uint8Array = await forageStorage.getItem('database/database.bin')
let gotStorage:Uint8Array = await forageStorage.getItem('database/database.bin') as unknown as Uint8Array
if(checkNullish(gotStorage)){
gotStorage = encodeRisuSave({})
await forageStorage.setItem('database/database.bin', gotStorage)
@@ -486,7 +476,7 @@ export async function loadData() {
let backupLoaded = false
for(const backup of backups){
try {
const backupData:Uint8Array = await forageStorage.getItem(`database/dbbackup-${backup}.bin`)
const backupData:Uint8Array = await forageStorage.getItem(`database/dbbackup-${backup}.bin`) as unknown as Uint8Array
setDatabase(
decodeRisuSave(backupData)
)
@@ -711,32 +701,16 @@ async function fetchWithPlainFetch(url: string, arg: GlobalFetchArgs): Promise<G
// Decoupled globalFetch built-in function
async function fetchWithTauri(url: string, arg: GlobalFetchArgs): Promise<GlobalFetchResult> {
const body = !arg.body ? null : arg.body instanceof URLSearchParams ? Body.text(arg.body.toString()) : Body.json(arg.body);
const headers = arg.headers ?? {};
const fetchPromise = TauriFetch(url, {
body,
method: arg.method ?? 'POST',
headers,
timeout: { secs: get(DataBase).timeOut, nanos: 0 },
responseType: arg.rawResponse ? ResponseType.Binary : ResponseType.JSON,
});
let abortFn = () => {};
const abortPromise = new Promise<"aborted">((res, rej) => {
abortFn = () => res("aborted");
arg.abortSignal?.addEventListener('abort', abortFn);
});
const result = await Promise.any([fetchPromise, abortPromise]);
arg.abortSignal?.removeEventListener('abort', abortFn);
if (result === 'aborted') {
return { ok: false, data: 'aborted', headers: {} };
}
const data = arg.rawResponse ? new Uint8Array(result.data as number[]) : result.data;
addFetchLogInGlobalFetch(data, result.ok, url, arg);
return { ok: result.ok, data, headers: result.headers };
try {
const headers = { 'Content-Type': 'application/json', ...arg.headers };
const response = await TauriHTTPFetch(new URL(url), { body: JSON.stringify(arg.body), headers, method: arg.method ?? "POST", signal: arg.abortSignal });
const data = arg.rawResponse ? new Uint8Array(await response.arrayBuffer()) : await response.json();
const ok = response.status >= 200 && response.status < 300;
addFetchLogInGlobalFetch(data, ok, url, arg);
return { ok, data, headers: Object.fromEntries(response.headers) };
} catch (error) {
}
}
// Decoupled globalFetch built-in function
@@ -1137,13 +1111,13 @@ async function pargeChunks(){
const unpargeable = getUnpargeables(db)
if(isTauri){
const assets = await readDir('assets', {dir: BaseDirectory.AppData})
const assets = await readDir('assets', {baseDir: BaseDirectory.AppData})
for(const asset of assets){
const n = getBasename(asset.name)
if(unpargeable.includes(n)){
}
else{
await removeFile(asset.path)
await remove(asset.name, {baseDir: BaseDirectory.AppData})
}
}
}
@@ -1222,7 +1196,7 @@ export class TauriWriter{
}
async write(data:Uint8Array) {
await writeBinaryFile(this.path, data, {
await writeFile(this.path, data, {
append: !this.firstWrite
})
this.firstWrite = false
@@ -1520,7 +1494,7 @@ export async function fetchNative(url:string, arg:{
const data = nativeFetchData[fetchId].shift()
if(data.type === 'chunk'){
const chunk = Buffer.from(data.body, 'base64')
controller.enqueue(chunk)
controller.enqueue(chunk as unknown as Uint8Array)
}
if(data.type === 'headers'){
resHeaders = data.body
@@ -1649,7 +1623,7 @@ export class BlankWriter{
export async function loadInternalBackup(){
const keys = isTauri ? (await readDir('database', {dir: BaseDirectory.AppData})).map((v) => {
const keys = isTauri ? (await readDir('database', {baseDir: BaseDirectory.AppData})).map((v) => {
return v.name
}) : (await forageStorage.keys())
let internalBackups:string[] = []
@@ -1677,11 +1651,11 @@ export async function loadInternalBackup(){
const selectedBackup = internalBackups[alertResult]
const data = isTauri ? (
await readBinaryFile('database/' + selectedBackup, {dir: BaseDirectory.AppData})
await readFile('database/' + selectedBackup, {baseDir: BaseDirectory.AppData})
) : (await forageStorage.getItem(selectedBackup))
setDatabase(
decodeRisuSave(data)
decodeRisuSave(Buffer.from(data) as unknown as Uint8Array)
)
await alertNormal('Loaded backup')