From b819e681accd195fe2774bf05401a84eb21e2e6a Mon Sep 17 00:00:00 2001 From: Antonio Date: Thu, 29 Jun 2023 16:43:15 +0800 Subject: [PATCH] GetForm --- funcaptcha | 2 +- go.mod | 2 +- go.sum | 2 ++ main.go | 23 +++++++++++++++-------- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/funcaptcha b/funcaptcha index 084e7df..43552f7 160000 --- a/funcaptcha +++ b/funcaptcha @@ -1 +1 @@ -Subproject commit 084e7dfaffef0932e67eb7b367c0b8dcc69d8a7e +Subproject commit 43552f77d69a0cf1802d583964708b06afee2f43 diff --git a/go.mod b/go.mod index f2d3b53..7d4a8a4 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( github.com/acheong08/OpenAIAuth v0.0.0-20230530050836-f2a06cd52911 github.com/acheong08/endless v0.0.0-20230529075213-74050cf641c8 - github.com/acheong08/funcaptcha v0.2.1-0.20230629044031-084e7dfaffef + github.com/acheong08/funcaptcha v0.2.1-0.20230629084009-43552f77d69a github.com/bogdanfinn/fhttp v0.5.23 github.com/bogdanfinn/tls-client v1.4.0 github.com/gin-gonic/gin v1.9.0 diff --git a/go.sum b/go.sum index 3011be7..3df48ec 100644 --- a/go.sum +++ b/go.sum @@ -4,6 +4,8 @@ github.com/acheong08/endless v0.0.0-20230529075213-74050cf641c8 h1:mHtMoGlGNUfMR github.com/acheong08/endless v0.0.0-20230529075213-74050cf641c8/go.mod h1:0yO7neMeJLvKk/B/fq5votDY8rByrOPDubpvU+6saKo= github.com/acheong08/funcaptcha v0.2.1-0.20230629044031-084e7dfaffef h1:B5fq4j+Qiu/6vay/70BG9mBuBgF28CnA4MTx1+J2V+o= github.com/acheong08/funcaptcha v0.2.1-0.20230629044031-084e7dfaffef/go.mod h1:VupbjtVAODvgyAB3Zo86fOA53G+UAmaV/Rk9jUCGuTU= +github.com/acheong08/funcaptcha v0.2.1-0.20230629084009-43552f77d69a h1:fmOHjUNCWC0iYzn0giYkDYIppIaCfmdn4UqFXZRbL4E= +github.com/acheong08/funcaptcha v0.2.1-0.20230629084009-43552f77d69a/go.mod h1:VupbjtVAODvgyAB3Zo86fOA53G+UAmaV/Rk9jUCGuTU= github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs= github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/bogdanfinn/fhttp v0.5.23 h1:4Xb5OjYArB8GpnUw4A4r5jmt8UW0/Cvey3R9nS2dC9U= diff --git a/main.go b/main.go index 609279e..4a370cb 100644 --- a/main.go +++ b/main.go @@ -38,7 +38,6 @@ var ( http_proxy = os.Getenv("http_proxy") authorizations auth_struct OpenAI_HOST = os.Getenv("OPENAI_HOST") - arkose_token string ) func admin(c *gin.Context) { @@ -133,6 +132,11 @@ func main() { os.Setenv("OPENAI_PASSWORD", authorizations.OpenAI_Password) }) + handler.GET("/api/arkose", func(ctx *gin.Context) { + arkose_form := arkose.GetForm() + ctx.JSON(200, gin.H{"form": arkose_form}) + }) + handler.Any("/api/*path", proxy) gin.SetMode(gin.ReleaseMode) @@ -171,14 +175,17 @@ func proxy(c *gin.Context) { return } if strings.HasPrefix(request_body["model"].(string), "gpt-4") { - token, err := arkose.GetOpenAIToken() - if err == nil { - arkose_token = token - } else { - fmt.Println(err) + if _, ok := request_body["arkose_token"]; !ok { + token, err := arkose.GetOpenAIToken() + var arkose_token string + if err == nil { + arkose_token = token + } else { + fmt.Println(err) + } + request_body["arkose_token"] = arkose_token + println(arkose_token) } - request_body["arkose_token"] = arkose_token - println(arkose_token) } body_json, err := json.Marshal(request_body) if err != nil {