@bytecodealliance/preview2-shim 0.0.16 → 0.0.17

package/lib/nodejs/http.js

@@ -1,130 +1,5 @@
-import { fileURLToPath } from "node:url";
-import { UnexpectedError } from "../http/error.js";
-import { createSyncFn } from "../http/synckit/index.js";
+import { WasiHttp } from '../http/wasi-http.js';
+import { _io } from './io.js';
 
-const workerPath = fileURLToPath(new URL('../http/make-request.js', import.meta.url));
-
-export function send(req) {
-  console.log(`[http] Send (nodejs) ${req.uri}`);
-  const syncFn = createSyncFn(workerPath);
-  let rawResponse = syncFn(req);
-  let response = JSON.parse(rawResponse);
-  if (response.status) {
-    return {
-      ...response,
-      body: response.body ? Buffer.from(response.body, "base64") : undefined,
-    };
-  }
-  throw new UnexpectedError(response.message);
-}
-
-export const incomingHandler = {
-  handle () {
-
-  }
-};
-
-export const outgoingHandler = {
-  handle () {
-
-  }
-};
-
-export const types = {
-  dropFields(_fields) {
-    console.log("[types] Drop fields");
-  },
-  newFields(_entries) {
-    console.log("[types] New fields");
-  },
-  fieldsGet(_fields, _name) {
-    console.log("[types] Fields get");
-  },
-  fieldsSet(_fields, _name, _value) {
-    console.log("[types] Fields set");
-  },
-  fieldsDelete(_fields, _name) {
-    console.log("[types] Fields delete");
-  },
-  fieldsAppend(_fields, _name, _value) {
-    console.log("[types] Fields append");
-  },
-  fieldsEntries(_fields) {
-    console.log("[types] Fields entries");
-  },
-  fieldsClone(_fields) {
-    console.log("[types] Fields clone");
-  },
-  finishIncomingStream(s) {
-    console.log(`[types] Finish incoming stream ${s}`);
-  },
-  finishOutgoingStream(s, _trailers) {
-    console.log(`[types] Finish outgoing stream ${s}`);
-  },
-  dropIncomingRequest(_req) {
-    console.log("[types] Drop incoming request");
-  },
-  dropOutgoingRequest(_req) {
-    console.log("[types] Drop outgoing request");
-  },
-  incomingRequestMethod(_req) {
-    console.log("[types] Incoming request method");
-  },
-  incomingRequestPathWithQuery(_req) {
-    console.log("[types] Incoming request path with query");
-  },
-  incomingRequestScheme(_req) {
-    console.log("[types] Incoming request scheme");
-  },
-  incomingRequestAuthority(_req) {
-    console.log("[types] Incoming request authority");
-  },
-  incomingRequestHeaders(_req) {
-    console.log("[types] Incoming request headers");
-  },
-  incomingRequestConsume(_req) {
-    console.log("[types] Incoming request consume");
-  },
-  newOutgoingRequest(_method, _pathWithQuery, _scheme, _authority, _headers) {
-    console.log("[types] New outgoing request");
-  },
-  outgoingRequestWrite(_req) {
-    console.log("[types] Outgoing request write");
-  },
-  dropResponseOutparam(_res) {
-    console.log("[types] Drop response outparam");
-  },
-  setResponseOutparam(_response) {
-    console.log("[types] Drop fields");
-  },
-  dropIncomingResponse(_res) {
-    console.log("[types] Drop incoming response");
-  },
-  dropOutgoingResponse(_res) {
-    console.log("[types] Drop outgoing response");
-  },
-  incomingResponseStatus(_res) {
-    console.log("[types] Incoming response status");
-  },
-  incomingResponseHeaders(_res) {
-    console.log("[types] Incoming response headers");
-  },
-  incomingResponseConsume(_res) {
-    console.log("[types] Incoming response consume");
-  },
-  newOutgoingResponse(_statusCode, _headers) {
-    console.log("[types] New outgoing response");
-  },
-  outgoingResponseWrite(_res) {
-    console.log("[types] Outgoing response write");
-  },
-  dropFutureIncomingResponse(_f) {
-    console.log("[types] Drop future incoming response");
-  },
-  futureIncomingResponseGet(_f) {
-    console.log("[types] Future incoming response get");
-  },
-  listenToFutureIncomingResponse(_f) {
-    console.log("[types] Listen to future incoming response");
-  }
-};
+const http = new WasiHttp(_io);
+export const { incomingHandler, outgoingHandler, types } = http;

package/lib/nodejs/index.js

@@ -8,7 +8,7 @@ import * as random from "./random.js";
 import * as sockets from "./sockets.js";
 import * as cli from "./cli.js";
 
