@bytecodealliance/preview2-shim 0.0.16 → 0.0.18

package/types/interfaces/wasi-sockets-tcp.d.ts

@@ -12,12 +12,13 @@ export namespace WasiSocketsTcp {
    * Unlike in POSIX, this function is async. This enables interactive WASI hosts to inject permission prompts.
    * 
    * # Typical `start` errors
-   * - `address-family-mismatch`:   The `local-address` has the wrong address family. (EINVAL)
-   * - `already-bound`:             The socket is already bound. (EINVAL)
-   * - `concurrency-conflict`:      Another `bind`, `connect` or `listen` operation is already in progress. (EALREADY)
+   * - `invalid-argument`:          The `local-address` has the wrong address family. (EAFNOSUPPORT, EFAULT on Windows)
+   * - `invalid-argument`:          `local-address` is not a unicast address. (EINVAL)
+   * - `invalid-argument`:          `local-address` is an IPv4-mapped IPv6 address, but the socket has `ipv6-only` enabled. (EINVAL)
+   * - `invalid-state`:             The socket is already bound. (EINVAL)
    * 
    * # Typical `finish` errors
-   * - `ephemeral-ports-exhausted`: No ephemeral ports available. (EADDRINUSE, ENOBUFS on Windows)
+   * - `address-in-use`:            No ephemeral ports available. (EADDRINUSE, ENOBUFS on Windows)
    * - `address-in-use`:            Address is already in use. (EADDRINUSE)
    * - `address-not-bindable`:      `local-address` is not an address that the `network` can bind to. (EADDRNOTAVAIL)
    * - `not-in-progress`:           A `bind` operation is not in progress.
@@ -29,8 +30,7 @@ export namespace WasiSocketsTcp {
    * - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-bind>
    * - <https://man.freebsd.org/cgi/man.cgi?query=bind&sektion=2&format=html>
    */
-  export function startBind(this_: TcpSocket, network: Network, localAddress: IpSocketAddress): void;
-  export function finishBind(this_: TcpSocket): void;
+  export { TcpSocket };
   /**
    * Connect to a remote endpoint.
    * 
@@ -38,21 +38,33 @@ export namespace WasiSocketsTcp {
    * - the socket is transitioned into the Connection state
    * - a pair of streams is returned that can be used to read & write to the connection
    * 
+   * POSIX mentions:
+   * > If connect() fails, the state of the socket is unspecified. Conforming applications should
+   * > close the file descriptor and create a new socket before attempting to reconnect.
+   * 
+   * WASI prescribes the following behavior:
+   * - If `connect` fails because an input/state validation error, the socket should remain usable.
+   * - If a connection was actually attempted but failed, the socket should become unusable for further network communication.
+   * Besides `drop`, any method after such a failure may return an error.
+   * 
    * # Typical `start` errors
-   * - `address-family-mismatch`:   The `remote-address` has the wrong address family. (EAFNOSUPPORT)
-   * - `invalid-remote-address`:    The IP address in `remote-address` is set to INADDR_ANY (`0.0.0.0` / `::`). (EADDRNOTAVAIL on Windows)
-   * - `invalid-remote-address`:    The port in `remote-address` is set to 0. (EADDRNOTAVAIL on Windows)
-   * - `already-attached`:          The socket is already attached to a different network. The `network` passed to `connect` must be identical to the one passed to `bind`.
-   * - `already-connected`:         The socket is already in the Connection state. (EISCONN)
-   * - `already-listening`:         The socket is already in the Listener state. (EOPNOTSUPP, EINVAL on Windows)
-   * - `concurrency-conflict`:      Another `bind`, `connect` or `listen` operation is already in progress. (EALREADY)
+   * - `invalid-argument`:          The `remote-address` has the wrong address family. (EAFNOSUPPORT)
+   * - `invalid-argument`:          `remote-address` is not a unicast address. (EINVAL, ENETUNREACH on Linux, EAFNOSUPPORT on MacOS)
+   * - `invalid-argument`:          `remote-address` is an IPv4-mapped IPv6 address, but the socket has `ipv6-only` enabled. (EINVAL, EADDRNOTAVAIL on Illumos)
+   * - `invalid-argument`:          `remote-address` is a non-IPv4-mapped IPv6 address, but the socket was bound to a specific IPv4-mapped IPv6 address. (or vice versa)
+   * - `invalid-argument`:          The IP address in `remote-address` is set to INADDR_ANY (`0.0.0.0` / `::`). (EADDRNOTAVAIL on Windows)
+   * - `invalid-argument`:          The port in `remote-address` is set to 0. (EADDRNOTAVAIL on Windows)
+   * - `invalid-argument`:          The socket is already attached to a different network. The `network` passed to `connect` must be identical to the one passed to `bind`.
+   * - `invalid-state`:             The socket is already in the Connection state. (EISCONN)
+   * - `invalid-state`:             The socket is already in the Listener state. (EOPNOTSUPP, EINVAL on Windows)
    * 
    * # Typical `finish` errors
    * - `timeout`:                   Connection timed out. (ETIMEDOUT)
    * - `connection-refused`:        The connection was forcefully rejected. (ECONNREFUSED)
    * - `connection-reset`:          The connection was reset. (ECONNRESET)
+   * - `connection-aborted`:        The connection was aborted. (ECONNABORTED)
    * - `remote-unreachable`:        The remote address is not reachable. (EHOSTUNREACH, EHOSTDOWN, ENETUNREACH, ENETDOWN)
-   * - `ephemeral-ports-exhausted`: Tried to perform an implicit bind, but there were no ephemeral ports available. (EADDRINUSE, EADDRNOTAVAIL on Linux, EAGAIN on BSD)
+   * - `address-in-use`:            Tried to perform an implicit bind, but there were no ephemeral ports available. (EADDRINUSE, EADDRNOTAVAIL on Linux, EAGAIN on BSD)
    * - `not-in-progress`:           A `connect` operation is not in progress.
    * - `would-block`:               Can't finish the operation, it is still in progress. (EWOULDBLOCK, EAGAIN)
    * 
@@ -62,13 +74,6 @@ export namespace WasiSocketsTcp {
    * - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-connect>
    * - <https://man.freebsd.org/cgi/man.cgi?connect>
    */
-  export function startConnect(this_: TcpSocket, network: Network, remoteAddress: IpSocketAddress): void;
-  /**
-   * Note: the returned `input-stream` and `output-stream` are child
-   * resources of the `tcp-socket`. Implementations may trap if the
-   * `tcp-socket` is dropped before both of these streams are dropped.
-   */
-  export function finishConnect(this_: TcpSocket): [InputStream, OutputStream];
   /**
    * Start listening for new connections.
    * 
@@ -79,13 +84,12 @@ export namespace WasiSocketsTcp {
    * - the socket must already be explicitly bound.
    * 
    * # Typical `start` errors
-   * - `not-bound`:                 The socket is not bound to any local address. (EDESTADDRREQ)
-   * - `already-connected`:         The socket is already in the Connection state. (EISCONN, EINVAL on BSD)
-   * - `already-listening`:         The socket is already in the Listener state.
-   * - `concurrency-conflict`:      Another `bind`, `connect` or `listen` operation is already in progress. (EINVAL on BSD)
+   * - `invalid-state`:             The socket is not bound to any local address. (EDESTADDRREQ)
+   * - `invalid-state`:             The socket is already in the Connection state. (EISCONN, EINVAL on BSD)
+   * - `invalid-state`:             The socket is already in the Listener state.
    * 
    * # Typical `finish` errors
-   * - `ephemeral-ports-exhausted`: Tried to perform an implicit bind, but there were no ephemeral ports available. (EADDRINUSE)
+   * - `address-in-use`:            Tried to perform an implicit bind, but there were no ephemeral ports available. (EADDRINUSE)
    * - `not-in-progress`:           A `listen` operation is not in progress.
    * - `would-block`:               Can't finish the operation, it is still in progress. (EWOULDBLOCK, EAGAIN)
    * 
@@ -95,25 +99,26 @@ export namespace WasiSocketsTcp {
    * - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-listen>
    * - <https://man.freebsd.org/cgi/man.cgi?query=listen&sektion=2>
    */
-  export function startListen(this_: TcpSocket): void;
-  export function finishListen(this_: TcpSocket): void;
   /**
    * Accept a new client socket.
    * 
-   * The returned socket is bound and in the Connection state.
+   * The returned socket is bound and in the Connection state. The following properties are inherited from the listener socket:
+   * - `address-family`
+   * - `ipv6-only`
+   * - `keep-alive`
+   * - `no-delay`
+   * - `unicast-hop-limit`
+   * - `receive-buffer-size`
+   * - `send-buffer-size`
    * 
    * On success, this function returns the newly accepted client socket along with
    * a pair of streams that can be used to read & write to the connection.
    * 
-   * Note: the returned `input-stream` and `output-stream` are child
-   * resources of the returned `tcp-socket`. Implementations may trap if the
-   * `tcp-socket` is dropped before its child streams are dropped.
-   * 
    * # Typical errors
-   * - `not-listening`: Socket is not in the Listener state. (EINVAL)
-   * - `would-block`:   No pending connections at the moment. (EWOULDBLOCK, EAGAIN)
-   * 
-   * Host implementations must skip over transient errors returned by the native accept syscall.
+   * - `invalid-state`:      Socket is not in the Listener state. (EINVAL)
+   * - `would-block`:        No pending connections at the moment. (EWOULDBLOCK, EAGAIN)
+   * - `connection-aborted`: An incoming connection was pending, but was terminated by the client before this listener could accept it. (ECONNABORTED)
+   * - `new-socket-limit`:   The new socket resource could not be created because of a system limit. (EMFILE, ENFILE)
    * 
    * # References
    * - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/accept.html>
@@ -121,12 +126,17 @@ export namespace WasiSocketsTcp {
    * - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-accept>
    * - <https://man.freebsd.org/cgi/man.cgi?query=accept&sektion=2>
    */
-  export function accept(this_: TcpSocket): [TcpSocket, InputStream, OutputStream];
   /**
    * Get the bound local address.
    * 
+   * POSIX mentions:
+   * > If the socket has not been bound to a local name, the value
+   * > stored in the object pointed to by `address` is unspecified.
+   * 
+   * WASI is stricter and requires `local-address` to return `invalid-state` when the socket hasn't been bound yet.
+   * 
    * # Typical errors
-   * - `not-bound`: The socket is not bound to any local address.
+   * - `invalid-state`: The socket is not bound to any local address.
    * 
    * # References
    * - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/getsockname.html>
@@ -134,12 +144,11 @@ export namespace WasiSocketsTcp {
    * - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-getsockname>
    * - <https://man.freebsd.org/cgi/man.cgi?getsockname>
    */
-  export function localAddress(this_: TcpSocket): IpSocketAddress;
   /**
-   * Get the bound remote address.
+   * Get the remote address.
    * 
    * # Typical errors
-   * - `not-connected`: The socket is not connected to a remote address. (ENOTCONN)
+   * - `invalid-state`: The socket is not connected to a remote address. (ENOTCONN)
    * 
    * # References
    * - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/getpeername.html>
@@ -147,60 +156,44 @@ export namespace WasiSocketsTcp {
    * - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-getpeername>
    * - <https://man.freebsd.org/cgi/man.cgi?query=getpeername&sektion=2&n=1>
    */
-  export function remoteAddress(this_: TcpSocket): IpSocketAddress;
   /**
    * Whether this is a IPv4 or IPv6 socket.
    * 
    * Equivalent to the SO_DOMAIN socket option.
    */
-  export function addressFamily(this_: TcpSocket): IpAddressFamily;
   /**
    * Whether IPv4 compatibility (dual-stack) mode is disabled or not.
    * 
    * Equivalent to the IPV6_V6ONLY socket option.
    * 
    * # Typical errors
-   * - `ipv6-only-operation`:  (get/set) `this` socket is an IPv4 socket.
-   * - `already-bound`:        (set) The socket is already bound.
+   * - `invalid-state`:        (set) The socket is already bound.
+   * - `not-supported`:        (get/set) `this` socket is an IPv4 socket.
    * - `not-supported`:        (set) Host does not support dual-stack sockets. (Implementations are not required to.)
-   * - `concurrency-conflict`: (set) A `bind`, `connect` or `listen` operation is already in progress. (EALREADY)
    */
-  export function ipv6Only(this_: TcpSocket): boolean;
-  export function setIpv6Only(this_: TcpSocket, value: boolean): void;
   /**
    * Hints the desired listen queue size. Implementations are free to ignore this.
    * 
    * # Typical errors
-   * - `already-connected`:    (set) The socket is already in the Connection state.
-   * - `concurrency-conflict`: (set) A `bind`, `connect` or `listen` operation is already in progress. (EALREADY)
+   * - `not-supported`:        (set) The platform does not support changing the backlog size after the initial listen.
+   * - `invalid-state`:        (set) The socket is already in the Connection state.
    */
-  export function setListenBacklogSize(this_: TcpSocket, value: bigint): void;
   /**
    * Equivalent to the SO_KEEPALIVE socket option.
-   * 
-   * # Typical errors
-   * - `concurrency-conflict`: (set) A `bind`, `connect` or `listen` operation is already in progress. (EALREADY)
    */
-  export function keepAlive(this_: TcpSocket): boolean;
-  export function setKeepAlive(this_: TcpSocket, value: boolean): void;
   /**
    * Equivalent to the TCP_NODELAY socket option.
    * 
-   * # Typical errors
-   * - `concurrency-conflict`: (set) A `bind`, `connect` or `listen` operation is already in progress. (EALREADY)
+   * The default value is `false`.
    */
-  export function noDelay(this_: TcpSocket): boolean;
-  export function setNoDelay(this_: TcpSocket, value: boolean): void;
   /**
    * Equivalent to the IP_TTL & IPV6_UNICAST_HOPS socket options.
    * 
    * # Typical errors
-   * - `already-connected`:    (set) The socket is already in the Connection state.
-   * - `already-listening`:    (set) The socket is already in the Listener state.
-   * - `concurrency-conflict`: (set) A `bind`, `connect` or `listen` operation is already in progress. (EALREADY)
+   * - `invalid-argument`:     (set) The TTL value must be 1 or higher.
+   * - `invalid-state`:        (set) The socket is already in the Connection state.
+   * - `invalid-state`:        (set) The socket is already in the Listener state.
    */
-  export function unicastHopLimit(this_: TcpSocket): number;
-  export function setUnicastHopLimit(this_: TcpSocket, value: number): void;
   /**
    * The kernel buffer space reserved for sends/receives on this socket.
    * 
@@ -214,25 +207,15 @@ export namespace WasiSocketsTcp {
    * Equivalent to the SO_RCVBUF and SO_SNDBUF socket options.
    * 
    * # Typical errors
-   * - `already-connected`:    (set) The socket is already in the Connection state.
-   * - `already-listening`:    (set) The socket is already in the Listener state.
-   * - `concurrency-conflict`: (set) A `bind`, `connect` or `listen` operation is already in progress. (EALREADY)
+   * - `invalid-state`:        (set) The socket is already in the Connection state.
+   * - `invalid-state`:        (set) The socket is already in the Listener state.
    */
-  export function receiveBufferSize(this_: TcpSocket): bigint;
-  export function setReceiveBufferSize(this_: TcpSocket, value: bigint): void;
-  export function sendBufferSize(this_: TcpSocket): bigint;
-  export function setSendBufferSize(this_: TcpSocket, value: bigint): void;
   /**
    * Create a `pollable` which will resolve once the socket is ready for I/O.
    * 
-   * The created `pollable` is a child resource of the `tcp-socket`.
-   * Implementations may trap if the `tcp-socket` is dropped before all
-   * derived `pollable`s created with this function are dropped.
-   * 
    * Note: this function is here for WASI Preview2 only.
    * It's planned to be removed when `future` is natively supported in Preview3.
    */
-  export function subscribe(this_: TcpSocket): Pollable;
   /**
    * Initiate a graceful shutdown.
    * 
@@ -246,7 +229,7 @@ export namespace WasiSocketsTcp {
    * The shutdown function does not close (drop) the socket.
    * 
    * # Typical errors
-   * - `not-connected`: The socket is not in the Connection state. (ENOTCONN)
+   * - `invalid-state`: The socket is not in the Connection state. (ENOTCONN)
    * 
    * # References
    * - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/shutdown.html>
@@ -254,21 +237,12 @@ export namespace WasiSocketsTcp {
    * - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-shutdown>
    * - <https://man.freebsd.org/cgi/man.cgi?query=shutdown&sektion=2>
    */
-  export function shutdown(this_: TcpSocket, shutdownType: ShutdownType): void;
-  /**
-   * Dispose of the specified `tcp-socket`, after which it may no longer be used.
-   * 
-   * Similar to the POSIX `close` function.
-   * 
-   * Note: this function is scheduled to be removed when Resources are natively supported in Wit.
-   */
-  export function dropTcpSocket(this_: TcpSocket): void;
 }
 import type { InputStream } from '../interfaces/wasi-io-streams';
 export { InputStream };
 import type { OutputStream } from '../interfaces/wasi-io-streams';
 export { OutputStream };
-import type { Pollable } from '../interfaces/wasi-poll-poll';
+import type { Pollable } from '../interfaces/wasi-io-poll';
 export { Pollable };
 import type { Network } from '../interfaces/wasi-sockets-network';
 export { Network };
@@ -278,10 +252,6 @@ import type { IpSocketAddress } from '../interfaces/wasi-sockets-network';
 export { IpSocketAddress };
 import type { IpAddressFamily } from '../interfaces/wasi-sockets-network';
 export { IpAddressFamily };
-/**
- * A TCP socket handle.
- */
-export type TcpSocket = number;
 /**
  * # Variants
  * 
@@ -296,3 +266,31 @@ export type TcpSocket = number;
  * Similar to `SHUT_RDWR` in POSIX.
  */
 export type ShutdownType = 'receive' | 'send' | 'both';
+
+export class TcpSocket {
+  startBind(network: Network, localAddress: IpSocketAddress): void;
+  finishBind(): void;
+  startConnect(network: Network, remoteAddress: IpSocketAddress): void;
+  finishConnect(): [InputStream, OutputStream];
+  startListen(): void;
+  finishListen(): void;
+  accept(): [TcpSocket, InputStream, OutputStream];
+  localAddress(): IpSocketAddress;
+  remoteAddress(): IpSocketAddress;
+  addressFamily(): IpAddressFamily;
+  ipv6Only(): boolean;
+  setIpv6Only(value: boolean): void;
+  setListenBacklogSize(value: bigint): void;
+  keepAlive(): boolean;
+  setKeepAlive(value: boolean): void;
+  noDelay(): boolean;
+  setNoDelay(value: boolean): void;
+  unicastHopLimit(): number;
+  setUnicastHopLimit(value: number): void;
+  receiveBufferSize(): bigint;
+  setReceiveBufferSize(value: bigint): void;
+  sendBufferSize(): bigint;
+  setSendBufferSize(value: bigint): void;
+  subscribe(): Pollable;
+  shutdown(shutdownType: ShutdownType): void;
+}

package/types/interfaces/wasi-sockets-udp-create-socket.d.ts

@@ -11,9 +11,8 @@ export namespace WasiSocketsUdpCreateSocket {
    * All sockets are non-blocking. Use the wasi-poll interface to block on asynchronous operations.
    * 
    * # Typical errors
-   * - `not-supported`:                The host does not support UDP sockets. (EOPNOTSUPP)
-   * - `address-family-not-supported`: The specified `address-family` is not supported. (EAFNOSUPPORT)
-   * - `new-socket-limit`:             The new socket resource could not be created because of a system limit. (EMFILE, ENFILE)
+   * - `not-supported`:     The specified `address-family` is not supported. (EAFNOSUPPORT)
+   * - `new-socket-limit`:  The new socket resource could not be created because of a system limit. (EMFILE, ENFILE)
    * 
    * # References:
    * - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/socket.html>

package/types/interfaces/wasi-sockets-udp.d.ts

@@ -11,12 +11,11 @@ export namespace WasiSocketsUdp {
    * Unlike in POSIX, this function is async. This enables interactive WASI hosts to inject permission prompts.
    * 
    * # Typical `start` errors
-   * - `address-family-mismatch`:   The `local-address` has the wrong address family. (EINVAL)
-   * - `already-bound`:             The socket is already bound. (EINVAL)
-   * - `concurrency-conflict`:      Another `bind` or `connect` operation is already in progress. (EALREADY)
+   * - `invalid-argument`:          The `local-address` has the wrong address family. (EAFNOSUPPORT, EFAULT on Windows)
+   * - `invalid-state`:             The socket is already bound. (EINVAL)
    * 
    * # Typical `finish` errors
-   * - `ephemeral-ports-exhausted`: No ephemeral ports available. (EADDRINUSE, ENOBUFS on Windows)
+   * - `address-in-use`:            No ephemeral ports available. (EADDRINUSE, ENOBUFS on Windows)
    * - `address-in-use`:            Address is already in use. (EADDRINUSE)
    * - `address-not-bindable`:      `local-address` is not an address that the `network` can bind to. (EADDRNOTAVAIL)
    * - `not-in-progress`:           A `bind` operation is not in progress.
@@ -28,8 +27,7 @@ export namespace WasiSocketsUdp {
    * - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-bind>
    * - <https://man.freebsd.org/cgi/man.cgi?query=bind&sektion=2&format=html>
    */
-  export function startBind(this_: UdpSocket, network: Network, localAddress: IpSocketAddress): void;
-  export function finishBind(this_: UdpSocket): void;
+  export { UdpSocket };
   /**
    * Set the destination address.
    * 
@@ -44,14 +42,14 @@ export namespace WasiSocketsUdp {
    * Unlike in POSIX, this function is async. This enables interactive WASI hosts to inject permission prompts.
    * 
    * # Typical `start` errors
-   * - `address-family-mismatch`:   The `remote-address` has the wrong address family. (EAFNOSUPPORT)
-   * - `invalid-remote-address`:    The IP address in `remote-address` is set to INADDR_ANY (`0.0.0.0` / `::`). (EDESTADDRREQ, EADDRNOTAVAIL)
-   * - `invalid-remote-address`:    The port in `remote-address` is set to 0. (EDESTADDRREQ, EADDRNOTAVAIL)
-   * - `already-attached`:          The socket is already bound to a different network. The `network` passed to `connect` must be identical to the one passed to `bind`.
-   * - `concurrency-conflict`:      Another `bind` or `connect` operation is already in progress. (EALREADY)
+   * - `invalid-argument`:          The `remote-address` has the wrong address family. (EAFNOSUPPORT)
+   * - `invalid-argument`:          `remote-address` is a non-IPv4-mapped IPv6 address, but the socket was bound to a specific IPv4-mapped IPv6 address. (or vice versa)
+   * - `invalid-argument`:          The IP address in `remote-address` is set to INADDR_ANY (`0.0.0.0` / `::`). (EDESTADDRREQ, EADDRNOTAVAIL)
+   * - `invalid-argument`:          The port in `remote-address` is set to 0. (EDESTADDRREQ, EADDRNOTAVAIL)
+   * - `invalid-argument`:          The socket is already bound to a different network. The `network` passed to `connect` must be identical to the one passed to `bind`.
    * 
    * # Typical `finish` errors
-   * - `ephemeral-ports-exhausted`: Tried to perform an implicit bind, but there were no ephemeral ports available. (EADDRINUSE, EADDRNOTAVAIL on Linux, EAGAIN on BSD)
+   * - `address-in-use`:            Tried to perform an implicit bind, but there were no ephemeral ports available. (EADDRINUSE, EADDRNOTAVAIL on Linux, EAGAIN on BSD)
    * - `not-in-progress`:           A `connect` operation is not in progress.
    * - `would-block`:               Can't finish the operation, it is still in progress. (EWOULDBLOCK, EAGAIN)
    * 
@@ -61,8 +59,6 @@ export namespace WasiSocketsUdp {
    * - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-connect>
    * - <https://man.freebsd.org/cgi/man.cgi?connect>
    */
-  export function startConnect(this_: UdpSocket, network: Network, remoteAddress: IpSocketAddress): void;
-  export function finishConnect(this_: UdpSocket): void;
   /**
    * Receive messages on the socket.
    * 
@@ -71,7 +67,7 @@ export namespace WasiSocketsUdp {
    * If `max-results` is 0, this function returns successfully with an empty list.
    * 
    * # Typical errors
-   * - `not-bound`:          The socket is not bound to any local address. (EINVAL)
+   * - `invalid-state`:      The socket is not bound to any local address. (EINVAL)
    * - `remote-unreachable`: The remote address is not reachable. (ECONNREFUSED, ECONNRESET, ENETRESET on Windows, EHOSTUNREACH, EHOSTDOWN, ENETUNREACH, ENETDOWN)
    * - `would-block`:        There is no pending data available to be read at the moment. (EWOULDBLOCK, EAGAIN)
    * 
@@ -85,7 +81,6 @@ export namespace WasiSocketsUdp {
    * - <https://learn.microsoft.com/en-us/previous-versions/windows/desktop/legacy/ms741687(v=vs.85)>
    * - <https://man.freebsd.org/cgi/man.cgi?query=recv&sektion=2>
    */
-  export function receive(this_: UdpSocket, maxResults: bigint): Datagram[];
   /**
    * Send messages on the socket.
    * 
@@ -102,11 +97,12 @@ export namespace WasiSocketsUdp {
    * call `remote-address` to get their address.
    * 
    * # Typical errors
-   * - `address-family-mismatch`: The `remote-address` has the wrong address family. (EAFNOSUPPORT)
-   * - `invalid-remote-address`:  The IP address in `remote-address` is set to INADDR_ANY (`0.0.0.0` / `::`). (EDESTADDRREQ, EADDRNOTAVAIL)
-   * - `invalid-remote-address`:  The port in `remote-address` is set to 0. (EDESTADDRREQ, EADDRNOTAVAIL)
-   * - `already-connected`:       The socket is in "connected" mode and the `datagram.remote-address` does not match the address passed to `connect`. (EISCONN)
-   * - `not-bound`:               The socket is not bound to any local address. Unlike POSIX, this function does not perform an implicit bind.
+   * - `invalid-argument`:        The `remote-address` has the wrong address family. (EAFNOSUPPORT)
+   * - `invalid-argument`:        `remote-address` is a non-IPv4-mapped IPv6 address, but the socket was bound to a specific IPv4-mapped IPv6 address. (or vice versa)
+   * - `invalid-argument`:        The IP address in `remote-address` is set to INADDR_ANY (`0.0.0.0` / `::`). (EDESTADDRREQ, EADDRNOTAVAIL)
+   * - `invalid-argument`:        The port in `remote-address` is set to 0. (EDESTADDRREQ, EADDRNOTAVAIL)
+   * - `invalid-argument`:        The socket is in "connected" mode and the `datagram.remote-address` does not match the address passed to `connect`. (EISCONN)
+   * - `invalid-state`:           The socket is not bound to any local address. Unlike POSIX, this function does not perform an implicit bind.
    * - `remote-unreachable`:      The remote address is not reachable. (ECONNREFUSED, ECONNRESET, ENETRESET on Windows, EHOSTUNREACH, EHOSTDOWN, ENETUNREACH, ENETDOWN)
    * - `datagram-too-large`:      The datagram is too large. (EMSGSIZE)
    * - `would-block`:             The send buffer is currently full. (EWOULDBLOCK, EAGAIN)
@@ -121,12 +117,17 @@ export namespace WasiSocketsUdp {
    * - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-wsasendmsg>
    * - <https://man.freebsd.org/cgi/man.cgi?query=send&sektion=2>
    */
-  export function send(this_: UdpSocket, datagrams: Datagram[]): bigint;
   /**
    * Get the current bound address.
    * 
+   * POSIX mentions:
+   * > If the socket has not been bound to a local name, the value
+   * > stored in the object pointed to by `address` is unspecified.
+   * 
+   * WASI is stricter and requires `local-address` to return `invalid-state` when the socket hasn't been bound yet.
+   * 
    * # Typical errors
-   * - `not-bound`: The socket is not bound to any local address.
+   * - `invalid-state`: The socket is not bound to any local address.
    * 
    * # References
    * - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/getsockname.html>
@@ -134,12 +135,11 @@ export namespace WasiSocketsUdp {
    * - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-getsockname>
    * - <https://man.freebsd.org/cgi/man.cgi?getsockname>
    */
-  export function localAddress(this_: UdpSocket): IpSocketAddress;
   /**
    * Get the address set with `connect`.
    * 
    * # Typical errors
-   * - `not-connected`: The socket is not connected to a remote address. (ENOTCONN)
+   * - `invalid-state`: The socket is not connected to a remote address. (ENOTCONN)
    * 
    * # References
    * - <https://pubs.opengroup.org/onlinepubs/9699919799/functions/getpeername.html>
@@ -147,34 +147,24 @@ export namespace WasiSocketsUdp {
    * - <https://learn.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-getpeername>
    * - <https://man.freebsd.org/cgi/man.cgi?query=getpeername&sektion=2&n=1>
    */
-  export function remoteAddress(this_: UdpSocket): IpSocketAddress;
   /**
    * Whether this is a IPv4 or IPv6 socket.
    * 
    * Equivalent to the SO_DOMAIN socket option.
    */
-  export function addressFamily(this_: UdpSocket): IpAddressFamily;
   /**
    * Whether IPv4 compatibility (dual-stack) mode is disabled or not.
    * 
    * Equivalent to the IPV6_V6ONLY socket option.
    * 
    * # Typical errors
-   * - `ipv6-only-operation`:  (get/set) `this` socket is an IPv4 socket.
-   * - `already-bound`:        (set) The socket is already bound.
+   * - `not-supported`:        (get/set) `this` socket is an IPv4 socket.
+   * - `invalid-state`:        (set) The socket is already bound.
    * - `not-supported`:        (set) Host does not support dual-stack sockets. (Implementations are not required to.)
-   * - `concurrency-conflict`: (set) Another `bind` or `connect` operation is already in progress. (EALREADY)
    */
-  export function ipv6Only(this_: UdpSocket): boolean;
-  export function setIpv6Only(this_: UdpSocket, value: boolean): void;
   /**
    * Equivalent to the IP_TTL & IPV6_UNICAST_HOPS socket options.
-   * 
-   * # Typical errors
-   * - `concurrency-conflict`: (set) Another `bind` or `connect` operation is already in progress. (EALREADY)
    */
-  export function unicastHopLimit(this_: UdpSocket): number;
-  export function setUnicastHopLimit(this_: UdpSocket, value: number): void;
   /**
    * The kernel buffer space reserved for sends/receives on this socket.
    * 
@@ -186,29 +176,15 @@ export namespace WasiSocketsUdp {
    * for internal metadata structures.
    * 
    * Equivalent to the SO_RCVBUF and SO_SNDBUF socket options.
-   * 
-   * # Typical errors
-   * - `concurrency-conflict`: (set) Another `bind` or `connect` operation is already in progress. (EALREADY)
    */
-  export function receiveBufferSize(this_: UdpSocket): bigint;
-  export function setReceiveBufferSize(this_: UdpSocket, value: bigint): void;
-  export function sendBufferSize(this_: UdpSocket): bigint;
-  export function setSendBufferSize(this_: UdpSocket, value: bigint): void;
   /**
    * Create a `pollable` which will resolve once the socket is ready for I/O.
    * 
    * Note: this function is here for WASI Preview2 only.
    * It's planned to be removed when `future` is natively supported in Preview3.
    */
-  export function subscribe(this_: UdpSocket): Pollable;
-  /**
-   * Dispose of the specified `udp-socket`, after which it may no longer be used.
-   * 
-   * Note: this function is scheduled to be removed when Resources are natively supported in Wit.
-   */
-  export function dropUdpSocket(this_: UdpSocket): void;
 }
-import type { Pollable } from '../interfaces/wasi-poll-poll';
+import type { Pollable } from '../interfaces/wasi-io-poll';
 export { Pollable };
 import type { Network } from '../interfaces/wasi-sockets-network';
 export { Network };
@@ -218,11 +194,28 @@ import type { IpSocketAddress } from '../interfaces/wasi-sockets-network';
 export { IpSocketAddress };
 import type { IpAddressFamily } from '../interfaces/wasi-sockets-network';
 export { IpAddressFamily };
-/**
- * A UDP socket handle.
- */
-export type UdpSocket = number;
 export interface Datagram {
   data: Uint8Array,
   remoteAddress: IpSocketAddress,
 }
+
+export class UdpSocket {
+  startBind(network: Network, localAddress: IpSocketAddress): void;
+  finishBind(): void;
+  startConnect(network: Network, remoteAddress: IpSocketAddress): void;
+  finishConnect(): void;
+  receive(maxResults: bigint): Datagram[];
+  send(datagrams: Datagram[]): bigint;
+  localAddress(): IpSocketAddress;
+  remoteAddress(): IpSocketAddress;
+  addressFamily(): IpAddressFamily;
+  ipv6Only(): boolean;
+  setIpv6Only(value: boolean): void;
+  unicastHopLimit(): number;
+  setUnicastHopLimit(value: number): void;
+  receiveBufferSize(): bigint;
+  setReceiveBufferSize(value: bigint): void;
+  sendBufferSize(): bigint;
+  setSendBufferSize(value: bigint): void;
+  subscribe(): Pollable;
+}

package/types/wasi-cli-command.d.ts

@@ -13,8 +13,8 @@ import { WasiClocksTimezone } from './interfaces/wasi-clocks-timezone';
 import { WasiClocksWallClock } from './interfaces/wasi-clocks-wall-clock';
 import { WasiFilesystemPreopens } from './interfaces/wasi-filesystem-preopens';
 import { WasiFilesystemTypes } from './interfaces/wasi-filesystem-types';
+import { WasiIoPoll } from './interfaces/wasi-io-poll';
 import { WasiIoStreams } from './interfaces/wasi-io-streams';
-import { WasiPollPoll } from './interfaces/wasi-poll-poll';
 import { WasiRandomInsecure } from './interfaces/wasi-random-insecure';
 import { WasiRandomInsecureSeed } from './interfaces/wasi-random-insecure-seed';
 import { WasiRandomRandom } from './interfaces/wasi-random-random';

package/lib/browser/logging.js

@@ -1,14 +0,0 @@
-const levels = ["trace", "debug", "info", "warn", "error", "critical"];
-
-let logLevel = levels.indexOf("warn");
-
-export const logging = {
-  log(level, context, msg) {
-    if (logLevel > levels.indexOf(level)) return;
-    console[level](`(${context}) ${msg}\n`);
-  }
-};
-
-export function setLevel(level) {
-  logLevel = levels.indexOf(level);
-}

package/lib/http/error.js

@@ -1,11 +0,0 @@
-export class UnexpectedError extends Error {
-  /** @type { import("../../types/interfaces/wasi-http-types").ErrorUnexpectedError } */
-  payload;
-  constructor(message = "unexpected-error") {
-    super(message);
-    this.payload = {
-      tag: "unexpected-error",
-      val: message,
-    };
-  }
-}