Skip to content

Commit 2c7e69e

Browse files
author
Zbynek Novotny
committedDec 8, 2017
Refactoring the WS framework
The goal is still to simplify (de)serialization to/from JSON.
1 parent 3c7f076 commit 2c7e69e

9 files changed

+216
-185
lines changed
 

‎gameclient/config/cmdlineargs.go ‎gameclient/client/config/cmdlineargs.go

File renamed without changes.

‎gameclient/config/config.go ‎gameclient/client/config/config.go

File renamed without changes.

‎gameclient/client/list_match.go

+41-24
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,21 @@ func listDMMatches(ml *match.DMMatches) {
3333
return
3434
}
3535

36-
for _, match := range *ml {
37-
fmt.Println("Match ID:", match.Number)
38-
fmt.Println("Ranks:\nPlayer\t\tKills\tDeaths\n---")
39-
for _, rank := range match.Ranks {
40-
fmt.Println(rank.Player.Nick, "\t\t", rank.Kills, "\t", rank.Deaths)
41-
}
36+
for _, m := range *ml {
37+
printDMMatch(m)
4238
fmt.Println("---------------------------------------------")
4339
}
4440
}
4541

42+
func printDMMatch(m *match.DMMatch) {
43+
fmt.Println("Match ID:", m.Number)
44+
fmt.Println("Ranks:\nPlayer\t\tKills\tDeaths\n---")
45+
for _, rank := range m.Ranks {
46+
fmt.Println(rank.Player.Nick, "\t\t", rank.Kills, "\t", rank.Deaths)
47+
}
48+
49+
}
50+
4651
func listCTFMatches(ml *match.CTFMatches) {
4752
fmt.Println("---------------------------------------------")
4853
fmt.Println("Game type:", match.CaptureTheFlag)
@@ -52,16 +57,20 @@ func listCTFMatches(ml *match.CTFMatches) {
5257
return
5358
}
5459

55-
for _, match := range *ml {
56-
fmt.Println("Match ID:", match.Number)
57-
fmt.Println("Ranks:\nPlayer\t\tKills\tDeaths\tCaptures\n---")
58-
for _, rank := range match.Ranks {
59-
fmt.Println(rank.Player.Nick, "\t\t", rank.Kills, "\t", rank.Deaths, "\t", rank.Captures)
60-
}
60+
for _, m := range *ml {
61+
printCTFMatch(m)
6162
fmt.Println("---------------------------------------------")
6263
}
6364
}
6465

66+
func printCTFMatch(m *match.CTFMatch) {
67+
fmt.Println("Match ID:", m.Number)
68+
fmt.Println("Ranks:\nPlayer\t\tKills\tDeaths\tCaptures\n---")
69+
for _, rank := range m.Ranks {
70+
fmt.Println(rank.Player.Nick, "\t\t", rank.Kills, "\t", rank.Deaths, "\t", rank.Captures)
71+
}
72+
}
73+
6574
func listLMSMatches(ml *match.LMSMatches) {
6675
fmt.Println("---------------------------------------------")
6776
fmt.Println("Game type:", match.LastManStanding)
@@ -71,16 +80,20 @@ func listLMSMatches(ml *match.LMSMatches) {
7180
return
7281
}
7382

74-
for _, match := range *ml {
75-
fmt.Println("Match ID:", match.Number)
76-
fmt.Println("Ranks:\nPlayer\t\tKills\tDeaths\n---")
77-
for _, rank := range match.Ranks {
78-
fmt.Println(rank.Player.Nick, "\t\t", rank.Kills, "\t", rank.Deaths)
79-
}
83+
for _, m := range *ml {
84+
printLMSMatch(m)
8085
fmt.Println("---------------------------------------------")
8186
}
8287
}
8388

89+
func printLMSMatch(m *match.LMSMatch) {
90+
fmt.Println("Match ID:", m.Number)
91+
fmt.Println("Ranks:\nPlayer\t\tKills\tDeaths\n---")
92+
for _, rank := range m.Ranks {
93+
fmt.Println(rank.Player.Nick, "\t\t", rank.Kills, "\t", rank.Deaths)
94+
}
95+
}
96+
8497
func listDuelMatches(ml *match.DuelMatches) {
8598
fmt.Println("---------------------------------------------")
8699
fmt.Println("Game type:", match.Duel)
@@ -90,12 +103,16 @@ func listDuelMatches(ml *match.DuelMatches) {
90103
return
91104
}
92105

93-
for _, match := range *ml {
94-
fmt.Println("Match ID:", match.Number)
95-
fmt.Println("Ranks:\nPlayer\t\tKills\tDeaths\n---")
96-
for _, rank := range match.Ranks {
97-
fmt.Println(rank.Player.Nick, "\t\t", rank.Kills, "\t", rank.Deaths)
98-
}
106+
for _, m := range *ml {
107+
printDuelMatch(m)
99108
fmt.Println("---------------------------------------------")
100109
}
101110
}
111+
112+
func printDuelMatch(m *match.DuelMatch) {
113+
fmt.Println("Match ID:", m.Number)
114+
fmt.Println("Ranks:\nPlayer\t\tKills\tDeaths\n---")
115+
for _, rank := range m.Ranks {
116+
fmt.Println(rank.Player.Nick, "\t\t", rank.Kills, "\t", rank.Deaths)
117+
}
118+
}

‎gameclient/client/net/restfunctions.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"io/ioutil"
77
"net/http"
88

9+
"github.com/mrclayman/rest-and-go/gameclient/client/config"
910
"github.com/mrclayman/rest-and-go/gameclient/client/shared"
10-
"github.com/mrclayman/rest-and-go/gameclient/config"
1111
)
1212

1313
func processResponse(resp *http.Response, out interface{}) error {

‎gameclient/client/net/ws/functions.go

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package ws
2+
3+
import (
4+
"net/url"
5+
6+
"github.com/gorilla/websocket"
7+
"github.com/mrclayman/rest-and-go/gameclient/client/config"
8+
)
9+
10+
// CreateSession launches a WebSocket session
11+
// for the player
12+
func CreateSession() (*websocket.Conn, error) {
13+
u := url.URL{Scheme: "ws", Host: config.Cfg.Conn.ServerURL, Path: "/match/room"}
14+
conn, _, err := websocket.DefaultDialer.Dial(u.String(), nil)
15+
if err != nil {
16+
return nil, err
17+
}
18+
19+
return conn, nil
20+
}

‎gameclient/client/net/ws/messages.go

+138
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,138 @@
1+
package ws
2+
3+
import (
4+
"errors"
5+
"strconv"
6+
7+
"github.com/mrclayman/rest-and-go/gameclient/client/match"
8+
"github.com/mrclayman/rest-and-go/gameclient/client/net"
9+
)
10+
11+
const (
12+
// InvalidMessageID defines the ID
13+
// of an invalid message that should
14+
// never be dispatched
15+
InvalidMessageID uint16 = 0
16+
17+
// WeaponFireMessageID defines the ID
18+
// of a message that indicates the
19+
// player fired a weapon
20+
WeaponFireMessageID uint16 = 1
21+
22+
// PlayerMoveMessageID defines the ID
23+
// of a message that indicates the
24+
// player moved to a new position
25+
PlayerMoveMessageID uint16 = 2
26+
27+
// PlayerListMessageID defines the ID
28+
// of a message that indicates the
29+
// player requested a list of players
30+
// present in the match
31+
PlayerListMessageID uint16 = 3
32+
33+
// QuitMessageID defines the ID
34+
// of a message that indicates the
35+
// player has requested to quit the match
36+
QuitMessageID uint16 = 4
37+
)
38+
39+
// WeaponFireMessage is used to notify server
40+
// of a user firing a weapon
41+
type WeaponFireMessage struct {
42+
MessageID uint16 `json:"message_id"`
43+
PlayerID int `json:"player_id"`
44+
Match match.ID `json:"match"`
45+
Token string `json:"token"`
46+
}
47+
48+
// newWeaponFireMessage is used to synthesize
49+
// an instance of the WeaponFireMessage structure
50+
func newWeaponFireMessage(ps net.PlayerSession, ms net.MatchSession) *WeaponFireMessage {
51+
return &WeaponFireMessage{
52+
MessageID: WeaponFireMessageID,
53+
PlayerID: ps.ID,
54+
Match: ms.ID,
55+
Token: ms.Token,
56+
}
57+
}
58+
59+
// PlayerMoveMessage is used to indicate to the
60+
// server that the player has changed position
61+
// The new position is transmitted to the server
62+
type PlayerMoveMessage struct {
63+
MessageID uint16 `json:"message_id"`
64+
PlayerID int `json:"player_id"`
65+
Match match.ID `json:"match"`
66+
Token string `json:"token"`
67+
Data [3]float64 `json:"data"`
68+
}
69+
70+
// newPlayerMoveMessage is used to synthesize
71+
// an instance of the PlayerMoveMessage structure
72+
func newPlayerMoveMessage(ps net.PlayerSession, ms net.MatchSession) *PlayerMoveMessage {
73+
return &PlayerMoveMessage{
74+
MessageID: PlayerMoveMessageID,
75+
PlayerID: ps.ID,
76+
Match: ms.ID,
77+
Token: ms.Token,
78+
Data: [3]float64{34.4154367, -123.42362662, 11.23267334},
79+
}
80+
}
81+
82+
// PlayerListMessage is used to indicate to the
83+
// server that the player wishes to obtain the
84+
// list of
85+
type PlayerListMessage struct {
86+
MessageID uint16 `json:"message_id"`
87+
PlayerID int `json:"player_id"`
88+
Match match.ID `json:"match"`
89+
Token string `json:"token"`
90+
}
91+
92+
// newPlayerListMessage synthesizes a new
93+
// PlayerListMessage instance
94+
func newPlayerListMessage(ps net.PlayerSession, ms net.MatchSession) *PlayerListMessage {
95+
return &PlayerListMessage{
96+
MessageID: PlayerListMessageID,
97+
PlayerID: ps.ID,
98+
Match: ms.ID,
99+
Token: ms.Token,
100+
}
101+
}
102+
103+
// QuitMatchMessage indicates to the server
104+
// that the player wishes to leave the match
105+
type QuitMatchMessage struct {
106+
MessageID uint16 `json:"message_id"`
107+
PlayerID int `json:"player_id"`
108+
Match match.ID `json:"match"`
109+
Token string `json:"token"`
110+
}
111+
112+
// newQuitMatchMessage synthesizes a QuitMessage
113+
// structure instance
114+
func newQuitMatchMessage(ps net.PlayerSession, ms net.MatchSession) *QuitMatchMessage {
115+
return &QuitMatchMessage{
116+
MessageID: QuitMessageID,
117+
PlayerID: ps.ID,
118+
Match: ms.ID,
119+
Token: ms.Token,
120+
}
121+
}
122+
123+
// NewMessage creates a new message based
124+
// on the ID provided in the argument
125+
func NewMessage(ID uint16, ps net.PlayerSession, ms net.MatchSession) (interface{}, error) {
126+
switch ID {
127+
case WeaponFireMessageID:
128+
return newWeaponFireMessage(ps, ms), nil
129+
case PlayerMoveMessageID:
130+
return newPlayerMoveMessage(ps, ms), nil
131+
case PlayerListMessageID:
132+
return newPlayerListMessage(ps, ms), nil
133+
case QuitMessageID:
134+
return newQuitMatchMessage(ps, ms), nil
135+
default:
136+
return nil, errors.New("Unhandled message ID " + strconv.FormatUint(uint64(ID), 10))
137+
}
138+
}

‎gameclient/client/net/ws/ws_messages.go

-128
This file was deleted.

‎gameclient/client/play_match.go

+15-31
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"fmt"
55
"net/http"
66

7+
"github.com/mrclayman/rest-and-go/gameclient/client/match"
78
"github.com/mrclayman/rest-and-go/gameclient/client/net"
8-
"github.com/mrclayman/rest-and-go/gameclient/client/player"
9-
"github.com/mrclayman/rest-and-go/gameclient/client/shared"
9+
"github.com/mrclayman/rest-and-go/gameclient/client/net/ws"
1010
)
1111

1212
func getUserAction() uint16 {
@@ -35,59 +35,43 @@ func getUserAction() uint16 {
3535
return choice
3636
}
3737

38-
func printPlayerList(mt string, playerList map[string]interface{}) {
39-
fmt.Println("---------------\nMatch type:", mt)
40-
fmt.Println("Ranks:")
41-
fmt.Println("Player\tKills\tDeaths")
42-
fmt.Println("---------------")
43-
for _, rank := range playerList["ranks"].(map[string]interface{}) {
44-
rankMap, ok := rank.(map[string]interface{})
45-
if !ok {
46-
fmt.Println("Cannot print player list, item not a map of values")
47-
return
48-
}
38+
func printPlayerList(gt string, data []byte) {
39+
fmt.Printf("---------------\nMatch type: %v\n---------------\n", gt)
40+
41+
switch gt {
42+
case match.DeathMatch:
4943

50-
p, err := player.FromMap(rankMap)
51-
if err != nil {
52-
fmt.Println("Could not obtain player struct:", err.Error())
53-
}
54-
fmt.Println(p.Nick, "\t", rankMap["kills"], "\t", rankMap["deaths"])
5544
}
56-
fmt.Println("---------------")
57-
fmt.Println()
5845
}
5946

47+
// runMatchLoop obtains input from the player
48+
// generates messages based on the input, sends
49+
// them to the server and processes its responses
6050
func runMatchLoop(c *http.Client, ps net.PlayerSession, ms net.MatchSession) error {
61-
conn, err := net.CreateSession()
51+
conn, err := ws.CreateSession()
6252
if err != nil {
6353
return err
6454
}
6555

6656
for {
6757
msgID := getUserAction()
68-
msg, err := net.CreateMessage(ps, ms, msgID)
58+
msg, err := ws.NewMessage(msgID, ps, ms)
6959

7060
if err != nil {
7161
return err
7262
} else if err = conn.WriteJSON(msg); err != nil {
7363
return err
7464
}
7565

76-
var respData map[string]interface{}
7766
var data []byte
78-
79-
// I cannot use ReadJSON() because I need
80-
// special handling of numeric values
8167
_, data, err = conn.ReadMessage()
8268
if err != nil {
8369
return err
84-
} else if err = shared.DecodeJSON(data, &respData); err != nil {
85-
return err
8670
}
8771

88-
if msgID == net.PlayerListMessage {
89-
printPlayerList(ms.ID.Type, respData)
90-
} else if msgID == net.QuitMessage {
72+
if msgID == ws.PlayerListMessageID {
73+
printPlayerList(ms.ID.Type, data)
74+
} else if msgID == ws.QuitMessageID {
9175
break
9276
}
9377
}

‎gameclient/gameclient.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"net/http"
66

77
"github.com/mrclayman/rest-and-go/gameclient/client"
8-
"github.com/mrclayman/rest-and-go/gameclient/config"
8+
"github.com/mrclayman/rest-and-go/gameclient/client/config"
99
)
1010

1111
////////////// Functions ////////////////

0 commit comments

Comments
 (0)
Please sign in to comment.