@bytecodealliance/preview2-shim 0.0.2 → 0.0.4

package/lib/browser/default-outgoing-HTTP.js

@@ -0,0 +1,3 @@
+export function handle(_request, _options) {
+  console.log("[default-outgoing-HTTP] Handle");
+}

package/lib/browser/environment.js

@@ -0,0 +1,3 @@
+export function getEnvironment () {
+  return [];
+}

package/lib/browser/filesystem.js

@@ -45,3 +45,7 @@ export function todoType(fd) {
 export function dropDirEntryStream(s) {
   console.log(`[filesystem] CLOSE DIR ENTRY STREAM: ${s}`);
 }
+
+export function getPreopens () {
+  console.log(`[filesystem] GET PREOPENS`);
+}

package/lib/browser/http.js

@@ -1,7 +1,7 @@
 import { UnexpectedError } from "../http/error.js";
 
 /**
- * @param {import("../types/wasi-http").Request} req
+ * @param {import("../types/imports/types").Request} req
  * @returns {string}
  */
 export function send(req) {
@@ -9,18 +9,20 @@ export function send(req) {
   try {
     const xhr = new XMLHttpRequest();
     xhr.open(req.method.toString(), req.uri, false);
-    xhr.responseType = "arraybuffer";
     for (let [name, value] of req.headers) {
-      xhr.setRequestHeader(name, value);
+      if (name !== "user-agent") {
+        xhr.setRequestHeader(name, value);
+      }
     }
     xhr.send(req.body.length > 0 ? req.body : null);
+    const body = xhr.response ? new TextEncoder().encode(xhr.response) : undefined;
     return {
       status: xhr.status,
       headers: xhr
         .getAllResponseHeaders()
         .trim()
         .split(/[\r\n]+/),
-      body: xhr.response.byteLength > 0 ? xhr.response : undefined,
+      body,
     };
   } catch (err) {
     throw new UnexpectedError(err.message);

package/lib/browser/index.js

@@ -1,21 +1,35 @@
-import * as clocks from "./clocks.js";
 import * as defaultClocks from "./default-clocks.js";
+import * as defaultOutgoingHttp from "./default-outgoing-HTTP.js";
+import * as environment from "./environment.js";
 import * as exit from "./exit.js";
 import * as filesystem from "./filesystem.js";
+import * as http from "./http.js";
 import * as io from "./io.js";
-import * as logging from "./logging.js";
+import * as logging from "./console.js";
+import * as monotonicClock from "./monotonic-clock.js";
 import * as poll from "./poll.js";
 import * as random from "./random.js";
 import * as stderr from "./stderr.js";
+import * as streams from "./streams.js";
+import * as types from "./types.js";
+import * as wallClock from "./wall-clock.js";
 
 export const importObject = {
-    "wasi-clocks": clocks,
-    "wasi-default-clocks": defaultClocks,
-    "wasi-exit": exit,
-    "wasi-filesystem": filesystem,
-    "wasi-io": io,
-    "wasi-logging": logging,
-    "wasi-poll": poll,
-    "wasi-random": random,
-    "wasi-stderr": stderr,
+    "default-clocks": defaultClocks,
+    "default-outgoing-HTTP": defaultOutgoingHttp,
+    "environment": environment,
+    "exit": exit,
+    "filesystem": filesystem,
+    "http": http,
+    "io": io,
+    "logging": logging,
+    "monotonic-clock": monotonicClock,
+    "poll": poll,
+    "random": random,
+    "stderr": stderr,
+    "streams": streams,
+    "types": types,
+    "wall-clock": wallClock,
 };
+
+export default importObject;

package/lib/browser/poll.js

@@ -1,3 +1,7 @@
+export function dropPollable(p) {
+  console.log(`[poll] Drop pollable ${p}`);
+}
+
 export function pollOneoff(f) {
   console.log(`[poll] Poll oneoff ${f}`);
 }

package/lib/browser/streams.js

@@ -0,0 +1,45 @@
+export function read(s, _len) {
+  console.log(`[streams] Read ${s}`);
+}
+export function blockingRead(s, _len) {
+  console.log(`[streams] Blocking read ${s}`);
+}
+export function skip(s, _len) {
+  console.log(`[streams] Skip ${s}`);
+}
+export function blockingSkip(s, _len) {
+  console.log(`[streams] Blocking skip ${s}`);
+}
+export function subscribeToInputStream(s) {
+  console.log(`[streams] Subscribe to input stream ${s}`);
+}
+export function dropInputStream(s) {
+  console.log(`[streams] Drop input stream ${s}`);
+}
+export function write(s, _buf) {
+  console.log(`[streams] Write ${s}`);
+}
+export function blockingWrite(s, _buf) {
+  console.log(`[streams] Blocking write ${s}`);
+}
+export function writeZeroes(s, _len) {
+  console.log(`[streams] Write zeroes ${s}`);
+}
+export function blockingWriteZeroes(s, _len) {
+  console.log(`[streams] Blocking write zeroes ${s}`);
+}
+export function splice(s, _src, _len) {
+  console.log(`[streams] Splice ${s}`);
+}
+export function blockingSplice(s, _src, _len) {
+  console.log(`[streams] Blocking splice ${s}`);
+}
+export function forward(s, _src) {
+  console.log(`[streams] Forward ${s}`);
+}
+export function subscribeToOutputStream(s) {
+  console.log(`[streams] Subscribe to output stream ${s}`);
+}
+export function dropOutputStream(s) {
+  console.log(`[streams] Drop output stream ${s}`);
+}

package/lib/browser/types.js

@@ -0,0 +1,99 @@
+export function dropFields(_fields) {
+  console.log("[types] Drop fields");
+}
+export function newFields(_entries) {
+  console.log("[types] New fields");
+}
+export function fieldsGet(_fields, _name) {
+  console.log("[types] Fields get");
+}
+export function fieldsSet(_fields, _name, _value) {
+  console.log("[types] Fields set");
+}
+export function fieldsDelete(_fields, _name) {
+  console.log("[types] Fields delete");
+}
+export function fieldsAppend(_fields, _name, _value) {
+  console.log("[types] Fields append");
+}
+export function fieldsEntries(_fields) {
+  console.log("[types] Fields entries");
+}
+export function fieldsClone(_fields) {
+  console.log("[types] Fields clone");
+}
+export function finishIncomingStream(s) {
+  console.log(`[types] Finish incoming stream ${s}`);
+}
+export function finishOutgoingStream(s, _trailers) {
+  console.log(`[types] Finish outgoing stream ${s}`);
+}
+export function dropIncomingRequest(_req) {
+  console.log("[types] Drop incoming request");
+}
+export function dropOutgoingRequest(_req) {
+  console.log("[types] Drop outgoing request");
+}
+export function incomingRequestMethod(_req) {
+  console.log("[types] Incoming request method");
+}
+export function incomingRequestPath(_req) {
+  console.log("[types] Incoming request path");
+}
+export function incomingRequestQuery(_req) {
+  console.log("[types] Incoming request query");
+}
+export function incomingRequestScheme(_req) {
+  console.log("[types] Incoming request scheme");
+}
+export function incomingRequestAuthority(_req) {
+  console.log("[types] Incoming request authority");
+}
+export function incomingRequestHeaders(_req) {
+  console.log("[types] Incoming request headers");
+}
+export function incomingRequestConsume(_req) {
+  console.log("[types] Incoming request consume");
+}
+export function newOutgoingRequest(_method, _path, _query, _scheme, _authority, _headers) {
+  console.log("[types] New outgoing request");
+}
+export function outgoingRequestWrite(_req) {
+  console.log("[types] Outgoing request write");
+}
+export function dropResponseOutparam(_res) {
+  console.log("[types] Drop response outparam");
+}
+export function setResponseOutparam(_res) {
+  console.log("[types] Drop fields");
+}
+export function dropIncomingResponse(_res) {
+  console.log("[types] Drop incoming response");
+}
+export function dropOutgoingResponse(_res) {
+  console.log("[types] Drop outgoing response");
+}
+export function incomingResponseStatus(_res) {
+  console.log("[types] Incoming response status");
+}
+export function incomingResponseHeaders(_res) {
+  console.log("[types] Incoming response headers");
+}
+export function incomingResponseConsume(_res) {
+  console.log("[types] Incoming response consume");
+}
+export function newOutgoingResponse(_statusCode, _headers) {
+  console.log("[types] New outgoing response");
+}
+export function outgoingResponseWrite(_res) {
+  console.log("[types] Outgoing response write");
+}
+export function dropFutureIncomingResponse(_f) {
+  console.log("[types] Drop future incoming response");
+}
+export function futureIncomingResponseGet(_f) {
+  console.log("[types] Future incoming response get");
+}
+export function listenToFutureIncomingResponse(_f) {
+  console.log("[types] Listen to future incoming response");
+}

package/lib/http/error.js

@@ -1,5 +1,5 @@
 export class UnexpectedError extends Error {
-  /** @type { import("../types/wasi-http").HttpErrorUnexpectedError } */
+  /** @type { import("../types/http").HttpErrorUnexpectedError } */
   payload;
   constructor(message = "unexpected-error") {
     super(message);

package/lib/http/make-request.js

@@ -1,7 +1,7 @@
-import { runAsWorker } from "synckit";
+import { runAsWorker } from "./synckit/index.js";
 
 /**
- * @param {import("../types/wasi-http").Request} req
+ * @param {import("../types/imports/types").Request} req
  * @returns {Promise<string>}
  */
 async function makeRequest(req) {

package/lib/http/synckit/index.d.ts

@@ -0,0 +1,71 @@
+/*
+MIT License
+
+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:
+
+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.
+*/
+
+/// <reference types="node" />
+import { MessagePort } from "node:worker_threads";
+export type AnyFn<R = any, T extends any[] = any[]> = (...args: T) => R;
+export type AnyPromise<T = any> = Promise<T>;
+export type AnyAsyncFn<T = any> = AnyFn<Promise<T>>;
+export type Syncify<T extends AnyAsyncFn> = T extends (
+  ...args: infer Args
+) => Promise<infer R>
+  ? (...args: Args) => R
+  : never;
+export type PromiseType<T extends AnyPromise> = T extends Promise<infer R>
+  ? R
+  : never;
+export interface MainToWorkerMessage<T extends unknown[]> {
+  sharedBuffer: SharedArrayBuffer;
+  id: number;
+  args: T;
+}
+export interface WorkerData {
+  workerPort: MessagePort;
+}
+export interface DataMessage<T> {
+  result?: T;
+  error?: unknown;
+  properties?: unknown;
+}
+export interface WorkerToMainMessage<T = unknown> extends DataMessage<T> {
+  id: number;
+}
+export interface SyncifyOptions {
+  bufferSize?: number;
+  timeout?: number;
+  execArgv?: string[];
+}
+export declare function createSyncFn<T extends AnyAsyncFn>(
+  workerPath: string,
+  bufferSize?: number,
+  timeout?: number
+): Syncify<T>;
+export declare function createSyncFn<T extends AnyAsyncFn>(
+  workerPath: string,
+  options?: SyncifyOptions
+): Syncify<T>;
+export declare function runAsWorker<
+  R = unknown,
+  T extends AnyAsyncFn<R> = AnyAsyncFn<R>
+>(fn: T): void;

package/lib/http/synckit/index.js

@@ -0,0 +1,141 @@
+// Based on: https://github.com/un-ts/synckit
+/*
+MIT License
+
+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:
+
+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.
+*/
+
+import path from "node:path";
+import {
+  MessageChannel,
+  Worker,
+  receiveMessageOnPort,
+  workerData,
+  parentPort,
+} from "node:worker_threads";
+
+const DEFAULT_WORKER_BUFFER_SIZE = 1024;
+const syncFnCache = new Map();
+
+function extractProperties(object) {
+  if (object && typeof object === "object") {
+    const properties = {};
+    for (const key in object) {
+      properties[key] = object[key];
+    }
+    return properties;
+  }
+}
+
+export function createSyncFn(workerPath, bufferSizeOrOptions, timeout) {
+  if (!path.isAbsolute(workerPath)) {
+    throw new Error("`workerPath` must be absolute");
+  }
+  const cachedSyncFn = syncFnCache.get(workerPath);
+  if (cachedSyncFn) {
+    return cachedSyncFn;
+  }
+  const syncFn = startWorkerThread(
+    workerPath,
+    typeof bufferSizeOrOptions === "number"
+      ? { bufferSize: bufferSizeOrOptions, timeout }
+      : bufferSizeOrOptions
+  );
+  syncFnCache.set(workerPath, syncFn);
+  return syncFn;
+}
+
+function startWorkerThread(
+  workerPath,
+  {
+    bufferSize = DEFAULT_WORKER_BUFFER_SIZE,
+    timeout = undefined,
+    execArgv = [],
+  } = {}
+) {
+  const { port1: mainPort, port2: workerPort } = new MessageChannel();
+  const worker = new Worker(workerPath, {
+    workerData: { workerPort },
+    transferList: [workerPort],
+    execArgv: execArgv,
+  });
+  let nextID = 0;
+  const syncFn = (...args) => {
+    const id = nextID++;
+    const sharedBuffer = new SharedArrayBuffer(bufferSize);
+    const sharedBufferView = new Int32Array(sharedBuffer);
+    const msg = { sharedBuffer, id, args };
+    worker.postMessage(msg);
+    const status = Atomics.wait(sharedBufferView, 0, 0, timeout);
+    if (!["ok", "not-equal"].includes(status)) {
+      throw new Error("Internal error: Atomics.wait() failed: " + status);
+    }
+    const {
+      id: id2,
+      result,
+      error,
+      properties,
+    } = receiveMessageOnPort(mainPort).message;
+    if (id !== id2) {
+      throw new Error(`Internal error: Expected id ${id} but got id ${id2}`);
+    }
+    if (error) {
+      throw Object.assign(error, properties);
+    }
+    return result;
+  };
+  worker.unref();
+  return syncFn;
+}
+
+export function runAsWorker(fn) {
+  if (!workerData) {
+    return;
+  }
+  const { workerPort } = workerData;
+  try {
+    parentPort.on("message", ({ sharedBuffer, id, args }) => {
+      (async () => {
+        const sharedBufferView = new Int32Array(sharedBuffer);
+        let msg;
+        try {
+          msg = { id, result: await fn(...args) };
+        } catch (error) {
+          msg = { id, error, properties: extractProperties(error) };
+        }
+        workerPort.postMessage(msg);
+        Atomics.add(sharedBufferView, 0, 1);
+        Atomics.notify(sharedBufferView, 0);
+      })();
+    });
+  } catch (error) {
+    parentPort.on("message", ({ sharedBuffer, id }) => {
+      const sharedBufferView = new Int32Array(sharedBuffer);
+      workerPort.postMessage({
+        id,
+        error,
+        properties: extractProperties(error),
+      });
+      Atomics.add(sharedBufferView, 0, 1);
+      Atomics.notify(sharedBufferView, 0);
+    });
+  }
+}

package/lib/nodejs/default-outgoing-HTTP.js

@@ -0,0 +1,3 @@
+export function handle(_request, _options) {
+  console.log("[default-outgoing-HTTP] Handle");
+}

package/lib/nodejs/environment.js

@@ -0,0 +1,7 @@
+export function getEnvironment () {
+  return [];
+}
+
+export function preopens () {
+  return [];
+}

package/lib/nodejs/filesystem.js

@@ -9,7 +9,7 @@
 //   ctim: Timestamp,
 // }
 
-export function flags(fd) {
+export function getFlags(fd) {
   console.log(`[filesystem] FLAGS FOR ${fd}`);
 }
 
@@ -49,10 +49,16 @@ export function stat(fd) {
   console.log(`[filesystem] STAT: ${fd}`);
 }
 
-export function todoType(fd) {
+export function getType(fd) {
   console.log(`[filesystem] TODO TYPE: ${fd}`);
 }
 
-export function dropDirEntryStream(s) {
+export function dropDirectoryEntryStream(s) {
   console.log(`[filesystem] CLOSE DIR ENTRY STREAM ${s}`);
 }
+
+// backwards compat
+export function getPreopens() {
+  return [];
+}
+export { getFlags as flags, getType as todoType, dropDirectoryEntryStream as dropDirEntryStream }

package/lib/nodejs/http.js

@@ -1,12 +1,12 @@
-import { createSyncFn } from "synckit";
-import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { UnexpectedError } from "../http/error.js";
+import { createSyncFn } from "../http/synckit/index.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 dirname = path.dirname(fileURLToPath(import.meta.url));
-  const syncFn = createSyncFn(path.resolve(dirname, "../http/make-request.js"));
+  const syncFn = createSyncFn(workerPath);
   let rawResponse = syncFn(req);
   let response = JSON.parse(rawResponse);
   if (response.status) {

package/lib/nodejs/index.js

@@ -1,21 +1,35 @@
-import * as clocks from "./clocks.js";
+import * as console from "./console.js";
 import * as defaultClocks from "./default-clocks.js";
+import * as defaultOutgoingHttp from "./default-outgoing-HTTP.js";
+import * as environment from "./environment.js";
 import * as exit from "./exit.js";
 import * as filesystem from "./filesystem.js";
+import * as http from "./http.js";
 import * as io from "./io.js";
-import * as logging from "./logging.js";
+import * as monotonicClock from "./monotonic-clock.js";
 import * as poll from "./poll.js";
 import * as random from "./random.js";
 import * as stderr from "./stderr.js";
+import * as streams from "./streams.js";
+import * as types from "./types.js";
+import * as wallClock from "./wall-clock.js";
 
 export const importObject = {
-    "wasi-clocks": clocks,
-    "wasi-default-clocks": defaultClocks,
-    "wasi-exit": exit,
-    "wasi-filesystem": filesystem,
-    "wasi-io": io,
-    "wasi-logging": logging,
-    "wasi-poll": poll,
-    "wasi-random": random,
-    "wasi-stderr": stderr,
+    "console": console,
+    "default-clocks": defaultClocks,
+    "default-outgoing-HTTP": defaultOutgoingHttp,
+    "environment": environment,
+    "exit": exit,
+    "filesystem": filesystem,
+    "http": http,
+    "io": io,
+    "monotonic-clock": monotonicClock,
+    "poll": poll,
+    "random": random,
+    "stderr": stderr,
+    "streams": streams,
+    "types": types,
+    "wall-clock": wallClock,
 };
+
+export default importObject;

package/lib/nodejs/monotonic-clock.js

@@ -12,3 +12,7 @@ export function now(clock) {
   }
   console.log("[clocks] UNKNOWN CLOCK");
 }
+
+export function instanceMonotonicClock () {
+  return 0;
+}

package/lib/nodejs/poll.js

@@ -1,3 +1,7 @@
+export function dropPollable(p) {
+  console.log(`[poll] Drop pollable ${p}`);
+}
+
 export function pollOneoff(f) {
   console.log(`[poll] Poll oneoff ${f}`);
 }

package/lib/nodejs/streams.js

@@ -0,0 +1,45 @@
+export function read(s, _len) {
+  console.log(`[streams] Read ${s}`);
+}
+export function blockingRead(s, _len) {
+  console.log(`[streams] Blocking read ${s}`);
+}
+export function skip(s, _len) {
+  console.log(`[streams] Skip ${s}`);
+}
+export function blockingSkip(s, _len) {
+  console.log(`[streams] Blocking skip ${s}`);
+}
+export function subscribeToInputStream(s) {
+  console.log(`[streams] Subscribe to input stream ${s}`);
+}
+export function dropInputStream(s) {
+  console.log(`[streams] Drop input stream ${s}`);
+}
+export function write(s, _buf) {
+  console.log(`[streams] Write ${s}`);
+}
+export function blockingWrite(s, _buf) {
+  console.log(`[streams] Blocking write ${s}`);
+}
+export function writeZeroes(s, _len) {
+  console.log(`[streams] Write zeroes ${s}`);
+}
+export function blockingWriteZeroes(s, _len) {
+  console.log(`[streams] Blocking write zeroes ${s}`);
+}
+export function splice(s, _src, _len) {
+  console.log(`[streams] Splice ${s}`);
+}
+export function blockingSplice(s, _src, _len) {
+  console.log(`[streams] Blocking splice ${s}`);
+}
+export function forward(s, _src) {
+  console.log(`[streams] Forward ${s}`);
+}
+export function subscribeToOutputStream(s) {
+  console.log(`[streams] Subscribe to output stream ${s}`);
+}
+export function dropOutputStream(s) {
+  console.log(`[streams] Drop output stream ${s}`);
+}