Merge pull request #96 from flametime/dovos-fixes

Spacetimedb 2.0 fix for V1 protocol

Author: xDovos

godot-client/addons/SpacetimeDB/core/spacetimedb_client.gd

@@ -324,7 +324,9 @@ func _handle_parsed_message(message_resource: Resource):
 
 		# Emit the full transaction update signal regardless of status
 		self.transaction_update_received.emit(tx_update)
-
+	elif message_resource is TransactionUpdateMessageLightmode:
+		var tx_update: TransactionUpdateMessageLightmode = message_resource
+		_local_db.apply_database_update(tx_update.committed_update)
 	else:
 		print_log("SpacetimeDBClient: Received unhandled message resource type: " + message_resource.get_class())
 

godot-client/addons/SpacetimeDB/core_types/server_message/spacetimedb_server_message.gd

@@ -23,6 +23,6 @@ static func get_resource_path(msg_type: int) -> String:
 		SUBSCRIPTION_ERROR:        return "res://addons/SpacetimeDB/core_types/server_message/subscription_error.gd" # Uses manual reader
 		SUBSCRIBE_MULTI_APPLIED:   return "res://addons/SpacetimeDB/core_types/server_message/subscribe_multi_applied.gd"
 		UNSUBSCRIBE_MULTI_APPLIED: return "res://addons/SpacetimeDB/core_types/server_message/unsubscribe_multi_applied.gd"
-		# TRANSACTION_UPDATE_LIGHT (0x02) is not handled yet
+		TRANSACTION_UPDATE_LIGHT:  return "res://addons/SpacetimeDB/core_types/server_message/transaction_update_lightmode.gd"
 		_:
 			return ""

godot-client/addons/SpacetimeDB/core_types/server_message/transaction_update_lightmode.gd

@@ -0,0 +1,8 @@
+@tool
+class_name TransactionUpdateMessageLightmode extends Resource
+
+@export var request_id: int #u32
+@export var committed_update: DatabaseUpdateData
+
+func _init():
+	set_meta("bsatn_type_request_id", "u32")

godot-client/addons/SpacetimeDB/core_types/server_message/transaction_update_lightmode.gd.uid

@@ -0,0 +1 @@
+uid://ctcp45tdhjins

godot-client/example_code/LobbyHolder.gd

@@ -21,7 +21,7 @@ func on_self_update(user: MainUser):
 
 func subscibe_whole_lobby(lobby_to_sub: int, user_identity: PackedByteArray):
 	var query = [
-		"SELECT * FROM user WHERE online == true AND lobby_id == " + str(lobby_to_sub), 
+		"SELECT * FROM user WHERE online == true AND lobby_id == " + str(lobby_to_sub),
 		"SELECT * FROM user_data WHERE lobby_id == " + str(lobby_to_sub),
 	]
 	SpacetimeDB.Main.subscribe(query)

godot-client/example_code/integration_tests.gd

@@ -6,7 +6,7 @@ func _ready() -> void:
 	var options :SpacetimeDBConnectionOptions = SpacetimeDBConnectionOptions.new()
 
 	options.one_time_token = true # <--- anonymous-like. set to false to persist
-	options.debug_mode = false # <--- enables lots of additional debug prints and warnings
+	options.debug_mode = true # <--- enables lots of additional debug prints and warnings
 	options.compression = SpacetimeDBConnection.CompressionPreference.GZIP
 	options.threading = true
 	# Increase buffer size. In general, you don't need this.

godot-client/example_code/lobby_holder.gd

@@ -15,10 +15,10 @@ func _on_user_inserted(user: MainUser) -> void:
 		print("Set local user: ", user.identity.hex_encode())
 		local_user = user
 		subscibe_on_lobby(user.lobby_id)
-	
+
 	if users.has(user.identity):
 		return
-	
+
 	print("Join: ", user.identity.hex_encode())
 	user_join.emit(user)
 	users[user.identity] = user
