fix: fallback to manifest values if they're not specified in ExtismPluginOptions

src/interfaces.ts

@@ -291,6 +291,22 @@ export type ManifestWasm = (
 export interface Manifest {
  wasm: Array<ManifestWasm>;
  config?: PluginConfigLike;
+ allowedPaths?: { [key: string]: string } | undefined;
+
+ /**
+ * A list of allowed hostnames. Wildcard subdomains are supported via `*`.
+ *
+ * Requires the plugin to run in a worker using `runInWorker: true`.
+ *
+ * @example
+ * ```ts
+ * await createPlugin('path/to/some/wasm', {
+ * runInWorker: true,
+ * allowedHosts: ['*.example.com', 'www.dylibso.com']
+ * })
+ * ```
+ */
+ allowedHosts?: string[] | undefined;
 }
 
 /**

src/mod.test.ts

@@ -539,6 +539,31 @@ if (typeof WebAssembly === 'undefined') {
  await plugin.close();
  }
  });
+
+ test('we fallback to Manifest.allowedHosts if ExtismPluginOptions.allowedHosts is not specified', async () => {
+ const plugin = await createPlugin(
+ { wasm: [{ name: 'main', url: 'https://localhost:8124/wasm/http.wasm' }], allowedHosts: ['*.typicode.com'] },
+ { useWasi: true, functions: {}, runInWorker: true },
+ );
+
+ try {
+ const [err, data] = await plugin
+ .call('http_get', '{"url": "https://jsonplaceholder.typicode.com/todos/1"}')
+ .then(
+ (data) => [null, data],
+ (err) => [err, null],
+ );
+ assert(err === null);
+ assert.deepEqual(data.json(), {
+ userId: 1,
+ id: 1,
+ title: 'delectus aut autem',
+ completed: false,
+ });
+ } finally {
+ await plugin.close();
+ }
+ });
  }
 
  test('createPlugin fails as expected when calling unknown function', async () => {
@@ -611,6 +636,25 @@ if (typeof WebAssembly === 'undefined') {
  }
  });
 
+ test('we fallback to Manifest.config if ExtismPluginOptions.config is not specified', async () => {
+ const plugin = await createPlugin(
+ { wasm: [{ url: 'https://localhost:8124/wasm/hello_haskell.wasm' }], config: { greeting: 'Howdy' } },
+ { useWasi: true }
+ );
+
+ try {
+ let output = await plugin.call('testing', 'John');
+
+ assert.equal(output?.string(), 'Howdy, John');
+
+ output = await plugin.call('testing', 'Ben');
+ assert(output !== null);
+ assert.equal(output?.string(), 'Howdy, Ben');
+ } finally {
+ await plugin.close();
+ }
+ });
+
  // TODO(chrisdickinson): this turns out to be pretty tricky to test, since
  // deno and node's wasi bindings bypass JS entirely and write directly to
  // their respective FDs. I'm settling for tests that exercise both behaviors.
@@ -671,6 +715,22 @@ if (typeof WebAssembly === 'undefined') {
  }
  });
 
+ test('we fallback to Manifest.allowedPaths if ExtismPluginOptions.allowedPaths is not specified', async () => {
+ const plugin = await createPlugin(
+ { wasm: [{ url: 'https://localhost:8124/wasm/fs.wasm'}], allowedPaths: { '/mnt': 'tests/data' } },
+ { useWasi: true }
+ );
+
+ try {
+ const output = await plugin.call('run_test', '');
+ assert(output !== null);
+ const result = output.string();
+ assert.equal(result, 'hello world!');
+ } finally {
+ await plugin.close();
+ }
+ });
+
  test('linking to a wasi command side-module works', async () => {
  const plugin = await createPlugin(
  {

src/mod.ts

@@ -1,6 +1,6 @@
 import { CAPABILITIES } from './polyfills/deno-capabilities.ts';
 
-import type { ManifestLike, InternalConfig, ExtismPluginOptions, Plugin } from './interfaces.ts';
+import type { Manifest, ManifestLike, InternalConfig, ExtismPluginOptions, Plugin } from './interfaces.ts';
 
 import { toWasmModuleData as _toWasmModuleData } from './manifest.ts';
 
@@ -73,6 +73,14 @@ export async function createPlugin(
  opts.useWasi ??= false;
  opts.enableWasiOutput ??= opts.useWasi ? CAPABILITIES.extismStdoutEnvVarSet : false;
  opts.functions = opts.functions || {};
+
+ const m = await Promise.resolve(manifest)
+ if ((m as Manifest).wasm) {
+ opts.allowedPaths ??= (m as Manifest).allowedPaths;
+ opts.allowedHosts ??= (m as Manifest).allowedHosts;
+ opts.config ??= (m as Manifest).config;
+ }
+
  opts.allowedPaths ??= {};
  // TODO(chrisdickinson): reset this to `CAPABILITIES.hasWorkerCapability` once we've fixed https://github.com/extism/js-sdk/issues/46.
  opts.runInWorker ??= false;
@@ -91,7 +99,7 @@ export async function createPlugin(
  );
  }
 
- const [names, moduleData] = await _toWasmModuleData(await Promise.resolve(manifest), opts.fetch ?? fetch);
+ const [names, moduleData] = await _toWasmModuleData(m, opts.fetch ?? fetch);
 
  const ic: InternalConfig = {
  allowedHosts: opts.allowedHosts as [],