use b64 to embed wad and compile with optimizations

Author: ading2210

.github/workflows/publish.yml

@@ -16,7 +16,7 @@ jobs:
           python3 -m venv .venv
           source .venv/bin/activate
           pip3 install -r requirements.txt
-          CFLAGS=-O1 ./build.sh
+          CFLAGS=-O3 ./build.sh
           cp index.html out
           rm out/compiled.js
 

build.sh

@@ -21,6 +21,6 @@ fi
 emmake make -C doomgeneric -f Makefile.pdfjs -j$(nproc --all)
 
 mkdir -p out
-cat pre.js doomgeneric/doomgeneric.js > out/compiled.js
-#emcc test.c -s WASM=0 -o out/compiled.js -Wno-fastcomp
+python3 embed_file.py file_template.js doomgeneric/doom1.wad out/data.js
+cat pre.js out/data.js doomgeneric/doomgeneric.js > out/compiled.js
 python3 generate.py out/compiled.js out/doom.pdf

doomgeneric/Makefile.pdfjs

@@ -6,8 +6,8 @@ else
 endif
 
 CC=emcc
-CFLAGS+=-sWASM=0 -Wno-fastcomp -static '-sEXPORTED_FUNCTIONS=[_main,_doomjs_tick,_key_to_doomkey]'
-LDFLAGS+=--embed-file doom1.wad
+CFLAGS+=-sWASM=0 -Wno-fastcomp -static '-sEXPORTED_FUNCTIONS=[_main,_doomjs_tick,_key_to_doomkey]' -sSINGLE_FILE=1
+LDFLAGS+=
 LIBS+=-lm -lc
 
 # subdirectory for objects

doomgeneric/doomgeneric_pdfjs.c

@@ -2,6 +2,7 @@
 #include <emscripten.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include "doomgeneric.h"
 #include "doomkeys.h"
 
@@ -129,6 +130,12 @@ void doomjs_tick() {
 }
 
 int main(int argc, char **argv) {
+  EM_ASM({
+    let stream = FS.open("/doom1.wad", "w+");
+    FS.write(stream, file_data, 0, file_data.length, 0);
+    FS.close(stream);
+  });
+
   doomgeneric_Create(argc, argv);
 
   EM_ASM({

embed_file.py

@@ -0,0 +1,12 @@
+import sys
+import base64
+
+with open(sys.argv[1]) as f:
+  js = f.read()
+
+with open(sys.argv[2], "rb") as f:
+  b64 = base64.b64encode(f.read()).decode()
+  js = js.replace("__b64_data__", b64, 1)
+
+with open(sys.argv[3], "w") as f:
+  f.write(js)

file_template.js

@@ -0,0 +1,15 @@
+//https://stackoverflow.com/a/62364519
+function b64_to_uint8array(str) {
+  const abc = [..."ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"]; // base64 alphabet
+  let result = [];
+
+  for(let i=0; i<str.length/4; i++) {
+    let chunk = [...str.slice(4*i,4*i+4)]
+    let bin = chunk.map(x=> abc.indexOf(x).toString(2).padStart(6,0)).join(''); 
+    let bytes = bin.match(/.{1,8}/g).map(x=> +('0b'+x));
+    result.push(...bytes.slice(0,3 - (str[4*i+2]=="=") - (str[4*i+3]=="=")));
+  }
+  return new Uint8Array(result);
+}
+
+var file_data = b64_to_uint8array("__b64_data__");

generate.py

@@ -89,7 +89,7 @@ def create_key_buttons(keys_info):
   writer = PdfWriter()
   page = create_page(width * scale, height * scale + 220)
   page.AA = PdfDict()
-  page.AA.O = create_script("try {"+js+"} catch (e) {app.alert(e.stack)}");
+  page.AA.O = create_script("try {"+js+"} catch (e) {app.alert(e.stack || e)}");
 
   fields = []
   for i in range(0, height):

pre.js

@@ -62,4 +62,5 @@ function key_up(key_str) {
 function reset_input_box() {
   globalThis.getField("key_input").value = "Type here for keyboard controls.";
 }
-app.setInterval("reset_input_box()", 1000);
+app.setInterval("reset_input_box()", 1000);
+