From 338b4d7f2c07c97f312c1c963310516b7aa91f1f Mon Sep 17 00:00:00 2001 From: Sergey Shorokhov Date: Sun, 23 Jun 2024 20:15:25 +0300 Subject: [PATCH 1/7] Dockerfile: add `AmxxEasyHttp` --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index c6a92e0..dd36a2b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,6 +32,10 @@ RUN curl -sSL ${AMXModX_URL} | bsdtar -xf - addons/ \ RUN releaseLink="https://github.com/s1lentq/reapi/releases/download/5.24.0.300/reapi-bin-5.24.0.300.zip" \ && curl -sSL ${releaseLink} | bsdtar -xf - --exclude='*.dll' --exclude='*.pdb' addons/ +# # Install AmxxEasyHttp +RUN releaseLink="https://github.com/Next21Team/AmxxEasyHttp/releases/download/1.3.0/release_linux_v1.3.0.zip" \ + && curl -sSL ${releaseLink} | bsdtar -xf - --strip-components=1 + COPY cstrike . SHELL ["/bin/bash", "-c"] From 02bfc32509a7e6bb76ab6f460603886c2ce85a5f Mon Sep 17 00:00:00 2001 From: Sergey Shorokhov Date: Sun, 23 Jun 2024 20:16:22 +0300 Subject: [PATCH 2/7] add include: `easy_http.inc` --- .../addons/amxmodx/scripting/ReDeathmatch.sma | 1 + .../amxmodx/scripting/include/easy_http.inc | 888 ++++++++++++++++++ 2 files changed, 889 insertions(+) create mode 100644 cstrike/addons/amxmodx/scripting/include/easy_http.inc diff --git a/cstrike/addons/amxmodx/scripting/ReDeathmatch.sma b/cstrike/addons/amxmodx/scripting/ReDeathmatch.sma index 199bbf7..1afbbc4 100644 --- a/cstrike/addons/amxmodx/scripting/ReDeathmatch.sma +++ b/cstrike/addons/amxmodx/scripting/ReDeathmatch.sma @@ -4,6 +4,7 @@ #include #include #include +#include #include #include diff --git a/cstrike/addons/amxmodx/scripting/include/easy_http.inc b/cstrike/addons/amxmodx/scripting/include/easy_http.inc new file mode 100644 index 0000000..693d2ea --- /dev/null +++ b/cstrike/addons/amxmodx/scripting/include/easy_http.inc @@ -0,0 +1,888 @@ +#if defined _easy_http_included + #endinput +#endif +#define _easy_http_included + +#pragma reqlib easy_http +#if !defined AMXMODX_NOAUTOLOAD + #pragma loadlib easy_http +#endif + +enum EzHttpErrorCode { + EZH_OK = 0, + EZH_CONNECTION_FAILURE, + EZH_EMPTY_RESPONSE, + EZH_HOST_RESOLUTION_FAILURE, + EZH_INTERNAL_ERROR, + EZH_INVALID_URL_FORMAT, + EZH_NETWORK_RECEIVE_ERROR, + EZH_NETWORK_SEND_FAILURE, + EZH_OPERATION_TIMEDOUT, + EZH_PROXY_RESOLUTION_FAILURE, + EZH_SSL_CONNECT_ERROR, + EZH_SSL_LOCAL_CERTIFICATE_ERROR, + EZH_SSL_REMOTE_CERTIFICATE_ERROR, + EZH_SSL_CACERT_ERROR, + EZH_GENERIC_SSL_ERROR, + EZH_UNSUPPORTED_PROTOCOL, + EZH_REQUEST_CANCELLED, + EZH_TOO_MANY_REDIRECTS, + EZH_UNKNOWN_ERROR = 1000, +}; + +enum EzHttpProgress +{ + EZH_DownloadNow = 0, + EZH_DownloadTotal, + EZH_UploadNow, + EZH_UploadTotal +}; + +enum EzHttpFtpSecurity +{ + EZH_UNSECURE = 0, + EZH_SECURE_EXPLICIT +}; + +enum EzHttpPluginEndBehaviour +{ + EZH_CANCEL_REQUEST = 0, + EZH_FORGET_REQUEST, +}; + +// options natives +native EzHttpOptions:ezhttp_create_options(); +native ezhttp_option_set_user_agent(EzHttpOptions:options_id, const user_agent[]); +native ezhttp_option_add_url_parameter(EzHttpOptions:options_id, const key[], const value[]); +native ezhttp_option_add_form_payload(EzHttpOptions:options_id, const key[], const value[]); +native ezhttp_option_set_body(EzHttpOptions:options_id, const body[]); + +/** + * Copies serialized string to the requests body. + * + * @note Needs to be freed using ezjson_free() native. + * + * @param options_id options_id + * @param json EzJSON handle + * @param pretty True to format pretty JSON string, false to not + * + * @return True if serialization was successful, false otherwise + * @error If passed handle is not a valid value. If passed options_id is not exists. + */ +native bool:ezhttp_option_set_body_from_json(EzHttpOptions:options_id, EzJSON:json, bool:pretty = false); + +native ezhttp_option_append_body(EzHttpOptions:options_id, const body[]); +native ezhttp_option_set_header(EzHttpOptions:options_id, const key[], const value[]); +native ezhttp_option_set_cookie(EzHttpOptions:options_id, const key[], const value[]); +native ezhttp_option_set_timeout(EzHttpOptions:options_id, timeout_ms); +native ezhttp_option_set_connect_timeout(EzHttpOptions:options_id, timeout_ms); +native ezhttp_option_set_proxy(EzHttpOptions:options_id, const proxy_url[]); +native ezhttp_option_set_proxy_auth(EzHttpOptions:options_id, const user[], const password[]); +native ezhttp_option_set_auth(EzHttpOptions:options_id, const user[], const password[]); +native ezhttp_option_set_user_data(EzHttpOptions:options_id, const data[], len); +native ezhttp_option_set_plugin_end_behaviour(EzHttpOptions:options_id, EzHttpPluginEndBehaviour:plugin_end_behaviour); +native ezhttp_option_set_queue(EzHttpOptions:options_id, EzHttpQueue:end_map_behaviour); + +// request natives +native EzHttpRequest:ezhttp_get(const url[], const on_complete[], EzHttpOptions:options_id = EzHttpOptions:0); +native EzHttpRequest:ezhttp_post(const url[], const on_complete[], EzHttpOptions:options_id = EzHttpOptions:0); +native ezhttp_is_request_exists(EzHttpRequest:request_id); +native ezhttp_cancel_request(EzHttpRequest:request_id); +native ezhttp_request_progress(EzHttpRequest:request_id, progress[EzHttpProgress]); // it's not recommend to use this too frequently (every frame) + +// response natives. You can use these only in response on_complete callback! +native ezhttp_get_http_code(EzHttpRequest:request_id); +native ezhttp_get_data(EzHttpRequest:request_id, buffer[], max_len); + +/** + * Parses http response body to JSON. + * + * @note Needs to be freed using ezjson_free() native. + * + * @param request_id request_id + * @param with_comments True if parsing JSON includes comments (it will ignore them), false otherwise + * + * @return EzJSON handle, EzInvalid_JSON if error occurred + */ +native EzJSON:ezhttp_parse_json_response(EzHttpRequest:request_id, bool:with_comments = false); + +native ezhttp_get_url(EzHttpRequest:request_id, buffer[], max_len); +native ezhttp_save_data_to_file(EzHttpRequest:request_id, const file_path[]); // file_path must be relative to mod dir +native ezhttp_save_data_to_file2(EzHttpRequest:request_id, file_handle); // file_handle must be opened via fopen with write permissions. Returns written bytes count +native ezhttp_get_headers_count(EzHttpRequest:request_id); +native ezhttp_get_headers(EzHttpRequest:request_id, const key[], value[], max_len); +native Float:ezhttp_get_elapsed(EzHttpRequest:request_id); +native ezhttp_get_cookies_count(EzHttpRequest:request_id); +native ezhttp_get_cookies(EzHttpRequest:request_id, const key[], value[], max_len); +native EzHttpErrorCode:ezhttp_get_error_code(EzHttpRequest:request_id); +native ezhttp_get_error_message(EzHttpRequest:request_id, buffer[], max_len); +native ezhttp_get_redirect_count(EzHttpRequest:request_id); +native ezhttp_get_uploaded_bytes(EzHttpRequest:request_id); +native ezhttp_get_downloaded_bytes(EzHttpRequest:request_id); +native ezhttp_get_user_data(EzHttpRequest:request_id, data[]); + +native EzHttpRequest:ezhttp_ftp_upload(const user[], const password[], const host[], const remote_file[], const local_file[], const on_complete[], EzHttpFtpSecurity:security = EZH_UNSECURE, EzHttpOptions:options_id = EzHttpOptions:0); +native EzHttpRequest:ezhttp_ftp_upload2(const uri[], const local_file[], const on_complete[], EzHttpFtpSecurity:security = EZH_UNSECURE, EzHttpOptions:options_id = EzHttpOptions:0); + +native EzHttpRequest:ezhttp_ftp_download(const user[], const password[], const host[], const remote_file[], const local_file[], const on_complete[], EzHttpFtpSecurity:security = EZH_UNSECURE, EzHttpOptions:options_id = EzHttpOptions:0); +native EzHttpRequest:ezhttp_ftp_download2(const uri[], const local_file[], const on_complete[], EzHttpFtpSecurity:security = EZH_UNSECURE, EzHttpOptions:options_id = EzHttpOptions:0); + + +native EzHttpQueue:ezhttp_create_queue(); + +// + +/* + * JSON types + */ +enum EzJSONType +{ + EzJSONError = -1, + EzJSONNull = 1, + EzJSONString = 2, + EzJSONNumber = 3, + EzJSONObject = 4, + EzJSONArray = 5, + EzJSONBoolean = 6 +}; + +/* + * JSON invalid handle + */ +enum EzJSON +{ + EzInvalid_JSON = -1 +} + +/** + * Helper macros for checking type + */ +#define ezjson_is_object(%1) (%1 != EzInvalid_JSON && ezjson_get_type(%1) == EzJSONObject) +#define ezjson_is_array(%1) (%1 != EzInvalid_JSON && ezjson_get_type(%1) == EzJSONArray) +#define ezjson_is_string(%1) (%1 != EzInvalid_JSON && ezjson_get_type(%1) == EzJSONString) +#define ezjson_is_number(%1) (%1 != EzInvalid_JSON && ezjson_get_type(%1) == EzJSONNumber) +#define ezjson_is_bool(%1) (%1 != EzInvalid_JSON && ezjson_get_type(%1) == EzJSONBoolean) +#define ezjson_is_null(%1) (%1 != EzInvalid_JSON && ezjson_get_type(%1) == EzJSONNull) +#define ezjson_is_true(%1) (%1 != EzInvalid_JSON && ezjson_is_bool(%1) && ezjson_get_bool(%1)) +#define ezjson_is_false(%1) (%1 != EzInvalid_JSON && ezjson_is_bool(%1) && !ezjson_get_bool(%1)) + +/** + * Parses JSON string or a file that contains JSON. + * + * @note Needs to be freed using ezjson_free() native. + * + * @param string String to parse + * @param is_file True to treat string param as filename, false otherwise + * @param with_comments True if parsing JSON includes comments (it will ignore them), false otherwise + * + * @return EzJSON handle, EzInvalid_JSON if error occurred + */ +native EzJSON:ezjson_parse(const string[], bool:is_file = false, bool:with_comments = false); + +/** + * Checks if the first value is the same as the second one. + * + * @param value1 EzJSON handle + * @param value2 EzJSON handle + * + * @return True if they are the same, false otherwise + * @error If passed value is not a valid handle + */ +native bool:ezjson_equals(const EzJSON:value1, const EzJSON:value2); + +/** + * Validates json by checking if object have identically named + * fields with matching types. + * + * @note Schema {"name":"", "age":0} will validate + * {"name":"Joe", "age":25} and {"name":"Joe", "age":25, "gender":"m"}, + * but not {"name":"Joe"} or {"name":"Joe", "age":"Cucumber"}. + * + * @note In case of arrays, only first value in schema + * is checked against all values in tested array. + * + * @note Empty objects ({}) validate all objects, + * empty arrays ([]) validate all arrays, + * null validates values of every type. + * + * @param schema EzJSON handle + * @param value EzJSON handle + * + * @return True if passed value is valid, false otherwise + * @error If a schema handle or value handle is invalid + */ +native bool:ezjson_validate(const EzJSON:schema, const EzJSON:value); + +/** + * Gets value's parent handle. + * + * @note Parent's handle needs to be freed using ezjson_free() native. + * + * @param value EzJSON handle + * + * @return Parent's handle + */ +native EzJSON:ezjson_get_parent(const EzJSON:value); + +/** + * Gets JSON type of passed value. + * + * @param value EzJSON handle + * + * @return JSON type (EzJSONType constants) + * @error If a value handle is invalid + */ +native EzJSONType:ezjson_get_type(const EzJSON:value); + +/** + * Inits an empty object. + * + * @note Needs to be freed using ezjson_free() native. + * + * @return EzJSON handle, EzInvalid_JSON if error occurred + */ +native EzJSON:ezjson_init_object(); + +/** + * Inits an empty array. + * + * @note Needs to be freed using ezjson_free() native. + * + * @return EzJSON handle, EzInvalid_JSON if error occurred + */ +native EzJSON:ezjson_init_array(); + +/** + * Inits string data. + * + * @note Needs to be freed using ezjson_free() native. + * + * @param value String that the handle will be initialized with + * + * @return EzJSON handle, EzInvalid_JSON if error occurred + */ +native EzJSON:ezjson_init_string(const value[]); + +/** + * Inits a number. + * + * @note Needs to be freed using ezjson_free() native. + * + * @param value Integer number that the handle will be initialized with + * + * @return EzJSON handle, EzInvalid_JSON if error occurred + */ +native EzJSON:ezjson_init_number(value); + +/** + * Inits a real number. + * + * @note Needs to be freed using ezjson_free() native. + * + * @param value Real number that the handle will be initialized with + * + * @return EzJSON handle, EzInvalid_JSON if error occurred + */ +native EzJSON:ezjson_init_real(Float:value); + +/** + * Inits a boolean value. + * + * @note Needs to be freed using ezjson_free() native. + * + * @param value Boolean value that the handle will be initialized with + * + * @return EzJSON handle, EzInvalid_JSON if error occurred + */ +native EzJSON:ezjson_init_bool(bool:value); + +/** + * Inits a null. + * + * @note Needs to be freed using ezjson_free() native. + * + * @return EzJSON handle, EzInvalid_JSON if error occurred + */ +native EzJSON:ezjson_init_null(); + +/** + * Creates deep copy of passed value. + * + * @note Needs to be freed using ezjson_free() native. + * + * @param value EzJSON handle to be copied + * + * @return EzJSON handle, EzInvalid_JSON if error occurred + * @error If passed value is not a valid handle + */ +native EzJSON:ezjson_deep_copy(const EzJSON:value); + +/** + * Frees handle. + * + * @param handle EzJSON handle to be freed + * + * @return True if succeed, false otherwise + * @error If passed handle is not a valid handle + */ +native bool:ezjson_free(&EzJSON:handle); + +/** + * Gets string data. + * + * @param value EzJSON handle + * @param buffer Buffer to copy string to + * @param maxlen Maximum size of the buffer + * + * @return The number of cells written to the buffer + * @error If passed value is not a valid handle + */ +native ezjson_get_string(const EzJSON:value, buffer[], maxlen); + +/** + * Gets a number. + * + * @param value EzJSON handle + * + * @return Number + * @error If passed value is not a valid handle + */ +native ezjson_get_number(const EzJSON:value); + +/** + * Gets a real number. + * + * @param value EzJSON handle + * + * @return Real number + * @error If passed value is not a valid handle + */ +native Float:ezjson_get_real(const EzJSON:value); + +/** + * Gets a boolean value. + * + * @param value EzJSON handle + * + * @return Boolean value + * @error If passed value is not a valid handle + */ +native bool:ezjson_get_bool(const EzJSON:value); + +/** + * Gets a value from the array. + * + * @note Needs to be freed using ezjson_free() native. + * + * @param array Array handle + * @param index Position in the array (starting from 0) + * + * @return EzJSON handle, EzInvalid_JSON if error occurred + * @error If passed handle is not a valid array + */ +native EzJSON:ezjson_array_get_value(const EzJSON:array, index); + +/** + * Gets string data from the array. + * + * @param array Array handle + * @param index Position in the array (starting from 0) + * @param buffer Buffer to copy string to + * @param maxlen Maximum size of the buffer + * + * @return The number of cells written to the buffer + * @error If passed handle is not a valid array + */ +native ezjson_array_get_string(const EzJSON:array, index, buffer[], maxlen); + +/** + * Gets a number from the array. + * + * @param array Array handle + * @param index Position in the array (starting from 0) + * + * @return The number as integer + * @error If passed handle is not a valid array + */ +native ezjson_array_get_number(const EzJSON:array, index); + +/** + * Gets a real number from the array. + * + * @param array Array handle + * @param index Position in the array (starting from 0) + * + * @return The number as float + * @error If passed handle is not a valid array + */ +native Float:ezjson_array_get_real(const EzJSON:array, index); + +/** + * Gets a boolean value from the array. + * + * @param array Array handle + * @param index Position in the array (starting from 0) + * + * @return Boolean value + * @error If passed handle is not a valid array + */ +native bool:ezjson_array_get_bool(const EzJSON:array, index); + +/** + * Gets count of the elements in the array. + * + * @param array Array handle + * + * @return Number of elements in the array + * @error If passed handle is not a valid array + */ +native ezjson_array_get_count(const EzJSON:array); + +/** + * Replaces an element in the array with value. + * + * @param array Array handle + * @param index Position in the array to be replaced + * @param value EzJSON handle to set + * + * @return True if succeed, false otherwise + * @error If passed handle is not a valid array + */ +native bool:ezjson_array_replace_value(EzJSON:array, index, const EzJSON:value); + +/** + * Replaces an element in the array with string data. + * + * @param array Array handle + * @param index Position in the array to be replaced + * @param string String to copy + * + * @return True if succeed, false otherwise + * @error If passed handle is not a valid array + */ +native bool:ezjson_array_replace_string(EzJSON:array, index, const string[]); + +/** + * Replaces an element in the array with number. + * + * @param array Array handle + * @param index Position in the array to be replaced + * @param number Number to set + * + * @return True if succeed, false otherwise + * @error If passed handle is not a valid array + */ +native bool:ezjson_array_replace_number(EzJSON:array, index, number); + +/** + * Replaces an element in the array with real number. + * + * @param array Array handle + * @param index Position in the array to be replaced + * @param number Real number to set + * + * @return True if succeed, false otherwise + * @error If passed handle is not a valid array + */ +native bool:ezjson_array_replace_real(EzJSON:array, index, Float:number); + +/** + * Replaces an element in the array with boolean value. + * + * @param array Array handle + * @param index Position in the array to be replaced + * @param boolean Boolean value to set + * + * @return True if succeed, false otherwise + * @error If passed handle is not a valid array + */ +native bool:ezjson_array_replace_bool(EzJSON:array, index, bool:boolean); + +/** + * Replaces an element in the array with null. + * + * @param array Array handle + * @param index Position in the array to be replaced + * + * @return True if succeed, false otherwise + * @error If passed handle is not a valid array + */ +native bool:ezjson_array_replace_null(EzJSON:array, index); + +/** + * Appends a value in the array. + * + * @param array Array handle + * @param value EzJSON handle to set + * + * @return True if succeed, false otherwise + * @error If passed handle is not a valid array + */ +native bool:ezjson_array_append_value(EzJSON:array, const EzJSON:value); + +/** + * Appends string data in the array. + * + * @param array Array handle + * @param string String to copy + * + * @return True if succeed, false otherwise + * @error If passed handle is not a valid array + */ +native bool:ezjson_array_append_string(EzJSON:array, const string[]); + +/** + * Appends a number in the array. + * + * @param array Array handle + * @param number Number to set + * + * @return True if succeed, false otherwise + * @error If passed handle is not a valid array + */ +native bool:ezjson_array_append_number(EzJSON:array, number); + +/** + * Appends a real number in the array. + * + * @param array Array handle + * @param number Real number to set + * + * @return True if succeed, false otherwise + * @error If passed handle is not a valid array + */ +native bool:ezjson_array_append_real(EzJSON:array, Float:number); + +/** + * Appends a boolean value in the array. + * + * @param array Array handle + * @param boolean Boolean value to set + * + * @return True if succeed, false otherwise + * @error If passed handle is not a valid array + */ +native bool:ezjson_array_append_bool(EzJSON:array, bool:boolean); + +/** + * Appends a null in the array. + * + * @param array Array handle + * + * @return True if succeed, false otherwise + * @error If passed handle is not a valid array + */ +native bool:ezjson_array_append_null(EzJSON:array); + +/** + * Removes an element from the array. + * + * @note Order of values in array may change during execution. + * + * @param array Array handle + * @param index Position in the array (starting from 0) + * + * @return True if succeed, false otherwise + * @error If passed handle is not a valid array + */ +native bool:ezjson_array_remove(EzJSON:array, index); + +/** + * Removes all elements from the array. + * + * @param array Array handle + * + * @return True if succeed, false otherwise + * @error If passed handle is not a valid array + */ +native bool:ezjson_array_clear(EzJSON:array); + +/** + * Gets a value from the object. + * + * @note Needs to be freed using ezjson_free() native. + * @note If dot notation is used some values may be inaccessible + * because valid names in JSON can contain dots. + * + * @param object Object handle + * @param name Key name + * @param dot_not True to use dot notation, false to not + * + * @return EzJSON handle, EzInvalid_JSON if error occurred + * @error If passed handle is not a valid object + */ +native EzJSON:ezjson_object_get_value(const EzJSON:object, const name[], bool:dot_not = false); + +/** + * Gets string data from the object. + * + * @note If dot notation is used some values may be inaccessible + * because valid names in JSON can contain dots. + * + * @param object Object handle + * @param name Key name + * @param buffer Buffer to copy string to + * @param maxlen Maximum size of the buffer + * @param dot_not True to use dot notation, false to not + * + * @return The number of cells written to the buffer + * @error If passed handle is not a valid object + */ +native ezjson_object_get_string(const EzJSON:object, const name[], buffer[], maxlen, bool:dot_not = false); + +/** + * Gets a number from the object. + * + * @note If dot notation is used some values may be inaccessible + * because valid names in JSON can contain dots. + * + * @param object Object handle + * @param name Key name + * @param dot_not True to use dot notation, false to not + * + * @return Number + * @error If passed handle is not a valid object + */ +native ezjson_object_get_number(const EzJSON:object, const name[], bool:dot_not = false); + +/** + * Gets a real number from the object. + * + * @note If dot notation is used some values may be inaccessible + * because valid names in JSON can contain dots. + * + * @param object Object handle + * @param name Key name + * @param dot_not True to use dot notation, false to not + * + * @return Real number + * @error If passed handle is not a valid object + */ +native Float:ezjson_object_get_real(const EzJSON:object, const name[], bool:dot_not = false); + +/** + * Gets a boolean value from the object. + * + * @note If dot notation is used some values may be inaccessible + * because valid names in JSON can contain dots. + * + * @param object Object handle + * @param name Key name + * @param dot_not True to use dot notation, false to not + * + * @return Boolean value + * @error If passed handle is not a valid object + */ +native bool:ezjson_object_get_bool(const EzJSON:object, const name[], bool:dot_not = false); + +/** + * Gets count of the keys in the object. + * + * @param object Object handle + * + * @return Keys count + * @error If passed handle is not a valid object + */ +native ezjson_object_get_count(const EzJSON:object); + +/** + * Gets name of the object's key. + * + * @param object Object handle + * @param index Position from which get key name + * @param buffer Buffer to copy string to + * @param maxlen Maximum size of the buffer + * + * @return The number of cells written to the buffer + * @error If passed handle is not a valid object + */ +native ezjson_object_get_name(const EzJSON:object, index, buffer[], maxlen); + +/** + * Gets a value at the specified position from the object. + * + * @note Needs to be freed using ezjson_free() native. + * + * @param object Object handle + * @param index Position from which get key name + * + * @return EzJSON handle, EzInvalid_JSON if error occurred + * @error If passed handle is not a valid object + */ +native EzJSON:ezjson_object_get_value_at(const EzJSON:object, index); + +/** + * Checks if the object has a value with a specific name and type. + * + * @param object Object handle + * @param name Key name + * @param type Type of value, if EzJSONError type will not be checked + * @param dot_not True to use dot notation, false to not + * + * @return True if has, false if not + * @error If passed handle is not a valid object + */ +native bool:ezjson_object_has_value(const EzJSON:object, const name[], EzJSONType:type = EzJSONError, bool:dot_not = false); + +/** + * Sets a value in the object. + * + * @note If dot notation is used some values may be inaccessible + * because valid names in JSON can contain dots. + * @note It also removes the old value if any. + * + * @param object Object handle + * @param name Key name + * @param value EzJSON handle to set + * @param dot_not True to use dot notation, false to not + * + * @return True if succeed, false otherwise + * @error If passed handle is not a valid object + */ +native bool:ezjson_object_set_value(EzJSON:object, const name[], const EzJSON:value, bool:dot_not = false); + +/** + * Sets string data in the object. + * + * @note If dot notation is used some values may be inaccessible + * because valid names in JSON can contain dots. + * @note It also removes the old value if any. + * + * @param object Object handle + * @param name Key name + * @param string String to copy + * @param dot_not True to use dot notation, false to not + * + * @return True if succeed, false otherwise + * @error If passed handle is not a valid object + */ +native bool:ezjson_object_set_string(EzJSON:object, const name[], const string[], bool:dot_not = false); + +/** + * Sets a number in the object. + * + * @note If dot notation is used some values may be inaccessible + * because valid names in JSON can contain dots. + * @note It also removes the old value if any. + * + * @param object Object handle + * @param name Key name + * @param number Number to set + * @param dot_not True to use dot notation, false to not + * + * @return True if succeed, false otherwise + * @error If passed handle is not a valid object + */ +native bool:ezjson_object_set_number(EzJSON:object, const name[], number, bool:dot_not = false); + +/** + * Sets a real number in the object. + * + * @note If dot notation is used some values may be inaccessible + * because valid names in JSON can contain dots. + * @note It also removes the old value if any. + * + * @param object Object handle + * @param name Key name + * @param number Real number to set + * @param dot_not True to use dot notation, false to not + * + * @return True if succeed, false otherwise + * @error If passed handle is not a valid object + */ +native bool:ezjson_object_set_real(EzJSON:object, const name[], Float:number, bool:dot_not = false); + +/** + * Sets a boolean value in the object. + * + * @note If dot notation is used some values may be inaccessible + * because valid names in JSON can contain dots. + * @note It also removes the old value if any. + * + * @param object Object handle + * @param name Key name + * @param boolean Boolean value to set + * @param dot_not True to use dot notation, false to not + * + * @return True if succeed, false otherwise + * @error If passed handle is not a valid object + */ +native bool:ezjson_object_set_bool(EzJSON:object, const name[], bool:boolean, bool:dot_not = false); + +/** + * Sets a null in the object. + * + * @note If dot notation is used some values may be inaccessible + * because valid names in JSON can contain dots. + * @note It also removes the old value if any. + * + * @param object Object handle + * @param name Key name + * @param dot_not True to use dot notation, false to not + * + * @return True if succeed, false otherwise + * @error If passed handle is not a valid object + */ +native bool:ezjson_object_set_null(EzJSON:object, const name[], bool:dot_not = false); + +/** + * Removes a key and its value in the object. + * + * @note If dot notation is used some values may be inaccessible + * because valid names in JSON can contain dots. + * + * @param object Object handle + * @param name Key name + * @param dot_not True to use dot notation, false to not + * + * @return True if succeed, false otherwise + * @error If passed handle is not a valid object + */ +native bool:ezjson_object_remove(EzJSON:object, const name[], bool:dot_not = false); + +/** + * Removes all keys and their values in the object. + * + * @param object Object handle + * + * @return True if succeed, false otherwise + * @error If passed handle is not a valid object + */ +native bool:ezjson_object_clear(EzJSON:object); + +/** + * Gets size of serialization. + * + * @param value EzJSON handle + * @param pretty True to count size for pretty format, false to not + * @param null_byte True to include null byte, false to not + * + * @return Size of serialized string + * @error If passed handle is not a valid value + */ +native ezjson_serial_size(const EzJSON:value, bool:pretty = false, bool:null_byte = false); + +/** + * Copies serialized string to the buffer. + * + * @param value EzJSON handle + * @param buffer Buffer to copy string to + * @param maxlen Maximum size of the buffer + * @param pretty True to format pretty JSON string, false to not + * + * @return The number of cells written to the buffer + * @error If passed handle is not a valid value + */ +native ezjson_serial_to_string(const EzJSON:value, buffer[], maxlen, bool:pretty = false); + +/** + * Copies serialized string to the file. + * + * @param value EzJSON handle + * @param file Path to the file + * @param pretty True to format pretty JSON string, false to not + * + * @return True if succeed, false otherwise + * @error If passed handle is not a valid value + */ +native bool:ezjson_serial_to_file(const EzJSON:value, const file[], bool:pretty = false); From 65ddfc6c232fc4b620dd5d90faac552ea2851cfc Mon Sep 17 00:00:00 2001 From: Sergey Shorokhov Date: Sun, 23 Jun 2024 20:17:19 +0300 Subject: [PATCH 3/7] rework `plugin_natives()` usage --- cstrike/addons/amxmodx/scripting/ReDeathmatch.sma | 4 ++++ cstrike/addons/amxmodx/scripting/ReDeathmatch/ReDM_api.inc | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cstrike/addons/amxmodx/scripting/ReDeathmatch.sma b/cstrike/addons/amxmodx/scripting/ReDeathmatch.sma index 1afbbc4..314bd27 100644 --- a/cstrike/addons/amxmodx/scripting/ReDeathmatch.sma +++ b/cstrike/addons/amxmodx/scripting/ReDeathmatch.sma @@ -112,6 +112,10 @@ public plugin_unpause() { SetActive(true) } +public plugin_natives() { + ApiInit_Natives() +} + public client_putinserver(player) { if (!IsActive()) return diff --git a/cstrike/addons/amxmodx/scripting/ReDeathmatch/ReDM_api.inc b/cstrike/addons/amxmodx/scripting/ReDeathmatch/ReDM_api.inc index aa15650..b9c4c37 100644 --- a/cstrike/addons/amxmodx/scripting/ReDeathmatch/ReDM_api.inc +++ b/cstrike/addons/amxmodx/scripting/ReDeathmatch/ReDM_api.inc @@ -6,7 +6,7 @@ static g_fwdGetConfigName = -1 static g_fwdGetConfigPrefixName = -1 -public plugin_natives() { +public ApiInit_Natives() { register_native("redm_is_active", "native_redm_is_active") register_native("redm_set_active", "native_redm_set_active") register_native("redm_get_config", "native_redm_get_config") From a40b30128c5775630887bf0dd5dd8f9e96cdee58 Mon Sep 17 00:00:00 2001 From: Sergey Shorokhov Date: Sun, 23 Jun 2024 20:22:01 +0300 Subject: [PATCH 4/7] new ConVar: `redm_update_notify` Notify for new ReDM update. --- .../addons/amxmodx/scripting/ReDeathmatch.sma | 3 + .../scripting/ReDeathmatch/ReDM_updater.inc | 131 ++++++++++++++++++ 2 files changed, 134 insertions(+) create mode 100644 cstrike/addons/amxmodx/scripting/ReDeathmatch/ReDM_updater.inc diff --git a/cstrike/addons/amxmodx/scripting/ReDeathmatch.sma b/cstrike/addons/amxmodx/scripting/ReDeathmatch.sma index 314bd27..2ee6d82 100644 --- a/cstrike/addons/amxmodx/scripting/ReDeathmatch.sma +++ b/cstrike/addons/amxmodx/scripting/ReDeathmatch.sma @@ -20,6 +20,7 @@ #include "ReDeathmatch/ReDM_features.inc" #include "ReDeathmatch/ReDM_round_modes.inc" #include "ReDeathmatch/ReDM_api.inc" +#include "ReDeathmatch/ReDM_updater.inc" static bool: g_prevState @@ -66,6 +67,7 @@ public plugin_init() { register_concmd("redm", "ConCmd_redm", ADMIN_MAP, "Get info.", .FlagManager = false) ApiInit_Forwards() + Updater_Init() } public plugin_precache() { @@ -114,6 +116,7 @@ public plugin_unpause() { public plugin_natives() { ApiInit_Natives() + Updater_Natives() } public client_putinserver(player) { diff --git a/cstrike/addons/amxmodx/scripting/ReDeathmatch/ReDM_updater.inc b/cstrike/addons/amxmodx/scripting/ReDeathmatch/ReDM_updater.inc new file mode 100644 index 0000000..014ce8d --- /dev/null +++ b/cstrike/addons/amxmodx/scripting/ReDeathmatch/ReDM_updater.inc @@ -0,0 +1,131 @@ +static const g_versionLink[] = "https://api.github.com/repos/" + + "ReDeathmatch/ReDeathmatch_AMXX" + + "/releases/latest" + +static bool: redm_update_notify + +Updater_Init() { + bind_pcvar_num( + create_cvar( + "redm_update_notify", "1", + .has_min = true, .min_val = 0.0, + .has_max = true, .max_val = 1.0, + .flags = _FCVAR_BOOLEAN, + .description = "Notify for new ReDM update.^n\ + Don't use into ReDM configs!" + ), + redm_update_notify + ) + + CheckUpdate() +} + +Updater_Natives() { + set_module_filter("@ModuleFilter") + set_native_filter("@NativeFilter") +} + +@ModuleFilter(const library[], LibType: type) { + return strcmp("easy_http", library) == 0 ? PLUGIN_HANDLED : PLUGIN_CONTINUE +} + +@NativeFilter(const nativeName[], index, trap) { + if (strncmp(nativeName, "ezhttp_", 7) == 0) + return PLUGIN_HANDLED + + if (strncmp(nativeName, "ezjson_", 7) == 0) + return PLUGIN_HANDLED + + return PLUGIN_CONTINUE +} + +static CheckUpdate() { + if (!redm_update_notify) + return + + new bool: isManualBuild = (strfind(REDM_VERSION, "manual") != -1) + if (isManualBuild) + return + + if (is_module_loaded("Amxx Easy Http") == -1) { + LogMessageEx(Warning, "The `AmxxEasyHttp` module is not loaded! The new version cannot be verified.") + LogMessageEx(Warning, "Please install AmxxEasyHttp: `https://github.com/Next21Team/AmxxEasyHttp` or disable update checks (`redm_update_notify 0`).") + + return + } + + Request_NewVersion(g_versionLink) +} + +static Request_NewVersion(const link[]) { + ezhttp_get(link, "@RequestCallback_NewVersion") +} + +@RequestCallback_NewVersion(EzHttpRequest: request_id) { + if (ezhttp_get_error_code(request_id) != EZH_OK) { + new error[64] + ezhttp_get_error_message(request_id, error, charsmax(error)) + + LogMessageEx(Warning, "RequestCallback_NewVersion(%i): Response error: %s", request_id, error) + return + } + + new response[8192] + ezhttp_get_data(request_id, response, charsmax(response)) + + if (contain(response, "tag_name") == -1) { + LogMessageEx(Warning, "RequestCallback_NewVersion: Wrong response! (don't contain `tag_name`). res=`%s`", response) + return + } + + new EzJSON: json = ezjson_parse(response) + if (json == EzInvalid_JSON) { + LogMessageEx(Warning, "RequestCallback_NewVersion: Can't parse response JSON!") + goto END + } + + new tag_name[32] + ezjson_object_get_string(json, "tag_name", tag_name, charsmax(tag_name)) + + if (CmpVersions(REDM_VERSION, tag_name) >= 0) + goto END + + new html_url[256] + ezjson_object_get_string(json, "html_url", html_url, charsmax(html_url)) + + NotifyUpdate(tag_name, html_url) + + END: + ezjson_free(json) +} + +static NotifyUpdate(const newVersion[], const URL[]) { + LogMessageEx(Info, "^n^t ReDeathmatch (%s) has update! New version `%s`.^n\ + Download link: `%s`", REDM_VERSION, newVersion, URL + ) +} + +static stock CmpVersions(const a[], const b[]) { + new segmentsA[32][32] + new segmentsB[32][32] + + new countA = explode_string( + a[!isdigit(a[0]) ? 1 : 0], + ".", + segmentsA, sizeof segmentsA, charsmax(segmentsA[]) + ) + + new countB = explode_string( + b[!isdigit(b[0]) ? 1 : 0], + ".", + segmentsB, sizeof segmentsB, charsmax(segmentsB[]) + ) + + for(new i, l = min(countA, countB); i < l; i++) { + new diff = strtol(segmentsA[i]) - strtol(segmentsB[i]) + if (diff) + return diff + } + + return countA - countB +} From 5fc3e577b12fb42795e4b04cadac8b2b4707ccc4 Mon Sep 17 00:00:00 2001 From: Sergey Shorokhov Date: Sun, 23 Jun 2024 20:53:45 +0300 Subject: [PATCH 5/7] new ConCmd: `redm_update_check` Checks ReDM update. --- .../scripting/ReDeathmatch/ReDM_updater.inc | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/cstrike/addons/amxmodx/scripting/ReDeathmatch/ReDM_updater.inc b/cstrike/addons/amxmodx/scripting/ReDeathmatch/ReDM_updater.inc index 014ce8d..d0d26d5 100644 --- a/cstrike/addons/amxmodx/scripting/ReDeathmatch/ReDM_updater.inc +++ b/cstrike/addons/amxmodx/scripting/ReDeathmatch/ReDM_updater.inc @@ -17,9 +17,26 @@ Updater_Init() { redm_update_notify ) + register_concmd( + "redm_update_check", "ConCmd_redm_update_check", + ADMIN_MAP, + "Checks ReDM update." + ) + CheckUpdate() } +public ConCmd_redm_update_check(const player) { + SetGlobalTransTarget(player) + + if (!cmd_access(player, level, commandId, 1)) + return PLUGIN_HANDLED + + Request_NewVersion(g_versionLink) + + return PLUGIN_HANDLED +} + Updater_Natives() { set_module_filter("@ModuleFilter") set_native_filter("@NativeFilter") From f29b6ae7405fb0540f0e68e7ea89f9b2e9eb5f60 Mon Sep 17 00:00:00 2001 From: Sergey Shorokhov Date: Sun, 23 Jun 2024 21:11:20 +0300 Subject: [PATCH 6/7] CI: add *amxx to releases artifacts --- .github/workflows/CI.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 3ed2c8b..05a82af 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -143,3 +143,4 @@ jobs: with: files: | *.zip + *.amxx From f84a5b9be431c93b031823835442dce647560979 Mon Sep 17 00:00:00 2001 From: Sergey Shorokhov Date: Sun, 23 Jun 2024 21:12:30 +0300 Subject: [PATCH 7/7] update readme --- .github/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/README.md b/.github/README.md index 306373f..00b2438 100644 --- a/.github/README.md +++ b/.github/README.md @@ -68,6 +68,7 @@ Many features have long been built and optimized to work directly in ReGameDLL_C - [ReGameDLL_CS](https://github.com/s1lentq/ReGameDLL_CS) installed; - Installed AMXModX ([`v1.9`](https://www.amxmodx.org/downloads-new.php) or [`v1.10`](https://www.amxmodx.org/downloads-new.php?branch=master)); - Installed [ReAPI](https://github.com/s1lentq/reapi) amxx module; +- Installed [AmxxEasyHttp](https://github.com/Next21Team/AmxxEasyHttp) module (optional); ## Installation Check the wiki [Installation](https://redeathmatch.github.io/en/Getting-started/installation/)