@tybys/wasm-util 0.8.2 → 0.9.0

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) {
@@ -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);
@@ -636,7 +658,14 @@ export class WASI {
                 return HEAPU8.subarray(buf, buf + bufLen);
             });
             let nread = 0;
-            const buffer = new Uint8Array(totalSize);
+            const buffer = (() => {
+                try {
+                    return new Uint8Array(new SharedArrayBuffer(totalSize));
+                }
+                catch (_) {
+                    return new Uint8Array(totalSize);
+                }
+            })();
             buffer._isBuffer = true;
             const fs = getFs(this);
             const bytesRead = fs.readSync(fileDescriptor.fd, buffer, 0, buffer.length, Number(offset));
@@ -646,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);
@@ -671,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);
@@ -690,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);
@@ -709,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);
@@ -733,7 +778,14 @@ export class WASI {
                 nread = buffer ? copyMemory(ioVecs, buffer) : 0;
             }
             else {
-                buffer = new Uint8Array(totalSize);
+                buffer = (() => {
+                    try {
+                        return new Uint8Array(new SharedArrayBuffer(totalSize));
+                    }
+                    catch (_) {
+                        return new Uint8Array(totalSize);
+                    }
+                })();
                 buffer._isBuffer = true;
                 const fs = getFs(this);
                 const bytesRead = fs.readSync(fileDescriptor.fd, buffer, 0, buffer.length, Number(fileDescriptor.pos));
@@ -745,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);
@@ -903,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);
@@ -929,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);
@@ -1031,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) {
@@ -1055,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) {
@@ -1262,7 +1320,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);
@@ -1286,7 +1344,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) {

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.2",
+  "version": "0.9.0",
   "description": "WASI polyfill for browser and some wasm util",
   "main": "./lib/cjs/index.js",
   "module": "./dist/wasm-util.esm-bundler.js",