Add client bootstrapper (#124)

* client: Add bootstrapper

* client: Use std::vector instead of raw C array

* client: Remove some redundant code

Former-commit-id: d49af4d

Author: LeonMrBonnie

client/.gitignore

@@ -13,3 +13,7 @@ tools/extra.bat
 deps/v8/include/
 deps/v8/lib/
 deps/v8/update.json
+
+# Generated
+
+src/bootstrap.js.gen

client/CMakeLists.txt

@@ -41,6 +41,15 @@ endmacro()
 GroupSources(${PROJECT_SOURCE_DIR}/src "Source Files")
 GroupSources("../shared" "Shared Files")
 
+function(make_includable input_file output_file)
+    file(READ ${input_file} content)
+    set(delim "for_c++_include")
+    set(content "R\"${delim}(\n${content})${delim}\"")
+    file(WRITE ${output_file} "${content}")
+endfunction(make_includable)
+
+make_includable("src/bootstrap.js" "src/bootstrap.js.gen")
+
 include_directories(
   ${ALTV_JS_CPP_SDK}
   ${ALTV_JS_DEPS_DIR}/v8/include

client/src/CV8Resource.cpp

@@ -56,6 +56,10 @@ void CV8ResourceImpl::ProcessDynamicImports()
     dynamicImports.clear();
 }
 
+static std::string bootstrap_code =
+#include "bootstrap.js.gen"
+  ;
+
 extern V8Module altModule;
 bool CV8ResourceImpl::Start()
 {
@@ -94,34 +98,24 @@ bool CV8ResourceImpl::Start()
     alt::IPackage::File* file = pkg->OpenFile(path);
 
     size_t fileSize = pkg->GetFileSize(file);
-    uint8_t* byteBuffer = new uint8_t[fileSize];
-    pkg->ReadFile(file, byteBuffer, fileSize);
+    std::vector<uint8_t> byteBuffer(fileSize);
+    pkg->ReadFile(file, byteBuffer.data(), fileSize);
     pkg->CloseFile(file);
 
-    isUsingBytecode = IsBytecodeModule(byteBuffer, fileSize);
+    isUsingBytecode = IsBytecodeModule(byteBuffer.data(), fileSize);
 
     Log::Info << "[V8] Starting script " << path << Log::Endl;
 
     bool result = V8Helpers::TryCatch([&]() {
         v8::MaybeLocal<v8::Module> maybeModule;
-        if(!isUsingBytecode)
-        {
-            alt::String src{ (char*)byteBuffer, fileSize };
-            v8::ScriptOrigin scriptOrigin(isolate, V8Helpers::JSValue(path), 0, 0, false, -1, v8::Local<v8::Value>(), false, false, true, v8::Local<v8::PrimitiveArray>());
-            v8::ScriptCompiler::Source source{ V8Helpers::JSValue(src), scriptOrigin };
-            maybeModule = v8::ScriptCompiler::CompileModule(isolate, &source);
-        }
-        else
-        {
-            maybeModule = ResolveBytecode(path, byteBuffer, fileSize);
-        }
+        v8::ScriptOrigin scriptOrigin(isolate, V8Helpers::JSValue("<bootstrapper>"), 0, 0, false, -1, v8::Local<v8::Value>(), false, false, true, v8::Local<v8::PrimitiveArray>());
+        v8::ScriptCompiler::Source source{ V8Helpers::JSValue(bootstrap_code), scriptOrigin };
+        maybeModule = v8::ScriptCompiler::CompileModule(isolate, &source);
 
         if(maybeModule.IsEmpty()) return false;
 
         v8::Local<v8::Module> curModule = maybeModule.ToLocalChecked();
 
-        modules.emplace(path, v8::UniquePersistent<v8::Module>{ isolate, curModule });
-
         auto exports = altModule.GetExports(isolate, ctx);
         // Overwrite global console object
         auto console = ctx->Global()->Get(ctx, V8Helpers::JSValue("console")).ToLocalChecked().As<v8::Object>();
@@ -141,13 +135,16 @@ bool CV8ResourceImpl::Start()
         ctx->Global()->Set(ctx, V8Helpers::JSValue("clearTimeout"), exports->Get(ctx, V8Helpers::JSValue("clearTimeout")).ToLocalChecked());
 
         ctx->Global()->Set(ctx, V8Helpers::JSValue("__internal_get_exports"), v8::Function::New(ctx, &StaticRequire).ToLocalChecked());
+        ctx->Global()->Set(ctx, V8Helpers::JSValue("__internal_main_path"), V8Helpers::JSValue(path));
 
         bool res = curModule->InstantiateModule(ctx, CV8ScriptRuntime::ResolveModule).IsJust();
 
         if(!res) return false;
 
         v8::MaybeLocal<v8::Value> v = curModule->Evaluate(ctx);
 
+        isPreloading = false;
+
         if(v.IsEmpty()) return false;
 
         if(curModule->GetStatus() == v8::Module::Status::kErrored)
@@ -165,17 +162,9 @@ bool CV8ResourceImpl::Start()
         alt::MValue _exports = V8Helpers::V8ToMValue(curModule->GetModuleNamespace());
         resource->SetExports(_exports.As<alt::IMValueDict>());
 
-        if(curModule->IsGraphAsync()) Log::Warning << "[V8] Top level await is an experimental feature, use it at your own risk" << Log::Endl;
-
         Log::Info << "[V8] Started script " << path << Log::Endl;
         return true;
     });
-    delete byteBuffer;
-
-    if(!result)
-    {
-        modules.erase(path);
-    }
 
     DispatchStartEvent(!result);
 
@@ -514,9 +503,9 @@ v8::MaybeLocal<v8::Value> CV8ResourceImpl::GetSyntheticModuleExport(v8::Local<v8
     return v8::MaybeLocal<v8::Value>();
 }
 
-void CV8ResourceImpl::HandleWebViewEventQueue(const alt::Ref<alt::IWebView> view)
+void CV8ResourceImpl::HandleWebViewEventQueue(alt::Ref<alt::IWebView> view)
 {
-    auto& eventQueuesMap = this->GetWebviewsEventQueue();
+    auto& eventQueuesMap = GetWebviewsEventQueue();
     if(!eventQueuesMap.count(view)) return;
 
     auto& eventQueue = eventQueuesMap.at(view);

client/src/CV8Resource.h

@@ -169,6 +169,11 @@ class CV8ResourceImpl : public V8ResourceImpl, public IImportHandler
     v8::Local<v8::Module> CreateSyntheticModule(const std::string& name, v8::Local<v8::Value> exportValue);
     v8::MaybeLocal<v8::Value> GetSyntheticModuleExport(v8::Local<v8::Module> syntheticModule);
 
+    bool IsPreloading()
+    {
+        return isPreloading;
+    }
+
 private:
     friend class CV8ScriptRuntime;
 
@@ -185,7 +190,7 @@ class CV8ResourceImpl : public V8ResourceImpl, public IImportHandler
     {
         return webViewsEventsQueue;
     }
-    void HandleWebViewEventQueue(const alt::Ref<alt::IWebView> view);
+    void HandleWebViewEventQueue(alt::Ref<alt::IWebView> view);
 
     std::unordered_set<alt::Ref<alt::IBaseObject>> ownedObjects;
 
@@ -201,4 +206,6 @@ class CV8ResourceImpl : public V8ResourceImpl, public IImportHandler
 
     // Key = Module identity hash, Value = Export value
     std::unordered_map<int, V8Helpers::CPersistent<v8::Value>> syntheticModuleExports;
+
+    bool isPreloading = true;
 };

client/src/CV8ScriptRuntime.cpp

@@ -132,7 +132,7 @@ CV8ScriptRuntime::CV8ScriptRuntime()
               });
           };
 
-          if(Instance().resourcesLoaded && resource->GetResource()->IsStarted())
+          if(Instance().resourcesLoaded && resource->GetResource()->IsStarted() || resource->IsPreloading())
           {
               // instantly resolve the module
               domodule();

client/src/bootstrap.js

@@ -0,0 +1,2 @@
+// clang-format off
+await import(`/${__internal_main_path}`);