fix errors on insertion to game, fix db creation of game

internal/foundry/transport/db.go

@@ -20,33 +20,22 @@ func (tr *FoundryTransport) FillDBWithFoundryData() {
 	// 	return
 	// }
 
-	// err = tr.InitWorldsData(idState)
-	// if err != nil {
-	// 	tr.ReadChan.Err() <- &types.FoundryError{Direction: types.WriterCode, Err: err, Type: types.DbCode}
-	// 	return
-	// }
+	err = tr.InitWorldsData()
+	if err != nil {
+		tr.ReadChan.Err() <- &types.FoundryError{Direction: types.WriterCode, Err: err, Type: types.DbCode}
+		return
+	}
 }
 
 func (tr *FoundryTransport) InitSetupData() error {
 	db.DeleteAll(tr.DB)
 	db.DeleteAllSeq(tr.DB)
-	for k := range requests.PathToSetupState {
-		err := tr.InsertJsonDataToDB(k)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
+
+	return tr.InsertSetupToDB()
 }
 
-func (tr *FoundryTransport) InsertJsonDataToDB(statePath string) error {
-	_, ok1 := requests.PathToSetupState[statePath]
-	_, ok2 := requests.PathToWorldState[statePath]
-	if !ok1 && !ok2 {
-		return ErrorStateTypeNotExist
-	}
-
-	msgJson, err := tr.GetJsonData(statePath)
+func (tr *FoundryTransport) InsertSetupToDB() error {
+	msgJson, err := tr.GetJsonDataByType(requests.SetupPath)
 	if err != nil {
 		return err
 	}
@@ -67,35 +56,49 @@ func (tr *FoundryTransport) InsertJsonDataToDB(statePath string) error {
 	return nil
 }
 
-// func (tr *FoundryTransport) InitWorldsData(idState int64) error {
-// 	worlds, err := tr.Models.FoundryState.GetWorlds(idState)
-// 	if err != nil {
-// 		return err
-// 	}
-// 	tr.Logger.Debug("Worlds", "len", len(worlds))
+func (tr *FoundryTransport) InitWorldsData() error {
+	worlds := []string{"kingmaker"} //TODO: get world name from database
 
-// 	for i := range worlds {
-// 		worldName := worlds[i].TextId
-// 		tr.InitWorldData(worldName)
-// 		_, err = tr.Http.PostReturnToSetup()
-// 		if err != nil {
-// 			return err
-// 		}
-// 	}
-// 	return nil
-// }
+	for i := range worlds {
+		worldName := worlds[i]
+		tr.InitWorldData(worldName)
+		_, err := tr.Http.PostReturnToSetup()
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
 
-// func (tr *FoundryTransport) InitWorldData(worldName string) error {
-// 	tr.Logger.Debug("World name", "name", worldName)
-// 	err := tr.LaunchWorld(worldName)
-// 	if err != nil {
-// 		return err
-// 	}
-// 	for k := range requests.PathToWorldState {
-// 		err := tr.InsertJsonDataToDB(k)
-// 		if err != nil {
-// 			return err
-// 		}
-// 	}
-// 	return nil
-// }
+func (tr *FoundryTransport) InitWorldData(worldName string) error {
+	tr.Logger.Debug("World name", "name", worldName)
+	err := tr.LaunchWorld(worldName)
+	if err != nil {
+		return err
+	}
+	return tr.InsertGameToDB()
+}
+
+func (tr *FoundryTransport) InsertGameToDB() error {
+	err := tr.ConnectToWorld()
+	if err != nil {
+		return err
+	}
+
+	msgJson, err := tr.GetJsonData("world")
+	if err != nil {
+		return err
+	}
+
+	tr.Logger.Info("Game data received")
+
+	gameJson, err := json.ParseGame(msgJson)
+	if err != nil {
+		return err
+	}
+
+	var foundryStateDb db.Game
+	gameJson.ToDB(&foundryStateDb)
+
+	return foundryStateDb.Insert(tr.DB)
+}

internal/foundry/transport/errors.go

@@ -3,9 +3,11 @@ package transport
 import "errors"
 
 var (
-	ErrorNotAuth           = errors.New("Admin is not authenticated")
-	ErrorIsNotReady        = errors.New("Connection is not ready for communication")
-	ErrorTimeout           = errors.New("Answer has not been received after timeout")
-	ErrorStateTypeNotExist = errors.New("State type does not exists")
-	ErrorAuthPassWrong     = errors.New("Authentication password is wrong")
+	ErrorNotAuth            = errors.New("Admin is not authenticated")
+	ErrorIsNotReady         = errors.New("Connection is not ready for communication")
+	ErrorTimeout            = errors.New("Answer has not been received after timeout")
+	ErrorStateTypeNotExist  = errors.New("State type does not exists")
+	ErrorAuthPassWrong      = errors.New("Authentication password is wrong")
+	ErrorChannelIsClosed    = errors.New("Channel has been closed")
+	ErrorUserIsNotConnected = errors.New("User is not connected")
 )

internal/foundry/transport/transport.go

@@ -17,6 +17,7 @@ type FoundryTransport struct {
 	ChanMutex    sync.Mutex
 	ReadChan     types.ReadChannels
 	ExchangeChan types.ExchangeChannels
+	LoggedInChan chan bool
 
 	Http             *requests.FoundryHttpRequest
 	ReconnectTimeout time.Duration

internal/foundry/transport/websocket.go

@@ -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()