Merge pull request godotengine#106848 from Faless/mp/rpc_config_revert

Repiteo · Repiteo · commit 91b3a26438e5 · 2025-05-27T09:39:32.000-05:00
Expose `get_rpc_config` and `get_node_rpc_config`
diff --git a/core/object/script_language.cpp b/core/object/script_language.cpp
@@ -172,7 +172,7 @@ void Script::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("is_tool"), &Script::is_tool);
 	ClassDB::bind_method(D_METHOD("is_abstract"), &Script::is_abstract);
 
-	ClassDB::bind_method(D_METHOD("get_rpc_config"), &Script::get_rpc_config);
+	ClassDB::bind_method(D_METHOD("get_rpc_config"), &Script::_get_rpc_config_bind);
 
 	ADD_PROPERTY(PropertyInfo(Variant::STRING, "source_code", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), "set_source_code", "get_source_code");
 }
diff --git a/core/object/script_language.h b/core/object/script_language.h
@@ -135,6 +135,10 @@ class Script : public Resource {
 
 	void _set_debugger_break_language();
 
+	Variant _get_rpc_config_bind() const {
+		return get_rpc_config().duplicate(true);
+	}
+
 public:
 	virtual void reload_from_file() override;
 
@@ -191,7 +195,7 @@ class Script : public Resource {
 
 	virtual bool is_placeholder_fallback_enabled() const { return false; }
 
-	virtual Variant get_rpc_config() const = 0;
+	virtual const Variant get_rpc_config() const = 0;
 
 	Script() {}
 };
diff --git a/core/object/script_language_extension.h b/core/object/script_language_extension.h
@@ -209,7 +209,7 @@ class ScriptExtension : public Script {
 
 	GDVIRTUAL0RC_REQUIRED(Variant, _get_rpc_config)
 
-	virtual Variant get_rpc_config() const override {
+	virtual const Variant get_rpc_config() const override {
 		Variant ret;
 		GDVIRTUAL_CALL(_get_rpc_config, ret);
 		return ret;
diff --git a/doc/classes/Node.xml b/doc/classes/Node.xml
@@ -495,6 +495,13 @@
 				Fetches a node by [NodePath]. Similar to [method get_node], but does not generate an error if [param path] does not point to a valid node.
 			</description>
 		</method>
+		<method name="get_node_rpc_config" qualifiers="const">
+			<return type="Variant" />
+			<description>
+				Returns a [Dictionary] mapping method names to their RPC configuration defined for this node using [method rpc_config].
+				[b]Note:[/b] This method only returns the RPC configuration assigned via [method rpc_config]. See [method Script.get_rpc_config] to retrieve the RPCs defined by the [Script].
+			</description>
+		</method>
 		<method name="get_orphan_node_ids" qualifiers="static">
 			<return type="int[]" />
 			<description>
@@ -538,12 +545,6 @@
 				[b]Note:[/b] The returned value will be larger than expected if running at a framerate lower than [member Engine.physics_ticks_per_second] / [member Engine.max_physics_steps_per_frame] FPS. This is done to avoid "spiral of death" scenarios where performance would plummet due to an ever-increasing number of physics steps per frame. This behavior affects both [method _process] and [method _physics_process]. As a result, avoid using [code]delta[/code] for time measurements in real-world seconds. Use the [Time] singleton's methods for this purpose instead, such as [method Time.get_ticks_usec].
 			</description>
 		</method>
-		<method name="get_rpc_config" qualifiers="const">
-			<return type="Variant" />
-			<description>
-				Returns a [Dictionary] mapping method names to their RPC configuration defined for this node using [method rpc_config].
-			</description>
-		</method>
 		<method name="get_scene_instance_load_placeholder" qualifiers="const">
 			<return type="bool" />
 			<description>
diff --git a/misc/extension_api_validation/4.4-stable.expected b/misc/extension_api_validation/4.4-stable.expected
@@ -251,3 +251,10 @@ Validate extension JSON: Error: Field 'classes/InputMap/methods/add_action/argum
 Validate extension JSON: Error: Field 'global_enums/KeyModifierMask/values/KEY_MODIFIER_MASK': value changed value in new API, from 532676600.0 to 2130706432.
 
 Precision of string-serialized Variant constants increased.
+
+
+GH-106848
+---------
+Validate extension JSON: API was removed: classes/Node/methods/get_rpc_config
+
+Change Node `get_rpc_config` to `get_node_rpc_config`. Compatibility method registered.
diff --git a/modules/gdscript/gdscript.cpp b/modules/gdscript/gdscript.cpp
@@ -922,7 +922,7 @@ void GDScript::get_members(HashSet<StringName> *p_members) {
 	}
 }
 
-Variant GDScript::get_rpc_config() const {
+const Variant GDScript::get_rpc_config() const {
 	return rpc_config;
 }
 
diff --git a/modules/gdscript/gdscript.h b/modules/gdscript/gdscript.h
@@ -346,7 +346,7 @@ class GDScript : public Script {
 	virtual void get_constants(HashMap<StringName, Variant> *p_constants) override;
 	virtual void get_members(HashSet<StringName> *p_members) override;
 
-	virtual Variant get_rpc_config() const override;
+	virtual const Variant get_rpc_config() const override;
 
 	void unload_static() const;
 
diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp
@@ -2737,7 +2737,7 @@ int CSharpScript::get_member_line(const StringName &p_member) const {
 	return -1;
 }
 
-Variant CSharpScript::get_rpc_config() const {
+const Variant CSharpScript::get_rpc_config() const {
 	return rpc_config;
 }
 
diff --git a/modules/mono/csharp_script.h b/modules/mono/csharp_script.h
@@ -289,7 +289,7 @@ class CSharpScript : public Script {
 
 	int get_member_line(const StringName &p_member) const override;
 
-	Variant get_rpc_config() const override;
+	const Variant get_rpc_config() const override;
 
 #ifdef TOOLS_ENABLED
 	bool is_placeholder_fallback_enabled() const override {
diff --git a/modules/multiplayer/scene_rpc_interface.cpp b/modules/multiplayer/scene_rpc_interface.cpp
@@ -105,7 +105,7 @@ const SceneRPCInterface::RPCConfigCache &SceneRPCInterface::_get_node_config(con
 		return rpc_cache[oid];
 	}
 	RPCConfigCache cache;
-	_parse_rpc_config(p_node->get_rpc_config(), true, cache);
+	_parse_rpc_config(p_node->get_node_rpc_config(), true, cache);
 	if (p_node->get_script_instance()) {
 		_parse_rpc_config(p_node->get_script_instance()->get_rpc_config(), false, cache);
 	}
diff --git a/scene/main/node.compat.inc b/scene/main/node.compat.inc
@@ -34,8 +34,13 @@ void Node::_set_name_bind_compat_76560(const String &p_name) {
 	set_name(p_name);
 }
 
+Variant Node::_get_rpc_config_bind_compat_106848() const {
+	return _get_node_rpc_config_bind();
+}
+
 void Node::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("set_name", "name"), &Node::_set_name_bind_compat_76560);
+	ClassDB::bind_compatibility_method(D_METHOD("get_rpc_config"), &Node::_get_rpc_config_bind_compat_106848);
 }
 
 #endif
diff --git a/scene/main/node.cpp b/scene/main/node.cpp
@@ -844,7 +844,7 @@ void Node::rpc_config(const StringName &p_method, const Variant &p_config) {
 	}
 }
 
-Variant Node::get_rpc_config() const {
+const Variant Node::get_node_rpc_config() const {
 	return data.rpc_config;
 }
 
@@ -3979,7 +3979,7 @@ void Node::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("get_multiplayer"), &Node::get_multiplayer);
 	ClassDB::bind_method(D_METHOD("rpc_config", "method", "config"), &Node::rpc_config);
-	ClassDB::bind_method(D_METHOD("get_rpc_config"), &Node::get_rpc_config);
+	ClassDB::bind_method(D_METHOD("get_node_rpc_config"), &Node::_get_node_rpc_config_bind);
 
 	ClassDB::bind_method(D_METHOD("set_editor_description", "editor_description"), &Node::set_editor_description);
 	ClassDB::bind_method(D_METHOD("get_editor_description"), &Node::get_editor_description);
diff --git a/scene/main/node.h b/scene/main/node.h
@@ -210,7 +210,7 @@ class Node : public Object {
 		void *process_group = nullptr; // to avoid cyclic dependency
 
 		int multiplayer_authority = 1; // Server by default.
-		Variant rpc_config = Dictionary();
+		Variant rpc_config;
 
 		// Variables used to properly sort the node when processing, ignored otherwise.
 		int process_priority = 0;
@@ -389,6 +389,10 @@ class Node : public Object {
 
 	void _validate_property(PropertyInfo &p_property) const;
 
+	Variant _get_node_rpc_config_bind() const {
+		return get_node_rpc_config().duplicate(true);
+	}
+
 protected:
 	virtual bool _uses_signal_mutex() const override { return false; } // Node uses thread guards instead.
 
@@ -415,6 +419,7 @@ class Node : public Object {
 
 #ifndef DISABLE_DEPRECATED
 	void _set_name_bind_compat_76560(const String &p_name);
+	Variant _get_rpc_config_bind_compat_106848() const;
 	static void _bind_compatibility_methods();
 #endif
 
@@ -787,7 +792,7 @@ class Node : public Object {
 	bool is_multiplayer_authority() const;
 
 	void rpc_config(const StringName &p_method, const Variant &p_config); // config a local method for RPC
-	Variant get_rpc_config() const;
+	const Variant get_node_rpc_config() const;
 
 	template <typename... VarArgs>
 	Error rpc(const StringName &p_method, VarArgs... p_args);

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ void Script::_bind_methods() {`
`172`	`172`	`ClassDB::bind_method(D_METHOD("is_tool"), &Script::is_tool);`
`173`	`173`	`ClassDB::bind_method(D_METHOD("is_abstract"), &Script::is_abstract);`
`174`	`174`
`175`		`- ClassDB::bind_method(D_METHOD("get_rpc_config"), &Script::get_rpc_config);`
	`175`	`+ ClassDB::bind_method(D_METHOD("get_rpc_config"), &Script::_get_rpc_config_bind);`
`176`	`176`
`177`	`177`	`ADD_PROPERTY(PropertyInfo(Variant::STRING, "source_code", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), "set_source_code", "get_source_code");`
`178`	`178`	`}`
Original file line number	Diff line number	Diff line change
`@@ -922,7 +922,7 @@ void GDScript::get_members(HashSet<StringName> *p_members) {`
`922`	`922`	`}`
`923`	`923`	`}`
`924`	`924`
`925`		`-Variant GDScript::get_rpc_config() const {`
	`925`	`+const Variant GDScript::get_rpc_config() const {`
`926`	`926`	`return rpc_config;`
`927`	`927`	`}`
`928`	`928`
Original file line number	Diff line number	Diff line change
`@@ -2737,7 +2737,7 @@ int CSharpScript::get_member_line(const StringName &p_member) const {`
`2737`	`2737`	`return -1;`
`2738`	`2738`	`}`
`2739`	`2739`
`2740`		`-Variant CSharpScript::get_rpc_config() const {`
	`2740`	`+const Variant CSharpScript::get_rpc_config() const {`
`2741`	`2741`	`return rpc_config;`
`2742`	`2742`	`}`
`2743`	`2743`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ const SceneRPCInterface::RPCConfigCache &SceneRPCInterface::_get_node_config(con`
`105`	`105`	`return rpc_cache[oid];`
`106`	`106`	`}`
`107`	`107`	`RPCConfigCache cache;`
`108`		`- _parse_rpc_config(p_node->get_rpc_config(), true, cache);`
	`108`	`+ _parse_rpc_config(p_node->get_node_rpc_config(), true, cache);`
`109`	`109`	`if (p_node->get_script_instance()) {`
`110`	`110`	`_parse_rpc_config(p_node->get_script_instance()->get_rpc_config(), false, cache);`
`111`	`111`	`}`