@tybys/wasm-util 0.8.3 → 0.10.0

package/lib/cjs/wasi/preview1.js

@@ -121,6 +121,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)
@@ -128,6 +129,14 @@ function readStdin() {
     const buffer = new TextEncoder().encode(value + '\n');
     return buffer;
 }
+function validateFstFlagsOrReturn(flags) {
+    return (Boolean((flags) & ~(types_1.WasiFstFlag.SET_ATIM | types_1.WasiFstFlag.SET_ATIM_NOW |
+        types_1.WasiFstFlag.SET_MTIM | types_1.WasiFstFlag.SET_MTIM_NOW)) ||
+        ((flags) & (types_1.WasiFstFlag.SET_ATIM | types_1.WasiFstFlag.SET_ATIM_NOW)) ===
+            (types_1.WasiFstFlag.SET_ATIM | types_1.WasiFstFlag.SET_ATIM_NOW) ||
+        ((flags) & (types_1.WasiFstFlag.SET_MTIM | types_1.WasiFstFlag.SET_MTIM_NOW)) ===
+            (types_1.WasiFstFlag.SET_MTIM | types_1.WasiFstFlag.SET_MTIM_NOW));
+}
 class WASI {
     constructor(args, env, fds, asyncFs, fs, asyncify) {
         this.args_get = syscallWrap(this, 'args_get', function (argv, argv_buf) {
@@ -224,7 +233,7 @@ class WASI {
                 case types_1.WasiClockid.MONOTONIC:
                 case types_1.WasiClockid.PROCESS_CPUTIME_ID:
                 case types_1.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);
@@ -288,7 +297,7 @@ class WASI {
             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 types_1.WasiErrno.ESUCCESS;
         });
         this.fd_prestat_dir_name = syscallWrap(this, 'fd_prestat_dir_name', function (fd, path, path_len) {
@@ -301,7 +310,7 @@ class WASI {
             const fileDescriptor = wasi.fds.get(fd, BigInt(0), BigInt(0));
             if (fileDescriptor.preopen !== 1)
                 return types_1.WasiErrno.EBADF;
-            const buffer = encoder.encode(fileDescriptor.path + '\0');
+            const buffer = encoder.encode(fileDescriptor.path);
             const size = buffer.length;
             if (size > path_len)
                 return types_1.WasiErrno.ENOBUFS;
@@ -496,6 +505,9 @@ class WASI {
         this.sock_shutdown = syscallWrap(this, 'sock_shutdown', function () {
             return types_1.WasiErrno.ENOTSUP;
         });
+        this.sock_accept = syscallWrap(this, 'sock_accept', function () {
+            return types_1.WasiErrno.ENOTSUP;
+        });
         _wasi.set(this, {
             fds,
             args,
@@ -611,11 +623,17 @@ class WASI {
             return { fileDescriptor, atim, mtim };
         }
         defineImport('fd_filestat_set_times', function fd_filestat_set_times(fd, atim, mtim, flags) {
+            if (validateFstFlagsOrReturn(flags)) {
+                return types_1.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 types_1.WasiErrno.ESUCCESS;
         }, async function fd_filestat_set_times(fd, atim, mtim, flags) {
+            if (validateFstFlagsOrReturn(flags)) {
+                return types_1.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));
@@ -624,12 +642,16 @@ class WASI {
         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 types_1.WasiErrno.EINVAL;
             }
             const { HEAPU8, view } = getMemory(this);
             const wasi = _wasi.get(this);
             const fileDescriptor = wasi.fds.get(fd, types_1.WasiRights.FD_READ | types_1.WasiRights.FD_SEEK, BigInt(0));
+            if (!iovslen) {
+                view.setUint32(size, 0, true);
+                return types_1.WasiErrno.ESUCCESS;
+            }
             let totalSize = 0;
             const ioVecs = Array.from({ length: Number(iovslen) }, (_, i) => {
                 const offset = iovs + (i * 8);
@@ -656,12 +678,16 @@ class WASI {
         }, 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 types_1.WasiErrno.EINVAL;
             }
             const { HEAPU8, view } = getMemory(this);
             const wasi = _wasi.get(this);
             const fileDescriptor = wasi.fds.get(fd, types_1.WasiRights.FD_READ | types_1.WasiRights.FD_SEEK, BigInt(0));
+            if (!iovslen) {
+                view.setUint32(size, 0, true);
+                return types_1.WasiErrno.ESUCCESS;
+            }
             let totalSize = 0;
             const ioVecs = Array.from({ length: Number(iovslen) }, (_, i) => {
                 const offset = iovs + (i * 8);
@@ -681,12 +707,16 @@ class WASI {
         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 types_1.WasiErrno.EINVAL;
             }
             const { HEAPU8, view } = getMemory(this);
             const wasi = _wasi.get(this);
             const fileDescriptor = wasi.fds.get(fd, types_1.WasiRights.FD_WRITE | types_1.WasiRights.FD_SEEK, BigInt(0));
+            if (!iovslen) {
+                view.setUint32(size, 0, true);
+                return types_1.WasiErrno.ESUCCESS;
+            }
             const buffer = (0, fd_1.concatBuffer)(Array.from({ length: Number(iovslen) }, (_, i) => {
                 const offset = iovs + (i * 8);
                 const buf = view.getInt32(offset, true);
@@ -700,12 +730,16 @@ class WASI {
         }, 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 types_1.WasiErrno.EINVAL;
             }
             const { HEAPU8, view } = getMemory(this);
             const wasi = _wasi.get(this);
             const fileDescriptor = wasi.fds.get(fd, types_1.WasiRights.FD_WRITE | types_1.WasiRights.FD_SEEK, BigInt(0));
+            if (!iovslen) {
+                view.setUint32(size, 0, true);
+                return types_1.WasiErrno.ESUCCESS;
+            }
             const buffer = (0, fd_1.concatBuffer)(Array.from({ length: Number(iovslen) }, (_, i) => {
                 const offset = iovs + (i * 8);
                 const buf = view.getInt32(offset, true);
@@ -719,12 +753,16 @@ class WASI {
         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 types_1.WasiErrno.EINVAL;
             }
             const { HEAPU8, view } = getMemory(this);
             const wasi = _wasi.get(this);
             const fileDescriptor = wasi.fds.get(fd, types_1.WasiRights.FD_READ, BigInt(0));
+            if (!iovslen) {
+                view.setUint32(size, 0, true);
+                return types_1.WasiErrno.ESUCCESS;
+            }
             let totalSize = 0;
             const ioVecs = Array.from({ length: Number(iovslen) }, (_, i) => {
                 const offset = iovs + (i * 8);
@@ -762,12 +800,16 @@ class WASI {
         }, 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 types_1.WasiErrno.EINVAL;
             }
             const { HEAPU8, view } = getMemory(this);
             const wasi = _wasi.get(this);
             const fileDescriptor = wasi.fds.get(fd, types_1.WasiRights.FD_READ, BigInt(0));
+            if (!iovslen) {
+                view.setUint32(size, 0, true);
+                return types_1.WasiErrno.ESUCCESS;
+            }
             let totalSize = 0;
             const ioVecs = Array.from({ length: Number(iovslen) }, (_, i) => {
                 const offset = iovs + (i * 8);
@@ -920,12 +962,16 @@ class WASI {
         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 types_1.WasiErrno.EINVAL;
             }
             const { HEAPU8, view } = getMemory(this);
             const wasi = _wasi.get(this);
             const fileDescriptor = wasi.fds.get(fd, types_1.WasiRights.FD_WRITE, BigInt(0));
+            if (!iovslen) {
+                view.setUint32(size, 0, true);
+                return types_1.WasiErrno.ESUCCESS;
+            }
             const buffer = (0, fd_1.concatBuffer)(Array.from({ length: Number(iovslen) }, (_, i) => {
                 const offset = iovs + (i * 8);
                 const buf = view.getInt32(offset, true);
@@ -946,12 +992,16 @@ class WASI {
         }, 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 types_1.WasiErrno.EINVAL;
             }
             const { HEAPU8, view } = getMemory(this);
             const wasi = _wasi.get(this);
             const fileDescriptor = wasi.fds.get(fd, types_1.WasiRights.FD_WRITE, BigInt(0));
+            if (!iovslen) {
+                view.setUint32(size, 0, true);
+                return types_1.WasiErrno.ESUCCESS;
+            }
             const buffer = (0, fd_1.concatBuffer)(Array.from({ length: Number(iovslen) }, (_, i) => {
                 const offset = iovs + (i * 8);
                 const buf = view.getInt32(offset, true);
@@ -1048,15 +1098,12 @@ class WASI {
             path_len = Number(path_len);
             if (path === 0)
                 return types_1.WasiErrno.EINVAL;
-            if ((fst_flags) & ~(types_1.WasiFstFlag.SET_ATIM |
-                types_1.WasiFstFlag.SET_ATIM_NOW |
-                types_1.WasiFstFlag.SET_MTIM |
-                types_1.WasiFstFlag.SET_MTIM_NOW)) {
-                return types_1.WasiErrno.EINVAL;
-            }
             const { HEAPU8 } = getMemory(this);
             const wasi = _wasi.get(this);
             const fileDescriptor = wasi.fds.get(fd, types_1.WasiRights.PATH_FILESTAT_SET_TIMES, BigInt(0));
+            if (validateFstFlagsOrReturn(fst_flags)) {
+                return types_1.WasiErrno.EINVAL;
+            }
             const fs = getFs(this);
             const resolvedPath = resolvePathSync(fs, fileDescriptor, decoder.decode((0, util_1.unsharedSlice)(HEAPU8, path, path + path_len)), flags);
             if ((fst_flags & types_1.WasiFstFlag.SET_ATIM_NOW) === types_1.WasiFstFlag.SET_ATIM_NOW) {
@@ -1072,15 +1119,12 @@ class WASI {
             path_len = Number(path_len);
             if (path === 0)
                 return types_1.WasiErrno.EINVAL;
-            if ((fst_flags) & ~(types_1.WasiFstFlag.SET_ATIM |
-                types_1.WasiFstFlag.SET_ATIM_NOW |
-                types_1.WasiFstFlag.SET_MTIM |
-                types_1.WasiFstFlag.SET_MTIM_NOW)) {
-                return types_1.WasiErrno.EINVAL;
-            }
             const { HEAPU8 } = getMemory(this);
             const wasi = _wasi.get(this);
             const fileDescriptor = wasi.fds.get(fd, types_1.WasiRights.PATH_FILESTAT_SET_TIMES, BigInt(0));
+            if (validateFstFlagsOrReturn(fst_flags)) {
+                return types_1.WasiErrno.EINVAL;
+            }
             const fs = getFs(this);
             const resolvedPath = await resolvePathAsync(fs, fileDescriptor, decoder.decode((0, util_1.unsharedSlice)(HEAPU8, path, path + path_len)), flags);
             if ((fst_flags & types_1.WasiFstFlag.SET_ATIM_NOW) === types_1.WasiFstFlag.SET_ATIM_NOW) {
@@ -1207,7 +1251,9 @@ class WASI {
             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 & types_1.WasiFileControlFlag.O_DIRECTORY) !== 0 && filetype !== types_1.WasiFileType.DIRECTORY) {
+            if ((filetype !== types_1.WasiFileType.DIRECTORY) &&
+                ((o_flags & types_1.WasiFileControlFlag.O_DIRECTORY) !== 0 ||
+                    (resolved_path.endsWith('/')))) {
                 return types_1.WasiErrno.ENOTDIR;
             }
             const { base: max_base, inheriting: max_inheriting } = (0, rights_1.getRights)(wasi.fds.stdio, r, flagsRes, filetype);
@@ -1279,7 +1325,7 @@ class WASI {
                 return types_1.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 types_1.WasiErrno.ESUCCESS;
         }, async function path_readlink(fd, path, path_len, buf, buf_len, bufused) {
             path = Number(path);
@@ -1303,7 +1349,7 @@ class WASI {
                 return types_1.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 types_1.WasiErrno.ESUCCESS;
         }, ['i32', 'i32', 'i32', 'i32', 'i32', 'i32'], ['i32']);
         defineImport('path_remove_directory', function path_remove_directory(fd, path, path_len) {
@@ -1396,6 +1442,9 @@ class WASI {
             const wasi = _wasi.get(this);
             const fileDescriptor = wasi.fds.get(fd, types_1.WasiRights.PATH_SYMLINK, BigInt(0));
             const oldPath = decoder.decode((0, util_1.unsharedSlice)(HEAPU8, old_path, old_path + old_path_len));
+            if (oldPath.length > 0 && oldPath[0] === '/') {
+                return types_1.WasiErrno.EPERM;
+            }
             let newPath = decoder.decode((0, util_1.unsharedSlice)(HEAPU8, new_path, new_path + new_path_len));
             newPath = (0, path_1.resolve)(fileDescriptor.realPath, newPath);
             const fs = getFs(this);

package/lib/cjs/wasi/rights.js

@@ -32,7 +32,8 @@ exports.RIGHTS_ALL = types_1.WasiRights.FD_DATASYNC |
     types_1.WasiRights.PATH_UNLINK_FILE |
     types_1.WasiRights.PATH_REMOVE_DIRECTORY |
     types_1.WasiRights.POLL_FD_READWRITE |
-    types_1.WasiRights.SOCK_SHUTDOWN;
+    types_1.WasiRights.SOCK_SHUTDOWN |
+    types_1.WasiRights.SOCK_ACCEPT;
 exports.BLOCK_DEVICE_BASE = exports.RIGHTS_ALL;
 exports.BLOCK_DEVICE_INHERITING = exports.RIGHTS_ALL;
 exports.CHARACTER_DEVICE_BASE = exports.RIGHTS_ALL;

package/lib/mjs/wasi/index.mjs

@@ -7,12 +7,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');
@@ -117,13 +111,21 @@ export 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');
@@ -148,11 +150,7 @@ export 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) {

package/lib/mjs/wasi/preview1.mjs

@@ -118,6 +118,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)
@@ -125,6 +126,14 @@ function readStdin() {
     const buffer = new TextEncoder().encode(value + '\n');
     return buffer;
 }
+function validateFstFlagsOrReturn(flags) {
+    return (Boolean((flags) & ~(WasiFstFlag.SET_ATIM | WasiFstFlag.SET_ATIM_NOW |
+        WasiFstFlag.SET_MTIM | WasiFstFlag.SET_MTIM_NOW)) ||
+        ((flags) & (WasiFstFlag.SET_ATIM | WasiFstFlag.SET_ATIM_NOW)) ===
+            (WasiFstFlag.SET_ATIM | WasiFstFlag.SET_ATIM_NOW) ||
+        ((flags) & (WasiFstFlag.SET_MTIM | WasiFstFlag.SET_MTIM_NOW)) ===
+            (WasiFstFlag.SET_MTIM | WasiFstFlag.SET_MTIM_NOW));
+}
 export class WASI {
     constructor(args, env, fds, asyncFs, fs, asyncify) {
         this.args_get = syscallWrap(this, 'args_get', function (argv, argv_buf) {
@@ -221,7 +230,7 @@ export class WASI {
                 case WasiClockid.MONOTONIC:
                 case WasiClockid.PROCESS_CPUTIME_ID:
                 case 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);
@@ -285,7 +294,7 @@ export class WASI {
             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 WasiErrno.ESUCCESS;
         });
         this.fd_prestat_dir_name = syscallWrap(this, 'fd_prestat_dir_name', function (fd, path, path_len) {
@@ -298,7 +307,7 @@ export class WASI {
             const fileDescriptor = wasi.fds.get(fd, BigInt(0), BigInt(0));
             if (fileDescriptor.preopen !== 1)
                 return WasiErrno.EBADF;
-            const buffer = encoder.encode(fileDescriptor.path + '\0');
+            const buffer = encoder.encode(fileDescriptor.path);
             const size = buffer.length;
             if (size > path_len)
                 return WasiErrno.ENOBUFS;
@@ -493,6 +502,9 @@ export class WASI {
         this.sock_shutdown = syscallWrap(this, 'sock_shutdown', function () {
             return WasiErrno.ENOTSUP;
         });
+        this.sock_accept = syscallWrap(this, 'sock_accept', function () {
+            return WasiErrno.ENOTSUP;
+        });
         _wasi.set(this, {
             fds,
             args,
@@ -608,11 +620,17 @@ export class WASI {
             return { fileDescriptor, atim, mtim };
         }
         defineImport('fd_filestat_set_times', function fd_filestat_set_times(fd, atim, mtim, flags) {
+            if (validateFstFlagsOrReturn(flags)) {
+                return 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 WasiErrno.ESUCCESS;
         }, async function fd_filestat_set_times(fd, atim, mtim, flags) {
+            if (validateFstFlagsOrReturn(flags)) {
+                return 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));
@@ -621,12 +639,16 @@ export class WASI {
         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 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 WasiErrno.ESUCCESS;
+            }
             let totalSize = 0;
             const ioVecs = Array.from({ length: Number(iovslen) }, (_, i) => {
                 const offset = iovs + (i * 8);
@@ -653,12 +675,16 @@ export class WASI {
         }, 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 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 WasiErrno.ESUCCESS;
+            }
             let totalSize = 0;
             const ioVecs = Array.from({ length: Number(iovslen) }, (_, i) => {
                 const offset = iovs + (i * 8);
@@ -678,12 +704,16 @@ export class WASI {
         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 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 WasiErrno.ESUCCESS;
+            }
             const buffer = concatBuffer(Array.from({ length: Number(iovslen) }, (_, i) => {
                 const offset = iovs + (i * 8);
                 const buf = view.getInt32(offset, true);
@@ -697,12 +727,16 @@ export class WASI {
         }, 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 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 WasiErrno.ESUCCESS;
+            }
             const buffer = concatBuffer(Array.from({ length: Number(iovslen) }, (_, i) => {
                 const offset = iovs + (i * 8);
                 const buf = view.getInt32(offset, true);
@@ -716,12 +750,16 @@ export class WASI {
         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 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 WasiErrno.ESUCCESS;
+            }
             let totalSize = 0;
             const ioVecs = Array.from({ length: Number(iovslen) }, (_, i) => {
                 const offset = iovs + (i * 8);
@@ -759,12 +797,16 @@ export class WASI {
         }, 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 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 WasiErrno.ESUCCESS;
+            }
             let totalSize = 0;
             const ioVecs = Array.from({ length: Number(iovslen) }, (_, i) => {
                 const offset = iovs + (i * 8);
@@ -917,12 +959,16 @@ export class WASI {
         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 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 WasiErrno.ESUCCESS;
+            }
             const buffer = concatBuffer(Array.from({ length: Number(iovslen) }, (_, i) => {
                 const offset = iovs + (i * 8);
                 const buf = view.getInt32(offset, true);
@@ -943,12 +989,16 @@ export class WASI {
         }, 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 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 WasiErrno.ESUCCESS;
+            }
             const buffer = concatBuffer(Array.from({ length: Number(iovslen) }, (_, i) => {
                 const offset = iovs + (i * 8);
                 const buf = view.getInt32(offset, true);
@@ -1045,15 +1095,12 @@ export class WASI {
             path_len = Number(path_len);
             if (path === 0)
                 return WasiErrno.EINVAL;
-            if ((fst_flags) & ~(WasiFstFlag.SET_ATIM |
-                WasiFstFlag.SET_ATIM_NOW |
-                WasiFstFlag.SET_MTIM |
-                WasiFstFlag.SET_MTIM_NOW)) {
-                return 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 WasiErrno.EINVAL;
+            }
             const fs = getFs(this);
             const resolvedPath = resolvePathSync(fs, fileDescriptor, decoder.decode(unsharedSlice(HEAPU8, path, path + path_len)), flags);
             if ((fst_flags & WasiFstFlag.SET_ATIM_NOW) === WasiFstFlag.SET_ATIM_NOW) {
@@ -1069,15 +1116,12 @@ export class WASI {
             path_len = Number(path_len);
             if (path === 0)
                 return WasiErrno.EINVAL;
-            if ((fst_flags) & ~(WasiFstFlag.SET_ATIM |
-                WasiFstFlag.SET_ATIM_NOW |
-                WasiFstFlag.SET_MTIM |
-                WasiFstFlag.SET_MTIM_NOW)) {
-                return 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 WasiErrno.EINVAL;
+            }
             const fs = getFs(this);
             const resolvedPath = await resolvePathAsync(fs, fileDescriptor, decoder.decode(unsharedSlice(HEAPU8, path, path + path_len)), flags);
             if ((fst_flags & WasiFstFlag.SET_ATIM_NOW) === WasiFstFlag.SET_ATIM_NOW) {
@@ -1204,7 +1248,9 @@ export class WASI {
             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 & WasiFileControlFlag.O_DIRECTORY) !== 0 && filetype !== WasiFileType.DIRECTORY) {
+            if ((filetype !== WasiFileType.DIRECTORY) &&
+                ((o_flags & WasiFileControlFlag.O_DIRECTORY) !== 0 ||
+                    (resolved_path.endsWith('/')))) {
                 return WasiErrno.ENOTDIR;
             }
             const { base: max_base, inheriting: max_inheriting } = getRights(wasi.fds.stdio, r, flagsRes, filetype);
@@ -1276,7 +1322,7 @@ export class WASI {
                 return 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 WasiErrno.ESUCCESS;
         }, async function path_readlink(fd, path, path_len, buf, buf_len, bufused) {
             path = Number(path);
@@ -1300,7 +1346,7 @@ export class WASI {
                 return 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 WasiErrno.ESUCCESS;
         }, ['i32', 'i32', 'i32', 'i32', 'i32', 'i32'], ['i32']);
         defineImport('path_remove_directory', function path_remove_directory(fd, path, path_len) {
@@ -1393,6 +1439,9 @@ export class WASI {
             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 WasiErrno.EPERM;
+            }
             let newPath = decoder.decode(unsharedSlice(HEAPU8, new_path, new_path + new_path_len));
             newPath = resolve(fileDescriptor.realPath, newPath);
             const fs = getFs(this);

package/lib/mjs/wasi/rights.mjs

@@ -28,7 +28,8 @@ export 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;
 export const BLOCK_DEVICE_BASE = RIGHTS_ALL;
 export const BLOCK_DEVICE_INHERITING = RIGHTS_ALL;
 export const CHARACTER_DEVICE_BASE = RIGHTS_ALL;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tybys/wasm-util",
-  "version": "0.8.3",
+  "version": "0.10.0",
   "description": "WASI polyfill for browser and some wasm util",
   "main": "./lib/cjs/index.js",
   "module": "./dist/wasm-util.esm-bundler.js",