Browse Source

configurable server/api address

Lurkars 6 years ago
parent
commit
4dd87de222
  1. 2
      scripts/menus/server.gd
  2. 2
      scripts/menus/server_create.gd
  3. 31
      scripts/networking/game_server.gd
  4. 8
      scripts/networking/game_server_requests.gd

2
scripts/menus/server.gd

@ -116,7 +116,7 @@ func _on_create_pressed():
func _on_join_pressed(): func _on_join_pressed():
client.join_game(game_server.SERVER_ADDR, int(selected_game['port']))
client.join_game(game_server.get_server_addr(), int(selected_game['port']))
func _connection_succeeded(): func _connection_succeeded():

2
scripts/menus/server_create.gd

@ -28,7 +28,7 @@ func _on_game_created(result, response_code, headers, body):
if result == OK && response_code == HTTPClient.RESPONSE_OK: if result == OK && response_code == HTTPClient.RESPONSE_OK:
var json = JSON.parse(body.get_string_from_utf8()) var json = JSON.parse(body.get_string_from_utf8())
gamestate.game_name = json.result['name'] gamestate.game_name = json.result['name']
client.join_game(game_server.SERVER_ADDR, int(json.result['port']))
client.join_game(game_server.get_server_addr(), int(json.result['port']))
queue_free() queue_free()

31
scripts/networking/game_server.gd

@ -7,8 +7,37 @@ const API_ADDR = "https://" + SERVER_ADDR + "/"
const HEADERS = ["Content-Type: application/json"] const HEADERS = ["Content-Type: application/json"]
const SSL = false const SSL = false
var server_addr:String = SERVER_ADDR
var api_addr:String = API_ADDR
var headers:Array = HEADERS
var ssl:bool = SSL
func _ready():
for argument in OS.get_cmdline_args():
if argument.split("=")[0] == "--server-addr":
server_addr = str(argument.split("=")[1])
if argument.split("=")[0] == "--api-addr":
api_addr = str(argument.split("=")[1])
func http(): func http():
var game_server_requests = GameServerRequests.new() var game_server_requests = GameServerRequests.new()
add_child(game_server_requests) add_child(game_server_requests)
return game_server_requests
return game_server_requests
func get_server_addr():
return server_addr
func get_api_addr():
return api_addr
func get_headers():
return headers
func get_ssl():
return ssl

8
scripts/networking/game_server_requests.gd

@ -16,19 +16,19 @@ func connect_http(node,function):
func get_request(path:String): func get_request(path:String):
http.request(game_server.API_ADDR + path, game_server.HEADERS, game_server.SSL, HTTPClient.METHOD_GET)
http.request(game_server.get_api_addr() + path, game_server.get_headers(), game_server.get_ssl(), HTTPClient.METHOD_GET)
func post_request(path:String, data:String = ""): func post_request(path:String, data:String = ""):
http.request(game_server.API_ADDR + path, game_server.HEADERS, game_server.SSL, HTTPClient.METHOD_POST, data)
http.request(game_server.get_api_addr() + path, game_server.get_headers(), game_server.get_ssl(), HTTPClient.METHOD_POST, data)
func put_request(path:String, data:String = ""): func put_request(path:String, data:String = ""):
http.request(game_server.API_ADDR + path, game_server.HEADERS, game_server.SSL, HTTPClient.METHOD_PUT, data)
http.request(game_server.get_api_addr() + path, game_server.get_headers(), game_server.get_ssl(), HTTPClient.METHOD_PUT, data)
func delete_request(path:String, data:String = ""): func delete_request(path:String, data:String = ""):
http.request(game_server.API_ADDR + path, game_server.HEADERS, game_server.SSL, HTTPClient.METHOD_DELETE, data)
http.request(game_server.get_api_addr() + path, game_server.get_headers(), game_server.get_ssl(), HTTPClient.METHOD_DELETE, data)
func _self_destroy(result, response_code, headers, body): func _self_destroy(result, response_code, headers, body):
Loading…
Cancel
Save