[Old] Fix pthread worker options usage with Vite bundler

src/library_pthread.js

@@ -393,25 +393,6 @@ var LibraryPThread = {
     // Creates a new web Worker and places it in the unused worker pool to wait for its use.
     allocateUnusedWorker() {
       var worker;
-      var workerOptions = {
-#if EXPORT_ES6
-        'type': 'module',
-#endif
-#if ENVIRONMENT_MAY_BE_NODE
-        // This is the way that we signal to the node worker that it is hosting
-        // a pthread.
-        'workerData': 'em-pthread',
-#endif
-#if ENVIRONMENT_MAY_BE_WEB || ENVIRONMENT_MAY_BE_WORKER
-        // This is the way that we signal to the Web Worker that it is hosting
-        // a pthread.
-#if ASSERTIONS
-        'name': 'em-pthread-' + PThread.nextWorkerID,
-#else
-        'name': 'em-pthread',
-#endif
-#endif
-      };
 #if EXPORT_ES6 && USE_ES6_IMPORT_META
       // If we're using module output, use bundler-friendly pattern.
 #if PTHREADS_DEBUG
@@ -426,14 +407,14 @@ var LibraryPThread = {
             createScriptURL: (ignored) => new URL("{{{ TARGET_JS_NAME }}}", import.meta.url)
           }
         );
-        worker = new Worker(p.createScriptURL('ignored'), workerOptions);
+        worker = new Worker(p.createScriptURL('ignored'), {{{ WORKER_OPTIONS }}});
       } else
 #endif
       // We need to generate the URL with import.meta.url as the base URL of the JS file
       // instead of just using new URL(import.meta.url) because bundler's only recognize
       // the first case in their bundling step. The latter ends up producing an invalid
       // URL to import from the server (e.g., for webpack the file:// path).
-      worker = new Worker(new URL('{{{ TARGET_JS_NAME }}}', import.meta.url), workerOptions);
+      worker = new Worker(new URL('{{{ TARGET_JS_NAME }}}', import.meta.url), {{{ WORKER_OPTIONS }}});
 #else
       var pthreadMainJs = _scriptName;
 #if expectToReceiveOnModule('mainScriptUrlOrBlob')
@@ -453,10 +434,10 @@ var LibraryPThread = {
       // Use Trusted Types compatible wrappers.
       if (typeof trustedTypes != 'undefined' && trustedTypes.createPolicy) {
         var p = trustedTypes.createPolicy('emscripten#workerPolicy2', { createScriptURL: (ignored) => pthreadMainJs });
-        worker = new Worker(p.createScriptURL('ignored'), workerOptions);
+        worker = new Worker(p.createScriptURL('ignored'), {{{ WORKER_OPTIONS }}});
       } else
 #endif
-      worker = new Worker(pthreadMainJs, workerOptions);
+      worker = new Worker(pthreadMainJs, {{{ WORKER_OPTIONS }}});
 #endif // EXPORT_ES6 && USE_ES6_IMPORT_META
       PThread.unusedWorkers.push(worker);
     },

test/test_other.py

@@ -370,7 +370,7 @@ def test_emcc_output_worker_mjs(self, args):
                       test_file('hello_world.c')] + args)
     src = read_file('subdir/hello_world.mjs')
     self.assertContained("new URL('hello_world.wasm', import.meta.url)", src)
-    self.assertContained("new Worker(new URL('hello_world.mjs', import.meta.url), workerOptions)", src)
+    self.assertContained("new Worker(new URL('hello_world.mjs', import.meta.url), { workerData: 'em-pthread' })", src)
     self.assertContained('export default Module;', src)
     self.assertContained('hello, world!', self.run_js('subdir/hello_world.mjs'))
 
@@ -381,7 +381,7 @@ def test_emcc_output_worker_mjs_single_file(self):
                       test_file('hello_world.c'), '-sSINGLE_FILE'])
     src = read_file('hello_world.mjs')
     self.assertNotContained("new URL('data:", src)
-    self.assertContained("new Worker(new URL('hello_world.mjs', import.meta.url), workerOptions)", src)
+    self.assertContained("new Worker(new URL('hello_world.mjs', import.meta.url), { workerData: 'em-pthread' })", src)
     self.assertContained('hello, world!', self.run_js('hello_world.mjs'))
 
   def test_emcc_output_mjs_closure(self):

tools/link.py

@@ -2098,6 +2098,9 @@ def phase_final_emitting(options, state, target, wasm_target):
 
   target_dir = os.path.dirname(os.path.abspath(target))
 
+  if settings.PTHREADS:
+    replace_worker_options_placeholders(final_js)
+
   # Deploy the Wasm Worker bootstrap file as an output file (*.ww.js)
   if settings.WASM_WORKERS == 1:
     create_worker_file('src/wasm_worker.js', target_dir, settings.WASM_WORKER_FILE, options)
@@ -2685,6 +2688,29 @@ def worker_js_script(proxy_worker_filename):
   return web_gl_client_src + '\n' + proxy_client_src
 
 
+def replace_worker_options_placeholders():
+  global final_js
+  js = read_file(final_js)
+  options = []
+
+  if settings.EXPORT_ES6:
+    options.append("type: 'module'")
+  if settings.ENVIRONMENT_MAY_BE_NODE:
+    options.append("workerData: 'em-pthread'")
+  if settings.ENVIRONMENT_MAY_BE_WEB or settings.ENVIRONMENT_MAY_BE_WORKER:
+    if settings.ASSERTIONS:
+      options.append("name: 'em-pthread-' + PThread.nextWorkerID")
+    else:
+      options.append("name: 'em-pthread'")
+
+  worker_options_str = "{ " + ", ".join(options) + " }"
+
+  # Replace placeholders with a worker options object literal
+  # This is necessary to avoid issues with JS bundlers, like Vite.
+  js = do_replace(js, '<<< WORKER_OPTIONS >>>', worker_options_str)
+  write_file(final_js, js)
+
+
 def find_library(lib, lib_dirs):
   for lib_dir in lib_dirs:
     path = os.path.join(lib_dir, lib)