Skip to content

respect mainScriptUrlOrBlob for esm targets #23859

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

respect mainScriptUrlOrBlob for esm targets #23859

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
706841b
respect mainScriptUrlOrBlob for esm targets
schlawg Mar 7, 2025
62258d3
make worker construction webpack-friendly
schlawg Mar 7, 2025
d80c8df
Merge branch 'main' into main
schlawg Mar 7, 2025
bf926a8
workerUrl must be undefined for webpack constructor
schlawg Mar 7, 2025
4849ae0
dont break node builds
schlawg Mar 7, 2025
2e083e2
streamline allocateUnusedWorker pre-processing flow
schlawg Mar 8, 2025
d055cc8
remove worker options var to appease vite
schlawg Mar 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 20 additions & 30 deletions src/lib/libpthread.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,49 +413,39 @@ var LibraryPThread = {

// Creates a new web Worker and places it in the unused worker pool to wait for its use.
allocateUnusedWorker() {
var worker;
#if EXPORT_ES6
// If we're using module output, use bundler-friendly pattern.
#if PTHREADS_DEBUG
dbg(`Allocating a new web worker from ${import.meta.url}`);
#endif
#if TRUSTED_TYPES
// Use Trusted Types compatible wrappers.
if (typeof trustedTypes != 'undefined' && trustedTypes.createPolicy) {
var p = trustedTypes.createPolicy('emscripten#workerPolicy1', { createScriptURL: (ignored) => import.meta.url });
worker = new Worker(p.createScriptURL('ignored'), {{{ pthreadWorkerOptions }}});
} else
var workerUrl, workerPolicyUrl;
#if expectToReceiveOnModule('mainScriptUrlOrBlob')
// We can't use makeModuleReceiveWithVar here since we want to also
// call URL.createObjectURL on the mainScriptUrlOrBlob.
workerPolicyUrl = workerUrl = Module['mainScriptUrlOrBlob'];
if (workerUrl && typeof workerUrl != 'string') {
workerPolicyUrl = workerUrl = URL.createObjectURL(workerUrl);
}
#endif
if (!workerUrl) {
#if EXPORT_ES6
// 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).
// See https://github.com/webpack/webpack/issues/12638
worker = new Worker(new URL('{{{ TARGET_JS_NAME }}}', import.meta.url), {{{ pthreadWorkerOptions }}});
#else // EXPORT_ES6
var pthreadMainJs = _scriptName;
#if expectToReceiveOnModule('mainScriptUrlOrBlob')
// We can't use makeModuleReceiveWithVar here since we want to also
// call URL.createObjectURL on the mainScriptUrlOrBlob.
if (Module['mainScriptUrlOrBlob']) {
pthreadMainJs = Module['mainScriptUrlOrBlob'];
if (typeof pthreadMainJs != 'string') {
pthreadMainJs = URL.createObjectURL(pthreadMainJs);
}
}
workerUrl = new URL("{{{ TARGET_JS_NAME }}}", import.meta.url);
workerPolicyUrl = import.meta.url
#else
workerUrl = workerPolicyUrl = _scriptName;
#endif
}
#if PTHREADS_DEBUG
dbg(`Allocating a new web worker from ${pthreadMainJs}`);
dbg(`Allocating a new web worker from ${workerUrl}`);
#endif
#if TRUSTED_TYPES
// 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'), {{{ pthreadWorkerOptions }}});
} else
var p = trustedTypes.createPolicy('emscripten#workerPolicy2', { createScriptURL: (ignored) => workerPolicyUrl });
workerUrl = p.createScriptURL('ignored');
}
#endif
worker = new Worker(pthreadMainJs, {{{ pthreadWorkerOptions }}});
#endif // EXPORT_ES6
var worker = new Worker(workerUrl, {{{ pthreadWorkerOptions }}});
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sadly we cannot use a variable for the first argument of the new Worker.. it needs to be a literal new URL in order for the bundlers to pick it up correctly. See the commend up on line 427,

Copy link
Author

@schlawg schlawg Mar 7, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i reckon webpack would still handle the full new Worker(new URL(...)) shebang in a ternary expression

#if ASSERTIONS
worker.workerID = PThread.nextWorkerID++;
#endif
Expand Down