@bytecodealliance/preview2-shim 0.17.7 → 0.17.9

package/lib/common/instantiation.js

@@ -1,4 +1,4 @@
-import * as wasi from '@bytecodealliance/preview2-shim';
+import * as wasi from "@bytecodealliance/preview2-shim";
 
 /**
  * (EXPERIMENTAL) A class that holds WASI shims and can be used to configure
@@ -79,129 +79,125 @@ import * as wasi from '@bytecodealliance/preview2-shim';
  * @class WASIShim
  */
 export class WASIShim {
-    /** Object that confirms to the shim interface for `wasi:cli` */
-    #cli;
-    /** Object that confirms to the shim interface for `wasi:filesystem` */
-    #filesystem;
-    /** Object that confirms to the shim interface for `wasi:io` */
-    #io;
-    /** Object that confirms to the shim interface for `wasi:random` */
-    #random;
-    /** Object that confirms to the shim interface for `wasi:clocks` */
-    #clocks;
-    /** Object that confirms to the shim interface for `wasi:sockets` */
-    #sockets;
-    /** Object that confirms to the shim interface for `wasi:http` */
-    #http;
-    /** Isolated preopens for this instance */
-    #preopens;
-    /** Isolated environment for this instance */
-    #environment;
-
-    /**
-     * Create a new WASIShim instance.
-     *
-     * @param {import('../types/instantiation.d.ts').WASIShimConfig} [config] - Configuration options
-     */
-    constructor(config) {
-        // Support both old 'shims' parameter name and new 'config' style
-        const shims = config;
-
-        this.#cli = shims?.cli ?? wasi.cli;
-        this.#filesystem = shims?.filesystem ?? wasi.filesystem;
-        this.#io = shims?.io ?? wasi.io;
-        this.#random = shims?.random ?? wasi.random;
-        this.#clocks = shims?.clocks ?? wasi.clocks;
-        this.#sockets = shims?.sockets ?? wasi.sockets;
-        this.#http = shims?.http ?? wasi.http;
-
-        // Extract sandbox options
-        const sandbox = shims?.sandbox;
-
-        // Create isolated preopens if configured
-        if (sandbox?.preopens !== undefined) {
-            this.#preopens = createIsolatedPreopens(sandbox.preopens);
-        }
-
-        // Create isolated environment if env or args are configured
-        if (sandbox?.env !== undefined || sandbox?.args !== undefined) {
-            this.#environment = createIsolatedEnvironment(
-                sandbox?.env,
-                sandbox?.args,
-                this.#cli
-            );
-        }
-
-        // Apply network restrictions if disabled
-        if (sandbox?.enableNetwork === false) {
-            // Use the sockets module's built-in deny functions
-            if (this.#sockets._denyTcp) {
-                this.#sockets._denyTcp();
-            }
-            if (this.#sockets._denyUdp) {
-                this.#sockets._denyUdp();
-            }
-            if (this.#sockets._denyDnsLookup) {
-                this.#sockets._denyDnsLookup();
-            }
-        }
+  /** Object that confirms to the shim interface for `wasi:cli` */
+  #cli;
+  /** Object that confirms to the shim interface for `wasi:filesystem` */
+  #filesystem;
+  /** Object that confirms to the shim interface for `wasi:io` */
+  #io;
+  /** Object that confirms to the shim interface for `wasi:random` */
+  #random;
+  /** Object that confirms to the shim interface for `wasi:clocks` */
+  #clocks;
+  /** Object that confirms to the shim interface for `wasi:sockets` */
+  #sockets;
+  /** Object that confirms to the shim interface for `wasi:http` */
+  #http;
+  /** Isolated preopens for this instance */
+  #preopens;
+  /** Isolated environment for this instance */
+  #environment;
+
+  /**
+   * Create a new WASIShim instance.
+   *
+   * @param {import('../types/instantiation.d.ts').WASIShimConfig} [config] - Configuration options
+   */
+  constructor(config) {
+    // Support both old 'shims' parameter name and new 'config' style
+    const shims = config;
+
+    this.#cli = shims?.cli ?? wasi.cli;
+    this.#filesystem = shims?.filesystem ?? wasi.filesystem;
+    this.#io = shims?.io ?? wasi.io;
+    this.#random = shims?.random ?? wasi.random;
+    this.#clocks = shims?.clocks ?? wasi.clocks;
+    this.#sockets = shims?.sockets ?? wasi.sockets;
+    this.#http = shims?.http ?? wasi.http;
+
+    // Extract sandbox options
+    const sandbox = shims?.sandbox;
+
+    // Create isolated preopens if configured
+    if (sandbox?.preopens !== undefined) {
+      this.#preopens = createIsolatedPreopens(sandbox.preopens);
     }
 
-    /**
-     * Generate an import object for the shim that can be used with
-     * functions like `instantiate` that are exposed from a transpiled
-     * WebAssembly component.
-     *
-     * @param {GetImportObjectArgs} [opts] - options for import object generation
-     * @returns {WASIImportObject}
-     *
-     * @typedef {{
-     *   asVersion?: number,
-     * }} GetImportObjectArgs
-     */
-    getImportObject(opts) {
-        const versionSuffix = opts?.asVersion ? `@${opts.asVersion}` : '';
-
-        const obj = {};
-
-        obj[`wasi:cli/environment${versionSuffix}`] = this.#environment ?? this.#cli.environment;
-        obj[`wasi:cli/exit${versionSuffix}`] = this.#cli.exit;
-        obj[`wasi:cli/stderr${versionSuffix}`] = this.#cli.stderr;
-        obj[`wasi:cli/stdin${versionSuffix}`] = this.#cli.stdin;
-        obj[`wasi:cli/stdout${versionSuffix}`] = this.#cli.stdout;
-        obj[`wasi:cli/terminal-input${versionSuffix}`] = this.#cli.terminalInput;
-        obj[`wasi:cli/terminal-output${versionSuffix}`] = this.#cli.terminalOutput;
-        obj[`wasi:cli/terminal-stderr${versionSuffix}`] = this.#cli.terminalStderr;
-        obj[`wasi:cli/terminal-stdin${versionSuffix}`] = this.#cli.terminalStdin;
-        obj[`wasi:cli/terminal-stdout${versionSuffix}`] = this.#cli.terminalStdout;
-
-        obj[`wasi:sockets/instance-network${versionSuffix}`] = this.#sockets.instanceNetwork;
-        obj[`wasi:sockets/ip-name-lookup${versionSuffix}`] = this.#sockets.ipNameLookup;
-        obj[`wasi:sockets/network${versionSuffix}`] = this.#sockets.network;
-        obj[`wasi:sockets/tcp${versionSuffix}`] = this.#sockets.tcp;
-        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/types${versionSuffix}`] = this.#filesystem.types;
-
-        obj[`wasi:io/error${versionSuffix}`] = this.#io.error;
-        obj[`wasi:io/poll${versionSuffix}`] = this.#io.poll;
-        obj[`wasi:io/streams${versionSuffix}`] = this.#io.streams;
-
-        obj[`wasi:random/random${versionSuffix}`] = this.#random.random;
-        obj[`wasi:random/insecure${versionSuffix}`] = this.#random.insecure;
-        obj[`wasi:random/insecure-seed${versionSuffix}`] = this.#random.insecureSeed;
-
-        obj[`wasi:clocks/monotonic-clock${versionSuffix}`] = this.#clocks.monotonicClock;
-        obj[`wasi:clocks/wall-clock${versionSuffix}`] = this.#clocks.wallClock;
-
-        obj[`wasi:http/types${versionSuffix}`] = this.#http.types;
-        obj[`wasi:http/outgoing-handler${versionSuffix}`] = this.#http.outgoingHandler;
+    // Create isolated environment if env or args are configured
+    if (sandbox?.env !== undefined || sandbox?.args !== undefined) {
+      this.#environment = createIsolatedEnvironment(sandbox?.env, sandbox?.args, this.#cli);
+    }
 
-        return obj;
+    // Apply network restrictions if disabled
+    if (sandbox?.enableNetwork === false) {
+      // Use the sockets module's built-in deny functions
+      if (this.#sockets._denyTcp) {
+        this.#sockets._denyTcp();
+      }
+      if (this.#sockets._denyUdp) {
+        this.#sockets._denyUdp();
+      }
+      if (this.#sockets._denyDnsLookup) {
+        this.#sockets._denyDnsLookup();
+      }
     }
+  }
+
+  /**
+   * Generate an import object for the shim that can be used with
+   * functions like `instantiate` that are exposed from a transpiled
+   * WebAssembly component.
+   *
+   * @param {GetImportObjectArgs} [opts] - options for import object generation
+   * @returns {WASIImportObject}
+   *
+   * @typedef {{
+   *   asVersion?: number,
+   * }} GetImportObjectArgs
+   */
+  getImportObject(opts) {
+    const versionSuffix = opts?.asVersion ? `@${opts.asVersion}` : "";
+
+    const obj = {};
+
+    obj[`wasi:cli/environment${versionSuffix}`] = this.#environment ?? this.#cli.environment;
+    obj[`wasi:cli/exit${versionSuffix}`] = this.#cli.exit;
+    obj[`wasi:cli/stderr${versionSuffix}`] = this.#cli.stderr;
+    obj[`wasi:cli/stdin${versionSuffix}`] = this.#cli.stdin;
+    obj[`wasi:cli/stdout${versionSuffix}`] = this.#cli.stdout;
+    obj[`wasi:cli/terminal-input${versionSuffix}`] = this.#cli.terminalInput;
+    obj[`wasi:cli/terminal-output${versionSuffix}`] = this.#cli.terminalOutput;
+    obj[`wasi:cli/terminal-stderr${versionSuffix}`] = this.#cli.terminalStderr;
+    obj[`wasi:cli/terminal-stdin${versionSuffix}`] = this.#cli.terminalStdin;
+    obj[`wasi:cli/terminal-stdout${versionSuffix}`] = this.#cli.terminalStdout;
+
+    obj[`wasi:sockets/instance-network${versionSuffix}`] = this.#sockets.instanceNetwork;
+    obj[`wasi:sockets/ip-name-lookup${versionSuffix}`] = this.#sockets.ipNameLookup;
+    obj[`wasi:sockets/network${versionSuffix}`] = this.#sockets.network;
+    obj[`wasi:sockets/tcp${versionSuffix}`] = this.#sockets.tcp;
+    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/types${versionSuffix}`] = this.#filesystem.types;
+
+    obj[`wasi:io/error${versionSuffix}`] = this.#io.error;
+    obj[`wasi:io/poll${versionSuffix}`] = this.#io.poll;
+    obj[`wasi:io/streams${versionSuffix}`] = this.#io.streams;
+
+    obj[`wasi:random/random${versionSuffix}`] = this.#random.random;
+    obj[`wasi:random/insecure${versionSuffix}`] = this.#random.insecure;
+    obj[`wasi:random/insecure-seed${versionSuffix}`] = this.#random.insecureSeed;
+
+    obj[`wasi:clocks/monotonic-clock${versionSuffix}`] = this.#clocks.monotonicClock;
+    obj[`wasi:clocks/wall-clock${versionSuffix}`] = this.#clocks.wallClock;
+
+    obj[`wasi:http/types${versionSuffix}`] = this.#http.types;
+    obj[`wasi:http/outgoing-handler${versionSuffix}`] = this.#http.outgoingHandler;
+
+    return obj;
+  }
 }
 
 /**
@@ -211,23 +207,23 @@ export class WASIShim {
  * @returns {object} A preopens object with Descriptor and getDirectories()
  */
 function createIsolatedPreopens(preopensConfig) {
-    const { types, _createPreopenDescriptor } = wasi.filesystem;
-    const entries = [];
-
-    // Populate entries using the filesystem's descriptor creation
-    if (_createPreopenDescriptor) {
-        for (const [virtualPath, hostPath] of Object.entries(preopensConfig)) {
-            const descriptor = _createPreopenDescriptor(hostPath);
-            entries.push([descriptor, virtualPath]);
-        }
+  const { types, _createPreopenDescriptor } = wasi.filesystem;
+  const entries = [];
+
+  // Populate entries using the filesystem's descriptor creation
+  if (_createPreopenDescriptor) {
+    for (const [virtualPath, hostPath] of Object.entries(preopensConfig)) {
+      const descriptor = _createPreopenDescriptor(hostPath);
+      entries.push([descriptor, virtualPath]);
     }
-
-    return {
-        Descriptor: types.Descriptor,
-        getDirectories() {
-            return entries;
-        },
-    };
+  }
+
+  return {
+    Descriptor: types.Descriptor,
+    getDirectories() {
+      return entries;
+    },
+  };
 }
 
 /**
@@ -239,19 +235,19 @@ function createIsolatedPreopens(preopensConfig) {
  * @returns {object} An isolated CLI environment object
  */
 function createIsolatedEnvironment(env, args, baseCli) {
-    const envEntries = env ? Object.entries(env) : null;
-    const argsArray = args || null;
-
-    return {
-        ...baseCli.environment,
-        getEnvironment() {
-            return envEntries ?? baseCli.environment.getEnvironment();
-        },
-        getArguments() {
-            return argsArray ?? baseCli.environment.getArguments();
-        },
-        initialCwd() {
-            return baseCli.environment.initialCwd();
-        },
-    };
+  const envEntries = env ? Object.entries(env) : null;
+  const argsArray = args || null;
+
+  return {
+    ...baseCli.environment,
+    getEnvironment() {
+      return envEntries ?? baseCli.environment.getEnvironment();
+    },
+    getArguments() {
+      return argsArray ?? baseCli.environment.getArguments();
+    },
+    initialCwd() {
+      return baseCli.environment.initialCwd();
+    },
+  };
 }

package/lib/io/calls.js

@@ -33,8 +33,7 @@ export const OUTPUT_STREAM_BLOCKING_WRITE_AND_FLUSH = ++call_id << CALL_SHIFT;
 export const OUTPUT_STREAM_FLUSH = ++call_id << CALL_SHIFT;
 export const OUTPUT_STREAM_BLOCKING_FLUSH = ++call_id << CALL_SHIFT;
 export const OUTPUT_STREAM_WRITE_ZEROES = ++call_id << CALL_SHIFT;
-export const OUTPUT_STREAM_BLOCKING_WRITE_ZEROES_AND_FLUSH =
-    ++call_id << CALL_SHIFT;
+export const OUTPUT_STREAM_BLOCKING_WRITE_ZEROES_AND_FLUSH = ++call_id << CALL_SHIFT;
 export const OUTPUT_STREAM_SPLICE = ++call_id << CALL_SHIFT;
 export const OUTPUT_STREAM_BLOCKING_SPLICE = ++call_id << CALL_SHIFT;
 export const OUTPUT_STREAM_SUBSCRIBE = ++call_id << CALL_SHIFT;
@@ -103,8 +102,7 @@ export const SOCKET_UDP_SET_RECEIVE_BUFFER_SIZE = ++call_id << CALL_SHIFT;
 export const SOCKET_UDP_SET_SEND_BUFFER_SIZE = ++call_id << CALL_SHIFT;
 export const SOCKET_UDP_SET_UNICAST_HOP_LIMIT = ++call_id << CALL_SHIFT;
 export const SOCKET_INCOMING_DATAGRAM_STREAM_RECEIVE = ++call_id << CALL_SHIFT;
-export const SOCKET_OUTGOING_DATAGRAM_STREAM_CHECK_SEND =
-    ++call_id << CALL_SHIFT;
+export const SOCKET_OUTGOING_DATAGRAM_STREAM_CHECK_SEND = ++call_id << CALL_SHIFT;
 export const SOCKET_OUTGOING_DATAGRAM_STREAM_SEND = ++call_id << CALL_SHIFT;
 export const SOCKET_DATAGRAM_STREAM_SUBSCRIBE = ++call_id << CALL_SHIFT;
 export const SOCKET_DATAGRAM_STREAM_DISPOSE = ++call_id << CALL_SHIFT;
@@ -120,11 +118,11 @@ export const SOCKET_RESOLVE_ADDRESS_DISPOSE_REQUEST = ++call_id << CALL_SHIFT;
 
 export const reverseMap = {};
 
-import * as calls from './calls.js';
+import * as calls from "./calls.js";
 
 for (const name of Object.getOwnPropertyNames(calls)) {
-    if (name === 'reverseMap') {
-        continue;
-    }
-    reverseMap[calls[name]] = name;
+  if (name === "reverseMap") {
+    continue;
+  }
+  reverseMap[calls[name]] = name;
 }