Fix for flakiness in socket tests. NFC (emscripten-core#23103)

In emscripten-core#22987 I added a new veriant of the test_nodejs_sockets_echo test and
chose the next consecutive port number, but it seems that each test ends
up using two ports numbers so this could conflicted with the tests that
were using both the previous and next number in the sequence (59164 and
59166).

Author: sbc100

src/library.js

@@ -128,7 +128,11 @@ addToLibrary({
     if (keepRuntimeAlive() && !implicit) {
       var msg = `program exited (with status: ${status}), but keepRuntimeAlive() is set (counter=${runtimeKeepaliveCounter}) due to an async operation, so halting execution but not exiting the runtime or preventing further async execution (you can use emscripten_force_exit, if you want to force a true shutdown)`;
 #if MODULARIZE
-      readyPromiseReject(msg);
+      if (!runtimeInitialized) {
+        // If the runtime has not yet been initializated then reject the
+        // ready promise instead of logging the error here.
+        readyPromiseReject(msg);
+      } else
 #endif // MODULARIZE
       err(msg);
     }

src/postamble.js

@@ -163,22 +163,21 @@ function run() {
 
 #if WASM_WORKERS
   if (ENVIRONMENT_IS_WASM_WORKER) {
+    initRuntime();
 #if MODULARIZE
     readyPromiseResolve(Module);
-#endif // MODULARIZE
-    return initRuntime();
+#endif
+    _wasmWorkerInitializeRuntime();
+    return;
   }
 #endif
 
 #if PTHREADS
   if (ENVIRONMENT_IS_PTHREAD) {
+    initRuntime();
 #if MODULARIZE
-    // The promise resolve function typically gets called as part of the execution
-    // of `doRun` below. The workers/pthreads don't execute `doRun` so the
-    // creation promise can be resolved, marking the pthread-Module as initialized.
     readyPromiseResolve(Module);
-#endif // MODULARIZE
-    initRuntime();
+#endif
     startWorker(Module);
     return;
   }
@@ -208,14 +207,14 @@ function run() {
     if (ABORT) return;
 
     initRuntime();
+#if MODULARIZE
+    readyPromiseResolve(Module);
+#endif
 
 #if HAS_MAIN
     preMain();
 #endif
 
-#if MODULARIZE
-    readyPromiseResolve(Module);
-#endif
 #if expectToReceiveOnModule('onRuntimeInitialized')
     Module['onRuntimeInitialized']?.();
 #endif

src/preamble.js

@@ -215,7 +215,7 @@ function initRuntime() {
   runtimeInitialized = true;
 
 #if WASM_WORKERS
-  if (ENVIRONMENT_IS_WASM_WORKER) return _wasmWorkerInitializeRuntime();
+  if (ENVIRONMENT_IS_WASM_WORKER) return;
 #endif
 
 #if PTHREADS
@@ -471,11 +471,13 @@ function abort(what) {
   var e = new WebAssembly.RuntimeError(what);
 
 #if MODULARIZE
-  readyPromiseReject(e);
+  if (!runtimeInitialized) {
+    // If the runtime has not yet been initializated then reject the
+    // ready promise instead of thowing the error;
+    readyPromiseReject(e);
+    return;
+  }
 #endif
-  // Throw the error whether or not MODULARIZE is set because abort is used
-  // in code paths apart from instantiation where an exception is expected
-  // to be thrown when abort is called.
   throw e;
 }
 

test/other/test_unoptimized_code_size.js.size

@@ -1 +1 @@
-54928
+54737

test/other/test_unoptimized_code_size_no_asserts.js.size

@@ -1 +1 @@
-30574
+30383

test/other/test_unoptimized_code_size_strict.js.size

@@ -1 +1 @@
-53724
+53533