fix errors on insertion to game, fix db creation of game
This commit is contained in:
@@ -31,13 +31,7 @@ func (tr *FoundryTransport) InitWebSocketConnection() error {
|
||||
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
|
||||
@@ -47,8 +41,6 @@ func (tr *FoundryTransport) InitWebSocketConnection() error {
|
||||
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
|
||||
@@ -118,19 +110,47 @@ func (tr *FoundryTransport) ListenWebSocket() {
|
||||
}
|
||||
}
|
||||
|
||||
func (tr *FoundryTransport) ConnectToWorld() error {
|
||||
err := tr.LogInToWorld()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
tr.Logger.Info("World is started. Succesfully logged into world")
|
||||
tr.LoggedInChan = make(chan bool)
|
||||
|
||||
close(tr.ReadChan.Reconnect())
|
||||
|
||||
val, ok := <-tr.LoggedInChan
|
||||
if !ok {
|
||||
return ErrorChannelIsClosed
|
||||
}
|
||||
if !val {
|
||||
return ErrorUserIsNotConnected
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (tr *FoundryTransport) SendOnlyCodeRequest(code string) error {
|
||||
tr.Logger.Debug("WS: Data has been send\n", "msg", types.CodesRespToReq[code])
|
||||
|
||||
return tr.WsConn.WriteMessage(websocket.TextMessage, []byte(types.CodesRespToReq[code]))
|
||||
}
|
||||
|
||||
func (tr *FoundryTransport) GetJsonData(stateType string) ([]byte, error) {
|
||||
func (tr *FoundryTransport) GetJsonDataByType(stateType string) ([]byte, error) {
|
||||
msg := types.NewWsMessageByPage(stateType, tr.CurrWsId)
|
||||
tr.CurrWsId++
|
||||
|
||||
return tr.HandleWebsocketRequest(msg)
|
||||
}
|
||||
|
||||
func (tr *FoundryTransport) GetJsonData(msg string) ([]byte, error) {
|
||||
wsMsg := types.NewWsMessage(msg, tr.CurrWsId)
|
||||
tr.CurrWsId++
|
||||
|
||||
return tr.HandleWebsocketRequest(wsMsg)
|
||||
}
|
||||
|
||||
func (tr *FoundryTransport) CloseWebSocketConn() error {
|
||||
tr.Logger.Debug("Websocket has been closed")
|
||||
return tr.WsConn.Close()
|
||||
|
||||
Reference in New Issue
Block a user