gateway fixes

Author: y21

http/gateway/handler.go

@@ -39,7 +39,7 @@ func Handle(c *websocket.Conn) {
 err := c.ReadJSON(&msg)
 if err != nil {
 fmt.Println(err)
-//handleClose(&ws)
+handleClose(&ws)
 break
 }
 
@@ -51,7 +51,7 @@ func Handle(c *websocket.Conn) {
 case OpEvent:
 handleEvent(&ws, &msg)
 case OpClose:
-//handleClose(&ws)
+handleClose(&ws)
 break
 }
 }
@@ -111,10 +111,22 @@ func handleHello(c *WebSocketConnection, d *AnyMessage) {
 
 r.Players = append(r.Players, &p)
 
-// TODO: check if room is elimination room and if it meets requirements for room start
-
-// TODO: send room data to client
 fmt.Println(r)
+c.Send(AnyMessage{
+Op: OpEvent,
+T: HeartbeatEvent,
+Data: map[string]interface{}{
+"user": p,
+"users": r.Players,
+"objects": r.Map.Objects,
+"interval": PingInterval,
+"items": r.Items,
+"roomCreatedAt": r.CreatedAt,
+"state": r.State,
+"countdownStarted": r.CountdownStarted,
+},
+})
+// TODO: check if room is elimination room and if it meets requirements for room start
 }
 
 func handleHeartbeat(c *WebSocketConnection, d *AnyMessage) {

http/gateway/types.go

@@ -17,6 +17,7 @@ const (
 ItemCollectEvent = "itemCollect"
 ItemUpdateEvent = "itemUpdate"
 StatsChangeEvent = "statsChange"
+HeartbeatEvent = "heartbeat"
 
 // Kick types
 RoomFullKick = 0
@@ -28,6 +29,11 @@ const (
 WinKick = 6
 RoomEndKick = 7
 FlagLimitKick = 8
+
+// Other
+// Clients send a ping every N milliseconds
+PingInterval = 3000
+PingIntervalLimit = 10000
 )
 
 type AnyMessage struct {

models/gamemap/gamemap.go

@@ -14,7 +14,7 @@ type GameMapSize struct {
 }
 
 type GameMapObject struct {
-NoNomAreas []GameMapNoNomArea `json:"noNomAreas"`
+NoNomAreas []GameMapNoNomArea `json:"noNomArea"`
 Walls []GameMapWall `json:"walls"`
 }
 

public/js/game.ts

@@ -145,6 +145,14 @@ if (["Android", "iOS"].some(v => window.navigator.userAgent.includes(v))) {
  Blobpeek = "../assets/blobpeek.png",
  Blobnom = "../assets/blobnom.png"
  }
+ enum BlobID {
+ Blobowo,
+ Blobevil,
+ Blobeyes,
+ Blobkittenknife,
+ Blobpeek,
+ Blobnom
+ }
  enum ItemType {
  HEALTH = 0,
  COIN = 1
@@ -794,7 +802,7 @@ if (["Android", "iOS"].some(v => window.navigator.userAgent.includes(v))) {
 
  // Own blob
  ownBlob.owner = eventData.user.username;
- ownBlob.blob = eventData.user.blob;
+ ownBlob.blob = <BlobType>blobIDToString(eventData.user.blob);
  ownBlob.directionChangedAt = Date.now();
  ownBlob.directionChangeCoordinates.x = ownBlob.x = eventData.user.x;
  ownBlob.directionChangeCoordinates.y = ownBlob.y = eventData.user.y;
@@ -1559,6 +1567,28 @@ if (["Android", "iOS"].some(v => window.navigator.userAgent.includes(v))) {
  wsc.onopen = (): any => wsc.send(data);
  }
  }
+ function blobIDToString(id: BlobID): string | null {
+ switch (id) {
+ case BlobID.Blobowo:
+ return BlobType.Blobowo;
+ break;
+ case BlobID.Blobevil:
+ return BlobType.Blobevil;
+ break;
+ case BlobID.Blobeyes:
+ return BlobType.Blobeyes;
+ break;
+ case BlobID.Blobkittenknife:
+ return BlobType.Blobkittenknife;
+ case BlobID.Blobpeek:
+ return BlobType.Blobpeek;
+ break;
+ case BlobID.Blobnom:
+ return BlobType.Blobnom;
+ default:
+ return null;
+ }
+ }