Lbenedar/Foundry-Scrapping-API
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add reconnect to websocket, add get world json object

Browse Source
This commit is contained in:
lbenedar
2026-04-13 17:40:59 +03:00
parent cd204ebcf5
commit 5bb592ea8a
14 changed files with 321 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
internal/foundry/transport/http.go
View File

@@ -37,14 +37,7 @@ func (tr *FoundryTransport) LaunchWorld(worldName string) error {
}
func (tr *FoundryTransport) ConnectToFoundry() error {
var err error
ok, err := tr.Http.GetSessionToken()
if err != nil {
return err
}
if tr.Http.Password != "" && !ok {
if tr.Http.Password != "" {
err := tr.Authenticate()
if err != nil {
return err
@@ -56,7 +49,7 @@ func (tr *FoundryTransport) ConnectToFoundry() error {
}
func (tr *FoundryTransport) Authenticate() error {
if tr.Http.SessionID == "" {
if tr.Http.SessionID == nil {
err := tr.Http.GetSessionId()
if err != nil {
return err
@@ -74,13 +67,13 @@ func (tr *FoundryTransport) Authenticate() error {
return err
}
return tr.CheckAuthRespAnswer(resp.Body, contentLen)
return tr.CheckAuthResponse(resp.Body, contentLen)
}
func (tr *FoundryTransport) CheckAuthRespAnswer(r io.Reader, respLength int) error {
func (tr *FoundryTransport) CheckAuthResponse(body io.Reader, respLength int) error {
authBody := make([]byte, respLength)
_, err := r.Read(authBody)
_, err := body.Read(authBody)
if err != nil && err != io.EOF {
return err
}
@@ -92,8 +85,50 @@ func (tr *FoundryTransport) CheckAuthRespAnswer(r io.Reader, respLength int) err
return nil
}
func (tr *FoundryTransport) LogInToWorld() error {
if tr.Http.SessionID == nil {
err := tr.Http.GetSessionId()
if err != nil {
return err
}
}
// TODO: make userid and password from tr object
resp, err := tr.Http.PostJoinWorld("YpMHZge0dxBZS5Cm", "")
if err != nil {
return err
}
defer resp.Body.Close()
contentLen, err := strconv.Atoi(resp.Header.Get("Content-Length"))
if err != nil {
return err
}
return tr.CheckLoginResponse(resp.Body, contentLen)
// {"userid":"YpMHZge0dxBZS5Cm","password":"","action":"join"}
}
func (tr *FoundryTransport) CheckLoginResponse(body io.Reader, respLength int) error {
joinBody := make([]byte, respLength)
_, err := body.Read(joinBody)
if err != nil && err != io.EOF {
return err
}
tr.Logger.Debug("Received response", "response", string(joinBody))
if !strings.Contains(string(joinBody), "\"status\":\"success\"") {
return ErrorAuthPassWrong
}
// tr.IsAuth = true
return nil
}
func (tr *FoundryTransport) HasSessionId() bool {
return tr.Http.SessionID != ""
return tr.Http.SessionID != nil
}
func (tr *FoundryTransport) InitSessionId() error {

16
internal/foundry/transport/transport.go
View File

@@ -19,8 +19,12 @@ type FoundryTransport struct {
ReadChan types.ReadChannels
ExchangeChan types.ExchangeChannels
Http requests.FoundryHttpRequest
IsAuth bool
Http *requests.FoundryHttpRequest
ReconnectTimeout time.Duration
ReconnectNum int
ReconnectNumMax int
IsAuth bool
IsLogin bool
Models *db.Models
IsDbInit bool
@@ -36,8 +40,12 @@ func NewFoundryTransport(dbConn *sql.DB, logger *slog.Logger, httpConfig *reques
ProgressMsg: map[string]chan struct{}{},
},
Http: *httpConfig,
IsAuth: false,
Http: httpConfig,
ReconnectTimeout: 500 * time.Millisecond,
IsAuth: false,
IsLogin: false,
ReconnectNumMax: 1,
ReconnectNum: 0,
Models: db.NewModels(dbConn),
IsDbInit: false,

45
internal/foundry/transport/websocket.go
View File

@@ -1,7 +1,6 @@
package transport
import (
"context"
"fmt"
"net/http"
"net/url"
@@ -18,20 +17,39 @@ func (tr *FoundryTransport) InitWebSocketConnection() error {
}
query := url.Values{}
query.Add("session", tr.Http.SessionID)
query.Add("session", *tr.Http.SessionID)
query.Add("EIO", "4")
query.Add("transport", "websocket")
u := url.URL{Scheme: "ws", Host: tr.Http.Host, Path: fmt.Sprintf("%s/", requests.SocketPath), RawQuery: query.Encode()}
wsHeader := http.Header{}
wsHeader.Set("Cookie", fmt.Sprintf("session=%s", tr.Http.SessionID))
wsHeader.Set("Cookie", fmt.Sprintf("session=%s", *tr.Http.SessionID))
wsHeader.Set("Pragma", "no-cache")
wsHeader.Set("Cache-Control", "no-cache")
wsConn, _, err := websocket.DefaultDialer.Dial(u.String(), wsHeader)
dialer := websocket.DefaultDialer
dialer.ReadBufferSize = 128 * 1024 * 1024
dialer.WriteBufferSize = 128 * 1024 * 1024
// dialer.Jar = tr.Http.Jar
// ur, err := url.Parse(fmt.Sprintf("http://%s", tr.Http.Host))
// if err != nil {
// return err
// }
// fmt.Printf("TEST:%v:%v\n", u.String(), dialer.Jar.Cookies(&u))
wsConn, resp, err := dialer.Dial(u.String(), wsHeader)
if err != nil {
return err
}
cookies := resp.Cookies()
for i := range cookies {
fmt.Printf("TEST%d: %v\n", i, cookies[i])
}
// fmt.Printf("TEST1: %v\n")
// fmt.Printf("TEST2: %v\n", wsHeader)
tr.WsConn = wsConn
tr.CurrWsId = 0
tr.Logger.Info("Successefully connected to Foundry Websocket")
@@ -39,6 +57,7 @@ func (tr *FoundryTransport) InitWebSocketConnection() error {
}
func (tr *FoundryTransport) HandleWebsocketRequest(msg *types.WsMessage) ([]byte, error) {
tr.Logger.Debug("WS: Data has been send\n", "msg", msg.ToString())
err := tr.WsConn.WriteMessage(websocket.TextMessage, msg.ToByteSlice())
if err != nil {
return nil, err
@@ -52,8 +71,8 @@ func (tr *FoundryTransport) HandleWebsocketRequest(msg *types.WsMessage) ([]byte
}
func (tr *FoundryTransport) ReceiveMessage(id int) ([]byte, error) {
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
// ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
// defer cancel()
for {
select {
@@ -64,12 +83,12 @@ func (tr *FoundryTransport) ReceiveMessage(id int) ([]byte, error) {
}
tr.CloseMsgChannel(id, 0)
return msg, nil
case <-ctx.Done():
err := ctx.Err()
if err != nil {
return nil, err
}
return nil, ErrorTimeout
// case <-ctx.Done():
// err := ctx.Err()
// if err != nil {
// return nil, err
// }
// return nil, ErrorTimeout
default:
time.Sleep(5 * time.Microsecond)
}
@@ -83,6 +102,8 @@ func (tr *FoundryTransport) ListenWebSocket() {
select {
case <-tr.ReadChan.Done():
return
case <-tr.ReadChan.Reconnect():
return
default:
tr.ReadChan.Err() <- &types.FoundryError{Direction: types.ReaderCode, Err: err, Type: types.WebSocketCode, IsFatal: true}
}