Skip to content

lib: expose setupInstance method on WASI class #57214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
toyobayashi wants to merge 14 commits into from
Closed

lib: expose setupInstance method on WASI class #57214

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
bd80e2d
lib: expose `setupInstance` method on WASI class
toyobayashi Feb 25, 2025
4898067
lib: fix lint
toyobayashi Feb 25, 2025
22bf625
lib: fix lint
toyobayashi Feb 25, 2025
3f9b57b
lib: rename `setupInstance` to `finalizeBindings`
toyobayashi Jun 21, 2025
bbd61fd
lib: fix lint
toyobayashi Jun 21, 2025
0de730e
fix
toyobayashi Jun 21, 2025
52a67da
fix
toyobayashi Jun 21, 2025
1d65be6
kSetMemory already check the argument type
toyobayashi Jun 21, 2025
d77b2a4
remove globalThis
toyobayashi Jun 21, 2025
6d90ff0
add wasm32-wasip1-threads test
toyobayashi Jul 2, 2025
9675f52
add finalizeBindings doc
toyobayashi Jul 2, 2025
f138870
add WebAssembly.Memory type reference
toyobayashi Jul 2, 2025
d4e14cf
terminate-all-threads event
toyobayashi Jul 2, 2025
40bb245
Update doc/api/wasi.md
guybedford Jul 2, 2025
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
Next Next commit
lib: expose setupInstance method on WASI class
  • Loading branch information
@toyobayashi
toyobayashi committed Jun 21, 2025
commit bd80e2d6c389f17c1036550ea444a5a25066c7cc
31 changes: 20 additions & 11 deletions lib/wasi.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ const {
const {
ERR_INVALID_ARG_VALUE,
ERR_WASI_ALREADY_STARTED,
ERR_INVALID_ARG_TYPE,
} = require('internal/errors').codes;
const {
emitExperimentalWarning,
Expand All @@ -35,13 +36,6 @@ const kBindingName = Symbol('kBindingName');
emitExperimentalWarning('WASI');


function setupInstance(self, instance) {
validateObject(instance, 'instance');
validateObject(instance.exports, 'instance.exports');

self[kInstance] = instance;
self[kSetMemory](instance.exports.memory);
}

class WASI {
constructor(options = kEmptyObject) {
Expand Down Expand Up @@ -118,14 +112,30 @@ class WASI {
this[kInstance] = undefined;
}

setupInstance(instance, memory) {
Comment thread
toyobayashi marked this conversation as resolved.
Resolved
validateObject(instance, 'instance');
validateObject(instance.exports, 'instance.exports');
Comment thread
toyobayashi marked this conversation as resolved.
Resolved

if (memory != null) {
if (!(memory instanceof WebAssembly.Memory)) {
throw new ERR_INVALID_ARG_TYPE('memory', 'WebAssembly.Memory', memory);
}
this[kSetMemory](memory);
} else {
this[kSetMemory](instance.exports.memory);
}

this[kInstance] = instance;
this[kStarted] = true;
}

// Must not export _initialize, must export _start
start(instance) {
if (this[kStarted]) {
throw new ERR_WASI_ALREADY_STARTED();
}
this[kStarted] = true;

setupInstance(this, instance);
this.setupInstance(instance);

const { _start, _initialize } = this[kInstance].exports;

Expand All @@ -148,9 +158,8 @@ class WASI {
if (this[kStarted]) {
throw new ERR_WASI_ALREADY_STARTED();
}
this[kStarted] = true;

setupInstance(this, instance);
this.setupInstance(instance);

const { _start, _initialize } = this[kInstance].exports;

Expand Down