From: Dmitry Volyntsev Date: Fri, 13 Nov 2026 23:20:47 +0000 (-0800) Subject: Modules: report library and host failures as Error X-Git-Url: https://git.kaiwu.me/%7Bsubstring-before(@doc,%20'.xml')%7D.html?a=commitdiff_plain;h=0852c7113209fe65a22904affab2b407cc7b2a96;p=njs.git Modules: report library and host failures as Error Since QuickJS-NG 0.18.0 (db0fe52, "Make InternalErrors uncatchable by JS code") an InternalError cannot be caught by JavaScript code. njs used InternalError for failures of OpenSSL, zlib, libxml and nginx, such as inflating corrupted data or failing to send a response. With QuickJS-NG 0.18.0 such an error terminated the script, and in nginx the handler, instead of reaching a try/catch block. Now such failures are reported as Error in both engines, as Node.js does. The QuickJS engine uses the new qjs_throw_error() function, which works with both QuickJS and QuickJS-NG. InternalError is kept for impossible internal states and unsupported features. The "path is too long" error of fs in the njs engine is now RangeError, as in the QuickJS engine. CI now uses QuickJS-NG 0.18.0, where the zlib test failed because of the uncaught InternalError. --- diff --git a/.github/scripts/nginx-ci.sh b/.github/scripts/nginx-ci.sh index 52722bc4..3f6c1b06 100644 --- a/.github/scripts/nginx-ci.sh +++ b/.github/scripts/nginx-ci.sh @@ -27,7 +27,7 @@ prepare() { make -C quickjs -j"$(nproc)" libquickjs.a ;; quickjs-ng) - git clone --branch v0.16.2 --depth=1 \ + git clone --branch v0.18.0 --depth=1 \ https://github.com/quickjs-ng/quickjs quickjs-ng CFLAGS="$cc_opt -fPIC" LDFLAGS="$ld_opt" \ meson setup quickjs-ng/build quickjs-ng \ diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml index bd2ff9fe..3eff693a 100644 --- a/.github/workflows/cli.yml +++ b/.github/workflows/cli.yml @@ -79,7 +79,7 @@ jobs: - name: Build QuickJS-NG if: matrix.engine == 'quickjs-ng' run: | - git clone --branch v0.16.2 --depth=1 \ + git clone --branch v0.18.0 --depth=1 \ https://github.com/quickjs-ng/quickjs quickjs-ng CFLAGS="$(dpkg-buildflags --get CFLAGS) -fPIC" \ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)" \ diff --git a/external/njs_crypto_module.c b/external/njs_crypto_module.c index aff99b5a..deeed5a3 100644 --- a/external/njs_crypto_module.c +++ b/external/njs_crypto_module.c @@ -262,7 +262,7 @@ njs_crypto_create_hash(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, cln->data = dgst; if (EVP_DigestInit_ex(dgst->ctx, md, NULL) <= 0) { - njs_vm_internal_error(vm, "EVP_DigestInit_ex() failed"); + njs_vm_error(vm, "EVP_DigestInit_ex() failed"); return NJS_ERROR; } @@ -343,13 +343,13 @@ njs_hash_prototype_update(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, if (!hmac) { if (EVP_DigestUpdate(dgst->ctx, data.start, data.length) <= 0) { - njs_vm_internal_error(vm, "EVP_DigestUpdate() failed"); + njs_vm_error(vm, "EVP_DigestUpdate() failed"); return NJS_ERROR; } } else { if (HMAC_Update(ctx->ctx, data.start, data.length) <= 0) { - njs_vm_internal_error(vm, "HMAC_Update() failed"); + njs_vm_error(vm, "HMAC_Update() failed"); return NJS_ERROR; } } @@ -408,7 +408,7 @@ njs_hash_prototype_digest(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, if (!hmac) { if (EVP_DigestFinal_ex(dgst->ctx, digest, &len) <= 0) { - njs_vm_internal_error(vm, "EVP_DigestFinal_ex() failed"); + njs_vm_error(vm, "EVP_DigestFinal_ex() failed"); return NJS_ERROR; } @@ -417,7 +417,7 @@ njs_hash_prototype_digest(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } else { if (HMAC_Final(ctx->ctx, digest, &len) <= 0) { - njs_vm_internal_error(vm, "HMAC_Final() failed"); + njs_vm_error(vm, "HMAC_Final() failed"); return NJS_ERROR; } @@ -479,7 +479,7 @@ njs_hash_prototype_copy(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, cln->data = copy; if (EVP_MD_CTX_copy_ex(copy->ctx, dgst->ctx) <= 0) { - njs_vm_internal_error(vm, "EVP_MD_CTX_copy_ex() failed"); + njs_vm_error(vm, "EVP_MD_CTX_copy_ex() failed"); return NJS_ERROR; } @@ -556,7 +556,7 @@ njs_crypto_create_hmac(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, cln->data = ctx; if (HMAC_Init_ex(ctx->ctx, key.start, (int) key.length, md, NULL) <= 0) { - njs_vm_internal_error(vm, "HMAC_Init_ex() failed"); + njs_vm_error(vm, "HMAC_Init_ex() failed"); return NJS_ERROR; } diff --git a/external/njs_fs_module.c b/external/njs_fs_module.c index 2876c84f..2fe8e414 100644 --- a/external/njs_fs_module.c +++ b/external/njs_fs_module.c @@ -2941,7 +2941,7 @@ njs_fs_make_path(njs_vm_t *vm, char *path, mode_t md, njs_bool_t recursive, } if (njs_slow_path((p - path) > NJS_MAX_PATH)) { - njs_vm_internal_error(vm, "too large path"); + njs_vm_error(vm, "too large path"); return NJS_ERROR; } @@ -3234,8 +3234,8 @@ njs_fs_path(njs_vm_t *vm, char storage[NJS_MAX_PATH + 1], njs_value_t *src, } if (njs_slow_path(str.length > NJS_MAX_PATH - 1)) { - njs_vm_internal_error(vm, "\"%s\" is too long >= %d", prop_name, - NJS_MAX_PATH); + njs_vm_range_error(vm, "\"%s\" is too long >= %d", prop_name, + NJS_MAX_PATH); return NULL; } @@ -3520,8 +3520,8 @@ njs_fs_dirent_test(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, if (njs_slow_path(njs_value_is_number(type) && (njs_value_number(type) == NJS_DT_INVALID))) { - njs_vm_internal_error(vm, "dentry type is not supported on this " - "platform"); + njs_vm_error(vm, "dentry type is not supported on this " + "platform"); return NJS_ERROR; } diff --git a/external/njs_shell.c b/external/njs_shell.c index 044762e1..2f484040 100644 --- a/external/njs_shell.c +++ b/external/njs_shell.c @@ -1288,7 +1288,7 @@ njs_module_loader(njs_vm_t *vm, njs_external_ptr_t external, njs_str_t *name) (void) close(info.fd); if (njs_slow_path(ret != NJS_OK)) { - njs_vm_internal_error(vm, "while reading \"%V\" module", &info.file); + njs_vm_error(vm, "while reading \"%V\" module", &info.file); return NULL; } @@ -1296,8 +1296,8 @@ njs_module_loader(njs_vm_t *vm, njs_external_ptr_t external, njs_str_t *name) ret = njs_console_set_cwd(console, &info.file); if (njs_slow_path(ret != NJS_OK)) { - njs_vm_internal_error(vm, "while setting cwd for \"%V\" module", - &info.file); + njs_vm_error(vm, "while setting cwd for \"%V\" module", + &info.file); return NULL; } @@ -2688,8 +2688,8 @@ njs_qjs_module_loader(JSContext *ctx, const char *module_name, void *opaque) (void) close(info.fd); if (njs_slow_path(ret != NJS_OK)) { - JS_ThrowInternalError(ctx, "while reading \"%.*s\" module", - (int) info.file.length, info.file.start); + qjs_throw_error(ctx, "while reading \"%.*s\" module", + (int) info.file.length, info.file.start); return NULL; } @@ -2697,8 +2697,8 @@ njs_qjs_module_loader(JSContext *ctx, const char *module_name, void *opaque) ret = njs_console_set_cwd(console, &info.file); if (njs_slow_path(ret != NJS_OK)) { - JS_ThrowInternalError(ctx, "while setting cwd for \"%.*s\" module", - (int) info.file.length, info.file.start); + qjs_throw_error(ctx, "while setting cwd for \"%.*s\" module", + (int) info.file.length, info.file.start); return NULL; } diff --git a/external/njs_webcrypto_module.c b/external/njs_webcrypto_module.c index c14d9288..61b3e6c9 100644 --- a/external/njs_webcrypto_module.c +++ b/external/njs_webcrypto_module.c @@ -6034,7 +6034,7 @@ njs_webcrypto_result(njs_vm_t *vm, njs_opaque_value_t *result, njs_int_t rc, error: - njs_vm_internal_error(vm, "cannot make webcrypto result"); + njs_vm_error(vm, "cannot make webcrypto result"); return NJS_ERROR; } diff --git a/external/njs_xml_module.c b/external/njs_xml_module.c index 26c3cd1c..cacbd091 100644 --- a/external/njs_xml_module.c +++ b/external/njs_xml_module.c @@ -465,7 +465,7 @@ njs_xml_ext_parse(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, ctx = xmlNewParserCtxt(); if (njs_slow_path(ctx == NULL)) { - njs_vm_internal_error(vm, "xmlNewParserCtxt() failed"); + njs_vm_error(vm, "xmlNewParserCtxt() failed"); return NJS_ERROR; } @@ -778,7 +778,7 @@ njs_xml_node_ext_add_child(njs_vm_t *vm, njs_value_t *args, node = xmlDocCopyNode(node, current->doc, 1); if (njs_slow_path(node == NULL)) { - njs_vm_internal_error(vm, "xmlDocCopyNode() failed"); + njs_vm_error(vm, "xmlDocCopyNode() failed"); return NJS_ERROR; } @@ -812,7 +812,7 @@ njs_xml_node_ext_get_attribute_ns(njs_vm_t *vm, njs_value_t *args, text = xmlNodeGetContent((xmlNode *) attr); if (njs_slow_path(text == NULL)) { - njs_vm_internal_error(vm, "xmlNodeGetContent() failed"); + njs_vm_error(vm, "xmlNodeGetContent() failed"); return NJS_ERROR; } @@ -1127,7 +1127,7 @@ njs_xml_node_ext_text(njs_vm_t *vm, njs_object_prop_t *unused, uint32_t unused1, if (retval != NULL && setval != NULL) { text = xmlNewDocTextLen(current->doc, content.start, content.length); if (njs_slow_path(text == NULL)) { - njs_vm_internal_error(vm, "xmlNewDocTextLen() failed"); + njs_vm_error(vm, "xmlNewDocTextLen() failed"); return NJS_ERROR; } } @@ -1234,7 +1234,7 @@ njs_xml_node_attr_handler(njs_vm_t *vm, xmlNode *current, njs_str_t *name, attr = xmlSetProp(current, name_c, value); if (njs_slow_path(attr == NULL)) { - njs_vm_internal_error(vm, "xmlSetProp() failed"); + njs_vm_error(vm, "xmlSetProp() failed"); return NJS_ERROR; } @@ -1252,7 +1252,7 @@ njs_xml_attr_value(njs_vm_t *vm, xmlAttr *attr, njs_value_t *retval) text = xmlNodeGetContent((xmlNode *) attr); if (njs_slow_path(text == NULL)) { - njs_vm_internal_error(vm, "xmlNodeGetContent() failed"); + njs_vm_error(vm, "xmlNodeGetContent() failed"); return NJS_ERROR; } @@ -1452,7 +1452,7 @@ njs_xml_node_tags_handler(njs_vm_t *vm, njs_value_t *value, njs_str_t *name, node = xmlDocCopyNode(node, current->doc, 1); if (njs_slow_path(node == NULL)) { - njs_vm_internal_error(vm, "xmlDocCopyNode() failed"); + njs_vm_error(vm, "xmlDocCopyNode() failed"); goto error; } @@ -2045,7 +2045,7 @@ njs_xml_ext_canonicalization(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, buf = xmlOutputBufferCreateIO(njs_xml_buf_write_cb, NULL, &chain, NULL); if (njs_slow_path(buf == NULL)) { - njs_vm_internal_error(vm, "xmlOutputBufferCreateIO() failed"); + njs_vm_error(vm, "xmlOutputBufferCreateIO() failed"); return NJS_ERROR; } @@ -2054,7 +2054,7 @@ njs_xml_ext_canonicalization(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, prefix_list, comments, buf); if (njs_slow_path(ret < 0)) { - njs_vm_internal_error(vm, "xmlC14NExecute() failed"); + njs_vm_error(vm, "xmlC14NExecute() failed"); ret = NJS_ERROR; goto error; } diff --git a/external/njs_zlib_module.c b/external/njs_zlib_module.c index a7c0b769..4f0e072c 100644 --- a/external/njs_zlib_module.c +++ b/external/njs_zlib_module.c @@ -310,14 +310,14 @@ njs_zlib_ext_deflate(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, rc = deflateInit2(&stream, level, Z_DEFLATED, window_bits, mem_level, strategy); if (njs_slow_path(rc != Z_OK)) { - njs_vm_internal_error(vm, "deflateInit2() failed"); + njs_vm_error(vm, "deflateInit2() failed"); return NJS_ERROR; } if (dictionary.start != NULL) { rc = deflateSetDictionary(&stream, dictionary.start, dictionary.length); if (njs_slow_path(rc != Z_OK)) { - njs_vm_internal_error(vm, "deflateSetDictionary() failed"); + njs_vm_error(vm, "deflateSetDictionary() failed"); return NJS_ERROR; } } @@ -335,8 +335,8 @@ njs_zlib_ext_deflate(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, rc = deflate(&stream, Z_FINISH); if (njs_slow_path(rc < 0)) { - njs_vm_internal_error(vm, "failed to deflate the data: %s", - stream.msg); + njs_vm_error(vm, "failed to deflate the data: %s", + stream.msg); goto fail; } @@ -451,14 +451,14 @@ njs_zlib_ext_inflate(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, rc = inflateInit2(&stream, window_bits); if (njs_slow_path(rc != Z_OK)) { - njs_vm_internal_error(vm, "inflateInit2() failed"); + njs_vm_error(vm, "inflateInit2() failed"); return NJS_ERROR; } if (dictionary.start != NULL) { rc = inflateSetDictionary(&stream, dictionary.start, dictionary.length); if (njs_slow_path(rc != Z_OK)) { - njs_vm_internal_error(vm, "deflateSetDictionary() failed"); + njs_vm_error(vm, "deflateSetDictionary() failed"); return NJS_ERROR; } } @@ -476,8 +476,8 @@ njs_zlib_ext_inflate(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, rc = inflate(&stream, Z_NO_FLUSH); if (njs_slow_path(rc < 0)) { - njs_vm_internal_error(vm, "failed to inflate the compressed " - "data: %s", stream.msg); + njs_vm_error(vm, "failed to inflate the compressed " + "data: %s", stream.msg); goto fail; } diff --git a/external/qjs_crypto_module.c b/external/qjs_crypto_module.c index d1e942ac..51534d2a 100644 --- a/external/qjs_crypto_module.c +++ b/external/qjs_crypto_module.c @@ -143,7 +143,7 @@ qjs_crypto_create_hash(JSContext *cx, JSValueConst this_val, int argc, if (EVP_DigestInit_ex(dgst->ctx, md, NULL) <= 0) { njs_evp_md_ctx_free(dgst->ctx); js_free(cx, dgst); - JS_ThrowInternalError(cx, "EVP_DigestInit_ex() failed"); + qjs_throw_error(cx, "EVP_DigestInit_ex() failed"); return JS_EXCEPTION; } @@ -227,7 +227,7 @@ qjs_hash_prototype_update(JSContext *cx, JSValueConst this_val, int argc, <= 0) { js_free(cx, content.start); - JS_ThrowInternalError(cx, "EVP_DigestUpdate() failed"); + qjs_throw_error(cx, "EVP_DigestUpdate() failed"); return JS_EXCEPTION; } @@ -235,7 +235,7 @@ qjs_hash_prototype_update(JSContext *cx, JSValueConst this_val, int argc, if (HMAC_Update(hctx->ctx, content.start, content.length) <= 0) { js_free(cx, content.start); - JS_ThrowInternalError(cx, "HMAC_Update() failed"); + qjs_throw_error(cx, "HMAC_Update() failed"); return JS_EXCEPTION; } } @@ -246,14 +246,14 @@ qjs_hash_prototype_update(JSContext *cx, JSValueConst this_val, int argc, if (!hmac) { if (EVP_DigestUpdate(dgst->ctx, str.start, str.length) <= 0) { JS_FreeCString(cx, (const char *) str.start); - JS_ThrowInternalError(cx, "EVP_DigestUpdate() failed"); + qjs_throw_error(cx, "EVP_DigestUpdate() failed"); return JS_EXCEPTION; } } else { if (HMAC_Update(hctx->ctx, str.start, str.length) <= 0) { JS_FreeCString(cx, (const char *) str.start); - JS_ThrowInternalError(cx, "HMAC_Update() failed"); + qjs_throw_error(cx, "HMAC_Update() failed"); return JS_EXCEPTION; } } @@ -268,13 +268,13 @@ qjs_hash_prototype_update(JSContext *cx, JSValueConst this_val, int argc, if (!hmac) { if (EVP_DigestUpdate(dgst->ctx, bytes.start, bytes.length) <= 0) { - JS_ThrowInternalError(cx, "EVP_DigestUpdate() failed"); + qjs_throw_error(cx, "EVP_DigestUpdate() failed"); return JS_EXCEPTION; } } else { if (HMAC_Update(hctx->ctx, bytes.start, bytes.length) <= 0) { - JS_ThrowInternalError(cx, "HMAC_Update() failed"); + qjs_throw_error(cx, "HMAC_Update() failed"); return JS_EXCEPTION; } } @@ -310,7 +310,7 @@ qjs_hash_prototype_digest(JSContext *cx, JSValueConst this_val, int argc, } if (EVP_DigestFinal_ex(dgst->ctx, digest, &len) <= 0) { - JS_ThrowInternalError(cx, "EVP_DigestFinal_ex() failed"); + qjs_throw_error(cx, "EVP_DigestFinal_ex() failed"); return JS_EXCEPTION; } @@ -328,7 +328,7 @@ qjs_hash_prototype_digest(JSContext *cx, JSValueConst this_val, int argc, } if (HMAC_Final(hctx->ctx, digest, &len) <= 0) { - JS_ThrowInternalError(cx, "HMAC_Final() failed"); + qjs_throw_error(cx, "HMAC_Final() failed"); return JS_EXCEPTION; } @@ -382,7 +382,7 @@ qjs_hash_prototype_copy(JSContext *cx, JSValueConst this_val, int argc, if (EVP_MD_CTX_copy_ex(copy->ctx, dgst->ctx) <= 0) { njs_evp_md_ctx_free(copy->ctx); js_free(cx, copy); - JS_ThrowInternalError(cx, "EVP_MD_CTX_copy_ex() failed"); + qjs_throw_error(cx, "EVP_MD_CTX_copy_ex() failed"); return JS_EXCEPTION; } @@ -461,7 +461,7 @@ qjs_crypto_create_hmac(JSContext *cx, JSValueConst this_val, int argc, JS_FreeCString(cx, (const char *) key.start); } - JS_ThrowInternalError(cx, "HMAC_Init_ex() failed"); + qjs_throw_error(cx, "HMAC_Init_ex() failed"); return JS_EXCEPTION; } diff --git a/external/qjs_fs_module.c b/external/qjs_fs_module.c index 05271924..cad376cd 100644 --- a/external/qjs_fs_module.c +++ b/external/qjs_fs_module.c @@ -507,7 +507,7 @@ qjs_fs_make_path(JSContext *cx, char *path, mode_t md, int recursive) } if ((p - path) > NJS_MAX_PATH) { - JS_ThrowInternalError(cx, "too large path"); + qjs_throw_error(cx, "too large path"); return JS_EXCEPTION; } @@ -2646,8 +2646,8 @@ qjs_fs_dirent_test(JSContext *cx, JSValueConst this_val, int argc, JS_FreeValue(cx, type); if (value == QJS_DT_INVALID) { - JS_ThrowInternalError(cx, "dentry type is not supported on this " - "platform"); + qjs_throw_error(cx, "dentry type is not supported on this " + "platform"); return JS_EXCEPTION; } diff --git a/external/qjs_webcrypto_module.c b/external/qjs_webcrypto_module.c index 8adcf407..e1626cb0 100644 --- a/external/qjs_webcrypto_module.c +++ b/external/qjs_webcrypto_module.c @@ -1447,7 +1447,7 @@ qjs_export_base64url_bignum(JSContext *cx, const BIGNUM *v, size_t size) } if (njs_bn_bn2binpad(v, &buf[0], size) <= 0) { - JS_ThrowInternalError(cx, "njs_bn_bn2binpad() failed"); + qjs_throw_error(cx, "njs_bn_bn2binpad() failed"); return JS_EXCEPTION; } diff --git a/external/qjs_xml_module.c b/external/qjs_xml_module.c index bbd24760..d5621924 100644 --- a/external/qjs_xml_module.c +++ b/external/qjs_xml_module.c @@ -240,7 +240,7 @@ qjs_xml_parse(JSContext *cx, JSValueConst this_val, int argc, ctx = xmlNewParserCtxt(); if (ctx == NULL) { qjs_bytes_free(cx, &data); - JS_ThrowInternalError(cx, "xmlNewParserCtxt() failed"); + qjs_throw_error(cx, "xmlNewParserCtxt() failed"); qjs_xml_doc_free(JS_GetRuntime(cx), tree); return JS_EXCEPTION; } @@ -371,7 +371,7 @@ qjs_xml_canonicalization(JSContext *cx, JSValueConst this_val, int argc, buf = xmlOutputBufferCreateIO(qjs_xml_buf_write_cb, NULL, &chain, NULL); if (buf == NULL) { - JS_ThrowInternalError(cx, "xmlOutputBufferCreateIO() failed"); + qjs_throw_error(cx, "xmlOutputBufferCreateIO() failed"); goto fail; } @@ -382,7 +382,7 @@ qjs_xml_canonicalization(JSContext *cx, JSValueConst this_val, int argc, if (size < 0) { njs_chb_destroy(&chain); (void) xmlOutputBufferClose(buf); - JS_ThrowInternalError(cx, "xmlC14NExecute() failed"); + qjs_throw_error(cx, "xmlC14NExecute() failed"); goto fail; } @@ -723,7 +723,7 @@ qjs_xml_attr_value(JSContext *cx, xmlAttr *attr) text = xmlNodeGetContent((xmlNode *) attr); if (text == NULL) { - JS_ThrowInternalError(cx, "xmlNodeGetContent() failed"); + qjs_throw_error(cx, "xmlNodeGetContent() failed"); return JS_EXCEPTION; } @@ -780,7 +780,7 @@ qjs_xml_node_attr_modify(JSContext *cx, JSValue current, const u_char *name, attr = xmlSetProp(node->node, name, value); JS_FreeCString(cx, (char *) value); if (attr == NULL) { - JS_ThrowInternalError(cx, "xmlSetProp() failed"); + qjs_throw_error(cx, "xmlSetProp() failed"); return -1; } @@ -912,7 +912,7 @@ qjs_xml_node_tags_modify(JSContext *cx, JSValue obj, njs_str_t *name, node = xmlDocCopyNode(node, current->doc->doc, 1); JS_FreeValue(cx, v); if (node == NULL) { - JS_ThrowInternalError(cx, "xmlDocCopyNode() failed"); + qjs_throw_error(cx, "xmlDocCopyNode() failed"); goto error; } @@ -1001,7 +1001,7 @@ qjs_xml_node_text_handler(JSContext *cx, JSValue current, JSValue setval) text = xmlNewDocTextLen(node->doc->doc, content.start, content.length); JS_FreeCString(cx, (char *) content.start); if (text == NULL) { - JS_ThrowInternalError(cx, "xmlNewDocTextLen() failed"); + qjs_throw_error(cx, "xmlNewDocTextLen() failed"); return -1; } } @@ -1535,7 +1535,7 @@ qjs_xml_node_get_attribute_ns(JSContext *cx, JSValueConst this_val, text = xmlNodeGetContent((xmlNode *) attr); if (text == NULL) { - value = JS_ThrowInternalError(cx, "xmlNodeGetContent() failed"); + value = qjs_throw_error(cx, "xmlNodeGetContent() failed"); break; } @@ -1611,7 +1611,7 @@ qjs_xml_node_add_child(JSContext *cx, JSValueConst this_val, node = xmlDocCopyNode(node, current->doc->doc, 1); if (node == NULL) { - JS_ThrowInternalError(cx, "xmlDocCopyNode() failed"); + qjs_throw_error(cx, "xmlDocCopyNode() failed"); return JS_EXCEPTION; } diff --git a/external/qjs_zlib_module.c b/external/qjs_zlib_module.c index adbe3dc7..8af08c89 100644 --- a/external/qjs_zlib_module.c +++ b/external/qjs_zlib_module.c @@ -246,14 +246,14 @@ qjs_zlib_ext_deflate(JSContext *ctx, JSValueConst this_val, int argc, rc = deflateInit2(&stream, level, Z_DEFLATED, window_bits, mem_level, strategy); if (njs_slow_path(rc != Z_OK)) { - JS_ThrowInternalError(ctx, "deflateInit2() failed"); + qjs_throw_error(ctx, "deflateInit2() failed"); goto fail; } if (dictionary_copy != NULL) { rc = deflateSetDictionary(&stream, dictionary_copy, dictionary_length); if (rc != Z_OK) { - JS_ThrowInternalError(ctx, "deflateSetDictionary() failed"); + qjs_throw_error(ctx, "deflateSetDictionary() failed"); goto fail; } } @@ -269,8 +269,8 @@ qjs_zlib_ext_deflate(JSContext *ctx, JSValueConst this_val, int argc, rc = deflate(&stream, Z_FINISH); if (njs_slow_path(rc < 0)) { - JS_ThrowInternalError(ctx, "failed to deflate the data: %s", - stream.msg); + qjs_throw_error(ctx, "failed to deflate the data: %s", + stream.msg); goto fail; } @@ -422,14 +422,14 @@ qjs_zlib_ext_inflate(JSContext *ctx, JSValueConst this_val, int argc, rc = inflateInit2(&stream, window_bits); if (njs_slow_path(rc != Z_OK)) { - JS_ThrowInternalError(ctx, "inflateInit2() failed"); + qjs_throw_error(ctx, "inflateInit2() failed"); goto fail; } if (dictionary_copy != NULL) { rc = inflateSetDictionary(&stream, dictionary_copy, dictionary_length); if (rc != Z_OK) { - JS_ThrowInternalError(ctx, "inflateSetDictionary() failed"); + qjs_throw_error(ctx, "inflateSetDictionary() failed"); goto fail; } } @@ -445,8 +445,8 @@ qjs_zlib_ext_inflate(JSContext *ctx, JSValueConst this_val, int argc, rc = inflate(&stream, Z_NO_FLUSH); if (njs_slow_path(rc < 0)) { - JS_ThrowInternalError(ctx, "failed to inflate the data: %s", - stream.msg); + qjs_throw_error(ctx, "failed to inflate the data: %s", + stream.msg); goto fail; } @@ -460,7 +460,7 @@ qjs_zlib_ext_inflate(JSContext *ctx, JSValueConst this_val, int argc, rc = inflateEnd(&stream); if (njs_slow_path(rc != Z_OK)) { - JS_ThrowInternalError(ctx, "inflateEnd() failed"); + qjs_throw_error(ctx, "inflateEnd() failed"); goto fail; } diff --git a/nginx/ngx_http_js_module.c b/nginx/ngx_http_js_module.c index 2b7109ed..7e96ad5b 100644 --- a/nginx/ngx_http_js_module.c +++ b/nginx/ngx_http_js_module.c @@ -3021,14 +3021,14 @@ ngx_http_js_ext_send_header(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } if (ngx_http_set_content_type(r) != NGX_OK) { - njs_vm_internal_error(vm, "failed to set content type"); + njs_vm_error(vm, "failed to set content type"); return NJS_ERROR; } r->disable_not_modified = 1; if (ngx_http_send_header(r) == NGX_ERROR) { - njs_vm_internal_error(vm, "failed to send header"); + njs_vm_error(vm, "failed to send header"); return NJS_ERROR; } @@ -3102,7 +3102,7 @@ ngx_http_js_ext_send(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, *ll = NULL; if (ngx_http_output_filter(r, out) == NGX_ERROR) { - njs_vm_internal_error(vm, "failed to send response"); + njs_vm_error(vm, "failed to send response"); return NJS_ERROR; } @@ -3272,7 +3272,7 @@ ngx_http_js_ext_finish(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } if (ngx_http_send_special(r, NGX_HTTP_LAST) == NGX_ERROR) { - njs_vm_internal_error(vm, "failed to send response"); + njs_vm_error(vm, "failed to send response"); return NJS_ERROR; } @@ -3340,7 +3340,7 @@ ngx_http_js_ext_return(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, ctx->status = ngx_http_send_response(r, status, NULL, &cv); if (ctx->status == NGX_ERROR) { - njs_vm_internal_error(vm, "failed to send response"); + njs_vm_error(vm, "failed to send response"); return NJS_ERROR; } @@ -3585,7 +3585,7 @@ ngx_http_js_ext_get_request_body(njs_vm_t *vm, njs_object_prop_t *prop, } if (ngx_http_js_collect_body(r, ctx) != NGX_OK) { - njs_vm_internal_error(vm, "failed to read request body"); + njs_vm_error(vm, "failed to read request body"); return NJS_ERROR; } @@ -4006,7 +4006,7 @@ ngx_http_js_ext_read_request_body(njs_vm_t *vm, njs_value_t *args, resolve: if (ngx_http_js_collect_body(r, ctx) != NGX_OK) { - njs_vm_internal_error(vm, "failed to read request body"); + njs_vm_error(vm, "failed to read request body"); return NJS_ERROR; } @@ -4125,7 +4125,7 @@ ngx_http_js_ext_read_request_form(njs_vm_t *vm, njs_value_t *args, resolve: if (ngx_http_js_collect_body(r, ctx) != NGX_OK) { - njs_vm_internal_error(vm, "failed to read request body"); + njs_vm_error(vm, "failed to read request body"); return NJS_ERROR; } @@ -4995,7 +4995,7 @@ ngx_http_js_ext_subrequest(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, if (ngx_http_subrequest(r, &uri, rargs.len ? &rargs : NULL, &sr, ps, flags) != NGX_OK) { - njs_vm_internal_error(vm, "subrequest creation failed"); + njs_vm_error(vm, "subrequest creation failed"); return NJS_ERROR; } @@ -6403,7 +6403,7 @@ ngx_http_qjs_ext_finish(JSContext *cx, JSValueConst this_val, } if (ngx_http_send_special(r, NGX_HTTP_LAST) == NGX_ERROR) { - return JS_ThrowInternalError(cx, "failed to send response"); + return qjs_throw_error(cx, "failed to send response"); } ctx = ngx_http_get_module_ctx(r, ngx_http_js_module); @@ -6696,7 +6696,7 @@ ngx_http_qjs_ext_request_body(JSContext *cx, JSValueConst this_val, int type) ctx = ngx_http_get_module_ctx(r, ngx_http_js_module); if (ngx_http_js_collect_body(r, ctx) != NGX_OK) { - return JS_ThrowInternalError(cx, "failed to read request body"); + return qjs_throw_error(cx, "failed to read request body"); } body = ngx_qjs_prop(cx, buffer_type, ctx->body_read_data, @@ -6856,7 +6856,7 @@ ngx_http_qjs_ext_read_request_body(JSContext *cx, JSValueConst this_val, resolve: if (ngx_http_js_collect_body(r, ctx) != NGX_OK) { - return JS_ThrowInternalError(cx, "failed to read request body"); + return qjs_throw_error(cx, "failed to read request body"); } return ngx_http_qjs_body_to_value(cx, ctx, (ngx_uint_t) magic); @@ -7017,7 +7017,7 @@ ngx_http_qjs_ext_read_request_form(JSContext *cx, JSValueConst this_val, resolve: if (ngx_http_js_collect_body(r, ctx) != NGX_OK) { - return JS_ThrowInternalError(cx, "failed to read request body"); + return qjs_throw_error(cx, "failed to read request body"); } return ngx_http_qjs_form_to_value(cx, r, ctx, max_keys, this_val); @@ -7312,7 +7312,7 @@ ngx_http_qjs_ext_return(JSContext *cx, JSValueConst this_val, ctx->status = ngx_http_send_response(r, status, NULL, &cv); if (ctx->status == NGX_ERROR) { - return JS_ThrowInternalError(cx, "failed to send response"); + return qjs_throw_error(cx, "failed to send response"); } } else { @@ -7456,7 +7456,7 @@ ngx_http_qjs_ext_send(JSContext *cx, JSValueConst this_val, *ll = NULL; if (ngx_http_output_filter(r, out) == NGX_ERROR) { - return JS_ThrowInternalError(cx, "failed to send response"); + return qjs_throw_error(cx, "failed to send response"); } return JS_UNDEFINED; @@ -7626,13 +7626,13 @@ ngx_http_qjs_ext_send_header(JSContext *cx, JSValueConst this_val, } if (ngx_http_set_content_type(r) != NGX_OK) { - return JS_ThrowInternalError(cx, "failed to set content type"); + return qjs_throw_error(cx, "failed to set content type"); } r->disable_not_modified = 1; if (ngx_http_send_header(r) == NGX_ERROR) { - return JS_ThrowInternalError(cx, "failed to send header"); + return qjs_throw_error(cx, "failed to send header"); } return JS_UNDEFINED; @@ -7997,7 +7997,7 @@ ngx_http_qjs_ext_subrequest(JSContext *cx, JSValueConst this_val, } JS_FreeValue(cx, retval); - return JS_ThrowInternalError(cx, "subrequest creation failed"); + return qjs_throw_error(cx, "subrequest creation failed"); } if (event != NULL) { diff --git a/nginx/ngx_js.c b/nginx/ngx_js.c index d3ffd4bc..21bada94 100644 --- a/nginx/ngx_js.c +++ b/nginx/ngx_js.c @@ -1509,7 +1509,7 @@ ngx_qjs_value(JSContext *cx, const ngx_str_t *path) key = JS_NewAtomLen(cx, (char *) start, size); if (key == JS_ATOM_NULL) { JS_FreeValue(cx, value); - return JS_ThrowInternalError(cx, "could not create atom"); + return qjs_throw_error(cx, "could not create atom"); } rv = JS_GetProperty(cx, value, key); @@ -2507,8 +2507,8 @@ ngx_qjs_module_loader(JSContext *cx, const char *module_name, void *opaque) (void) close(info.fd); if (ret != NJS_OK) { - JS_ThrowInternalError(cx, "while reading \"%.*s\" module", - (int) info.file.length, info.file.start); + qjs_throw_error(cx, "while reading \"%.*s\" module", + (int) info.file.length, info.file.start); return NULL; } @@ -2542,7 +2542,7 @@ ngx_qjs_module_loader(JSContext *cx, const char *module_name, void *opaque) JS_WRITE_OBJ_BYTECODE); if (pc->code == NULL) { JS_FreeValue(cx, func_val); - JS_ThrowInternalError(cx, "could not write module bytecode"); + qjs_throw_error(cx, "could not write module bytecode"); return NULL; } @@ -4622,7 +4622,7 @@ ngx_js_module_loader(njs_vm_t *vm, njs_external_ptr_t external, njs_str_t *name) (void) close(info.fd); if (ret != NJS_OK) { - njs_vm_internal_error(vm, "while reading \"%V\" module", &info.file); + njs_vm_error(vm, "while reading \"%V\" module", &info.file); return NULL; } @@ -4630,8 +4630,8 @@ ngx_js_module_loader(njs_vm_t *vm, njs_external_ptr_t external, njs_str_t *name) ret = ngx_js_set_cwd(njs_vm_memory_pool(vm), conf, &info.file); if (ret != NJS_OK) { - njs_vm_internal_error(vm, "while setting cwd for \"%V\" module", - &info.file); + njs_vm_error(vm, "while setting cwd for \"%V\" module", + &info.file); return NULL; } diff --git a/nginx/ngx_js_fetch.c b/nginx/ngx_js_fetch.c index ad786d4a..17083f5e 100644 --- a/nginx/ngx_js_fetch.c +++ b/nginx/ngx_js_fetch.c @@ -623,7 +623,7 @@ ngx_js_ext_fetch(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, &http->proxy.url, &http->proxy.auth) != NGX_OK) { - njs_vm_internal_error(vm, "failed to evaluate proxy URL"); + njs_vm_error(vm, "failed to evaluate proxy URL"); goto fail; } @@ -664,7 +664,7 @@ ngx_js_ext_fetch(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } if (ctx == NGX_NO_RESOLVER) { - njs_vm_internal_error(vm, "no resolver defined"); + njs_vm_error(vm, "no resolver defined"); goto fail; } @@ -1163,7 +1163,7 @@ ngx_js_fetch_alloc(njs_vm_t *vm, ngx_pool_t *pool, ngx_log_t *log, failed: - njs_vm_internal_error(vm, "internal error"); + njs_vm_error(vm, "internal error"); return NULL; } @@ -1240,7 +1240,7 @@ ngx_js_fetch_promissified_result(njs_vm_t *vm, njs_value_t *result, error: - njs_vm_internal_error(vm, "internal error"); + njs_vm_error(vm, "internal error"); return NJS_ERROR; } diff --git a/nginx/ngx_js_shared_dict.c b/nginx/ngx_js_shared_dict.c index 355f4e51..ddb8617a 100644 --- a/nginx/ngx_js_shared_dict.c +++ b/nginx/ngx_js_shared_dict.c @@ -551,7 +551,7 @@ njs_js_ext_global_shared_prop(njs_vm_t *vm, njs_object_prop_t *prop, ngx_js_shared_dict_proto_id, shm_zone, 0); if (ret != NJS_OK) { - njs_vm_internal_error(vm, "sharedDict creation failed"); + njs_vm_error(vm, "sharedDict creation failed"); return NJS_ERROR; } diff --git a/nginx/ngx_qjs_fetch.c b/nginx/ngx_qjs_fetch.c index 84fee7f2..ebc46ad9 100644 --- a/nginx/ngx_qjs_fetch.c +++ b/nginx/ngx_qjs_fetch.c @@ -403,7 +403,7 @@ ngx_qjs_ext_fetch(JSContext *cx, JSValueConst this_val, int argc, &http->proxy.url, &http->proxy.auth) != NGX_OK) { - JS_ThrowInternalError(cx, "failed to evaluate proxy URL"); + qjs_throw_error(cx, "failed to evaluate proxy URL"); goto fail; } @@ -444,7 +444,7 @@ ngx_qjs_ext_fetch(JSContext *cx, JSValueConst this_val, int argc, } if (rs == NGX_NO_RESOLVER) { - JS_ThrowInternalError(cx, "no resolver defined"); + qjs_throw_error(cx, "no resolver defined"); goto fail; } @@ -1661,7 +1661,7 @@ fail: JS_FreeValue(cx, fetch->promise_callbacks[0]); JS_FreeValue(cx, fetch->promise_callbacks[1]); - JS_ThrowInternalError(cx, "internal error"); + qjs_throw_error(cx, "internal error"); return NULL; } diff --git a/nginx/ngx_stream_js_module.c b/nginx/ngx_stream_js_module.c index 9c97bfc5..ae91e039 100644 --- a/nginx/ngx_stream_js_module.c +++ b/nginx/ngx_stream_js_module.c @@ -1747,7 +1747,7 @@ ngx_stream_js_ext_send(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } else { if (ngx_stream_js_next_filter(s, ctx, cl, from_upstream) == NGX_ERROR) { - njs_vm_internal_error(vm, "ngx_stream_js_next_filter() failed"); + njs_vm_error(vm, "ngx_stream_js_next_filter() failed"); return NJS_ERROR; } } @@ -2569,8 +2569,8 @@ string: JS_FreeCString(cx, str); } - return JS_ThrowInternalError(cx, "ngx_stream_js_next_filter() " - "failed"); + return qjs_throw_error(cx, "ngx_stream_js_next_filter() " + "failed"); } } diff --git a/src/qjs.c b/src/qjs.c index 3f64aedd..f2ac6dde 100644 --- a/src/qjs.c +++ b/src/qjs.c @@ -1398,6 +1398,45 @@ qjs_array_buffer_adopt(JSContext *cx, uint8_t *src, size_t len) } +/* + * Library and host failures are reported as Error, since QuickJS-NG makes + * InternalError uncatchable by JavaScript code. + */ + +JSValue +qjs_throw_error(JSContext *cx, const char *fmt, ...) +{ + char buf[256]; + JSValue error, message; + va_list args; + + va_start(args, fmt); + vsnprintf(buf, sizeof(buf), fmt, args); + va_end(args); + + error = qjs_new_error(cx); + if (JS_IsException(error)) { + return JS_EXCEPTION; + } + + message = JS_NewString(cx, buf); + if (JS_IsException(message)) { + JS_FreeValue(cx, error); + return JS_EXCEPTION; + } + + if (JS_DefinePropertyValueStr(cx, error, "message", message, + JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE) + < 0) + { + JS_FreeValue(cx, error); + return JS_EXCEPTION; + } + + return JS_Throw(cx, error); +} + + JSValue qjs_string_create_chb(JSContext *cx, njs_chb_t *chain) { @@ -1412,7 +1451,7 @@ qjs_string_create_chb(JSContext *cx, njs_chb_t *chain) val = JS_ThrowRangeError(cx, "invalid string length"); } else { - val = JS_ThrowInternalError(cx, "failed to create string"); + val = qjs_throw_error(cx, "failed to create string"); } njs_chb_destroy(chain); diff --git a/src/qjs.h b/src/qjs.h index 4336455b..8c1e33d0 100644 --- a/src/qjs.h +++ b/src/qjs.h @@ -71,6 +71,7 @@ void qjs_chb_rt_free(void *rt, void *p); JSValue qjs_new_uint8_array(JSContext *ctx, int argc, JSValueConst *argv); JSValue qjs_array_buffer_adopt(JSContext *cx, uint8_t *src, size_t len); +JSValue qjs_throw_error(JSContext *cx, const char *fmt, ...); JSValue qjs_buffer_alloc(JSContext *ctx, uint64_t size); JSValue qjs_buffer_copy(JSContext *ctx, u_char *start, size_t size); JSValue qjs_buffer_chb_copy(JSContext *ctx, njs_chb_t *chain); diff --git a/test/fs/readdir.t.mjs b/test/fs/readdir.t.mjs index 02b12a3a..b9a58800 100644 --- a/test/fs/readdir.t.mjs +++ b/test/fs/readdir.t.mjs @@ -26,7 +26,7 @@ var match = (entry) => { return false; } } catch (e) { - if (e instanceof InternalError) { + if (e.message.startsWith('dentry type is not supported')) { return true; } diff --git a/test/zlib.t.mjs b/test/zlib.t.mjs index 69352ec1..7b9c6a28 100644 --- a/test/zlib.t.mjs +++ b/test/zlib.t.mjs @@ -100,7 +100,7 @@ let inflateSync_tsuite = { exception: 'RangeError: windowBits must be in the range -15..-8' }, { value: zlib.deflateRawSync('WAKA', {dictionary: Buffer.from('WAKA')}), - exception: 'InternalError: failed to inflate the compressed data: invalid distance too far back' }, + exception: 'Error: failed to inflate the compressed data: invalid distance too far back' }, { value: zlib.deflateSync('WAKA WAKA WAKA', {dictionary: Buffer.from('WAKA')}), raw: false,