Compare commits
No commits in common. "47dc68028cb643b5e0228820f8694e2d02104e93" and "836c101e6f7e38617b052778f756e342ce06690b" have entirely different histories.
47dc68028c
...
836c101e6f
35
Main.gd
35
Main.gd
@ -17,7 +17,26 @@ func _start_server(port: int = 3001) -> void:
|
||||
return
|
||||
|
||||
_server = HTTPServer.new()
|
||||
_server.endpoint(HTTPServer.Method.GET, "/", funcref(self, "_serve_file"))
|
||||
var dir := Directory.new()
|
||||
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:
|
||||
# TODO: show error to user here
|
||||
@ -43,14 +62,13 @@ func _process(_delta: float) -> void:
|
||||
return
|
||||
|
||||
|
||||
func _serve_file(request: HTTPServer.Request, response: HTTPServer.Response) -> void:
|
||||
var file_name: String = request.endpoint()
|
||||
if file_name == "/": # if the request is for root, serve index
|
||||
file_name = "index.html"
|
||||
func _serve_file(_request: HTTPServer.Request, response: HTTPServer.Response, binds: Array) -> void:
|
||||
var file_name: String = binds[0] as String
|
||||
|
||||
var f := File.new()
|
||||
var success = f.open(server_dir.plus_file(file_name), File.READ)
|
||||
|
||||
if success == OK: # TODO: handle other errors like file not found
|
||||
if success == OK:
|
||||
var mime := mime_types.get(file_name)
|
||||
response.type(mime)
|
||||
|
||||
@ -59,9 +77,8 @@ func _serve_file(request: HTTPServer.Request, response: HTTPServer.Response) ->
|
||||
response.data(data)
|
||||
|
||||
else:
|
||||
response.type(mime_types.get("txt"))
|
||||
response.status(500)
|
||||
response.data("Internal Server Error")
|
||||
response.header("content-type", "text/plain")
|
||||
response.data("500 - Read Error")
|
||||
|
||||
|
||||
func _on_ServerUI_start_server_button_pressed(port: int, new_dir: String) -> void:
|
||||
|
@ -13,7 +13,7 @@ const Status = preload("res://addons/http_server/status.gd")
|
||||
|
||||
var __endpoints: Dictionary = {
|
||||
# key: [Int, String], array with 0 index representing method, 1 index representing endpoint
|
||||
# value: FuncRef, reference to function to call
|
||||
# value: [FuncRef, Array], index 0 = reference to function to call, index 1 = binds to pass to func
|
||||
}
|
||||
var __fallback: FuncRef = null
|
||||
var __server: TCP_Server = null
|
||||
@ -32,7 +32,7 @@ func endpoint(type: int, endpoint: String, function: FuncRef, binds: Array = [])
|
||||
)
|
||||
return
|
||||
|
||||
__endpoints[endpoint_hash] = function
|
||||
__endpoints[endpoint_hash] = [function, binds]
|
||||
|
||||
|
||||
func fallback(function: FuncRef) -> void:
|
||||
@ -121,13 +121,20 @@ func __process_request(method: String, endpoint: String, headers: Dictionary, bo
|
||||
|
||||
var endpoint_func: FuncRef = null
|
||||
var endpoint_parts: PoolStringArray = endpoint.split("/", false)
|
||||
var binds
|
||||
|
||||
while !endpoint_func:
|
||||
# special case for if endpoint is just root
|
||||
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("/")]
|
||||
if __endpoints.has(endpoint_hash):
|
||||
endpoint_func = __endpoints[endpoint_hash]
|
||||
elif endpoint_parts.empty():
|
||||
break
|
||||
endpoint_func = __endpoints[endpoint_hash][0]
|
||||
binds = __endpoints[endpoint_hash][1]
|
||||
else:
|
||||
endpoint_parts.remove(endpoint_parts.size() - 1)
|
||||
|
||||
@ -153,7 +160,10 @@ func __process_request(method: String, endpoint: String, headers: Dictionary, bo
|
||||
"[INF] Recieved request method: %s, endpoint: %s" % [method, endpoint]
|
||||
)
|
||||
|
||||
if !binds:
|
||||
endpoint_func.call_func(request, response)
|
||||
else:
|
||||
endpoint_func.call_func(request, response, binds)
|
||||
|
||||
return response
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user