Merge pull request #119 from AnushK-Fro/patch-3

Updates the code to start the server upon unsuspension

.editorconfig

@@ -0,0 +1,818 @@
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = false
+max_line_length = 120
+tab_width = 4
+ij_continuation_indent_size = 8
+ij_formatter_off_tag = @formatter:off
+ij_formatter_on_tag = @formatter:on
+ij_formatter_tags_enabled = true
+ij_smart_tabs = false
+ij_visual_guides = 
+ij_wrap_on_typing = false
+
+[*.blade.php]
+ij_blade_keep_indents_on_empty_lines = false
+
+[*.css]
+ij_css_align_closing_brace_with_properties = false
+ij_css_blank_lines_around_nested_selector = 1
+ij_css_blank_lines_between_blocks = 1
+ij_css_block_comment_add_space = false
+ij_css_brace_placement = end_of_line
+ij_css_enforce_quotes_on_format = false
+ij_css_hex_color_long_format = false
+ij_css_hex_color_lower_case = false
+ij_css_hex_color_short_format = false
+ij_css_hex_color_upper_case = false
+ij_css_keep_blank_lines_in_code = 2
+ij_css_keep_indents_on_empty_lines = false
+ij_css_keep_single_line_blocks = false
+ij_css_properties_order = font,font-family,font-size,font-weight,font-style,font-variant,font-size-adjust,font-stretch,line-height,position,z-index,top,right,bottom,left,display,visibility,float,clear,overflow,overflow-x,overflow-y,clip,zoom,align-content,align-items,align-self,flex,flex-flow,flex-basis,flex-direction,flex-grow,flex-shrink,flex-wrap,justify-content,order,box-sizing,width,min-width,max-width,height,min-height,max-height,margin,margin-top,margin-right,margin-bottom,margin-left,padding,padding-top,padding-right,padding-bottom,padding-left,table-layout,empty-cells,caption-side,border-spacing,border-collapse,list-style,list-style-position,list-style-type,list-style-image,content,quotes,counter-reset,counter-increment,resize,cursor,user-select,nav-index,nav-up,nav-right,nav-down,nav-left,transition,transition-delay,transition-timing-function,transition-duration,transition-property,transform,transform-origin,animation,animation-name,animation-duration,animation-play-state,animation-timing-function,animation-delay,animation-iteration-count,animation-direction,text-align,text-align-last,vertical-align,white-space,text-decoration,text-emphasis,text-emphasis-color,text-emphasis-style,text-emphasis-position,text-indent,text-justify,letter-spacing,word-spacing,text-outline,text-transform,text-wrap,text-overflow,text-overflow-ellipsis,text-overflow-mode,word-wrap,word-break,tab-size,hyphens,pointer-events,opacity,color,border,border-width,border-style,border-color,border-top,border-top-width,border-top-style,border-top-color,border-right,border-right-width,border-right-style,border-right-color,border-bottom,border-bottom-width,border-bottom-style,border-bottom-color,border-left,border-left-width,border-left-style,border-left-color,border-radius,border-top-left-radius,border-top-right-radius,border-bottom-right-radius,border-bottom-left-radius,border-image,border-image-source,border-image-slice,border-image-width,border-image-outset,border-image-repeat,outline,outline-width,outline-style,outline-color,outline-offset,background,background-color,background-image,background-repeat,background-attachment,background-position,background-position-x,background-position-y,background-clip,background-origin,background-size,box-decoration-break,box-shadow,text-shadow
+ij_css_space_after_colon = true
+ij_css_space_before_opening_brace = true
+ij_css_use_double_quotes = true
+ij_css_value_alignment = do_not_align
+
+[*.feature]
+indent_size = 2
+ij_gherkin_keep_indents_on_empty_lines = false
+
+[*.less]
+indent_size = 2
+ij_less_align_closing_brace_with_properties = false
+ij_less_blank_lines_around_nested_selector = 1
+ij_less_blank_lines_between_blocks = 1
+ij_less_block_comment_add_space = false
+ij_less_brace_placement = 0
+ij_less_enforce_quotes_on_format = false
+ij_less_hex_color_long_format = false
+ij_less_hex_color_lower_case = false
+ij_less_hex_color_short_format = false
+ij_less_hex_color_upper_case = false
+ij_less_keep_blank_lines_in_code = 2
+ij_less_keep_indents_on_empty_lines = false
+ij_less_keep_single_line_blocks = false
+ij_less_line_comment_add_space = false
+ij_less_line_comment_at_first_column = false
+ij_less_properties_order = font,font-family,font-size,font-weight,font-style,font-variant,font-size-adjust,font-stretch,line-height,position,z-index,top,right,bottom,left,display,visibility,float,clear,overflow,overflow-x,overflow-y,clip,zoom,align-content,align-items,align-self,flex,flex-flow,flex-basis,flex-direction,flex-grow,flex-shrink,flex-wrap,justify-content,order,box-sizing,width,min-width,max-width,height,min-height,max-height,margin,margin-top,margin-right,margin-bottom,margin-left,padding,padding-top,padding-right,padding-bottom,padding-left,table-layout,empty-cells,caption-side,border-spacing,border-collapse,list-style,list-style-position,list-style-type,list-style-image,content,quotes,counter-reset,counter-increment,resize,cursor,user-select,nav-index,nav-up,nav-right,nav-down,nav-left,transition,transition-delay,transition-timing-function,transition-duration,transition-property,transform,transform-origin,animation,animation-name,animation-duration,animation-play-state,animation-timing-function,animation-delay,animation-iteration-count,animation-direction,text-align,text-align-last,vertical-align,white-space,text-decoration,text-emphasis,text-emphasis-color,text-emphasis-style,text-emphasis-position,text-indent,text-justify,letter-spacing,word-spacing,text-outline,text-transform,text-wrap,text-overflow,text-overflow-ellipsis,text-overflow-mode,word-wrap,word-break,tab-size,hyphens,pointer-events,opacity,color,border,border-width,border-style,border-color,border-top,border-top-width,border-top-style,border-top-color,border-right,border-right-width,border-right-style,border-right-color,border-bottom,border-bottom-width,border-bottom-style,border-bottom-color,border-left,border-left-width,border-left-style,border-left-color,border-radius,border-top-left-radius,border-top-right-radius,border-bottom-right-radius,border-bottom-left-radius,border-image,border-image-source,border-image-slice,border-image-width,border-image-outset,border-image-repeat,outline,outline-width,outline-style,outline-color,outline-offset,background,background-color,background-image,background-repeat,background-attachment,background-position,background-position-x,background-position-y,background-clip,background-origin,background-size,box-decoration-break,box-shadow,text-shadow
+ij_less_space_after_colon = true
+ij_less_space_before_opening_brace = true
+ij_less_use_double_quotes = true
+ij_less_value_alignment = 0
+
+[*.sass]
+indent_size = 2
+ij_sass_align_closing_brace_with_properties = false
+ij_sass_blank_lines_around_nested_selector = 1
+ij_sass_blank_lines_between_blocks = 1
+ij_sass_brace_placement = 0
+ij_sass_enforce_quotes_on_format = false
+ij_sass_hex_color_long_format = false
+ij_sass_hex_color_lower_case = false
+ij_sass_hex_color_short_format = false
+ij_sass_hex_color_upper_case = false
+ij_sass_keep_blank_lines_in_code = 2
+ij_sass_keep_indents_on_empty_lines = false
+ij_sass_keep_single_line_blocks = false
+ij_sass_line_comment_add_space = false
+ij_sass_line_comment_at_first_column = false
+ij_sass_properties_order = font,font-family,font-size,font-weight,font-style,font-variant,font-size-adjust,font-stretch,line-height,position,z-index,top,right,bottom,left,display,visibility,float,clear,overflow,overflow-x,overflow-y,clip,zoom,align-content,align-items,align-self,flex,flex-flow,flex-basis,flex-direction,flex-grow,flex-shrink,flex-wrap,justify-content,order,box-sizing,width,min-width,max-width,height,min-height,max-height,margin,margin-top,margin-right,margin-bottom,margin-left,padding,padding-top,padding-right,padding-bottom,padding-left,table-layout,empty-cells,caption-side,border-spacing,border-collapse,list-style,list-style-position,list-style-type,list-style-image,content,quotes,counter-reset,counter-increment,resize,cursor,user-select,nav-index,nav-up,nav-right,nav-down,nav-left,transition,transition-delay,transition-timing-function,transition-duration,transition-property,transform,transform-origin,animation,animation-name,animation-duration,animation-play-state,animation-timing-function,animation-delay,animation-iteration-count,animation-direction,text-align,text-align-last,vertical-align,white-space,text-decoration,text-emphasis,text-emphasis-color,text-emphasis-style,text-emphasis-position,text-indent,text-justify,letter-spacing,word-spacing,text-outline,text-transform,text-wrap,text-overflow,text-overflow-ellipsis,text-overflow-mode,word-wrap,word-break,tab-size,hyphens,pointer-events,opacity,color,border,border-width,border-style,border-color,border-top,border-top-width,border-top-style,border-top-color,border-right,border-right-width,border-right-style,border-right-color,border-bottom,border-bottom-width,border-bottom-style,border-bottom-color,border-left,border-left-width,border-left-style,border-left-color,border-radius,border-top-left-radius,border-top-right-radius,border-bottom-right-radius,border-bottom-left-radius,border-image,border-image-source,border-image-slice,border-image-width,border-image-outset,border-image-repeat,outline,outline-width,outline-style,outline-color,outline-offset,background,background-color,background-image,background-repeat,background-attachment,background-position,background-position-x,background-position-y,background-clip,background-origin,background-size,box-decoration-break,box-shadow,text-shadow
+ij_sass_space_after_colon = true
+ij_sass_space_before_opening_brace = true
+ij_sass_use_double_quotes = true
+ij_sass_value_alignment = 0
+
+[*.scss]
+indent_size = 2
+ij_scss_align_closing_brace_with_properties = false
+ij_scss_blank_lines_around_nested_selector = 1
+ij_scss_blank_lines_between_blocks = 1
+ij_scss_block_comment_add_space = false
+ij_scss_brace_placement = 0
+ij_scss_enforce_quotes_on_format = false
+ij_scss_hex_color_long_format = false
+ij_scss_hex_color_lower_case = false
+ij_scss_hex_color_short_format = false
+ij_scss_hex_color_upper_case = false
+ij_scss_keep_blank_lines_in_code = 2
+ij_scss_keep_indents_on_empty_lines = false
+ij_scss_keep_single_line_blocks = false
+ij_scss_line_comment_add_space = false
+ij_scss_line_comment_at_first_column = false
+ij_scss_properties_order = font,font-family,font-size,font-weight,font-style,font-variant,font-size-adjust,font-stretch,line-height,position,z-index,top,right,bottom,left,display,visibility,float,clear,overflow,overflow-x,overflow-y,clip,zoom,align-content,align-items,align-self,flex,flex-flow,flex-basis,flex-direction,flex-grow,flex-shrink,flex-wrap,justify-content,order,box-sizing,width,min-width,max-width,height,min-height,max-height,margin,margin-top,margin-right,margin-bottom,margin-left,padding,padding-top,padding-right,padding-bottom,padding-left,table-layout,empty-cells,caption-side,border-spacing,border-collapse,list-style,list-style-position,list-style-type,list-style-image,content,quotes,counter-reset,counter-increment,resize,cursor,user-select,nav-index,nav-up,nav-right,nav-down,nav-left,transition,transition-delay,transition-timing-function,transition-duration,transition-property,transform,transform-origin,animation,animation-name,animation-duration,animation-play-state,animation-timing-function,animation-delay,animation-iteration-count,animation-direction,text-align,text-align-last,vertical-align,white-space,text-decoration,text-emphasis,text-emphasis-color,text-emphasis-style,text-emphasis-position,text-indent,text-justify,letter-spacing,word-spacing,text-outline,text-transform,text-wrap,text-overflow,text-overflow-ellipsis,text-overflow-mode,word-wrap,word-break,tab-size,hyphens,pointer-events,opacity,color,border,border-width,border-style,border-color,border-top,border-top-width,border-top-style,border-top-color,border-right,border-right-width,border-right-style,border-right-color,border-bottom,border-bottom-width,border-bottom-style,border-bottom-color,border-left,border-left-width,border-left-style,border-left-color,border-radius,border-top-left-radius,border-top-right-radius,border-bottom-right-radius,border-bottom-left-radius,border-image,border-image-source,border-image-slice,border-image-width,border-image-outset,border-image-repeat,outline,outline-width,outline-style,outline-color,outline-offset,background,background-color,background-image,background-repeat,background-attachment,background-position,background-position-x,background-position-y,background-clip,background-origin,background-size,box-decoration-break,box-shadow,text-shadow
+ij_scss_space_after_colon = true
+ij_scss_space_before_opening_brace = true
+ij_scss_use_double_quotes = true
+ij_scss_value_alignment = 0
+
+[*.twig]
+ij_twig_keep_indents_on_empty_lines = false
+ij_twig_spaces_inside_comments_delimiters = true
+ij_twig_spaces_inside_delimiters = true
+ij_twig_spaces_inside_variable_delimiters = true
+
+[*.vue]
+indent_size = 2
+tab_width = 2
+ij_continuation_indent_size = 4
+ij_vue_indent_children_of_top_level = template
+ij_vue_interpolation_new_line_after_start_delimiter = true
+ij_vue_interpolation_new_line_before_end_delimiter = true
+ij_vue_interpolation_wrap = off
+ij_vue_keep_indents_on_empty_lines = false
+ij_vue_spaces_within_interpolation_expressions = true
+
+[.editorconfig]
+ij_editorconfig_align_group_field_declarations = false
+ij_editorconfig_space_after_colon = false
+ij_editorconfig_space_after_comma = true
+ij_editorconfig_space_before_colon = false
+ij_editorconfig_space_before_comma = false
+ij_editorconfig_spaces_around_assignment_operators = true
+
+[{*.ant,*.fxml,*.jhm,*.jnlp,*.jrxml,*.rng,*.tld,*.wsdl,*.xml,*.xsd,*.xsl,*.xslt,*.xul,phpunit.xml.dist}]
+ij_xml_align_attributes = true
+ij_xml_align_text = false
+ij_xml_attribute_wrap = normal
+ij_xml_block_comment_add_space = false
+ij_xml_block_comment_at_first_column = true
+ij_xml_keep_blank_lines = 2
+ij_xml_keep_indents_on_empty_lines = false
+ij_xml_keep_line_breaks = true
+ij_xml_keep_line_breaks_in_text = true
+ij_xml_keep_whitespaces = false
+ij_xml_keep_whitespaces_around_cdata = preserve
+ij_xml_keep_whitespaces_inside_cdata = false
+ij_xml_line_comment_at_first_column = true
+ij_xml_space_after_tag_name = false
+ij_xml_space_around_equals_in_attribute = false
+ij_xml_space_inside_empty_tag = false
+ij_xml_text_wrap = normal
+
+[{*.ats,*.cts,*.mts,*.ts}]
+ij_continuation_indent_size = 4
+ij_typescript_align_imports = false
+ij_typescript_align_multiline_array_initializer_expression = false
+ij_typescript_align_multiline_binary_operation = false
+ij_typescript_align_multiline_chained_methods = false
+ij_typescript_align_multiline_extends_list = false
+ij_typescript_align_multiline_for = true
+ij_typescript_align_multiline_parameters = true
+ij_typescript_align_multiline_parameters_in_calls = false
+ij_typescript_align_multiline_ternary_operation = false
+ij_typescript_align_object_properties = 0
+ij_typescript_align_union_types = false
+ij_typescript_align_var_statements = 0
+ij_typescript_array_initializer_new_line_after_left_brace = false
+ij_typescript_array_initializer_right_brace_on_new_line = false
+ij_typescript_array_initializer_wrap = off
+ij_typescript_assignment_wrap = off
+ij_typescript_binary_operation_sign_on_next_line = false
+ij_typescript_binary_operation_wrap = off
+ij_typescript_blacklist_imports = rxjs/Rx,node_modules/**,**/node_modules/**,@angular/material,@angular/material/typings/**
+ij_typescript_blank_lines_after_imports = 1
+ij_typescript_blank_lines_around_class = 1
+ij_typescript_blank_lines_around_field = 0
+ij_typescript_blank_lines_around_field_in_interface = 0
+ij_typescript_blank_lines_around_function = 1
+ij_typescript_blank_lines_around_method = 1
+ij_typescript_blank_lines_around_method_in_interface = 1
+ij_typescript_block_brace_style = end_of_line
+ij_typescript_block_comment_add_space = false
+ij_typescript_block_comment_at_first_column = true
+ij_typescript_call_parameters_new_line_after_left_paren = false
+ij_typescript_call_parameters_right_paren_on_new_line = false
+ij_typescript_call_parameters_wrap = off
+ij_typescript_catch_on_new_line = false
+ij_typescript_chained_call_dot_on_new_line = true
+ij_typescript_class_brace_style = end_of_line
+ij_typescript_comma_on_new_line = false
+ij_typescript_do_while_brace_force = never
+ij_typescript_else_on_new_line = false
+ij_typescript_enforce_trailing_comma = keep
+ij_typescript_enum_constants_wrap = on_every_item
+ij_typescript_extends_keyword_wrap = off
+ij_typescript_extends_list_wrap = off
+ij_typescript_field_prefix = _
+ij_typescript_file_name_style = relaxed
+ij_typescript_finally_on_new_line = false
+ij_typescript_for_brace_force = never
+ij_typescript_for_statement_new_line_after_left_paren = false
+ij_typescript_for_statement_right_paren_on_new_line = false
+ij_typescript_for_statement_wrap = off
+ij_typescript_force_quote_style = false
+ij_typescript_force_semicolon_style = false
+ij_typescript_function_expression_brace_style = end_of_line
+ij_typescript_if_brace_force = never
+ij_typescript_import_merge_members = global
+ij_typescript_import_prefer_absolute_path = global
+ij_typescript_import_sort_members = true
+ij_typescript_import_sort_module_name = false
+ij_typescript_import_use_node_resolution = true
+ij_typescript_imports_wrap = on_every_item
+ij_typescript_indent_case_from_switch = true
+ij_typescript_indent_chained_calls = true
+ij_typescript_indent_package_children = 0
+ij_typescript_jsdoc_include_types = false
+ij_typescript_jsx_attribute_value = braces
+ij_typescript_keep_blank_lines_in_code = 2
+ij_typescript_keep_first_column_comment = true
+ij_typescript_keep_indents_on_empty_lines = false
+ij_typescript_keep_line_breaks = true
+ij_typescript_keep_simple_blocks_in_one_line = false
+ij_typescript_keep_simple_methods_in_one_line = false
+ij_typescript_line_comment_add_space = true
+ij_typescript_line_comment_at_first_column = false
+ij_typescript_method_brace_style = end_of_line
+ij_typescript_method_call_chain_wrap = off
+ij_typescript_method_parameters_new_line_after_left_paren = false
+ij_typescript_method_parameters_right_paren_on_new_line = false
+ij_typescript_method_parameters_wrap = off
+ij_typescript_object_literal_wrap = on_every_item
+ij_typescript_object_types_wrap = on_every_item
+ij_typescript_parentheses_expression_new_line_after_left_paren = false
+ij_typescript_parentheses_expression_right_paren_on_new_line = false
+ij_typescript_place_assignment_sign_on_next_line = false
+ij_typescript_prefer_as_type_cast = false
+ij_typescript_prefer_explicit_types_function_expression_returns = false
+ij_typescript_prefer_explicit_types_function_returns = false
+ij_typescript_prefer_explicit_types_vars_fields = false
+ij_typescript_prefer_parameters_wrap = false
+ij_typescript_property_prefix = 
+ij_typescript_reformat_c_style_comments = false
+ij_typescript_space_after_colon = true
+ij_typescript_space_after_comma = true
+ij_typescript_space_after_dots_in_rest_parameter = false
+ij_typescript_space_after_generator_mult = true
+ij_typescript_space_after_property_colon = true
+ij_typescript_space_after_quest = true
+ij_typescript_space_after_type_colon = true
+ij_typescript_space_after_unary_not = false
+ij_typescript_space_before_async_arrow_lparen = true
+ij_typescript_space_before_catch_keyword = true
+ij_typescript_space_before_catch_left_brace = true
+ij_typescript_space_before_catch_parentheses = true
+ij_typescript_space_before_class_lbrace = true
+ij_typescript_space_before_class_left_brace = true
+ij_typescript_space_before_colon = true
+ij_typescript_space_before_comma = false
+ij_typescript_space_before_do_left_brace = true
+ij_typescript_space_before_else_keyword = true
+ij_typescript_space_before_else_left_brace = true
+ij_typescript_space_before_finally_keyword = true
+ij_typescript_space_before_finally_left_brace = true
+ij_typescript_space_before_for_left_brace = true
+ij_typescript_space_before_for_parentheses = true
+ij_typescript_space_before_for_semicolon = false
+ij_typescript_space_before_function_left_parenth = true
+ij_typescript_space_before_generator_mult = false
+ij_typescript_space_before_if_left_brace = true
+ij_typescript_space_before_if_parentheses = true
+ij_typescript_space_before_method_call_parentheses = false
+ij_typescript_space_before_method_left_brace = true
+ij_typescript_space_before_method_parentheses = false
+ij_typescript_space_before_property_colon = false
+ij_typescript_space_before_quest = true
+ij_typescript_space_before_switch_left_brace = true
+ij_typescript_space_before_switch_parentheses = true
+ij_typescript_space_before_try_left_brace = true
+ij_typescript_space_before_type_colon = false
+ij_typescript_space_before_unary_not = false
+ij_typescript_space_before_while_keyword = true
+ij_typescript_space_before_while_left_brace = true
+ij_typescript_space_before_while_parentheses = true
+ij_typescript_spaces_around_additive_operators = true
+ij_typescript_spaces_around_arrow_function_operator = true
+ij_typescript_spaces_around_assignment_operators = true
+ij_typescript_spaces_around_bitwise_operators = true
+ij_typescript_spaces_around_equality_operators = true
+ij_typescript_spaces_around_logical_operators = true
+ij_typescript_spaces_around_multiplicative_operators = true
+ij_typescript_spaces_around_relational_operators = true
+ij_typescript_spaces_around_shift_operators = true
+ij_typescript_spaces_around_unary_operator = false
+ij_typescript_spaces_within_array_initializer_brackets = false
+ij_typescript_spaces_within_brackets = false
+ij_typescript_spaces_within_catch_parentheses = false
+ij_typescript_spaces_within_for_parentheses = false
+ij_typescript_spaces_within_if_parentheses = false
+ij_typescript_spaces_within_imports = false
+ij_typescript_spaces_within_interpolation_expressions = false
+ij_typescript_spaces_within_method_call_parentheses = false
+ij_typescript_spaces_within_method_parentheses = false
+ij_typescript_spaces_within_object_literal_braces = false
+ij_typescript_spaces_within_object_type_braces = true
+ij_typescript_spaces_within_parentheses = false
+ij_typescript_spaces_within_switch_parentheses = false
+ij_typescript_spaces_within_type_assertion = false
+ij_typescript_spaces_within_union_types = true
+ij_typescript_spaces_within_while_parentheses = false
+ij_typescript_special_else_if_treatment = true
+ij_typescript_ternary_operation_signs_on_next_line = false
+ij_typescript_ternary_operation_wrap = off
+ij_typescript_union_types_wrap = on_every_item
+ij_typescript_use_chained_calls_group_indents = false
+ij_typescript_use_double_quotes = true
+ij_typescript_use_explicit_js_extension = auto
+ij_typescript_use_path_mapping = always
+ij_typescript_use_public_modifier = false
+ij_typescript_use_semicolon_after_statement = true
+ij_typescript_var_declaration_wrap = normal
+ij_typescript_while_brace_force = never
+ij_typescript_while_on_new_line = false
+ij_typescript_wrap_comments = false
+
+[{*.bash,*.sh,*.zsh}]
+indent_size = 2
+tab_width = 2
+ij_shell_binary_ops_start_line = false
+ij_shell_keep_column_alignment_padding = false
+ij_shell_minify_program = false
+ij_shell_redirect_followed_by_space = false
+ij_shell_switch_cases_indented = false
+ij_shell_use_unix_line_separator = true
+
+[{*.cjs,*.js}]
+ij_continuation_indent_size = 4
+ij_javascript_align_imports = false
+ij_javascript_align_multiline_array_initializer_expression = false
+ij_javascript_align_multiline_binary_operation = false
+ij_javascript_align_multiline_chained_methods = false
+ij_javascript_align_multiline_extends_list = false
+ij_javascript_align_multiline_for = true
+ij_javascript_align_multiline_parameters = true
+ij_javascript_align_multiline_parameters_in_calls = false
+ij_javascript_align_multiline_ternary_operation = false
+ij_javascript_align_object_properties = 0
+ij_javascript_align_union_types = false
+ij_javascript_align_var_statements = 0
+ij_javascript_array_initializer_new_line_after_left_brace = false
+ij_javascript_array_initializer_right_brace_on_new_line = false
+ij_javascript_array_initializer_wrap = off
+ij_javascript_assignment_wrap = off
+ij_javascript_binary_operation_sign_on_next_line = false
+ij_javascript_binary_operation_wrap = off
+ij_javascript_blacklist_imports = rxjs/Rx,node_modules/**,**/node_modules/**,@angular/material,@angular/material/typings/**
+ij_javascript_blank_lines_after_imports = 1
+ij_javascript_blank_lines_around_class = 1
+ij_javascript_blank_lines_around_field = 0
+ij_javascript_blank_lines_around_function = 1
+ij_javascript_blank_lines_around_method = 1
+ij_javascript_block_brace_style = end_of_line
+ij_javascript_block_comment_add_space = false
+ij_javascript_block_comment_at_first_column = true
+ij_javascript_call_parameters_new_line_after_left_paren = false
+ij_javascript_call_parameters_right_paren_on_new_line = false
+ij_javascript_call_parameters_wrap = off
+ij_javascript_catch_on_new_line = false
+ij_javascript_chained_call_dot_on_new_line = true
+ij_javascript_class_brace_style = end_of_line
+ij_javascript_comma_on_new_line = false
+ij_javascript_do_while_brace_force = never
+ij_javascript_else_on_new_line = false
+ij_javascript_enforce_trailing_comma = keep
+ij_javascript_extends_keyword_wrap = off
+ij_javascript_extends_list_wrap = off
+ij_javascript_field_prefix = _
+ij_javascript_file_name_style = relaxed
+ij_javascript_finally_on_new_line = false
+ij_javascript_for_brace_force = never
+ij_javascript_for_statement_new_line_after_left_paren = false
+ij_javascript_for_statement_right_paren_on_new_line = false
+ij_javascript_for_statement_wrap = off
+ij_javascript_force_quote_style = false
+ij_javascript_force_semicolon_style = false
+ij_javascript_function_expression_brace_style = end_of_line
+ij_javascript_if_brace_force = never
+ij_javascript_import_merge_members = global
+ij_javascript_import_prefer_absolute_path = global
+ij_javascript_import_sort_members = true
+ij_javascript_import_sort_module_name = false
+ij_javascript_import_use_node_resolution = true
+ij_javascript_imports_wrap = on_every_item
+ij_javascript_indent_case_from_switch = true
+ij_javascript_indent_chained_calls = true
+ij_javascript_indent_package_children = 0
+ij_javascript_jsx_attribute_value = braces
+ij_javascript_keep_blank_lines_in_code = 2
+ij_javascript_keep_first_column_comment = true
+ij_javascript_keep_indents_on_empty_lines = false
+ij_javascript_keep_line_breaks = true
+ij_javascript_keep_simple_blocks_in_one_line = false
+ij_javascript_keep_simple_methods_in_one_line = false
+ij_javascript_line_comment_add_space = true
+ij_javascript_line_comment_at_first_column = false
+ij_javascript_method_brace_style = end_of_line
+ij_javascript_method_call_chain_wrap = off
+ij_javascript_method_parameters_new_line_after_left_paren = false
+ij_javascript_method_parameters_right_paren_on_new_line = false
+ij_javascript_method_parameters_wrap = off
+ij_javascript_object_literal_wrap = on_every_item
+ij_javascript_object_types_wrap = on_every_item
+ij_javascript_parentheses_expression_new_line_after_left_paren = false
+ij_javascript_parentheses_expression_right_paren_on_new_line = false
+ij_javascript_place_assignment_sign_on_next_line = false
+ij_javascript_prefer_as_type_cast = false
+ij_javascript_prefer_explicit_types_function_expression_returns = false
+ij_javascript_prefer_explicit_types_function_returns = false
+ij_javascript_prefer_explicit_types_vars_fields = false
+ij_javascript_prefer_parameters_wrap = false
+ij_javascript_property_prefix = 
+ij_javascript_reformat_c_style_comments = false
+ij_javascript_space_after_colon = true
+ij_javascript_space_after_comma = true
+ij_javascript_space_after_dots_in_rest_parameter = false
+ij_javascript_space_after_generator_mult = true
+ij_javascript_space_after_property_colon = true
+ij_javascript_space_after_quest = true
+ij_javascript_space_after_type_colon = true
+ij_javascript_space_after_unary_not = false
+ij_javascript_space_before_async_arrow_lparen = true
+ij_javascript_space_before_catch_keyword = true
+ij_javascript_space_before_catch_left_brace = true
+ij_javascript_space_before_catch_parentheses = true
+ij_javascript_space_before_class_lbrace = true
+ij_javascript_space_before_class_left_brace = true
+ij_javascript_space_before_colon = true
+ij_javascript_space_before_comma = false
+ij_javascript_space_before_do_left_brace = true
+ij_javascript_space_before_else_keyword = true
+ij_javascript_space_before_else_left_brace = true
+ij_javascript_space_before_finally_keyword = true
+ij_javascript_space_before_finally_left_brace = true
+ij_javascript_space_before_for_left_brace = true
+ij_javascript_space_before_for_parentheses = true
+ij_javascript_space_before_for_semicolon = false
+ij_javascript_space_before_function_left_parenth = true
+ij_javascript_space_before_generator_mult = false
+ij_javascript_space_before_if_left_brace = true
+ij_javascript_space_before_if_parentheses = true
+ij_javascript_space_before_method_call_parentheses = false
+ij_javascript_space_before_method_left_brace = true
+ij_javascript_space_before_method_parentheses = false
+ij_javascript_space_before_property_colon = false
+ij_javascript_space_before_quest = true
+ij_javascript_space_before_switch_left_brace = true
+ij_javascript_space_before_switch_parentheses = true
+ij_javascript_space_before_try_left_brace = true
+ij_javascript_space_before_type_colon = false
+ij_javascript_space_before_unary_not = false
+ij_javascript_space_before_while_keyword = true
+ij_javascript_space_before_while_left_brace = true
+ij_javascript_space_before_while_parentheses = true
+ij_javascript_spaces_around_additive_operators = true
+ij_javascript_spaces_around_arrow_function_operator = true
+ij_javascript_spaces_around_assignment_operators = true
+ij_javascript_spaces_around_bitwise_operators = true
+ij_javascript_spaces_around_equality_operators = true
+ij_javascript_spaces_around_logical_operators = true
+ij_javascript_spaces_around_multiplicative_operators = true
+ij_javascript_spaces_around_relational_operators = true
+ij_javascript_spaces_around_shift_operators = true
+ij_javascript_spaces_around_unary_operator = false
+ij_javascript_spaces_within_array_initializer_brackets = false
+ij_javascript_spaces_within_brackets = false
+ij_javascript_spaces_within_catch_parentheses = false
+ij_javascript_spaces_within_for_parentheses = false
+ij_javascript_spaces_within_if_parentheses = false
+ij_javascript_spaces_within_imports = false
+ij_javascript_spaces_within_interpolation_expressions = false
+ij_javascript_spaces_within_method_call_parentheses = false
+ij_javascript_spaces_within_method_parentheses = false
+ij_javascript_spaces_within_object_literal_braces = false
+ij_javascript_spaces_within_object_type_braces = true
+ij_javascript_spaces_within_parentheses = false
+ij_javascript_spaces_within_switch_parentheses = false
+ij_javascript_spaces_within_type_assertion = false
+ij_javascript_spaces_within_union_types = true
+ij_javascript_spaces_within_while_parentheses = false
+ij_javascript_special_else_if_treatment = true
+ij_javascript_ternary_operation_signs_on_next_line = false
+ij_javascript_ternary_operation_wrap = off
+ij_javascript_union_types_wrap = on_every_item
+ij_javascript_use_chained_calls_group_indents = false
+ij_javascript_use_double_quotes = true
+ij_javascript_use_explicit_js_extension = auto
+ij_javascript_use_path_mapping = always
+ij_javascript_use_public_modifier = false
+ij_javascript_use_semicolon_after_statement = true
+ij_javascript_var_declaration_wrap = normal
+ij_javascript_while_brace_force = never
+ij_javascript_while_on_new_line = false
+ij_javascript_wrap_comments = false
+
+[{*.ctp,*.hphp,*.inc,*.module,*.php,*.php4,*.php5,*.phtml}]
+max_line_length = 100
+ij_continuation_indent_size = 4
+ij_php_align_assignments = false
+ij_php_align_class_constants = false
+ij_php_align_enum_cases = false
+ij_php_align_group_field_declarations = false
+ij_php_align_inline_comments = false
+ij_php_align_key_value_pairs = false
+ij_php_align_match_arm_bodies = false
+ij_php_align_multiline_array_initializer_expression = false
+ij_php_align_multiline_binary_operation = false
+ij_php_align_multiline_chained_methods = true
+ij_php_align_multiline_extends_list = false
+ij_php_align_multiline_for = true
+ij_php_align_multiline_parameters = true
+ij_php_align_multiline_parameters_in_calls = false
+ij_php_align_multiline_ternary_operation = false
+ij_php_align_named_arguments = true
+ij_php_align_phpdoc_comments = false
+ij_php_align_phpdoc_param_names = false
+ij_php_anonymous_brace_style = end_of_line
+ij_php_api_weight = 28
+ij_php_array_initializer_new_line_after_left_brace = false
+ij_php_array_initializer_right_brace_on_new_line = false
+ij_php_array_initializer_wrap = off
+ij_php_assignment_wrap = off
+ij_php_attributes_wrap = off
+ij_php_author_weight = 28
+ij_php_binary_operation_sign_on_next_line = false
+ij_php_binary_operation_wrap = off
+ij_php_blank_lines_after_class_header = 0
+ij_php_blank_lines_after_function = 1
+ij_php_blank_lines_after_imports = 1
+ij_php_blank_lines_after_opening_tag = 0
+ij_php_blank_lines_after_package = 0
+ij_php_blank_lines_around_class = 1
+ij_php_blank_lines_around_constants = 0
+ij_php_blank_lines_around_enum_cases = 0
+ij_php_blank_lines_around_field = 0
+ij_php_blank_lines_around_method = 1
+ij_php_blank_lines_before_class_end = 0
+ij_php_blank_lines_before_imports = 1
+ij_php_blank_lines_before_method_body = 0
+ij_php_blank_lines_before_package = 1
+ij_php_blank_lines_before_return_statement = 0
+ij_php_blank_lines_between_imports = 0
+ij_php_block_brace_style = end_of_line
+ij_php_call_parameters_new_line_after_left_paren = true
+ij_php_call_parameters_right_paren_on_new_line = true
+ij_php_call_parameters_wrap = normal
+ij_php_catch_on_new_line = false
+ij_php_category_weight = 28
+ij_php_class_brace_style = next_line
+ij_php_comma_after_last_argument = true
+ij_php_comma_after_last_array_element = true
+ij_php_comma_after_last_closure_use_var = true
+ij_php_comma_after_last_match_arm = true
+ij_php_comma_after_last_parameter = true
+ij_php_concat_spaces = true
+ij_php_copyright_weight = 28
+ij_php_deprecated_weight = 28
+ij_php_do_while_brace_force = never
+ij_php_else_if_style = combine
+ij_php_else_on_new_line = false
+ij_php_example_weight = 28
+ij_php_extends_keyword_wrap = off
+ij_php_extends_list_wrap = off
+ij_php_fields_default_visibility = private
+ij_php_filesource_weight = 28
+ij_php_finally_on_new_line = false
+ij_php_for_brace_force = never
+ij_php_for_statement_new_line_after_left_paren = false
+ij_php_for_statement_right_paren_on_new_line = false
+ij_php_for_statement_wrap = off
+ij_php_force_empty_methods_in_one_line = false
+ij_php_force_short_declaration_array_style = true
+ij_php_getters_setters_naming_style = camel_case
+ij_php_getters_setters_order_style = getters_first
+ij_php_global_weight = 28
+ij_php_group_use_wrap = on_every_item
+ij_php_if_brace_force = never
+ij_php_if_lparen_on_next_line = false
+ij_php_if_rparen_on_next_line = false
+ij_php_ignore_weight = 28
+ij_php_import_sorting = alphabetic
+ij_php_indent_break_from_case = true
+ij_php_indent_case_from_switch = true
+ij_php_indent_code_in_php_tags = false
+ij_php_internal_weight = 28
+ij_php_keep_blank_lines_after_lbrace = 2
+ij_php_keep_blank_lines_before_right_brace = 2
+ij_php_keep_blank_lines_in_code = 2
+ij_php_keep_blank_lines_in_declarations = 2
+ij_php_keep_control_statement_in_one_line = true
+ij_php_keep_first_column_comment = true
+ij_php_keep_indents_on_empty_lines = false
+ij_php_keep_line_breaks = true
+ij_php_keep_rparen_and_lbrace_on_one_line = false
+ij_php_keep_simple_classes_in_one_line = false
+ij_php_keep_simple_methods_in_one_line = false
+ij_php_lambda_brace_style = end_of_line
+ij_php_license_weight = 28
+ij_php_line_comment_add_space = false
+ij_php_line_comment_at_first_column = true
+ij_php_link_weight = 28
+ij_php_lower_case_boolean_const = true
+ij_php_lower_case_keywords = true
+ij_php_lower_case_null_const = true
+ij_php_method_brace_style = next_line
+ij_php_method_call_chain_wrap = normal
+ij_php_method_parameters_new_line_after_left_paren = true
+ij_php_method_parameters_right_paren_on_new_line = true
+ij_php_method_parameters_wrap = normal
+ij_php_method_weight = 28
+ij_php_modifier_list_wrap = false
+ij_php_multiline_chained_calls_semicolon_on_new_line = false
+ij_php_namespace_brace_style = 1
+ij_php_new_line_after_php_opening_tag = true
+ij_php_null_type_position = in_the_end
+ij_php_package_weight = 28
+ij_php_param_weight = 0
+ij_php_parameters_attributes_wrap = off
+ij_php_parentheses_expression_new_line_after_left_paren = false
+ij_php_parentheses_expression_right_paren_on_new_line = false
+ij_php_phpdoc_blank_line_before_tags = false
+ij_php_phpdoc_blank_lines_around_parameters = false
+ij_php_phpdoc_keep_blank_lines = true
+ij_php_phpdoc_param_spaces_between_name_and_description = 1
+ij_php_phpdoc_param_spaces_between_tag_and_type = 1
+ij_php_phpdoc_param_spaces_between_type_and_name = 1
+ij_php_phpdoc_use_fqcn = false
+ij_php_phpdoc_wrap_long_lines = false
+ij_php_place_assignment_sign_on_next_line = false
+ij_php_place_parens_for_constructor = 1
+ij_php_property_read_weight = 28
+ij_php_property_weight = 28
+ij_php_property_write_weight = 28
+ij_php_return_type_on_new_line = false
+ij_php_return_weight = 1
+ij_php_see_weight = 28
+ij_php_since_weight = 28
+ij_php_sort_phpdoc_elements = true
+ij_php_space_after_colon = true
+ij_php_space_after_colon_in_enum_backed_type = true
+ij_php_space_after_colon_in_named_argument = true
+ij_php_space_after_colon_in_return_type = true
+ij_php_space_after_comma = true
+ij_php_space_after_for_semicolon = true
+ij_php_space_after_quest = true
+ij_php_space_after_type_cast = false
+ij_php_space_after_unary_not = false
+ij_php_space_before_array_initializer_left_brace = false
+ij_php_space_before_catch_keyword = true
+ij_php_space_before_catch_left_brace = true
+ij_php_space_before_catch_parentheses = true
+ij_php_space_before_class_left_brace = true
+ij_php_space_before_closure_left_parenthesis = true
+ij_php_space_before_colon = true
+ij_php_space_before_colon_in_enum_backed_type = false
+ij_php_space_before_colon_in_named_argument = false
+ij_php_space_before_colon_in_return_type = false
+ij_php_space_before_comma = false
+ij_php_space_before_do_left_brace = true
+ij_php_space_before_else_keyword = true
+ij_php_space_before_else_left_brace = true
+ij_php_space_before_finally_keyword = true
+ij_php_space_before_finally_left_brace = true
+ij_php_space_before_for_left_brace = true
+ij_php_space_before_for_parentheses = true
+ij_php_space_before_for_semicolon = false
+ij_php_space_before_if_left_brace = true
+ij_php_space_before_if_parentheses = true
+ij_php_space_before_method_call_parentheses = false
+ij_php_space_before_method_left_brace = true
+ij_php_space_before_method_parentheses = false
+ij_php_space_before_quest = true
+ij_php_space_before_short_closure_left_parenthesis = true
+ij_php_space_before_switch_left_brace = true
+ij_php_space_before_switch_parentheses = true
+ij_php_space_before_try_left_brace = true
+ij_php_space_before_unary_not = false
+ij_php_space_before_while_keyword = true
+ij_php_space_before_while_left_brace = true
+ij_php_space_before_while_parentheses = true
+ij_php_space_between_ternary_quest_and_colon = false
+ij_php_spaces_around_additive_operators = true
+ij_php_spaces_around_arrow = false
+ij_php_spaces_around_assignment_in_declare = false
+ij_php_spaces_around_assignment_operators = true
+ij_php_spaces_around_bitwise_operators = true
+ij_php_spaces_around_equality_operators = true
+ij_php_spaces_around_logical_operators = true
+ij_php_spaces_around_multiplicative_operators = true
+ij_php_spaces_around_null_coalesce_operator = true
+ij_php_spaces_around_pipe_in_union_type = false
+ij_php_spaces_around_relational_operators = true
+ij_php_spaces_around_shift_operators = true
+ij_php_spaces_around_unary_operator = false
+ij_php_spaces_around_var_within_brackets = false
+ij_php_spaces_within_array_initializer_braces = false
+ij_php_spaces_within_brackets = false
+ij_php_spaces_within_catch_parentheses = false
+ij_php_spaces_within_for_parentheses = false
+ij_php_spaces_within_if_parentheses = false
+ij_php_spaces_within_method_call_parentheses = false
+ij_php_spaces_within_method_parentheses = false
+ij_php_spaces_within_parentheses = false
+ij_php_spaces_within_short_echo_tags = true
+ij_php_spaces_within_switch_parentheses = false
+ij_php_spaces_within_while_parentheses = false
+ij_php_special_else_if_treatment = false
+ij_php_subpackage_weight = 28
+ij_php_ternary_operation_signs_on_next_line = false
+ij_php_ternary_operation_wrap = off
+ij_php_throws_weight = 2
+ij_php_todo_weight = 28
+ij_php_treat_multiline_arrays_and_lambdas_multiline = false
+ij_php_unknown_tag_weight = 28
+ij_php_upper_case_boolean_const = false
+ij_php_upper_case_null_const = false
+ij_php_uses_weight = 28
+ij_php_var_weight = 28
+ij_php_variable_naming_style = mixed
+ij_php_version_weight = 28
+ij_php_while_brace_force = never
+ij_php_while_on_new_line = false
+
+[{*.har,*.jsb2,*.jsb3,*.json,.babelrc,.eslintrc,.prettierrc,.stylelintrc,bowerrc,composer.lock,jest.config}]
+indent_size = 2
+ij_json_array_wrapping = split_into_lines
+ij_json_keep_blank_lines_in_code = 0
+ij_json_keep_indents_on_empty_lines = false
+ij_json_keep_line_breaks = true
+ij_json_keep_trailing_comma = false
+ij_json_object_wrapping = split_into_lines
+ij_json_property_alignment = do_not_align
+ij_json_space_after_colon = true
+ij_json_space_after_comma = true
+ij_json_space_before_colon = false
+ij_json_space_before_comma = false
+ij_json_spaces_within_braces = false
+ij_json_spaces_within_brackets = false
+ij_json_wrap_long_lines = false
+
+[{*.htm,*.html,*.ng,*.sht,*.shtm,*.shtml}]
+ij_html_add_new_line_before_tags = body,div,p,form,h1,h2,h3
+ij_html_align_attributes = true
+ij_html_align_text = false
+ij_html_attribute_wrap = normal
+ij_html_block_comment_add_space = false
+ij_html_block_comment_at_first_column = true
+ij_html_do_not_align_children_of_min_lines = 0
+ij_html_do_not_break_if_inline_tags = title,h1,h2,h3,h4,h5,h6,p
+ij_html_do_not_indent_children_of_tags = html,body,thead,tbody,tfoot
+ij_html_enforce_quotes = false
+ij_html_inline_tags = a,abbr,acronym,b,basefont,bdo,big,br,cite,cite,code,dfn,em,font,i,img,input,kbd,label,q,s,samp,select,small,span,strike,strong,sub,sup,textarea,tt,u,var
+ij_html_keep_blank_lines = 2
+ij_html_keep_indents_on_empty_lines = false
+ij_html_keep_line_breaks = true
+ij_html_keep_line_breaks_in_text = true
+ij_html_keep_whitespaces = false
+ij_html_keep_whitespaces_inside = span,pre,textarea
+ij_html_line_comment_at_first_column = true
+ij_html_new_line_after_last_attribute = never
+ij_html_new_line_before_first_attribute = never
+ij_html_quote_style = double
+ij_html_remove_new_line_before_tags = br
+ij_html_space_after_tag_name = false
+ij_html_space_around_equality_in_attribute = false
+ij_html_space_inside_empty_tag = false
+ij_html_text_wrap = normal
+
+[{*.http,*.rest}]
+indent_size = 0
+ij_continuation_indent_size = 4
+ij_http-request_call_parameters_wrap = normal
+ij_http-request_method_parameters_wrap = split_into_lines
+ij_http-request_space_before_comma = true
+ij_http-request_spaces_around_assignment_operators = true
+
+[{*.markdown,*.md}]
+ij_markdown_force_one_space_after_blockquote_symbol = true
+ij_markdown_force_one_space_after_header_symbol = true
+ij_markdown_force_one_space_after_list_bullet = true
+ij_markdown_force_one_space_between_words = true
+ij_markdown_format_tables = true
+ij_markdown_insert_quote_arrows_on_wrap = true
+ij_markdown_keep_indents_on_empty_lines = false
+ij_markdown_keep_line_breaks_inside_text_blocks = true
+ij_markdown_max_lines_around_block_elements = 1
+ij_markdown_max_lines_around_header = 1
+ij_markdown_max_lines_between_paragraphs = 1
+ij_markdown_min_lines_around_block_elements = 1
+ij_markdown_min_lines_around_header = 1
+ij_markdown_min_lines_between_paragraphs = 1
+ij_markdown_wrap_text_if_long = true
+ij_markdown_wrap_text_inside_blockquotes = true
+
+[{*.yaml,*.yml}]
+indent_size = 2
+ij_yaml_align_values_properties = do_not_align
+ij_yaml_autoinsert_sequence_marker = true
+ij_yaml_block_mapping_on_new_line = false
+ij_yaml_indent_sequence_value = true
+ij_yaml_keep_indents_on_empty_lines = false
+ij_yaml_keep_line_breaks = true
+ij_yaml_sequence_on_new_line = false
+ij_yaml_space_before_colon = false
+ij_yaml_spaces_within_braces = true
+ij_yaml_spaces_within_brackets = true

.env.ci

@@ -1,18 +1,38 @@
-APP_ENV=testing
+APP_NAME=Convoy
+APP_ENV=local
+APP_KEY=base64:+5q+lnrWbT8DykRkTZS8JZ+mTU7Efwv35bnTCyff02w=
 APP_DEBUG=true
-APP_KEY=SomeRandomString3232RandomString
-APP_TIMEZONE=UTC
-APP_URL=http://localhost/
+APP_URL=http://localhost
 
-DB_HOST=127.0.0.1
-DB_DATABASE=panel_test
-DB_USERNAME=root
-DB_PASSWORD=
+LOG_CHANNEL=stack
+LOG_DEPRECATIONS_CHANNEL=null
+LOG_LEVEL=debug
 
-CACHE_DRIVER=array
-SESSION_DRIVER=array
-MAIL_DRIVER=array
-QUEUE_DRIVER=sync
+DB_CONNECTION=mysql
+DB_HOST=database
+DB_PORT=3306
+DB_DATABASE=convoy
+DB_USERNAME=convoy_user
+DB_PASSWORD=YzLa2BCBwDGWVkpG
 
-HASHIDS_SALT=test123
-APP_ENVIRONMENT_ONLY=true
+CACHE_DRIVER=redis
+FILESYSTEM_DISK=local
+QUEUE_CONNECTION=redis
+SESSION_DRIVER=redis
+SESSION_LIFETIME=525600
+
+REDIS_HOST=redis
+REDIS_PASSWORD=YzLa2BCBwDGWVkpG
+REDIS_PORT=6379
+
+MAIL_MAILER=smtp
+MAIL_HOST=mailhog
+MAIL_PORT=1025
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+MAIL_FROM_ADDRESS="hello@example.com"
+MAIL_FROM_NAME="${APP_NAME}"
+
+PHP_XDEBUG=false
+PHP_XDEBUG_MODE='debug'

.env.example

@@ -9,22 +9,20 @@ LOG_DEPRECATIONS_CHANNEL=null
 LOG_LEVEL=debug
 
 DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
+DB_HOST=database
 DB_PORT=3306
-DB_DATABASE=laravel
-DB_USERNAME=root
+DB_DATABASE=convoy
+DB_USERNAME=convoy_user
 DB_PASSWORD=
-DB_ROOT_PASSWORD=
 
-BROADCAST_DRIVER=pusher
-CACHE_DRIVER=file
+CACHE_DRIVER=redis
 FILESYSTEM_DISK=local
-QUEUE_CONNECTION=sync
-SESSION_DRIVER=file
-SESSION_LIFETIME=120
+QUEUE_CONNECTION=redis
+SESSION_DRIVER=redis
+SESSION_LIFETIME=525600
 
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
+REDIS_HOST=redis
+REDIS_PASSWORD=
 REDIS_PORT=6379
 
 MAIL_MAILER=smtp
@@ -36,22 +34,5 @@ MAIL_ENCRYPTION=null
 MAIL_FROM_ADDRESS="hello@example.com"
 MAIL_FROM_NAME="${APP_NAME}"
 
-PUSHER_APP_ID=app-id
-PUSHER_APP_KEY=app-key
-PUSHER_APP_SECRET=app-secret
-PUSHER_HOST=127.0.0.1
-PUSHER_PORT=6001
-PUSHER_SCHEME=http
-PUSHER_APP_CLUSTER=mt1
-
-VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
-VITE_PUSHER_HOST="${PUSHER_HOST}"
-VITE_PUSHER_PORT="${PUSHER_PORT}"
-VITE_PUSHER_SCHEME="${PUSHER_SCHEME}"
-VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
-
-EXTERNAL_SECRET=
-
-DEV_XDEBUG=false
-PHP_IDE_CONFIG="serverName=convoy"
-XDEBUG_CONFIG="client_host=999.999.999.999 client_port=9003 idekey=docker start_with_request=yes log=/dev/stdout log_level=0 discover_client_host=true"
+PHP_XDEBUG=false
+PHP_XDEBUG_MODE='debug'

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: ['https://donate.stripe.com/dR6dRIgbafyIaek000', 'https://console.convoypanel.com']

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -0,0 +1,91 @@
+name: Bug Report
+description: Something isn't working quite right in the software.
+labels: [ bug,not confirmed ]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Bug reports should only be used for reporting issues with how the software works. For assistance installing this software, as well as debugging issues with dependencies, please use our [Discord server](https://discord.convoypanel.com).
+
+  - type: textarea
+    attributes:
+      label: Current Behavior
+      description: Please provide a clear & concise description of the issue.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Expected Behavior
+      description: Please describe what you expected to happen.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Steps to Reproduce
+      description: Please be as detailed as possible when providing steps to reproduce, failure to provide steps will result in this issue being closed.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Screenshots
+      description: If applicable, add screenshots to help explain your problem.
+
+  - type: input
+    attributes:
+      label: Proxmox OS Version
+      description: The version of your Proxmox node
+      placeholder: 7.4-13
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: Operating System
+      description: The OS you are using on your own computer to use Convoy.
+      placeholder: Windows 11 22H2
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: Browser
+      description: Your browser and its version
+      placeholder: e.g. Chrome 69, Firefox 420, Chromium 69, Edge 420
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Additional Context
+      description: Add any other context about the problem here.
+
+  - type: input
+    id: panel-version
+    attributes:
+      label: Panel Version
+      description: Version number of your Panel (latest is not a version)
+      placeholder: 3.10.0-beta
+    validations:
+      required: true
+
+  - type: input
+    id: panel-logs
+    attributes:
+      label: Error Logs
+      description: |
+        Check out [this page on our documentation](https://convoypanel.com/docs/project/support.html#collecting-panel-logs) for the log collector utility. You will need to run this on the server
+        hosting your instance of Convoy.
+      placeholder: "https://paste.frocdn.com/"
+
+  - type: checkboxes
+    attributes:
+      label: Is there an existing issue for this?
+      description: Please [search here](https://github.com/convoypanel/panel/issues) to see if an issue already exists for your problem.
+      options:
+        - label: I have searched the existing issues before opening this issue.
+          required: true
+        - label: I have checked in the Discord server and believe this is a bug with the software, and not a configuration issue with my specific system.
+          required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,11 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Installation Help
+    url: https://discord.convoypanel.com
+    about: Please visit our Discord for help with your installation.
+  - name: General Question
+    url: https://discord.convoypanel.com
+    about: Please visit our Discord for general questions about Convoy.
+  - name: Documentation
+    url: https://convoypanel.com
+    about: Our documentation may have an answer for your issue/question.

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -0,0 +1,30 @@
+name: Feature Request
+description: Suggest a new feature or improvement for the software.
+labels: [enhancement]
+body:
+  - type: checkboxes
+    attributes:
+      label: Is there an existing feature request for this?
+      description: Please [search here](https://github.com/convoypanel/panel/issues?q=is%3Aissue) to see if someone else has already suggested this.
+      options:
+        - label: I have searched the existing issues before opening this feature request.
+          required: true
+
+  - type: textarea
+    attributes:
+      label: Describe the feature you would like to see.
+      description: "A clear & concise description of the feature you'd like to have added, and what issues it would solve."
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Describe the solution you'd like.
+      description: "You must explain how you'd like to see this feature implemented. Technical implementation details are not necessary, rather an idea of how you'd like to see this feature used."
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Additional context to this request.
+      description: "Add any other context or screenshots about the feature request."

.github/workflows/build.yml

@@ -1,22 +0,0 @@
-name: Build
-on:
-  push:
-    branches:
-      - 'develop'
-  pull_request:
-jobs:
-  build:
-    runs-on: ubuntu-20.04
-    if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'ci skip')"
-    strategy:
-      matrix:
-        node-version: [18.x]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v2
-      with:
-        node-version: ${{ matrix.node-version }}
-        cache: 'npm'
-    - run: npm install
-    - run: npm run build

.github/workflows/release.yml

@@ -2,84 +2,79 @@ name: Release
 on:
   push:
     tags:
-      - 'v*'
+      - 'v*.*.*'
 jobs:
   release:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: '18.x'
+          node-version: 20
 
-      - name: Create release branch and bump version
+      - name: Update Embedded Version String
         env:
           REF: ${{ github.ref }}
         run: |
-          BRANCH=release/${REF:10}
-          git config --local user.email "ci@convoypanel.com"
-          git config --local user.name "Convoy CI"
-          git checkout -b $BRANCH
-          git push -u origin $BRANCH
           sed -i "s/    'version' => 'canary',/    'version' => '${REF:11}',/" config/app.php
-          git add config/app.php
-          git commit -m "bump version for release"
-          git push
 
-      - name: Build assets
+      - name: Build Assets
         run: |
           npm install
           npm run build
 
-      - name: Create release archive
+      - name: Create Release Archive
         run: |
-          rm -rf node_modules/ test/ codecov.yml CONTRIBUTOR_LICENSE_AGREEMENT CODE_OF_CONDUCT.md CONTRIBUTING.md phpunit.xml
-          tar -czf panel.tar.gz * .env.example
+          # Array of files and directories to remove
+          files_to_remove=(
+            "node_modules/"
+            "tests/"
+            "CODE_OF_CONDUCT.md"
+            "CONTRIBUTOR_LICENSE_AGREEMENT"
+            "crowdin.yml"
+            "docker-compose.ci.yml"
+            "phpstan.neon"
+            "phpunit.xml"
+            "stats.html"
+          )
+          
+          # Loop over the files to remove and delete them
+          rm -rf "${files_to_remove[@]}"
+          
+          # Array of specific dot files to include
+          files_to_include=(
+            ".editorconfig"
+            ".env.example"
+            ".gitattributes"
+            ".gitignore"
+            ".prettierignore"
+            ".prettierrc.json"
+          )
 
-      - name: Extract changelog
+          # Archive files, using * directly outside the array for proper expansion
+          tar --exclude=panel.tar.gz -czf panel.tar.gz * "${files_to_include[@]}"
+
+      - name: Extract Changelog
         id: extract_changelog
         env:
           REF: ${{ github.ref }}
         run: |
           sed -n "/^## ${REF:10}/,/^## /{/^## /b;p}" CHANGELOG.md > ./RELEASE_CHANGELOG
-          echo ::set-output name=version_name::`sed -nr "s/^## (${REF:10} .*)$/\1/p" CHANGELOG.md`
+          echo "version_name=${REF:10}" >> $GITHUB_OUTPUT
 
-      - name: Create checksum and add to changelog
+      - name: Create Checksum and Add to Changelog
         run: |
           SUM=`sha256sum panel.tar.gz`
           echo -e "\n#### SHA256 Checksum\n\n\`\`\`\n$SUM\n\`\`\`\n" >> ./RELEASE_CHANGELOG
           echo $SUM > checksum.txt
 
       - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        uses: softprops/action-gh-release@v1
         with:
-          tag_name: ${{ github.ref }}
-          release_name: ${{ steps.extract_changelog.outputs.version_name }}
+          name: ${{ steps.extract_changelog.outputs.version_name }}
           body_path: ./RELEASE_CHANGELOG
           draft: true
-          prerelease: ${{ contains(github.ref, 'beta') || contains(github.ref, 'alpha') }}
-
-      - name: Upload binary
-        id: upload-release-archive
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: panel.tar.gz
-          asset_name: panel.tar.gz
-          asset_content_type: application/gzip
-
-      - name: Upload checksum
-        id: upload-release-checksum
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./checksum.txt
-          asset_name: checksum.txt
-          asset_content_type: text/plain
+          prerelease: ${{ contains(github.ref, 'beta') || contains(github.ref, 'alpha') || contains(github.ref, 'rc') }}
+          files: |
+            panel.tar.gz
+            checksum.txt

.github/workflows/tests.yml

@@ -3,55 +3,35 @@ on:
   push:
     branches:
       - 'develop'
+      - '3.0-develop'
   pull_request:
 jobs:
   tests:
-    runs-on: ubuntu-20.04
-    if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'ci skip')"
-    strategy:
-      fail-fast: false
-      matrix:
-        php: [ 8.1 ]
-        database: [ 'mariadb:10.2', 'mysql:8' ]
-    services:
-      database:
-        image: ${{ matrix.database }}
-        env:
-          MYSQL_ALLOW_EMPTY_PASSWORD: yes
-          MYSQL_DATABASE: panel_test
-        ports:
-          - 3306
-        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
-    name: "php-${{ matrix.php }} (${{ matrix.database }})"
+    runs-on: ubuntu-latest
+
     steps:
-      - uses: actions/checkout@v2
-      - name: get cache directory
-        id: composer-cache
-        run: |
-          echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - uses: actions/cache@v2
-        with:
-          path: |
-            ~/.php_cs.cache
-            ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-cache-${{ matrix.php }}-${{ hashFiles('**.composer.lock') }}
-      - uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          extensions: bcmath, cli, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
-          tools: composer:v2
-          coverage: none
-      - run: cp .env.ci .env
-      - run: composer install --prefer-dist --no-interaction --no-progress
-      - run: vendor/bin/php-cs-fixer fix --dry-run --diff
-        continue-on-error: true
-      - name: execute unit tests
-        run: vendor/bin/phpunit --bootstrap vendor/autoload.php tests/Unit
-        if: ${{ always() }}
-        env:
-          DB_HOST: UNIT_NO_DB
-#      - name: execute integration tests
-#        run: vendor/bin/phpunit tests/Integration
-#        env:
-#          DB_PORT: ${{ job.services.database.ports[3306] }}
-#          DB_USERNAME: root
+      - uses: actions/checkout@v4
+
+      - name: Create environment file
+        run: cp .env.ci .env
+
+      - name: Start Docker Containers
+        run: docker compose -f docker-compose.ci.yml up -d
+
+      - name: Install Composer dependencies
+        run: docker compose -f docker-compose.ci.yml exec workspace composer install --prefer-dist --no-interaction --no-progress
+
+      - name: Install NPM dependencies
+        run: docker compose -f docker-compose.ci.yml exec workspace npm install
+
+      - name: Build frontend assets
+        run: docker compose -f docker-compose.ci.yml exec workspace npm run build
+
+      - name: Run database migrations
+        run: docker compose -f docker-compose.ci.yml exec workspace php artisan migrate
+
+      - name: Run feature tests
+        run: docker compose -f docker-compose.ci.yml exec workspace vendor/bin/pest --bootstrap vendor/autoload.php tests/Feature
+
+      - name: Run unit tests
+        run: docker compose -f docker-compose.ci.yml exec workspace vendor/bin/pest --bootstrap vendor/autoload.php tests/Unit

.gitignore

@@ -16,4 +16,7 @@ yarn-error.log
 /supervisord.log
 /supervisord.pid
 _ide_*.php
-stats.html
+stats.html
+.fleet
+lang/php_*.json
+.phpunit.cache

.prettierignore

@@ -0,0 +1,4 @@
+.github
+public
+node_modules
+resources/views

.prettierrc.json

@@ -0,0 +1,29 @@
+{
+    "arrowParens": "avoid",
+    "bracketSameLine": false,
+    "bracketSpacing": true,
+    "embeddedLanguageFormatting": "auto",
+    "htmlWhitespaceSensitivity": "css",
+    "insertPragma": false,
+    "jsxSingleQuote": true,
+    "printWidth": 80,
+    "proseWrap": "preserve",
+    "quoteProps": "consistent",
+    "requirePragma": false,
+    "semi": false,
+    "singleAttributePerLine": false,
+    "singleQuote": true,
+    "trailingComma": "es5",
+    "useTabs": false,
+    "vueIndentScriptAndStyle": false,
+    "tabWidth": 4,
+    "importOrderSeparation": true,
+    "importOrderSortSpecifiers": true,
+    "importOrder": [
+        "^@/api/(.*)$",
+        "^@/components/elements/(.*)$",
+        "^@/components/(.*)$",
+        "^[./]"
+    ],
+    "plugins": ["@trivago/prettier-plugin-sort-imports"]
+}

.styleci.yml

@@ -1,12 +1,12 @@
 php:
-  preset: laravel
-  disabled:
-    - no_unused_imports
-  finder:
-    not-name:
-      - index.php
+    preset: laravel
+    disabled:
+        - no_unused_imports
+    finder:
+        not-name:
+            - index.php
 js:
-  finder:
-    not-name:
-      - vite.config.js
+    finder:
+        not-name:
+            - vite.config.js
 css: true

ACKNOWLEDGEMENTS.md

@@ -1,4 +1,8 @@
-Package: tslib
+# Acknowledgements
+
+## tslib
+
+```
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
 
@@ -13,10 +17,13 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
+```
+
+## fakerphp/faker
 
-Package: fakerphp/faker
 Translations are under the CC-BY-SA-3.0 license.
 https://github.com/FakerPHP/Faker
 
-Package: caniuse-lite
+## caniuse-lite
+
 https://github.com/browserslist/caniuse-lite

CHANGELOG.md

@@ -1,24 +1,572 @@
 # Changelog
+
 This file is a running track of new features and fixes to each version of the panel released starting with `v2.0.0`.
 
 This project follows [Semantic Versioning](http://semver.org) guidelines.
 
-## v2.0.0-beta (Bombay)
-### Added
-* Storing of CPU, memory, disk, snapshots, backups, and bandwidth limits
-* Added server suspensions
-* Added real-time status updates of server installs (though it will be deprecated in v3.x.x)
-* Automatic bandwidth throttler when a user exceeds the bandwidth limit
+## v4.2.4
 
-### Changed
-* Internally, server details are now passed around the application using Laravel Data by Spatie. Though in v3.x.x, we are planning on switching to Data Transfer Objects by Spatie. We pulled the wrong package and didn't realize until one month in using the package LOL.
-* Virtual machines are now limited to one disk. Multiple disks may be supported when a daemon is available in the future.
+### Changes
+
+- Fixed a bug where initiating a backup with no compression fails. #87
+
+## v4.2.3
+
+### Changes
+
+- Updated code for applying rate limits to NIC. Convoy will no longer override settings other than ratelimit, NIC
+  model (e.g., e1000, vmxnet3, virtio, etc.), and firewall status.
+
+#### From v4.2.2-rc.2
+
+- Fix US keyboard characters validation #80
+- Fixed a visual bug on the bandwidth usage card where the text wasn't centered.
+
+#### From v4.2.2-rc.1
+
+- Fix special character support in environment file.
+- Added checks in server creation to use unique VMID. #78
+- Add error messages instead of generic server error messages. #49
+- Scope route model binding by default to prevent unauthorized access of related resources.
+- Removed a lot of dead code.
+- Added more tests (getting closer to full release! 😁😩).
+
+#### From v4.2.1-rc.1
+
+- Potential fix for disk resize timeout?
+
+## v4.2.2-rc.2
+
+### Changes
+
+- Fix US keyboard characters validation #80
+- Fixed a visual bug on the bandwidth usage card where the text wasn't centered.
+
+## v4.2.2-rc.1
+
+### Changes
+
+- Fix special character support in environment file.
+- Added checks in server creation to use unique VMID. #78
+- Add error messages instead of generic server error messages. #49
+- Scope route model binding by default to prevent unauthorized access of related resources.
+- Removed a lot of dead code.
+- Added more tests (getting closer to full release! 😁😩).
+
+## v4.2.1-rc.1
+
+### Changes
+
+- Potential fix for disk resize timeout?
+
+## v4.2.0-beta
+
+### Changes
+
+- Added server UUID copy to clipboard button in the admin area server table.
+- Added ability to toggle TLS verification per node basis.
+
+## v4.1.0-beta
+
+### Changes
+
+- Removed the `DB_ROOT_PASSWORD` variable from the environment file. It is now automatically generated, but we still
+  aren't planning on using it.
+- Added health checks to the Docker compose configuration to prevent the containers from exploding when its dependencies
+  don't start up in time.
+
+## v4.0.0-beta
+
+If you use Convoy for a production or commercial environment/purpose, please subscribe to a
+license [here](https://console.convoypanel.com). It supports my work, and you are also violating the license agreement
+if you don't. Your deployment of Convoy may be disabled without warning if you don't adhere to the terms of the license
+agreement.
+
+### Changes
+
+- **BREAKING**: Overhauled the IP address management system to add IP pools that can be shared among nodes. #51
+- **BREAKING**: Fixed Coterm where it doesn't support multiple nodes #50
+- Fixed inability to use special characters for Redis password.
+- Fixed error when trying to parse a vm's disk that has no `size` attribute #48
+- Fixed typo in the input labels on the node creation modal #42
+- Fixed the mobile navigation menu where it won't automatically close when you click on a link #41
+- Added ability to copy node and template IDs #40
+- Fixed incorrect conversion from mebibytes to bytes of a server's bandwidth limit during manual server creation through
+  the admin area UI #70
+- Fixed missing SSO token creation endpoint
+- Fixed bulk importing of IPv6 addresses #66
+- Fixed inability to create servers with IP addresses.
+- Fixed minor UI bug where addresses in IPAM won't optimistically update after making a change.
+- Made the IPAM address table sort by descending.
+- Removed API request throttling
+- Increased Coterm session token lifetime from 30 seconds to a minute.
+- Fixed cloning of VM's to the wrong storage location #64
+
+## v4.0.0-rc.5
+
+### Changes
+
+- Fixed missing SSO token creation endpoint
+
+## v4.0.0-rc.4
+
+### Changes
+
+- Fixed bulk importing of IPv6 addresses #66
+
+## v4.0.0-rc.3
+
+### Changes
+
+- Fixed inability to create servers with IP addresses.
+- Fixed minor UI bug where addresses in IPAM won't optimistically update after making a change.
+- Made the IPAM address table sort by descending.
+
+## v3.10.2-beta
+
+### Changes
+
+- Fixed cloning of VM's to the wrong storage location #64
+
+## v4.0.0-rc.2
+
+### Changes
+
+- Removed API request throttling
+- Increased Coterm session token lifetime from 30 seconds to a minute.
+- Fixed cloning of VM's to the wrong storage location #64
+
+## v4.0.0-rc.1
+
+If you use Convoy for a production or commercial environment/purpose, please subscribe to a
+license [here](https://console.convoypanel.com). It supports my work, and you are also violating the license agreement
+if you don't. Your deployment of Convoy may be disabled without warning if you don't adhere to the terms of the license
+agreement.
+
+### Changes
+
+- **BREAKING**: Overhauled the IP address management system to add IP pools that can be shared among nodes. #51
+- **BREAKING**: Fixed Coterm where it doesn't support multiple nodes #50
+- Fixed inability to use special characters for Redis password.
+- Fixed error when trying to parse a vm's disk that has no `size` attribute #48
+- Fixed typo in the input labels on the node creation modal #42
+- Fixed the mobile navigation menu where it won't automatically close when you click on a link #41
+- Added ability to copy node and template IDs #40
+
+## v3.10.1-beta
+
+### Fixes
+
+- Fixed `workspace` image failing to build because PHP Composer hash changed from a recent update.
+
+## v3.10.0-beta
+
+### Additions
+
+- Added ISO imports (thanks A LOTTTT Fro!!!)
+- Added new logo courtesy of Yatin Manuel from [Halvex Inc.](https://halvex.net/)
+    - This changelog was forgotten, so I will add it now
+
+### Changes
+
+- mind-numbing frontend refactorings
+
+## v3.9.3-beta
+
+### Fixes
+
+- Fixed inability to successfully build the `workspace` container because the PHP Docker image recently upgraded from
+  Debian 11 to 12 while Nodesource hasn't added stable support for Debian 12.
+
+## v3.9.2-beta
+
+### Fixes
+
+- Fixed inability to save new password/ssh keys on Client > Server > Settings > Security > Authentication
+
+## v3.9.1-beta
+
+### Fixes
+
+- Fixed coterm fields required when trying to update node information instead of updating Coterm information.
+
+### Changes
+
+- Reorganized frontend React Router routes
+
+## v3.9.0-beta
+
+The release candidate process for non-beta v3.9.0 was discontinued. Convoy will be keeping its beta status while more
+improvements to the product are made.
+
+If you are upgrading from v3.8.1-beta, keep note of these notices:
+
+- v3.9.0-rc.9: :warning: This release may require you to regenerate your Proxmox API token credentials for each of your
+  nodes with the implementation of encryption of node credentials in Convoy from this point on.
+- v3.9.0-rc.3: :warning: This release makes changes to the data in your database. Rows that have a non-null `deleted_at`
+  field in
+  your `servers` and `users` table will be purged. If your routine relies on soft deletes, please make changes now to
+  stop
+  relying on them as they are removed in this update.
 
 ### Fixed
-* The commands in the node viewing page for installing the VNC Broker and templates.
+
+- Servers using IP addresses that they shouldn't have access to.
+
+### Added
+
+- Address pools (not in use yet)
+
+### Changed
+
+- IPAddress internal naming to Address
+- SSO to use JWT instead of generating+saving tokens to the database
+
+## v3.9.0-rc.9
+
+:warning: This release may require you to regenerate your Proxmox API token credentials for each of your nodes with the
+implementation of encryption of node credentials in Convoy from this point on.
+
+### Added
+
+- Coterm support (DEV PREVIEW)
+- Encryption for PVE node credentials
+
+### Fixed
+
+- Potential security vulnerability allowing unauthorized users to access another user's server
+
+## v3.9.0-rc.8
+
+### Fixed
+
+- Inability to reimport the same IP address across different nodes.
+
+## v3.9.0-rc.7
+
+### Fixed
+
+- Password updating when marked optional in a server import
+
+## v3.9.0-rc.6
+
+### Fixed
+
+- Email max length on the login screen
+
+## v3.9.0-rc.5
+
+### Fixed
+
+- Password setting when rebuilding/creating a new server
+
+## v3.9.0-rc.4
+
+### Fixed
+
+- Browser history hijacking on client server settings page
+
+## v3.9.0-rc.3
+
+:warning: This release makes changes to the data in your database. Rows that have a non-null `deleted_at` field in
+your `servers` and `users` table will be purged. If your routine relies on soft deletes, please make changes now to stop
+relying on them as they are removed in this update.
+
+### Fixed
+
+- Adding both a IPv4 and IPv6 address to a server
+
+### Added
+
+- Base code for adding translations/localizations to Convoy
+
+### Removed
+
+- Soft deletes from `servers` and `users` table
+
+### Changes
+
+- Some automatic refactors done by PHPStorm
+- Renamed Media to Iso
+
+## v3.9.0-rc.2
+
+### Fixed
+
+- Server reinstallations firing wrong job chain
+- can sync server usages test
+- ISO download progress monitor
+- Backup creation progress monitor
+
+## v3.9.0-rc.1
+
+### Added
+
+- Tests
+
+### Changed
+
+- Internal HTTP client from Guzzle to a wrapper of it from Laravel
+- VM building, deletion, and server deletion logic
+    - This should improve reliability of Convoy tremendously
+
+## v3.8.1-beta
+
+### Fixed
+
+- Rate limit throttling
+
+## v3.8.0-beta
+
+### Changed
+
+- Made system OS password optional if create server option isn't checked when creating a new server in the administrator
+  area
+
+## v3.7.5-beta
+
+### Fixed
+
+- English keyboard characters validation rule in create server modal in the administrator area.
+
+### Changed
+
+- Some minor refactoring that changed the namespacings of some files to improve code consistency.
+
+## v3.7.4-beta
+
+### Fixed
+
+- Server power commands
+
+## v3.7.3-beta
+
+### Fixed
+
+- Server deletion failing when the virtual machine is running
+
+## v3.7.2-beta
+
+### Fixed
+
+- Error unmounting media (or ISOs) in the server control panel in the client area
+
+## v3.7.1-beta
+
+### Fixed
+
+- Server bandwidth statistic not updating #14
+
+## v3.7.0-beta
+
+### Fixed
+
+- Overallocation check logic whenever an administrator tries to update a server's build #16
+- Issue where you can't use IPv6 for nameservers
+
+### Changed
+
+- Made account_password required by default for creating new servers and server installations
+- Refactored all settings pages
+- Refactored menu component to reduce bundle size
+- Refactored Server Usages and Rate Limit sync for better scaling
+- Minor frontend styling
+- Refactored disk data transfer object
+- All password inputs (except for Convoy user account password) has these two validation rules:
+    1. `/^[A-Za-z0-9!@#$%^&*()_+\-=[\]{}|;\':",.\/<>?\\ ]*$/` for checking if the password contains only characters on
+       the U.S. English keyboard.
+    2. `/^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#\$%\^&\*])(?=.{8,})/` for checking if the password contains 8
+       characters, 1 uppercase, 1 lowercase, 1 number and 1 special character.
+
+### Added
+
+- Search bars in the administrator area
+- Log rotation for Laravel log file
+- Proxmox user pruning to prune expired temporary NoVNC users
+
+## v3.6.2-beta
+
+### Fixed
+
+- IP Addresses being clipped if too long in the UI (x2)
+- Hostname validation regex in frontend
+- Viewport glitch when a server name or hostname is too long
+- Validation rule not catching special characters from other languages for OS password validation
+
+### Note
+
+If you are developing automation software for Convoy, please implement these regular expressions in your code.
+Otherwise, your code will error when you send invalid requests.
+
+- server `account_password` validation
+    - `/^[A-z0-9!@£$%^&*()\'~*_+\-]+$/` to detect special characters from other language
+    - `/^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#\$%\^&\*])(?=.{8,})/u` minimum password requirements
+- server `hostname` validation
+    - `/^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$/`
+
+## v3.6.1-beta
+
+### Fixed
+
+- IP Addresses being clipped if too long in the UI
+- Awkward delete address modal
+
+## v3.6.0-beta
+
+### Fixed
+
+- IPv6 addresses wouldn't display in client area settings
+- Confusing "account password" placeholder when creating a server in the admin area
+
+### Added
+
+- Ability to view IP addresses of a server on the dashboard in the client area
+
+## v3.5.1-beta
+
+### Added
+
+- Support for hosting Convoy without a hostname
+
+### Changed
+
+- Default redis configuration in .env because some people were getting confused by the documentation
+
+## v3.5.0-beta
+
+### Changed
+
+- Settings layout for client side server settings
+
+### Fixed
+
+- possibility that `address_ids` will cause an exception when it's null when creating a new server
+
+## v3.4.0-beta
+
+### Changed
+
+- Refactored routes
+
+### Added
+
+- Navigation Bar Context. Now switching pages are even more seamless
+
+## v3.3.0-beta
+
+### Fixed
+
+- Lack of cancel button when deleting an API key
+
+### Added
+
+- Ability for administrators to impersonate the client view for a server and also visit the server's configuration in
+  the admin area.
+- Warnings when creating a new node to disable privilege separation and grant root permissions.
+
+## v3.2.0-beta
+
+### Fixed
+
+- Broken network syncing when updating an address's assigned server
+- Text alignment for server counter on the users table in the admin area
+
+### Added
+
+- Hyperlinks to the owner on the servers table
+
+## v3.1.2-beta
+
+### Fixed
+
+- Scoped routing bindings in RouteServiceProvider that were breaking some routes
+
+## v3.1.1-beta
+
+### Fixed
+
+- Conflicting named routes that would break route optimization/caching
+
+## v3.1.0-beta
+
+### Fixed
+
+- IP Address updating
+- Server build updating
+
+### Removed
+
+- Option to sync or not sync network settings when deleting an IP address
+    - The default behavior is always to sync
+
+## v3.0.0-beta (Tuxedo)
+
+### Fixed
+
+- Server installs
+- a bunch of other stuff
+
+### Changed
+
+- from proprietary hard-coded api tokens to Bearer tokens for the application/external api
+- the whole entire frontend
+
+### Added
+
+- Server hostnames
+- Node location grouping
+
+### Notes
+
+- This release is so big that I can't really summarize everything
+
+![The maxwell cat meme is the mascot for v3](https://imgur.com/mowvogE.png)
+
+## v2.0.3-beta
+
+### Fixed
+
+- Inability to delete IP address from the admin user interface
+
+## v2.0.2-beta
+
+### Fixed
+
+- FQDN validator for the hostname field when adding a new node
+
+## v2.0.1-beta
+
+### Fixed
+
+- Problem where validation errors for the SSH key wouldn't show up
+- Bug where user couldn't unset a SSH key after saving one
+
+## v2.0.0-beta (Bombay)
+
+### Added
+
+- Storing of CPU, memory, disk, snapshots, backups, and bandwidth limits
+- Added server suspensions
+- Added real-time status updates of server installs (though it will be deprecated in v3.x.x)
+- Automatic bandwidth throttler when a user exceeds the bandwidth limit
+
+### Changed
+
+- Internally, server details are now passed around the application using Laravel Data by Spatie. Though in v3.x.x, we
+  are planning on switching to Data Transfer Objects by Spatie. We pulled the wrong package and didn't realize until one
+  month in using the package LOL.
+- Virtual machines are now limited to one disk. Multiple disks may be supported when a daemon is available in the
+  future.
+- The built-in web server is now Caddy instead of Nginx. This provides auto SSL out of the box.
+
+### Fixed
+
+- The commands in the node viewing page for installing the VNC Broker and templates.
 
 ### Known Bugs
-* The real-time server installation communication is known to be buggy and will be resolved in v3.x.x
-* Editing the server field for IP Addresses will sometime result in the first server of the node to be used. This will be resolved in v3.x.x
+
+- The real-time server installation communication is known to be buggy and will be resolved in v3.x.x
+- Editing the server field for IP Addresses will sometime result in the first server of the node to be used. This will
+  be resolved in v3.x.x
 
 ![The Bombay cat breed is the mascot for v2](https://imgur.com/fP6oxn9.png)

CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+eric@performave.com.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

LICENSE.md

@@ -1,40 +1,124 @@
-Business Source License 1.1
-License text copyright © 2017 MariaDB Corporation Ab, All Rights Reserved. "Business Source License" is a trademark of MariaDB Corporation Ab.
+# Convoy Software End User License Agreement (EULA)
 
-Additional Use Grant
+**Effective Date:** March 3th, 2024
 
-The licensee may use this code in production if they have an active subscription from Performave. However, the licensee must remain within the limits defined by the subscription.
+**Last Updated:** March 13th, 2024
 
-Change License
+**License Grantor:** Performave
 
-GNU GENERAL PUBLIC LICENSE
-Version 3, 29 June 2007
+## 1. Acceptance of Terms
 
-Terms
+By installing, copying, downloading, accessing, or otherwise using the Convoy Panel software ("Software"), you agree to
+be bound by the terms of this End User License Agreement ("EULA"). If you do not agree to the terms of this EULA, do not
+install or use the Software.
 
-The Licensor hereby grants you the right to copy, modify, create derivative works, redistribute, and make non-production use of the Licensed Work. The Licensor may make an Additional Use Grant, above, permitting limited production use.
+## 2. License Grant
 
-Effective on the Change Date, or the fourth anniversary of the first publicly available distribution of a specific version of the Licensed Work under this License, whichever comes first, the Licensor hereby grants you rights under the terms of the Change License, and the rights granted in the paragraph above terminate.
+### 2.1 Personal Use License
 
-If your use of the Licensed Work does not comply with the requirements currently in effect as described in this License, you must purchase a commercial license from the Licensor, its affiliated entities, or authorized resellers, or you must refrain from using the Licensed Work.
+Performave grants you a non-exclusive, non-transferable, free license to download, install, and use the Software for
+personal, non-commercial purposes, provided that you comply with all the terms and conditions of this EULA.
 
-All copies of the original and modified Licensed Work, and derivative works of the Licensed Work, are subject to this License. This License applies separately for each version of the Licensed Work and the Change Date may vary for each version of the Licensed Work released by Licensor.
+### 2.2 Enterprise License
 
-You must conspicuously display this License on each original or modified copy of the Licensed Work. If you receive the Licensed Work in original or modified form from a third party, the terms and conditions set forth in this License apply to your use of that work.
+If you wish to use the Software for commercial purposes, including but not limited to production environments, business
+operations, or any activity intended for profit, you must subscribe to an Enterprise License. The Enterprise License is
+subscription-based, and the fees are based on the number of nodes on which the Software is used. The specific terms,
+including the fee structure and the number of nodes allowed, will be determined at the time of the subscription. Each
+license permits the use of the Software on the number of nodes paid for and is non-transferable.
 
-Any use of the Licensed Work in violation of this License will automatically terminate your rights under this License for the current and all other versions of the Licensed Work.
+### 2.3 Non-Profit Organization License
 
-This License does not grant you any right in any trademark or logo of Licensor or its affiliates (provided that you may use a trademark or logo of Licensor as expressly required by this License).
+Non-profit organizations, upon providing proof of 501(c)(3) registration or its equivalent, are granted a non-exclusive,
+non-transferable license to use the Software for free. The Software may be used for the organization's operational
+purposes, subject to the terms and conditions of this EULA.
 
-TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON AN "AS IS" BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS, EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND TITLE.
+### 2.4 Partnership Licenses
 
-MariaDB hereby grants you permission to use this License's text to license your works, and to refer to it using the trademark "Business Source License", as long as you comply with the Covenants of Licensor below.
+Licenses obtained through partnerships or negotiations with Performave are valid as per the agreements made during such
+negotiations. These licenses are subject to the specific terms agreed upon and must also adhere to the general terms and
+conditions of this EULA.
 
-Covenants of Licensor
+### 2.5 Insider License
 
-In consideration of the right to use this License's text and the "Business Source License" name and trademark, Licensor covenants to MariaDB, and to all other recipients of the licensed work to be provided by Licensor:
+Performave may grant an Insider License to individuals recruited specifically for testing new versions or features of
+the Software. This license includes a waiver of fees associated with the use of the Software during the testing period.
+Testers are expected to be available to test the Software as required and provide feedback to Performave. Performave
+reserves the right to revoke this license at any time at its discretion, including for lack of participation or if the
+tester's needs no longer align with the testing program's objectives.
 
-1. To specify as the Change License the GPL Version 2.0 or any later version, or a license that is compatible with GPL Version 2.0 or a later version, where "compatible" means that software provided under the Change License can be included in a program with software provided under GPL Version 2.0 or a later version. Licensor may specify additional Change Licenses without limitation.
-2. To either: (a) specify an additional grant of rights to use that does not impose any additional restriction on the right granted in this License, as the Additional Use Grant; or (b) insert the text "None".
-3. To specify a Change Date.
-4. Not to modify this License in any other way.
+## 3. Legal Use Requirement
+
+You agree to use the Software only for lawful purposes and in compliance with all applicable laws and regulations. Any
+use of the Software for illegal or criminal activities is strictly prohibited. Performave reserves the right to
+terminate your license if you engage in any illegal conduct with the Software. In the event of such termination,
+Performave isn't obligated to refund any transactions.
+
+## 4. Restrictions
+
+The following restrictions apply to your use of the Software, but these are not all-inclusive. Additional restrictions
+may also apply as outlined elsewhere in this EULA or as otherwise determined by Performave:
+
+- You may not modify the Software in a manner that interferes with its licensing mechanism or changes its copyright
+  information without making substantial other modifications.
+- You are permitted to modify the Software for your personal or enterprise use to tailor it to your needs, provided such
+  modifications do not violate the restrictions stated in this EULA.
+- You may not distribute or sublicense modified versions of the Software that violate the terms of this EULA.
+- You may not use the Software in any manner that could damage, disable, overburden, or impair any Performave server, or
+  the network(s) connected to any Performave server, or interfere with any other party's use and enjoyment of the
+  Software.
+
+### 4.1 Additional Licensing Terms for Modifications and Contributions
+
+Any modifications, enhancements, derivative works of the Software, or any code from the Software that is incorporated into other works by you or any third party are considered part of the Software and subject to the terms and conditions of this EULA. Such modifications, derivative works, or incorporated code must be offered under the same terms and conditions as those set forth in this EULA, including any provisions regarding distribution and sublicensing. You may not alter the terms of this EULA or sublicense any modifications, derivative works, or incorporated code under terms that differ from those specified in this EULA.
+
+## 5. License Enforcement and Digital Rights Management
+
+Performave employs various measures, including Digital Rights Management (DRM), to enforce the terms of this EULA and prevent unauthorized use of the Software. These measures may include, but are not limited to, remotely disabling access to the Software or specific features of the Software for users who are found to be in violation of this EULA. By using the Software, you acknowledge and agree that Performave may, at its sole discretion, implement such measures.
+
+You further agree that Performave shall not be responsible or liable for any loss, damage, or inconvenience you may suffer as a result of such actions taken to enforce this EULA. Your rights under this EULA may be subject to termination and denial of access to the Software without notice if any form of tampering with or circumvention of the DRM or other license enforcement mechanisms is detected.
+
+This section is designed to inform users of the license enforcement practices and to legally protect Performave from liability for actions taken in good faith to protect its intellectual property rights.
+
+## 6. Intellectual Property Rights
+
+The Software is protected by intellectual property laws and treaties. Performave or its suppliers own all title,
+copyright, and interest in and to the Software, including any intellectual property rights therein. This EULA grants you
+no rights to use such content. All rights not expressly granted are reserved by Performave.
+
+## 7. Termination
+
+This EULA is effective until terminated. Your rights under this EULA will terminate automatically without notice from
+Performave if you fail to comply with any term(s) of this EULA. Upon termination, you shall cease all use of the
+Software and destroy all copies, full or partial, of the Software.
+
+## 8. Disclaimer of Warranty
+
+The Software is provided "AS IS," with all faults, without warranty of any kind, and Performave hereby disclaims all
+warranties and conditions with respect to the Software, either express, implied, or statutory, including, but not
+limited to, the implied warranties and/or conditions of merchantability, of satisfactory quality, of fitness for a
+particular purpose, of accuracy, of quiet enjoyment, and non-infringement of third-party rights.
+
+## 9. Limitation of Liability
+
+In no event shall Performave be liable for any indirect, incidental, special, consequential, or punitive damages
+whatsoever (including, without limitation, damages for loss of business profits, business interruption, loss of business
+information, or any other pecuniary loss) arising out of the use of or inability to use the Software, even if Performave
+has been advised of the possibility of such damages.
+
+## 10. Governing Law
+
+This EULA shall be governed by the laws of the jurisdiction in which Performave is located, without reference to
+conflict of laws principles.
+
+## 11. Entire Agreement
+
+This EULA constitutes the entire agreement between you and Performave relating to the Software and supersedes all prior
+or contemporaneous oral or written communications, proposals, and representations with respect to the Software or any
+other subject matter covered by this EULA.
+
+## 12. Amendment
+
+Performave reserves the right to amend this EULA at any time, at its sole discretion, by posting an updated version to
+its website or through the Software. Your continued use of the Software following the posting of an updated EULA will
+mean that you accept those changes.

README.md

@@ -1,31 +1,30 @@
-![Banner Logo](https://imgur.com/oAGZ7fb.png)
+![Version 4 release announcement banner](https://github.com/ConvoyPanel/panel/assets/37554696/4629321b-7214-4eb1-8cc5-85c89229b5bf)
 
-![GitHub Workflow Status](https://img.shields.io/github/workflow/status/convoypanel/panel/Tests?label=Tests)
+
+![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/convoypanel/panel/tests.yml?branch=develop)
 ![Discord](https://img.shields.io/discord/746612878261616700?label=Discord&logo=Discord&logoColor=white)
 ![GitHub Releases](https://img.shields.io/github/downloads/convoypanel/panel/latest/total)
 [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2FConvoyPanel%2Fpanel.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2FConvoyPanel%2Fpanel?ref=badge_shield)
 
 # Convoy
-Convoy is a modern and performant KVM server management panel for hosting businesses. It's built with PHP and React and proven technology like Proxmox, making it easier to drop in Convoy.
+
+Convoy is a modern and performant KVM server management panel for hosting businesses. It's built with PHP and React and proven technology like Proxmox, making it easier to drop Convoy in an existing system.
 
 Stop paying hundreds of dollars for unreliable and slow software. Subscribe to a license to use Convoy today for $6/node/mo
 
-![Screenshot of Convoy](https://imgur.com/pFj0kvO.png)
+![Screenshot of Convoy](https://imgur.com/GsORIRQ.png)
 
 ## Documentation
-* [Panel Documentation](https://docs.convoypanel.com)
-* [Discord Community](https://discord.convoypanel.com)
+
+-   [Panel Documentation](https://docs.convoypanel.com)
+-   [Discord Community](https://discord.convoypanel.com)
 
 ## Acknowledgements
 
-Convoy wouldn't have been possible without these organizations and people
-
-* Advin Servers - provided several development servers (at least $200 of hardware) to help me develop this SaaS
-* Kjartann - donated $250 to support Convoy development and encouraged me to keep on working on this panel!
-* Pterodactyl Panel - provided the architecture and a lot of backend/boilerplate code for Convoy.
-* FastKVM.EU - for reporting bugs and testing the panel
+Please [visit this page](https://convoypanel.com/docs/project/about.html#acknowledgements) on our website to view acknowledgements.
 
 ## License
-Convoy is licensed under the Business Source License. Production use of Convoy without an active license from Performave is strictly disallowed.
 
-[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2FConvoyPanel%2Fpanel.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2FConvoyPanel%2Fpanel?ref=badge_large)
+Convoy is licensed under our own proprietary license.
+
+[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2FConvoyPanel%2Fpanel.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2FConvoyPanel%2Fpanel?ref=badge_large)

app/Actions/Fortify/CreateNewUser.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Convoy\Actions\Fortify;
+
+use Convoy\Models\User;
+use Illuminate\Validation\Rule;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Validator;
+use Laravel\Fortify\Contracts\CreatesNewUsers;
+
+class CreateNewUser implements CreatesNewUsers
+{
+    use PasswordValidationRules;
+
+    public function create(array $input): User
+    {
+        Validator::make($input, [
+            'name' => ['required', 'string', 'max:255'],
+            'email' => [
+                'required',
+                'string',
+                'email',
+                'max:255',
+                Rule::unique(User::class),
+            ],
+            'password' => $this->passwordRules(),
+        ])->validate();
+
+        return User::create([
+            'name' => $input['name'],
+            'email' => $input['email'],
+            'password' => Hash::make($input['password']),
+        ]);
+    }
+}

app/Actions/Fortify/PasswordValidationRules.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Convoy\Actions\Fortify;
+
+use Laravel\Fortify\Rules\Password;
+
+trait PasswordValidationRules
+{
+    /**
+     * Get the validation rules used to validate passwords.
+     */
+    protected function passwordRules(): array
+    {
+        return ['required', 'string', new Password, 'confirmed'];
+    }
+}

