Validate joy axis binding axis parameter

Author: Joshua

plugin/addons/godot_ai/handlers/input_handler.gd

@@ -195,11 +195,30 @@ func _create_event(event_type: String, params: Dictionary):
 			ev.button_index = int(params.get("button", 0))
 			return ev
 		"joy_axis":
-			if not params.has("axis"):
+			var axis_param = params.get("axis", null)
+			if axis_param == null:
 				return ErrorCodes.make(ErrorCodes.MISSING_REQUIRED_PARAM,
 					"event_type='joy_axis' requires axis (JoyAxis index, e.g. 0=left stick X, 1=left stick Y).")
+			var axis: int
+			match typeof(axis_param):
+				TYPE_INT:
+					axis = axis_param
+				TYPE_FLOAT:
+					if axis_param != floor(axis_param):
+						return ErrorCodes.make(ErrorCodes.VALUE_OUT_OF_RANGE,
+							"joy_axis axis must be an integer JoyAxis index (got %s)." % str(axis_param))
+					axis = int(axis_param)
+				TYPE_STRING:
+					var axis_text := str(axis_param)
+					if not axis_text.is_valid_int():
+						return ErrorCodes.make(ErrorCodes.WRONG_TYPE,
+							"joy_axis axis must be an integer JoyAxis index (got '%s')." % axis_text)
+					axis = int(axis_text)
+				_:
+					return ErrorCodes.make(ErrorCodes.WRONG_TYPE,
+						"joy_axis axis must be an integer JoyAxis index (got %s)." % type_string(typeof(axis_param)))
 			var ev := InputEventJoypadMotion.new()
-			ev.axis = int(params.get("axis", 0))
+			ev.axis = axis
 			ev.axis_value = float(params.get("axis_value", 1.0))
 			return ev
 	return ErrorCodes.make(ErrorCodes.VALUE_OUT_OF_RANGE,

test_project/tests/test_input.gd

@@ -219,6 +219,17 @@ func test_bind_event_joy_axis_missing_axis() -> void:
 	_handler.remove_action({"action": TEST_ACTION})
 
 
+func test_bind_event_joy_axis_null_axis() -> void:
+	_handler.add_action({"action": TEST_ACTION})
+	var result := _handler.bind_event({
+		"action": TEST_ACTION,
+		"event_type": "joy_axis",
+		"axis": null,
+	})
+	assert_is_error(result, ErrorCodes.MISSING_REQUIRED_PARAM)
+	_handler.remove_action({"action": TEST_ACTION})
+
+
 func test_bind_event_unknown_action_message_suggests_add_action() -> void:
 	## The error string should point the caller at the fix so they don't loop.
 	var result := _handler.bind_event({