Skip to content

Commit f39eec0

Browse files
BrooooooklynBrooooooklyn
authored
feat: support wasi target on browser (#757)
1 parent ed4e9aa commit f39eec0

37 files changed

+827
-183
lines changed

‎.eslintrc.yml

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ parserOptions:
44
ecmaVersion: latest
55
sourceType: module
66

7+
globals:
8+
globalThis: true
9+
710
env:
811
browser: true
912
es6: true

‎package.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,12 @@
2626
"devDependencies": {
2727
"@emnapi/core": "^0.45.0",
2828
"@emnapi/runtime": "^0.45.0",
29-
"@napi-rs/cli": "^3.0.0-alpha.30",
29+
"@napi-rs/cli": "^3.0.0-alpha.33",
3030
"@swc-node/core": "^1.10.6",
3131
"@swc-node/register": "^1.6.8",
3232
"@swc/core": "^1.3.101",
3333
"@taplo/cli": "^0.5.2",
34+
"@tybys/wasm-util": "^0.8.1",
3435
"@types/node": "^20.10.5",
3536
"@typescript-eslint/eslint-plugin": "^6.16.0",
3637
"@typescript-eslint/parser": "^6.16.0",
@@ -45,6 +46,7 @@
4546
"husky": "^8.0.3",
4647
"lerna": "^8.0.1",
4748
"lint-staged": "^15.2.0",
49+
"memfs-browser": "^3.4.13000",
4850
"npm-run-all": "^4.1.5",
4951
"prettier": "^3.1.1",
5052
"ts-node": "^10.9.2",

‎packages/argon2/argon2.wasi-browser.js

+77
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
import { instantiateNapiModuleSync as __emnapiInstantiateNapiModuleSync } from '@emnapi/core'
2+
import { getDefaultContext as __emnapiGetDefaultContext } from '@emnapi/runtime'
3+
import { WASI as __WASI } from '@tybys/wasm-util'
4+
import { Volume as __Volume, createFsFromVolume as __createFsFromVolume } from 'memfs-browser'
5+
6+
import __wasmUrl from './argon2.wasm32-wasi.wasm?url'
7+
8+
const __fs = __createFsFromVolume(
9+
__Volume.fromJSON({
10+
'/': null,
11+
}),
12+
)
13+
14+
const __wasi = new __WASI({
15+
version: 'preview1',
16+
fs: __fs,
17+
})
18+
19+
const __emnapiContext = __emnapiGetDefaultContext()
20+
21+
const __sharedMemory = new WebAssembly.Memory({
22+
initial: 1024,
23+
maximum: 10240,
24+
shared: true,
25+
})
26+
27+
const __wasmFile = await fetch(__wasmUrl).then((res) => res.arrayBuffer())
28+
29+
const {
30+
instance: __napiInstance,
31+
module: __wasiModule,
32+
napiModule: __napiModule,
33+
} = __emnapiInstantiateNapiModuleSync(__wasmFile, {
34+
context: __emnapiContext,
35+
asyncWorkPoolSize: 4,
36+
wasi: __wasi,
37+
onCreateWorker() {
38+
return new Worker(new URL('./wasi-worker-browser.mjs', import.meta.url), {
39+
type: 'module',
40+
})
41+
},
42+
overwriteImports(importObject) {
43+
importObject.env = {
44+
...importObject.env,
45+
...importObject.napi,
46+
...importObject.emnapi,
47+
memory: __sharedMemory,
48+
}
49+
return importObject
50+
},
51+
beforeInit({ instance }) {
52+
__napi_rs_initialize_modules(instance)
53+
},
54+
})
55+
56+
function __napi_rs_initialize_modules(__napiInstance) {
57+
__napiInstance.exports['__napi_register__Algorithm_0']?.()
58+
__napiInstance.exports['__napi_register__Version_1']?.()
59+
__napiInstance.exports['__napi_register__Options_struct_2']?.()
60+
__napiInstance.exports['__napi_register__HashTask_impl_3']?.()
61+
__napiInstance.exports['__napi_register__hash_4']?.()
62+
__napiInstance.exports['__napi_register__hash_sync_5']?.()
63+
__napiInstance.exports['__napi_register__RawHashTask_impl_6']?.()
64+
__napiInstance.exports['__napi_register__hash_raw_7']?.()
65+
__napiInstance.exports['__napi_register__hash_raw_sync_8']?.()
66+
__napiInstance.exports['__napi_register__VerifyTask_impl_9']?.()
67+
__napiInstance.exports['__napi_register__verify_10']?.()
68+
__napiInstance.exports['__napi_register__verify_sync_11']?.()
69+
}
70+
export const Algorithm = __napiModule.exports.Algorithm
71+
export const hash = __napiModule.exports.hash
72+
export const hashRaw = __napiModule.exports.hashRaw
73+
export const hashRawSync = __napiModule.exports.hashRawSync
74+
export const hashSync = __napiModule.exports.hashSync
75+
export const verify = __napiModule.exports.verify
76+
export const verifySync = __napiModule.exports.verifySync
77+
export const Version = __napiModule.exports.Version

‎packages/argon2/argon2.wasi.cjs

+19-13
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ const __wasi = new __nodeWASI({
1515
version: 'preview1',
1616
env: process.env,
1717
preopens: {
18-
'/': '/'
19-
}
18+
'/': '/',
19+
},
2020
})
2121

2222
const __emnapiContext = __emnapiGetDefaultContext()
@@ -33,13 +33,19 @@ if (!__nodeFs.existsSync(__wasmFilePath)) {
3333
try {
3434
__wasmFilePath = __nodePath.resolve('@node-rs/argon2-wasm32-wasi')
3535
} catch {
36-
throw new Error('Cannot find argon2.wasm32-wasi.wasm file, and @node-rs/argon2-wasm32-wasi package is not installed.')
36+
throw new Error(
37+
'Cannot find argon2.wasm32-wasi.wasm file, and @node-rs/argon2-wasm32-wasi package is not installed.',
38+
)
3739
}
3840
}
3941

40-
const { instance: __napiInstance, module: __wasiModule, napiModule: __napiModule } = __emnapiInstantiateNapiModuleSync(__nodeFs.readFileSync(__wasmFilePath), {
42+
const {
43+
instance: __napiInstance,
44+
module: __wasiModule,
45+
napiModule: __napiModule,
46+
} = __emnapiInstantiateNapiModuleSync(__nodeFs.readFileSync(__wasmFilePath), {
4147
context: __emnapiContext,
42-
asyncWorkPoolSize: (function() {
48+
asyncWorkPoolSize: (function () {
4349
const threadsSizeFromEnv = Number(process.env.NAPI_RS_ASYNC_WORK_POOL_SIZE ?? process.env.UV_THREADPOOL_SIZE)
4450
// NaN > 0 is false
4551
if (threadsSizeFromEnv > 0) {
@@ -66,7 +72,7 @@ const { instance: __napiInstance, module: __wasiModule, napiModule: __napiModule
6672
},
6773
beforeInit({ instance }) {
6874
__napi_rs_initialize_modules(instance)
69-
}
75+
},
7076
})
7177

7278
function __napi_rs_initialize_modules(__napiInstance) {
@@ -83,11 +89,11 @@ function __napi_rs_initialize_modules(__napiInstance) {
8389
__napiInstance.exports['__napi_register__verify_10']?.()
8490
__napiInstance.exports['__napi_register__verify_sync_11']?.()
8591
}
86-
module.exports.Algorithm = __napiModule.exports.Algorithm,
87-
module.exports.hash = __napiModule.exports.hash,
88-
module.exports.hashRaw = __napiModule.exports.hashRaw,
89-
module.exports.hashRawSync = __napiModule.exports.hashRawSync,
90-
module.exports.hashSync = __napiModule.exports.hashSync,
91-
module.exports.verify = __napiModule.exports.verify,
92-
module.exports.verifySync = __napiModule.exports.verifySync,
92+
module.exports.Algorithm = __napiModule.exports.Algorithm
93+
module.exports.hash = __napiModule.exports.hash
94+
module.exports.hashRaw = __napiModule.exports.hashRaw
95+
module.exports.hashRawSync = __napiModule.exports.hashRawSync
96+
module.exports.hashSync = __napiModule.exports.hashSync
97+
module.exports.verify = __napiModule.exports.verify
98+
module.exports.verifySync = __napiModule.exports.verifySync
9399
module.exports.Version = __napiModule.exports.Version

‎packages/argon2/npm/wasm32-wasi/package.json

+7-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
"files": [
99
"argon2.wasm32-wasi.wasm",
1010
"argon2.wasi.cjs",
11-
"wasi-worker.mjs"
11+
"argon2.wasi-browser.js",
12+
"wasi-worker.mjs",
13+
"wasi-worker-browser.mjs"
1214
],
1315
"description": "RustCrypto: Argon2 binding for Node.js",
1416
"keywords": [
@@ -35,8 +37,11 @@
3537
"type": "git",
3638
"url": "git+https://github.com/napi-rs/node-rs.git"
3739
},
40+
"browser": "argon2.wasi-browser.js",
3841
"dependencies": {
3942
"@emnapi/core": "^0.45.0",
40-
"@emnapi/runtime": "^0.45.0"
43+
"@emnapi/runtime": "^0.45.0",
44+
"@tybys/wasm-util": "^0.8.1",
45+
"memfs-browser": "^3.4.13000"
4146
}
4247
}

‎packages/argon2/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"version": "napi version"
6161
},
6262
"devDependencies": {
63-
"@napi-rs/cli": "^3.0.0-alpha.30",
63+
"@napi-rs/cli": "^3.0.0-alpha.33",
6464
"argon2": "^0.31.2",
6565
"cross-env": "^7.0.3"
6666
}

‎packages/argon2/wasi-worker-browser.mjs

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
import { instantiateNapiModuleSync, MessageHandler } from '@emnapi/core'
2+
import { WASI } from '@tybys/wasm-util'
3+
import { Volume, createFsFromVolume } from 'memfs-browser'
4+
5+
const fs = createFsFromVolume(
6+
Volume.fromJSON({
7+
'/': null,
8+
}),
9+
)
10+
11+
const handler = new MessageHandler({
12+
onLoad({ wasmModule, wasmMemory }) {
13+
const wasi = new WASI({
14+
fs,
15+
print: function () {
16+
// eslint-disable-next-line no-console
17+
console.log.apply(console, arguments)
18+
},
19+
})
20+
return instantiateNapiModuleSync(wasmModule, {
21+
childThread: true,
22+
wasi,
23+
overwriteImports(importObject) {
24+
importObject.env = {
25+
...importObject.env,
26+
...importObject.napi,
27+
...importObject.emnapi,
28+
memory: wasmMemory,
29+
}
30+
},
31+
})
32+
},
33+
})
34+
35+
globalThis.onmessage = function (e) {
36+
handler.handle(e)
37+
}

‎packages/argon2/wasi-worker.mjs

+19-19
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
1-
import fs from "node:fs";
2-
import { createRequire } from "node:module";
3-
import { parentPort, Worker } from "node:worker_threads";
1+
import fs from 'node:fs'
2+
import { createRequire } from 'node:module'
3+
import { parentPort, Worker } from 'node:worker_threads'
44

5-
import { instantiateNapiModuleSync, MessageHandler } from "@emnapi/core";
6-
import { WASI } from "@tybys/wasm-util";
5+
import { instantiateNapiModuleSync, MessageHandler } from '@emnapi/core'
6+
import { WASI } from '@tybys/wasm-util'
77

8-
const require = createRequire(import.meta.url);
8+
const require = createRequire(import.meta.url)
99

1010
if (parentPort) {
11-
parentPort.on("message", (data) => {
12-
globalThis.onmessage({ data });
13-
});
11+
parentPort.on('message', (data) => {
12+
globalThis.onmessage({ data })
13+
})
1414
}
1515

1616
Object.assign(globalThis, {
1717
self: globalThis,
1818
require,
1919
Worker,
2020
importScripts: function (f) {
21-
;(0, eval)(fs.readFileSync(f, "utf8") + "//# sourceURL=" + f);
21+
;(0, eval)(fs.readFileSync(f, 'utf8') + '//# sourceURL=' + f)
2222
},
2323
postMessage: function (msg) {
2424
if (parentPort) {
25-
parentPort.postMessage(msg);
25+
parentPort.postMessage(msg)
2626
}
2727
},
28-
});
28+
})
2929

3030
const handler = new MessageHandler({
3131
onLoad({ wasmModule, wasmMemory }) {
32-
const wasi = new WASI({ fs });
32+
const wasi = new WASI({ fs })
3333

3434
return instantiateNapiModuleSync(wasmModule, {
3535
childThread: true,
@@ -39,13 +39,13 @@ const handler = new MessageHandler({
3939
...importObject.env,
4040
...importObject.napi,
4141
...importObject.emnapi,
42-
memory: wasmMemory
43-
};
42+
memory: wasmMemory,
43+
}
4444
},
45-
});
45+
})
4646
},
47-
});
47+
})
4848