app/Actions/Fortify/ResetUserPassword.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Convoy\Actions\Fortify;
+
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Validator;
+use Laravel\Fortify\Contracts\ResetsUserPasswords;
+
+class ResetUserPassword implements ResetsUserPasswords
+{
+    use PasswordValidationRules;
+
+    /**
+     * Validate and reset the user's forgotten password.
+     *
+     * @param  mixed  $user
+     */
+    public function reset($user, array $input): void
+    {
+        Validator::make($input, [
+            'password' => $this->passwordRules(),
+        ])->validate();
+
+        $user->forceFill([
+            'password' => Hash::make($input['password']),
+        ])->save();
+    }
+}

app/Actions/Fortify/UpdateUserPassword.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Convoy\Actions\Fortify;
+
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Validator;
+use Laravel\Fortify\Contracts\UpdatesUserPasswords;
+
+class UpdateUserPassword implements UpdatesUserPasswords
+{
+    use PasswordValidationRules;
+
+    /**
+     * Validate and update the user's password.
+     *
+     * @param  mixed  $user
+     */
+    public function update($user, array $input): void
+    {
+        Validator::make($input, [
+            'current_password' => ['required', 'string', 'current_password:web'],
+            'password' => $this->passwordRules(),
+        ], [
+            'current_password.current_password' => __('The provided password does not match your current password.'),
+        ])->validateWithBag('updatePassword');
+
+        $user->forceFill([
+            'password' => Hash::make($input['password']),
+        ])->save();
+    }
+}