-export const importObject = {
+export {
   clocks,
   filesystem,
   http,
@@ -17,9 +17,8 @@ export const importObject = {
   poll,
   random,
   sockets,
-  cli,
-};
+  cli
+}
 
 export { WasiHttp } from "../http/wasi-http.js";
 
-export default importObject;

package/lib/nodejs/io.js

@@ -1,160 +1,16 @@
-import { readSync as fsReadSync } from 'node:fs';
+import { Io } from '../common/io.js';
 
-function _convertFsError (e) {
-  switch (e.code) {
-    case 'EACCES': throw 'access';
-    case 'EAGAIN':
-    case 'EWOULDBLOCK': throw 'would-block';
-    case 'EALREADY': throw 'already';
-    case 'EBADF': throw 'bad-descriptor';
-    case 'EBUSY': throw 'busy';
-    case 'EDEADLK': throw 'deadlock';
-    case 'EDQUOT': throw 'quota';
-    case 'EEXIST': throw 'exist';
-    case 'EFBIG': throw 'file-too-large';
-    case 'EILSEQ': throw 'illegal-byte-sequence';
-    case 'EINPROGRESS': throw 'in-progress';
-    case 'EINTR': throw 'interrupted';
-    case 'EINVAL': throw 'invalid';
-    case 'EIO': throw 'io';
-    case 'EISDIR': throw 'is-directory';
-    case 'ELOOP': throw 'loop';
-    case 'EMLINK': throw 'too-many-links';
-    case 'EMSGSIZE': throw 'message-size';
-    case 'ENAMETOOLONG': throw 'name-too-long'
-    case 'ENODEV': throw 'no-device';
-    case 'ENOENT': throw 'no-entry';
-    case 'ENOLCK': throw 'no-lock';
-    case 'ENOMEM': throw 'insufficient-memory';
-    case 'ENOSPC': throw 'insufficient-space';
-    case 'ENOTDIR': throw 'not-directory';
-    case 'ENOTEMPTY': throw 'not-empty';
-    case 'ENOTRECOVERABLE': throw 'not-recoverable';
-    case 'ENOTSUP': throw 'unsupported';
-    case 'ENOTTY': throw 'no-tty';
-    case 'ENXIO': throw 'no-such-device';
-    case 'EOVERFLOW': throw 'overflow';
-    case 'EPERM': throw 'not-permitted';
-    case 'EPIPE': throw 'pipe';
-    case 'EROFS': throw 'read-only';
-    case 'ESPIPE': throw 'invalid-seek';
-    case 'ETXTBSY': throw 'text-file-busy';
-    case 'EXDEV': throw 'cross-device';
-    default: throw e;
-  }
-}
-
-export let _streams = {};
-let streamCnt = 0;
-export function _createFsStream(fd, type, context) {
-  _streams[streamCnt] = {
-    type,
-    fd,
-    context
-  };
-  return streamCnt++;
-}
-
-export function _getFsStreamContext(stream, type) {
-  const entry = _streams[stream];
-  if (!entry)
-    throw new Error(`No '${type}' stream found at stream ${stream}`);
-  if (entry.type !== type)
-    throw new Error(`Unexpected '${entry.type}' stream found at stream ${stream}, expected '${type}'`);
-  return entry.context;
-}
-
-export function _dropFsStream(stream) {
-  // TODO: recycling?
-  delete _streams[stream];
-}
-
-export const streams = {
-  read(s, len) {
-    return streams.blockingRead(s, len);
-  },
-  blockingRead(s, len) {
-    len = Number(len);
-    const stream = _streams[s];
-    switch (stream?.type) {
-      case 'file': {
-        const buf = Buffer.alloc(Number(len));
-        try {
-          const readBytes = fsReadSync(stream.fd, buf, 0, Number(len));
-          if (readBytes < Number(len)) {
-            return [new Uint8Array(buf.buffer, 0, readBytes), 'ended'];
-          }
-          return [new Uint8Array(buf.buffer, 0, readBytes), 'open'];
-        }
-        catch (e) {
-          _convertFsError(e);
-        }
-        break;
-      }
+export const _io = new Io(
+  {
+    write (buf) {
+      process.stdout.write(buf);
     }
-    throw null;
-  },
-  skip(s, _len) {
-    console.log(`[streams] Skip ${s}`);
-  },
-  blockingSkip(s, _len) {
-    console.log(`[streams] Blocking skip ${s}`);
-  },
-  subscribeToInputStream(s) {
-    console.log(`[streams] Subscribe to input stream ${s}`);
-  },
-  dropInputStream(s) {
-    delete _streams[s];
-  },
-  checkWrite(_s) {
-    // TODO: implement
-    return 1000000n;
   },
-  write(s, buf) {
-    switch (s) {
-      case 0:
-        throw new Error(`TODO: write stdin`);
-      case 1: {
-        process.stdout.write(buf);
-        break;
-      }
-      case 2: {
-        process.stderr.write(buf);
-        break;
-      }
-      default:
-        throw new Error(`TODO: write ${s}`);
+  {
+    write (buf) {
+      process.stderr.write(buf);
     }
-  },
-  blockingWriteAndFlush(s, buf) {
-    // TODO: implement
-    return streams.write(s, buf);
-  },
-  flush(s) {
-    return streams.blockingFlush(s);
-  },
-  blockingFlush(_s) {
-    // TODO: implement
-  },
-  writeZeroes(s, _len) {
-    console.log(`[streams] Write zeroes ${s}`);
-  },
-  blockingWriteZeroes(s, _len) {
-    console.log(`[streams] Blocking write zeroes ${s}`);
-  },
-  splice(s, _src, _len) {
-    console.log(`[streams] Splice ${s}`);
-  },
-  blockingSplice(s, _src, _len) {
-    console.log(`[streams] Blocking splice ${s}`);
-  },
-  forward(s, _src) {
-    console.log(`[streams] Forward ${s}`);
-  },
-  subscribeToOutputStream(s) {
-    console.log(`[streams] Subscribe to output stream ${s}`);
-  },
-  dropOutputStream(s) {
-    console.log(`[streams] Drop output stream ${s}`);
   }
-};
+);
+
+export const streams = _io.streams;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytecodealliance/preview2-shim",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "description": "WASI Preview2 shim for JS environments",
   "author": "Guy Bedford, Eduardo Rodrigues<16357187+eduardomourar@users.noreply.github.com>",
   "type": "module",

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,
-    };
-  }
-}