Merge remote-tracking branch 'origin/rc' into release

altmp · Sep 18, 2024 · 641bb79 · 641bb79
2 parents 16a8f83 + 38ecccf
commit 641bb79
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 9 deletions.
diff --git a/client/src/main.cpp b/client/src/main.cpp
@@ -114,3 +114,15 @@ ALTV_JS_EXPORT const char* GetSDKHash()
 {
     return ALT_SDK_VERSION;
 }
+
+#ifndef ALTV_JS_SHARED
+namespace alt
+{
+    v8::Platform* GetV8Platform();
+}
+
+v8::Platform* alt::GetV8Platform()
+{
+    return CV8ScriptRuntime::Instance().GetPlatform();
+}
+#endif
diff --git a/shared/Log.cpp b/shared/Log.cpp
@@ -8,6 +8,8 @@
 
 Log& Log::Endl(Log& log)
 {
+    auto& core = alt::ICore::Instance();
+
     v8::Isolate* isolate = nullptr;
 #ifdef ALT_CLIENT_API
     isolate = CV8ScriptRuntime::Instance().GetIsolate();
@@ -22,11 +24,11 @@ Log& Log::Endl(Log& log)
 
     switch(log.type)
     {
-        case INFO: alt::ICore::Instance().LogInfo(log.buf.str(), resource); break;
-        case DEBUG: alt::ICore::Instance().LogDebug(log.buf.str().c_str(), resource); break;
-        case WARNING: alt::ICore::Instance().LogWarning(log.buf.str().c_str(), resource); break;
-        case ERR: alt::ICore::Instance().LogError(log.buf.str().c_str(), resource); break;
-        case COLORED: alt::ICore::Instance().LogColored(log.buf.str().c_str(), resource); break;
+        case INFO: core.LogInfo(LOG_PREFIX, log.buf.str(), resource); break;
+        case DEBUG: core.LogDebug(LOG_PREFIX, log.buf.str().c_str(), resource); break;
+        case WARNING: core.LogWarning(LOG_PREFIX, log.buf.str().c_str(), resource); break;
+        case ERR: core.LogError(LOG_PREFIX, log.buf.str().c_str(), resource); break;
+        case COLORED: core.LogColored(LOG_PREFIX, log.buf.str().c_str(), resource); break;
     }
 
     log.buf.str("");

diff --git a/shared/Log.h b/shared/Log.h
@@ -22,6 +22,8 @@ class Log
     Log() = default;
 
 public:
+    static constexpr const char* LOG_PREFIX = "[js]";
+
     Log(const Log&) = delete;
     Log(Log&&) = delete;
     Log& operator=(const Log&) = delete;

diff --git a/shared/V8ResourceImpl.cpp b/shared/V8ResourceImpl.cpp
@@ -652,17 +652,17 @@ static void PrintLog(const v8::FunctionCallbackInfo<v8::Value>& info)
     {
         case 0:
         {
-            alt::ICore::Instance().LogColored(stream.str(), resource->GetResource());
+            alt::ICore::Instance().LogColored(Log::LOG_PREFIX, stream.str(), resource->GetResource());
             break;
         }
         case 1:
         {
-            alt::ICore::Instance().LogWarning(stream.str(), resource->GetResource());
+            alt::ICore::Instance().LogWarning(Log::LOG_PREFIX, stream.str(), resource->GetResource());
             break;
         }
         case 2:
         {
-            alt::ICore::Instance().LogError(stream.str(), resource->GetResource());
+            alt::ICore::Instance().LogError(Log::LOG_PREFIX, stream.str(), resource->GetResource());
             break;
         }
     }

diff --git a/shared/deps/cpp-sdk b/shared/deps/cpp-sdk