app/Actions/Fortify/UpdateUserProfileInformation.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace Convoy\Actions\Fortify;
+
+use Illuminate\Validation\Rule;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Contracts\Auth\MustVerifyEmail;
+use Laravel\Fortify\Contracts\UpdatesUserProfileInformation;
+
+class UpdateUserProfileInformation implements UpdatesUserProfileInformation
+{
+    /**
+     * Validate and update the given user's profile information.
+     *
+     * @param  mixed  $user
+     */
+    public function update($user, array $input): void
+    {
+        Validator::make($input, [
+            'name' => ['required', 'string', 'max:255'],
+
+            'email' => [
+                'required',
+                'string',
+                'email',
+                'max:255',
+                Rule::unique('users')->ignore($user->id),
+            ],
+        ])->validateWithBag('updateProfileInformation');
+
+        if ($input['email'] !== $user->email &&
+            $user instanceof MustVerifyEmail) {
+            $this->updateVerifiedUser($user, $input);
+        } else {
+            $user->forceFill([
+                'name' => $input['name'],
+                'email' => $input['email'],
+            ])->save();
+        }
+    }
+
+    /**
+     * Update the given verified user's profile information.
+     *
+     * @param  mixed  $user
+     */
+    protected function updateVerifiedUser($user, array $input): void
+    {
+        $user->forceFill([
+            'name' => $input['name'],
+            'email' => $input['email'],
+            'email_verified_at' => null,
+        ])->save();
+
+        $user->sendEmailVerificationNotification();
+    }
+}

