ALTV-659: JS module optimizations

.gitignore

@@ -1,6 +1,7 @@
 # Generated
 *.gen
-shared/JSBindings.h
-shared/JSEnums.h
+shared/CompiledEnums.h
+shared/CompiledBindings.h
+shared/bindings-hashes.json
 
 node_modules/

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "shared/deps/cpp-sdk"]
 	path = shared/deps/cpp-sdk
 	url = https://github.com/altmp/cpp-sdk.git
+[submodule "shared/deps/magic_enum"]
+	path = shared/deps/magic_enum
+	url = https://github.com/altmp/magic_enum.git

client/CMakeLists.txt

@@ -43,12 +43,11 @@ endmacro()
 GroupSources(${PROJECT_SOURCE_DIR}/src "Source Files")
 GroupSources("../shared" "Shared Files")
 
-make_includable("src/bootstrap.js" "src/bootstrap.js.gen")
-
 include_directories(
   ${ALTV_JS_CPP_SDK}
   ${ALTV_JS_DEPS_DIR}/v8/include
   ../shared
+  ../shared/deps/magic_enum/include
   ${PROJECT_SOURCE_DIR}/src
 )
 

client/src/CV8Resource.cpp

@@ -26,7 +26,7 @@
 
 #include "workers/CWorker.h"
 
-#include "JSBindings.h"
+#include "CompiledBindings.h"
 
 extern void StaticRequire(const v8::FunctionCallbackInfo<v8::Value>& info)
 {
@@ -77,10 +77,6 @@ void CV8ResourceImpl::ProcessDynamicImports()
     dynamicImports.clear();
 }
 
-extern std::string bootstrap_code =
-#include "bootstrap.js.gen"
-;
-
 CV8ResourceImpl::CV8ResourceImpl(alt::IResource* resource, v8::Isolate* isolate) : V8ResourceImpl(isolate, resource)
 {
     v8::Locker locker(isolate);
@@ -96,8 +92,6 @@ CV8ResourceImpl::CV8ResourceImpl(alt::IResource* resource, v8::Isolate* isolate)
     ctx->SetAlignedPointerInEmbedderData(1, resource);
 }
 
-extern V8Module altModule;
-
 bool CV8ResourceImpl::Start()
 {
     if (resource->GetMain().empty()) return false;
@@ -111,8 +105,14 @@ bool CV8ResourceImpl::Start()
     v8::Local<v8::Context> ctx = GetContext();
     v8::Context::Scope context_scope(ctx);
 
+    V8ResourceImpl::Initialize();
     V8ResourceImpl::Start();
-    SetupScriptGlobals();
+    SetupScriptGlobals(ctx);
+
+    V8ResourceImpl::InitializeBindings(js::Binding::Scope::CLIENT, V8Module::Get("alt"));
+
+    js::Binding bootstrapper = js::Binding::Get("client/bootstrap.js");
+    if (!bootstrapper.IsValid()) return false;
 
     std::string path = resource->GetMain();
     Log::Info << "[V8] Starting script " << path << Log::Endl;
@@ -123,23 +123,18 @@ bool CV8ResourceImpl::Start()
             v8::MaybeLocal<v8::Module> maybeModule;
             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};
+            v8::ScriptCompiler::Source source{V8Helpers::JSValue(bootstrapper.GetSource()), scriptOrigin};
             maybeModule = v8::ScriptCompiler::CompileModule(isolate, &source);
 
             if (maybeModule.IsEmpty()) return false;
 
             v8::Local<v8::Module> curModule = maybeModule.ToLocalChecked();
 
-            ctx->Global()->Set(ctx, V8Helpers::JSValue("__internal_get_exports"),
-                               v8::Function::New(ctx, &StaticRequire).ToLocalChecked());
-            ctx->Global()->Set(ctx, V8Helpers::JSValue("__internal_bindings_code"),
-                               V8Helpers::JSValue(JSBindings::GetBindingsCode()));
-            ctx->Global()->Set(ctx, V8Helpers::JSValue("__internal_main_path"), V8Helpers::JSValue(path));
-            ctx->Global()->Set(ctx, V8Helpers::JSValue("__internal_start_file"),
-                               v8::Function::New(ctx, &StartFile).ToLocalChecked());
+            js::TemporaryGlobalExtension internalGetExports(GetContext(), "__internal_get_exports", v8::Function::New(ctx, &StaticRequire).ToLocalChecked());
+            js::TemporaryGlobalExtension internalMainPath(GetContext(), "__internal_main_path", V8Helpers::JSValue(path));
+            js::TemporaryGlobalExtension internalStartFile(GetContext(), "__internal_start_file", v8::Function::New(ctx, &StartFile).ToLocalChecked());
 
