FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

wasi: allow WASI stdio to be configured · nodejs/node@8adfb54 · GitHub

/ node Public

Commit 8adfb54

Browse files
cjihrig
authored and
codebytere
committed
wasi: allow WASI stdio to be configured
This commit adds stdin, stderr, and stdout options to WASI, which allow the stdio streams to be configured. PR-URL: #33544 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: David Carlier <devnexen@gmail.com> Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com> Reviewed-By: Zeyu Yang <himself65@outlook.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent a3b6095 commit 8adfb54

5 files changed

Lines changed: 71 additions & 5 deletions

File tree

‎doc/api/wasi.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,12 @@ added: v12.16.0
6262
process via the `__wasi_proc_exit()` function. Setting this option to `true`
6363
causes `wasi.start()` to return the exit code rather than terminate the
6464
process. **Default:** `false`.
65+
* `stdin` {integer} The file descriptor used as standard input in the
66+
WebAssembly application. **Default:** `0`.
67+
* `stdout` {integer} The file descriptor used as standard output in the
68+
WebAssembly application. **Default:** `1`.
69+
* `stderr` {integer} The file descriptor used as standard error in the
70+
WebAssembly application. **Default:** `2`.
6571

6672
### `wasi.start(instance)`
6773
<!-- YAML

‎lib/wasi.js‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ const { isArrayBuffer } = require('internal/util/types');
1515
const {
1616
validateArray,
1717
validateBoolean,
18+
validateInt32,
1819
validateObject,
1920
} = require('internal/validators');
2021
const { WASI: _WASI } = internalBinding('wasi');
@@ -50,7 +51,13 @@ class WASI {
5051
}
5152
}
5253

53-
const wrap = new _WASI(args, env, preopens);
54+
const { stdin = 0, stdout = 1, stderr = 2 } = options;
55+
validateInt32(stdin, 'options.stdin', 0);
56+
validateInt32(stdout, 'options.stdout', 0);
57+
validateInt32(stderr, 'options.stderr', 0);
58+
const stdio = [stdin, stdout, stderr];
59+
60+
const wrap = new _WASI(args, env, preopens, stdio);
5461

5562
for (const prop in wrap) {
5663
wrap[prop] = FunctionPrototypeBind(wrap[prop], wrap);

‎src/node_wasi.cc‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,20 +162,27 @@ void WASI::DecreaseAllocatedSize(size_t size) {
162162

163163
void WASI::New(const FunctionCallbackInfo<Value>& args) {
164164
CHECK(args.IsConstructCall());
165-
CHECK_EQ(args.Length(), 3);
165+
CHECK_EQ(args.Length(), 4);
166166
CHECK(args[0]->IsArray());
167167
CHECK(args[1]->IsArray());
168168
CHECK(args[2]->IsArray());
169+
CHECK(args[3]->IsArray());
169170

170171
Environment* env = Environment::GetCurrent(args);
171172
Local<Context> context = env->context();
172173
Local<Array> argv = args[0].As<Array>();
173174
const uint32_t argc = argv->Length();
174175
uvwasi_options_t options;
175176

176-
options.in = 0;
177-
options.out = 1;
178-
options.err = 2;
177+
Local<Array> stdio = args[3].As<Array>();
178+
CHECK_EQ(stdio->Length(), 3);
179+
options.in = stdio->Get(context, 0).ToLocalChecked()->
180+
Int32Value(context).FromJust();
181+
options.out = stdio->Get(context, 1).ToLocalChecked()->
182+
Int32Value(context).FromJust();
183+
options.err = stdio->Get(context, 2).ToLocalChecked()->
184+
Int32Value(context).FromJust();
185+
179186
options.fd_table_size = 3;
180187
options.argc = argc;
181188
options.argv =

‎test/wasi/test-wasi-options-validation.js‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,18 @@ assert.throws(() => { new WASI({ preopens: 'fhqwhgads' }); },
2525
assert.throws(() => { new WASI({ returnOnExit: 'fhqwhgads' }); },
2626
{ code: 'ERR_INVALID_ARG_TYPE', message: /\breturnOnExit\b/ });
2727

28+
// If stdin is not an int32 and not undefined, it should throw.
29+
assert.throws(() => { new WASI({ stdin: 'fhqwhgads' }); },
30+
{ code: 'ERR_INVALID_ARG_TYPE', message: /\bstdin\b/ });
31+
32+
// If stdout is not an int32 and not undefined, it should throw.
33+
assert.throws(() => { new WASI({ stdout: 'fhqwhgads' }); },
34+
{ code: 'ERR_INVALID_ARG_TYPE', message: /\bstdout\b/ });
35+
36+
// If stderr is not an int32 and not undefined, it should throw.
37+
assert.throws(() => { new WASI({ stderr: 'fhqwhgads' }); },
38+
{ code: 'ERR_INVALID_ARG_TYPE', message: /\bstderr\b/ });
39+
2840
// If options is provided, but not an object, the constructor should throw.
2941
[null, 'foo', '', 0, NaN, Symbol(), true, false, () => {}].forEach((value) => {
3042
assert.throws(() => { new WASI(value); },

‎test/wasi/test-wasi-stdio.js‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
// Flags: --experimental-wasi-unstable-preview1 --experimental-wasm-bigint
2+
'use strict';
3+
require('../common');
4+
const tmpdir = require('../common/tmpdir');
5+
const { strictEqual } = require('assert');
6+
const { closeSync, openSync, readFileSync, writeFileSync } = require('fs');
7+
const { join } = require('path');
8+
const { WASI } = require('wasi');
9+
const modulePath = join(__dirname, 'wasm', 'stdin.wasm');
10+
const buffer = readFileSync(modulePath);
11+
const stdinFile = join(tmpdir.path, 'stdin.txt');
12+
const stdoutFile = join(tmpdir.path, 'stdout.txt');
13+
const stderrFile = join(tmpdir.path, 'stderr.txt');
14+
15+
tmpdir.refresh();
16+
// Write 33 x's. The test's buffer only holds 31 x's + a terminator.
17+
writeFileSync(stdinFile, 'x'.repeat(33));
18+
19+
const stdin = openSync(stdinFile, 'r');
20+
const stdout = openSync(stdoutFile, 'a');
21+
const stderr = openSync(stderrFile, 'a');
22+
const wasi = new WASI({ stdin, stdout, stderr, returnOnExit: true });
23+
const importObject = { wasi_snapshot_preview1: wasi.wasiImport };
24+
25+
(async () => {
26+
const { instance } = await WebAssembly.instantiate(buffer, importObject);
27+
28+
strictEqual(wasi.start(instance), 0);
29+
closeSync(stdin);
30+
closeSync(stdout);
31+
closeSync(stderr);
32+
strictEqual(readFileSync(stdoutFile, 'utf8').trim(), 'x'.repeat(31));
33+
strictEqual(readFileSync(stderrFile, 'utf8').trim(), '');
34+
})();

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL