Fix remaining issues

Author: WolfgangSenff

addons/godot-firebase/Utilies.gd

@@ -2,6 +2,8 @@ extends Node
 class_name Utilities
 
 static func get_json_data(value):
+    if value is PackedByteArray:
+        value = value.get_string_from_utf8()
     var json = JSON.new()
     var json_parse_result = json.parse(value)
     if json_parse_result == OK:

addons/godot-firebase/auth/auth.gd

@@ -403,7 +403,7 @@ func manual_token_refresh(auth_data):
 # This function is called whenever there is an authentication request to Firebase
 # On an error, this function with emit the signal 'login_failed' and print the error to the console
 func _on_FirebaseAuth_request_completed(result : int, response_code : int, headers : PackedStringArray, body : PackedByteArray) -> void:
-    var json = Utilities.get_json_data(body)
+    var json = Utilities.get_json_data(body.get_string_from_utf8())
     is_busy = false
     var res
     if response_code == 0:
@@ -467,7 +467,6 @@ func save_auth(auth : Dictionary) -> void:
         Firebase._printerr("Error Opening File. Error Code: " + str(FileAccess.get_open_error()))
     else:
         encrypted_file.store_line(JSON.stringify(auth))
-        encrypted_file.close()
 
 
 # Function used to load the auth data file that has been stored locally

addons/godot-firebase/database/database.gd

@@ -42,6 +42,7 @@ func _on_FirebaseAuth_logout() -> void:
 func get_database_reference(path : String, filter : Dictionary = {}) -> FirebaseDatabaseReference:
     var firebase_reference : FirebaseDatabaseReference = FirebaseDatabaseReference.new()
     var pusher : HTTPRequest = HTTPRequest.new()
+    pusher.use_threads = true
     var listener : Node = Node.new()
     listener.set_script(load("res://addons/http-sse-client/HTTPSSEClient.gd"))
     var store : FirebaseDatabaseStore = FirebaseDatabaseStore.new()

addons/godot-firebase/firebase/firebase.tscn

@@ -1,31 +1,32 @@
-[gd_scene load_steps=8 format=2]
+[gd_scene load_steps=8 format=3 uid="uid://cvb26atjckwlq"]
 
-[ext_resource path="res://addons/godot-firebase/database/database.gd" type="Script" id=1]
-[ext_resource path="res://addons/godot-firebase/firestore/firestore.gd" type="Script" id=2]
-[ext_resource path="res://addons/godot-firebase/firebase/firebase.gd" type="Script" id=3]
-[ext_resource path="res://addons/godot-firebase/auth/auth.gd" type="Script" id=4]
-[ext_resource path="res://addons/godot-firebase/storage/storage.gd" type="Script" id=5]
-[ext_resource path="res://addons/godot-firebase/dynamiclinks/dynamiclinks.gd" type="Script" id=6]
-[ext_resource path="res://addons/godot-firebase/functions/functions.gd" type="Script" id=7]
+[ext_resource type="Script" path="res://addons/godot-firebase/database/database.gd" id="1"]
+[ext_resource type="Script" path="res://addons/godot-firebase/firestore/firestore.gd" id="2"]
+[ext_resource type="Script" path="res://addons/godot-firebase/firebase/firebase.gd" id="3"]
+[ext_resource type="Script" path="res://addons/godot-firebase/auth/auth.gd" id="4"]
+[ext_resource type="Script" path="res://addons/godot-firebase/storage/storage.gd" id="5"]
+[ext_resource type="Script" path="res://addons/godot-firebase/dynamiclinks/dynamiclinks.gd" id="6"]
+[ext_resource type="Script" path="res://addons/godot-firebase/functions/functions.gd" id="7"]
 
 [node name="Firebase" type="Node"]
-process_mode = 2
-script = ExtResource( 3 )
+script = ExtResource("3")
 
 [node name="Auth" type="HTTPRequest" parent="."]
