Skip to content

Bugfix/code cache files #4457

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
etkmao merged 4 commits into from
Nov 3, 2025
Merged

Bugfix/code cache files #4457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6d42af2
fix(android): fix v8 code cache rejected condition
etkmao Oct 29, 2025
2daee45
fix(android): fix demo code cache tag setting
etkmao Oct 29, 2025
21bf098
fix(ohos): fix jsvm code cache rejected condition
etkmao Oct 29, 2025
17079e5
fix(ohos): fix demo code cache tag setting
etkmao Oct 29, 2025
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
19 changes: 17 additions & 2 deletions driver/js/src/napi/jsh/jsh_ctx.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,19 @@ std::shared_ptr<CtxValue> JSHCtx::InternalRunScript(
if(!CheckJSVMStatus(env_, status)) {
return nullptr;
}
if (!script) {
return nullptr;
}
if (cacheRejected) {
const uint8_t *data = nullptr;
size_t length = 0;
status = OH_JSVM_CreateCodeCache(env_, script, &data, &length);
FOOTSTONE_DCHECK(status == JSVM_OK);
if (status == JSVM_OK && data && length > 0) {
*cache = string_view(data, length);
delete[] data;
}
}
} else {
FOOTSTONE_UNREACHABLE();
}
Expand All @@ -389,8 +402,10 @@ std::shared_ptr<CtxValue> JSHCtx::InternalRunScript(
size_t length = 0;
status = OH_JSVM_CreateCodeCache(env_, script, &data, &length);
FOOTSTONE_DCHECK(status == JSVM_OK);
*cache = string_view(data, length);
delete[] data;
if (status == JSVM_OK && data && length > 0) {
*cache = string_view(data, length);
delete[] data;
}
} else {
status = OH_JSVM_CompileScript(env_, jsh_source_value->GetValue(), nullptr, 0, true, nullptr, &script);
if(!CheckJSVMStatus(env_, status)) {
Expand Down
6 changes: 6 additions & 0 deletions driver/js/src/napi/v8/v8_ctx.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,12 @@ std::shared_ptr<CtxValue> V8Ctx::InternalRunScript(
v8::ScriptCompiler::Source script_source(source, origin, cached_data);
script = v8::ScriptCompiler::Compile(
context, &script_source, v8::ScriptCompiler::kConsumeCodeCache);
if (cached_data && cached_data->rejected) {
const v8::ScriptCompiler::CachedData* new_cached_data =
v8::ScriptCompiler::CreateCodeCache(script.ToLocalChecked()->GetUnboundScript());
*cache = string_view(new_cached_data->data,
footstone::checked_numeric_cast<int, size_t>(new_cached_data->length));
}
} else {
FOOTSTONE_UNREACHABLE();
}
Expand Down
6 changes: 3 additions & 3 deletions framework/examples/android-demo/src/main/java/com/openhippy/example/HippyEngineWrapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class HippyEngineWrapper//TODO: Coming soon
//TODO: Coming soon
}
}
initParams.codeCacheTag = "common"
initParams.codeCacheTag = "common_1.0" // 建议tag拼接js version，tag会用来拼接v8 code cache文件的路径，不同js不同cache文件
initParams.exceptionHandler = object : HippyExceptionHandlerAdapter {
override fun handleJsException(e: HippyJsException) {
LogUtils.e("hippy", e.message)
Expand Down Expand Up @@ -156,7 +156,7 @@ class HippyEngineWrapper//TODO: Coming soon
val loadParams = ModuleLoadParams()
loadParams.context = context
loadParams.componentName = "Demo"
loadParams.codeCacheTag = "Demo"
loadParams.codeCacheTag = "Demo_1.0" // 建议tag拼接js version，tag会用来拼接v8 code cache文件的路径，不同js不同cache文件
when(driverMode) {
PageConfiguration.DriverMode.JS_REACT -> {
loadParams.jsAssetsPath = "react/index.android.js"
Expand Down Expand Up @@ -258,4 +258,4 @@ class HippyEngineWrapper//TODO: Coming soon
fun onReplaySnapshotViewCompleted(snapshotView: ViewGroup)
fun onLoadModuleCompleted(statusCode: ModuleLoadStatus, msg: String?)
}
}
}
2 changes: 1 addition & 1 deletion framework/examples/ohos-c-demo/src/main/ets/pages/Index.ets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class DefaultEngineListener implements EngineListener {
null,
)
loadParams.componentName = "Demo"
loadParams.codeCacheTag = "Demo"
loadParams.codeCacheTag = "Demo_1.0" // 建议tag拼接js version，tag会用来拼接v8 code cache文件的路径，不同js不同cache文件
loadParams.jsParams = new Map<string, HippyValue>()
loadParams.jsParams.set(
"msgFromNative",
Expand Down
2 changes: 1 addition & 1 deletion framework/examples/ohos-demo/src/main/ets/pages/PageConfiguration.ets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ class DefaultEngineListener implements EngineListener {
null
)
loadParams.componentName = "Demo"
loadParams.codeCacheTag = "Demo"
loadParams.codeCacheTag = "Demo_1.0" // 建议tag拼接js version，tag会用来拼接v8 code cache文件的路径，不同js不同cache文件
loadParams.jsParams = new Map<string, HippyValue>()
loadParams.jsParams.set(
"msgFromNative",
Expand Down
2 changes: 1 addition & 1 deletion framework/examples/ohos-har-demo/src/main/ets/pages/Index.ets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class DefaultEngineListener implements EngineListener {
null,
)
loadParams.componentName = "Demo"
loadParams.codeCacheTag = "Demo"
loadParams.codeCacheTag = "Demo_1.0" // 建议tag拼接js version，tag会用来拼接v8 code cache文件的路径，不同js不同cache文件
loadParams.jsParams = new Map<string, HippyValue>()
loadParams.jsParams.set(
"msgFromNative",
Expand Down
4 changes: 2 additions & 2 deletions framework/examples/ohos-har-demo/src/main/ets/pages/Index2.ets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class DefaultEngineListener implements EngineListener {
null,
)
loadParams.componentName = "Demo"
loadParams.codeCacheTag = "Demo"
loadParams.codeCacheTag = "Demo1"
loadParams.jsParams = new Map<string, HippyValue>()
loadParams.jsParams.set(
"msgFromNative",
Expand Down Expand Up @@ -146,7 +146,7 @@ class DefaultEngineListener2 implements EngineListener {
null,
)
loadParams.componentName = "Demo"
loadParams.codeCacheTag = "Demo"
loadParams.codeCacheTag = "Demo2"
loadParams.jsParams = new Map<string, HippyValue>()
loadParams.jsParams.set(
"msgFromNative",
Expand Down
Loading