1 files changed, 18 insertions, 78 deletions

diff --git a/platform/javascript/javascript_main.cpp b/platform/javascript/javascript_main.cpp
index a30d84a52c..b4985a4f36 100644
--- a/platform/javascript/javascript_main.cpp
+++ b/platform/javascript/javascript_main.cpp
@@ -36,6 +36,8 @@
 #include <emscripten/emscripten.h>
 #include <stdlib.h>
 
+#include "godot_js.h"
+
 static OS_JavaScript *os = nullptr;
 static uint64_t target_ticks = 0;
 
@@ -48,6 +50,10 @@ void exit_callback() {
 	emscripten_force_exit(exit_code); // No matter that we call cancel_main_loop, regular "exit" will not work, forcing.
 }
 
+void cleanup_after_sync() {
+	emscripten_set_main_loop(exit_callback, -1, false);
+}
+
 void main_loop_callback() {
 	uint64_t current_ticks = os->get_ticks_usec();
 
@@ -63,95 +69,29 @@ void main_loop_callback() {
 		target_ticks += (uint64_t)(1000000 / target_fps);
 	}
 	if (os->main_loop_iterate()) {
-		emscripten_cancel_main_loop(); // Cancel current loop and wait for finalize_async.
-		/* clang-format off */
-		EM_ASM({
-			// This will contain the list of operations that need to complete before cleanup.
-			Module.async_finish = [
-				// Always contains at least one async promise, to avoid firing immediately if nothing is added.
-				new Promise(function(accept, reject) {
-					setTimeout(accept, 0);
-				})
-			];
-		});
-		/* clang-format on */
-		os->get_main_loop()->finish();
-		os->finalize_async(); // Will add all the async finish functions.
-		EM_ASM({
-			Promise.all(Module.async_finish).then(function() {
-				Module.async_finish = [];
-				ccall("cleanup_after_sync", null, []);
-			});
-		});
+		emscripten_cancel_main_loop(); // Cancel current loop and wait for cleanup_after_sync.
+		godot_js_os_finish_async(cleanup_after_sync);
 	}
 }
 
-extern "C" EMSCRIPTEN_KEEPALIVE void cleanup_after_sync() {
-	emscripten_set_main_loop(exit_callback, -1, false);
-}
+/// When calling main, it is assumed FS is setup and synced.
+extern EMSCRIPTEN_KEEPALIVE int godot_js_main(int argc, char *argv[]) {
+	os = new OS_JavaScript();
+
+	// We must override main when testing is enabled
+	TEST_MAIN_OVERRIDE
+
+	Main::setup(argv[0], argc - 1, &argv[1]);
 
-extern "C" EMSCRIPTEN_KEEPALIVE void main_after_fs_sync(char *p_idbfs_err) {
-	String idbfs_err = String::utf8(p_idbfs_err);
-	if (!idbfs_err.empty()) {
-		print_line("IndexedDB not available: " + idbfs_err);
-	}
-	os->set_idb_available(idbfs_err.empty());
-	// TODO: Check error return value.
-	Main::setup2(); // Manual second phase.
 	// Ease up compatibility.
 	ResourceLoader::set_abort_on_missing_resources(false);
+
 	Main::start();
 	os->get_main_loop()->init();
+	emscripten_set_main_loop(main_loop_callback, -1, false);
 	// Immediately run the first iteration.
 	// We are inside an animation frame, we want to immediately draw on the newly setup canvas.
 	main_loop_callback();
-	emscripten_resume_main_loop();
-}
-
-int main(int argc, char *argv[]) {
-	// Create and mount userfs immediately.
-	EM_ASM({
-		FS.mkdir('/userfs');
-		FS.mount(IDBFS, {}, '/userfs');
-	});
-
-	// Configure locale.
-	char locale_ptr[16];
-	/* clang-format off */
-	EM_ASM({
-		stringToUTF8(Module['locale'], $0, 16);
-	}, locale_ptr);
-	/* clang-format on */
-	setenv("LANG", locale_ptr, true);
-
-	// Ensure the canvas ID.
-	/* clang-format off */
-	EM_ASM({
-		stringToUTF8("#" + Module['canvas'].id, $0, 255);
-	}, DisplayServerJavaScript::canvas_id);
-	/* clang-format on */
-
-	os = new OS_JavaScript();
-
-	// We must override main when testing is enabled
-	TEST_MAIN_OVERRIDE
-
-	Main::setup(argv[0], argc - 1, &argv[1], false);
-	emscripten_set_main_loop(main_loop_callback, -1, false);
-	emscripten_pause_main_loop(); // Will need to wait for FS sync.
-
-	// Sync from persistent state into memory and then
-	// run the 'main_after_fs_sync' function.
-	/* clang-format off */
-	EM_ASM({
-		FS.syncfs(true, function(err) {
-			requestAnimationFrame(function() {
-				ccall('main_after_fs_sync', null, ['string'], [err ? err.message : ""]);
-			});
-		});
-	});
-	/* clang-format on */
 
 	return 0;
-	// Continued async in main_after_fs_sync() from the syncfs() callback.
 }