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

[refactor] proxy url by header

Browse Source
This commit is contained in:
kwaroran
2023-07-07 06:30:04 +09:00
parent ead670516d
commit e338940708
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
functions/proxy2.js
View File

@@ -12,7 +12,9 @@ async function fetchProxy(request) {
let response = null; let response = null;
let rurl = new URL(request.url); let rurl = new URL(request.url);
const urlParam = rurl.searchParams.get('url') const nheader = request.headers.get('risu-url') ? decodeURIComponent(request.headers.get('risu-url')) : null
const urlParam = nheader ?? rurl.searchParams.get('url')
if(!urlParam){ if(!urlParam){
return new Response('Access denied', { return new Response('Access denied', {

3
src/ts/process/request.ts
View File

@@ -181,13 +181,14 @@ export async function requestChatDataMain(arg:requestDataArgument, model:'model'
if(db.useStreaming && arg.useStreaming){ if(db.useStreaming && arg.useStreaming){
body.stream = true body.stream = true
const da = ((!isTauri) && (!isNodeServer)) const da = ((!isTauri) && (!isNodeServer))
? await fetch(`/proxy2?url=${encodeURIComponent(replacerURL)}`, { ? await fetch(`/proxy2`, {
body: JSON.stringify(body), body: JSON.stringify(body),
headers: { headers: {
"risu-header": encodeURIComponent(JSON.stringify({ "risu-header": encodeURIComponent(JSON.stringify({
"Authorization": "Bearer " + db.openAIKey, "Authorization": "Bearer " + db.openAIKey,
"Content-Type": "application/json" "Content-Type": "application/json"
})), })),
"risu-url": encodeURIComponent(replacerURL),
"Content-Type": "application/json" "Content-Type": "application/json"
}, },
method: "POST", method: "POST",

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

@@ -617,12 +617,13 @@ export async function globalFetch(url:string, arg:{plainFetchForce?:boolean,body
} }
} }
if(arg.rawResponse){ if(arg.rawResponse){
const furl = `/proxy2?url=${encodeURIComponent(url)}` const furl = `/proxy2`
const da = await fetch(furl, { const da = await fetch(furl, {
body: body, body: body,
headers: { headers: {
"risu-header": encodeURIComponent(JSON.stringify(arg.headers)), "risu-header": encodeURIComponent(JSON.stringify(arg.headers)),
"risu-url": encodeURIComponent(url),
"Content-Type": "application/json" "Content-Type": "application/json"
}, },
method: method, method: method,
@@ -637,12 +638,13 @@ export async function globalFetch(url:string, arg:{plainFetchForce?:boolean,body
} }
} }
else{ else{
const furl = `/proxy2?url=${encodeURIComponent(url)}` const furl = `/proxy2`
const da = await fetch(furl, { const da = await fetch(furl, {
body: body, body: body,
headers: { headers: {
"risu-header": encodeURIComponent(JSON.stringify(arg.headers)), "risu-header": encodeURIComponent(JSON.stringify(arg.headers)),
"risu-url": encodeURIComponent(url),
"Content-Type": "application/json" "Content-Type": "application/json"
}, },
method: method method: method