From 4187590f5658c87218c2b22c68b78e559c6d4451 Mon Sep 17 00:00:00 2001
From: kwaroran <kwaworan@gmail.com>
Date: Fri, 23 Jun 2023 12:37:51 +0900
Subject: [PATCH] [rm] removed request types, due to unsafe

---
 src/lib/Setting/Pages/AdvancedSettings.svelte | 22 ++-------
 src/ts/storage/globalApi.ts                   | 49 ++-----------------
 2 files changed, 8 insertions(+), 63 deletions(-)

diff --git a/src/lib/Setting/Pages/AdvancedSettings.svelte b/src/lib/Setting/Pages/AdvancedSettings.svelte
index f3599709..75d28f04 100644
--- a/src/lib/Setting/Pages/AdvancedSettings.svelte
+++ b/src/lib/Setting/Pages/AdvancedSettings.svelte
@@ -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>
diff --git a/src/ts/storage/globalApi.ts b/src/ts/storage/globalApi.ts
index 763fef6f..971965d2 100644
--- a/src/ts/storage/globalApi.ts
+++ b/src/ts/storage/globalApi.ts
@@ -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)