feat(hermes): close demo v8 serialization

etkmao · Dec 28, 2023 · 6a1c29f · 6a1c29f
1 parent 624b46b
commit 6a1c29f
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 9 deletions.
diff --git a/driver/js/include/driver/vm/hermes/hermes_vm.h b/driver/js/include/driver/vm/hermes/hermes_vm.h
@@ -40,7 +40,7 @@ struct HermesVMInitParam : public VM::VMInitParam {
 
 class HermesVM : public VM {
  public:
-  HermesVM(const std::shared_ptr<HermesVMInitParam>& param) : VM(param) {}
+  HermesVM(const std::shared_ptr<HermesVMInitParam>& param);
   ~HermesVM() = default;
 
   virtual std::shared_ptr<CtxValue> ParseJson(const std::shared_ptr<Ctx>& ctx, const string_view& json) override;

diff --git a/driver/js/src/js_driver_utils.cc b/driver/js/src/js_driver_utils.cc
@@ -382,7 +382,7 @@ bool JsDriverUtils::RunScript(const std::shared_ptr<Scope>& scope,
       worker_task_runner->PostTask(std::move(func));
     }
   }
-#elifdef JS_HERMES
+#elif defined(JS_HERMES)
   std::shared_ptr<CtxValue> ret = nullptr;
   try {
     ret = scope->GetContext()->RunScript(script_content, file_name);
@@ -613,7 +613,7 @@ void JsDriverUtils::CallNative(hippy::napi::CallbackInfo& info, const std::funct
           StringViewUtils::ConvertEncoding(json, string_view::Encoding::Utf8).utf8_value());
     }
   }
-#elifdef JS_HERMES
+#elif defined(JS_HERMES)
   if (info[3] && context->IsObject(info[3])) {
     string_view json;
     auto flag = context->GetValueJson(info[3], &json);
@@ -661,7 +661,7 @@ void JsDriverUtils::LoadInstance(const std::shared_ptr<Scope>& scope, byte_strin
     } else {
       scope->GetContext()->ThrowException("LoadInstance param error");
     }
-#elifdef JS_HERMES
+ #elif defined(JS_HERMES)
     std::u16string str(reinterpret_cast<const char16_t*>(&buffer_data_[0]), buffer_data_.length() / sizeof(char16_t));
     string_view buf_str(std::move(str));
     auto engine = scope->GetEngine().lock();

diff --git a/driver/js/src/modules/contextify_module.cc b/driver/js/src/modules/contextify_module.cc
@@ -95,7 +95,7 @@ void ContextifyModule::RunInThisContext(hippy::napi::CallbackInfo& info, void* d
   } else {
     info.GetReturnValue()->Set(ret);
   }
-#elifdef JS_HERMES
+#elif defined(JS_HERMES)
   try {
     auto ret = context->RunScript(str_view, key);
     info.GetReturnValue()->Set(ret);

diff --git a/driver/js/src/napi/hermes/hermes_ctx.cc b/driver/js/src/napi/hermes/hermes_ctx.cc
@@ -231,7 +231,6 @@ static Value InvokeJsCallback(Runtime& runtime, const Value& this_value, const V
     }
   }
 
-  // TODO construct call
   if (this_value.isObject()) {
     cb_info.SetReceiver(std::make_shared<HermesCtxValue>(runtime, this_value.asObject(runtime)));
   } else {
@@ -964,7 +963,7 @@ std::shared_ptr<CtxValue> HermesCtx::RunScript(const string_view& data, const st
   }
 }
 
-// void HermesCtx::SetDefaultContext(const std::shared_ptr<v8::SnapshotCreator>& creator) {}
+
 // TODO: add throw exception
 void HermesCtx::ThrowException(const std::shared_ptr<CtxValue>& exception) {}
 

diff --git a/driver/js/src/vm/hermes/hermes_vm.cc b/driver/js/src/vm/hermes/hermes_vm.cc
@@ -35,6 +35,11 @@ namespace hippy {
 inline namespace driver {
 inline namespace vm {
 
+HermesVM::HermesVM(const std::shared_ptr<HermesVMInitParam>& param) : VM(param) {
+  FOOTSTONE_DLOG(INFO) << "HermesVM begin";
+  FOOTSTONE_DLOG(INFO) << "HermesVM end";
+}
+
 std::shared_ptr<CtxValue> HermesVM::ParseJson(const std::shared_ptr<Ctx>& ctx, const string_view& json) {
   if (footstone::StringViewUtils::IsEmpty(json)) {
     return nullptr;

diff --git a/framework/android/src/main/java/com/tencent/mtt/hippy/HippyEngine.java b/framework/android/src/main/java/com/tencent/mtt/hippy/HippyEngine.java
@@ -247,7 +247,7 @@ public static class EngineInitParams {
     public List<HippyAPIProvider> providers;
     public List<Processor> processors;
     //Optional  is use V8 serialization or json
-    public boolean enableV8Serialization = false;
+    public boolean enableV8Serialization = true;
     // 可选参数 是否打印引擎的完整的log。默认为false
     public boolean enableLog = false;
     // 可选参数 code cache的名字，如果设置为空，则不启用code cache，默认为 ""

diff --git a/framework/android/src/main/java/com/tencent/mtt/hippy/HippyEngineManager.java b/framework/android/src/main/java/com/tencent/mtt/hippy/HippyEngineManager.java
@@ -82,7 +82,7 @@ static class Builder {
     private List<HippyAPIProvider> mPackages;
     private boolean mSupportDev = false;
     private String mDebugJs;
-    private boolean enableV8Serialization = false;
+    private boolean enableV8Serialization = true;
     private int mGroupId = -1;
     private String mRemoteServerUrl;
 

diff --git a/framework/examples/android-demo/src/main/java/com/openhippy/example/HippyEngineWrapper.kt b/framework/examples/android-demo/src/main/java/com/openhippy/example/HippyEngineWrapper.kt
@@ -66,6 +66,7 @@ class HippyEngineWrapper//TODO: Coming soon
         initParams.debugMode = isDebug
         initParams.enableLog = true
         initParams.logAdapter = DefaultLogAdapter()
+        initParams.enableV8Serialization = false;
         when(driverMode) {
             PageConfiguration.DriverMode.JS_REACT -> {
                 initParams.coreJSAssetsPath = "react/vendor.android.js"