Skip to content
This repository was archived by the owner on Sep 17, 2024. It is now read-only.

Commit 88c0be5

Browse files
authored
chore(lobbies): upgrade multiplayer manager sdk addon (#160)
1 parent a97095b commit 88c0be5

File tree

1 file changed

+32
-32
lines changed

1 file changed

+32
-32
lines changed

modules/lobbies/sdk_addons/godot/multiplayer_manager.gd

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
extends Node
2-
class_name BackendMultiplayerManager
2+
class_name RivetMultiplayerManager
33

44
enum Transport { ENET, WEB_SOCKET }
55

@@ -79,7 +79,7 @@ var _player_token = null
7979
func setup_multiplayer():
8080
# Validate only initialized once
8181
if _multiplayer_setup:
82-
BackendLogger.warning("setup_multiplayer already called")
82+
RivetLogger.warning("setup_multiplayer already called")
8383
return
8484
_multiplayer_setup = true
8585

@@ -111,29 +111,29 @@ func setup_multiplayer():
111111
if OS.has_environment("LOBBY_ID"):
112112
_lobby_id = OS.get_environment("LOBBY_ID")
113113
else:
114-
BackendLogger.warning("Missing lobby ID")
114+
RivetLogger.warning("Missing lobby ID")
115115

116116
if OS.has_environment("LOBBY_TOKEN"):
117117
_lobby_token = OS.get_environment("LOBBY_TOKEN")
118118

119119
# Start server
120120
if transport == Transport.ENET:
121-
BackendLogger.log("Starting ENet server: %s:%s" % [_server_hostname, _server_port])
121+
RivetLogger.log("Starting ENet server: %s:%s" % [_server_hostname, _server_port])
122122

123123
peer = ENetMultiplayerPeer.new()
124124
peer.set_bind_ip(_server_hostname)
125125
peer.create_server(_server_port)
126126
# TODO: crash if create server fails
127127
multiplayer.set_multiplayer_peer(peer)
128128
elif transport == Transport.WEB_SOCKET:
129-
BackendLogger.log("Starting WebSocket server: %s:%s" % [_server_hostname, _server_port])
129+
RivetLogger.log("Starting WebSocket server: %s:%s" % [_server_hostname, _server_port])
130130

131131
peer = WebSocketMultiplayerPeer.new()
132132
peer.create_server(_server_port, _server_hostname)
133133
# TODO: crash if create server fails
134134
multiplayer.set_multiplayer_peer(peer)
135135
else:
136-
BackendLogger.error("Unsupported transport: %s" % transport)
136+
RivetLogger.error("Unsupported transport: %s" % transport)
137137
OS.crash("Unsupported transport")
138138

139139
# Notify lobby ready
@@ -142,24 +142,24 @@ func setup_multiplayer():
142142
}
143143
if _lobby_token != null:
144144
request["lobbyToken"] = _lobby_token
145-
var response = await Backend.lobbies.set_lobby_ready(request).async()
145+
var response = await Rivet.lobbies.set_lobby_ready(request).async()
146146
if response.is_ok():
147-
BackendLogger.log("Lobby ready")
147+
RivetLogger.log("Lobby ready")
148148
else:
149-
BackendLogger.warning("Lobby ready failed failed: %s" % response.body)
149+
RivetLogger.warning("Lobby ready failed failed: %s" % response.body)
150150
OS.crash("Lobby ready failed")
151151
return
152152

153153
## Connect to a lobby returned from the backend.
154154
func connect_to_lobby(lobby, player):
155155
if !_multiplayer_setup:
156-
BackendLogger.error("setup_multiplayer needs to be called in _ready")
156+
RivetLogger.error("setup_multiplayer needs to be called in _ready")
157157
return
158158
if is_server:
159-
BackendLogger.warning("Cannot called set_player_token on server")
159+
RivetLogger.warning("Cannot called set_player_token on server")
160160
return
161161

162-
BackendLogger.log("Connecting to lobby: %s %s" % [lobby, player])
162+
RivetLogger.log("Connecting to lobby: %s %s" % [lobby, player])
163163

164164
# Save token
165165
_player_token = player.token
@@ -179,12 +179,12 @@ func connect_to_lobby(lobby, player):
179179
hostname = backend_port.hostname
180180
port = backend_port.port
181181
else:
182-
BackendLogger.error("Unsupported lobby backend: %s" % lobby.backend)
182+
RivetLogger.error("Unsupported lobby backend: %s" % lobby.backend)
183183
return
184184

185185
# Start server
186186
if transport == Transport.ENET:
187-
BackendLogger.log("Connecting to ENet server: %s:%s" % [hostname, port])
187+
RivetLogger.log("Connecting to ENet server: %s:%s" % [hostname, port])
188188

189189
peer = ENetMultiplayerPeer.new()
190190
peer.create_client(hostname, port)
@@ -197,44 +197,44 @@ func connect_to_lobby(lobby, player):
197197
ws_protocol = "ws"
198198
var url = "%s://%s:%s" % [ws_protocol, hostname, port]
199199