@@ -29,7 +29,7 @@ func _on_user_deleted(user: MainUser) -> void:
 
 func subscibe_on_lobby(lobby_to_sub: int) -> void:
 	var query := [
-		"SELECT * FROM user WHERE online == true AND lobby_id == " + str(lobby_to_sub), 
+		"SELECT * FROM user WHERE online == true AND lobby_id == " + str(lobby_to_sub),
 		"SELECT * FROM user_data WHERE lobby_id == " + str(lobby_to_sub),
 	]
 	var sub := SpacetimeDB.Main.subscribe(query)

godot-client/example_code/mouse.gd

@@ -22,11 +22,11 @@ func _update_player_on_row_update(_prev_value: MainUserData, user_data: MainUser
 func _process(delta: float) -> void:
 	if not SpacetimeDB.Main.is_connected_db():
 		return
-	
+
 	if get_meta("local") == true:
 		if last_position != get_global_mouse_position():
 			last_position = get_global_mouse_position()
 			var vec_to2d := Vector3(last_position.x, last_position.y, 0)
 			SpacetimeDB.Main.reducers.move_user(Vector2(0,0), vec_to2d)
-	
+
 	global_position = global_position.lerp(last_position, 10 * delta)

godot-client/example_code/player.gd

@@ -8,87 +8,87 @@ var remote_input: Vector2
 var remote_speed: float
 
 func _ready() -> void:
-    receiver.insert.connect(_initialize_player_on_insert)
-    receiver.update.connect(_update_player_on_row_update)
-    
-    set_process(get_meta("is_local"))
-    set_process_input(get_meta("is_local"))
+	receiver.insert.connect(_initialize_player_on_insert)
+	receiver.update.connect(_update_player_on_row_update)
+
+	set_process(get_meta("is_local"))
+	set_process_input(get_meta("is_local"))
 
 func test_struct():
-    var test_damage = MainDamage.create(16, SpacetimeDB.Main.get_local_identity(), [1,2,3])
-    var test_one := MainMessage.new()
-    test_one.int_value = 55
-    test_one.string_value = "Hello from Godot"
-    test_one.int_vec = [1,2,3]
-    test_one.string_vec = ["one", "two", "three"]
-    var option = Option.new()
-    option.set_some(["pip", "pop"])
-    test_one.test_option_vec = option
-    
-    var test_option = Option.new()
-    test_option.set_some("Single string")
-    test_one.test_option = test_option
-    var option_inner = Option.new()
-    option_inner.set_some(test_damage)
-    test_one.test_inner = option_inner
-    
-    var res = await SpacetimeDB.Main.reducers.test_struct(test_one, func(_t): 
-        print("Result:", _t)
-    )
+	var test_damage = MainDamage.create(16, SpacetimeDB.Main.get_local_identity(), [1,2,3])
+	var test_one := MainMessage.new()
+	test_one.int_value = 55
+	test_one.string_value = "Hello from Godot"
+	test_one.int_vec = [1,2,3]
+	test_one.string_vec = ["one", "two", "three"]
+	var option = Option.new()
+	option.set_some(["pip", "pop"])
+	test_one.test_option_vec = option
+
+	var test_option = Option.new()
+	test_option.set_some("Single string")
+	test_one.test_option = test_option
+	var option_inner = Option.new()
+	option_inner.set_some(test_damage)
+	test_one.test_inner = option_inner
+
+	var res = await SpacetimeDB.Main.reducers.test_struct(test_one, func(_t):
+		print("Result:", _t)
+	)
 
 func test_option_vec(text):
-    var opt = Option.new()
-    opt.set_some(text)
-    SpacetimeDB.Main.reducers.test_option_vec(opt)
-    
+	var opt = Option.new()
+	opt.set_some(text)
+	SpacetimeDB.Main.reducers.test_option_vec(opt)
+
 func test_option_single(text):
-    var opt = Option.new()
-    opt.set_some(text)
-    SpacetimeDB.Main.reducers.test_option_single(opt)
+	var opt = Option.new()
+	opt.set_some(text)
+	SpacetimeDB.Main.reducers.test_option_single(opt)
 
 func _input(event: InputEvent) -> void:
-    if event.is_action_pressed("ui_cancel"):
-        SpacetimeDB.Main.reducers.change_color_random()
-        
-    if event.is_action_pressed("ui_accept"):
-        test_struct()
-        test_option_vec(["Hello","World"])
-        test_option_single("Welcome")
+	if event.is_action_pressed("ui_cancel"):
+		SpacetimeDB.Main.reducers.change_color_random()
+
+	if event.is_action_pressed("ui_accept"):
+		test_struct()
+		test_option_vec(["Hello","World"])
+		test_option_single("Welcome")
 
 func _initialize_player_on_insert(user_data: MainUserData):
-    #Need to receive only THIS entity/table updates 
-    if get_meta("id") != user_data.identity:
-        return
-    
-    $MeshInstance3D.get_surface_override_material(0).albedo_color = user_data.color
-    $Label3D.text = str(user_data.name)
-    last_position = user_data.last_position
-    remote_input = user_data.direction
-    remote_speed = user_data.player_speed
-    
+	#Need to receive only THIS entity/table updates
+	if get_meta("id") != user_data.identity:
+		return
+
+	$MeshInstance3D.get_surface_override_material(0).albedo_color = user_data.color
+	$Label3D.text = str(user_data.name)
+	last_position = user_data.last_position
+	remote_input = user_data.direction
+	remote_speed = user_data.player_speed
+
 func _update_player_on_row_update(prev_value: MainUserData, user_data: MainUserData):
-    #Need to receive only THIS entity/table updates 
-    if get_meta("id") != user_data.identity:
-        return
+	#Need to receive only THIS entity/table updates
+	if get_meta("id") != user_data.identity:
+		return
 
-    $MeshInstance3D.get_surface_override_material(0).albedo_color = user_data.color
-    last_position = user_data.last_position
-    remote_input = user_data.direction
-    remote_speed = user_data.player_speed
+	$MeshInstance3D.get_surface_override_material(0).albedo_color = user_data.color
+	last_position = user_data.last_position
+	remote_input = user_data.direction
+	remote_speed = user_data.player_speed
 
 func _process(delta: float) -> void:
-    var input_dir: Vector2 = Input.get_vector("ui_left", "ui_right", "ui_up", "ui_down")
-    if last_local_input == input_dir:
-        return
-    
-    last_local_input = input_dir
-    SpacetimeDB.Main.reducers.move_user(input_dir, global_position)
+	var input_dir: Vector2 = Input.get_vector("ui_left", "ui_right", "ui_up", "ui_down")
+	if last_local_input == input_dir:
+		return
+
+	last_local_input = input_dir
+	SpacetimeDB.Main.reducers.move_user(input_dir, global_position)
 
 func _physics_process(delta: float) -> void:
-    if remote_input == Vector2.ZERO:
-        global_position = global_position.lerp(last_position, 10 * delta)
-    var direction := Vector3(remote_input.x, 0, remote_input.y)
-    if direction:
-        velocity.x = direction.x * remote_speed
-        velocity.z = direction.z * remote_speed
-    move_and_slide()
+	if remote_input == Vector2.ZERO:
+		global_position = global_position.lerp(last_position, 10 * delta)
+	var direction := Vector3(remote_input.x, 0, remote_input.y)
+	if direction:
+		velocity.x = direction.x * remote_speed
+		velocity.z = direction.z * remote_speed
+	move_and_slide()

godot-client/example_code/players.gd

@@ -12,7 +12,7 @@ func spawn(user: MainUser) -> void:
 	player.set_meta("local", user.identity == SpacetimeDB.Main.get_local_identity())
 	player.name = user.identity.hex_encode()
 	add_child(player)
-	
+
 func despawn(user: MainUser) -> void:
 	var player := get_node_or_null(str(user.identity.hex_encode()))
 	if player != null: