Skip to content

Commit

Permalink
HTML: correct worker URL encoding tests
Browse files Browse the repository at this point in the history
SharedWorker is only exposed on Window, not in any worker global.

The SharedWorker importScripts() took me a while to debug, but ultimately the problem was that the variable was declared in a function scope and importScripts would attempt to override it in the global scope. As such, the fix is declaring the variable a little earlier on, matching how it's done for Worker importScripts().

Helps with #4934.
  • Loading branch information
annevk committed Sep 4, 2023
1 parent 7a7b4f8 commit b300c1b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 47 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -513,13 +513,6 @@ onload = function() {
});
}, 'Worker() in a dedicated worker');

subsetTestByKey('workers', async_test, function() {
var worker = new Worker(input_url_worker_sharedworker);
worker.onmessage = this.step_func_done(function(e) {
assert_equals(e.data, expected_utf8);
});
}, 'SharedWorker() in a dedicated worker');

subsetTestByKey('workers', async_test, function() {
var worker = new SharedWorker(input_url_sharedworker_importScripts);
worker.port.onmessage = this.step_func_done(function(e) {
Expand All @@ -534,13 +527,6 @@ onload = function() {
});
}, 'Worker() in a shared worker');

subsetTestByKey('workers', async_test, function() {
var worker = new SharedWorker(input_url_sharedworker_sharedworker);
worker.port.onmessage = this.step_func_done(function(e) {
assert_equals(e.data, expected_utf8);
});
}, 'SharedWorker() in a shared worker');

// WebSocket()
subsetTestByKey('websocket', async_test, function() {
var ws = new WebSocket('ws://{{host}}:{{ports[ws][0]}}/echo-query?\u00E5');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,23 +39,12 @@ def main(request, response):
} catch(ex) {
postMessage(String(ex));
}""" % encoding)
elif type == b'worker_sharedworker':
return ([(b"Content-Type", b"text/javascript; charset=%s" % encoding)], # charset should be ignored for workers
b"""try {
var worker = new SharedWorker('?q=\\u00E5&type=sharedworker&encoding=%s');
worker.port.onmessage = function(e) {
postMessage(e.data);
close();
};
} catch(ex) {
postMessage(String(ex));
}""" % encoding)
elif type == b'sharedworker_importScripts':
return ([(b"Content-Type", b"text/javascript; charset=%s" % request.GET[b'encoding'])], # charset should be ignored for workers
b"""onconnect = function(e) {
return ([(b"Content-Type", b"text/javascript; charset=%s" % encoding)], # charset should be ignored for workers
b"""var x = 'importScripts failed to run';
onconnect = function(e) {
var connect_port = e.source;
try {
var x = 'importScripts failed to run';
importScripts('?q=\\u00E5&type=js&var=x&encoding=%s');
connect_port.postMessage(x);
close();
Expand All @@ -77,25 +66,6 @@ def main(request, response):
connect_port.postMessage(String(ex));
}
};""" % encoding)
elif type == b'sharedworker_sharedworker':
return ([(b"Content-Type", b"text/javascript; charset=%s" % encoding)], # charset should be ignored for workers
b"""onconnect = function(e) {
var connect_port = e.source;
try {
onerror = function(msg) {
connect_port.postMessage(msg);
close();
return false;
};
var worker = new SharedWorker('?q=\\u00E5&type=sharedworker&encoding=%s');
worker.port.onmessage = function(e) {
connect_port.postMessage(e.data);
close();
};
} catch(ex) {
connect_port.postMessage(String(ex));
}
};""" % encoding)
elif type == b'eventstream':
return [(b"Content-Type", b"text/event-stream")], b"data: %s\n\n" % isomorphic_encode(q)
elif type == b'svg':
Expand Down

0 comments on commit b300c1b

Please sign in to comment.