-script = ExtResource( 4 )
+max_redirects = 12
+timeout = 10.0
+script = ExtResource("4")
 
 [node name="Firestore" type="Node" parent="."]
-script = ExtResource( 2 )
+script = ExtResource("2")
 
 [node name="Database" type="Node" parent="."]
-script = ExtResource( 1 )
+script = ExtResource("1")
 
 [node name="Storage" type="Node" parent="."]
-script = ExtResource( 5 )
+script = ExtResource("5")
 
 [node name="DynamicLinks" type="Node" parent="."]
-script = ExtResource( 6 )
+script = ExtResource("6")
 
 [node name="Functions" type="Node" parent="."]
-script = ExtResource( 7 )
+script = ExtResource("7")

addons/godot-firebase/storage/storage.gd

@@ -192,7 +192,7 @@ func _download(ref : StorageReference, meta_only : bool, url_only : bool) -> Sto
 
     var data = await info_task.task_finished
     if info_task.result == OK:
-        task._url += data.downloadTokens # I don't see how this will ever work, but who knows; pretty sure it doesn't, which means in theory it should be running the else every single time; data is a PackedByteArray, not sure what the original code was smoking
+        task._url += info_task.data.downloadTokens
     else:
         task.data = info_task.data
         task.response_headers = info_task.response_headers
@@ -306,7 +306,7 @@ func _finish_request(result : int) -> void:
         next_task = _pending_tasks.pop_front()
 
     task.finished = true
-    task.task_finished.emit()
+    task.task_finished.emit(task.data) # I believe this parameter has been missing all along, but not sure. Caused weird results at times with a yield/await returning null, but the task containing data.
     if typeof(task.data) == TYPE_DICTIONARY and task.data.has("error"):
         task_failed.emit(task.result, task.response_code, task.data)
     else:

addons/godot-firebase/storage/storage_reference.gd

@@ -104,7 +104,6 @@ func put_string(data : String, metadata := {}) -> StorageTask:
 func put_file(file_path : String, metadata := {}) -> StorageTask:
     var file := FileAccess.open(file_path, FileAccess.READ)
     var data := file.get_buffer(file.get_length())
-    file.close()
 
     if "Content-Type" in metadata:
         metadata["Content-Type"] = MIME_TYPES.get(file_path.get_extension(), DEFAULT_MIME_TYPE)

addons/http-sse-client/HTTPSSEClient.gd

@@ -23,6 +23,7 @@ var is_requested = false
 var response_body = PackedByteArray()
 
 func connect_to_host(domain : String, url_after_domain : String, port : int = -1, trusted_chain : X509Certificate = null, common_name_override : String = ""):
+    process_mode = Node.PROCESS_MODE_INHERIT
     self.domain = domain
     self.url_after_domain = url_after_domain
     self.port = port
@@ -103,7 +104,7 @@ func _process(delta):
             if response_body.size() > 0:
                 _parse_response_body(headers)
 
-func get_event_data(body : String) -> Dictionary:
+func get_event_data(body : String):
     var result = {}
     var event_idx = body.find(event_tag)
     if event_idx == -1:
@@ -113,11 +114,11 @@ func get_event_data(body : String) -> Dictionary:
     var data_idx = body.find(data_tag, event_idx + event_tag.length())
     assert(data_idx != -1)
     var event = body.substr(event_idx, data_idx)
-    event = event.replace(event_tag, "").strip_edges()
-    assert(event)
-    assert(event.length() > 0)
-    result["event"] = event
-    var data = body.right(data_idx + data_tag.length()).strip_edges()
+    var event_value = event.replace(event_tag, "").strip_edges()
+    assert(event_value)
+    assert(event_value.length() > 0)
+    result["event"] = event_value
+    var data = body.right(body.length() - (data_idx + data_tag.length())).strip_edges()
     assert(data)
     assert(data.length() > 0)
     result["data"] = data