@bytecodealliance/preview2-shim 0.14.2 → 0.15.0

package/lib/browser/sockets.js

@@ -64,12 +64,6 @@ export const tcp = {
   },
   addressFamily() {
   
-  },
-  ipv6Only() {
-  
-  },
-  setIpv6Only() {
-  
   },
   setListenBacklogSize() {
   
@@ -152,14 +146,6 @@ export const udp = {
   
   },
   
-  ipv6Only () {
-  
-  },
-  
-  setIpv6Only () {
-  
-  },
-  
   unicastHopLimit () {
   
   },

package/lib/io/calls.js

@@ -1,10 +1,21 @@
 let call_id = 0;
 
-// Call is a 32 bit integer, leading 16 bits are call number, trailing 16 bits allow custom call types
+// Call is a 32 bit integer, leading 8 bits are call number, trailing 24 bits allow custom call types
 export const CALL_MASK = 0xff000000;
 export const CALL_TYPE_MASK = 0x00ffffff;
 export const CALL_SHIFT = 24;
 
+// Type indiciator for generic Stream, Future, and Poll calls
+let cnt = 0;
+export const STDIN = ++cnt;
+export const STDOUT = ++cnt;
+export const STDERR = ++cnt;
+export const FILE = ++cnt;
+export const HTTP = ++cnt;
+export const SOCKET_TCP = ++cnt;
+export const SOCKET_UDP = ++cnt;
+export const CLOCKS = ++cnt;
+
 // Io Input Stream
 export const INPUT_STREAM_CREATE = ++call_id << CALL_SHIFT;
 export const INPUT_STREAM_READ = ++call_id << CALL_SHIFT;
@@ -34,11 +45,13 @@ export const OUTPUT_STREAM_GET_TOTAL_BYTES = ++call_id << CALL_SHIFT;
 // Io Poll
 export const POLL_POLLABLE_READY = ++call_id << CALL_SHIFT;
 export const POLL_POLLABLE_BLOCK = ++call_id << CALL_SHIFT;
+export const POLL_POLLABLE_DISPOSE = ++call_id << CALL_SHIFT;
 export const POLL_POLL_LIST = ++call_id << CALL_SHIFT;
 
 // Futures
-export const FUTURE_GET_VALUE_AND_DISPOSE = ++call_id << CALL_SHIFT;
 export const FUTURE_DISPOSE = ++call_id << CALL_SHIFT;
+export const FUTURE_TAKE_VALUE = ++call_id << CALL_SHIFT;
+export const FUTURE_SUBSCRIBE = ++call_id << CALL_SHIFT;
 
 // Http
 export const HTTP_CREATE_REQUEST = ++call_id << 24;
@@ -49,143 +62,67 @@ export const HTTP_SERVER_STOP = ++call_id << CALL_SHIFT;
 export const HTTP_SERVER_INCOMING_HANDLER = ++call_id << CALL_SHIFT;
 export const HTTP_SERVER_SET_OUTGOING_RESPONSE = ++call_id << CALL_SHIFT;
 export const HTTP_SERVER_CLEAR_OUTGOING_RESPONSE = ++call_id << CALL_SHIFT;
+export const HTTP_OUTGOING_BODY_DISPOSE = ++call_id << CALL_SHIFT;
 
 // Clocks
-export const CLOCKS_NOW = ++call_id << 24;
-export const CLOCKS_DURATION_SUBSCRIBE = ++call_id << 24;
-export const CLOCKS_INSTANT_SUBSCRIBE = ++call_id << 24;
-
-// Sockets (TCP)
-export const SOCKET_TCP_CREATE_HANDLE = ++call_id << 24;
-export const SOCKET_TCP_BIND = ++call_id << 24;
-export const SOCKET_TCP_CONNECT = ++call_id << 24;
-export const SOCKET_TCP_LISTEN = ++call_id << 24;
-export const SOCKET_TCP_ACCEPT = ++call_id << 24;
-export const SOCKET_TCP_GET_LOCAL_ADDRESS = ++call_id << 24;
-export const SOCKET_TCP_GET_REMOTE_ADDRESS = ++call_id << 24;
-export const SOCKET_TCP_SHUTDOWN = ++call_id << 24;
-export const SOCKET_TCP_SET_KEEP_ALIVE = ++call_id << 24;
-export const SOCKET_TCP_DISPOSE = ++call_id << 24;
-export const SOCKET_TCP_CREATE_INPUT_STREAM = ++call_id << 24;
-export const SOCKET_TCP_CREATE_OUTPUT_STREAM = ++call_id << 24;
-// Sockets (UDP)
-export const SOCKET_UDP_CREATE_HANDLE = ++call_id << 24;
-export const SOCKET_UDP_BIND = ++call_id << 24;
-export const SOCKET_UDP_CONNECT = ++call_id << 24;
-export const SOCKET_UDP_DISCONNECT = ++call_id << 24;
-export const SOCKET_UDP_CHECK_SEND = ++call_id << 24;
-export const SOCKET_UDP_SEND = ++call_id << 24;
-export const SOCKET_UDP_RECEIVE = ++call_id << 24;
-export const SOCKET_UDP_DISPOSE = ++call_id << 24;
-export const SOCKET_UDP_GET_LOCAL_ADDRESS = ++call_id << 24;
-export const SOCKET_UDP_GET_REMOTE_ADDRESS = ++call_id << 24;
-export const SOCKET_UDP_GET_RECEIVE_BUFFER_SIZE = ++call_id << 24;
-export const SOCKET_UDP_SET_RECEIVE_BUFFER_SIZE = ++call_id << 24;
-export const SOCKET_UDP_GET_SEND_BUFFER_SIZE = ++call_id << 24;
-export const SOCKET_UDP_SET_SEND_BUFFER_SIZE = ++call_id << 24;
-export const SOCKET_UDP_SET_UNICAST_HOP_LIMIT = ++call_id << 24;
-export const SOCKET_RESOLVE_ADDRESS_CREATE_REQUEST = ++call_id << 24;
-export const SOCKET_RESOLVE_ADDRESS_GET_AND_DISPOSE_REQUEST = ++call_id << 24;
-export const SOCKET_RESOLVE_ADDRESS_DISPOSE_REQUEST = ++call_id << 24;
-
-// Type indiciator for generic Stream, Future, and Poll calls
-let cnt = 0;
-export const STDIN = ++cnt;
-export const STDOUT = ++cnt;
-export const STDERR = ++cnt;
-export const FILE = ++cnt;
-export const HTTP = ++cnt;
-export const SOCKET = ++cnt;
-
-export const callTypeMap = {
-  [STDIN]: "STDIN",
-  [STDOUT]: "STDOUT",
-  [STDERR]: "STDERR",
-  [FILE]: "FILE",
-  [HTTP]: "HTTP",
-  [SOCKET]: "SOCKET",
-};
-
-export const callMap = {
-  [INPUT_STREAM_CREATE]: 'INPUT_STREAM_CREATE',
-  [INPUT_STREAM_READ]: "INPUT_STREAM_READ",
-  [INPUT_STREAM_BLOCKING_READ]: "INPUT_STREAM_BLOCKING_READ",
-  [INPUT_STREAM_SKIP]: "INPUT_STREAM_SKIP",
-  [INPUT_STREAM_BLOCKING_SKIP]: "INPUT_STREAM_BLOCKING_SKIP",
-  [INPUT_STREAM_SUBSCRIBE]: "INPUT_STREAM_SUBSCRIBE",
-  [INPUT_STREAM_DISPOSE]: "INPUT_STREAM_DISPOSE",
-
-  // Io Output Stream
-  [OUTPUT_STREAM_CREATE]: "OUTPUT_STREAM_CREATE",
-  [OUTPUT_STREAM_CHECK_WRITE]: "OUTPUT_STREAM_CHECK_WRITE",
-  [OUTPUT_STREAM_WRITE]: "OUTPUT_STREAM_WRITE",
-  [OUTPUT_STREAM_BLOCKING_WRITE_AND_FLUSH]: "OUTPUT_STREAM_BLOCKING_WRITE_AND_FLUSH",
-  [OUTPUT_STREAM_FLUSH]: "OUTPUT_STREAM_FLUSH",
-  [OUTPUT_STREAM_BLOCKING_FLUSH]: "OUTPUT_STREAM_BLOCKING_FLUSH",
-  [OUTPUT_STREAM_WRITE_ZEROES]: "OUTPUT_STREAM_WRITE_ZEROES",
-  [OUTPUT_STREAM_BLOCKING_WRITE_ZEROES_AND_FLUSH]: "OUTPUT_STREAM_BLOCKING_WRITE_ZEROES_AND_FLUSH",
-  [OUTPUT_STREAM_SPLICE]: "OUTPUT_STREAM_SPLICE",
-  [OUTPUT_STREAM_BLOCKING_SPLICE]: "OUTPUT_STREAM_BLOCKING_SPLICE",
-  [OUTPUT_STREAM_SUBSCRIBE]: "OUTPUT_STREAM_SUBSCRIBE",
-  [OUTPUT_STREAM_DISPOSE]: "OUTPUT_STREAM_DISPOSE",
-
-  [OUTPUT_STREAM_GET_TOTAL_BYTES]: "OUTPUT_STREAM_GET_TOTAL_BYTES",
+export const CLOCKS_NOW = ++call_id << CALL_SHIFT;
+export const CLOCKS_DURATION_SUBSCRIBE = ++call_id << CALL_SHIFT;
+export const CLOCKS_INSTANT_SUBSCRIBE = ++call_id << CALL_SHIFT;
+
+// Sockets
+// Tcp
+export const SOCKET_TCP_CREATE_HANDLE = ++call_id << CALL_SHIFT;
+export const SOCKET_TCP_BIND_START = ++call_id << CALL_SHIFT;
+export const SOCKET_TCP_BIND_FINISH = ++call_id << CALL_SHIFT;
+export const SOCKET_TCP_CONNECT_START = ++call_id << CALL_SHIFT;
+export const SOCKET_TCP_CONNECT_FINISH = ++call_id << CALL_SHIFT;
+export const SOCKET_TCP_SUBSCRIBE = ++call_id << CALL_SHIFT;
+export const SOCKET_TCP_LISTEN_START = ++call_id << CALL_SHIFT;
+export const SOCKET_TCP_LISTEN_FINISH = ++call_id << CALL_SHIFT;
+export const SOCKET_TCP_IS_LISTENING = ++call_id << CALL_SHIFT;
+export const SOCKET_TCP_ACCEPT = ++call_id << CALL_SHIFT;
+export const SOCKET_TCP_GET_LOCAL_ADDRESS = ++call_id << CALL_SHIFT;
+export const SOCKET_TCP_GET_REMOTE_ADDRESS = ++call_id << CALL_SHIFT;
+export const SOCKET_TCP_SET_KEEP_ALIVE = ++call_id << CALL_SHIFT;
+export const SOCKET_TCP_SET_LISTEN_BACKLOG_SIZE = ++call_id << CALL_SHIFT;
+export const SOCKET_TCP_SHUTDOWN = ++call_id << CALL_SHIFT;
+export const SOCKET_TCP_DISPOSE = ++call_id << CALL_SHIFT;
+// Udp
+export const SOCKET_UDP_CREATE_HANDLE = ++call_id << CALL_SHIFT;
+export const SOCKET_UDP_BIND_START = ++call_id << CALL_SHIFT;
+export const SOCKET_UDP_BIND_FINISH = ++call_id << CALL_SHIFT;
+export const SOCKET_UDP_STREAM = ++call_id << CALL_SHIFT;
+export const SOCKET_UDP_SUBSCRIBE = ++call_id << CALL_SHIFT;
+export const SOCKET_UDP_DISPOSE = ++call_id << CALL_SHIFT;
+export const SOCKET_UDP_GET_LOCAL_ADDRESS = ++call_id << CALL_SHIFT;
+export const SOCKET_UDP_GET_RECEIVE_BUFFER_SIZE = ++call_id << CALL_SHIFT;
+export const SOCKET_UDP_GET_REMOTE_ADDRESS = ++call_id << CALL_SHIFT;
+export const SOCKET_UDP_GET_SEND_BUFFER_SIZE = ++call_id << CALL_SHIFT;
+export const SOCKET_UDP_GET_UNICAST_HOP_LIMIT = ++call_id << CALL_SHIFT;
+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_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;
 
-  // Io Poll
-  [POLL_POLLABLE_READY]: "POLL_POLLABLE_READY",
-  [POLL_POLLABLE_BLOCK]: "POLL_POLLABLE_BLOCK",
-  [POLL_POLL_LIST]: "POLL_POLL_LIST",
+export const SOCKET_GET_DEFAULT_SEND_BUFFER_SIZE = ++call_id << CALL_SHIFT;
+export const SOCKET_GET_DEFAULT_RECEIVE_BUFFER_SIZE = ++call_id << CALL_SHIFT;
 
-  // Futures
-  [FUTURE_GET_VALUE_AND_DISPOSE]: "FUTURE_GET_VALUE_AND_DISPOSE",
-  [FUTURE_DISPOSE]: "FUTURE_DISPOSE",
+// Name lookup
+export const SOCKET_RESOLVE_ADDRESS_CREATE_REQUEST = ++call_id << CALL_SHIFT;
+export const SOCKET_RESOLVE_ADDRESS_TAKE_REQUEST = ++call_id << CALL_SHIFT;
+export const SOCKET_RESOLVE_ADDRESS_SUBSCRIBE_REQUEST = ++call_id << CALL_SHIFT;
+export const SOCKET_RESOLVE_ADDRESS_DISPOSE_REQUEST = ++call_id << CALL_SHIFT;
 
-  // Http
-  [HTTP_CREATE_REQUEST]: "HTTP_CREATE_REQUEST",
-  [HTTP_OUTPUT_STREAM_FINISH]: "HTTP_OUTPUT_STREAM_FINISH",
-  // Http server
-  [HTTP_SERVER_START]: "HTTP_SERVER_START",
-  [HTTP_SERVER_STOP]: "HTTP_SERVER_STOP",
-  [HTTP_SERVER_INCOMING_HANDLER]: "HTTP_SERVER_INCOMING_HANDLER",
-  [HTTP_SERVER_SET_OUTGOING_RESPONSE]: "HTTP_SERVER_SET_OUTGOING_RESPONSE",
-  [HTTP_SERVER_CLEAR_OUTGOING_RESPONSE]: "HTTP_SERVER_CLEAR_OUTGOING_RESPONSE",
+export const reverseMap = {};
 
-  // Clocks
-  [CLOCKS_NOW]: "CLOCKS_NOW",
-  [CLOCKS_DURATION_SUBSCRIBE]: "CLOCKS_DURATION_SUBSCRIBE",
-  [CLOCKS_INSTANT_SUBSCRIBE]: "CLOCKS_INSTANT_SUBSCRIBE",
+import * as calls from "./calls.js";
 
-  // Sockets TCP
-  [SOCKET_TCP_CREATE_HANDLE]: "SOCKET_TCP_CREATE_HANDLE",
-  [SOCKET_TCP_BIND]: "SOCKET_TCP_BIND",
-  [SOCKET_TCP_CONNECT]: "SOCKET_TCP_CONNECT",
-  [SOCKET_TCP_LISTEN]: "SOCKET_TCP_LISTEN",
-  [SOCKET_TCP_ACCEPT]: "SOCKET_TCP_ACCEPT",
-  [SOCKET_TCP_GET_LOCAL_ADDRESS]: "SOCKET_TCP_GET_LOCAL_ADDRESS",
-  [SOCKET_TCP_GET_REMOTE_ADDRESS]: "SOCKET_TCP_GET_REMOTE_ADDRESS",
-  [SOCKET_TCP_SHUTDOWN]: "SOCKET_TCP_SHUTDOWN",
-  [SOCKET_TCP_SET_KEEP_ALIVE]: "SOCKET_TCP_SET_KEEP_ALIVE",
-  [SOCKET_TCP_DISPOSE]: "SOCKET_TCP_DISPOSE",
-  [SOCKET_TCP_CREATE_INPUT_STREAM]: "SOCKET_TCP_CREATE_INPUT_STREAM",
-  [SOCKET_TCP_CREATE_OUTPUT_STREAM]: "SOCKET_TCP_CREATE_OUTPUT_STREAM",
-  // Sockets UDP
-  [SOCKET_UDP_CREATE_HANDLE]: "SOCKET_UDP_CREATE_HANDLE",
-  [SOCKET_UDP_BIND]: "SOCKET_UDP_BIND",
-  [SOCKET_UDP_CONNECT]: "SOCKET_UDP_CONNECT",
-  [SOCKET_UDP_DISCONNECT]: "SOCKET_UDP_DISCONNECT",
-  [SOCKET_UDP_CHECK_SEND]: "SOCKET_UDP_CHECK_SEND",
-  [SOCKET_UDP_SEND]: "SOCKET_UDP_SEND",
-  [SOCKET_UDP_RECEIVE]: "SOCKET_UDP_RECEIVE",
-  [SOCKET_UDP_DISPOSE]: "SOCKET_UDP_DISPOSE",
-  [SOCKET_UDP_GET_LOCAL_ADDRESS]: "SOCKET_UDP_GET_LOCAL_ADDRESS",
-  [SOCKET_UDP_GET_REMOTE_ADDRESS]: "SOCKET_UDP_GET_REMOTE_ADDRESS",
-  [SOCKET_UDP_GET_RECEIVE_BUFFER_SIZE]: "SOCKET_UDP_GET_RECEIVE_BUFFER_SIZE",
-  [SOCKET_UDP_SET_RECEIVE_BUFFER_SIZE]: "SOCKET_UDP_SET_RECEIVE_BUFFER_SIZE",
-  [SOCKET_UDP_GET_SEND_BUFFER_SIZE]: "SOCKET_UDP_GET_SEND_BUFFER_SIZE",
-  [SOCKET_UDP_SET_SEND_BUFFER_SIZE]: "SOCKET_UDP_SET_SEND_BUFFER_SIZE",
-  [SOCKET_UDP_SET_UNICAST_HOP_LIMIT]: "SOCKET_UDP_SET_UNICAST_HOP_LIMIT",
-  // Socket DNS
-  [SOCKET_RESOLVE_ADDRESS_CREATE_REQUEST]: "SOCKET_RESOLVE_ADDRESS_CREATE_REQUEST",
-  [SOCKET_RESOLVE_ADDRESS_GET_AND_DISPOSE_REQUEST]: "SOCKET_RESOLVE_ADDRESS_GET_AND_DISPOSE_REQUEST",
-  [SOCKET_RESOLVE_ADDRESS_DISPOSE_REQUEST]: "SOCKET_RESOLVE_ADDRESS_DISPOSE_REQUEST",
-};
+for (const name of Object.getOwnPropertyNames(calls)) {
+  if (name === "reverseMap") continue;
+  reverseMap[calls[name]] = name;
+}

package/lib/io/worker-http.js

@@ -1,4 +1,7 @@
-import { createStream, getStreamOrThrow } from "./worker-thread.js";
+import {
+  createReadableStream,
+  getStreamOrThrow,
+} from "./worker-thread.js";
 import {
   createServer,
   request as httpRequest,
@@ -48,7 +51,7 @@ export async function setOutgoingResponse(
 export async function startHttpServer(id, { port, host }) {
   const server = createServer((req, res) => {
     // create the streams and their ids
-    const streamId = createStream(req);
+    const streamId = createReadableStream(req);
     const responseId = ++responseCnt;
     parentPort.postMessage({
       type: HTTP_SERVER_INCOMING_HANDLER,
@@ -56,9 +59,11 @@ export async function startHttpServer(id, { port, host }) {
       payload: {
         responseId,
         method: req.method,
-        host: req.headers.host || host || 'localhost',
+        host: req.headers.host || host || "localhost",
         pathWithQuery: req.url,
-        headers: Object.entries(req.headersDistinct).flatMap(([key, val]) => val.map(val => [key, val])),
+        headers: Object.entries(req.headersDistinct).flatMap(([key, val]) =>
+          val.map((val) => [key, val])
+        ),
         streamId,
       },
     });
@@ -109,8 +114,8 @@ export async function createHttpRequest(
         req = httpRequest({
           agent: httpAgent,
           method,
-          host: authority.split(':')[0],
-          port: authority.split(':')[1],
+          host: authority.split(":")[0],
+          port: authority.split(":")[1],
           path: pathWithQuery,
           timeout: connectTimeout && Number(connectTimeout),
         });
@@ -119,8 +124,8 @@ export async function createHttpRequest(
         req = httpsRequest({
           agent: httpsAgent,
           method,
-          host: authority.split(':')[0],
-          port: authority.split(':')[1],
+          host: authority.split(":")[0],
+          port: authority.split(":")[1],
           path: pathWithQuery,
           timeout: connectTimeout && Number(connectTimeout),
         });
@@ -138,22 +143,20 @@ export async function createHttpRequest(
       req.end();
     }
     const res = await new Promise((resolve, reject) => {
-      req.on("response", resolve);
-      req.on("close", () => reject);
-      req.on("error", reject);
+      req.once("response", resolve);
+      req.once("close", () => reject);
+      req.once("error", reject);
     });
-    if (firstByteTimeout)
-      res.setTimeout(Number(firstByteTimeout));
+    if (firstByteTimeout) res.setTimeout(Number(firstByteTimeout));
     if (betweenBytesTimeout)
-      res.on("readable", () => {
+      res.once("readable", () => {
         res.setTimeout(Number(betweenBytesTimeout));
       });
-    res.on("end", () => void res.emit("readable"));
-    const bodyStreamId = createStream(res);
+    const bodyStreamId = createReadableStream(res);
     return {
       status: res.statusCode,
       headers: Array.from(Object.entries(res.headers)),
-      bodyStreamId: bodyStreamId,
+      bodyStreamId
     };
   } catch (e) {
     if (e?.tag) throw e;
@@ -166,7 +169,7 @@ export async function createHttpRequest(
           tag: "DNS-error",
           val: {
             rcode: err.code,
-            infoCode: err.errno,
+            infoCode: err.errno < 0 ? -err.errno : err.errno,
           },
         };
       case "ECONNREFUSED":