-            bool result = InstantiateModule(curModule);
-            if (!result) return false;
+            if (!InstantiateModule(curModule)) return false;
 
             Log::Info << "[V8] Started script " << path << Log::Endl;
             return true;
@@ -568,14 +563,14 @@ v8::MaybeLocal<v8::Value> EvaluateSyntheticModule(v8::Local<v8::Context> context
 v8::Local<v8::Module> CV8ResourceImpl::CreateSyntheticModule(const std::string& name, v8::Local<v8::Value> exportValue)
 {
     v8::Local<v8::String> defaultExport = V8Helpers::JSValue("default");
-    v8::MemorySpan<const v8::Local<v8::String>> exports = { &defaultExport, 1 };
+    v8::MemorySpan<const v8::Local<v8::String>> exports = { &defaultExport, 1 };
 
     v8::Local<v8::Module> syntheticModule = v8::Module::CreateSyntheticModule(
-        isolate, V8Helpers::JSValue(name), exports, &EvaluateSyntheticModule);
+        isolate, V8Helpers::JSValue(name), exports, &EvaluateSyntheticModule);
 
     syntheticModuleExports.insert({
         syntheticModule->GetIdentityHash(), V8Helpers::CPersistent<v8::Value>(isolate, exportValue)
-    });
+    });
 
     return syntheticModule;
 }

client/src/CV8ScriptRuntime.cpp

@@ -3,16 +3,16 @@
 #include "inspector/CV8InspectorChannel.h"
 #include "V8Module.h"
 #include "events/Events.h"
-#include "CProfiler.h"
+#include "CProfiler.h"
 #include <Windows.h>
 
 CV8ScriptRuntime::CV8ScriptRuntime()
 {
     // !!! Don't change these without adjusting bytecode module !!!
     v8::V8::SetFlagsFromString("--harmony-import-assertions --short-builtin-calls --no-lazy --no-flush-bytecode");
-    platform = v8::platform::NewDefaultPlatform();
-
-    v8::LogEventCallback;
+    platform = v8::platform::NewDefaultPlatform();
+
+    v8::LogEventCallback;
 
     v8::V8::InitializePlatform(platform.get());
     v8::V8::InitializeICU((alt::ICore::Instance().GetClientPath() + "/libs/icudtl_v8.dat").c_str());
@@ -218,10 +218,9 @@ CV8ScriptRuntime::CV8ScriptRuntime()
         v8::Isolate::Scope isolate_scope(isolate);
         v8::HandleScope handle_scope(isolate);
 
-        V8Class::LoadAll(isolate);
-
+        V8Class::Initialize(isolate);
         extern V8Module altModule, nativesModule, sharedModule;
-        V8Module::Add(isolate, { altModule, nativesModule, sharedModule });
+        V8Module::Add({ altModule, nativesModule, sharedModule });
     }
 
     RegisterEvents();
@@ -250,6 +249,8 @@ void CV8ScriptRuntime::OnDispose()
 
     if(CProfiler::Instance().IsEnabled()) CProfiler::Instance().Dump(alt::ICore::Instance().GetClientPath());
 
+    V8Class::UnloadAll(isolate);
+    V8Module::Cleanup(isolate);
     CV8ScriptRuntime::SetInstance(nullptr);
     delete this;
 }

client/src/IImportHandler.cpp

