Scripting layer improvements

MafiaHub · Apr 24, 2023 · f56f596 · f56f596
1 parent 004e4d4
commit f56f596
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/code/framework/src/scripting/engines/node/engine.cpp b/code/framework/src/scripting/engines/node/engine.cpp
@@ -33,19 +33,8 @@ namespace Framework::Scripting::Engines::Node {
         v8::V8::InitializePlatform(_platform.get());
         v8::V8::Initialize();
 
-        // Allocate the isolate
-        _isolate = v8::Isolate::Allocate();
-
-        // Register the isolate to the platform
-        _platform->RegisterIsolate(_isolate, uv_default_loop());
-
-        // Initialize the isolate
-        v8::Isolate::CreateParams params;
-        params.array_buffer_allocator = node::CreateArrayBufferAllocator();
-        v8::Isolate::Initialize(_isolate, params);
-
-        // Register the IsWorker data slot
-        _isolate->SetData(v8::Isolate::GetNumberOfDataSlots() - 1, new bool(false));
+        // Allocate and register the isolate
+        _isolate = node::NewIsolate(node::CreateArrayBufferAllocator(), uv_default_loop(), _platform.get());
 
         // Allocate our scopes
         v8::Locker locker(_isolate);
@@ -65,6 +54,7 @@ namespace Framework::Scripting::Engines::Node {
 
         // Ye
         Logging::GetLogger(FRAMEWORK_INNER_SCRIPTING)->debug("Node.JS engine initialized!");
+        _isShuttingDown = false;
         return EngineError::ENGINE_NONE;
     }
 
@@ -77,6 +67,8 @@ namespace Framework::Scripting::Engines::Node {
             return EngineError::ENGINE_ISOLATE_NULL;
         }
 
+        _isShuttingDown = true;
+
         v8::SealHandleScope seal(_isolate);
         // Drain the remaining tasks while there are available ones
         do {
@@ -107,6 +99,10 @@ namespace Framework::Scripting::Engines::Node {
             return;
         }
 
+        if(_isShuttingDown) {
+            return;
+        }
+
         // Update the scripting layer
         v8::Locker locker(_isolate);
         v8::Isolate::Scope isolateScope(_isolate);

diff --git a/code/framework/src/scripting/engines/node/engine.h b/code/framework/src/scripting/engines/node/engine.h
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <atomic>
+
 #include <node.h>
 #include <v8.h>
 
@@ -24,6 +26,7 @@ namespace Framework::Scripting::Engines::Node {
         v8::Persistent<v8::ObjectTemplate> _globalObjectTemplate;
         std::unique_ptr<node::MultiIsolatePlatform> _platform;
         std::string _modName;
+        std::atomic<bool> _isShuttingDown = false;
 
       public:
         EngineError Init(SDKRegisterCallback) override;

diff --git a/code/framework/src/scripting/engines/node/resource.cpp b/code/framework/src/scripting/engines/node/resource.cpp
@@ -100,10 +100,15 @@ namespace Framework::Scripting::Engines::Node {
             return false;
         }
 
+        // Scope the resources
         v8::Locker locker(_isolate);
         v8::Isolate::Scope isolateScope(_isolate);
         v8::HandleScope handleScope(_isolate);
 
+        // Scope the context and emit destroy
+        v8::Context::Scope scope(GetContext());
+        node::EmitAsyncDestroy(_isolate, _asyncContext);
+
         // Exit node environment
         node::EmitProcessBeforeExit(_env);
         node::EmitProcessExit(_env);