Skip to content

Remove unsed/unneeded code in in proxyClient.js #22512

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

Merged
sbc100 merged 2 commits into from
Sep 5, 2024
Merged

Remove unsed/unneeded code in in proxyClient.js #22512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27bed60
Fix TODO in proxyClient.js
sbc100 Sep 5, 2024
f5ee873
update
sbc100 Sep 5, 2024
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
14 changes: 1 addition & 13 deletions src/proxyClient.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,23 +120,12 @@ if (typeof window != 'undefined') {

var frameId = 0;

// Temporarily handling this at run-time pending Python preprocessor support

var SUPPORT_BASE64_EMBEDDING;

// Worker

var filename;
filename ||= '<<< filename >>>';

var workerURL = filename;
if (SUPPORT_BASE64_EMBEDDING) {
var fileBytes = tryParseAsDataURI(filename);
if (fileBytes) {
workerURL = URL.createObjectURL(new Blob([fileBytes], {type: 'application/javascript'}));
}
}
var worker = new Worker(workerURL);
var worker = new Worker(filename);

#if ENVIRONMENT_MAY_BE_NODE
if (ENVIRONMENT_IS_NODE) {
Expand Down Expand Up @@ -166,7 +155,6 @@ worker.onmessage = (event) => {
if (!workerResponded) {
workerResponded = true;
Module.setStatus?.('');
if (SUPPORT_BASE64_EMBEDDING && workerURL !== filename) URL.revokeObjectURL(workerURL);
}

var data = event.data;
Expand Down
4 changes: 2 additions & 2 deletions tools/link.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2640,7 +2640,7 @@ def generate_html(target, options, js_target, target_basename, wasm_target):

def generate_worker_js(target, js_target, target_basename):
if settings.SINGLE_FILE:
# compiler output is embedded as base64
# compiler output is embedded as base64 data URL
proxy_worker_filename = get_subresource_location(js_target)
else:
# compiler output goes in .worker.js file
Expand All @@ -2655,7 +2655,7 @@ def generate_worker_js(target, js_target, target_basename):
def worker_js_script(proxy_worker_filename):
web_gl_client_src = read_file(utils.path_from_root('src/webGLClient.js'))
proxy_client_src = shared.read_and_preprocess(utils.path_from_root('src/proxyClient.js'), expand_macros=True)
if not os.path.dirname(proxy_worker_filename):
if not settings.SINGLE_FILE and not os.path.dirname(proxy_worker_filename):
proxy_worker_filename = './' + proxy_worker_filename
proxy_client_src = do_replace(proxy_client_src, '<<< filename >>>', proxy_worker_filename)
return web_gl_client_src + '\n' + proxy_client_src
Expand Down