From 4dd87de2226cb39618556d8ac7386a232e78234e Mon Sep 17 00:00:00 2001
From: Lurkars <git@lh8.de>
Date: Wed, 24 Jul 2019 10:35:42 +0200
Subject: [PATCH] configurable server/api address

---
 scripts/menus/server.gd                    |  2 +-
 scripts/menus/server_create.gd             |  2 +-
 scripts/networking/game_server.gd          | 31 +++++++++++++++++++++-
 scripts/networking/game_server_requests.gd |  8 +++---
 4 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/scripts/menus/server.gd b/scripts/menus/server.gd
index 5b00513..ae0d9e9 100644
--- a/scripts/menus/server.gd
+++ b/scripts/menus/server.gd
@@ -116,7 +116,7 @@ func _on_create_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():
diff --git a/scripts/menus/server_create.gd b/scripts/menus/server_create.gd
index da359f1..ab12ad9 100644
--- a/scripts/menus/server_create.gd
+++ b/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:
 		var json = JSON.parse(body.get_string_from_utf8())
 		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()
 
 
diff --git a/scripts/networking/game_server.gd b/scripts/networking/game_server.gd
index aea4f09..5e5f511 100644
--- a/scripts/networking/game_server.gd
+++ b/scripts/networking/game_server.gd
@@ -7,8 +7,37 @@ const API_ADDR = "https://" + SERVER_ADDR + "/"
 const HEADERS = ["Content-Type: application/json"]
 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():
 	var game_server_requests = GameServerRequests.new()
 	add_child(game_server_requests)
-	return game_server_requests
\ No newline at end of file
+	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
diff --git a/scripts/networking/game_server_requests.gd b/scripts/networking/game_server_requests.gd
index eea2043..c2a0f91 100644
--- a/scripts/networking/game_server_requests.gd
+++ b/scripts/networking/game_server_requests.gd
@@ -16,19 +16,19 @@ func connect_http(node,function):
 
 
 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 = ""):
-	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 = ""):
-	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 = ""):
-	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):