app/Casts/MebibytesToAndFromBytes.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Convoy\Casts;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
+
+class MebibytesToAndFromBytes implements CastsAttributes
+{
+    /**
+     * Cast the given value.
+     */
+    public function get(Model $model, string $key, mixed $value, array $attributes): ?int
+    {
+        return !is_null($value) ? $value * 1048576 : $value; // Convert from megabytes to bytes
+    }
+
+    /**
+     * Prepare the given value for storage.
+     */
+    public function set(Model $model, string $key, mixed $value, array $attributes): ?int
+    {
+        return !is_null($value) ? intval(floor($value / 1048576)) : $value; // Convert from bytes to megabytes to prevent overflow
+    }
+}

app/Casts/MegabytesAndBytes.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace Convoy\Casts;
-
-use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
-
-class MegabytesAndBytes implements CastsAttributes
-{
-    /**
-     * Cast the given value.
-     *
-     * @param  \Illuminate\Database\Eloquent\Model  $model
-     * @param  string  $key
-     * @param  int  $value
-     * @param  array  $attributes
-     * @return ?int
-     */
-    public function get($model, $key, $value, $attributes)
-    {
-        return isset($value) ? $value * 1048576 : $value; // Convert from megabytes to bytes
-    }
-
-    /**
-     * Prepare the given value for storage.
-     *
-     * @param  \Illuminate\Database\Eloquent\Model  $model
-     * @param  string  $key
-     * @param  int  $value
-     * @param  array  $attributes
-     * @return ?int
-     */
-    public function set($model, $key, $value, $attributes)
-    {
-        return isset($value) ? intval(floor($value / 1048576)) : $value; // Convert from bytes to megabytes to prevent overflow
-    }
-}

