Update code to enable lobby server integration

Author: NZSPY

Client/Atari/FujiLlama.bas

@@ -212,12 +212,13 @@ DATA colorThemeMap()      =  $B4,$88,  $84,$08, $22,$28, $04,$08,' NTSC
 DATA                      =  $A4,$78,  $74,$08, $12,$18, $04,$08 ' PAL 
 colorTheme=-1
 
-' Read server endpoint stored from Lobby
+
 serverEndpoint$=""
 query$=""
 
+' Read server endpoint stored from Lobby
 @NReadAppKey AK_LOBBY_CREATOR_ID, AK_LOBBY_APP_ID, AK_LOBBY_KEY_SERVER, &serverEndpoint$
-serverEndpoint$="" ' Clear for testing - comment out to use lobby server setting
+'serverEndpoint$="" ' Clear for testing - comment out to use lobby server setting
 
 ' Parse endpoint url into server and query
 if serverEndpoint$<>""
@@ -231,7 +232,7 @@ if serverEndpoint$<>""
 else
   ' Default to known server if not specified by lobby. Override for local testing
   serverEndpoint$="N:https://fujillama.spysoft.nz"
-  'serverEndpoint$="N:http://192.168.68.100:8080"
+  'serverEndpoint$="N:http://192.168.68.100:8080" ' Local server for testing
 endif
 
 ' Fuji-Net Setup Variblies 

server/lobbyClient.go

@@ -11,7 +11,8 @@ import (
 )
 
 const (
-	LOBBY_ENDPOINT_UPSERT = "http://lobby.fujinet.online/server"
+	// LOBBY_ENDPOINT_UPSERT = "http://qalobby.fujinet.online/server" --- use for testing
+	LOBBY_ENDPOINT_UPSERT = "http://qalobby.fujinet.online/server"
 )
 
 // Defaults for this game server
@@ -20,9 +21,9 @@ var DefaultGameServerDetails = GameServer{
 	Appkey:    4,
 	Game:      "Fuji-Llama",
 	Region:    "nz",
-	Serverurl: "https://fujillama.spysoft.nz/",
+	Serverurl: "N:https://fujillama.spysoft.nz",
 	Clients: []GameClient{
-		{Platform: "atari", Url: "tnfs://ec.tnfs.io/atari/fujillama.xex"},
+		{Platform: "atari", Url: "tnfs://34.31.166.226/atari/fujillama.xex"},
 	},
 }
 
@@ -48,10 +49,6 @@ type GameClient struct {
 
 func sendStateToLobby(maxPlayers int, curPlayers int, isOnline bool, server string, instanceUrlSuffix string) {
 
-	//if !UpdateLobby {
-	//	return
-	//}
-
 	// Start with copy of default game server details
 	serverDetails := DefaultGameServerDetails
 	serverDetails.Maxplayers = maxPlayers
@@ -64,12 +61,12 @@ func sendStateToLobby(maxPlayers int, curPlayers int, isOnline bool, server stri
 
 	serverDetails.Server = server
 	serverDetails.Serverurl += instanceUrlSuffix
+	//serverDetails.Serverurl += ""
 
 	jsonPayload, err := json.Marshal(serverDetails)
 	if err != nil {
 		panic(err)
 	}
-	log.Printf("Updating Lobby: %s", jsonPayload)
 	fmt.Printf("Updating Lobby: %s", jsonPayload)
 	request, err := http.NewRequest("POST", LOBBY_ENDPOINT_UPSERT, bytes.NewBuffer(jsonPayload))
 	if err != nil {
@@ -89,7 +86,6 @@ func sendStateToLobby(maxPlayers int, curPlayers int, isOnline bool, server stri
 	log.Printf("Lobby Response: %s", response.Status)
 	if response.StatusCode > 300 {
 		body, _ := io.ReadAll(response.Body)
-		log.Println("response Body:", string(body))
 		fmt.Println("response Body:", string(body))
 	}
 

server/main.go

@@ -121,7 +121,8 @@ func main() {
 			EndedLast:      -1,
 			RoundOver:      false,
 			Gameover:       false}
-		SetupTable(i) // Initialize each table with a new deck and shuffle it
+		setUpTable(i)  // Initialize each table with a new deck and shuffle it
+		updateLobby(i) // Update the lobby with the initial state of each table
 	}
 
 	router := gin.Default()
@@ -132,7 +133,6 @@ func main() {
 	router.GET("/join", joinTable)        // Join a table
 	router.GET("/start", StartNewGame)    // start a new game on a table (this also happens automaticly when the table is filled with players), if the table is not filled  it will fill the emplty slots with AI Players
 	router.GET("/move", doVaildMoveURL)   // Make a move on the table (play, fold, draw)
-	router.GET("/updateLobby", apiUpdateLobby)
 
 	// Set up router and start server
 	router.SetTrustedProxies(nil) // Disable trusted proxies because Gin told me to do it.. (neeed to investigate this further)
@@ -189,7 +189,7 @@ func NewDeck() []Card {
 	return deck
 }
 
-func SetupTable(tableIndex int) {
+func setUpTable(tableIndex int) {
 	if tableIndex < 0 || tableIndex >= len(gameStates) {
 		return // Invalid table index
 	}
@@ -280,6 +280,7 @@ func joinTable(c *gin.Context) {
 		tables[tableIndex].CurPlayers = gameStates[tableIndex].Table.CurPlayers // update the quick table view players count
 		tables[tableIndex].Status = gameStates[tableIndex].Table.Status         // update the quick table view status
 		gameStates[tableIndex].startTime = time.Now()                           // Reset the waiting timer for the game state
+		updateLobby(tableIndex)                                                 // Update the lobby with the new table state
 	}
 }
 
@@ -936,7 +937,7 @@ func resetGame(tableIndex int) {
 		Players:        Players{},
 		LastMovePlayed: "Waiting for players to join",
 	}
-	SetupTable(tableIndex) // Initialize each table with a new deck and shuffle it
+	setUpTable(tableIndex) // Initialize each table with a new deck and shuffle it
 }
 
 // Reset the game state for the next round
@@ -976,23 +977,10 @@ func makeHandSummary(tableIndex int, playerIndex int) string {
 	return strings.TrimSpace(summary)
 }
 
-// Forces an update of all tables to the lobby - useful for adhoc use if the Lobby restarts or loses info
-func apiUpdateLobby(c *gin.Context) {
+// update game table info to the lobby fujinet lobby server
+func updateLobby(tableIndex int) {
+	instanceUrlSuffix := "/?table=" + gameStates[tableIndex].Table.Table
+	sendStateToLobby(gameStates[tableIndex].Table.MaxPlayers, gameStates[tableIndex].Table.CurPlayers, true, gameStates[tableIndex].Table.Name, instanceUrlSuffix)
 
-	for i := 0; i < len(gameStates); i++ {
-
-		sendStateToLobby(gameStates[i].Table.MaxPlayers, gameStates[i].Table.CurPlayers, false, gameStates[i].Table.Name, "https://fujillama.spysoft.nz/")
-
-	}
-
-	/*
-		for _, table := range tables {
-			value, ok := stateMap.Load(table.Table)
-			if ok {
-				state := value.(*GameState)
-				state.updateLobby()
-			}
-		}
-	*/
-	c.JSON(http.StatusOK, "Lobby Updated")
+	fmt.Println("lobby updated for :", string(gameStates[tableIndex].Table.Name))
 }