mirror of
https://github.com/facebook/react-native.git
synced 2026-11-18 20:19:07 +00:00
Harden on-demand JS segment load path against missing cache file (#57855)
Summary: Pull Request resolved: https://github.com/react/react-native/pull/57855 Harden the on-demand (lazily code-split) JS segment load path against a missing cache file. When RN lazily loads an on-demand JS segment, the file lives in an OS-purgeable / LRU-evictable on-demand cache and can already be gone by the time the segment is registered. On a missing file `JSBigFileString::fromPath` throws `std::runtime_error("... Could not open file: ...")`, and `ReactInstance::registerSegment` had no failure handling, so the throw surfaced as an unhandled JS exception and crashed the app. Fix (V4, addresses pieterdb's latest review feedback): - `JSBigFileString::fromPath`'s throwing contract is now documented in the header: it throws `std::runtime_error` when the file cannot be opened or read, and callers loading files that may legitimately be gone (an OS-purgeable / LRU-evictable cache) must catch and degrade gracefully. No behavior change to `fromPath` and no new factory. - `ReactInstance::registerSegment` builds the segment buffer on the calling thread (outside the `scheduleWork` callback) inside a try/catch. On the thrown exception it logs an ERROR and returns early, so a missing segment never schedules evaluation and the throw no longer escapes. The buffer is carried into the callback as a `std::shared_ptr<const JSBigFileString>` (`RuntimeScheduler` callbacks are copyable `std::function`s; `evaluateJavaScript` takes `const shared_ptr<const Buffer>&`). This keeps file I/O off the JS thread. - Dropped the inline `access(R_OK)` pre-check: the `open()` failure inside `fromPath` is the single source of truth, removing the redundant check and its TOCTOU window. Changelog: [iOS][Fixed] - Avoid an unhandled exception in bridgeless `ReactInstance::registerSegment` when an on-demand JS segment file is missing from the cache at lazy-load time Reviewed By: zeyap, javache Differential Revision: D114761643 fbshipit-source-id: 8c8e0bd8ae5886953a77d1596181d83d8967df67
This commit is contained in:
1 parent
44e590f5e3
commit
fff4994af8
2 files changed
+38
-20
No files matched your search
@@ -140,6 +140,11 @@ class RN_EXPORT JSBigFileString : public JSBigString {
|
||||
size_t size() const override;
|
||||
int fd() const;
|
||||
|
||||
// Throws std::runtime_error when the file at sourceURL cannot be opened or
|
||||
// read (e.g. it is missing). Callers that load files which may legitimately
|
||||
// be gone at load time (such as an OS-purgeable / LRU-evictable cache) must
|
||||
// catch this and degrade gracefully rather than let it surface as an
|
||||
// unhandled exception.
|
||||
static std::unique_ptr<const JSBigFileString> fromPath(const std::string &sourceURL);
|
||||
|
||||
private:
|
||||
|
||||
@@ -378,26 +378,39 @@ void ReactInstance::registerSegment(
|
||||
const std::string& segmentPath) {
|
||||
LOG(WARNING) << "Starting to run ReactInstance::registerSegment with segment "
|
||||
<< segmentId;
|
||||
runtimeScheduler_->scheduleWork([=](jsi::Runtime& runtime) {
|
||||
TraceSection s("ReactInstance::registerSegment");
|
||||
auto tag = std::to_string(segmentId);
|
||||
auto script = JSBigFileString::fromPath(segmentPath);
|
||||
if (script->size() == 0) {
|
||||
throw std::invalid_argument(
|
||||
"Empty segment registered with ID " + tag + " from " + segmentPath);
|
||||
}
|
||||
|
||||
ReactMarker::logTaggedMarker(
|
||||
ReactMarker::REGISTER_JS_SEGMENT_START, tag.c_str());
|
||||
LOG(WARNING) << "Starting to evaluate segment " << segmentId
|
||||
<< " in ReactInstance::registerSegment";
|
||||
runtime.evaluateJavaScript(
|
||||
std::move(script), getSyntheticBundlePath(segmentId));
|
||||
LOG(WARNING) << "Finished evaluating segment " << segmentId
|
||||
<< " in ReactInstance::registerSegment";
|
||||
ReactMarker::logTaggedMarker(
|
||||
ReactMarker::REGISTER_JS_SEGMENT_STOP, tag.c_str());
|
||||
});
|
||||
// Build the segment buffer off the JS thread: there's no need to block the
|
||||
// JS thread on file I/O. The segment lives in an OS-purgeable /
|
||||
// LRU-evictable on-demand cache and can already be gone by the time we get
|
||||
// here, in which case fromPath throws. Catch it and return early so a
|
||||
// missing segment degrades gracefully instead of surfacing as an unhandled
|
||||
// exception.
|
||||
std::shared_ptr<const JSBigFileString> script;
|
||||
try {
|
||||
script = JSBigFileString::fromPath(segmentPath);
|
||||
} catch (const std::exception& e) {
|
||||
LOG(ERROR) << "ReactInstance::registerSegment - could not load segment "
|
||||
<< segmentId << " from " << segmentPath << ": " << e.what();
|
||||
return;
|
||||
}
|
||||
if (script->size() == 0) {
|
||||
throw std::invalid_argument(
|
||||
"Empty segment registered with ID " + std::to_string(segmentId) +
|
||||
" from " + segmentPath);
|
||||
}
|
||||
runtimeScheduler_->scheduleWork(
|
||||
[script = std::move(script), segmentId](jsi::Runtime& runtime) {
|
||||
TraceSection s("ReactInstance::registerSegment");
|
||||
auto tag = std::to_string(segmentId);
|
||||
ReactMarker::logTaggedMarker(
|
||||
ReactMarker::REGISTER_JS_SEGMENT_START, tag.c_str());
|
||||
LOG(WARNING) << "Starting to evaluate segment " << segmentId
|
||||
<< " in ReactInstance::registerSegment";
|
||||
runtime.evaluateJavaScript(script, getSyntheticBundlePath(segmentId));
|
||||
LOG(WARNING) << "Finished evaluating segment " << segmentId
|
||||
<< " in ReactInstance::registerSegment";
|
||||
ReactMarker::logTaggedMarker(
|
||||
ReactMarker::REGISTER_JS_SEGMENT_STOP, tag.c_str());
|
||||
});
|
||||
}
|
||||
|
||||
namespace {
|
||||
|
||||
Reference in new issue
Block a user