yagich/tickle-godot-frontend
1
0
Fork 1
Code Issues 9 Pull Requests 1 Projects Releases Wiki Activity

make the endpoints at request time #9

Merged
yagich merged 2 commits from serve-on-request into main 2022-07-04 20:04:07 +00:00
Conversation 0 Commits 2 Files Changed 2 +19 -46
2 changed files with 19 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Main.gd
View File

@ -17,26 +17,7 @@ func _start_server(port: int = 3001) -> void:
return return
_server = HTTPServer.new() _server = HTTPServer.new()
var dir := Directory.new() _server.endpoint(HTTPServer.Method.GET, "/", funcref(self, "_serve_file"))
if dir.open(server_dir) == OK:
if dir.list_dir_begin() != OK:
# TODO: show error to user here
return
var file_name := dir.get_next()
while file_name != "":
if !dir.current_is_dir():
if file_name.get_extension() == "import":
file_name = dir.get_next()
continue
# print(file_name)
_server.endpoint(HTTPServer.Method.GET, "/%s" % file_name, funcref(self, "_serve_file"), [file_name])
file_name = dir.get_next()
_server.endpoint(HTTPServer.Method.GET, "/", funcref(self, "_serve_file"), ["index.html"])
if _server.listen(port) != OK: if _server.listen(port) != OK:
# TODO: show error to user here # TODO: show error to user here
@ -62,13 +43,14 @@ func _process(_delta: float) -> void:
return return
func _serve_file(_request: HTTPServer.Request, response: HTTPServer.Response, binds: Array) -> void: func _serve_file(request: HTTPServer.Request, response: HTTPServer.Response) -> void:
var file_name: String = binds[0] as String var file_name: String = request.endpoint()
if file_name == "/": # if the request is for root, serve index
file_name = "index.html"
var f := File.new() var f := File.new()
var success = f.open(server_dir.plus_file(file_name), File.READ) var success = f.open(server_dir.plus_file(file_name), File.READ)
if success == OK: if success == OK: # TODO: handle other errors like file not found
var mime := mime_types.get(file_name) var mime := mime_types.get(file_name)
response.type(mime) response.type(mime)
@ -77,8 +59,9 @@ func _serve_file(_request: HTTPServer.Request, response: HTTPServer.Response, bi
response.data(data) response.data(data)
else: else:
response.header("content-type", "text/plain") response.type(mime_types.get("txt"))
response.data("500 - Read Error") response.status(500)
response.data("Internal Server Error")
func _on_ServerUI_start_server_button_pressed(port: int, new_dir: String) -> void: func _on_ServerUI_start_server_button_pressed(port: int, new_dir: String) -> void:

22
addons/http_server/http_server.gd
View File

@ -13,7 +13,7 @@ const Status = preload("res://addons/http_server/status.gd")
var __endpoints: Dictionary = { var __endpoints: Dictionary = {
# key: [Int, String], array with 0 index representing method, 1 index representing endpoint # key: [Int, String], array with 0 index representing method, 1 index representing endpoint
# value: [FuncRef, Array], index 0 = reference to function to call, index 1 = binds to pass to func # value: FuncRef, reference to function to call
} }
var __fallback: FuncRef = null var __fallback: FuncRef = null
var __server: TCP_Server = null var __server: TCP_Server = null
@ -32,7 +32,7 @@ func endpoint(type: int, endpoint: String, function: FuncRef, binds: Array = [])
) )
return return
__endpoints[endpoint_hash] = [function, binds] __endpoints[endpoint_hash] = function
func fallback(function: FuncRef) -> void: func fallback(function: FuncRef) -> void:
@ -121,20 +121,13 @@ func __process_request(method: String, endpoint: String, headers: Dictionary, bo
var endpoint_func: FuncRef = null var endpoint_func: FuncRef = null
var endpoint_parts: PoolStringArray = endpoint.split("/", false) var endpoint_parts: PoolStringArray = endpoint.split("/", false)
var binds
# special case for if endpoint is just root while !endpoint_func:
if endpoint == "/":
var endpoint_hash: Array = [type, "/"]
if __endpoints.has(endpoint_hash):
endpoint_func = __endpoints[endpoint_hash][0]
binds = __endpoints[endpoint_hash][1]
else:
while (!endpoint_func && !endpoint_parts.empty()):
var endpoint_hash: Array = [type, "/" + endpoint_parts.join("/")] var endpoint_hash: Array = [type, "/" + endpoint_parts.join("/")]
if __endpoints.has(endpoint_hash): if __endpoints.has(endpoint_hash):
endpoint_func = __endpoints[endpoint_hash][0] endpoint_func = __endpoints[endpoint_hash]
binds = __endpoints[endpoint_hash][1] elif endpoint_parts.empty():
break
else: else:
endpoint_parts.remove(endpoint_parts.size() - 1) endpoint_parts.remove(endpoint_parts.size() - 1)
@ -160,10 +153,7 @@ func __process_request(method: String, endpoint: String, headers: Dictionary, bo
"[INF] Recieved request method: %s, endpoint: %s" % [method, endpoint] "[INF] Recieved request method: %s, endpoint: %s" % [method, endpoint]
) )
if !binds:
endpoint_func.call_func(request, response) endpoint_func.call_func(request, response)
else:
endpoint_func.call_func(request, response, binds)
return response return response