app/Casts/NullableEncrypter.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Convoy\Casts;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Contracts\Encryption\Encrypter;
+use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
+
+class NullableEncrypter implements CastsAttributes
+{
+    /**
+     * Cast the given value.
+     *
+     * @param  array<string, mixed>  $attributes
+     */
+    public function get(Model $model, string $key, mixed $value, array $attributes): ?string
+    {
+        return !empty($value) ? app(Encrypter::class)->decrypt($value) : null;
+    }
+
+    /**
+     * Prepare the given value for storage.
+     *
+     * @param  array<string, mixed>  $attributes
+     */
+    public function set(Model $model, string $key, mixed $value, array $attributes): ?string
+    {
+        return !empty($value) ? app(Encrypter::class)->encrypt($value) : null;
+    }
+}

app/Console/Commands/Maintenance/PruneOrphanedBackupsCommand.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace Convoy\Console\Commands\Maintenance;
+
+use Carbon\CarbonImmutable;
+use InvalidArgumentException;
+use Illuminate\Console\Command;
+use Convoy\Repositories\Eloquent\BackupRepository;
+
+class PruneOrphanedBackupsCommand extends Command
+{
+    /**
+     * @var string
+     */
+    protected $signature = 'c:maintenance:prune-backups {--prune-age=}';
+
+    /**
+     * @var string
+     */
+    protected $description = 'Marks all backups that have not completed in the last "n" minutes as being failed.';
+
+    public function handle(BackupRepository $repository): void
+    {
+        $since = $this->option('prune-age') ?? config('backups.prune_age', 360);
+        if (! $since || ! is_int($since)) {
+            throw new InvalidArgumentException('The "--prune-age" argument must be a value greater than 0.');
+        }
+
+        $query = $repository->getBuilder()
+            ->whereNull('completed_at')
+            ->where('created_at', '<=', CarbonImmutable::now()->subMinutes($since)->toDateTimeString());
+
+        $count = $query->count();
+        if (! $count) {
+            $this->info('There are no orphaned backups to be marked as failed.');
+
+            return;
+        }
+
+        $this->warn("Marking {$count} backups that have not been marked as completed in the last {$since} minutes as failed.");
+
+        $query->update([
+            'is_successful' => false,
+            'completed_at' => CarbonImmutable::now(),
+            'updated_at' => CarbonImmutable::now(),
+        ]);
+    }
+}