200-
BackendLogger.log("Connecting to WebSocket server: %s" % url)
200+
RivetLogger.log("Connecting to WebSocket server: %s" % url)
201201

202202
peer = WebSocketMultiplayerPeer.new()
203203
peer.create_client(url)
204204
multiplayer.set_multiplayer_peer(peer)
205205
else:
206-
BackendLogger.error("Unsupported transport: %s" % transport)
206+
RivetLogger.error("Unsupported transport: %s" % transport)
207207

208208
# MARK: Peers
209209
func _on_peer_connected(id):
210-
BackendLogger.log('Peer connected: %s' % id)
210+
RivetLogger.log('Peer connected: %s' % id)
211211

212212
if is_server:
213213
client_connected.emit(id)
214214
else:
215215
server_connected.emit()
216216

217217
func _on_peer_disconnected(id):
218-
BackendLogger.log('Peer disconnected: %s' % id)
218+
RivetLogger.log('Peer disconnected: %s' % id)
219219

220220
if is_server:
221221
# Remove player from lobby
222222
var player_token = _player_tokens.get(id)
223223
if player_token != null:
224224
_player_tokens.erase(id)
225-
BackendLogger.log("Removing player %s" % player_token)
225+
RivetLogger.log("Removing player %s" % player_token)
226226

227227
var request = {
228228
"lobbyId": _lobby_id,
229229
"playerTokens": [player_token],
230230
}
231231
if _lobby_token != null:
232232
request["lobbyToken"] = _lobby_token
233-
var response = await Backend.lobbies.set_player_disconnected(request).async()
233+
var response = await Rivet.lobbies.set_player_disconnected(request).async()
234234
if response.is_error():
235-
BackendLogger.warning("Player disconnect failed for %id: %s" % [id, response.body])
235+
RivetLogger.warning("Player disconnect failed for %id: %s" % [id, response.body])
236236
else:
237-
BackendLogger.warning("Player disconnected without player token: %s" % id)
237+
RivetLogger.warning("Player disconnected without player token: %s" % id)
238238
return
239239

240240
# Signal
@@ -243,13 +243,13 @@ func _on_peer_disconnected(id):
243243
server_disconnected.emit()
244244

245245
func _on_connected_to_server():
246-
BackendLogger.log('Connected to server')
246+
RivetLogger.log('Connected to server')
247247

248248
func _on_connection_failed():
249-
BackendLogger.log('Connection failed')
249+
RivetLogger.log('Connection failed')
250250

251251
func _on_server_disconnected():
252-
BackendLogger.log('Server disconnected')
252+
RivetLogger.log('Server disconnected')
253253

254254
# MARK: Authentication
255255
func _auth_callback(id: int, buf: PackedByteArray):
@@ -259,12 +259,12 @@ func _auth_callback(id: int, buf: PackedByteArray):
259259
json.parse(buf.get_string_from_utf8())
260260
var data = json.get_data()
261261

262-
BackendLogger.log("Player authenticating %s: %s" % [id, data])
262+
RivetLogger.log("Player authenticating %s: %s" % [id, data])
263263

264264
# Check token
265265
var player_token = data["player_token"]
266266
if player_token == null:
267-
BackendLogger.warning("Player token not provided in auth for %s" % id)
267+
RivetLogger.warning("Player token not provided in auth for %s" % id)
268268
_scene_multiplayer.disconnect_peer(id)
269269
return
270270

@@ -278,13 +278,13 @@ func _auth_callback(id: int, buf: PackedByteArray):
278278
}
279279
if _lobby_token != null:
280280
request["lobbyToken"] = _lobby_token
281-
var response = await Backend.lobbies.set_player_connected(request).async()
281+
var response = await Rivet.lobbies.set_player_connected(request).async()
282282
if response.is_ok():
283-
BackendLogger.log("Player authenticated for %s" % id)
283+
RivetLogger.log("Player authenticated for %s" % id)
284284
_scene_multiplayer.complete_auth(id)
285285
else:
286286
# Player will be cleaned up on disconnect handler
287-
BackendLogger.warning("Player authentiation failed for %s: %s" % [id, response.body])
287+
RivetLogger.warning("Player authentiation failed for %s: %s" % [id, response.body])
288288
_scene_multiplayer.disconnect_peer(id)
289289
else:
290290
# Server does not need to auth with client
@@ -294,7 +294,7 @@ func _on_peer_authenticating(id):
294294
#if is_server:
295295
#return
296296

297-
BackendLogger.log("Authenticating with server")
297+
RivetLogger.log("Authenticating with server")
298298
var body = JSON.stringify({ "player_token": _player_token })
299299
(multiplayer as SceneMultiplayer).send_auth(id, body.to_utf8_buffer())
300300

@@ -303,6 +303,6 @@ func _on_peer_authentication_failed(id):
303303
#if !is_server:
304304
#return
305305

306-
BackendLogger.warning("Client authentication failed %s" % id)
306+
RivetLogger.warning("Client authentication failed %s" % id)
307307
multiplayer.set_multiplayer_peer(null)
308308

0 commit comments

Comments
 (0)