Skip to content

Commit

Permalink
first try fix websocket
Browse files Browse the repository at this point in the history
  • Loading branch information
@xqdoo00o
xqdoo00o committed Feb 29, 2024
1 parent 48475df commit 85f1203
Show file tree
Hide file tree
Showing 5 changed files with 125 additions and 30 deletions.
2 changes: 1 addition & 1 deletion auth.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ type TokenExp struct {
func getTokenExpire(tokenstring string) (time.Time, error) {
payLoadData := strings.Split(tokenstring, ".")[1]
// Decode payload
payload, err := base64.StdEncoding.DecodeString(payLoadData)
payload, err := base64.RawStdEncoding.DecodeString(payLoadData)
if err != nil {
return time.Time{}, err
}
Expand Down
13 changes: 7 additions & 6 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@ require (
github.com/bogdanfinn/tls-client v1.6.1
github.com/gin-gonic/gin v1.9.1
github.com/go-resty/resty/v2 v2.7.0
github.com/google/uuid v1.3.1
github.com/google/uuid v1.6.0
github.com/gorilla/websocket v1.5.1
github.com/joho/godotenv v1.5.1
github.com/tidwall/gjson v1.14.4
github.com/xqdoo00o/OpenAIAuth v0.0.0-20240119133540-9d0c14e31678
github.com/xqdoo00o/funcaptcha v0.0.0-20240119125440-13927300884f
github.com/xqdoo00o/OpenAIAuth v0.0.0-20240229152233-ff4cededff72
github.com/xqdoo00o/funcaptcha v0.0.0-20240229151808-f73bef32f529
k8s.io/apimachinery v0.27.2
)

Expand Down Expand Up @@ -44,9 +45,9 @@ require (
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/ugorji/go/codec v1.2.11 // indirect
golang.org/x/arch v0.5.0 // indirect
golang.org/x/crypto v0.13.0 // indirect
golang.org/x/net v0.15.0 // indirect
golang.org/x/sys v0.12.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
26 changes: 14 additions & 12 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,10 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY=
github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY=
github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
Expand Down Expand Up @@ -95,18 +97,18 @@ github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS
github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
github.com/xqdoo00o/OpenAIAuth v0.0.0-20240119133540-9d0c14e31678 h1:nZoYYOeUGeroU302rkYxxeehe5gnS8FPQzpbn/JMkvk=
github.com/xqdoo00o/OpenAIAuth v0.0.0-20240119133540-9d0c14e31678/go.mod h1:VTcu1KCFag3OEhhbo6YPa2/dNluk1DmzIRXiDav799g=
github.com/xqdoo00o/funcaptcha v0.0.0-20240119125440-13927300884f h1:r5RUduEYYU3grdJOUCCyY+PM5GG7sDayRvxbUkta3uQ=
github.com/xqdoo00o/funcaptcha v0.0.0-20240119125440-13927300884f/go.mod h1:2frDREz1MeGS6sXyNSQGKJGd/0yCCydf5khEqyi4krI=
github.com/xqdoo00o/OpenAIAuth v0.0.0-20240229152233-ff4cededff72 h1:7jUuMnzn4ZBEoGWjMGID+tK0CzzNrKwS3DCjrB2gxV4=
github.com/xqdoo00o/OpenAIAuth v0.0.0-20240229152233-ff4cededff72/go.mod h1:kzlOoE+TsXU3R7ZbJUFV4n5uFHCmH7unpbgGaB4ghvo=
github.com/xqdoo00o/funcaptcha v0.0.0-20240229151808-f73bef32f529 h1:N8F7ls4jsqKruhOWLfQNRXaL+QWQS5j2xeCKPyCI6DM=
github.com/xqdoo00o/funcaptcha v0.0.0-20240229151808-f73bef32f529/go.mod h1:7aCyoW5MHDUsoooMVLqKe0F7W9HMPUvDG3bXqw++8XA=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
golang.org/x/arch v0.5.0 h1:jpGode6huXQxcskEIpOCvrU+tzo81b6+oFLUYXWtH/Y=
golang.org/x/arch v0.5.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck=
golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
Expand All @@ -117,8 +119,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=
golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
Expand All @@ -131,8 +133,8 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
Expand Down
93 changes: 82 additions & 11 deletions internal/chatgpt/request.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package chatgpt
import (
"bufio"
"bytes"
"encoding/base64"
"encoding/json"
"freechatgpt/typings"
chatgpt_types "freechatgpt/typings/chatgpt"
Expand All @@ -12,6 +13,10 @@ import (
"strings"
"sync"

"github.com/gorilla/websocket"

hp "net/http"

http "github.com/bogdanfinn/fhttp"
tls_client "github.com/bogdanfinn/tls-client"
"github.com/bogdanfinn/tls-client/profiles"
Expand All @@ -30,6 +35,7 @@ var (
}...)
API_REVERSE_PROXY = os.Getenv("API_REVERSE_PROXY")
FILES_REVERSE_PROXY = os.Getenv("FILES_REVERSE_PROXY")
conn *websocket.Conn
)

func POSTconversation(message chatgpt_types.ChatGPTRequest, access_token string, puid string, proxy string) (*http.Response, error) {
Expand Down Expand Up @@ -138,6 +144,7 @@ func GetImageSource(wg *sync.WaitGroup, url string, prompt string, token string,
}
imgSource[idx] = "[![image](" + file_info.DownloadURL + " \"" + prompt + "\")](" + file_info.DownloadURL + ")"
}

func Handler(c *gin.Context, response *http.Response, token string, puid string, translated_request chatgpt_types.ChatGPTRequest, stream bool) (string, *ContinueInfo) {
max_tokens := false

Expand All @@ -157,14 +164,72 @@ func Handler(c *gin.Context, response *http.Response, token string, puid string,
var original_response chatgpt_types.ChatGPTResponse
var isRole = true
var waitSource = false
var isEnd = false
var imgSource []string
for {
line, err := reader.ReadString('\n')
var isWSS = false
var convId string

firstStr, _ := reader.ReadString('\n')
if strings.Contains(firstStr, "\"wss_url\"") {
isWSS = true
var wssResponse chatgpt_types.ChatGPTWSSResponse
json.Unmarshal([]byte(firstStr), &wssResponse)
convId = wssResponse.ConversationId
wssUrl := wssResponse.WssUrl
header := make(hp.Header)
header.Add("Sec-WebSocket-Protocol", "json.reliable.webpubsub.azure.v1")
var err error
conn, _, err = websocket.DefaultDialer.Dial(wssUrl, header)
if err != nil {
return "", nil
}

} else {
err := json.Unmarshal([]byte(firstStr[6:]), &original_response)
if err != nil {
if err == io.EOF {
return "", nil
}
if original_response.Error != nil {
c.JSON(500, gin.H{"error": original_response.Error})
return "", nil
}
convId = original_response.ConversationID
}
for {
var line string
var err error
if isWSS {
var messageType int
var message []byte
messageType, message, err = conn.ReadMessage()
if err != nil {
println(err.Error())
conn.Close()
break
}
return "", nil
if messageType == websocket.TextMessage {
var wssMsgResponse chatgpt_types.WSSMsgResponse
json.Unmarshal(message, &wssMsgResponse)
base64Body := wssMsgResponse.Data.Body
bodyByte, err := base64.StdEncoding.DecodeString(base64Body)
if err != nil {
continue
}
line = string(bodyByte)
}
} else {
if firstStr != "" {
line = firstStr
firstStr = ""
} else {
line, err = reader.ReadString('\n')
}
if err != nil {
if err == io.EOF {
break
}
return "", nil
}
}
if len(line) < 6 {
continue
Expand All @@ -182,6 +247,9 @@ func Handler(c *gin.Context, response *http.Response, token string, puid string,
c.JSON(500, gin.H{"error": original_response.Error})
return "", nil
}
if original_response.ConversationID != convId {
continue
}
if !(original_response.Message.Author.Role == "assistant" || (original_response.Message.Author.Role == "tool" && original_response.Message.Content.ContentType != "text")) || original_response.Message.Content.Parts == nil {
continue
}
Expand All @@ -191,9 +259,8 @@ func Handler(c *gin.Context, response *http.Response, token string, puid string,
if original_response.Message.EndTurn != nil {
if waitSource {
waitSource = false
} else {
continue
}
isEnd = true
}
if len(original_response.Message.Metadata.Citations) != 0 {
r := []rune(original_response.Message.Content.Parts[0].(string))
Expand Down Expand Up @@ -269,11 +336,15 @@ func Handler(c *gin.Context, response *http.Response, token string, puid string,
}
finish_reason = original_response.Message.Metadata.FinishDetails.Type
}

} else {
if stream {
final_line := official_types.StopChunk(finish_reason)
c.Writer.WriteString("data: " + final_line.String() + "\n\n")
if isEnd {
if stream {
final_line := official_types.StopChunk(finish_reason)
c.Writer.WriteString("data: " + final_line.String() + "\n\n")
}
if isWSS {
conn.Close()
}
break
}
}
}
Expand Down
21 changes: 21 additions & 0 deletions typings/chatgpt/response.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,27 @@ type ChatGPTResponse struct {
ConversationID string `json:"conversation_id"`
Error interface{} `json:"error"`
}
type ChatGPTWSSResponse struct {
WssUrl string `json:"wss_url"`
ConversationId string `json:"conversation_id"`
ResponseId string `json:"response_id"`
}

type WSSMsgResponse struct {
SequenceId int `json:"sequenceId"`
Type string `json:"type"`
From string `json:"from"`
DataType string `json:"dataType"`
Data WSSMsgResponseData `json:"data"`
}

type WSSMsgResponseData struct {
Type string `json:"type"`
Body string `json:"body"`
MoreBody bool `json:"more_body"`
ResponseId string `json:"response_id"`
ConversationId string `json:"conversation_id"`
}

type Message struct {
ID string `json:"id"`
Expand Down

0 comments on commit 85f1203

Please sign in to comment.