app/Console/Commands/Maintenance/PruneUsersCommand.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace Convoy\Console\Commands\Maintenance;
+
+use Convoy\Models\Node;
+use Illuminate\Console\Command;
+use Convoy\Jobs\Node\PruneUsersJob;
+use Illuminate\Console\View\Components\Task;
+
+class PruneUsersCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'c:maintenance:prune-users';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Prunes all users on all nodes that have expired.';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle(): int
+    {
+        $this->info('Queuing user prune request.');
+
+        $nodes = Node::all();
+
+        $nodes->each(function (Node $node) {
+            (new Task($this->output))->render("Node {$node->fqdn}", function () use ($node) {
+                PruneUsersJob::dispatch($node->id);
+            });
+        });
+
+        return Command::SUCCESS;
+    }
+}

app/Console/Commands/Maintenance/RefreshActivityRunnersCommand.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace Convoy\Console\Commands\Maintenance;
-
-use Convoy\Contracts\Repository\ActivityRepositoryInterface;
-use Convoy\Facades\LogRunner;
-use Convoy\Models\ActivityLog;
-use Illuminate\Console\Command;
-
-class RefreshActivityRunnersCommand extends Command
-{
-    /**
-     * @var string
-     */
-    protected $description = 'Update running tasks by polling Proxmox.';
-
-    /**
-     * @var string
-     */
-    protected $signature = 'c:maintenance:refresh-activity-runners';
-
-    /**
-     * Handle command execution.
-     */
-    public function handle(ActivityRepositoryInterface $repository)
-    {
-        $runners = ActivityLog::where('status', 'running')->whereIn('event', array_keys(ActivityLog::$eventTypes))->get();
-
-        foreach ($runners as $runner) {
-            LogRunner::setNode($repository->getServer($runner)->node)->setActivity($runner)->refresh();
-        }
-    }
-}

app/Console/Commands/Server/ResetUsagesCommand.php

@@ -2,7 +2,6 @@
 
 namespace Convoy\Console\Commands\Server;
 
-use Carbon\Carbon;
 use Convoy\Models\Server;
 use Illuminate\Console\Command;
 
@@ -21,12 +20,11 @@ class ResetUsagesCommand extends Command
     /**
      * Handle command execution.
      */
