Mirrors/cloud-game
1
0
Fork 0
mirror of https://github.com/giongto35/cloud-game.git synced 2026-07-23 10:07:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add register room logic

Browse source
This commit is contained in:
giongto35 2019-04-20 04:47:52 +08:00
parent ff2262f204
commit 757d2021c4
2 changed files with 28 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
main.go
View file

@ -146,6 +146,7 @@ func isRoomRunning(roomID string) bool {
// startSession handles one session call
func startSession(webRTC *webrtc.WebRTC, gameName string, roomID string, playerIndex int) (rRoomID string, isNewRoom bool) {
isNewRoom = false
cleanSession(webRTC)
// If the roomID is empty,
// or the roomID doesn't have any running sessions (room was closed)
@ -162,7 +163,7 @@ func startSession(webRTC *webrtc.WebRTC, gameName string, roomID string, playerI
webRTC.AttachRoomID(roomID)
go startWebRTCSession(room, webRTC, playerIndex)
return roomID, false
return roomID, isNewRoom
}
// Session represents a session connected from the browser to the current server
@ -184,7 +185,6 @@ func ws(w http.ResponseWriter, r *http.Request) {
var roomID string
var playerIndex int
var oclient *Client
// Create connection to overlord
client := NewClient(c, webrtc.NewWebRTC())
@ -252,10 +252,17 @@ func ws(w http.ResponseWriter, r *http.Request) {
//log.Println("Ping from server with game:", gameName)
//res.ID = "pong"
log.Println("Starting game")
roomServerID := <-GetServerIDOfRoom(wssession.oclient, roomID)
log.Println("Server of RoomID ", roomID, " is ", roomServerID)
if roomServerID != "" && wssession.ServerID != roomServerID {
// TODO: Re -register
return
}
roomID, isNewRoom = startSession(client.peerconnection, gameName, roomID, playerIndex)
if isNewRoom {
oclient.send(WSPacket{
ID: "RegisterRoom",
wssession.oclient.send(WSPacket{
ID: "registerRoom",
Data: roomID,
})
}
@ -375,12 +382,14 @@ func removeSession(w *webrtc.WebRTC, room *Room) {
}
}
func GetServerIDOfRoom(oc Client, roomID string) chan string {
func GetServerIDOfRoom(oc *Client, roomID string) chan string {
res := make(chan string)
oc.syncSend(WSPacket{
ID: "getRoom",
ID: "getRoom",
Data: roomID,
}, func(resp WSPacket) {
log.Println("GetRoom", resp.Data)
res <- resp.Data
})
return res
@ -427,5 +436,8 @@ func (s *Session) NewOverlordClient() {
go oclient.listen()
s.oclient = oclient
// TODO: return oclient
return
}

13
overlord.go
View file

@ -10,7 +10,7 @@ import (
"github.com/giongto35/cloud-game/webrtc"
)
var overlordRooms = map[string]string{}
var roomToServer = map[string]string{}
// servers are the map serverID to server Client
var servers = map[string]Client{}
@ -46,12 +46,19 @@ func wso(w http.ResponseWriter, r *http.Request) {
})
client.syncReceive("registerRoom", func(resp WSPacket) WSPacket {
log.Println("received registerRoom")
overlordRooms[resp.Data] = serverID
log.Println("Received registerRoom ", resp.Data, serverID)
roomToServer[resp.Data] = serverID
return WSPacket{
ID: "registerRoom",
}
})
client.syncReceive("getRoom", func(resp WSPacket) WSPacket {
return WSPacket{
ID: "getRoom",
Data: roomToServer[resp.Data],
}
})
client.listen()
}