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

[rm] removed request types, due to unsafe

Browse Source
This commit is contained in:
kwaroran
2023-06-23 12:37:51 +09:00
parent 6d2f9fe4da
commit 4187590f56
2 changed files with 8 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/lib/Setting/Pages/AdvancedSettings.svelte
View File

@@ -26,25 +26,11 @@
<span class="text-neutral-200">{language.requestretrys}</span>
<input class="text-neutral-200 mb-4 p-2 bg-transparent input-text focus:bg-selected text-sm" type="number" min={0} max="20" bind:value={$DataBase.requestRetrys}>
<span class="text-neutral-200">Request Type</span>
<select class="bg-transparent input-text text-gray-200 appearance-none text-sm mb-4" bind:value={$DataBase.requestmet}>
<option value="normal" class="bg-darkbg appearance-none">Normal</option>
<option value="proxy" class="bg-darkbg appearance-none">Proxy</option>
<option value="plain" class="bg-darkbg appearance-none">Plain Fetch</option>
<span class="text-neutral-200">Request Lib</span>
<select class="bg-transparent input-text text-gray-200 appearance-none text-sm" bind:value={$DataBase.requester}>
<option value="new" class="bg-darkbg appearance-none">Reqwest</option>
<option value="old" class="bg-darkbg appearance-none">Tauri</option>
</select>
{#if $DataBase.requestmet === 'proxy'}
<span class="text-neutral-200">Request Proxy URL</span>
<input class="text-neutral-200 mb-4 p-2 bg-transparent input-text focus:bg-selected text-sm" bind:value={$DataBase.requestproxy}>
{/if}
{#if isTauri && $DataBase.requestmet === 'normal'}
<span class="text-neutral-200">Request Lib</span>
<select class="bg-transparent input-text text-gray-200 appearance-none text-sm" bind:value={$DataBase.requester}>
<option value="new" class="bg-darkbg appearance-none">Reqwest</option>
<option value="old" class="bg-darkbg appearance-none">Tauri</option>
</select>
{/if}
<div class="flex items-center mt-4">
<Check bind:check={$DataBase.useSayNothing} name={language.sayNothing}/>
</div>

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

@@ -383,6 +383,7 @@ export async function globalFetch(url:string, arg:{body?:any,headers?:{[key:stri
try {
const db = get(DataBase)
const method = arg.method ?? "POST"
db.requestmet = "normal"
function addFetchLog(response:any, success:boolean){
try{
@@ -410,7 +411,7 @@ export async function globalFetch(url:string, arg:{body?:any,headers?:{[key:stri
const urlHost = (new URL(url)).hostname
let forcePlainFetch = knownHostes.includes(urlHost) && (!isTauri)
if(db.requestmet === 'plain' || forcePlainFetch){
if(forcePlainFetch){
try {
let headers = arg.headers ?? {}
if(!headers["Content-Type"]){
@@ -451,48 +452,6 @@ export async function globalFetch(url:string, arg:{body?:any,headers?:{[key:stri
}
}
}
if(db.requestmet === 'proxy'){
try {
let headers = arg.headers ?? {}
if(!headers["Content-Type"]){
headers["Content-Type"] = `application/json`
}
const furl = new URL(db.requestproxy)
furl.pathname = url
const da = await fetch(furl, {
body: JSON.stringify(arg.body),
headers: arg.headers,
method: method,
signal: arg.abortSignal
})
if(arg.rawResponse){
addFetchLog("Uint8Array Response", da.ok && da.status >= 200 && da.status < 300)
return {
ok: da.ok && da.status >= 200 && da.status < 300,
data: new Uint8Array(await da.arrayBuffer()),
headers: Object.fromEntries(da.headers)
}
}
else{
const dat = await da.json()
addFetchLog(dat, da.ok && da.status >= 200 && da.status < 300)
return {
ok: da.ok && da.status >= 200 && da.status < 300,
data: dat,
headers: Object.fromEntries(da.headers)
}
}
} catch (error) {
return {
ok: false,
data: `${error}`,
headers: {}
}
}
}
if(isTauri){
if(db.requester === 'new'){
try {
@@ -609,8 +568,8 @@ export async function globalFetch(url:string, arg:{body?:any,headers?:{[key:stri
"risu-header": encodeURIComponent(JSON.stringify(arg.headers)),
"Content-Type": "application/json"
},
method: method
,signal: arg.abortSignal
method: method,
signal: arg.abortSignal
})
addFetchLog("Uint8Array Response", da.ok && da.status >= 200 && da.status < 300)