-    public function handle()
+    public function handle(): void
     {
-        if (date('d') === '01')
-        {
+        if (date('d') === '01') {
             Server::query()->update([
-                    'bandwidth_usage' => 0,
+                'bandwidth_usage' => 0,
             ]);
         }
     }

app/Console/Commands/Server/UpdateRateLimitsCommand.php

@@ -2,46 +2,38 @@
 
 namespace Convoy\Console\Commands\Server;
 
-use Carbon\Carbon;
-use Convoy\Models\Server;
-use Convoy\Services\Servers\NetworkService;
+use Convoy\Models\Node;
 use Illuminate\Console\Command;
+use Illuminate\Console\View\Components\Task;
+use Convoy\Jobs\Node\SyncServerRateLimitsJob;
 
 class UpdateRateLimitsCommand extends Command
 {
     /**
      * @var string
      */
-    protected $description = 'Update the network rate limits of all servers.';
+    protected $description = 'Sync the network rate limits of all servers.';
 
     /**
      * @var string
      */
-    protected $signature = 'c:server:update-rate-limits';
+    protected $signature = 'c:servers:sync-rate-limits';
 
     /**
      * Handle command execution.
      */
-    public function handle(NetworkService $service)
+    public function handle(): int
     {
-        $servers = Server::all();
+        $this->info('Queuing rate limits sync request.');
 
-        foreach ($servers as $server) {
-            echo "Updating id {$server->id}...    ";
+        $nodes = Node::all();
 
-            try {
-                if ($server->bandwidth_usage >= $server->bandwidth_limit && isset($server->bandwidth_limit)) {
-                    $service->setServer($server)->updateRateLimit(1);
+        $nodes->each(function (Node $node) {
+            (new Task($this->output))->render("Node {$node->fqdn}", function () use ($node) {
+                SyncServerRateLimitsJob::dispatch($node->id);
+            });
+        });
 
-                    echo 'LIMITED' . PHP_EOL;
-                } else {
-                    $service->setServer($server)->updateRateLimit();
-
-                    echo 'UNLIMITED' . PHP_EOL;
-                }
-            } catch (\Exception $e) {
-                echo 'FAILED' . PHP_EOL;
-            }
-        }
+        return Command::SUCCESS;
     }
 }

app/Console/Commands/Server/UpdateUsagesCommand.php

@@ -2,10 +2,9 @@
 
 namespace Convoy\Console\Commands\Server;
 
-use Carbon\Carbon;
-use Convoy\Models\Server;
-use Convoy\Repositories\Proxmox\Server\ProxmoxMetricsRepository;
+use Convoy\Models\Node;
 use Illuminate\Console\Command;
+use Convoy\Jobs\Node\SyncServerUsagesJob;
 use Illuminate\Console\View\Components\Task;
 
 class UpdateUsagesCommand extends Command
@@ -13,47 +12,28 @@ class UpdateUsagesCommand extends Command
     /**
      * @var string
      */
-    protected $description = 'Update the bandwidth usage of all servers.';
+    protected $description = 'Sync the usages of all the servers.';
 
     /**
      * @var string
      */
-    protected $signature = 'c:server:update-usages';
+    protected $signature = 'c:servers:sync-usages';
 
     /**
      * Handle command execution.
      */
-    public function handle(ProxmoxMetricsRepository $repository)
+    public function handle(): int
     {
-        $servers = Server::all();
+        $this->info('Queuing usage sync.');
 
-        foreach ($servers as $server) {
-            with(new Task($this->output))->render("Server #{$server->id}", function () use ($repository, $server) {
-                try {
+        $nodes = Node::all();
 
-                    $metrics = $repository->setServer($server)->getMetrics('hour');
-
-                    $bandwidth = $server->bandwidth_usage;
-
-                    foreach ($metrics as $metric) {
-                        if (Carbon::createFromTimestamp($metric['time'])->gt(Carbon::parse($server->hydrated_at))) {
-                            // we multiply it by 60 seconds because each metric is
-                            // recorded every 1 minute but the values like netin and
-                            // netout are in bytes/sec
-                            $bandwidth += (int) $metric['netin'] * 60 + (int) $metric['netout'] * 60;
-                        }
-                    }
-
-                    if ($bandwidth > 0) {
-                        $server->update([
-                            'bandwidth_usage' => $bandwidth,
-                            'hydrated_at' => Carbon::now(),
-                        ]);
-                    }
-                } catch (\Exception $e) {
-                    // do nothing
-                }
+        $nodes->each(function (Node $node) {
+            (new Task($this->output))->render("Node {$node->fqdn}", function () use ($node) {
+                SyncServerUsagesJob::dispatch($node->id);
             });
-        }
+        });
+
+        return Command::SUCCESS;
     }
 }

app/Console/Commands/User/MakeUserCommand.php

@@ -0,0 +1,67 @@
+<?php
+
+/*
+Pterodactyl®
+Copyright © Dane Everitt <dane@daneeveritt.com> and contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+namespace Convoy\Console\Commands\User;
+
+use Exception;
+use Convoy\Models\User;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Hash;
+use Convoy\Exceptions\Model\DataValidationException;
+
+class MakeUserCommand extends Command
+{
+    protected $description = 'Creates a user on the system via the CLI.';
+
+    protected $signature = 'c:user:make {--email=} {--name=} {--password=} {--admin=}';
+
+    /**
+     * Handle command request to create a new user.
+     *
+     * @throws Exception
+     * @throws DataValidationException
+     */
+    public function handle(): void
+    {
+        $root_admin = $this->option('admin') ?? $this->confirm('Is this user an administrator?');
+        $email = $this->option('email') ?? $this->ask('Email Address');
+        $name = $this->option('name') ?? $this->ask('Name');
+        $password = $this->option('password') ?? $this->secret('Password');
+
+        $user = User::create([
+            'name' => $name,
+            'email' => $email,
+            'root_admin' => (bool) $root_admin,
+            'password' => Hash::make($password),
+        ]);
+
+        $this->table(['Field', 'Value'], [
+            ['Internal ID', $user->id],
+            ['Email', $user->email],
+            ['Name', $user->name],
+            ['Admin', $user->root_admin ? 'Yes' : 'No'],
+        ]);
+    }
+}

app/Console/Kernel.php

@@ -2,41 +2,44 @@
 
 namespace Convoy\Console;
 
-use Convoy\Console\Commands\Maintenance\RefreshActivityRunnersCommand;
-use Convoy\Console\Commands\Server\ResetUsagesCommand;
-use Convoy\Console\Commands\Server\UpdateRateLimitsCommand;
-use Convoy\Console\Commands\Server\UpdateUsagesCommand;
 use Convoy\Models\ActivityLog;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Database\Console\PruneCommand;
+use Convoy\Console\Commands\Server\ResetUsagesCommand;
+use Convoy\Console\Commands\Server\UpdateUsagesCommand;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
+use Convoy\Console\Commands\Maintenance\PruneUsersCommand;
+use Convoy\Console\Commands\Server\UpdateRateLimitsCommand;
+use Convoy\Console\Commands\Maintenance\PruneOrphanedBackupsCommand;
 
 class Kernel extends ConsoleKernel
 {
     /**
      * Define the application's command schedule.
-     *
-     * @param  \Illuminate\Console\Scheduling\Schedule  $schedule
-     * @return void
      */
-    protected function schedule(Schedule $schedule)
+    protected function schedule(Schedule $schedule): void
     {
-        $schedule->command(RefreshActivityRunnersCommand::class)->everyMinute()->withoutOverlapping();
-        $schedule->command(UpdateUsagesCommand::class)->everyFiveMinutes()->withoutOverlapping();
-        $schedule->command(UpdateRateLimitsCommand::class)->everyTenMinutes()->withoutOverlapping();
-        $schedule->command(ResetUsagesCommand::class)->daily();
+        $schedule->command('queue:prune-batches')->daily();
+
+        if (config('backups.prune_age')) {
+            // Every 30 minutes, run the backup pruning command so that any abandoned backups can be deleted.
+            $schedule->command(PruneOrphanedBackupsCommand::class)->everyThirtyMinutes();
+        }
 
         if (config('activity.prune_days')) {
             $schedule->command(PruneCommand::class, ['--model' => [ActivityLog::class]])->daily();
         }
+
+        $schedule->command(ResetUsagesCommand::class)->daily();
+        $schedule->command(PruneUsersCommand::class)->daily();
+        $schedule->command(UpdateUsagesCommand::class)->everyFiveMinutes();
+        $schedule->command(UpdateRateLimitsCommand::class)->everyTenMinutes();
     }
 
     /**
      * Register the commands for the application.
-     *
-     * @return void
      */
-    protected function commands()
+    protected function commands(): void
     {
         $this->load(__DIR__.'/Commands');
 

app/Contracts/Repository/ActivityRepositoryInterface.php

@@ -2,15 +2,13 @@
 
 namespace Convoy\Contracts\Repository;
 
-use Convoy\Models\ActivityLog;
 use Convoy\Models\Server;
+use Convoy\Models\ActivityLog;
 
 interface ActivityRepositoryInterface extends RepositoryInterface
 {
     /**
      * Return the server model associated with an activity
-     *
-     * @return \Convoy\Models\Server|null
      */
     public function getServer(ActivityLog $activity): ?Server;
 }

app/Contracts/Repository/RepositoryInterface.php

@@ -2,15 +2,18 @@
 
 namespace Convoy\Contracts\Repository;
 
-use Illuminate\Contracts\Pagination\LengthAwarePaginator;
+use Closure;
 use Illuminate\Support\Collection;
+use Convoy\Exceptions\Model\DataValidationException;
+use Illuminate\Contracts\Pagination\LengthAwarePaginator;
+use Convoy\Exceptions\Repository\RecordNotFoundException;
 
 interface RepositoryInterface
 {
     /**
      * Return an identifier or Model object to be used by the repository.
      *
-     * @return string|\Closure|object
+     * @return string|Closure|object
      */
     public function model();
 
@@ -71,7 +74,7 @@ interface RepositoryInterface
      *
      * @return mixed
      *
-     * @throws \Convoy\Exceptions\Model\DataValidationException
+     * @throws DataValidationException
      */
     public function create(array $fields, bool $validate = true, bool $force = false);
 
@@ -80,7 +83,7 @@ interface RepositoryInterface
      *
      * @return mixed
      *
-     * @throws \Convoy\Exceptions\Repository\RecordNotFoundException
+     * @throws RecordNotFoundException
      */
     public function find(int $id);
 
@@ -94,7 +97,7 @@ interface RepositoryInterface
      *
      * @return mixed
      *
-     * @throws \Convoy\Exceptions\Repository\RecordNotFoundException
+     * @throws RecordNotFoundException
      */
     public function findFirstWhere(array $fields);
 
@@ -119,8 +122,8 @@ interface RepositoryInterface
      * @param  int  $id
      * @return mixed
      *
-     * @throws \Convoy\Exceptions\Model\DataValidationException
-     * @throws \Convoy\Exceptions\Repository\RecordNotFoundException
+     * @throws DataValidationException
+     * @throws RecordNotFoundException
      */
     public function update($id, array $fields, bool $validate = true, bool $force = false);
 
@@ -135,7 +138,7 @@ interface RepositoryInterface
      *
      * @return mixed
      *
-     * @throws \Convoy\Exceptions\Model\DataValidationException
+     * @throws DataValidationException
      */
     public function updateOrCreate(array $where, array $fields, bool $validate = true, bool $force = false);
 

app/Contracts/Repository/ServerRepositoryInterface.php

@@ -3,6 +3,7 @@
 namespace Convoy\Contracts\Repository;
 
 use Convoy\Models\Server;
+use Convoy\Exceptions\Repository\RecordNotFoundException;
 
 interface ServerRepositoryInterface extends RepositoryInterface
 {
@@ -14,7 +15,7 @@ interface ServerRepositoryInterface extends RepositoryInterface
     /**
      * Return a server by UUID.
      *
-     * @throws \Convoy\Exceptions\Repository\RecordNotFoundException
+     * @throws RecordNotFoundException
      */
     public function getByUuid(string $uuid): Server;
 }

app/Data/Helpers/ChecksumData.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Convoy\Data\Helpers;
+
+use Spatie\LaravelData\Data;
+use Convoy\Enums\Helpers\ChecksumAlgorithm;
+
+class ChecksumData extends Data
+{
+    public function __construct(
+        public string            $checksum,
+        public ChecksumAlgorithm $algorithm,
+    )
+    {
+    }
+}

app/Data/Node/Access/CreateUserData.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Convoy\Data\Node\Access;
+
+use Carbon\Carbon;
+use Spatie\LaravelData\Data;
+use Spatie\LaravelData\Casts\EnumCast;
+use Convoy\Enums\Node\Access\RealmType;
+use Spatie\LaravelData\Attributes\WithCast;
+use Spatie\LaravelData\Attributes\Validation\Min;
+use Spatie\LaravelData\Attributes\Validation\Max;
+
+class CreateUserData extends Data
+{
+    public function __construct(
+        #[WithCast(EnumCast::class)]
+        public RealmType $realm_type,
+        public bool      $enabled,
+        #[Min(1), Max(60)]
+        public ?string   $username = null,
+        #[Min(1), Max(64)]
+        public ?string   $password = null,
+        public ?Carbon   $expires_at = null,
+    )
+    {
+    }
+}

app/Data/Node/Access/UserCredentialsData.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Convoy\Data\Node\Access;
+
+use Spatie\LaravelData\Data;
+use Convoy\Enums\Node\Access\RealmType;
+
+class UserCredentialsData extends Data
+{
+    public function __construct(
+        public string    $username,
+        public RealmType $realm_type,
+        public string    $ticket,
+        public string    $csrf_token,
+    )
+    {
+
+    }
+
+    public static function fromRaw(array $raw): UserCredentialsData
+    {
+        return new self(...[
+            'username' => explode('@', $raw['username'])[0],
+            'realm_type' => RealmType::from(explode('@', $raw['username'])[1]),
+            'ticket' => $raw['ticket'],
+            'csrf_token' => $raw['CSRFPreventionToken'],
+        ]);
+    }
+}

app/Data/Node/Access/UserData.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Convoy\Data\Node\Access;
+
+use Carbon\Carbon;
+use Illuminate\Support\Arr;
+use Spatie\LaravelData\Data;
+use Spatie\LaravelData\Casts\EnumCast;
+use Convoy\Enums\Node\Access\RealmType;
+use Spatie\LaravelData\Attributes\WithCast;
+
+class UserData extends Data
+{
+    public function __construct(
+        public string    $username,
+        public ?string   $email,
+        #[WithCast(EnumCast::class)]
+        public RealmType $realm_type,
+        public bool      $enabled,
+        public ?Carbon   $expires_at,
+    )
+    {
+    }
+
+    public static function fromRaw(array $raw): UserData
+    {
+        return new self(...[
+            'username' => explode('@', $raw['userid'])[0],
+            'email' => Arr::get($raw, 'email'),
+            'realm_type' => RealmType::from($raw['realm-type']),
+            'enabled' => (bool)$raw['enable'],
+            'expires_at' => Arr::get($raw, 'expire') ? Carbon::createFromTimestamp($raw['expire']) : null,
+        ]);
+    }
+}

app/Data/Node/Storage/FileMetaData.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Convoy\Data\Node\Storage;
+
+use Spatie\LaravelData\Data;
+
+class FileMetaData extends Data
+{
+    public function __construct(
+        public string $file_name,
+        public string $mime_type,
+        public int    $size,
+    )
+    {
+    }
+}

app/Data/Node/Storage/IsoData.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Convoy\Data\Node\Storage;
+
+use Carbon\CarbonInterface;
+use Spatie\LaravelData\Data;
+
+class IsoData extends Data
+{
+    public function __construct(
+        public string          $file_name,
+        public int             $size,
+        public CarbonInterface $created_at,
+    )
+    {
+    }
+}

app/Data/Server/Deployments/CloudinitAddressConfigData.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Convoy\Data\Server\Deployments;
+
+use Spatie\LaravelData\Data;
+use Convoy\Data\Server\Eloquent\AddressData;
+
+class CloudinitAddressConfigData extends Data
+{
+    public function __construct(
+        public ?AddressData $ipv4,
+        public ?AddressData $ipv6,
+    )
+    {
+    }
+}

app/Data/Server/Deployments/ServerDeploymentData.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Convoy\Data\Server\Deployments;
+
+use Convoy\Models\Server;
+use Convoy\Models\Template;
+use Spatie\LaravelData\Data;
+
+class ServerDeploymentData extends Data
+{
+    public function __construct(
+        public Server    $server,
+        public ?Template $template,
+        public ?string   $account_password,
+        public bool      $should_create_server,
+        public bool      $start_on_completion,
+    )
+    {
+    }
+}

app/Data/Server/Eloquent/AddressData.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Convoy\Data\Server\Eloquent;
+
+use Spatie\LaravelData\Data;
+use Spatie\LaravelData\Attributes\Validation\IP;
+use Spatie\LaravelData\Attributes\Validation\In;
+
+class AddressData extends Data
+{
+    public function __construct(
+        public int     $id,
+        public int     $address_pool_id,
+        public ?int    $server_id,
+        #[In(['ipv4', 'ipv6'])]
+        public string  $type,
+        #[IP]
+        public string  $address,
+        public int     $cidr,
+        public string  $gateway,
+        public ?string $mac_address,
+    )
+    {
+    }
+}

app/Data/Server/Eloquent/ServerAddressesData.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Convoy\Data\Server\Eloquent;
+
+use Spatie\LaravelData\Data;
+use Spatie\LaravelData\DataCollection;
+use Spatie\LaravelData\Attributes\DataCollectionOf;
+
+class ServerAddressesData extends Data
+{
+    public function __construct(
+        #[DataCollectionOf(AddressData::class)]
+        public DataCollection $ipv4,
+        #[DataCollectionOf(AddressData::class)]
+        public DataCollection $ipv6,
+    )
+    {
+    }
+}

app/Data/Server/Eloquent/ServerEloquentData.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Convoy\Data\Server\Eloquent;
+
+use Spatie\LaravelData\Data;
+
+class ServerEloquentData extends Data
+{
+    public function __construct(
+        public int              $id,
+        public string           $uuid_short,
+        public string           $uuid,
+        public int              $node_id,
+        public string           $hostname,
+        public string           $name,
+        public ?string          $description,
+        public ?string          $status,
+        public ServerUsagesData $usages,
+        public ServerLimitsData $limits,
+    )
+    {
+    }
+}

app/Data/Server/Eloquent/ServerLimitsData.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Convoy\Data\Server\Eloquent;
+
+use Spatie\LaravelData\Data;
+
+class ServerLimitsData extends Data
+{
+    public function __construct(
+        public int                 $cpu,
+        public int                 $memory,
+        public int                 $disk,
+        public ?int                $snapshots,
+        public ?int                $backups,
+        public ?int                $bandwidth,
+        public ServerAddressesData $addresses,
+        public ?string             $mac_address,
+    )
+    {
+    }
+}

app/Data/Server/Eloquent/ServerUsagesData.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Convoy\Data\Server\Eloquent;
+
+use Spatie\LaravelData\Data;
+
+class ServerUsagesData extends Data
+{
+    public function __construct(
+        public int $bandwidth,
+    )
+    {
+    }
+}

app/Data/Server/MacAddressData.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Convoy\Data\Server;
+
+use Spatie\LaravelData\Data;
+
+class MacAddressData extends Data
+{
+    public function __construct(
+        public ?string $proxmox,
+        public ?string $eloquent,
+    )
+    {
+    }
+}

app/Data/Server/Proxmox/Config/AddressConfigData.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Convoy\Data\Server\Proxmox\Config;
+
+use Spatie\LaravelData\Data;
+
+class AddressConfigData extends Data
+{
+    public function __construct(
+        public ?AddressData $ipv4,
+        public ?AddressData $ipv6,
+    )
+    {
+    }
+}

app/Data/Server/Proxmox/Config/AddressData.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Convoy\Data\Server\Proxmox\Config;
+
+use Spatie\LaravelData\Data;
+
+class AddressData extends Data
+{
+    public function __construct(
+        public string $address,
+        public int    $cidr,
+        public string $gateway,
+    )
+    {
+    }
+}

app/Data/Server/Proxmox/Config/DiskData.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Convoy\Data\Server\Proxmox\Config;
+
+use Spatie\LaravelData\Data;
+use Spatie\LaravelData\Casts\EnumCast;
+use Convoy\Enums\Server\DiskInterface;
+use Spatie\LaravelData\Attributes\WithCast;
+
+class DiskData extends Data
+{
+    public function __construct(
+        #[WithCast(EnumCast::class)]
+        public DiskInterface $interface,
+        public bool          $is_primary_disk,
+
+        public bool          $is_media,
+        public ?string       $media_name,
+
+        public int           $size,
+    )
+    {
+    }
+}

app/Data/Server/Proxmox/Config/MediaData.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Convoy\Data\Server\Proxmox\Config;
+
+use Spatie\LaravelData\Data;
+
+class MediaData extends Data
+{
+    public function __construct(
+        //
+    )
+    {
+    }
+}

app/Data/Server/Proxmox/Config/ServerConfigData.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Convoy\Data\Server\Proxmox\Config;
+
+use Spatie\LaravelData\Data;
+use Spatie\LaravelData\DataCollection;
+use Spatie\LaravelData\Attributes\DataCollectionOf;
+
+class ServerConfigData extends Data
+{
+    public function __construct(
+        public string         $mac_address,
+        #[DataCollectionOf(DiskData::class)]
+        public DataCollection $boot_order,
+        #[DataCollectionOf(DiskData::class)]
+        public DataCollection $disks,
+        /* public AddressConfigData $addresses */
+    )
+    {
+    }
+}

app/Data/Server/Proxmox/Console/NoVncCredentialsData.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Convoy\Data\Server\Proxmox\Console;
+
+use Spatie\LaravelData\Data;
+
+class NoVncCredentialsData extends Data
+{
+    public function __construct(
+        public int    $port,
+        public string $ticket,
+        public string $pve_auth_cookie,
+    )
+    {
+    }
+}

app/Data/Server/Proxmox/Console/XTermCredentialsData.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Convoy\Data\Server\Proxmox\Console;
+
+use Spatie\LaravelData\Data;
+use Convoy\Enums\Node\Access\RealmType;
+
+class XTermCredentialsData extends Data
+{
+    public function __construct(
+        public int       $port,
+        public string    $ticket,
+        public string    $username,
+        public RealmType $realm_type,
+        public string    $pve_auth_cookie,
+    )
+    {
+    }
+}

app/Data/Server/Proxmox/ServerProxmoxData.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Convoy\Data\Server\Proxmox;
+
+use Spatie\LaravelData\Data;
+use Convoy\Data\Server\Proxmox\Config\ServerConfigData;
+
+class ServerProxmoxData extends Data
+{
+    public function __construct(
+        public int              $id,
+        public string           $uuid_short,
+        public string           $uuid,
+        public int              $node_id,
+        public string           $state,
+        public bool             $locked,
+        public ServerConfigData $config,
+    )
+    {
+    }
+}

app/Data/Server/Proxmox/ServerStateData.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Convoy\Data\Server\Proxmox;
+
+use Spatie\LaravelData\Data;
+use Convoy\Enums\Server\State;
+
+class ServerStateData extends Data
+{
+    public function __construct(
+        public State $state,
+        public float $cpu_used,
+        public int   $memory_total,
+        public int   $memory_used,
+        public int   $uptime,
+    )
+    {
+    }
+
+    public static function fromRaw(array $raw)
+    {
+        return new self(...[
+            'state' => State::from($raw['status']),
+            'uptime' => $raw['uptime'],
+            'cpu_used' => $raw['cpu'],
+            'memory_total' => $raw['maxmem'],
+            'memory_used' => $raw['mem'],
+        ]);
+    }
+}

app/Data/Server/Proxmox/Usages/ServerDiskData.php

@@ -1,14 +1,15 @@
 <?php
 
-namespace Convoy\Models\Objects\Server\Usage;
+namespace Convoy\Data\Server\Proxmox\Usages;
 
 use Spatie\LaravelData\Data;
 
-class DiskUsageObject extends Data
+class ServerDiskData extends Data
 {
     public function __construct(
         public int $write,
         public int $read,
-    ) {
+    )
+    {
     }
 }

app/Data/Server/Proxmox/Usages/ServerNetworkData.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace Convoy\Models\Objects\Server\Usage;
+namespace Convoy\Data\Server\Proxmox\Usages;
 
 use Spatie\LaravelData\Data;
 
-class NetworkUsageObject extends Data
+class ServerNetworkData extends Data
 {
     public function __construct(
         public int $in,
         public int $out,
-        public int $monthly_total,
-    ) {
+    )
+    {
     }
 }

app/Data/Server/Proxmox/Usages/ServerUsagesData.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Convoy\Data\Server\Proxmox\Usages;
+
+use Spatie\LaravelData\Data;
+
+class ServerUsagesData extends Data
+{
+    public function __construct(
+        public int               $bandwidth,
+        public ServerNetworkData $network,
+        public ServerDiskData    $disk,
+    )
+    {
+    }
+}

app/Enums/Api/ApiKeyType.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Convoy\Enums\Api;
+
+enum ApiKeyType: string
+{
+    case ACCOUNT = 'account';
+    case APPLICATION = 'application';
+}

app/Enums/Helpers/ChecksumAlgorithm.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Convoy\Enums\Helpers;
+
+enum ChecksumAlgorithm: string
+{
+    case MD5 = 'md5';
+    case SHA1 = 'sha1';
+    case SHA224 = 'sha224';
+    case SHA256 = 'sha256';
+    case SHA384 = 'sha384';
+    case SHA512 = 'sha512';
+}

app/Enums/Network/AddressType.php

@@ -5,8 +5,5 @@ namespace Convoy\Enums\Network;
 enum AddressType: string
 {
     case IPV4 = 'ipv4';
-    case GWV4 = 'gw'; //gateway
-
     case IPV6 = 'ipv6';
-    case GWV6 = 'gw6';
 }

app/Enums/Node/Access/RealmType.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Convoy\Enums\Node\Access;
+
+enum RealmType: string
+{
+    case PAM = 'pam';
+    case PVE = 'pve';
+}

app/Enums/Node/Storage/ContentType.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Convoy\Enums\Node\Storage;
+
+enum ContentType: string
+{
+    case ISO = 'iso';
+    case VZTMPL = 'vztmpl';
+}

app/Enums/Proxmox/AuthenticationType.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace Convoy\Enums\Proxmox;
-
-enum AuthenticationType: string
-{
-    case PVE = 'pve'; // use PVE if the user doesn't exist as a Linux user
-    case PAM = 'pam'; // use PAM only if the user exists as a Linux user
-}

app/Enums/Server/AuthenticationType.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Convoy\Enums\Server;
+
+enum AuthenticationType: string
+{
+    case KEY = 'ssh_keys';
+    case PASSWORD = 'password';
+}

app/Enums/Server/BackupCompressionType.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Convoy\Enums\Server;
+
+enum BackupCompressionType: string
+{
+    case NONE = 'none';
+    case LZO = 'lzo';
+    case GZIP = 'gzip';
+    case ZSTD = 'zstd';
+}

app/Enums/Server/BackupMode.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Convoy\Enums\Server;
+
+enum BackupMode: string
+{
+    case SNAPSHOT = 'snapshot';
+    case SUSPEND = 'suspend';
+    case KILL = 'kill';
+}

app/Enums/Server/BiosType.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Convoy\Enums\Server\Cloudinit;
+namespace Convoy\Enums\Server;
 
 enum BiosType: string
 {

app/Enums/Server/Cloudinit/AuthenticationType.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace Convoy\Enums\Server\Cloudinit;
-
-enum AuthenticationType: string
-{
-    case KEY = 'sshkeys';
-    case PASSWORD = 'cipassword';
-}

app/Enums/Server/ConsoleType.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Convoy\Enums\Server;
+
+enum ConsoleType: string
+{
+    case NOVNC = 'novnc';
+    case XTERMJS = 'xtermjs';
+}

app/Enums/Server/DiskInterface.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace Convoy\Enums\Server;
+
+enum DiskInterface: string
+{
+    case IDE0 = 'ide0';
+    case IDE1 = 'ide1';
+    case IDE2 = 'ide2';
+    case IDE3 = 'ide3';
+    case SCSI0 = 'scsi0';
+    case SCSI1 = 'scsi1';
+    case SCSI2 = 'scsi2';
+    case SCSI3 = 'scsi3';
+    case SCSI4 = 'scsi4';
+    case SCSI5 = 'scsi5';
+    case SCSI6 = 'scsi6';
+    case SCSI7 = 'scsi7';
+    case SCSI8 = 'scsi8';
+    case SCSI9 = 'scsi9';
+    case SCSI10 = 'scsi10';
+    case SCSI11 = 'scsi11';
+    case SCSI12 = 'scsi12';
+    case SCSI13 = 'scsi13';
+    case SCSI14 = 'scsi14';
+    case SCSI15 = 'scsi15';
+    case SCSI16 = 'scsi16';
+    case SCSI17 = 'scsi17';
+    case SCSI18 = 'scsi18';
+    case SCSI19 = 'scsi19';
+    case SCSI20 = 'scsi20';
+    case SCSI21 = 'scsi21';
+    case SCSI22 = 'scsi22';
+    case SCSI23 = 'scsi23';
+    case SCSI24 = 'scsi24';
+    case SCSI25 = 'scsi25';
+    case SCSI26 = 'scsi26';
+    case SCSI27 = 'scsi27';
+    case SCSI28 = 'scsi28';
+    case SCSI29 = 'scsi29';
+    case SCSI30 = 'scsi30';
+    case VIRTIO0 = 'virtio0';
+    case VIRTIO1 = 'virtio1';
+    case VIRTIO2 = 'virtio2';
+    case VIRTIO3 = 'virtio3';
+    case VIRTIO4 = 'virtio4';
+    case VIRTIO5 = 'virtio5';
+    case VIRTIO6 = 'virtio6';
+    case VIRTIO7 = 'virtio7';
+    case VIRTIO8 = 'virtio8';
+    case VIRTIO9 = 'virtio9';
+    case VIRTIO10 = 'virtio10';
+    case VIRTIO11 = 'virtio11';
+    case VIRTIO12 = 'virtio12';
+    case VIRTIO13 = 'virtio13';
+    case VIRTIO14 = 'virtio14';
+    case VIRTIO15 = 'virtio15';
+    case SATA0 = 'sata0';
+    case SATA1 = 'sata1';
+    case SATA2 = 'sata2';
+    case SATA3 = 'sata3';
+    case SATA4 = 'sata4';
+    case SATA5 = 'sata5';
+    case EFIDISK0 = 'efidisk0';
+    case TPMSTATE0 = 'tpmstate0';
+}

app/Enums/Server/MetricParameter.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Convoy\Enums\Server;
+
+enum MetricParameter: string
+{
+    case AVERAGE = 'AVERAGE';
+    case MAX = 'MAX';
+}

app/Enums/Server/MetricTimeframe.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Convoy\Enums\Server;
+
+enum MetricTimeframe: string
+{
+    case HOUR = 'hour';
+    case DAY = 'day';
+    case WEEK = 'week';
+    case MONTH = 'month';
+    case YEAR = 'year';
+}

app/Enums/Server/PowerAction.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Convoy\Enums\Server;
+
+enum PowerAction: string
+{
+    case RESTART = 'restart';
+    case RESET = 'reset';
+    case RESUME = 'resume';
+    case SHUTDOWN = 'shutdown';
+    case START = 'start';
+    case KILL = 'kill';
+    case SUSPEND = 'suspend';
+}

app/Enums/Server/State.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Convoy\Enums\Server;
+
+enum State: string
+{
+    case STOPPED = 'stopped';
+    case RUNNING = 'running';
+
+    /* Synthetic states (not part of Proxmox but used in Convoy) */
+    case STOPPING = 'stopping';
+    case STARTING = 'starting';
+    case SHUTTING_DOWN = 'shutting_down';
+}

app/Enums/Server/Status.php

@@ -5,5 +5,10 @@ namespace Convoy\Enums\Server;
 enum Status: string
 {
     case INSTALLING = 'installing';
+    case INSTALL_FAILED = 'install_failed';
     case SUSPENDED = 'suspended';
+    case RESTORING_BACKUP = 'restoring_backup';
+    case RESTORING_SNAPSHOT = 'restoring_snapshot';
+    case DELETING = 'deleting';
+    case DELETION_FAILED = 'deletion_failed';
 }

app/Enums/Server/SuspensionAction.php

@@ -6,4 +6,4 @@ enum SuspensionAction: string
 {
     case SUSPEND = 'suspend';
     case UNSUSPEND = 'unsuspend';
-}
+}

app/Enums/Server/ThrottleAction.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace Convoy\Enums\Server;
-
-enum ThrottleAction: string
-{
-    case THROTTLE = 'throttle';
-    case UNTHROTTLE = 'unthrottle';
-}

app/Events/Activity/Activity.php

@@ -2,9 +2,9 @@
 
 namespace Convoy\Events\Activity;
 
+use Illuminate\Support\Str;
 use Convoy\Models\ActivityLog;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Str;
 
 abstract class Activity
 {
@@ -34,6 +34,7 @@ abstract class Activity
 
     public function isSystem()
     {
+        // @phpstan-ignore-next-line
         return is_null($this->model->actor_id);
     }
 }

app/Events/Activity/ActivityLogged.php

@@ -1,55 +0,0 @@
-<?php
-
-namespace Convoy\Events\Activity;
-
-use Convoy\Models\ActivityLog;
-use Convoy\Models\Server;
-use Convoy\Models\User;
-use Convoy\Transformers\Client\ActivityLogTransformer;
-use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Broadcasting\PrivateChannel;
-use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
-use Illuminate\Queue\SerializesModels;
-use LogicException;
-
-class ActivityLogged extends Activity implements ShouldBroadcast
-{
-    use Dispatchable, InteractsWithSockets, SerializesModels;
-
-    /**
-     * Create a new event instance.
-     *
-     * @return void
-     */
-    public function __construct(ActivityLog $model)
-    {
-        parent::__construct($model);
-    }
-
-    /**
-     * Get the data to broadcast.
-     *
-     * @return array
-     */
-    public function broadcastWith()
-    {
-        return fractal($this->model, new ActivityLogTransformer)->toArray();
-    }
-
-    /**
-     * Get the channels the event should broadcast on.
-     *
-     * @return \Illuminate\Broadcasting\Channel|array
-     */
-    public function broadcastOn()
-    {
-        if ($this->isServerEvent()) {
-            return new PrivateChannel('server.'.$this->model->subjects()->firstWhere('subject_type', (new Server)->getMorphClass())?->subject_id);
-        } elseif ($this->isUserEvent()) {
-            return new PrivateChannel('user.'.$this->model->subjects()->firstWhere('subject_type', (new User)->getMorphClass())?->subject_id);
-        }
-
-        throw new LogicException('Event subject is invalid');
-    }
-}

app/Events/Activity/ActivityUpdated.php

@@ -1,55 +0,0 @@
-<?php
-
-namespace Convoy\Events\Activity;
-
-use Convoy\Models\ActivityLog;
-use Convoy\Models\Server;
-use Convoy\Models\User;
-use Convoy\Transformers\Client\ActivityLogTransformer;
-use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Broadcasting\PrivateChannel;
-use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
-use Illuminate\Queue\SerializesModels;
-use LogicException;
-
-class ActivityUpdated extends Activity implements ShouldBroadcast
-{
-    use Dispatchable, InteractsWithSockets, SerializesModels;
-
-    /**
-     * Create a new event instance.
-     *
-     * @return void
-     */
-    public function __construct(ActivityLog $model)
-    {
-        parent::__construct($model);
-    }
-
-    /**
-     * Get the data to broadcast.
-     *
-     * @return array
-     */
-    public function broadcastWith()
-    {
-        return fractal($this->model, new ActivityLogTransformer)->toArray();
-    }
-
-    /**
-     * Get the channels the event should broadcast on.
-     *
-     * @return \Illuminate\Broadcasting\Channel|array
-     */
-    public function broadcastOn()
-    {
-        if ($this->isServerEvent()) {
-            return new PrivateChannel('server.'.$this->model->subjects()->firstWhere('subject_type', (new Server)->getMorphClass())?->subject_id);
-        } elseif ($this->isUserEvent()) {
-            return new PrivateChannel('user.'.$this->model->subjects()->firstWhere('subject_type', (new User)->getMorphClass())?->subject_id);
-        }
-
-        throw new LogicException('Event subject is invalid');
-    }
-}

app/Events/TriggerWebsocket.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace Convoy\Events;
-
-use Illuminate\Broadcasting\Channel;
-use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
-use Illuminate\Queue\SerializesModels;
-
-class TriggerWebsocket implements ShouldBroadcast
-{
-    use Dispatchable, InteractsWithSockets, SerializesModels;
-
-    /**
-     * Create a new event instance.
-     *
-     * @return void
-     */
-    public function __construct(public string $message)
-    {
-        //
-    }
-
-    /**
-     * Get the channels the event should broadcast on.
-     *
-     * @return \Illuminate\Broadcasting\Channel|array
-     */
-    public function broadcastOn()
-    {
-        return new Channel('public');
-    }
-}

app/Exceptions/DisplayException.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace Convoy\Exceptions;
+
+use Exception;
+use Throwable;
+use Psr\Log\LoggerInterface;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Container\Container;
+use Illuminate\Http\RedirectResponse;
+use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
+
+class DisplayException extends ConvoyException implements HttpExceptionInterface
+{
+    public const LEVEL_DEBUG = 'debug';
+
+    public const LEVEL_INFO = 'info';
+
+    public const LEVEL_WARNING = 'warning';
+
+    public const LEVEL_ERROR = 'error';
+
+    /**
+     * DisplayException constructor.
+     */
+    public function __construct(string $message, ?Throwable $previous = null, protected string $level = self::LEVEL_ERROR, int $code = 0)
+    {
+        parent::__construct($message, $code, $previous);
+    }
+
+    public function getErrorLevel(): string
+    {
+        return $this->level;
+    }
+
+    public function getStatusCode(): int
+    {
+        return Response::HTTP_BAD_REQUEST;
+    }
+
+    public function getHeaders(): array
+    {
+        return [];
+    }
+
+    /**
+     * Render the exception to the user by adding a flashed message to the session
+     * and then redirecting them back to the page that they came from. If the
+     * request originated from an API hit, return the error in JSONAPI spec format.
+     */
+    public function render(Request $request): JsonResponse|RedirectResponse
+    {
+        if ($request->expectsJson()) {
+            return response()->json(Handler::toArray($this), $this->getStatusCode(), $this->getHeaders());
+        }
+
+        return redirect()->back()->withInput();
+    }
+
+    /**
+     * Log the exception to the logs using the defined error level only if the previous
+     * exception is set.
+     *
+     * @throws Throwable
+     */
+    public function report()
+    {
+        if (! $this->getPrevious() instanceof Exception || ! Handler::isReportable($this->getPrevious())) {
+            return null;
+        }
+
+        try {
+            $logger = Container::getInstance()->make(LoggerInterface::class);
+        } catch (Exception) {
+            throw $this->getPrevious();
+        }
+
+        return $logger->{$this->getErrorLevel()}($this->getPrevious());
+    }
+}

app/Exceptions/Handler.php

@@ -2,29 +2,13 @@
 
 namespace Convoy\Exceptions;
 
-use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Exception;
 use Throwable;
+use Illuminate\Container\Container;
+use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 
 class Handler extends ExceptionHandler
 {
-    /**
-     * A list of exception types with their corresponding custom log levels.
-     *
-     * @var array<class-string<\Throwable>, \Psr\Log\LogLevel::*>
-     */
-    protected $levels = [
-        //
-    ];
-
-    /**
-     * A list of the exception types that are not reported.
-     *
-     * @var array<int, class-string<\Throwable>>
-     */
-    protected $dontReport = [
-        //
-    ];
-
     /**
      * A list of the inputs that are never flashed to the session on validation exceptions.
      *
@@ -38,13 +22,28 @@ class Handler extends ExceptionHandler
 
     /**
      * Register the exception handling callbacks for the application.
-     *
-     * @return void
      */
-    public function register()
+    public function register(): void
     {
         $this->reportable(function (Throwable $e) {
             //
         });
     }
+
+    /**
+     * Return an array of exceptions that should not be reported.
+     */
+    public static function isReportable(Exception $exception): bool
+    {
+        return (new static(Container::getInstance()))->shouldReport($exception);
+    }
+
+    /**
+     * Helper method to allow reaching into the handler to convert an exception
+     * into the expected array response type.
+     */
+    public static function toArray(Throwable $e): array
+    {
+        return (new self(app()))->convertExceptionToArray($e);
+    }
 }

app/Exceptions/Http/Server/ServerStatusConflictException.php

@@ -6,7 +6,7 @@ use Throwable;
 use Convoy\Models\Server;
 use Symfony\Component\HttpKernel\Exception\ConflictHttpException;
 
-class ServerStateConflictException extends ConflictHttpException
+class ServerStatusConflictException extends ConflictHttpException
 {
     /**
      * Exception thrown when the server is in an unsupported state for API access or
@@ -14,10 +14,10 @@ class ServerStateConflictException extends ConflictHttpException
      */
     public function __construct(Server $server, Throwable $previous = null)
     {
-        $message = 'This server is currently in an unsupported state, please try again later.';
+        $message = 'This server is currently in an unsupported status, please try again later.';
         if ($server->isSuspended()) {
             $message = 'This server is currently suspended and the functionality requested is unavailable.';
-        } elseif (!$server->isInstalled()) {
+        } elseif (! $server->isInstalled()) {
             $message = 'This server has not yet completed its installation process, please try again later.';
         }
 

app/Exceptions/Model/DataValidationException.php

@@ -2,10 +2,11 @@
 
 namespace Convoy\Exceptions\Model;
 
+use Illuminate\Support\MessageBag;
 use Convoy\Exceptions\ConvoyException;
-use Illuminate\Contracts\Support\MessageProvider;
-use Illuminate\Contracts\Validation\Validator;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Contracts\Validation\Validator;
+use Illuminate\Contracts\Support\MessageProvider;
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 
 class DataValidationException extends ConvoyException implements HttpExceptionInterface, MessageProvider
@@ -40,27 +41,20 @@ class DataValidationException extends ConvoyException implements HttpExceptionIn
 
     /**
      * Return the validator message bag.
-     *
-     * @return \Illuminate\Support\MessageBag
      */
-    public function getMessageBag()
+    public function getMessageBag(): MessageBag
     {
         return $this->validator->errors();
     }
 
     /**
      * Return the status code for this request.
-     *
-     * @return int
      */
     public function getStatusCode(): int
     {
         return 500;
     }
 
-    /**
-     * @return array
-     */
     public function getHeaders(): array
     {
         return [];

app/Exceptions/Repository/Proxmox/ProxmoxConnectionException.php

@@ -2,8 +2,14 @@
 
 namespace Convoy\Exceptions\Repository\Proxmox;
 
+use Illuminate\Http\Client\Response;
+use Illuminate\Http\Client\RequestException;
 use Convoy\Exceptions\Repository\RepositoryException;
 
 class ProxmoxConnectionException extends RepositoryException
 {
+   public function __construct(Response $response, RequestException $exception)
+   {
+       parent::__construct($response->reason() . PHP_EOL . $exception->getMessage() . PHP_EOL . $exception->getTraceAsString(), $exception->getCode(), $exception);
+   }
 }

app/Exceptions/Repository/RecordNotFoundException.php

@@ -9,8 +9,6 @@ class RecordNotFoundException extends RepositoryException implements HttpExcepti
 {
     /**
      * Returns the status code.
-     *
-     * @return int
      */
     public function getStatusCode(): int
     {
@@ -19,8 +17,6 @@ class RecordNotFoundException extends RepositoryException implements HttpExcepti
 
     /**
      * Returns response headers.
-     *
-     * @return array
      */
     public function getHeaders(): array
     {

app/Exceptions/Service/Api/InvalidJWTException.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Convoy\Exceptions\Service\Api;
+use Throwable;
+use Convoy\Exceptions\ConvoyException;
+
+class InvalidJWTException extends ConvoyException
+{
+    public function __construct(?Throwable $previous = null)
+    {
+        parent::__construct(message: 'Invalid JWT token', previous: $previous);
+    }
+}

app/Exceptions/Service/Backup/BackupLockedException.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Convoy\Exceptions\Service\Backup;
+
+use Convoy\Exceptions\DisplayException;
+
+class BackupLockedException extends DisplayException
+{
+    /**
+     * TooManyBackupsException constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct('Cannot delete a backup that is marked as locked.');
+    }
+}

app/Exceptions/Service/Backup/TooManyBackupsException.php

@@ -2,9 +2,9 @@
 
 namespace Convoy\Exceptions\Service\Backup;
 
-use Convoy\Exceptions\ConvoyException;
+use Convoy\Exceptions\DisplayException;
 
-class TooManyBackupsException extends ConvoyException
+class TooManyBackupsException extends DisplayException
 {
     /**
      * TooManyBackupsException constructor.

app/Exceptions/Service/Deployment/InvalidTemplateException.php

@@ -2,8 +2,8 @@
 
 namespace Convoy\Exceptions\Service\Deployment;
 
-use Convoy\Exceptions\ConvoyException;
+use Convoy\Exceptions\DisplayException;
 
-class InvalidTemplateException extends ConvoyException
+class InvalidTemplateException extends DisplayException
 {
 }

app/Exceptions/Service/Network/AddressInUseException.php

@@ -2,9 +2,9 @@
 
 namespace Convoy\Exceptions\Service\Network;
 
-use Convoy\Exceptions\ConvoyException;
+use Convoy\Exceptions\DisplayException;
 
-class AddressInUseException extends ConvoyException
+class AddressInUseException extends DisplayException
 {
     /**
      * TooManyBackupsException constructor.
@@ -12,7 +12,7 @@ class AddressInUseException extends ConvoyException
     public function __construct(int $addressId)
     {
         parent::__construct(
-            sprintf('Address %d is currently in use by another server.', $addressId)
+            sprintf('Address %d is currently in use by another server.', $addressId),
         );
     }
 }

app/Exceptions/Service/Node/IsoLibrary/InvalidIsoLinkException.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Convoy\Exceptions\Service\Node\IsoLibrary;
+
+use Convoy\Exceptions\DisplayException;
+
+class InvalidIsoLinkException extends DisplayException
+{
+    public function __construct()
+    {
+        parent::__construct('The ISO link provided is either unreachable or invalid.');
+    }
+}