4949
globalThis.onmessage = function (e) {
50-
handler.handle(e);
51-
};
50+
handler.handle(e)
51+
}

‎packages/bcrypt/bcrypt.wasi-browser.js

+74
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
import { instantiateNapiModuleSync as __emnapiInstantiateNapiModuleSync } from '@emnapi/core'
2+
import { getDefaultContext as __emnapiGetDefaultContext } from '@emnapi/runtime'
3+
import { WASI as __WASI } from '@tybys/wasm-util'
4+
import { Volume as __Volume, createFsFromVolume as __createFsFromVolume } from 'memfs-browser'
5+
6+
import __wasmUrl from './bcrypt.wasm32-wasi.wasm?url'
7+
8+
const __fs = __createFsFromVolume(
9+
__Volume.fromJSON({
10+
'/': null,
11+
}),
12+
)
13+
14+
const __wasi = new __WASI({
15+
version: 'preview1',
16+
fs: __fs,
17+
})
18+
19+
const __emnapiContext = __emnapiGetDefaultContext()
20+
21+
const __sharedMemory = new WebAssembly.Memory({
22+
initial: 1024,
23+
maximum: 10240,
24+
shared: true,
25+
})
26+
27+
const __wasmFile = await fetch(__wasmUrl).then((res) => res.arrayBuffer())
28+
29+
const {
30+
instance: __napiInstance,
31+
module: __wasiModule,
32+
napiModule: __napiModule,
33+
} = __emnapiInstantiateNapiModuleSync(__wasmFile, {
34+
context: __emnapiContext,
35+
asyncWorkPoolSize: 4,
36+
wasi: __wasi,
37+
onCreateWorker() {
38+
return new Worker(new URL('./wasi-worker-browser.mjs', import.meta.url), {
39+
type: 'module',
40+
})
41+
},
42+
overwriteImports(importObject) {
43+
importObject.env = {
44+
...importObject.env,
45+
...importObject.napi,
46+
...importObject.emnapi,
47+
memory: __sharedMemory,
48+
}
49+
return importObject
50+
},
51+
beforeInit({ instance }) {
52+
__napi_rs_initialize_modules(instance)
53+
},
54+
})
55+
56+
function __napi_rs_initialize_modules(__napiInstance) {
57+
__napiInstance.exports['__napi_register__HashTask_impl_0']?.()
58+
__napiInstance.exports['__napi_register__SaltTask_impl_1']?.()
59+
__napiInstance.exports['__napi_register__VerifyTask_impl_2']?.()
60+
__napiInstance.exports['__napi_register__DEFAULT_COST_3']?.()
61+
__napiInstance.exports['__napi_register__gen_salt_sync_4']?.()
62+
__napiInstance.exports['__napi_register__gen_salt_js_5']?.()
63+
__napiInstance.exports['__napi_register__hash_sync_6']?.()
64+
__napiInstance.exports['__napi_register__hash_7']?.()
65+
__napiInstance.exports['__napi_register__verify_sync_8']?.()
66+
__napiInstance.exports['__napi_register__verify_9']?.()
67+
}
68+
export const DEFAULT_COST = __napiModule.exports.DEFAULT_COST
69+
export const genSalt = __napiModule.exports.genSalt
70+
export const genSaltSync = __napiModule.exports.genSaltSync
71+
export const hash = __napiModule.exports.hash
72+
export const hashSync = __napiModule.exports.hashSync
73+
export const verify = __napiModule.exports.verify
74+
export const verifySync = __napiModule.exports.verifySync

0 commit comments

Comments
 (0)