Refactor creation of environment

Author: gschwind

Diff for: register_types.cpp

@@ -70,5 +70,6 @@ void jsb_uninitialize_module(ModuleInitializationLevel p_level)
 
         ScriptServer::unregister_language(GodotJavascriptLanguage::get_singleton());
         GodotJavascriptLanguage::destroy_singleton();
+
     }
 }

Diff for: weaver/jsb_script_language.cpp

@@ -36,15 +36,11 @@ GodotJSScriptLanguageBase::~GodotJSScriptLanguageBase()
     }
 }
 
-void GodotJSScriptLanguageBase::init()
+void GodotJSScriptLanguageBase::create_environment()
 {
-    if (once_inited_) return;
-
-    JSB_BENCHMARK_SCOPE(GodotJSScriptLanguageBase, init);
-    once_inited_ = true;
-    JSB_LOG(Verbose, "Runtime: %s", JSB_IMPL_VERSION_STRING);
-    JSB_LOG(VeryVerbose, "jsb lang init");
-
+    ++prevent_environment_dispose_;
+    if (environment_)
+        return;
     jsb::Environment::CreateParams params;
     params.initial_class_slots = (int) ClassDB::classes.size() + JSB_MASTER_INITIAL_CLASS_EXTRA_SLOTS;
     params.initial_object_slots = JSB_MASTER_INITIAL_OBJECT_SLOTS;
@@ -53,34 +49,51 @@ void GodotJSScriptLanguageBase::init()
     params.debugger_port = jsb::internal::Settings::get_debugger_port();
     params.thread_id = Thread::get_caller_id();
 
-    ++prevent_environment_dispose_;
-    // Initialize only once
-    if (!environment_) {
-        environment_ = std::make_shared<jsb::Environment>(params);
-        environment_->init();
+    environment_ = std::make_shared<jsb::Environment>(params);
+    environment_->init();
 
-        // load internal scripts (jsb.core, jsb.editor.main, jsb.editor.codegen)
-        static constexpr char kRuntimeBundleFile[] = "jsb.runtime.bundle.js";
-        jsb_ensuref(jsb::AMDModuleLoader::load_source(environment_.get(), kRuntimeBundleFile, GodotJSProjectPreset::get_source_rt) == OK,
-            "the embedded '%s' not found, run 'scons' again to refresh all *.gen.cpp sources", kRuntimeBundleFile);
-        jsb_ensuref(environment_->load("jsb.inject") == OK, "failed to load jsb.inject");
+    // load internal scripts (jsb.core, jsb.editor.main, jsb.editor.codegen)
+    static constexpr char kRuntimeBundleFile[] = "jsb.runtime.bundle.js";
+    jsb_ensuref(jsb::AMDModuleLoader::load_source(environment_.get(), kRuntimeBundleFile, GodotJSProjectPreset::get_source_rt) == OK,
+        "the embedded '%s' not found, run 'scons' again to refresh all *.gen.cpp sources", kRuntimeBundleFile);
+    jsb_ensuref(environment_->load("jsb.inject") == OK, "failed to load jsb.inject");
 
 #ifdef TOOLS_ENABLED
-        static constexpr char kEditorBundleFile[] = "jsb.editor.bundle.js";
-        jsb_ensuref(jsb::AMDModuleLoader::load_source(environment_.get(), kEditorBundleFile, GodotJSProjectPreset::get_source_ed) == OK,
-            "the embedded '%s' not found, run 'scons' again to refresh all *.gen.cpp sources", kEditorBundleFile);
+    static constexpr char kEditorBundleFile[] = "jsb.editor.bundle.js";
+    jsb_ensuref(jsb::AMDModuleLoader::load_source(environment_.get(), kEditorBundleFile, GodotJSProjectPreset::get_source_ed) == OK,
+        "the embedded '%s' not found, run 'scons' again to refresh all *.gen.cpp sources", kEditorBundleFile);
 #endif
-    }
 }
 
-void GodotJSScriptLanguageBase::finish()
+void GodotJSScriptLanguageBase::destroy_environment()
 {
-    jsb_check(once_inited_);
-    once_inited_ = false;
+    if (!environment_)
+        return;
     if (--prevent_environment_dispose_ == 1) {
         environment_->dispose();
         environment_.reset();
     }
+}
+
+void GodotJSScriptLanguageBase::init()
+{
+    if (once_inited_) return;
+
+    JSB_BENCHMARK_SCOPE(GodotJSScriptLanguageBase, init);
+    once_inited_ = true;
+    JSB_LOG(Verbose, "Runtime: %s", JSB_IMPL_VERSION_STRING);
+    JSB_LOG(VeryVerbose, "jsb lang init");
+
+    create_environment();
+
+}
+
+void GodotJSScriptLanguageBase::finish()
+{
+    jsb_check(once_inited_);
+    once_inited_ = false;
+
+    destroy_environment();
 #if !JSB_WITH_WEB
     jsb::Worker::finish();
 #endif

Diff for: weaver/jsb_script_language.h

@@ -31,6 +31,12 @@ class GodotJSScriptLanguageBase : public ScriptLanguage
 
 public:
     // main context
+
+    static void create_environment();
+
+    static void destroy_environment();
+
+    // Get the environment singleton
     jsb_force_inline std::shared_ptr<jsb::Environment> get_environment() const
     {
         jsb_check(once_inited_ && environment_);