Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "@tracsystems/blake3",
"version": "0.0.6",
"version": "0.0.7",
"scripts": {
"build": "make",
"clean": "make clean",
"build:docker": "docker build -t blake3-build . && docker run --rm -v $(pwd):/build blake3-build bash -c 'npm install && npm run build'",
"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/"
Expand Down
6 changes: 3 additions & 3 deletions src/index.mjs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import createBlake3 from './internal/blake3_wasm'
import createBlake3 from './internal/blake3_wasm.mjs'

const DEFAULT_LENGTH = 32
let wasm
Expand All @@ -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)
Expand Down