@bytecodealliance/preview2-shim 0.19.0 → 0.20.0

package/README.md

@@ -15,8 +15,8 @@ An default instantiation object can be used via the `WASIShim` class in `@byteco
 ```typescript
 import { WASIShim } from "@bytecodealliance/preview2-shim/instantiation";
 import type {
-  VersionedWASIImportObject,
-  WASIImportObject,
+    VersionedWASIImportObject,
+    WASIImportObject,
 } from "@bytecodealliance/preview2-shim/instantiation";
 
 const shim = new WASIShim();
@@ -27,7 +27,7 @@ unversioned satisfies WASIImportObject;
 unversioned satisfies VersionedWASIImportObject<"">;
 
 const versioned: VersionedWASIImportObject<"0.2.3"> = shim.getImportObject({
-  asVersion: "0.2.3",
+    asVersion: "0.2.3",
 });
 //console.log('versioned', versioned);
 versioned satisfies VersionedWASIImportObject<"0.2.3">;
@@ -66,23 +66,23 @@ import { WASIShim } from "@bytecodealliance/preview2-shim/instantiation";
 
 // Fully sandboxed - no filesystem, network, or env access
 const sandboxedShim = new WASIShim({
-  sandbox: {
-    preopens: {}, // No filesystem access
-    env: {}, // No environment variables
-    args: ["arg1"], // Custom arguments
-    enableNetwork: false, // Disable network access
-  },
+    sandbox: {
+        preopens: {}, // No filesystem access
+        env: {}, // No environment variables
+        args: ["arg1"], // Custom arguments
+        enableNetwork: false, // Disable network access
+    },
 });
 
 // Limited filesystem access - map virtual paths to host paths
 const limitedShim = new WASIShim({
-  sandbox: {
-    preopens: {
-      "/data": "/tmp/guest-data", // Guest sees /data, maps to /tmp/guest-data
-      "/config": "/etc/app", // Guest sees /config, maps to /etc/app
+    sandbox: {
+        preopens: {
+            "/data": "/tmp/guest-data", // Guest sees /data, maps to /tmp/guest-data
+            "/config": "/etc/app", // Guest sees /config, maps to /etc/app
+        },
+        env: { ENV1: "42" }, // Only expose specific env vars
     },
-    env: { ENV1: "42" }, // Only expose specific env vars
-  },
 });
 
 const component = await instantiate(loader, sandboxedShim.getImportObject());

package/dist/browser/filesystem.js

@@ -74,6 +74,21 @@ function getSource(fileEntry) {
     }
     return fileEntry.source;
 }
+// Keep spare capacity separate so FileDataEntry.source always reflects the logical file size.
+const fileWriteBuffers = new WeakMap();
+function getFileWriteBuffer(entry, source, requiredLength) {
+    let buffer = fileWriteBuffers.get(entry);
+    if (!buffer || buffer.buffer !== source.buffer || buffer.byteOffset !== source.byteOffset) {
+        buffer = source;
+    }
+    if (requiredLength <= buffer.byteLength) {
+        return buffer;
+    }
+    const newBuffer = new Uint8Array(Math.max(requiredLength, source.byteLength * 2));
+    newBuffer.set(source);
+    fileWriteBuffers.set(entry, newBuffer);
+    return newBuffer;
+}
 class DirectoryEntryStream {
     idx = 0;
     entries = [];
@@ -130,15 +145,24 @@ class Descriptor {
     }
     writeViaStream(_offset) {
         const entry = this.#entry;
-        let offset = Number(_offset);
+        let offset = coerceToSafeIntegerNumber(_offset);
         return outputStreamCreate({
             write(buf) {
-                const src = entry.source;
-                const newSource = new Uint8Array(buf.byteLength + src.byteLength);
-                newSource.set(src, 0);
-                newSource.set(buf, offset);
-                offset += buf.byteLength;
-                entry.source = newSource;
+                if (buf.byteLength === 0) {
+                    return;
+                }
+                const source = getSource(entry);
+                const end = offset + buf.byteLength;
+                if (!Number.isSafeInteger(end)) {
+                    throw new TypeError(`excessively large number: ${end}`);
+                }
+                const buffer = getFileWriteBuffer(entry, source, end);
+                if (offset > source.byteLength) {
+                    buffer.fill(0, source.byteLength, offset);
+                }
+                buffer.set(buf, offset);
+                entry.source = buffer.subarray(0, Math.max(source.byteLength, end));
+                offset = end;
             },
         });
     }

package/dist/browser/http.js

@@ -509,7 +509,7 @@ class FutureTrailers {
             tag: "ok",
             val: {
                 tag: "ok",
-                val: undefined,
+                val: fieldsLock(fieldsFromEntriesChecked([])),
             },
         };
     }

package/dist/common/instantiation.js

