diff --git a/Makefile b/Makefile index 667ee95..f35d9ea 100644 --- a/Makefile +++ b/Makefile @@ -10,11 +10,11 @@ WASM_OUT_ESM = dist/wasm/internal/blake3_wasm.mjs define wasm-compile-cjs = emcc -O3 -msimd128 -msse4.1 $^ -o $@ \ -sEXPORTED_FUNCTIONS=_malloc,_free -sEXPORTED_RUNTIME_METHODS=ccall \ - -Iblake3-src/c -sMODULARIZE -s 'EXPORT_NAME="createBlake3"' \ + -Iblake3-src/c -sMODULARIZE=1 -s 'EXPORT_NAME="createBlake3"' \ -sASSERTIONS=0 \ -sALLOW_MEMORY_GROWTH=0 \ -flto \ - -sENVIRONMENT=shell,node \ + -sENVIRONMENT=web,webview,worker,node,shell \ -Os \ -DNDEBUG \ -DIS_WASM -DBLAKE3_NO_AVX512 -DBLAKE3_NO_SSE2 -DBLAKE3_NO_AVX2 \ @@ -24,11 +24,11 @@ endef define wasm-compile-esm = emcc -O3 -msimd128 -msse4.1 $^ -o $@ \ -sEXPORTED_FUNCTIONS=_malloc,_free -sEXPORTED_RUNTIME_METHODS=ccall \ - -Iblake3-src/c -sMODULARIZE -s 'EXPORT_NAME="createBlake3"' \ + -Iblake3-src/c -sMODULARIZE=1 -s 'EXPORT_NAME="createBlake3"' \ -sASSERTIONS=0 \ -sALLOW_MEMORY_GROWTH=0 \ -flto \ - -sENVIRONMENT=shell,node \ + -sENVIRONMENT=web,webview,worker,node,shell \ -Os \ -DNDEBUG \ -DIS_WASM -DBLAKE3_NO_AVX512 -DBLAKE3_NO_SSE2 -DBLAKE3_NO_AVX2 \ diff --git a/package.json b/package.json index e664baa..0462ef5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@tracsystems/blake3", - "version": "0.0.6", + "version": "0.0.7", "scripts": { "build": "make", "clean": "make clean", @@ -8,7 +8,7 @@ "test": "mocha \"test/**/*.test.js\"" }, "main": "dist/wasm/blake3.js", - "browser": "dist/wasm/blake3.js", + "browser": "dist/wasm/blake3.mjs", "module": "dist/wasm/blake3.mjs", "files": [ "dist/" diff --git a/src/index.mjs b/src/index.mjs index af7b6f9..b1d0107 100644 --- a/src/index.mjs +++ b/src/index.mjs @@ -1,4 +1,4 @@ -import createBlake3 from './internal/blake3_wasm' +import createBlake3 from './internal/blake3_wasm.mjs' const DEFAULT_LENGTH = 32 let wasm @@ -13,14 +13,14 @@ export const blake3 = async (bytes, hashLength = DEFAULT_LENGTH) => { const wasm = await getWasm() const inputAddr = wasm._malloc(bytes.length) - wasm.HEAPU8.set(bytes, ptr) + wasm.HEAPU8.set(bytes, inputAddr) const outputAddr = wasm._malloc(hashLength) wasm.ccall( 'hash', null, ['number', 'number', 'number', 'number'], - [ptr, bytes.length, outputAddr, hashLength], + [inputAddr, bytes.length, outputAddr, hashLength], ) const res = wasm.HEAPU8.subarray(outputAddr, outputAddr + hashLength)