@bytecodealliance/preview2-shim 0.0.4 → 0.0.6

package/lib/nodejs/streams.js

@@ -1,5 +1,10 @@
-export function read(s, _len) {
-  console.log(`[streams] Read ${s}`);
+export function read(s, len) {
+  switch (s) {
+    case 0:
+      return [process.stdin.read(len), true];
+    default:
+      throw new Error(`TODO: write ${s}`);
+  }
 }
 export function blockingRead(s, _len) {
   console.log(`[streams] Blocking read ${s}`);
@@ -16,8 +21,21 @@ export function subscribeToInputStream(s) {
 export function dropInputStream(s) {
   console.log(`[streams] Drop input stream ${s}`);
 }
-export function write(s, _buf) {
-  console.log(`[streams] Write ${s}`);
+export function write(s, buf) {
+  switch (s) {
+    case 0:
+      throw new Error(`TODO: write stdin`);
+    case 1: {
+      process.stdout.write(buf);
+      return BigInt(buf.byteLength);
+    }
+    case 2: {
+      process.stderr.write(buf);
+      return BigInt(buf.byteLength);
+    }
+    default:
+      throw new Error(`TODO: write ${s}`);
+  }
 }
 export function blockingWrite(s, _buf) {
   console.log(`[streams] Blocking write ${s}`);

package/lib/nodejs/timezone.js

@@ -0,0 +1,12 @@
+export function display (timezone, when) {
+  console.log(`[timezone] DISPLAY ${timezone} ${when}`);
+}
+
+export function utcOffset (timezone, when) {
+  console.log(`[timezone] UTC OFFSET ${timezone} ${when}`);
+  return 0;
+}
+
+export function dropTimezone (timezone) {
+  console.log(`[timezone] DROP ${timezone}`);
+}

package/lib/nodejs/wall-clock.js

@@ -4,13 +4,9 @@ export function now(clock) {
     const nanoseconds = (Date.now() % 1000) * 1000 * 1000;
     return { seconds, nanoseconds };
   }
-  console.log("[clocks] UNKNOWN CLOCK");
+  console.log(`[wall-clock] now() UNKNOWN CLOCK ${clock}`);
 }
 
 export function resolution(clock) {
-  console.log(`[clocks] Wall clock resolution ${clock}`);
-}
-
-export function instanceWallClock () {
-  return 1;
+  console.log(`[wall-clock] Wall clock resolution ${clock}`);
 }

package/package.json

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

package/types/imports/environment.d.ts

@@ -1,3 +1,4 @@
 export namespace Environment {
   export function getEnvironment(): [string, string][];
+  export function getArguments(): string[];
 }

package/types/imports/monotonic-clock.d.ts

@@ -1,10 +1,8 @@
 export namespace MonotonicClock {
-  export function now(this: MonotonicClock): Instant;
-  export function resolution(this: MonotonicClock): Instant;
-  export function subscribe(this: MonotonicClock, when: Instant, absolute: boolean): Pollable;
-  export function dropMonotonicClock(this: MonotonicClock): void;
+  export function now(): Instant;
+  export function resolution(): Instant;
+  export function subscribe(when: Instant, absolute: boolean): Pollable;
 }
-export type MonotonicClock = number;
 export type Instant = bigint;
 import type { Pollable } from '../imports/poll';
 export { Pollable };

package/types/imports/preopens.d.ts

@@ -0,0 +1,15 @@
+export namespace Preopens {
+  export function getStdio(): StdioPreopens;
+  export function getDirectories(): [Descriptor, string][];
+}
+import type { InputStream } from '../imports/streams';
+export { InputStream };
+import type { OutputStream } from '../imports/streams';
+export { OutputStream };
+export interface StdioPreopens {
+  stdin: InputStream,
+  stdout: OutputStream,
+  stderr: OutputStream,
+}
+import type { Descriptor } from '../imports/filesystem';
+export { Descriptor };

package/types/imports/wall-clock.d.ts

@@ -1,9 +1,7 @@
 export namespace WallClock {
-  export function now(this: WallClock): Datetime;
-  export function resolution(this: WallClock): Datetime;
-  export function dropWallClock(this: WallClock): void;
+  export function now(): Datetime;
+  export function resolution(): Datetime;
 }
-export type WallClock = number;
 export interface Datetime {
   seconds: bigint,
   nanoseconds: number,

package/types/wasi-reactor.d.ts

@@ -1,8 +1,6 @@
 import { WallClock as WallClockImports } from './imports/wall-clock';
 import { Poll as PollImports } from './imports/poll';
 import { MonotonicClock as MonotonicClockImports } from './imports/monotonic-clock';
-import { InstanceWallClock as InstanceWallClockImports } from './imports/instance-wall-clock';
-import { InstanceMonotonicClock as InstanceMonotonicClockImports } from './imports/instance-monotonic-clock';
 import { Timezone as TimezoneImports } from './imports/timezone';
 import { Streams as StreamsImports } from './imports/streams';
 import { Filesystem as FilesystemImports } from './imports/filesystem';
@@ -14,16 +12,16 @@ import { TcpCreateSocket as TcpCreateSocketImports } from './imports/tcp-create-
 import { Udp as UdpImports } from './imports/udp';
 import { UdpCreateSocket as UdpCreateSocketImports } from './imports/udp-create-socket';
 import { Random as RandomImports } from './imports/random';
+import { Console as ConsoleImports } from './imports/console';
+import { Types as TypesImports } from './imports/types';
+import { DefaultOutgoingHttp as DefaultOutgoingHttpImports } from './imports/default-outgoing-HTTP';
 import { Environment as EnvironmentImports } from './imports/environment';
-import { EnvironmentPreopens as EnvironmentPreopensImports } from './imports/environment-preopens';
+import { Preopens as PreopensImports } from './imports/preopens';
 import { Exit as ExitImports } from './imports/exit';
-import { Stderr as StderrImports } from './imports/stderr';
 export interface ImportObject {
   'wall-clock': typeof WallClockImports,
   'poll': typeof PollImports,
   'monotonic-clock': typeof MonotonicClockImports,
-  'instance-wall-clock': typeof InstanceWallClockImports,
-  'instance-monotonic-clock': typeof InstanceMonotonicClockImports,
   'timezone': typeof TimezoneImports,
   'streams': typeof StreamsImports,
   'filesystem': typeof FilesystemImports,
@@ -35,10 +33,12 @@ export interface ImportObject {
   'udp': typeof UdpImports,
   'udp-create-socket': typeof UdpCreateSocketImports,
   'random': typeof RandomImports,
+  'console': typeof ConsoleImports,
+  'types': typeof TypesImports,
+  'default-outgoing-HTTP': typeof DefaultOutgoingHttpImports,
   'environment': typeof EnvironmentImports,
-  'environment-preopens': typeof EnvironmentPreopensImports,
+  'preopens': typeof PreopensImports,
   'exit': typeof ExitImports,
-  'stderr': typeof StderrImports,
 }
 export interface WasiReactor {
 }

package/lib/browser/clocks.js

@@ -1,47 +0,0 @@
-export function wallClockNow(clock) {
-  if (clock === 1) {
-    const seconds = BigInt(Math.floor(Date.now() / 1000));
-    const nanoseconds = (Date.now() % 1000) * 1000 * 1000;
-    return { seconds, nanoseconds };
-  }
-  console.log("[clocks] UNKNOWN CLOCK");
-}
-
-export function monotonicClockResolution(clock) {
-  console.log(`[clocks] Monotonic clock resolution ${clock}`);
-}
-
-export function wallClockResolution(clock) {
-  console.log(`[clocks] Wall clock resolution ${clock}`);
-}
-
-let hrStart = hrtimeBigint();
-
-export function monotonicClockNow(clock) {
-  if (clock === 0) {
-    return hrtimeBigint() - hrStart;
-  }
-  console.log("UNKNOWN CLOCK");
-}
-
-function hrtime(previousTimestamp) {
-  const baseNow = Math.floor((Date.now() - performance.now()) * 1e-3);
-  const clocktime = performance.now() * 1e-3;
-  let seconds = Math.floor(clocktime) + baseNow;
-  let nanoseconds = Math.floor((clocktime % 1) * 1e9);
-
-  if (previousTimestamp) {
-    seconds = seconds - previousTimestamp[0];
-    nanoseconds = nanoseconds - previousTimestamp[1];
-    if (nanoseconds < 0) {
-      seconds--;
-      nanoseconds += 1e9;
-    }
-  }
-  return [seconds, nanoseconds];
-}
-
-function hrtimeBigint(time) {
-  const diff = hrtime(time);
-  return BigInt(diff[0] * 1e9 + diff[1]);
-}

package/lib/browser/default-clocks.js

@@ -1,7 +0,0 @@
-export function defaultMonotonicClock() {
-  return 0;
-}
-
-export function defaultWallClock() {
-  return 1;
-}

package/lib/nodejs/default-clocks.js

@@ -1,7 +0,0 @@
-export function defaultMonotonicClock() {
-  return 0;
-}
-
-export function defaultWallClock() {
-  return 1;
-}

package/types/imports/environment-preopens.d.ts

@@ -1,5 +0,0 @@
-export namespace EnvironmentPreopens {
-  export function preopens(): [Descriptor, string][];
-}
-import type { Descriptor } from '../imports/filesystem';
-export { Descriptor };

package/types/imports/instance-monotonic-clock.d.ts

@@ -1,5 +0,0 @@
-export namespace InstanceMonotonicClock {
-  export function instanceMonotonicClock(): MonotonicClock;
-}
-import type { MonotonicClock } from '../imports/monotonic-clock';
-export { MonotonicClock };

package/types/imports/instance-wall-clock.d.ts

@@ -1,5 +0,0 @@
-export namespace InstanceWallClock {
-  export function instanceWallClock(): WallClock;
-}
-import type { WallClock } from '../imports/wall-clock';
-export { WallClock };

package/types/imports/stderr.d.ts

@@ -1,3 +0,0 @@
-export namespace Stderr {
-  export function print(message: string): void;
-}