@@ -164,7 +164,8 @@ export class WASIShim {
         obj[`wasi:sockets/tcp-create-socket${versionSuffix}`] = this.#sockets.tcpCreateSocket;
         obj[`wasi:sockets/udp${versionSuffix}`] = this.#sockets.udp;
         obj[`wasi:sockets/udp-create-socket${versionSuffix}`] = this.#sockets.udpCreateSocket;
-        obj[`wasi:filesystem/preopens${versionSuffix}`] = this.#preopens ?? this.#filesystem.preopens;
+        obj[`wasi:filesystem/preopens${versionSuffix}`] =
+            this.#preopens ?? this.#filesystem.preopens;
         obj[`wasi:filesystem/types${versionSuffix}`] = this.#filesystem.types;
         obj[`wasi:io/error${versionSuffix}`] = this.#io.error;
         obj[`wasi:io/poll${versionSuffix}`] = this.#io.poll;

package/dist/io/worker-io.js

@@ -13,7 +13,11 @@ export function registerIncomingHttpHandler(id, handler) {
 }
 const instanceId = Math.round(Math.random() * 1000).toString();
 const DEBUG_DEFAULT = false;
-const DEBUG = env.PREVIEW2_SHIM_DEBUG === "0" ? false : env.PREVIEW2_SHIM_DEBUG === "1" ? true : DEBUG_DEFAULT;
+const DEBUG = env.PREVIEW2_SHIM_DEBUG === "0"
+    ? false
+    : env.PREVIEW2_SHIM_DEBUG === "1"
+        ? true
+        : DEBUG_DEFAULT;
 /**
  * @type {(call: number, id: number | null, payload: any) -> any}
  */
@@ -148,7 +152,8 @@ class InputStream {
                 disposeFn = httpInputStreamDispose;
                 break;
             default:
-                throw new Error("wasi-io trap: Dispose function not created for stream type " + reverseMap[streamType]);
+                throw new Error("wasi-io trap: Dispose function not created for stream type " +
+                    reverseMap[streamType]);
         }
         stream.#finalizer = registerDispose(stream, null, id, disposeFn);
         return stream;
@@ -253,7 +258,8 @@ class OutputStream {
             case HTTP:
                 return stream;
             default:
-                throw new Error("wasi-io trap: Dispose function not created for stream type " + reverseMap[streamType]);
+                throw new Error("wasi-io trap: Dispose function not created for stream type " +
+                    reverseMap[streamType]);
         }
         stream.#finalizer = registerDispose(stream, null, id, disposeFn);
         return stream;

package/dist/io/worker-socket-udp.js

@@ -406,7 +406,8 @@ export async function socketOutgoingDatagramStreamSend(id, datagrams) {
     function doSendBatch() {
         return new Promise((resolve, reject) => {
             if (socket.remoteAddress) {
-                if (sendQueueAddress !== socket.remoteAddress || sendQueuePort !== socket.remotePort) {
+                if (sendQueueAddress !== socket.remoteAddress ||
+                    sendQueuePort !== socket.remotePort) {
                     return void reject("invalid-argument");
                 }
                 udpSocket.send(sendQueue, handler);

package/dist/io/worker-thread.js

@@ -444,7 +444,8 @@ function handle(call, id, payload) {
             if (stream.flushPromise) {
                 return stream.flushPromise.then(() => handle(call, id, payload));
             }
-            if (payload.byteLength > stream.stream.writableHighWaterMark - stream.stream.writableLength) {
+            if (payload.byteLength >
+                stream.stream.writableHighWaterMark - stream.stream.writableLength) {
                 throw new Error("wasi-io trap: Cannot write more than permitted writable length");
             }
             stream.pollState.ready = false;
@@ -570,7 +571,9 @@ function handle(call, id, payload) {
             let resolve, reject;
             if (outputStream.stream.writableNeedDrain) {
                 promise = new Promise((_resolve, _reject) => {
-                    outputStream.stream.once("drain", (resolve = _resolve)).once("error", (reject = _reject));
+                    outputStream.stream
+                        .once("drain", (resolve = _resolve))
+                        .once("error", (reject = _reject));
                 }).then(() => {
                     outputStream.stream.off("error", reject);
                 }, (err) => {

package/dist/nodejs/filesystem.js

@@ -142,7 +142,8 @@ class Descriptor {
             throw "invalid";
         }
         let stats;
-        if (dataAccessTimestamp.tag === "no-change" || dataModificationTimestamp.tag === "no-change") {
+        if (dataAccessTimestamp.tag === "no-change" ||
+            dataModificationTimestamp.tag === "no-change") {
             stats = this.stat();
         }
         const atime = this.#getNewTimestamp(dataAccessTimestamp, dataAccessTimestamp.tag === "no-change" && stats.dataAccessTimestamp);
@@ -259,7 +260,8 @@ class Descriptor {
     setTimesAt(pathFlags, path, dataAccessTimestamp, dataModificationTimestamp) {
         const fullPath = this.#getFullPath(path, false);
         let stats;
-        if (dataAccessTimestamp.tag === "no-change" || dataModificationTimestamp.tag === "no-change") {
+        if (dataAccessTimestamp.tag === "no-change" ||
+            dataModificationTimestamp.tag === "no-change") {
             stats = this.stat();
         }
         const atime = this.#getNewTimestamp(dataAccessTimestamp, dataAccessTimestamp.tag === "no-change" && stats.dataAccessTimestamp);
@@ -519,7 +521,8 @@ class Descriptor {
             // new segment - check if it is relative
             else if (subpath[i] === ".") {
                 // ../ segment
-                if (subpath[i + 1] === "." && (subpath[i + 2] === "/" || i + 2 === subpath.length)) {
+                if (subpath[i + 1] === "." &&
+                    (subpath[i + 2] === "/" || i + 2 === subpath.length)) {
                     if (segments.pop() === undefined) {
                         throw "not-permitted";
                     }

package/dist/nodejs/http.js

@@ -1,6 +1,6 @@
 import { FUTURE_DISPOSE, FUTURE_SUBSCRIBE, FUTURE_TAKE_VALUE, HTTP_CREATE_REQUEST, HTTP_OUTGOING_BODY_DISPOSE, HTTP_OUTPUT_STREAM_FINISH, HTTP_SERVER_CLEAR_OUTGOING_RESPONSE, HTTP_SERVER_SET_OUTGOING_RESPONSE, HTTP_SERVER_START, HTTP_SERVER_STOP, HTTP_SERVER_GET_ADDRESS, OUTPUT_STREAM_CREATE, OUTPUT_STREAM_DISPOSE, } from "../io/calls.js";
-import { earlyDispose, inputStreamCreate, ioCall, outputStreamCreate, pollableCreate, registerDispose, registerIncomingHttpHandler, } from "../io/worker-io.js";
-import { HTTP } from "../io/calls.js";
+import { earlyDispose, inputStreamCreate, ioCall, outputStreamCreate, pollableCreate, createPoll, registerDispose, registerIncomingHttpHandler, } from "../io/worker-io.js";
+import { CLOCKS_DURATION_SUBSCRIBE, HTTP } from "../io/calls.js";
 import * as http from "node:http";
 const { validateHeaderName = () => { }, validateHeaderValue = () => { } } = http;
 const symbolDispose = Symbol.dispose || Symbol.for("dispose");
@@ -76,7 +76,7 @@ delete IncomingRequest._create;
 class FutureTrailers {
     #requested = false;
     subscribe() {
-        return pollableCreate(0, this);
+        return createPoll(CLOCKS_DURATION_SUBSCRIBE, null, 0n);
     }
     get() {
         if (this.#requested) {
@@ -87,7 +87,7 @@ class FutureTrailers {
             tag: "ok",
             val: {
                 tag: "ok",
-                val: undefined,
+                val: fieldsLock(fieldsFromEntriesChecked([])),
             },
         };
     }

package/dist/synckit/index.js

@@ -1,26 +1,26 @@
 // Based on: https://github.com/un-ts/synckit
 /*
-MIT License
+  MIT License
 
-Copyright (c) 2021 UnTS
+  Copyright (c) 2021 UnTS
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
 */
 import path from "node:path";
 import { MessageChannel, Worker, receiveMessageOnPort, workerData, parentPort, } from "node:worker_threads";
@@ -62,7 +62,7 @@ export function createSyncFn(workerPath, debug, callbackHandler) {
         if (!["ok", "not-equal"].includes(status)) {
             throw new Error("Internal error: Atomics.wait() failed: " + status);
         }
-        const { cid: cid2, result, error, properties } = receiveMessageOnPort(mainPort)?.message ?? {};
+        const { cid: cid2, result, error, properties, } = receiveMessageOnPort(mainPort)?.message ?? {};
         if (cid !== cid2) {
             throw new Error(`Internal error: Expected id ${cid} but got id ${cid2}`);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytecodealliance/preview2-shim",
-  "version": "0.19.0",
+  "version": "0.20.0",
   "description": "WASI Preview2 shim for JS environments",
   "homepage": "https://github.com/bytecodealliance/jco#readme",
   "bugs": {
@@ -48,7 +48,7 @@
       "default": "./dist/browser/*.js"
     },
     "./instantiation": {
-      "types": "./types/instantiation.d.ts",
+      "types": "./dist/common/*.d.ts",
       "node": "./dist/common/instantiation.js",
       "default": "./dist/common/instantiation.js"
     },
@@ -57,8 +57,8 @@
     }
   },
   "devDependencies": {
-    "@bytecodealliance/componentize-js": "0.21.0",
-    "@bytecodealliance/jco": "1.20.0",
+    "@bytecodealliance/componentize-js": "0.22.0",
+    "@bytecodealliance/jco": "1.25.2",
     "@types/node": "^24.12.4",
     "mime": "^4.0.7",
     "puppeteer": "^25.1.0",