From 075215f69e60f4f052a4aa85112832ce3825caae Mon Sep 17 00:00:00 2001 From: Dmitry Volyntsev Date: Wed, 24 Aug 2022 17:04:58 -0700 Subject: [PATCH] Modules: sorting external object property descriptors alphabetically. --- nginx/ngx_http_js_module.c | 255 +++++++++++++++++------------------ nginx/ngx_js.c | 41 +++--- nginx/ngx_stream_js_module.c | 120 ++++++++--------- 3 files changed, 207 insertions(+), 209 deletions(-) diff --git a/nginx/ngx_http_js_module.c b/nginx/ngx_http_js_module.c index a5258616..76c39839 100644 --- a/nginx/ngx_http_js_module.c +++ b/nginx/ngx_http_js_module.c @@ -459,114 +459,118 @@ static njs_external_t ngx_http_js_ext_request[] = { { .flags = NJS_EXTERN_PROPERTY, - .name.string = njs_str("uri"), + .name.string = njs_str("args"), .enumerable = 1, .u.property = { - .handler = ngx_js_ext_string, - .magic32 = offsetof(ngx_http_request_t, uri), + .handler = ngx_http_js_ext_get_args, } }, { - .flags = NJS_EXTERN_PROPERTY, - .name.string = njs_str("method"), + .flags = NJS_EXTERN_METHOD, + .name.string = njs_str("done"), + .writable = 1, + .configurable = 1, .enumerable = 1, - .u.property = { - .handler = ngx_js_ext_string, - .magic32 = offsetof(ngx_http_request_t, method_name), + .u.method = { + .native = ngx_http_js_ext_done, } }, { - .flags = NJS_EXTERN_PROPERTY, - .name.string = njs_str("httpVersion"), + .flags = NJS_EXTERN_METHOD, + .name.string = njs_str("error"), + .writable = 1, + .configurable = 1, .enumerable = 1, - .u.property = { - .handler = ngx_http_js_ext_get_http_version, + .u.method = { + .native = ngx_js_ext_log, + .magic8 = NGX_LOG_ERR, } }, { - .flags = NJS_EXTERN_PROPERTY, - .name.string = njs_str("remoteAddress"), + .flags = NJS_EXTERN_METHOD, + .name.string = njs_str("finish"), + .writable = 1, + .configurable = 1, .enumerable = 1, - .u.property = { - .handler = ngx_http_js_ext_get_remote_address, + .u.method = { + .native = ngx_http_js_ext_finish, } }, { - .flags = NJS_EXTERN_PROPERTY, - .name.string = njs_str("requestBody"), - .u.property = { - .handler = ngx_http_js_ext_get_request_body, - .magic32 = NGX_JS_STRING | NGX_JS_DEPRECATED, + .flags = NJS_EXTERN_OBJECT, + .name.string = njs_str("headersIn"), + .enumerable = 1, + .u.object = { + .enumerable = 1, + .prop_handler = ngx_http_js_ext_header_in, + .keys = ngx_http_js_ext_keys_header_in, } }, { - .flags = NJS_EXTERN_PROPERTY, - .name.string = njs_str("requestText"), + .flags = NJS_EXTERN_OBJECT, + .name.string = njs_str("headersOut"), .enumerable = 1, - .u.property = { - .handler = ngx_http_js_ext_get_request_body, - .magic32 = NGX_JS_STRING, + .u.object = { + .writable = 1, + .configurable = 1, + .enumerable = 1, + .prop_handler = ngx_http_js_ext_header_out, + .keys = ngx_http_js_ext_keys_header_out, } }, { .flags = NJS_EXTERN_PROPERTY, - .name.string = njs_str("requestBuffer"), + .name.string = njs_str("httpVersion"), + .enumerable = 1, .u.property = { - .handler = ngx_http_js_ext_get_request_body, - .magic32 = NGX_JS_BUFFER, + .handler = ngx_http_js_ext_get_http_version, } }, { - .flags = NJS_EXTERN_PROPERTY, - .name.string = njs_str("parent"), - .u.property = { - .handler = ngx_http_js_ext_get_parent, + .flags = NJS_EXTERN_METHOD, + .name.string = njs_str("internalRedirect"), + .writable = 1, + .configurable = 1, + .enumerable = 1, + .u.method = { + .native = ngx_http_js_ext_internal_redirect, } }, { - .flags = NJS_EXTERN_PROPERTY, - .name.string = njs_str("responseBody"), - .u.property = { - .handler = ngx_http_js_ext_get_response_body, - .magic32 = NGX_JS_STRING | NGX_JS_DEPRECATED, + .flags = NJS_EXTERN_METHOD, + .name.string = njs_str("log"), + .writable = 1, + .configurable = 1, + .enumerable = 1, + .u.method = { + .native = ngx_js_ext_log, + .magic8 = NGX_LOG_INFO, } }, { .flags = NJS_EXTERN_PROPERTY, - .name.string = njs_str("responseText"), + .name.string = njs_str("method"), .enumerable = 1, .u.property = { - .handler = ngx_http_js_ext_get_response_body, - .magic32 = NGX_JS_STRING, + .handler = ngx_js_ext_string, + .magic32 = offsetof(ngx_http_request_t, method_name), } }, { .flags = NJS_EXTERN_PROPERTY, - .name.string = njs_str("responseBuffer"), + .name.string = njs_str("parent"), .u.property = { - .handler = ngx_http_js_ext_get_response_body, - .magic32 = NGX_JS_BUFFER, - } - }, - - { - .flags = NJS_EXTERN_OBJECT, - .name.string = njs_str("headersIn"), - .enumerable = 1, - .u.object = { - .enumerable = 1, - .prop_handler = ngx_http_js_ext_header_in, - .keys = ngx_http_js_ext_keys_header_in, + .handler = ngx_http_js_ext_get_parent, } }, @@ -581,20 +585,10 @@ static njs_external_t ngx_http_js_ext_request[] = { { .flags = NJS_EXTERN_PROPERTY, - .name.string = njs_str("args"), - .enumerable = 1, + .name.string = njs_str("rawHeadersOut"), .u.property = { - .handler = ngx_http_js_ext_get_args, - } - }, - - { - .flags = NJS_EXTERN_OBJECT, - .name.string = njs_str("variables"), - .u.object = { - .writable = 1, - .prop_handler = ngx_http_js_ext_variables, - .magic32 = NGX_JS_STRING, + .handler = ngx_http_js_ext_raw_header, + .magic32 = 1, } }, @@ -610,91 +604,77 @@ static njs_external_t ngx_http_js_ext_request[] = { { .flags = NJS_EXTERN_PROPERTY, - .name.string = njs_str("status"), - .writable = 1, + .name.string = njs_str("remoteAddress"), .enumerable = 1, .u.property = { - .handler = ngx_http_js_ext_status, + .handler = ngx_http_js_ext_get_remote_address, } }, { - .flags = NJS_EXTERN_OBJECT, - .name.string = njs_str("headersOut"), - .enumerable = 1, - .u.object = { - .writable = 1, - .configurable = 1, - .enumerable = 1, - .prop_handler = ngx_http_js_ext_header_out, - .keys = ngx_http_js_ext_keys_header_out, + .flags = NJS_EXTERN_PROPERTY, + .name.string = njs_str("requestBody"), + .u.property = { + .handler = ngx_http_js_ext_get_request_body, + .magic32 = NGX_JS_STRING | NGX_JS_DEPRECATED, } }, { .flags = NJS_EXTERN_PROPERTY, - .name.string = njs_str("rawHeadersOut"), + .name.string = njs_str("requestBuffer"), .u.property = { - .handler = ngx_http_js_ext_raw_header, - .magic32 = 1, + .handler = ngx_http_js_ext_get_request_body, + .magic32 = NGX_JS_BUFFER, } }, { - .flags = NJS_EXTERN_METHOD, - .name.string = njs_str("subrequest"), - .writable = 1, - .configurable = 1, + .flags = NJS_EXTERN_PROPERTY, + .name.string = njs_str("requestText"), .enumerable = 1, - .u.method = { - .native = ngx_http_js_ext_subrequest, + .u.property = { + .handler = ngx_http_js_ext_get_request_body, + .magic32 = NGX_JS_STRING, } }, { - .flags = NJS_EXTERN_METHOD, - .name.string = njs_str("log"), - .writable = 1, - .configurable = 1, - .enumerable = 1, - .u.method = { - .native = ngx_js_ext_log, - .magic8 = NGX_LOG_INFO, + .flags = NJS_EXTERN_PROPERTY, + .name.string = njs_str("responseBody"), + .u.property = { + .handler = ngx_http_js_ext_get_response_body, + .magic32 = NGX_JS_STRING | NGX_JS_DEPRECATED, } }, { - .flags = NJS_EXTERN_METHOD, - .name.string = njs_str("warn"), - .writable = 1, - .configurable = 1, - .enumerable = 1, - .u.method = { - .native = ngx_js_ext_log, - .magic8 = NGX_LOG_WARN, + .flags = NJS_EXTERN_PROPERTY, + .name.string = njs_str("responseBuffer"), + .u.property = { + .handler = ngx_http_js_ext_get_response_body, + .magic32 = NGX_JS_BUFFER, } }, { - .flags = NJS_EXTERN_METHOD, - .name.string = njs_str("error"), - .writable = 1, - .configurable = 1, + .flags = NJS_EXTERN_PROPERTY, + .name.string = njs_str("responseText"), .enumerable = 1, - .u.method = { - .native = ngx_js_ext_log, - .magic8 = NGX_LOG_ERR, + .u.property = { + .handler = ngx_http_js_ext_get_response_body, + .magic32 = NGX_JS_STRING, } }, { .flags = NJS_EXTERN_METHOD, - .name.string = njs_str("sendHeader"), + .name.string = njs_str("return"), .writable = 1, .configurable = 1, .enumerable = 1, .u.method = { - .native = ngx_http_js_ext_send_header, + .native = ngx_http_js_ext_return, } }, @@ -722,59 +702,78 @@ static njs_external_t ngx_http_js_ext_request[] = { { .flags = NJS_EXTERN_METHOD, - .name.string = njs_str("setReturnValue"), + .name.string = njs_str("sendHeader"), .writable = 1, .configurable = 1, .enumerable = 1, .u.method = { - .native = ngx_http_js_ext_set_return_value, + .native = ngx_http_js_ext_send_header, } }, { .flags = NJS_EXTERN_METHOD, - .name.string = njs_str("done"), + .name.string = njs_str("setReturnValue"), .writable = 1, .configurable = 1, .enumerable = 1, .u.method = { - .native = ngx_http_js_ext_done, + .native = ngx_http_js_ext_set_return_value, } }, { - .flags = NJS_EXTERN_METHOD, - .name.string = njs_str("finish"), + .flags = NJS_EXTERN_PROPERTY, + .name.string = njs_str("status"), .writable = 1, - .configurable = 1, .enumerable = 1, - .u.method = { - .native = ngx_http_js_ext_finish, + .u.property = { + .handler = ngx_http_js_ext_status, } }, { .flags = NJS_EXTERN_METHOD, - .name.string = njs_str("return"), + .name.string = njs_str("subrequest"), .writable = 1, .configurable = 1, .enumerable = 1, .u.method = { - .native = ngx_http_js_ext_return, + .native = ngx_http_js_ext_subrequest, + } + }, + + { + .flags = NJS_EXTERN_PROPERTY, + .name.string = njs_str("uri"), + .enumerable = 1, + .u.property = { + .handler = ngx_js_ext_string, + .magic32 = offsetof(ngx_http_request_t, uri), + } + }, + + { + .flags = NJS_EXTERN_OBJECT, + .name.string = njs_str("variables"), + .u.object = { + .writable = 1, + .prop_handler = ngx_http_js_ext_variables, + .magic32 = NGX_JS_STRING, } }, { .flags = NJS_EXTERN_METHOD, - .name.string = njs_str("internalRedirect"), + .name.string = njs_str("warn"), .writable = 1, .configurable = 1, .enumerable = 1, .u.method = { - .native = ngx_http_js_ext_internal_redirect, + .native = ngx_js_ext_log, + .magic8 = NGX_LOG_WARN, } }, - }; diff --git a/nginx/ngx_js.c b/nginx/ngx_js.c index 534232f4..478e3595 100644 --- a/nginx/ngx_js.c +++ b/nginx/ngx_js.c @@ -17,14 +17,24 @@ extern njs_module_t njs_webcrypto_module; static njs_external_t ngx_js_ext_core[] = { + { + .flags = NJS_EXTERN_PROPERTY, + .name.string = njs_str("ERR"), + .u.property = { + .handler = ngx_js_ext_constant, + .magic32 = NGX_LOG_ERR, + .magic16 = NGX_JS_NUMBER, + } + }, + { .flags = NJS_EXTERN_METHOD, - .name.string = njs_str("log"), + .name.string = njs_str("fetch"), .writable = 1, .configurable = 1, .enumerable = 1, .u.method = { - .native = ngx_js_ext_log, + .native = ngx_js_ext_fetch, } }, @@ -39,35 +49,26 @@ static njs_external_t ngx_js_ext_core[] = { }, { - .flags = NJS_EXTERN_PROPERTY, - .name.string = njs_str("WARN"), - .u.property = { - .handler = ngx_js_ext_constant, - .magic32 = NGX_LOG_WARN, - .magic16 = NGX_JS_NUMBER, + .flags = NJS_EXTERN_METHOD, + .name.string = njs_str("log"), + .writable = 1, + .configurable = 1, + .enumerable = 1, + .u.method = { + .native = ngx_js_ext_log, } }, { .flags = NJS_EXTERN_PROPERTY, - .name.string = njs_str("ERR"), + .name.string = njs_str("WARN"), .u.property = { .handler = ngx_js_ext_constant, - .magic32 = NGX_LOG_ERR, + .magic32 = NGX_LOG_WARN, .magic16 = NGX_JS_NUMBER, } }, - { - .flags = NJS_EXTERN_METHOD, - .name.string = njs_str("fetch"), - .writable = 1, - .configurable = 1, - .enumerable = 1, - .u.method = { - .native = ngx_js_ext_fetch, - } - }, }; diff --git a/nginx/ngx_stream_js_module.c b/nginx/ngx_stream_js_module.c index ede8e060..e275747e 100644 --- a/nginx/ngx_stream_js_module.c +++ b/nginx/ngx_stream_js_module.c @@ -325,45 +325,6 @@ static njs_external_t ngx_stream_js_ext_session[] = { } }, - { - .flags = NJS_EXTERN_PROPERTY, - .name.string = njs_str("status"), - .enumerable = 1, - .u.property = { - .handler = ngx_js_ext_uint, - .magic32 = offsetof(ngx_stream_session_t, status), - } - }, - - { - .flags = NJS_EXTERN_PROPERTY, - .name.string = njs_str("remoteAddress"), - .enumerable = 1, - .u.property = { - .handler = ngx_stream_js_ext_get_remote_address, - } - }, - - { - .flags = NJS_EXTERN_OBJECT, - .name.string = njs_str("variables"), - .u.object = { - .writable = 1, - .prop_handler = ngx_stream_js_ext_variables, - .magic32 = NGX_JS_STRING, - } - }, - - { - .flags = NJS_EXTERN_OBJECT, - .name.string = njs_str("rawVariables"), - .u.object = { - .writable = 1, - .prop_handler = ngx_stream_js_ext_variables, - .magic32 = NGX_JS_BUFFER, - } - }, - { .flags = NJS_EXTERN_METHOD, .name.string = njs_str("allow"), @@ -378,25 +339,25 @@ static njs_external_t ngx_stream_js_ext_session[] = { { .flags = NJS_EXTERN_METHOD, - .name.string = njs_str("deny"), + .name.string = njs_str("decline"), .writable = 1, .configurable = 1, .enumerable = 1, .u.method = { .native = ngx_stream_js_ext_done, - .magic8 = -NGX_DONE, + .magic8 = -NGX_DECLINED, } }, { .flags = NJS_EXTERN_METHOD, - .name.string = njs_str("decline"), + .name.string = njs_str("deny"), .writable = 1, .configurable = 1, .enumerable = 1, .u.method = { .native = ngx_stream_js_ext_done, - .magic8 = -NGX_DECLINED, + .magic8 = -NGX_DONE, } }, @@ -415,37 +376,36 @@ static njs_external_t ngx_stream_js_ext_session[] = { { .flags = NJS_EXTERN_METHOD, - .name.string = njs_str("log"), + .name.string = njs_str("error"), .writable = 1, .configurable = 1, .enumerable = 1, .u.method = { .native = ngx_js_ext_log, - .magic8 = NGX_LOG_INFO, + .magic8 = NGX_LOG_ERR, } }, { .flags = NJS_EXTERN_METHOD, - .name.string = njs_str("warn"), + .name.string = njs_str("log"), .writable = 1, .configurable = 1, .enumerable = 1, .u.method = { .native = ngx_js_ext_log, - .magic8 = NGX_LOG_WARN, + .magic8 = NGX_LOG_INFO, } }, { .flags = NJS_EXTERN_METHOD, - .name.string = njs_str("error"), + .name.string = njs_str("off"), .writable = 1, .configurable = 1, .enumerable = 1, .u.method = { - .native = ngx_js_ext_log, - .magic8 = NGX_LOG_ERR, + .native = ngx_stream_js_ext_off, } }, @@ -461,13 +421,21 @@ static njs_external_t ngx_stream_js_ext_session[] = { }, { - .flags = NJS_EXTERN_METHOD, - .name.string = njs_str("off"), - .writable = 1, - .configurable = 1, + .flags = NJS_EXTERN_OBJECT, + .name.string = njs_str("rawVariables"), + .u.object = { + .writable = 1, + .prop_handler = ngx_stream_js_ext_variables, + .magic32 = NGX_JS_BUFFER, + } + }, + + { + .flags = NJS_EXTERN_PROPERTY, + .name.string = njs_str("remoteAddress"), .enumerable = 1, - .u.method = { - .native = ngx_stream_js_ext_off, + .u.property = { + .handler = ngx_stream_js_ext_get_remote_address, } }, @@ -493,6 +461,37 @@ static njs_external_t ngx_stream_js_ext_session[] = { } }, + { + .flags = NJS_EXTERN_PROPERTY, + .name.string = njs_str("status"), + .enumerable = 1, + .u.property = { + .handler = ngx_js_ext_uint, + .magic32 = offsetof(ngx_stream_session_t, status), + } + }, + + { + .flags = NJS_EXTERN_OBJECT, + .name.string = njs_str("variables"), + .u.object = { + .writable = 1, + .prop_handler = ngx_stream_js_ext_variables, + .magic32 = NGX_JS_STRING, + } + }, + + { + .flags = NJS_EXTERN_METHOD, + .name.string = njs_str("warn"), + .writable = 1, + .configurable = 1, + .enumerable = 1, + .u.method = { + .native = ngx_js_ext_log, + .magic8 = NGX_LOG_WARN, + } + }, }; @@ -508,26 +507,25 @@ static njs_external_t ngx_stream_js_ext_session_flags[] = { { .flags = NJS_EXTERN_PROPERTY, - .name.string = njs_str("last"), + .name.string = njs_str("from_upstream"), .enumerable = 1, .u.property = { .handler = ngx_js_ext_flags, .magic16 = NGX_JS_BOOLEAN, - .magic32 = 0x00000001, + .magic32 = 0x00000002, } }, { .flags = NJS_EXTERN_PROPERTY, - .name.string = njs_str("from_upstream"), + .name.string = njs_str("last"), .enumerable = 1, .u.property = { .handler = ngx_js_ext_flags, .magic16 = NGX_JS_BOOLEAN, - .magic32 = 0x00000002, + .magic32 = 0x00000001, } }, - }; -- 2.47.3