Skip to content

[node.js] fix handling null value for externalData #24428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 15, 2025
+33 −31
Merged

[node.js] fix handling null value for externalData #24428

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 33 additions & 31 deletions js/node/src/session_options_helper.cc
View file
Original file line number Diff line number Diff line change
@@ -321,44 +321,46 @@ void ParseSessionOptions(const Napi::Object options, Ort::SessionOptions& sessio
// external data
if (options.Has("externalData")) {
auto externalDataValue = options.Get("externalData");
ORT_NAPI_THROW_TYPEERROR_IF(!externalDataValue.IsArray(), options.Env(),
"Invalid argument: sessionOptions.externalData must be an array.");
auto externalData = externalDataValue.As<Napi::Array>();
std::vector<std::basic_string<ORTCHAR_T>> paths;
std::vector<char*> buffs;
std::vector<size_t> sizes;
if (!externalDataValue.IsNull() && !externalDataValue.IsUndefined()) {
ORT_NAPI_THROW_TYPEERROR_IF(!externalDataValue.IsArray(), options.Env(),
"Invalid argument: sessionOptions.externalData must be an array.");
auto externalData = externalDataValue.As<Napi::Array>();
std::vector<std::basic_string<ORTCHAR_T>> paths;
std::vector<char*> buffs;
std::vector<size_t> sizes;

for (const auto& kvp : externalData) {
Napi::Value value = kvp.second;
ORT_NAPI_THROW_TYPEERROR_IF(!value.IsObject(), options.Env(),
"Invalid argument: sessionOptions.externalData value must be an object in Node.js binding.");
Napi::Object obj = value.As<Napi::Object>();
ORT_NAPI_THROW_TYPEERROR_IF(!obj.Has("path") || !obj.Get("path").IsString(), options.Env(),
"Invalid argument: sessionOptions.externalData value must have a 'path' property of type string in Node.js binding.");
for (const auto& kvp : externalData) {
Napi::Value value = kvp.second;
ORT_NAPI_THROW_TYPEERROR_IF(!value.IsObject(), options.Env(),
"Invalid argument: sessionOptions.externalData value must be an object in Node.js binding.");
Napi::Object obj = value.As<Napi::Object>();
ORT_NAPI_THROW_TYPEERROR_IF(!obj.Has("path") || !obj.Get("path").IsString(), options.Env(),
"Invalid argument: sessionOptions.externalData value must have a 'path' property of type string in Node.js binding.");
#ifdef _WIN32
auto path = obj.Get("path").As<Napi::String>().Utf16Value();
paths.push_back(std::wstring{path.begin(), path.end()});
auto path = obj.Get("path").As<Napi::String>().Utf16Value();
paths.push_back(std::wstring{path.begin(), path.end()});
#else
auto path = obj.Get("path").As<Napi::String>().Utf8Value();
paths.push_back(path);
auto path = obj.Get("path").As<Napi::String>().Utf8Value();
paths.push_back(path);
#endif
ORT_NAPI_THROW_TYPEERROR_IF(!obj.Has("data") ||
!obj.Get("data").IsBuffer() ||
!(obj.Get("data").IsTypedArray() && obj.Get("data").As<Napi::TypedArray>().TypedArrayType() == napi_uint8_array),
options.Env(),
"Invalid argument: sessionOptions.externalData value must have an 'data' property of type buffer or typed array in Node.js binding.");
ORT_NAPI_THROW_TYPEERROR_IF(!obj.Has("data") ||
!obj.Get("data").IsBuffer() ||
!(obj.Get("data").IsTypedArray() && obj.Get("data").As<Napi::TypedArray>().TypedArrayType() == napi_uint8_array),
options.Env(),
"Invalid argument: sessionOptions.externalData value must have an 'data' property of type buffer or typed array in Node.js binding.");

auto data = obj.Get("data");
if (data.IsBuffer()) {
buffs.push_back(data.As<Napi::Buffer<char>>().Data());
sizes.push_back(data.As<Napi::Buffer<char>>().Length());
} else {
auto typedArray = data.As<Napi::TypedArray>();
buffs.push_back(reinterpret_cast<char*>(typedArray.ArrayBuffer().Data()) + typedArray.ByteOffset());
sizes.push_back(typedArray.ByteLength());
auto data = obj.Get("data");
if (data.IsBuffer()) {
buffs.push_back(data.As<Napi::Buffer<char>>().Data());
sizes.push_back(data.As<Napi::Buffer<char>>().Length());
} else {
auto typedArray = data.As<Napi::TypedArray>();
buffs.push_back(reinterpret_cast<char*>(typedArray.ArrayBuffer().Data()) + typedArray.ByteOffset());
sizes.push_back(typedArray.ByteLength());
}
}
sessionOptions.AddExternalInitializersFromFilesInMemory(paths, buffs, sizes);
}
sessionOptions.AddExternalInitializersFromFilesInMemory(paths, buffs, sizes);
}
}