refactor for bot

protocol.go

@@ -1,77 +1,11 @@
 package main
 
 import (
+	"bitbucket.org/hackerbots/bot"
 	"code.google.com/p/go.net/websocket"
 	"errors"
 )
 
-type GameID struct {
-	Id string `json:"id"`
-}
-
-// > identify
-type IdRequest struct {
-	Type       string `json:"type"`
-	AssignedID string `json:"id"`
-}
-
-func NewIdRequest(id string) *IdRequest {
-	return &IdRequest{
-		Type:       "idreq",
-		AssignedID: id,
-	}
-}
-
-// < [robot | spectator], name, client-type, game ID
-type ClientID struct {
-	Type      string `json:"type"`
-	Name      string `json:"name"`
-	Useragent string `json:"useragent"`
-}
-
-func (c *ClientID) Valid() (bool, string) {
-	switch c.Type {
-	case "robot", "spectator":
-		return true, ""
-	}
-	return false, "usergent must be 'robot' or 'spectator'"
-}
-
-type BoardSize struct {
-	Width  float64 `json:"width"`
-	Height float64 `json:"height"`
-}
-
-type GameParam struct {
-	BoardSize BoardSize `json:"boardsize"`
-	Type      string    `json:"type"`
-}
-
-// > [OK | FULL | NOT AUTH], board size, game params
-func NewGameParam(w, h float64) *GameParam {
-	return &GameParam{
-		BoardSize: BoardSize{
-			Width:  w,
-			Height: h,
-		},
-		Type: "gameparam",
-	}
-}
-
-type Handshake struct {
-	ID      string `json:"id"`
-	Success bool   `json:"success"`
-	Type    string `json:"type"`
-}
-
-func NewHandshake(id string, success bool) *Handshake {
-	return &Handshake{
-		ID:      id,
-		Success: success,
-		Type:    "handshake",
-	}
-}
-
 type Failure struct {
 	Reason string `json:"reason"`
 	Type   string `json:"type"`
@@ -84,15 +18,15 @@ func NewFailure(reason string) *Failure {
 	}
 }
 
-func Negociate(ws *websocket.Conn, id string, width, height float64) (*Config, error) {
+func Negociate(ws *websocket.Conn, id string, width, height float64) (*bot.Config, error) {
 	var err error
 
-	err = websocket.JSON.Send(ws, NewIdRequest(id))
+	err = websocket.JSON.Send(ws, bot.NewIdRequest(id))
 	if err != nil {
 		return nil, errors.New("generic servr error")
 	}
 
-	var clientid ClientID
+	var clientid bot.ClientID
 	err = websocket.JSON.Receive(ws, &clientid)
 	if err != nil {
 		return nil, errors.New("could not parse id")
@@ -105,7 +39,7 @@ func Negociate(ws *websocket.Conn, id string, width, height float64) (*Config, e
 		return nil, errors.New(msg)
 	}
 
-	gameParam := NewGameParam(width, height)
+	gameParam := bot.NewGameParam(width, height)
 	err = websocket.JSON.Send(ws, gameParam)
 	if err != nil {
 		websocket.JSON.Send(ws, NewFailure("generic server error"))
@@ -113,18 +47,18 @@ func Negociate(ws *websocket.Conn, id string, width, height float64) (*Config, e
 	}
 	switch clientid.Type {
 	case "robot":
-		var conf Config
+		var conf bot.Config
 		for {
 			err = websocket.JSON.Receive(ws, &conf)
 			if err != nil {
 				return nil, err
 			}
 			// TODO: verify conf's type
-			if conf.Stats.valid() {
-				_ = websocket.JSON.Send(ws, NewHandshake(id, true))
+			if conf.Stats.Valid() {
+				_ = websocket.JSON.Send(ws, bot.NewHandshake(id, true))
 				break
 			} else {
-				_ = websocket.JSON.Send(ws, NewHandshake(id, false))
+				_ = websocket.JSON.Send(ws, bot.NewHandshake(id, false))
 			}
 		}
 		return &conf, nil