Merge pull request #61 from TaloDev/develop

Release 0.18.0

Author: tudddorrr

addons/talo/apis/feedback_api.gd

@@ -12,7 +12,7 @@ func get_categories() -> Array[TaloFeedbackCategory]:
 	match (res.status):
 		200:
 			var categories: Array[TaloFeedbackCategory] = []
-			categories.assign(res.body.categories.map(func (category: Dictionary): return TaloFeedbackCategory.new(category)))
+			categories.assign(res.body.feedbackCategories.map(func (category: Dictionary): return TaloFeedbackCategory.new(category)))
 			return categories
 		_:
 			return []

addons/talo/apis/game_config_api.gd

@@ -7,6 +7,15 @@ class_name GameConfigAPI extends TaloAPI
 
 ## Emitted when the live config has been loaded.
 signal live_config_loaded(live_config: TaloLiveConfig)
+signal live_config_updated(live_config: TaloLiveConfig)
+
+func _ready() -> void:
+	await Talo.init_completed
+	Talo.socket.message_received.connect(_on_message_received)
+
+func _on_message_received(res: String, data: Dictionary) -> void:
+	if res == "v1.live-config.updated":
+		live_config_updated.emit(TaloLiveConfig.new(data.config))
 
 ## Get the live config for your game.
 func get_live_config() -> void:

addons/talo/apis/saves_api.gd

@@ -55,17 +55,7 @@ func get_saves() -> Array[TaloGameSave]:
 		match (res.status):
 			200:
 				online_saves.append_array(res.body.saves.map(func (data: Dictionary): return TaloGameSave.new(data)))
-				
-				if not offline_saves.is_empty():
-					for online_save in online_saves:
-						var filtered = offline_saves.filter(func (save: TaloGameSave): return save.id == online_save.id)
-						if not filtered.is_empty():
-							await _saves_manager.sync_save(online_save, filtered.front())
-					
-					var synced_saves = await _saves_manager.sync_offline_saves(offline_saves)
-					saves.append_array(synced_saves)
-				
-				saves.append_array(online_saves)
+				saves.append_array(await _saves_manager.get_synced_saves(online_saves))
 
 	_saves_manager.all_saves = saves
 	saves_loaded.emit()

addons/talo/plugin.cfg

@@ -3,5 +3,5 @@
 name="Talo Game Services"
 description="Talo (https://trytalo.com) is an open-source game backend with services designed to help you build games faster. You can currently:\n\n- Identify and authenticate players\n- Store persistent data across players\n- Track events (levelling up, finding loot, etc)\n- Display high scores with leaderboards\n- Store and load player saves\n- Load game config options and flags from the cloud\n- Get feedback directly from your players\n- Keep your data in-sync even when players are offline\n- Send channel messages between players"
 author="trytalo"
-version="0.17.0"
+version="0.18.0"
 script="talo_autoload.gd"

addons/talo/samples/playground/scripts/get_config_button.gd

@@ -1,4 +1,17 @@
 extends Button
 
+func _ready() -> void:
+	Talo.game_config.live_config_loaded.connect(_on_live_config_loaded)
+	Talo.game_config.live_config_updated.connect(_on_live_config_updated)
+
 func _on_pressed() -> void:
 	Talo.game_config.get_live_config()
+
+func _stringify_props(props: Array[TaloProp]) -> String:
+	return JSON.stringify(props.map(func (prop: TaloProp): return prop.to_dictionary()))
+
+func _on_live_config_loaded(config: TaloLiveConfig):
+	%ResponseLabel.text = "Live config loaded: %s" % _stringify_props(config.props)
+
+func _on_live_config_updated(live_config: TaloLiveConfig) -> void:
+	%ResponseLabel.text = "Live config updated: %s" % _stringify_props(live_config.props)

addons/talo/samples/playground/scripts/response_label.gd

@@ -1,7 +1 @@
 extends Label
-
-func _ready() -> void:
-	Talo.game_config.live_config_loaded.connect(_on_live_config_loaded)
-
-func _on_live_config_loaded(config: TaloLiveConfig):
-	text = JSON.stringify(config.props.map(func (prop: TaloProp): return prop.to_dictionary()))

addons/talo/talo_manager.gd

@@ -1,5 +1,7 @@
 extends Node
 
+signal init_completed
+
 var current_alias: TaloPlayerAlias
 var current_player: TaloPlayer:
 	get:
@@ -37,6 +39,7 @@ func _ready() -> void:
 
 	get_tree().set_auto_accept_quit(false)
 	process_mode = ProcessMode.PROCESS_MODE_ALWAYS
+	init_completed.emit()
 
 func _init_crypto_manager() -> void:
 	crypto_manager = TaloCryptoManager.new()

addons/talo/utils/socket.gd addons/talo/talo_socket.gdaddons/talo/utils/socket.gd renamed to addons/talo/talo_socket.gd

@@ -9,7 +9,8 @@ const _continuity_timestamp_header = "X-Talo-Continuity-Timestamp"
 const _excluded_endpoints: Array[String] = [
 	"/v1/health-check",
 	"/v1/players/auth",
-	"/v1/players/identify"
+	"/v1/players/identify",
+	"/v1/socket-tickets"
 ]
 
 func _ready() -> void:

addons/talo/utils/continuity_manager.gd

@@ -34,7 +34,8 @@ func sync_save(online_save: TaloGameSave, offline_save: TaloGameSave) -> TaloGam
 	var offline_updated_at = Time.get_unix_time_from_datetime_string(offline_save.updated_at)
 
 	if offline_updated_at > online_updated_at:
-		var save = await Talo.Saves.replace_save_with_offline_save(offline_save)
+		var save = await Talo.saves.replace_save_with_offline_save(offline_save)
+		delete_offline_save(offline_save)
 		return save
 
 	return online_save
@@ -55,6 +56,24 @@ func sync_offline_saves(offline_saves: Array[TaloGameSave]) -> Array[TaloGameSav
 
 	return new_saves
 
+func get_synced_saves(online_saves: Array[TaloGameSave]) -> Array[TaloGameSave]:
+	var saves: Array[TaloGameSave] = []
+	var offline_saves: Array[TaloGameSave] = read_offline_saves()
+				
+	if not offline_saves.is_empty():
+		for online_save in online_saves:
+			var filtered = offline_saves.filter(func (save: TaloGameSave): return save.id == online_save.id)
+			if not filtered.is_empty():
+				var save = await sync_save(online_save, filtered.front())
+				saves.push_back(save)
+			else:
+				saves.push_back(online_save)
+		
+		var synced_saves = await sync_offline_saves(offline_saves)
+		saves.append_array(synced_saves)
+	
+	return saves
+
 func update_offline_saves(incoming_save: TaloGameSave) -> void:
 	var offline_saves: Array[TaloGameSave] = read_offline_saves()
 	var updated = false