@bytecodealliance/preview2-shim 0.0.12 → 0.0.13

package/lib/browser/{cli-base.js → cli.js}

@@ -23,12 +23,6 @@ export const exit = {
   }
 };
 
-export const preopens = {
-  getDirectories () {
-    return [];
-  }
-}
-
 export const stdin = {
   getStdin () {
     return 0;
@@ -46,3 +40,33 @@ export const stderr = {
     return 2;
   }
 };
+
+export const terminalInput = {
+  dropTerminalInput () {
+
+  }
+};
+
+export const terminalOutput = {
+  dropTerminalOutput () {
+
+  }
+};
+
+export const terminalStderr = {
+  getTerminalStderr () {
+    return 0;
+  }
+};
+
+export const terminalStdin = {
+  getTerminalStdin () {
+    return 1;
+  }
+};
+
+export const terminalStdout = {
+  getTerminalStdout () {
+    return 2;
+  }
+};

package/lib/browser/filesystem.js

@@ -1,4 +1,10 @@
-export const filesystem = {
+export const preopens = {
+  getDirectories () {
+    return [];
+  }
+}
+
+export const types = {
   readViaStream(fd, offset) {
     console.log(`[filesystem] READ STREAM ${fd} ${offset}`);
   },
@@ -137,7 +143,15 @@ export const filesystem = {
 
   dropDirectoryEntryStream(stream) {
     console.log(`[filesystem] DROP DIRECTORY ENTRY`, stream);
+  },
+
+  metadataHash(fd) {
+    console.log(`[filesystem] METADATA HASH`, fd);
+  },
+
+  metadataHashAt(fd, pathFlags, path) {
+    console.log(`[filesystem] METADATA HASH AT `, fd, pathFlags, path);
   }
 };
 
-export { filesystem as filesystemFilesystem }
+export { types as filesystemTypes }

package/lib/browser/index.js

@@ -6,7 +6,7 @@ import * as logging from "./logging.js";
 import * as poll from "./poll.js";
 import * as random from "./random.js";
 import * as sockets from "./sockets.js";
-import * as cliBase from "./cli-base.js";
+import * as cli from "./cli.js";
 
 export const importObject = {
   clocks,
@@ -17,7 +17,7 @@ export const importObject = {
   poll,
   random,
   sockets,
-  cliBase,
+  cli,
 };
 
 export { WasiHttp } from "../http/wasi-http.js";

package/lib/nodejs/cli.js

@@ -0,0 +1,65 @@
+let _env;
+export function _setEnv (envObj) {
+  _env = Object.entries(envObj);
+}
+
+export const environment = {
+  getEnvironment () {
+    if (!_env) _setEnv(process.env);
+    return _env;
+  }
+};
+
+export const exit = {
+  exit (status) {
+    process.exit(status.tag === 'err' ? 1 : 0);
+  }
+};
+
+export const stdin = {
+  getStdin () {
+    return 0;
+  }
+};
+
+export const stdout = {
+  getStdout () {
+    return 1;
+  }
+};
+
+export const stderr = {
+  getStderr () {
+    return 2;
+  }
+};
+
+export const terminalInput = {
+  dropTerminalInput () {
+
+  }
+};
+
+export const terminalOutput = {
+  dropTerminalOutput () {
+
+  }
+};
+
+export const terminalStderr = {
+  getTerminalStderr () {
+    return 0;
+  }
+};
+
+export const terminalStdin = {
+  getTerminalStdin () {
+    return 1;
+  }
+};
+
+export const terminalStdout = {
+  getTerminalStdout () {
+    return 2;
+  }
+};

package/lib/nodejs/filesystem.js

@@ -1,7 +1,70 @@
 import { openSync, constants, statSync, lstatSync, fstatSync, closeSync, readdirSync } from 'node:fs';
-import { _descriptors, _addOpenedDescriptor, _removeOpenedDescriptor, _getDescriptorType, _setSubdescriptorType, _setDescriptorType, _getFullPath } from './cli-base.js';
 import { _createFsStream, _dropFsStream, _getFsStreamContext } from './io.js';
 
+// default is full permissions
+let preopenCnt = 4;
+export let _descriptors = {
+  3: { type: 'directory', path: '/', parent: null, subpathTypes: {} }
+};
+let directories = [[3, '/']];
+
+export function _setPreopens (preopens) {
+  _descriptors = {};
+  directories = [,,];
+  for (const [virtualPath, path] of Object.entries(preopens)) {
+    _descriptors[preopenCnt] = { type: 'directory', path, parent: null, subpathTypes: {} };
+    directories.push([preopenCnt++, virtualPath]);
+  }
+}
+
+export function _getFullPath (fd) {
+  let path = '';
+  while (fd) {
+    path = _descriptors[fd].path + path;
+    fd = _descriptors[fd].parent;
+  }
+  return path;
+}
+
+export function _getDescriptorType (fd) {
+  return _descriptors[fd].type;
+}
+
+export function _setDescriptorType (fd, type) {
+  _descriptors[fd].type = type;
+}
+
+export function _setSubdescriptorType (fd, path, type) {
+  while (_descriptors[fd].parent) {
+    path = _descriptors[fd].path + path;
+    fd = _descriptors[fd].parent;
+  }
+  _descriptors[fd].subpathTypes[path] = type;
+}
+
+export function _addOpenedDescriptor (fd, path, parentFd) {
+  if (fd < preopenCnt || _descriptors[fd])
+    throw 'bad-descriptor';
+  let type = null;
+  for (const [_path, _type] of Object.entries(_descriptors[parentFd].subpathTypes)) {
+    if (_path === path)
+      type = _type;
+  }
+  _descriptors[fd] = { path, type, parent: parentFd, subpathTypes: {} };
+}
+
+export function _removeOpenedDescriptor (fd) {
+  if (fd < preopenCnt)
+    throw 'eperm';
+  delete _descriptors[fd];
+}
+
+export const preopens = {
+  getDirectories () {
+    return directories;
+  }
+}
+
 const nsMagnitude = 1_000_000_000_000n;
 function nsToDateTime (ns) {
   const seconds = ns / nsMagnitude;
@@ -71,7 +134,7 @@ function _lookupType (obj) {
   return 'unknown';
 }
 
-export const filesystem = {
+export const types = {
   readViaStream(fd, offset) {
     if (Number(offset) !== 0)
       throw new Error('Read streams with non-zero offset not currently supported');
@@ -102,7 +165,7 @@ export const filesystem = {
   getType(fd) {
     let type = _getDescriptorType(fd);
     if (type === null) {
-      filesystem.stat(fd);
+      types.stat(fd);
       type = _getDescriptorType(fd);
     }
     return type;
@@ -307,5 +370,32 @@ export const filesystem = {
 
   dropDirectoryEntryStream(stream) {
     _dropFsStream(stream);
+  },
+
+  metadataHash(fd) {
+    let stats;
+    try {
+      stats = fstatSync(fd, { bigint: true });
+    }
+    catch (e) {
+      _convertFsError(e);
+    }
+    const type = _lookupType(stats);
+    _setDescriptorType(fd, type);
+    return { upper: BigInt(stats.size), lower: stats.mtimeNs };
+  },
+
+  metadataHashAt(fd, { symlinkFollow }, path) {
+    const fullPath = _descriptors[fd].path + path;
+    let stats;
+    try {
+      stats = (symlinkFollow ? statSync : lstatSync)(fullPath, { bigint: true });
+    }
+    catch (e) {
+      _convertFsError(e);
+    }
+    const type = _lookupType(stats);
+    _setSubdescriptorType(fd, path, type);
+    return { upper: BigInt(stats.size), lower: stats.mtimeNs };
   }
 };

package/lib/nodejs/index.js

@@ -6,7 +6,7 @@ import * as logging from "./logging.js";
 import * as poll from "./poll.js";
 import * as random from "./random.js";
 import * as sockets from "./sockets.js";
-import * as cliBase from "./cli-base.js";
+import * as cli from "./cli.js";
 
 export const importObject = {
   clocks,
@@ -17,7 +17,7 @@ export const importObject = {
   poll,
   random,
   sockets,
-  cliBase,
+  cli,
 };
 
 export { WasiHttp } from "../http/wasi-http.js";

package/package.json

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

package/lib/nodejs/cli-base.js

@@ -1,99 +0,0 @@
-// default is full permissions
-let preopenCnt = 4;
-export let _descriptors = {
-  3: { type: 'directory', path: '/', parent: null, subpathTypes: {} }
-};
-let directories = [[3, '/']];
-
-export function _getFullPath (fd) {
-  let path = '';
-  while (fd) {
-    path = _descriptors[fd].path + path;
-    fd = _descriptors[fd].parent;
-  }
-  return path;
-}
-
-export function _getDescriptorType (fd) {
-  return _descriptors[fd].type;
-}
-
-export function _setDescriptorType (fd, type) {
-  _descriptors[fd].type = type;
-}
-
-export function _setSubdescriptorType (fd, path, type) {
-  while (_descriptors[fd].parent) {
-    path = _descriptors[fd].path + path;
-    fd = _descriptors[fd].parent;
-  }
-  _descriptors[fd].subpathTypes[path] = type;
-}
-
-export function _addOpenedDescriptor (fd, path, parentFd) {
-  if (fd < preopenCnt || _descriptors[fd])
-    throw 'bad-descriptor';
-  let type = null;
-  for (const [_path, _type] of Object.entries(_descriptors[parentFd].subpathTypes)) {
-    if (_path === path)
-      type = _type;
-  }
-  _descriptors[fd] = { path, type, parent: parentFd, subpathTypes: {} };
-}
-
-export function _removeOpenedDescriptor (fd) {
-  if (fd < preopenCnt)
-    throw 'eperm';
-  delete _descriptors[fd];
-}
-
-export function _setPreopens (preopens) {
-  _descriptors = {};
-  directories = [,,];
-  for (const [virtualPath, path] of Object.entries(preopens)) {
-    _descriptors[preopenCnt] = { type: 'directory', path, parent: null, subpathTypes: {} };
-    directories.push([preopenCnt++, virtualPath]);
-  }
-}
-
-let _env;
-export function _setEnv (envObj) {
-  _env = Object.entries(envObj);
-}
-
-export const environment = {
-  getEnvironment () {
-    if (!_env) _setEnv(process.env);
-    return _env;
-  }
-};
-
-export const exit = {
-  exit (status) {
-    process.exit(status.tag === 'err' ? 1 : 0);
-  }
-};
-
-export const preopens = {
-  getDirectories () {
-    return directories;
-  }
-}
-
-export const stdin = {
-  getStdin () {
-    return 0;
-  }
-};
-
-export const stdout = {
-  getStdout () {
-    return 1;
-  }
-};
-
-export const stderr = {
-  getStderr () {
-    return 2;
-  }
-};

package/types/exports/wasi-http-incoming-handler.d.ts

@@ -1,7 +0,0 @@
-export namespace ExportsWasiHttpIncomingHandler {
-  export function handle(request: IncomingRequest, responseOut: ResponseOutparam): void;
-}
-import type { IncomingRequest } from '../imports/types';
-export { IncomingRequest };
-import type { ResponseOutparam } from '../imports/types';
-export { ResponseOutparam };

package/types/imports/environment.d.ts

@@ -1,17 +0,0 @@
-export namespace ImportsEnvironment {
-  /**
-   * Get the POSIX-style environment variables.
-   * 
-   * Each environment variable is provided as a pair of string variable names
-   * and string value.
-   * 
-   * Morally, these are a value import, but until value imports are available
-   * in the component model, this import function should return the same
-   * values each time it is called.
-   */
-  export function getEnvironment(): [string, string][];
-  /**
-   * Get the POSIX-style arguments to the program.
-   */
-  export function getArguments(): string[];
-}

package/types/imports/exit.d.ts

@@ -1,7 +0,0 @@
-export namespace ImportsExit {
-  /**
-   * Exit the curerent instance and any linked instances.
-   */
-  export function exit(status: Result<void, void>): void;
-}
-export type Result<T, E> = { tag: 'ok', val: T } | { tag: 'err', val: E };