Skip to content

Commit

Permalink
SINGLE_FILE html and worker fixes + tests (#5736)
Browse files Browse the repository at this point in the history 
Fix some broken cases, and make SINGLE_FILE embed everything in the html when emitting html
  • Loading branch information
@buu700 @kripken
buu700 authored and kripken committed Nov 7, 2017
1 parent 68fb8ae commit 7802705
Show file tree
Hide file tree
Showing 3 changed files with 69 additions and 34 deletions.
83 changes: 51 additions & 32 deletions emcc.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2413,16 +2413,16 @@ def generate_html(target, options, js_target, target_basename,
asm_mods = []

if options.proxy_to_worker:
proxy_worker_filename = shared.Settings.PROXY_TO_WORKER_FILENAME or target_basename
proxy_worker_filename = (shared.Settings.PROXY_TO_WORKER_FILENAME or target_basename) + '.js'
worker_js = worker_js_script(proxy_worker_filename)
script.inline = '''
script.inline = ('''
var filename = '%s';
if ((',' + window.location.search.substr(1) + ',').indexOf(',noProxy,') < 0) {
console.log('running code in a web worker');
''' + worker_js + '''
''' % shared.JS.get_subresource_location(proxy_worker_filename)) + worker_js + '''
} else {
// note: no support for code mods (PRECISE_F32==2)
console.log('running code on the main thread');
var filename = '%s';
var fileBytes = tryParseAsDataURI(filename);
var script = document.createElement('script');
if (fileBytes) {
Expand All @@ -2432,7 +2432,7 @@ def generate_html(target, options, js_target, target_basename,
}
document.body.appendChild(script);
}
''' % shared.JS.get_subresource_location(proxy_worker_filename + '.js')
'''
else:
# Normal code generation path
script.src = base_js_target
Expand All @@ -2442,10 +2442,11 @@ def generate_html(target, options, js_target, target_basename,
minified = 'minifyNames' in optimizer.queue_history,
separate_asm = options.separate_asm)

if shared.Settings.EMTERPRETIFY_FILE:
# We need to load the emterpreter file before anything else, it has to be synchronously ready
script.un_src()
script.inline = '''
if not shared.Settings.SINGLE_FILE:
if shared.Settings.EMTERPRETIFY_FILE:
# We need to load the emterpreter file before anything else, it has to be synchronously ready
script.un_src()
script.inline = '''
var emterpretURL = '%s';
var emterpretXHR = new XMLHttpRequest();
emterpretXHR.open('GET', emterpretURL, true);
Expand All @@ -2464,10 +2465,10 @@ def generate_html(target, options, js_target, target_basename,
emterpretXHR.send(null);
''' % (shared.JS.get_subresource_location(shared.Settings.EMTERPRETIFY_FILE), script.inline)

if options.memory_init_file:
# start to load the memory init file in the HTML, in parallel with the JS
script.un_src()
script.inline = ('''
if options.memory_init_file:
# start to load the memory init file in the HTML, in parallel with the JS
script.un_src()
script.inline = ('''
var memoryInitializer = '%s';
if (typeof Module['locateFile'] === 'function') {
memoryInitializer = Module['locateFile'](memoryInitializer);
Expand All @@ -2481,15 +2482,15 @@ def generate_html(target, options, js_target, target_basename,
meminitXHR.send(null);
''' % shared.JS.get_subresource_location(memfile)) + script.inline

# Download .asm.js if --separate-asm was passed in an asm.js build, or if 'asmjs' is one
# of the wasm run methods.
if not options.separate_asm or (shared.Settings.BINARYEN and 'asmjs' not in shared.Settings.BINARYEN_METHOD):
assert len(asm_mods) == 0, 'no --separate-asm means no client code mods are possible'
else:
script.un_src()
if len(asm_mods) == 0:
# just load the asm, then load the rest
script.inline = '''
# Download .asm.js if --separate-asm was passed in an asm.js build, or if 'asmjs' is one
# of the wasm run methods.
if not options.separate_asm or (shared.Settings.BINARYEN and 'asmjs' not in shared.Settings.BINARYEN_METHOD):
assert len(asm_mods) == 0, 'no --separate-asm means no client code mods are possible'
else:
script.un_src()
if len(asm_mods) == 0:
# just load the asm, then load the rest
script.inline = '''
var filename = '%s';
var fileBytes = tryParseAsDataURI(filename);
var script = document.createElement('script');
Expand All @@ -2505,9 +2506,9 @@ def generate_html(target, options, js_target, target_basename,
};
document.body.appendChild(script);
''' % (shared.JS.get_subresource_location(asm_target), script.inline)
else:
# may need to modify the asm code, load it as text, modify, and load asynchronously
script.inline = '''
else:
# may need to modify the asm code, load it as text, modify, and load asynchronously
script.inline = '''
var codeURL = '%s';
var codeXHR = new XMLHttpRequest();
codeXHR.open('GET', codeURL, true);
Expand Down Expand Up @@ -2538,10 +2539,10 @@ def generate_html(target, options, js_target, target_basename,
codeXHR.send(null);
''' % (shared.JS.get_subresource_location(asm_target), '\n'.join(asm_mods), script.inline)

if shared.Settings.BINARYEN and not shared.Settings.BINARYEN_ASYNC_COMPILATION:
# We need to load the wasm file before anything else, it has to be synchronously ready TODO: optimize
script.un_src()
script.inline = '''
if shared.Settings.BINARYEN and not shared.Settings.BINARYEN_ASYNC_COMPILATION:
# We need to load the wasm file before anything else, it has to be synchronously ready TODO: optimize
script.un_src()
script.inline = '''
var wasmURL = '%s';
var wasmXHR = new XMLHttpRequest();
wasmXHR.open('GET', wasmURL, true);
Expand All @@ -2567,6 +2568,17 @@ def generate_html(target, options, js_target, target_basename,
script.inline = f.read() + script.inline
f.close()

# inline script for SINGLE_FILE output
if shared.Settings.SINGLE_FILE:
js_contents = script.inline or ''
if script.src:
js = open(js_target, 'r')
js_contents += js.read()
js.close()
shared.try_delete(js_target)
script.src = None
script.inline = js_contents

html = open(target, 'wb')
html_contents = shell.replace('{{{ SCRIPT }}}', script.replacement())
html_contents = tools.line_endings.convert_line_endings(html_contents, '\n', options.output_eol)
Expand All @@ -2575,9 +2587,16 @@ def generate_html(target, options, js_target, target_basename,


def generate_worker_js(target, js_target, target_basename):
shutil.move(js_target, unsuffixed(js_target) + '.worker.js') # compiler output goes in .worker.js file
worker_target_basename = target_basename + '.worker'
proxy_worker_filename = shared.Settings.PROXY_TO_WORKER_FILENAME or worker_target_basename
# compiler output is embedded as base64
if shared.Settings.SINGLE_FILE:
proxy_worker_filename = shared.JS.get_subresource_location(js_target)

# compiler output goes in .worker.js file
else:
shutil.move(js_target, unsuffixed(js_target) + '.worker.js')
worker_target_basename = target_basename + '.worker'
proxy_worker_filename = (shared.Settings.PROXY_TO_WORKER_FILENAME or worker_target_basename) + '.js'

target_contents = worker_js_script(proxy_worker_filename)
open(target, 'w').write(target_contents)

Expand Down
7 changes: 5 additions & 2 deletions src/proxyClient.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,10 @@ var SUPPORT_BASE64_EMBEDDING;

// Worker

var filename = '{{{ filename }}}.js';
var filename;
if (!filename) {
filename = '{{{ filename }}}';
}

var workerURL = filename;
if (SUPPORT_BASE64_EMBEDDING) {
Expand All @@ -110,7 +113,7 @@ if (SUPPORT_BASE64_EMBEDDING) {
workerURL = URL.createObjectURL(new Blob([fileBytes], {type: 'application/javascript'}));
}
}
var worker = new Worker(filename);
var worker = new Worker(workerURL);

WebGLClient.prefetch();

Expand Down
13 changes: 13 additions & 0 deletions tests/test_browser.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3707,3 +3707,16 @@ def test_base64_atob_fallback(self):
</script>
''')
self.run_browser('a.html', '...', '/report_result?0')

# Tests that SINGLE_FILE works as intended in generated HTML (with and without Worker)
def test_single_file_html(self):
self.btest('emscripten_main_loop_setimmediate.cpp', '1', args=['-s', 'SINGLE_FILE=1', '-s', 'WASM=1', '-s', "BINARYEN_METHOD='native-wasm'"], also_proxied=True)
assert os.path.exists('test.html') and not os.path.exists('test.js') and not os.path.exists('test.worker.js')

# Tests that SINGLE_FILE works as intended in a Worker in JS output
def test_single_file_worker_js(self):
open('src.cpp', 'w').write(self.with_report_result(open(path_from_root('tests', 'browser_test_hello_world.c')).read()))
Popen([PYTHON, EMCC, 'src.cpp', '-o', 'test.js', '--proxy-to-worker', '-s', 'SINGLE_FILE=1', '-s', 'WASM=1', '-s', "BINARYEN_METHOD='native-wasm'"]).communicate()
open('test.html', 'w').write('<script src="test.js"></script>')
self.run_browser('test.html', None, '/report_result?0')
assert os.path.exists('test.js') and not os.path.exists('test.worker.js')

0 comments on commit 7802705

Please sign in to comment.