@tybys/wasm-util 0.4.0 → 0.5.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -2
- package/dist/wasm-util.d.ts +25 -8
- package/dist/wasm-util.esm-bundler.js +1042 -476
- package/dist/wasm-util.esm.js +1042 -476
- package/dist/wasm-util.esm.min.js +1 -1
- package/dist/wasm-util.js +1043 -475
- package/dist/wasm-util.min.js +1 -1
- package/lib/cjs/asyncify.js +22 -31
- package/lib/cjs/load.js +33 -32
- package/lib/cjs/memory.js +1 -0
- package/lib/cjs/wasi/fd.js +57 -15
- package/lib/cjs/wasi/index.js +92 -60
- package/lib/cjs/wasi/preview1.js +684 -209
- package/lib/cjs/wasi/rights.js +1 -0
- package/lib/cjs/wasi/types.js +61 -30
- package/lib/mjs/asyncify.mjs +22 -31
- package/lib/mjs/load.mjs +30 -31
- package/lib/mjs/memory.mjs +1 -1
- package/lib/mjs/wasi/fd.mjs +53 -13
- package/lib/mjs/wasi/index.mjs +93 -61
- package/lib/mjs/wasi/preview1.mjs +685 -210
- package/lib/mjs/wasi/rights.mjs +2 -2
- package/lib/mjs/wasi/types.mjs +61 -30
- package/package.json +1 -1
package/lib/cjs/wasi/rights.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getRights = exports.TTY_INHERITING = exports.TTY_BASE = exports.SOCKET_INHERITING = exports.SOCKET_BASE = exports.DIRECTORY_INHERITING = exports.DIRECTORY_BASE = exports.REGULAR_FILE_INHERITING = exports.REGULAR_FILE_BASE = exports.CHARACTER_DEVICE_INHERITING = exports.CHARACTER_DEVICE_BASE = exports.BLOCK_DEVICE_INHERITING = exports.BLOCK_DEVICE_BASE = exports.RIGHTS_ALL = void 0;
|
|
4
|
+
/* eslint-disable spaced-comment */
|
|
4
5
|
const error_1 = require("./error");
|
|
5
6
|
const types_1 = require("./types");
|
|
6
7
|
exports.RIGHTS_ALL = types_1.WasiRights.FD_DATASYNC |
|
package/lib/cjs/wasi/types.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.WasiFstFlag = exports.WasiClockid = exports.WasiFdFlag = exports.WasiFileControlFlag = exports.FileControlFlag = exports.WasiWhence = exports.WasiRights = exports.WasiFileType = exports.WasiErrno = void 0;
|
|
4
|
+
/* eslint-disable spaced-comment */
|
|
4
5
|
var WasiErrno;
|
|
5
6
|
(function (WasiErrno) {
|
|
6
7
|
WasiErrno[WasiErrno["ESUCCESS"] = 0] = "ESUCCESS";
|
|
@@ -92,37 +93,67 @@ var WasiFileType;
|
|
|
92
93
|
WasiFileType[WasiFileType["SOCKET_STREAM"] = 6] = "SOCKET_STREAM";
|
|
93
94
|
WasiFileType[WasiFileType["SYMBOLIC_LINK"] = 7] = "SYMBOLIC_LINK";
|
|
94
95
|
})(WasiFileType = exports.WasiFileType || (exports.WasiFileType = {}));
|
|
96
|
+
const FD_DATASYNC = /*#__PURE__*/ (BigInt(1) << BigInt(0));
|
|
97
|
+
const FD_READ = /*#__PURE__*/ (BigInt(1) << BigInt(1));
|
|
98
|
+
const FD_SEEK = /*#__PURE__*/ (BigInt(1) << BigInt(2));
|
|
99
|
+
const FD_FDSTAT_SET_FLAGS = /*#__PURE__*/ (BigInt(1) << BigInt(3));
|
|
100
|
+
const FD_SYNC = /*#__PURE__*/ (BigInt(1) << BigInt(4));
|
|
101
|
+
const FD_TELL = /*#__PURE__*/ (BigInt(1) << BigInt(5));
|
|
102
|
+
const FD_WRITE = /*#__PURE__*/ (BigInt(1) << BigInt(6));
|
|
103
|
+
const FD_ADVISE = /*#__PURE__*/ (BigInt(1) << BigInt(7));
|
|
104
|
+
const FD_ALLOCATE = /*#__PURE__*/ (BigInt(1) << BigInt(8));
|
|
105
|
+
const PATH_CREATE_DIRECTORY = /*#__PURE__*/ (BigInt(1) << BigInt(9));
|
|
106
|
+
const PATH_CREATE_FILE = /*#__PURE__*/ (BigInt(1) << BigInt(10));
|
|
107
|
+
const PATH_LINK_SOURCE = /*#__PURE__*/ (BigInt(1) << BigInt(11));
|
|
108
|
+
const PATH_LINK_TARGET = /*#__PURE__*/ (BigInt(1) << BigInt(12));
|
|
109
|
+
const PATH_OPEN = /*#__PURE__*/ (BigInt(1) << BigInt(13));
|
|
110
|
+
const FD_READDIR = /*#__PURE__*/ (BigInt(1) << BigInt(14));
|
|
111
|
+
const PATH_READLINK = /*#__PURE__*/ (BigInt(1) << BigInt(15));
|
|
112
|
+
const PATH_RENAME_SOURCE = /*#__PURE__*/ (BigInt(1) << BigInt(16));
|
|
113
|
+
const PATH_RENAME_TARGET = /*#__PURE__*/ (BigInt(1) << BigInt(17));
|
|
114
|
+
const PATH_FILESTAT_GET = /*#__PURE__*/ (BigInt(1) << BigInt(18));
|
|
115
|
+
const PATH_FILESTAT_SET_SIZE = /*#__PURE__*/ (BigInt(1) << BigInt(19));
|
|
116
|
+
const PATH_FILESTAT_SET_TIMES = /*#__PURE__*/ (BigInt(1) << BigInt(20));
|
|
117
|
+
const FD_FILESTAT_GET = /*#__PURE__*/ (BigInt(1) << BigInt(21));
|
|
118
|
+
const FD_FILESTAT_SET_SIZE = /*#__PURE__*/ (BigInt(1) << BigInt(22));
|
|
119
|
+
const FD_FILESTAT_SET_TIMES = /*#__PURE__*/ (BigInt(1) << BigInt(23));
|
|
120
|
+
const PATH_SYMLINK = /*#__PURE__*/ (BigInt(1) << BigInt(24));
|
|
121
|
+
const PATH_REMOVE_DIRECTORY = /*#__PURE__*/ (BigInt(1) << BigInt(25));
|
|
122
|
+
const PATH_UNLINK_FILE = /*#__PURE__*/ (BigInt(1) << BigInt(26));
|
|
123
|
+
const POLL_FD_READWRITE = /*#__PURE__*/ (BigInt(1) << BigInt(27));
|
|
124
|
+
const SOCK_SHUTDOWN = /*#__PURE__*/ (BigInt(1) << BigInt(28));
|
|
125
|
+
const SOCK_ACCEPT = /*#__PURE__*/ (BigInt(1) << BigInt(29));
|
|
95
126
|
exports.WasiRights = {
|
|
96
|
-
FD_DATASYNC
|
|
97
|
-
FD_READ
|
|
98
|
-
FD_SEEK
|
|
99
|
-
FD_FDSTAT_SET_FLAGS
|
|
100
|
-
FD_SYNC
|
|
101
|
-
FD_TELL
|
|
102
|
-
FD_WRITE
|
|
103
|
-
FD_ADVISE
|
|
104
|
-
FD_ALLOCATE
|
|
105
|
-
PATH_CREATE_DIRECTORY
|
|
106
|
-
PATH_CREATE_FILE
|
|
107
|
-
PATH_LINK_SOURCE
|
|
108
|
-
PATH_LINK_TARGET
|
|
109
|
-
PATH_OPEN
|
|
110
|
-
FD_READDIR
|
|
111
|
-
PATH_READLINK
|
|
112
|
-
PATH_RENAME_SOURCE
|
|
113
|
-
PATH_RENAME_TARGET
|
|
114
|
-
PATH_FILESTAT_GET
|
|
115
|
-
PATH_FILESTAT_SET_SIZE
|
|
116
|
-
PATH_FILESTAT_SET_TIMES
|
|
117
|
-
FD_FILESTAT_GET
|
|
118
|
-
FD_FILESTAT_SET_SIZE
|
|
119
|
-
FD_FILESTAT_SET_TIMES
|
|
120
|
-
PATH_SYMLINK
|
|
121
|
-
PATH_REMOVE_DIRECTORY
|
|
122
|
-
PATH_UNLINK_FILE
|
|
123
|
-
POLL_FD_READWRITE
|
|
124
|
-
SOCK_SHUTDOWN
|
|
125
|
-
SOCK_ACCEPT
|
|
127
|
+
FD_DATASYNC,
|
|
128
|
+
FD_READ,
|
|
129
|
+
FD_SEEK,
|
|
130
|
+
FD_FDSTAT_SET_FLAGS,
|
|
131
|
+
FD_SYNC,
|
|
132
|
+
FD_TELL,
|
|
133
|
+
FD_WRITE,
|
|
134
|
+
FD_ADVISE,
|
|
135
|
+
FD_ALLOCATE,
|
|
136
|
+
PATH_CREATE_DIRECTORY,
|
|
137
|
+
PATH_CREATE_FILE,
|
|
138
|
+
PATH_LINK_SOURCE,
|
|
139
|
+
PATH_LINK_TARGET,
|
|
140
|
+
PATH_OPEN,
|
|
141
|
+
FD_READDIR,
|
|
142
|
+
PATH_READLINK,
|
|
143
|
+
PATH_RENAME_SOURCE,
|
|
144
|
+
PATH_RENAME_TARGET,
|
|
145
|
+
PATH_FILESTAT_GET,
|
|
146
|
+
PATH_FILESTAT_SET_SIZE,
|
|
147
|
+
PATH_FILESTAT_SET_TIMES,
|
|
148
|
+
FD_FILESTAT_GET,
|
|
149
|
+
FD_FILESTAT_SET_SIZE,
|
|
150
|
+
FD_FILESTAT_SET_TIMES,
|
|
151
|
+
PATH_SYMLINK,
|
|
152
|
+
PATH_REMOVE_DIRECTORY,
|
|
153
|
+
PATH_UNLINK_FILE,
|
|
154
|
+
POLL_FD_READWRITE,
|
|
155
|
+
SOCK_SHUTDOWN,
|
|
156
|
+
SOCK_ACCEPT
|
|
126
157
|
};
|
|
127
158
|
var WasiWhence;
|
|
128
159
|
(function (WasiWhence) {
|
package/lib/mjs/asyncify.mjs
CHANGED
|
@@ -90,18 +90,20 @@ export class Asyncify {
|
|
|
90
90
|
}
|
|
91
91
|
}
|
|
92
92
|
wrapImportFunction(f) {
|
|
93
|
-
|
|
93
|
+
// eslint-disable-next-line @typescript-eslint/no-this-alias
|
|
94
|
+
const _this = this;
|
|
95
|
+
return (function () {
|
|
94
96
|
// eslint-disable-next-line no-unreachable-loop
|
|
95
|
-
while (
|
|
96
|
-
|
|
97
|
-
return
|
|
97
|
+
while (_this.exports.asyncify_get_state() === AsyncifyState.REWINDING) {
|
|
98
|
+
_this.exports.asyncify_stop_rewind();
|
|
99
|
+
return _this.value;
|
|
98
100
|
}
|
|
99
|
-
|
|
100
|
-
const v = f(
|
|
101
|
+
_this.assertState();
|
|
102
|
+
const v = f.apply(this, arguments);
|
|
101
103
|
if (!isPromiseLike(v))
|
|
102
104
|
return v;
|
|
103
|
-
|
|
104
|
-
|
|
105
|
+
_this.exports.asyncify_start_unwind(_this.dataPtr);
|
|
106
|
+
_this.value = v;
|
|
105
107
|
});
|
|
106
108
|
}
|
|
107
109
|
wrapImports(imports) {
|
|
@@ -123,17 +125,19 @@ export class Asyncify {
|
|
|
123
125
|
return importObject;
|
|
124
126
|
}
|
|
125
127
|
wrapExportFunction(f) {
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
128
|
+
// eslint-disable-next-line @typescript-eslint/no-this-alias
|
|
129
|
+
const _this = this;
|
|
130
|
+
return (async function () {
|
|
131
|
+
_this.assertState();
|
|
132
|
+
let ret = f.apply(this, arguments);
|
|
133
|
+
while (_this.exports.asyncify_get_state() === AsyncifyState.UNWINDING) {
|
|
134
|
+
_this.exports.asyncify_stop_unwind();
|
|
135
|
+
_this.value = await _this.value;
|
|
136
|
+
_this.assertState();
|
|
137
|
+
_this.exports.asyncify_start_rewind(_this.dataPtr);
|
|
138
|
+
ret = f.call(this);
|
|
135
139
|
}
|
|
136
|
-
|
|
140
|
+
_this.assertState();
|
|
137
141
|
return ret;
|
|
138
142
|
});
|
|
139
143
|
}
|
|
@@ -147,16 +151,3 @@ export class Asyncify {
|
|
|
147
151
|
});
|
|
148
152
|
}
|
|
149
153
|
}
|
|
150
|
-
// /** @public */
|
|
151
|
-
// export class Instance extends WebAssembly.Instance {
|
|
152
|
-
// constructor (options: AsyncifyOptions, module: WebAssembly.Module, importObject?: WebAssembly.Imports) {
|
|
153
|
-
// importObject = importObject ?? {}
|
|
154
|
-
// const asyncify = new Asyncify()
|
|
155
|
-
// super(module, asyncify.wrapImports(importObject))
|
|
156
|
-
// asyncify.init(importObject, this, options)
|
|
157
|
-
// }
|
|
158
|
-
// get exports (): WebAssembly.Exports {
|
|
159
|
-
// return wrappedExports.get(super.exports)!
|
|
160
|
-
// }
|
|
161
|
-
// }
|
|
162
|
-
// Object.defineProperty(Instance.prototype, 'exports', { enumerable: true })
|
package/lib/mjs/load.mjs
CHANGED
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
import { _WebAssembly } from "./webassembly.mjs";
|
|
2
2
|
import { Asyncify } from "./asyncify.mjs";
|
|
3
|
+
function validateImports(imports) {
|
|
4
|
+
if (imports && typeof imports !== 'object') {
|
|
5
|
+
throw new TypeError('imports must be an object or undefined');
|
|
6
|
+
}
|
|
7
|
+
}
|
|
3
8
|
async function fetchWasm(urlOrBuffer, imports) {
|
|
4
9
|
if (typeof wx !== 'undefined' && typeof __wxConfig !== 'undefined') {
|
|
5
10
|
return await _WebAssembly.instantiate(urlOrBuffer, imports);
|
|
@@ -10,24 +15,12 @@ async function fetchWasm(urlOrBuffer, imports) {
|
|
|
10
15
|
return source;
|
|
11
16
|
}
|
|
12
17
|
/** @public */
|
|
13
|
-
export async function load(urlOrBuffer, imports
|
|
14
|
-
|
|
15
|
-
if (imports && typeof imports !== 'object') {
|
|
16
|
-
throw new TypeError('imports must be an object or undefined');
|
|
17
|
-
}
|
|
18
|
+
export async function load(urlOrBuffer, imports) {
|
|
19
|
+
validateImports(imports);
|
|
18
20
|
imports = imports !== null && imports !== void 0 ? imports : {};
|
|
19
|
-
let asyncifyHelper;
|
|
20
21
|
let source;
|
|
21
|
-
if (asyncify) {
|
|
22
|
-
asyncifyHelper = new Asyncify();
|
|
23
|
-
imports = asyncifyHelper.wrapImports(imports);
|
|
24
|
-
}
|
|
25
22
|
if (urlOrBuffer instanceof ArrayBuffer || ArrayBuffer.isView(urlOrBuffer)) {
|
|
26
23
|
source = await _WebAssembly.instantiate(urlOrBuffer, imports);
|
|
27
|
-
if (asyncify) {
|
|
28
|
-
const memory = source.instance.exports.memory || ((_a = imports.env) === null || _a === void 0 ? void 0 : _a.memory);
|
|
29
|
-
return { module: source.module, instance: asyncifyHelper.init(memory, source.instance, asyncify) };
|
|
30
|
-
}
|
|
31
24
|
return source;
|
|
32
25
|
}
|
|
33
26
|
if (typeof urlOrBuffer !== 'string' && !(urlOrBuffer instanceof URL)) {
|
|
@@ -44,33 +37,39 @@ export async function load(urlOrBuffer, imports, asyncify) {
|
|
|
44
37
|
else {
|
|
45
38
|
source = await fetchWasm(urlOrBuffer, imports);
|
|
46
39
|
}
|
|
47
|
-
if (asyncify) {
|
|
48
|
-
const memory = source.instance.exports.memory || ((_b = imports.env) === null || _b === void 0 ? void 0 : _b.memory);
|
|
49
|
-
return { module: source.module, instance: asyncifyHelper.init(memory, source.instance, asyncify) };
|
|
50
|
-
}
|
|
51
40
|
return source;
|
|
52
41
|
}
|
|
53
42
|
/** @public */
|
|
54
|
-
export function
|
|
43
|
+
export async function asyncifyLoad(asyncify, urlOrBuffer, imports) {
|
|
55
44
|
var _a;
|
|
45
|
+
validateImports(imports);
|
|
46
|
+
imports = imports !== null && imports !== void 0 ? imports : {};
|
|
47
|
+
const asyncifyHelper = new Asyncify();
|
|
48
|
+
imports = asyncifyHelper.wrapImports(imports);
|
|
49
|
+
const source = await load(urlOrBuffer, imports);
|
|
50
|
+
const memory = source.instance.exports.memory || ((_a = imports.env) === null || _a === void 0 ? void 0 : _a.memory);
|
|
51
|
+
return { module: source.module, instance: asyncifyHelper.init(memory, source.instance, asyncify) };
|
|
52
|
+
}
|
|
53
|
+
/** @public */
|
|
54
|
+
export function loadSync(buffer, imports) {
|
|
56
55
|
if ((buffer instanceof ArrayBuffer) && !ArrayBuffer.isView(buffer)) {
|
|
57
56
|
throw new TypeError('Invalid source');
|
|
58
57
|
}
|
|
59
|
-
|
|
60
|
-
throw new TypeError('imports must be an object or undefined');
|
|
61
|
-
}
|
|
58
|
+
validateImports(imports);
|
|
62
59
|
imports = imports !== null && imports !== void 0 ? imports : {};
|
|
63
|
-
let asyncifyHelper;
|
|
64
|
-
if (asyncify) {
|
|
65
|
-
asyncifyHelper = new Asyncify();
|
|
66
|
-
imports = asyncifyHelper.wrapImports(imports);
|
|
67
|
-
}
|
|
68
60
|
const module = new _WebAssembly.Module(buffer);
|
|
69
61
|
const instance = new _WebAssembly.Instance(module, imports);
|
|
70
62
|
const source = { instance, module };
|
|
71
|
-
if (asyncify) {
|
|
72
|
-
const memory = source.instance.exports.memory || ((_a = imports.env) === null || _a === void 0 ? void 0 : _a.memory);
|
|
73
|
-
return { module: source.module, instance: asyncifyHelper.init(memory, instance, asyncify) };
|
|
74
|
-
}
|
|
75
63
|
return source;
|
|
76
64
|
}
|
|
65
|
+
/** @public */
|
|
66
|
+
export function asyncifyLoadSync(asyncify, buffer, imports) {
|
|
67
|
+
var _a;
|
|
68
|
+
validateImports(imports);
|
|
69
|
+
imports = imports !== null && imports !== void 0 ? imports : {};
|
|
70
|
+
const asyncifyHelper = new Asyncify();
|
|
71
|
+
imports = asyncifyHelper.wrapImports(imports);
|
|
72
|
+
const source = loadSync(buffer, imports);
|
|
73
|
+
const memory = source.instance.exports.memory || ((_a = imports.env) === null || _a === void 0 ? void 0 : _a.memory);
|
|
74
|
+
return { module: source.module, instance: asyncifyHelper.init(memory, source.instance, asyncify) };
|
|
75
|
+
}
|
package/lib/mjs/memory.mjs
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { _WebAssembly } from "./webassembly.mjs";
|
|
2
2
|
/** @public */
|
|
3
|
-
export const WebAssemblyMemory = _WebAssembly.Memory;
|
|
3
|
+
export const WebAssemblyMemory = /*#__PURE__*/ _WebAssembly.Memory;
|
|
4
4
|
/** @public */
|
|
5
5
|
export class Memory extends WebAssemblyMemory {
|
|
6
6
|
// eslint-disable-next-line @typescript-eslint/no-useless-constructor
|
package/lib/mjs/wasi/fd.mjs
CHANGED
|
@@ -112,7 +112,6 @@ export class FileDescriptorTable {
|
|
|
112
112
|
this.size = options.size;
|
|
113
113
|
this.fds = Array(options.size);
|
|
114
114
|
this.stdio = [options.in, options.out, options.err];
|
|
115
|
-
this.fs = options.fs;
|
|
116
115
|
this.print = options.print;
|
|
117
116
|
this.printErr = options.printErr;
|
|
118
117
|
this.insertStdio(options.in, 0, '<stdin>');
|
|
@@ -159,18 +158,6 @@ export class FileDescriptorTable {
|
|
|
159
158
|
this.used++;
|
|
160
159
|
return entry;
|
|
161
160
|
}
|
|
162
|
-
getFileTypeByFd(fd) {
|
|
163
|
-
const stat = this.fs.fstatSync(fd);
|
|
164
|
-
return toFileType(stat);
|
|
165
|
-
}
|
|
166
|
-
insertPreopen(fd, mappedPath, realPath) {
|
|
167
|
-
const type = this.getFileTypeByFd(fd);
|
|
168
|
-
if (type !== WasiFileType.DIRECTORY) {
|
|
169
|
-
throw new WasiError(`Preopen not dir: ["${mappedPath}", "${realPath}"]`, WasiErrno.ENOTDIR);
|
|
170
|
-
}
|
|
171
|
-
const result = getRights(this.stdio, fd, 0, type);
|
|
172
|
-
return this.insert(fd, mappedPath, realPath, type, result.base, result.inheriting, 1);
|
|
173
|
-
}
|
|
174
161
|
get(id, base, inheriting) {
|
|
175
162
|
if (id >= this.size) {
|
|
176
163
|
throw new WasiError('Invalid fd', WasiErrno.EBADF);
|
|
@@ -196,6 +183,24 @@ export class FileDescriptorTable {
|
|
|
196
183
|
this.fds[id] = undefined;
|
|
197
184
|
this.used--;
|
|
198
185
|
}
|
|
186
|
+
}
|
|
187
|
+
export class SyncTable extends FileDescriptorTable {
|
|
188
|
+
constructor(options) {
|
|
189
|
+
super(options);
|
|
190
|
+
this.fs = options.fs;
|
|
191
|
+
}
|
|
192
|
+
getFileTypeByFd(fd) {
|
|
193
|
+
const stats = this.fs.fstatSync(fd, { bigint: true });
|
|
194
|
+
return toFileType(stats);
|
|
195
|
+
}
|
|
196
|
+
insertPreopen(fd, mappedPath, realPath) {
|
|
197
|
+
const type = this.getFileTypeByFd(fd);
|
|
198
|
+
if (type !== WasiFileType.DIRECTORY) {
|
|
199
|
+
throw new WasiError(`Preopen not dir: ["${mappedPath}", "${realPath}"]`, WasiErrno.ENOTDIR);
|
|
200
|
+
}
|
|
201
|
+
const result = getRights(this.stdio, fd, 0, type);
|
|
202
|
+
return this.insert(fd, mappedPath, realPath, type, result.base, result.inheriting, 1);
|
|
203
|
+
}
|
|
199
204
|
renumber(dst, src) {
|
|
200
205
|
if (dst === src)
|
|
201
206
|
return;
|
|
@@ -214,3 +219,38 @@ export class FileDescriptorTable {
|
|
|
214
219
|
this.used--;
|
|
215
220
|
}
|
|
216
221
|
}
|
|
222
|
+
export class AsyncTable extends FileDescriptorTable {
|
|
223
|
+
// eslint-disable-next-line @typescript-eslint/no-useless-constructor
|
|
224
|
+
constructor(options) {
|
|
225
|
+
super(options);
|
|
226
|
+
}
|
|
227
|
+
async getFileTypeByFd(fd) {
|
|
228
|
+
const stats = await fd.stat({ bigint: true });
|
|
229
|
+
return toFileType(stats);
|
|
230
|
+
}
|
|
231
|
+
async insertPreopen(fd, mappedPath, realPath) {
|
|
232
|
+
const type = await this.getFileTypeByFd(fd);
|
|
233
|
+
if (type !== WasiFileType.DIRECTORY) {
|
|
234
|
+
throw new WasiError(`Preopen not dir: ["${mappedPath}", "${realPath}"]`, WasiErrno.ENOTDIR);
|
|
235
|
+
}
|
|
236
|
+
const result = getRights(this.stdio, fd.fd, 0, type);
|
|
237
|
+
return this.insert(fd, mappedPath, realPath, type, result.base, result.inheriting, 1);
|
|
238
|
+
}
|
|
239
|
+
async renumber(dst, src) {
|
|
240
|
+
if (dst === src)
|
|
241
|
+
return;
|
|
242
|
+
if (dst >= this.size || src >= this.size) {
|
|
243
|
+
throw new WasiError('Invalid fd', WasiErrno.EBADF);
|
|
244
|
+
}
|
|
245
|
+
const dstEntry = this.fds[dst];
|
|
246
|
+
const srcEntry = this.fds[src];
|
|
247
|
+
if (!dstEntry || !srcEntry || dstEntry.id !== dst || srcEntry.id !== src) {
|
|
248
|
+
throw new WasiError('Invalid fd', WasiErrno.EBADF);
|
|
249
|
+
}
|
|
250
|
+
await dstEntry.fd.close();
|
|
251
|
+
this.fds[dst] = this.fds[src];
|
|
252
|
+
this.fds[dst].id = dst;
|
|
253
|
+
this.fds[src] = undefined;
|
|
254
|
+
this.used--;
|
|
255
|
+
}
|
|
256
|
+
}
|
package/lib/mjs/wasi/index.mjs
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { WASI as _WASI } from "./preview1.mjs";
|
|
2
|
-
import { validateObject, validateArray, validateBoolean, validateFunction, validateUndefined
|
|
3
|
-
|
|
2
|
+
import { validateObject, validateArray, validateBoolean, validateFunction, validateUndefined } from "./util.mjs";
|
|
3
|
+
// eslint-disable-next-line spaced-comment
|
|
4
|
+
const kEmptyObject = /*#__PURE__*/ Object.freeze(/*#__PURE__*/ Object.create(null));
|
|
4
5
|
const kExitCode = Symbol('kExitCode');
|
|
5
6
|
const kSetMemory = Symbol('kSetMemory');
|
|
6
7
|
const kStarted = Symbol('kStarted');
|
|
@@ -13,74 +14,105 @@ function setupInstance(self, instance) {
|
|
|
13
14
|
}
|
|
14
15
|
// /** @public */
|
|
15
16
|
// export type WasiSnapshotPreview1 = Omit<_WASI, '_setMemory'>
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
if (value !== undefined) {
|
|
30
|
-
env.push(`${key}=${value}`);
|
|
31
|
-
}
|
|
32
|
-
});
|
|
33
|
-
}
|
|
34
|
-
const preopens = [];
|
|
35
|
-
if (options.preopens !== undefined) {
|
|
36
|
-
validateObject(options.preopens, 'options.preopens');
|
|
37
|
-
Object.entries(options.preopens).forEach(({ 0: key, 1: value }) => preopens.push({ mappedPath: String(key), realPath: String(value) }));
|
|
38
|
-
}
|
|
39
|
-
if (preopens.length > 0) {
|
|
40
|
-
if (options.filesystem === undefined) {
|
|
41
|
-
throw new Error('filesystem is disabled, can not preopen directory');
|
|
17
|
+
function validateOptions(options) {
|
|
18
|
+
var _a;
|
|
19
|
+
validateObject(options, 'options');
|
|
20
|
+
if (options.args !== undefined) {
|
|
21
|
+
validateArray(options.args, 'options.args');
|
|
22
|
+
}
|
|
23
|
+
const args = ((_a = options.args) !== null && _a !== void 0 ? _a : []).map(String);
|
|
24
|
+
const env = [];
|
|
25
|
+
if (options.env !== undefined) {
|
|
26
|
+
validateObject(options.env, 'options.env');
|
|
27
|
+
Object.entries(options.env).forEach(({ 0: key, 1: value }) => {
|
|
28
|
+
if (value !== undefined) {
|
|
29
|
+
env.push(`${key}=${value}`);
|
|
42
30
|
}
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
const preopens = [];
|
|
34
|
+
if (options.preopens !== undefined) {
|
|
35
|
+
validateObject(options.preopens, 'options.preopens');
|
|
36
|
+
Object.entries(options.preopens).forEach(({ 0: key, 1: value }) => preopens.push({ mappedPath: String(key), realPath: String(value) }));
|
|
37
|
+
}
|
|
38
|
+
if (preopens.length > 0) {
|
|
39
|
+
if (options.fs === undefined) {
|
|
40
|
+
throw new Error('filesystem is disabled, can not preopen directory');
|
|
43
41
|
}
|
|
44
|
-
|
|
45
|
-
validateObject(options.
|
|
46
|
-
validateString(options.filesystem.type, 'options.filesystem.type');
|
|
47
|
-
if (options.filesystem.type !== 'memfs') {
|
|
48
|
-
throw new Error(`Filesystem type ${options.filesystem.type} is not supported, only "memfs" is supported currently`);
|
|
49
|
-
}
|
|
50
|
-
try {
|
|
51
|
-
validateObject(options.filesystem.fs, 'options.filesystem.fs');
|
|
52
|
-
}
|
|
53
|
-
catch (_) {
|
|
54
|
-
throw new Error('Node.js fs like implementation is not provided');
|
|
55
|
-
}
|
|
42
|
+
try {
|
|
43
|
+
validateObject(options.fs, 'options.fs');
|
|
56
44
|
}
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
if (options.printErr !== undefined)
|
|
60
|
-
validateFunction(options.printErr, 'options.printErr');
|
|
61
|
-
// const { stdin = 0, stdout = 1, stderr = 2 } = options
|
|
62
|
-
// validateInt32(stdin, 'options.stdin', 0)
|
|
63
|
-
// validateInt32(stdout, 'options.stdout', 0)
|
|
64
|
-
// validateInt32(stderr, 'options.stderr', 0)
|
|
65
|
-
// const stdio = [stdin, stdout, stderr] as const
|
|
66
|
-
const stdio = [0, 1, 2];
|
|
67
|
-
const wrap = new _WASI(args, env, preopens, stdio, options.filesystem, options.print, options.printErr);
|
|
68
|
-
for (const prop in wrap) {
|
|
69
|
-
wrap[prop] = wrap[prop].bind(wrap);
|
|
45
|
+
catch (_) {
|
|
46
|
+
throw new TypeError('Node.js fs like implementation is not provided');
|
|
70
47
|
}
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
48
|
+
}
|
|
49
|
+
// if (options.filesystem !== undefined) {
|
|
50
|
+
// validateObject(options.filesystem, 'options.filesystem')
|
|
51
|
+
// validateString(options.filesystem.type, 'options.filesystem.type')
|
|
52
|
+
// if (options.filesystem.type !== 'memfs' && options.filesystem.type !== 'file-system-access-api') {
|
|
53
|
+
// throw new Error(`Filesystem type ${(options.filesystem as any).type as string} is not supported, only "memfs" and "file-system-access-api" is supported currently`)
|
|
54
|
+
// }
|
|
55
|
+
// try {
|
|
56
|
+
// validateObject(options.filesystem.fs, 'options.filesystem.fs')
|
|
57
|
+
// } catch (_) {
|
|
58
|
+
// throw new Error('Node.js fs like implementation is not provided')
|
|
59
|
+
// }
|
|
60
|
+
// }
|
|
61
|
+
if (options.print !== undefined)
|
|
62
|
+
validateFunction(options.print, 'options.print');
|
|
63
|
+
if (options.printErr !== undefined)
|
|
64
|
+
validateFunction(options.printErr, 'options.printErr');
|
|
65
|
+
if (options.returnOnExit !== undefined) {
|
|
66
|
+
validateBoolean(options.returnOnExit, 'options.returnOnExit');
|
|
67
|
+
}
|
|
68
|
+
// const { stdin = 0, stdout = 1, stderr = 2 } = options
|
|
69
|
+
// validateInt32(stdin, 'options.stdin', 0)
|
|
70
|
+
// validateInt32(stdout, 'options.stdout', 0)
|
|
71
|
+
// validateInt32(stderr, 'options.stderr', 0)
|
|
72
|
+
// const stdio = [stdin, stdout, stderr] as const
|
|
73
|
+
const stdio = [0, 1, 2];
|
|
74
|
+
return {
|
|
75
|
+
args,
|
|
76
|
+
env,
|
|
77
|
+
preopens,
|
|
78
|
+
stdio
|
|
79
|
+
};
|
|
80
|
+
}
|
|
81
|
+
/** @public */
|
|
82
|
+
export class WASI {
|
|
83
|
+
constructor(setMemory, wrap) {
|
|
84
|
+
this[kSetMemory] = setMemory;
|
|
79
85
|
this.wasiImport = wrap;
|
|
80
86
|
this[kStarted] = false;
|
|
81
87
|
this[kExitCode] = 0;
|
|
82
88
|
this[kInstance] = undefined;
|
|
83
89
|
}
|
|
90
|
+
static createSync(options = kEmptyObject) {
|
|
91
|
+
const { args, env, preopens, stdio } = validateOptions(options);
|
|
92
|
+
const wrap = _WASI.createSync(args, env, preopens, stdio, options.fs, options.print, options.printErr);
|
|
93
|
+
const setMemory = wrap._setMemory;
|
|
94
|
+
delete wrap._setMemory;
|
|
95
|
+
const _this = new WASI(setMemory, wrap);
|
|
96
|
+
if (options.returnOnExit) {
|
|
97
|
+
wrap.proc_exit = wasiReturnOnProcExit.bind(_this);
|
|
98
|
+
}
|
|
99
|
+
return _this;
|
|
100
|
+
}
|
|
101
|
+
static async createAsync(options = kEmptyObject) {
|
|
102
|
+
const { args, env, preopens, stdio } = validateOptions(options);
|
|
103
|
+
if (options.asyncify !== undefined) {
|
|
104
|
+
validateObject(options.asyncify, 'options.asyncify');
|
|
105
|
+
validateFunction(options.asyncify.wrapImportFunction, 'options.asyncify.wrapImportFunction');
|
|
106
|
+
}
|
|
107
|
+
const wrap = await _WASI.createAsync(args, env, preopens, stdio, options.fs, options.print, options.printErr, options.asyncify);
|
|
108
|
+
const setMemory = wrap._setMemory;
|
|
109
|
+
delete wrap._setMemory;
|
|
110
|
+
const _this = new WASI(setMemory, wrap);
|
|
111
|
+
if (options.returnOnExit) {
|
|
112
|
+
wrap.proc_exit = wasiReturnOnProcExit.bind(_this);
|
|
113
|
+
}
|
|
114
|
+
return _this;
|
|
115
|
+
}
|
|
84
116
|
// Must not export _initialize, must export _start
|
|
85
117
|
start(instance) {
|
|
86
118
|
if (this[kStarted]) {
|