diff --git a/Makefile b/Makefile index 885d6d97..0251b1c4 100644 --- a/Makefile +++ b/Makefile @@ -96,7 +96,7 @@ js-test: build/js/infomap.worker.js: $(SOURCES) $(PRE_WORKER_MODULE) @echo "Compiling Infomap to run in a worker in the browser..." @mkdir -p $(dir $@) - em++ -std=c++14 -O3 -s WASM=0 -s ALLOW_MEMORY_GROWTH=1 -s DISABLE_EXCEPTION_CATCHING=0 -s ENVIRONMENT=worker --pre-js $(PRE_WORKER_MODULE) -o build/js/$(WORKER_FILENAME) $(SOURCES) + em++ -std=c++14 -O3 -s WASM=1 -s ALLOW_MEMORY_GROWTH=1 -s DISABLE_EXCEPTION_CATCHING=0 -s ENVIRONMENT=worker --pre-js $(PRE_WORKER_MODULE) -o build/js/$(WORKER_FILENAME) $(SOURCES) js-clean: $(RM) -r build/js interfaces/js/src/worker index.js *.d.ts README.md diff --git a/interfaces/js/pre-worker-module.js b/interfaces/js/pre-worker-module.js index 38bfb272..f287edec 100644 --- a/interfaces/js/pre-worker-module.js +++ b/interfaces/js/pre-worker-module.js @@ -8,16 +8,6 @@ function readFile(filename) { let outName = "Untitled"; -let memoryHackRequest = { - status: 200, - useRequest: null, - addEventListener: function (event, callback) { - if (event === "load") { - this.useRequest = callback; - } - }, -}; - var Module = { arguments: [], preRun: function () { @@ -72,14 +62,10 @@ var Module = { }; postMessage({ type: "finished", content }); }, - memoryInitializerRequest: memoryHackRequest, }; onmessage = function onmessage(message) { const data = message.data; - - memoryHackRequest.response = data.memBuffer; - memoryHackRequest.useRequest(); outName = data.outName; Module.arguments.push(...[data.filename, ".", ...data.arguments]); FS.writeFile(data.filename, data.network); diff --git a/interfaces/js/src/index.ts b/interfaces/js/src/index.ts index 0e02c56a..1f980755 100644 --- a/interfaces/js/src/index.ts +++ b/interfaces/js/src/index.ts @@ -7,8 +7,6 @@ import fileToString, { import networkToString, { NetworkTypes } from "./network"; // @ts-ignore import InfomapWorker from "./worker/infomap.worker.js"; -// @ts-ignore -import MemFile from "./worker/infomap.worker.js.mem"; export interface Changelog { body: string | null; @@ -194,7 +192,6 @@ class Infomap { this.workers[id] = worker; worker.postMessage({ - memBuffer: new Uint8Array(MemFile), arguments: args.split(" "), filename, network,