@@ -13,7 +13,7 @@ static inline v8::MaybeLocal<v8::Module> CompileESM(v8::Isolate* isolate, const
 
 static inline bool IsSystemModule(v8::Isolate* isolate, const std::string& name)
 {
-    return V8Module::Exists(isolate, name);
+    return V8Module::Exists(name);
 }
 
 static inline v8::MaybeLocal<v8::Module> WrapModule(v8::Isolate* isolate, const std::deque<std::string>& _exportKeys, const std::string& name, bool exportAsDefault = false)
@@ -44,7 +44,7 @@ static inline v8::MaybeLocal<v8::Module> WrapModule(v8::Isolate* isolate, const
 bool IImportHandler::IsValidModule(const std::string& name)
 {
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
-    if(V8Module::Exists(isolate, name)) return true;
+    if(V8Module::Exists(name)) return true;
 
     alt::IResource* resource = alt::ICore::Instance().GetResource(name);
     if(resource) return true;
@@ -66,10 +66,10 @@ std::deque<std::string> IImportHandler::GetModuleKeys(const std::string& name)
 {
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
     v8::Local<v8::Context> context = isolate->GetEnteredOrMicrotaskContext();
-    auto v8module = V8Module::All()[isolate].find(name);
-    if(v8module != V8Module::All()[isolate].end())
+    if(V8Module::Exists(name))
     {
-        auto _exports = v8module->second->GetExports(isolate, context);
+        V8Module& module = V8Module::Get(name);
+        auto _exports = module.GetModuleExports(isolate);
         v8::Local<v8::Array> v8Keys = _exports->GetOwnPropertyNames(context).ToLocalChecked();
 
         std::deque<std::string> keys;
@@ -131,10 +131,10 @@ v8::MaybeLocal<v8::Value> IImportHandler::Require(const std::string& name)
     auto it = requiresMap.find(name);
     if(it != requiresMap.end()) return it->second.Get(isolate);
 
-    auto v8module = V8Module::All()[isolate].find(name);
-    if(v8module != V8Module::All()[isolate].end())
+    if (V8Module::Exists(name))
     {
-        auto _exports = v8module->second->GetExports(isolate, isolate->GetEnteredOrMicrotaskContext());
+        V8Module& module = V8Module::Get(name);
+        auto _exports = module.GetModuleExports(isolate);
         requiresMap.insert({ name, V8Helpers::CPersistent<v8::Value>{ isolate, _exports } });
 
         return _exports;

client/src/PromiseRejections.cpp

@@ -33,12 +33,15 @@ void V8Helpers::PromiseRejections::ProcessQueue(CV8ResourceImpl* resource)
         auto moduleData = resource->GetModuleData(fileName);
         if(rejection->location.GetLineNumber() != 0 && !moduleData.isBytecode)
         {
-            Log::Error << "[V8] Unhandled promise rejection at " << resource->GetResource()->GetName() << ":" << fileName << ":" << rejection->location.GetLineNumber() << " ("
-                       << rejectionMsg << ")" << Log::Endl;
+            Log::Error << "[V8] Unhandled promise rejection at resource [" << resource->GetResource()->GetName() << "]: "
+            << "File name: [" << fileName << "], function: [" << rejection->location.GetFuncName() << "], line number:" << rejection->location.GetLineNumber() << ", error: ["
+                       << rejectionMsg << "]" << Log::Endl;
         }
         else
         {
-            Log::Error << "[V8] Unhandled promise rejection at " << resource->GetResource()->GetName() << ":" << fileName << " (" << rejectionMsg << ")" << Log::Endl;
+            Log::Error << "[V8] Unhandled promise rejection at resource [" << resource->GetResource()->GetName() << "]: "
+            << "File name: [" << fileName << "], function: [" << rejection->location.GetFuncName() << "], line number:" << rejection->location.GetLineNumber() << ", error: ["
+                       << rejectionMsg << "]" << Log::Endl;
         }
         rejection->stackTrace.Print(1);
 

client/src/bindings/Audio.cpp

@@ -131,11 +131,6 @@ static void AllAudioGetter(v8::Local<v8::String> name, const v8::PropertyCallbac
     V8_RETURN(jsArr);
 }
 
-static void AudioCountGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
-{
-    V8_RETURN_UINT(alt::ICore::Instance().GetBaseObjects(alt::IBaseObject::Type::AUDIO).size());
-}
-
 static void StaticGetByID(const v8::FunctionCallbackInfo<v8::Value>& info)
 {
     V8_GET_ISOLATE_CONTEXT_RESOURCE();
@@ -167,7 +162,6 @@ extern V8Class v8Audio("Audio",
                            V8Helpers::SetStaticMethod(isolate, tpl, "getByID", StaticGetByID);
 
                            V8Helpers::SetStaticAccessor(isolate, tpl, "all", &AllAudioGetter);
-                           V8Helpers::SetStaticAccessor(isolate, tpl, "count", &AudioCountGetter);
 
                            V8Helpers::SetMethod(isolate, tpl, "on", &On);
                            V8Helpers::SetMethod(isolate, tpl, "off", &Off);

client/src/bindings/AudioOutput.cpp

@@ -22,11 +22,6 @@ static void AllAudioOutputGetter(v8::Local<v8::String> name, const v8::PropertyC
     V8_RETURN(resource->GetAllAudioOutputs());
 }
 
-static void AudioOutputCountGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
-{
-    V8_RETURN_UINT(alt::ICore::Instance().GetBaseObjects(alt::IBaseObject::Type::AUDIO_OUTPUT).size());
-}
-
 static void GetFilter(v8::Local<v8::String>, const v8::PropertyCallbackInfo<v8::Value>& info)
 {
     V8_GET_ISOLATE_CONTEXT_RESOURCE();
@@ -66,7 +61,6 @@ extern V8Class v8AudioOutput("AudioOutput",
                                  v8::Isolate* isolate = v8::Isolate::GetCurrent();
 
                                  V8Helpers::SetStaticAccessor(isolate, tpl, "all", &AllAudioOutputGetter);
-                                 V8Helpers::SetStaticAccessor(isolate, tpl, "count", &AudioOutputCountGetter);
 
                                  V8Helpers::SetAccessor<IAudioOutput, bool, &IAudioOutput::IsMuted, &IAudioOutput::SetMuted>(isolate, tpl, "muted");
                                  V8Helpers::SetAccessor<IAudioOutput, float, &IAudioOutput::GetVolume, &IAudioOutput::SetVolume>(isolate, tpl, "volume");

client/src/bindings/Checkpoint.cpp

@@ -117,11 +117,6 @@ static void AllGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo
     V8_RETURN(resource->GetAllCheckpoints());
 }
 
-static void CountGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
-{
-    V8_RETURN_UINT(alt::ICore::Instance().GetBaseObjects(alt::IBaseObject::Type::CHECKPOINT).size());
-}
-
 static void StaticGetByID(const v8::FunctionCallbackInfo<v8::Value>& info)
 {
     V8_GET_ISOLATE_CONTEXT_RESOURCE();
@@ -170,7 +165,6 @@ extern V8Class v8Checkpoint("Checkpoint",
                                 V8Helpers::SetAccessor<ICheckpoint, uint32_t, &ICheckpoint::GetGameID>(isolate, tpl, "scriptID");
 
                                 V8Helpers::SetStaticAccessor(isolate, tpl, "all", &AllGetter);
-                                V8Helpers::SetStaticAccessor(isolate, tpl, "count", &CountGetter);
                                 V8Helpers::SetStaticMethod(isolate, tpl, "getByID", StaticGetByID);
                                 V8Helpers::SetStaticMethod(isolate, tpl, "getByScriptID", StaticGetByScriptID);
 

client/src/bindings/LocalObject.cpp

@@ -124,11 +124,6 @@ static void AllGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo
     V8_RETURN(resource->GetAllLocalObjects());
 }
 
-static void CountGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
-{
-    V8_RETURN_UINT(alt::ICore::Instance().GetBaseObjects(alt::IBaseObject::Type::LOCAL_OBJECT).size());
-}
-
 static void AllWorldGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
 {
     V8_GET_ISOLATE_CONTEXT_RESOURCE();
@@ -262,7 +257,6 @@ extern V8Class v8LocalObject("LocalObject",
                                  V8Helpers::SetStaticMethod(isolate, tpl, "getByScriptID", StaticGetByScriptID);
 
                                  V8Helpers::SetStaticAccessor(isolate, tpl, "all", &AllGetter);
-                                 V8Helpers::SetStaticAccessor(isolate, tpl, "count", &CountGetter);
 
                                  V8Helpers::SetStaticAccessor(isolate, tpl, "allWorld", &AllWorldGetter);
 

client/src/bindings/Object.cpp

@@ -21,11 +21,6 @@ static void ToString(const v8::FunctionCallbackInfo<v8::Value>& info)
     V8_RETURN_STRING(ss.str());
 }
 
-static void CountGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
-{
-    V8_RETURN_UINT(alt::ICore::Instance().GetBaseObjects(alt::IBaseObject::Type::OBJECT).size());
-}
-
 static void StreamedInGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
 {
     V8_GET_ISOLATE_CONTEXT_RESOURCE();
@@ -110,7 +105,6 @@ extern V8Class v8Object("Object", v8Entity, [](v8::Local<v8::FunctionTemplate> t
     V8Helpers::SetStaticMethod(isolate, tpl, "getByRemoteID", StaticGetByRemoteId);
 
     V8Helpers::SetStaticAccessor(isolate, tpl, "all", &AllGetter);
-    V8Helpers::SetStaticAccessor(isolate, tpl, "count", &CountGetter);
     V8Helpers::SetStaticAccessor(isolate, tpl, "streamedIn", &StreamedInGetter);
 
     V8Helpers::SetAccessor<alt::IObject, uint8_t, &alt::IObject::GetAlpha>(isolate, tpl, "alpha");

client/src/bindings/Ped.cpp

@@ -12,11 +12,6 @@ static void AllGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo
     V8_RETURN(resource->GetAllPeds());
 }
 
-static void CountGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
-{
-    V8_RETURN_UINT(alt::ICore::Instance().GetBaseObjects(alt::IBaseObject::Type::PED).size());
-}
-
 static void StreamedInGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
 {
     V8_GET_ISOLATE_CONTEXT_RESOURCE();
@@ -96,7 +91,6 @@ extern V8Class v8Ped("Ped", v8Entity, [](v8::Local<v8::FunctionTemplate> tpl)
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
 
     V8Helpers::SetStaticAccessor(isolate, tpl, "all", &AllGetter);
-    V8Helpers::SetStaticAccessor(isolate, tpl, "count", &CountGetter);
     V8Helpers::SetStaticAccessor(isolate, tpl, "streamedIn", &StreamedInGetter);
     V8Helpers::SetStaticMethod(isolate, tpl, "getByID", StaticGetByID);
     V8Helpers::SetStaticMethod(isolate, tpl, "getByScriptID", StaticGetByScriptID);

client/src/bindings/Player.cpp

@@ -42,11 +42,6 @@ static void AllGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo
     V8_RETURN(resource->GetAllPlayers());
 }
 
-static void CountGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
-{
-    V8_RETURN_UINT(alt::ICore::Instance().GetBaseObjects(alt::IBaseObject::Type::PLAYER).size());
-}
-
 static void StreamedInGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
 {
     V8_GET_ISOLATE_CONTEXT_RESOURCE();
@@ -221,7 +216,6 @@ extern V8Class v8Player("Player",
                             V8Helpers::SetStaticMethod(isolate, tpl, "getByRemoteID", StaticGetByRemoteId);
 
                             V8Helpers::SetStaticAccessor(isolate, tpl, "all", &AllGetter);
-                            V8Helpers::SetStaticAccessor(isolate, tpl, "count", &CountGetter);
 
                             V8Helpers::SetStaticAccessor(isolate, tpl, "streamedIn", &StreamedInGetter);
                             V8Helpers::SetStaticAccessor(isolate, tpl, "local", &LocalGetter);

client/src/bindings/Vehicle.cpp

@@ -69,11 +69,6 @@ static void AllGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo
     V8_RETURN(resource->GetAllVehicles());
 }
 
-static void CountGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
-{
-    V8_RETURN_UINT(alt::ICore::Instance().GetBaseObjects(alt::IBaseObject::Type::VEHICLE).size());
-}
-
 static void StreamedInGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
 {
     V8_GET_ISOLATE_CONTEXT_RESOURCE();
@@ -313,7 +308,7 @@ static void SetupTransmission(const v8::FunctionCallbackInfo<v8::Value>& info)
 {
     V8_GET_ISOLATE_CONTEXT();
     V8_GET_THIS_BASE_OBJECT(vehicle, alt::IVehicle);
-    V8_CHECK_ARGS_LEN(0);
+    V8_CHECK_ARGS_LEN(0);
 
     vehicle->SetupTransmission();
 }
@@ -351,7 +346,6 @@ extern V8Class v8Vehicle("Vehicle",
                              V8Helpers::SetStaticMethod(isolate, tpl, "getByRemoteID", StaticGetByRemoteId);
 
                              V8Helpers::SetStaticAccessor(isolate, tpl, "all", &AllGetter);
-                             V8Helpers::SetStaticAccessor(isolate, tpl, "count", &CountGetter);
                              V8Helpers::SetStaticAccessor(isolate, tpl, "streamedIn", &StreamedInGetter);
 
                              // Common getters