fixup! module: improve getPackageType performance

make sure to early-return if invalid url errors are thrown

Author: dario-piotrowicz

src/node_modules.cc

@@ -405,20 +405,24 @@ void BindingData::GetNearestParentPackageJSONType(
 }
 
 const BindingData::PackageConfig* BindingData::FindPackageScopeConfig(
-    Realm* realm, const FunctionCallbackInfo<Value>& args) {
+    Realm* realm,
+    const FunctionCallbackInfo<Value>& args,
+    bool& invalid_url_out) {
   CHECK_GE(args.Length(), 1);
   CHECK(args[0]->IsString());
   Utf8Value resolved(realm->isolate(), args[0]);
   auto package_json_url_base = ada::parse(resolved.ToStringView());
   if (!package_json_url_base) {
     url::ThrowInvalidURL(realm->env(), resolved.ToStringView(), std::nullopt);
+    invalid_url_out = true;
     return nullptr;
   }
 
   auto package_json_url =
       ada::parse("./package.json", &package_json_url_base.value());
   if (!package_json_url) {
     url::ThrowInvalidURL(realm->env(), "./package.json", resolved.ToString());
+    invalid_url_out = true;
     return nullptr;
   }
 
@@ -436,6 +440,7 @@ const BindingData::PackageConfig* BindingData::FindPackageScopeConfig(
     auto file_url = url::FileURLToPath(realm->env(), *package_json_url);
     if (!file_url) {
       url::ThrowInvalidURL(realm->env(), resolved.ToStringView(), std::nullopt);
+      invalid_url_out = true;
       return nullptr;
     }
     error_context.specifier = resolved.ToString();
@@ -449,6 +454,7 @@ const BindingData::PackageConfig* BindingData::FindPackageScopeConfig(
     package_json_url = ada::parse("../package.json", &package_json_url.value());
     if (!package_json_url) {
       url::ThrowInvalidURL(realm->env(), "../package.json", last_href);
+      invalid_url_out = true;
       return nullptr;
     }
 
@@ -466,7 +472,12 @@ void BindingData::GetPackageScopeConfig(
     const FunctionCallbackInfo<Value>& args) {
   Realm* realm = Realm::GetCurrent(args);
 
-  auto package_json = FindPackageScopeConfig(realm, args);
+  bool invalid_url = false;
+  auto package_json = FindPackageScopeConfig(realm, args, invalid_url);
+  if (invalid_url) {
+    return;
+  }
+
   if (package_json != nullptr) {
     return args.GetReturnValue().Set(package_json->Serialize(realm));
   }
@@ -489,7 +500,11 @@ void BindingData::GetPackageScopeConfig(
 void BindingData::GetPackageType(const FunctionCallbackInfo<Value>& args) {
   Realm* realm = Realm::GetCurrent(args);
 
-  auto package_scope = FindPackageScopeConfig(realm, args);
+  bool invalid_url = false;
+  auto package_scope = FindPackageScopeConfig(realm, args, invalid_url);
+  if (invalid_url) {
+    return;
+  }
 
   std::string resultType = "none";
 

src/node_modules.h

@@ -60,7 +60,9 @@ class BindingData : public SnapshotableObject {
   static void GetNearestParentPackageJSONType(
       const v8::FunctionCallbackInfo<v8::Value>& args);
   static const BindingData::PackageConfig* FindPackageScopeConfig(
-      Realm* realm, const v8::FunctionCallbackInfo<v8::Value>& args);
+      Realm* realm,
+      const v8::FunctionCallbackInfo<v8::Value>& args,
+      bool& invalid_url_out);
   static void GetPackageScopeConfig(
       const v8::FunctionCallbackInfo<v8::Value>& args);
   static void GetPackageType(const v8::FunctionCallbackInfo<v8::Value>& args);