@tybys/wasm-util 0.8.3 → 0.10.0

package/dist/wasm-util.d.ts

@@ -111,6 +111,11 @@ export declare interface FileHandle {
     close(): Promise<void>;
 }
 
+/** @public */
+export declare interface FinalizeBindingsOptions {
+    memory?: WebAssembly.Memory;
+}
+
 /** @public */
 export declare interface IDirent {
     isFile(): boolean;
@@ -375,6 +380,7 @@ export declare class WASI {
     private [kBindingName];
     readonly wasiImport: Record<string, any>;
     constructor(options?: SyncWASIOptions);
+    finalizeBindings(instance: WebAssembly.Instance, { memory }?: FinalizeBindingsOptions): void;
     start(instance: WebAssembly.Instance): number | undefined | Promise<number> | Promise<undefined>;
     initialize(instance: WebAssembly.Instance): void | Promise<void>;
     getImportObject(): Record<string, Record<string, any>>;

package/dist/wasm-util.esm-bundler.js

@@ -591,7 +591,8 @@ const RIGHTS_ALL = WasiRights.FD_DATASYNC |
     WasiRights.PATH_UNLINK_FILE |
     WasiRights.PATH_REMOVE_DIRECTORY |
     WasiRights.POLL_FD_READWRITE |
-    WasiRights.SOCK_SHUTDOWN;
+    WasiRights.SOCK_SHUTDOWN |
+    WasiRights.SOCK_ACCEPT;
 const BLOCK_DEVICE_BASE = RIGHTS_ALL;
 const BLOCK_DEVICE_INHERITING = RIGHTS_ALL;
 const CHARACTER_DEVICE_BASE = RIGHTS_ALL;
@@ -1127,6 +1128,7 @@ async function resolvePathAsync(fs, fileDescriptor, path, flags) {
 const encoder = /*#__PURE__*/ new TextEncoder();
 // eslint-disable-next-line spaced-comment
 const decoder = /*#__PURE__*/ new TextDecoder();
+const INT64_MAX = (BigInt(1) << BigInt(63)) - BigInt(1);
 function readStdin() {
     const value = window.prompt();
     if (value === null)
@@ -1134,6 +1136,14 @@ function readStdin() {
     const buffer = new TextEncoder().encode(value + '\n');
     return buffer;
 }
+function validateFstFlagsOrReturn(flags) {
+    return (Boolean((flags) & ~(1 /* WasiFstFlag.SET_ATIM */ | 2 /* WasiFstFlag.SET_ATIM_NOW */ |
+        4 /* WasiFstFlag.SET_MTIM */ | 8 /* WasiFstFlag.SET_MTIM_NOW */)) ||
+        ((flags) & (1 /* WasiFstFlag.SET_ATIM */ | 2 /* WasiFstFlag.SET_ATIM_NOW */)) ===
+            (1 /* WasiFstFlag.SET_ATIM */ | 2 /* WasiFstFlag.SET_ATIM_NOW */) ||
+        ((flags) & (4 /* WasiFstFlag.SET_MTIM */ | 8 /* WasiFstFlag.SET_MTIM_NOW */)) ===
+            (4 /* WasiFstFlag.SET_MTIM */ | 8 /* WasiFstFlag.SET_MTIM_NOW */));
+}
 class WASI$1 {
     constructor(args, env, fds, asyncFs, fs, asyncify) {
         this.args_get = syscallWrap(this, 'args_get', function (argv, argv_buf) {
@@ -1230,7 +1240,7 @@ class WASI$1 {
                 case 1 /* WasiClockid.MONOTONIC */:
                 case 2 /* WasiClockid.PROCESS_CPUTIME_ID */:
                 case 3 /* WasiClockid.THREAD_CPUTIME_ID */: {
-                    const t = performance.now();
+                    const t = performance.now() / 1000;
                     const s = Math.trunc(t);
                     const ms = Math.floor((t - s) * 1000);
                     const result = BigInt(s) * BigInt(1000000000) + BigInt(ms) * BigInt(1000000);
@@ -1294,7 +1304,7 @@ class WASI$1 {
             const { view } = getMemory(this);
             // preopen type is dir(0)
             view.setUint32(prestat, 0, true);
-            view.setUint32(prestat + 4, encoder.encode(fileDescriptor.path).length + 1, true);
+            view.setUint32(prestat + 4, encoder.encode(fileDescriptor.path).length, true);
             return 0 /* WasiErrno.ESUCCESS */;
         });
         this.fd_prestat_dir_name = syscallWrap(this, 'fd_prestat_dir_name', function (fd, path, path_len) {
@@ -1307,7 +1317,7 @@ class WASI$1 {
             const fileDescriptor = wasi.fds.get(fd, BigInt(0), BigInt(0));
             if (fileDescriptor.preopen !== 1)
                 return 8 /* WasiErrno.EBADF */;
-            const buffer = encoder.encode(fileDescriptor.path + '\0');
+            const buffer = encoder.encode(fileDescriptor.path);
             const size = buffer.length;
             if (size > path_len)
                 return 42 /* WasiErrno.ENOBUFS */;
@@ -1502,6 +1512,9 @@ class WASI$1 {
         this.sock_shutdown = syscallWrap(this, 'sock_shutdown', function () {
             return 58 /* WasiErrno.ENOTSUP */;
         });
+        this.sock_accept = syscallWrap(this, 'sock_accept', function () {
+            return 58 /* WasiErrno.ENOTSUP */;
+        });
         _wasi.set(this, {
             fds,
             args,
@@ -1617,11 +1630,17 @@ class WASI$1 {
             return { fileDescriptor, atim, mtim };
         }
         defineImport('fd_filestat_set_times', function fd_filestat_set_times(fd, atim, mtim, flags) {
+            if (validateFstFlagsOrReturn(flags)) {
+                return 28 /* WasiErrno.EINVAL */;
+            }
             const { fileDescriptor, atim: atimRes, mtim: mtimRes } = fdFilestatGetTimes.call(this, fd, atim, mtim, flags);
             const fs = getFs(this);
             fs.futimesSync(fileDescriptor.fd, Number(atimRes), Number(mtimRes));
             return 0 /* WasiErrno.ESUCCESS */;
         }, async function fd_filestat_set_times(fd, atim, mtim, flags) {
+            if (validateFstFlagsOrReturn(flags)) {
+                return 28 /* WasiErrno.EINVAL */;
+            }
             const { fileDescriptor, atim: atimRes, mtim: mtimRes } = fdFilestatGetTimes.call(this, fd, atim, mtim, flags);
             const h = fileDescriptor.fd;
             await h.utimes(Number(atimRes), Number(mtimRes));
@@ -1630,12 +1649,16 @@ class WASI$1 {
         defineImport('fd_pread', function fd_pread(fd, iovs, iovslen, offset, size) {
             iovs = Number(iovs);
             size = Number(size);
-            if (iovs === 0 || size === 0) {
+            if ((iovs === 0 && iovslen) || size === 0 || offset > INT64_MAX) {
                 return 28 /* WasiErrno.EINVAL */;
             }
             const { HEAPU8, view } = getMemory(this);
             const wasi = _wasi.get(this);
             const fileDescriptor = wasi.fds.get(fd, WasiRights.FD_READ | WasiRights.FD_SEEK, BigInt(0));
+            if (!iovslen) {
+                view.setUint32(size, 0, true);
+                return 0 /* WasiErrno.ESUCCESS */;
+            }
             let totalSize = 0;
             const ioVecs = Array.from({ length: Number(iovslen) }, (_, i) => {
                 const offset = iovs + (i * 8);
@@ -1662,12 +1685,16 @@ class WASI$1 {
         }, async function (fd, iovs, iovslen, offset, size) {
             iovs = Number(iovs);
             size = Number(size);
-            if (iovs === 0 || size === 0) {
+            if ((iovs === 0 && iovslen) || size === 0 || offset > INT64_MAX) {
                 return 28 /* WasiErrno.EINVAL */;
             }
             const { HEAPU8, view } = getMemory(this);
             const wasi = _wasi.get(this);
             const fileDescriptor = wasi.fds.get(fd, WasiRights.FD_READ | WasiRights.FD_SEEK, BigInt(0));
+            if (!iovslen) {
+                view.setUint32(size, 0, true);
+                return 0 /* WasiErrno.ESUCCESS */;
+            }
             let totalSize = 0;
             const ioVecs = Array.from({ length: Number(iovslen) }, (_, i) => {
                 const offset = iovs + (i * 8);
@@ -1687,12 +1714,16 @@ class WASI$1 {
         defineImport('fd_pwrite', function fd_pwrite(fd, iovs, iovslen, offset, size) {
             iovs = Number(iovs);
             size = Number(size);
-            if (iovs === 0 || size === 0) {
+            if ((iovs === 0 && iovslen) || size === 0 || offset > INT64_MAX) {
                 return 28 /* WasiErrno.EINVAL */;
             }
             const { HEAPU8, view } = getMemory(this);
             const wasi = _wasi.get(this);
             const fileDescriptor = wasi.fds.get(fd, WasiRights.FD_WRITE | WasiRights.FD_SEEK, BigInt(0));
+            if (!iovslen) {
+                view.setUint32(size, 0, true);
+                return 0 /* WasiErrno.ESUCCESS */;
+            }
             const buffer = concatBuffer(Array.from({ length: Number(iovslen) }, (_, i) => {
                 const offset = iovs + (i * 8);
                 const buf = view.getInt32(offset, true);
@@ -1706,12 +1737,16 @@ class WASI$1 {
         }, async function fd_pwrite(fd, iovs, iovslen, offset, size) {
             iovs = Number(iovs);
             size = Number(size);
-            if (iovs === 0 || size === 0) {
+            if ((iovs === 0 && iovslen) || size === 0 || offset > INT64_MAX) {
                 return 28 /* WasiErrno.EINVAL */;
             }
             const { HEAPU8, view } = getMemory(this);
             const wasi = _wasi.get(this);
             const fileDescriptor = wasi.fds.get(fd, WasiRights.FD_WRITE | WasiRights.FD_SEEK, BigInt(0));
+            if (!iovslen) {
+                view.setUint32(size, 0, true);
+                return 0 /* WasiErrno.ESUCCESS */;
+            }
             const buffer = concatBuffer(Array.from({ length: Number(iovslen) }, (_, i) => {
                 const offset = iovs + (i * 8);
                 const buf = view.getInt32(offset, true);
@@ -1725,12 +1760,16 @@ class WASI$1 {
         defineImport('fd_read', function fd_read(fd, iovs, iovslen, size) {
             iovs = Number(iovs);
             size = Number(size);
-            if (iovs === 0 || size === 0) {
+            if ((iovs === 0 && iovslen) || size === 0) {
                 return 28 /* WasiErrno.EINVAL */;
             }
             const { HEAPU8, view } = getMemory(this);
             const wasi = _wasi.get(this);
             const fileDescriptor = wasi.fds.get(fd, WasiRights.FD_READ, BigInt(0));
+            if (!iovslen) {
+                view.setUint32(size, 0, true);
+                return 0 /* WasiErrno.ESUCCESS */;
+            }
             let totalSize = 0;
             const ioVecs = Array.from({ length: Number(iovslen) }, (_, i) => {
                 const offset = iovs + (i * 8);
@@ -1768,12 +1807,16 @@ class WASI$1 {
         }, async function fd_read(fd, iovs, iovslen, size) {
             iovs = Number(iovs);
             size = Number(size);
-            if (iovs === 0 || size === 0) {
+            if ((iovs === 0 && iovslen) || size === 0) {
                 return 28 /* WasiErrno.EINVAL */;
             }
             const { HEAPU8, view } = getMemory(this);
             const wasi = _wasi.get(this);
             const fileDescriptor = wasi.fds.get(fd, WasiRights.FD_READ, BigInt(0));
+            if (!iovslen) {
+                view.setUint32(size, 0, true);
+                return 0 /* WasiErrno.ESUCCESS */;
+            }
             let totalSize = 0;
             const ioVecs = Array.from({ length: Number(iovslen) }, (_, i) => {
                 const offset = iovs + (i * 8);
@@ -1926,12 +1969,16 @@ class WASI$1 {
         defineImport('fd_write', function fd_write(fd, iovs, iovslen, size) {
             iovs = Number(iovs);
             size = Number(size);
-            if (iovs === 0 || size === 0) {
+            if ((iovs === 0 && iovslen) || size === 0) {
                 return 28 /* WasiErrno.EINVAL */;
             }
             const { HEAPU8, view } = getMemory(this);
             const wasi = _wasi.get(this);
             const fileDescriptor = wasi.fds.get(fd, WasiRights.FD_WRITE, BigInt(0));
+            if (!iovslen) {
+                view.setUint32(size, 0, true);
+                return 0 /* WasiErrno.ESUCCESS */;
+            }
             const buffer = concatBuffer(Array.from({ length: Number(iovslen) }, (_, i) => {
                 const offset = iovs + (i * 8);
                 const buf = view.getInt32(offset, true);
@@ -1952,12 +1999,16 @@ class WASI$1 {
         }, async function fd_write(fd, iovs, iovslen, size) {
             iovs = Number(iovs);
             size = Number(size);
-            if (iovs === 0 || size === 0) {
+            if ((iovs === 0 && iovslen) || size === 0) {
                 return 28 /* WasiErrno.EINVAL */;
             }
             const { HEAPU8, view } = getMemory(this);
             const wasi = _wasi.get(this);
             const fileDescriptor = wasi.fds.get(fd, WasiRights.FD_WRITE, BigInt(0));
+            if (!iovslen) {
+                view.setUint32(size, 0, true);
+                return 0 /* WasiErrno.ESUCCESS */;
+            }
             const buffer = concatBuffer(Array.from({ length: Number(iovslen) }, (_, i) => {
                 const offset = iovs + (i * 8);
                 const buf = view.getInt32(offset, true);
@@ -2054,15 +2105,12 @@ class WASI$1 {
             path_len = Number(path_len);
             if (path === 0)
                 return 28 /* WasiErrno.EINVAL */;
-            if ((fst_flags) & ~(1 /* WasiFstFlag.SET_ATIM */ |
-                2 /* WasiFstFlag.SET_ATIM_NOW */ |
-                4 /* WasiFstFlag.SET_MTIM */ |
-                8 /* WasiFstFlag.SET_MTIM_NOW */)) {
-                return 28 /* WasiErrno.EINVAL */;
-            }
             const { HEAPU8 } = getMemory(this);
             const wasi = _wasi.get(this);
             const fileDescriptor = wasi.fds.get(fd, WasiRights.PATH_FILESTAT_SET_TIMES, BigInt(0));
+            if (validateFstFlagsOrReturn(fst_flags)) {
+                return 28 /* WasiErrno.EINVAL */;
+            }
             const fs = getFs(this);
             const resolvedPath = resolvePathSync(fs, fileDescriptor, decoder.decode(unsharedSlice(HEAPU8, path, path + path_len)), flags);
             if ((fst_flags & 2 /* WasiFstFlag.SET_ATIM_NOW */) === 2 /* WasiFstFlag.SET_ATIM_NOW */) {
@@ -2078,15 +2126,12 @@ class WASI$1 {
             path_len = Number(path_len);
             if (path === 0)
                 return 28 /* WasiErrno.EINVAL */;
-            if ((fst_flags) & ~(1 /* WasiFstFlag.SET_ATIM */ |
-                2 /* WasiFstFlag.SET_ATIM_NOW */ |
-                4 /* WasiFstFlag.SET_MTIM */ |
-                8 /* WasiFstFlag.SET_MTIM_NOW */)) {
-                return 28 /* WasiErrno.EINVAL */;
-            }
             const { HEAPU8 } = getMemory(this);
             const wasi = _wasi.get(this);
             const fileDescriptor = wasi.fds.get(fd, WasiRights.PATH_FILESTAT_SET_TIMES, BigInt(0));
+            if (validateFstFlagsOrReturn(fst_flags)) {
+                return 28 /* WasiErrno.EINVAL */;
+            }
             const fs = getFs(this);
             const resolvedPath = await resolvePathAsync(fs, fileDescriptor, decoder.decode(unsharedSlice(HEAPU8, path, path + path_len)), flags);
             if ((fst_flags & 2 /* WasiFstFlag.SET_ATIM_NOW */) === 2 /* WasiFstFlag.SET_ATIM_NOW */) {
@@ -2213,7 +2258,9 @@ class WASI$1 {
             const resolved_path = resolvePathSync(fs, fileDescriptor, pathString, dirflags);
             const r = fs.openSync(resolved_path, flagsRes, 0o666);
             const filetype = wasi.fds.getFileTypeByFd(r);
-            if ((o_flags & 2 /* WasiFileControlFlag.O_DIRECTORY */) !== 0 && filetype !== 3 /* WasiFileType.DIRECTORY */) {
+            if ((filetype !== 3 /* WasiFileType.DIRECTORY */) &&
+                ((o_flags & 2 /* WasiFileControlFlag.O_DIRECTORY */) !== 0 ||
+                    (resolved_path.endsWith('/')))) {
                 return 54 /* WasiErrno.ENOTDIR */;
             }
             const { base: max_base, inheriting: max_inheriting } = getRights(wasi.fds.stdio, r, flagsRes, filetype);
@@ -2285,7 +2332,7 @@ class WASI$1 {
                 return 42 /* WasiErrno.ENOBUFS */;
             HEAPU8.set(linkData.subarray(0, len), buf);
             HEAPU8[buf + len] = 0;
-            view.setUint32(bufused, len + 1, true);
+            view.setUint32(bufused, len, true);
             return 0 /* WasiErrno.ESUCCESS */;
         }, async function path_readlink(fd, path, path_len, buf, buf_len, bufused) {
             path = Number(path);
@@ -2309,7 +2356,7 @@ class WASI$1 {
                 return 42 /* WasiErrno.ENOBUFS */;
             HEAPU8.set(linkData.subarray(0, len), buf);
             HEAPU8[buf + len] = 0;
-            view.setUint32(bufused, len + 1, true);
+            view.setUint32(bufused, len, true);
             return 0 /* WasiErrno.ESUCCESS */;
         }, ['i32', 'i32', 'i32', 'i32', 'i32', 'i32'], ['i32']);
         defineImport('path_remove_directory', function path_remove_directory(fd, path, path_len) {
@@ -2402,6 +2449,9 @@ class WASI$1 {
             const wasi = _wasi.get(this);
             const fileDescriptor = wasi.fds.get(fd, WasiRights.PATH_SYMLINK, BigInt(0));
             const oldPath = decoder.decode(unsharedSlice(HEAPU8, old_path, old_path + old_path_len));
+            if (oldPath.length > 0 && oldPath[0] === '/') {
+                return 63 /* WasiErrno.EPERM */;
+            }
             let newPath = decoder.decode(unsharedSlice(HEAPU8, new_path, new_path + new_path_len));
             newPath = resolve(fileDescriptor.realPath, newPath);
             const fs = getFs(this);
@@ -2510,12 +2560,6 @@ const kSetMemory = Symbol('kSetMemory');
 const kStarted = Symbol('kStarted');
 const kInstance = Symbol('kInstance');
 const kBindingName = Symbol('kBindingName');
-function setupInstance(self, instance) {
-    validateObject(instance, 'instance');
-    validateObject(instance.exports, 'instance.exports');
-    self[kInstance] = instance;
-    self[kSetMemory](instance.exports.memory);
-}
 function validateOptions(options) {
     var _a;
     validateObject(options, 'options');
@@ -2620,13 +2664,21 @@ class WASI {
             wrap.proc_exit = wasiReturnOnProcExit.bind(this);
         }
     }
-    // Must not export _initialize, must export _start
-    start(instance) {
+    finalizeBindings(instance, _a) {
+        var _b;
+        var { memory = (_b = instance === null || instance === void 0 ? void 0 : instance.exports) === null || _b === void 0 ? void 0 : _b.memory } = _a === void 0 ? {} : _a;
         if (this[kStarted]) {
             throw new Error('WASI instance has already started');
         }
+        validateObject(instance, 'instance');
+        validateObject(instance.exports, 'instance.exports');
+        this[kSetMemory](memory);
+        this[kInstance] = instance;
         this[kStarted] = true;
-        setupInstance(this, instance);
+    }
+    // Must not export _initialize, must export _start
+    start(instance) {
+        this.finalizeBindings(instance);
         const { _start, _initialize } = this[kInstance].exports;
         validateFunction(_start, 'instance.exports._start');
         validateUndefined(_initialize, 'instance.exports._initialize');
@@ -2651,11 +2703,7 @@ class WASI {
     }
     // Must not export _start, may optionally export _initialize
     initialize(instance) {
-        if (this[kStarted]) {
-            throw new Error('WASI instance has already started');
-        }
-        this[kStarted] = true;
-        setupInstance(this, instance);
+        this.finalizeBindings(instance);
         const { _start, _initialize } = this[kInstance].exports;
         validateUndefined(_start, 'instance.exports._start');
         if (_initialize !== undefined) {