From 260ec17e74dd9148ea5ba1bc333a4abfd151b2d9 Mon Sep 17 00:00:00 2001
From: Muhammad Azeez <muhammad@dylibso.com>
Date: Thu, 5 Oct 2023 13:21:02 +0300
Subject: [PATCH 01/18] feat: export createPlugin instead of the static
 ExtismPlugin.new

---
 examples/deno.js     |  4 +-
 examples/index.html  |  7 ++--
 examples/node.js     |  6 +--
 src/browser/index.ts | 97 ++++++++++++++++++++++++--------------------
 src/deno/mod.ts      | 54 ++++++++++++------------
 src/node/index.ts    | 72 +++++++++++++++++---------------
 6 files changed, 130 insertions(+), 110 deletions(-)

diff --git a/examples/deno.js b/examples/deno.js
index 6ab7ae9..1d5c10b 100644
--- a/examples/deno.js
+++ b/examples/deno.js
@@ -1,4 +1,4 @@
-import { ExtismPlugin, ExtismPluginOptions } from '../src/deno/mod.ts'
+import { createPlugin, ExtismPluginOptions } from '../src/deno/mod.ts'
 
 async function main() {
     const filename = Deno.args[0] || "wasm/hello.wasm";
@@ -12,7 +12,7 @@ async function main() {
         .withConfig("thing", "testing")
         .withWasi();
 
-    const plugin = await ExtismPlugin.new(wasm, options);
+    const plugin = await createPlugin(wasm, options);
 
     const res = await plugin.call(funcname, new TextEncoder().encode(input));
     const s = new TextDecoder().decode(res.buffer);
diff --git a/examples/index.html b/examples/index.html
index 77f686a..2892f5d 100644
--- a/examples/index.html
+++ b/examples/index.html
@@ -58,6 +58,8 @@
     <script type="module" src="/dist/browser/index.mjs"></script>
 
     <script type="module">
+        import { createPlugin } from '/dist/browser/index.mjs';
+
         async function runPlugin() {
             // Get values from input fields
             const url = document.getElementById('url').value;
@@ -70,12 +72,11 @@
             }
 
             const options = new ExtismPluginOptions()
-                .withConfig("thing", "Charles")
-                .withConfig("name", "Charles")
+                .withConfig("thing", "testing")
                 .withWasi()
                 .withAllowedHosts(hosts);
 
-            const plugin = await ExtismPlugin.new(wasm, options);
+            const plugin = await createPlugin(wasm, options);
 
             const res = await plugin.call(funcname, new TextEncoder().encode(input));
             const s = new TextDecoder().decode(res.buffer);
diff --git a/examples/node.js b/examples/node.js
index 746ff11..a80fcf7 100644
--- a/examples/node.js
+++ b/examples/node.js
@@ -1,5 +1,5 @@
-const { ExtismPlugin, ExtismPluginOptions } = require("../dist/node/index")
-const { argv } = require("node:process");
+const { createPlugin, ExtismPluginOptions } = require("../dist/node/index")
+const { argv } = require("process");
 
 async function main() {
     const filename = argv[2] || "wasm/hello.wasm";
@@ -14,7 +14,7 @@ async function main() {
         .withWasi()
         .withAllowedHost("*.typicode.com");
 
-    const plugin = await ExtismPlugin.new(wasm, options);
+    const plugin = await createPlugin(wasm, options);
 
     const res = await plugin.call(funcname, new TextEncoder().encode(input));
     const s = new TextDecoder().decode(res.buffer);
diff --git a/src/browser/index.ts b/src/browser/index.ts
index ad50884..cbb1510 100644
--- a/src/browser/index.ts
+++ b/src/browser/index.ts
@@ -15,32 +15,10 @@ import {
   embeddedRuntimeHash
 } from '../plugin';
 
-import { WASI, Fd } from '@bjorn3/browser_wasi_shim';
+import { WASI, Fd, File, OpenFile } from '@bjorn3/browser_wasi_shim';
 import { minimatch } from 'minimatch';
 
 class ExtismPlugin extends ExtismPluginBase {
-  /**
-   * Create a new plugin.
-   * @param manifestData An Extism manifest {@link Manifest} or a Wasm module.
-   * @param options Options for initializing the plugin.
-   * @returns {ExtismPlugin} An initialized plugin.
-   */
-  static async new(
-    manifestData: Manifest | ManifestWasm | Buffer,
-    options: ExtismPluginOptions,
-  ): Promise<ExtismPlugin> {
-    let moduleData = await fetchModuleData(manifestData, this.fetchWasm, this.calculateHash);
-
-    const runtimeWasm = options.runtime ?? {
-      data: this.toBytes(embeddedRuntime),
-      hash: embeddedRuntimeHash
-    };
-
-    let runtime = await instantiateExtismRuntime(runtimeWasm, this.fetchWasm, this.calculateHash);
-
-    return new ExtismPlugin(runtime, moduleData, options);
-  }
-
   protected supportsHttpRequests(): boolean {
     return true;
   }
@@ -95,6 +73,9 @@ class ExtismPlugin extends ExtismPluginBase {
     const args: Array<string> = [];
     const envVars: Array<string> = [];
     let fds: Fd[] = [
+      new OpenFile(new File([])), // stdin
+      new OpenFile(new File([])), // stdout
+      new OpenFile(new File([])), // stderr
     ];
 
     const wasi = new WASI(args, envVars, fds);
@@ -116,8 +97,49 @@ class ExtismPlugin extends ExtismPluginBase {
 
     wasi.start(wrapper);
   }
+}
 
-  private static async fetchWasm(wasm: ManifestWasm): Promise<ArrayBuffer> {
+/**
+ * Create a new plugin.
+ * @param manifestData An Extism manifest {@link Manifest} or a Wasm module.
+ * @param options Options for initializing the plugin.
+ * @returns {ExtismPlugin} An initialized plugin.
+ */
+async function createPlugin(
+  manifestData: Manifest | ManifestWasm | ArrayBuffer,
+  options: ExtismPluginOptions,
+): Promise<ExtismPlugin> {
+  let moduleData = await fetchModuleData(manifestData, fetchWasm, calculateHash);
+
+  const runtimeWasm = options.runtime ?? {
+    data: toBytes(embeddedRuntime),
+    hash: embeddedRuntimeHash
+  };
+
+  let runtime = await instantiateExtismRuntime(runtimeWasm, fetchWasm, calculateHash);
+
+  return new ExtismPlugin(runtime, moduleData, options);
+
+  function toBytes(base64: string): Uint8Array {
+    const binaryString = window.atob(base64);
+    const len = binaryString.length;
+    const bytes = new Uint8Array(len);
+  
+    for (let i = 0; i < len; i++) {
+      bytes[i] = binaryString.charCodeAt(i);
+    }
+  
+    return bytes;
+  }
+  
+  async function calculateHash(data: ArrayBuffer) {
+    const hashBuffer = await crypto.subtle.digest('SHA-256', data);
+    const hashArray = Array.from(new Uint8Array(hashBuffer));
+    const hashHex = hashArray.map((byte) => byte.toString(16).padStart(2, '0')).join('');
+    return hashHex;
+  }
+
+  async function fetchWasm(wasm: ManifestWasm): Promise<ArrayBuffer> {
     let data: ArrayBuffer;
 
     if ((wasm as ManifestWasmData).data) {
@@ -133,25 +155,6 @@ class ExtismPlugin extends ExtismPluginBase {
 
     return data;
   }
-
-  private static async calculateHash(data: ArrayBuffer) {
-    const hashBuffer = await crypto.subtle.digest('SHA-256', data);
-    const hashArray = Array.from(new Uint8Array(hashBuffer));
-    const hashHex = hashArray.map((byte) => byte.toString(16).padStart(2, '0')).join('');
-    return hashHex;
-  }
-
-  private static toBytes(base64: string): Uint8Array {
-    const binaryString = window.atob(base64);
-    const len = binaryString.length;
-    const bytes = new Uint8Array(len);
-  
-    for (let i = 0; i < len; i++) {
-      bytes[i] = binaryString.charCodeAt(i);
-    }
-  
-    return bytes;
-  }
 }
 
 if (window) {
@@ -161,4 +164,10 @@ if (window) {
   window.ExtismPluginOptions = ExtismPluginOptions;
 }
 
-export { ExtismPlugin, ExtismPluginOptions, Manifest, ManifestWasm, ManifestWasmData, ManifestWasmFile, ManifestWasmUrl };
+export {
+  createPlugin,
+  ExtismPlugin,
+  ExtismPluginOptions,
+}
+
+export type { Manifest, ManifestWasm, ManifestWasmData, ManifestWasmFile, ManifestWasmUrl };
\ No newline at end of file
diff --git a/src/deno/mod.ts b/src/deno/mod.ts
index 38e1af5..8be90e2 100644
--- a/src/deno/mod.ts
+++ b/src/deno/mod.ts
@@ -20,28 +20,6 @@ import { createHash } from 'https://deno.land/std@0.108.0/hash/mod.ts';
 import { decode } from 'https://deno.land/std@0.201.0/encoding/base64.ts';
 
 class ExtismPlugin extends ExtismPluginBase {
-  /**
-   * Create a new plugin.
-   * @param manifestData An Extism manifest {@link Manifest} or a Wasm module.
-   * @param options Options for initializing the plugin.
-   * @returns {ExtismPlugin} An initialized plugin.
-   */
-  static async new(
-    manifestData: Manifest | ManifestWasm | ArrayBuffer,
-    options: ExtismPluginOptions,
-  ): Promise<ExtismPlugin> {
-    const moduleData = await fetchModuleData(manifestData, this.fetchWasm, this.calculateHash);
-
-    const runtimeWasm = options.runtime ?? {
-      data: decode(embeddedRuntime),
-      hash: embeddedRuntimeHash,
-    };
-
-    const runtime = await instantiateExtismRuntime(runtimeWasm, this.fetchWasm, this.calculateHash);
-
-    return new ExtismPlugin(runtime, moduleData, options);
-  }
-
   protected supportsHttpRequests(): boolean {
     return false;
   }
@@ -76,8 +54,31 @@ class ExtismPlugin extends ExtismPluginBase {
       },
     });
   }
+}
 
-  private static async fetchWasm(wasm: ManifestWasm): Promise<ArrayBuffer> {
+/**
+   * Create a new plugin.
+   * @param manifestData An Extism manifest {@link Manifest} or a Wasm module.
+   * @param options Options for initializing the plugin.
+   * @returns {ExtismPlugin} An initialized plugin.
+   */
+async function createPlugin(
+  manifestData: Manifest | ManifestWasm | ArrayBuffer,
+  options: ExtismPluginOptions,
+): Promise<ExtismPlugin> {
+  const moduleData = await fetchModuleData(manifestData, fetchWasm, calculateHash);
+
+  const runtimeWasm = options.runtime ?? {
+    data: decode(embeddedRuntime),
+    hash: embeddedRuntimeHash,
+  };
+
+  const runtime = await instantiateExtismRuntime(runtimeWasm, fetchWasm, calculateHash);
+
+  return new ExtismPlugin(runtime, moduleData, options);
+
+  
+  async function fetchWasm(wasm: ManifestWasm): Promise<ArrayBuffer> {
     let data: ArrayBuffer;
 
     if ((wasm as ManifestWasmData).data) {
@@ -94,7 +95,7 @@ class ExtismPlugin extends ExtismPluginBase {
     return data;
   }
 
-  private static calculateHash(data: ArrayBuffer): Promise<string> {
+  function calculateHash(data: ArrayBuffer): Promise<string> {
     return new Promise<string>((resolve) => {
       const hasher = createHash('sha256');
       hasher.update(data);
@@ -103,6 +104,9 @@ class ExtismPlugin extends ExtismPluginBase {
   }
 }
 
-export { ExtismPlugin, ExtismPluginOptions };
+export {
+  createPlugin,
+  ExtismPluginOptions
+}
 
 export type { Manifest, ManifestWasm, ManifestWasmData, ManifestWasmFile, ManifestWasmUrl };
diff --git a/src/node/index.ts b/src/node/index.ts
index 6fcb02d..d9ad6ed 100644
--- a/src/node/index.ts
+++ b/src/node/index.ts
@@ -22,28 +22,6 @@ import { minimatch } from 'minimatch';
 import { createHash } from 'crypto';
 
 class ExtismPlugin extends ExtismPluginBase {
-  /**
-   * Create a new plugin.
-   * @param manifestData An Extism manifest {@link Manifest} or a Wasm module.
-   * @param options Options for initializing the plugin.
-   * @returns {ExtismPlugin} An initialized plugin.
-   */
-  static async new(
-    manifestData: Manifest | ManifestWasm | Buffer,
-    options: ExtismPluginOptions,
-  ): Promise<ExtismPlugin> {
-    let moduleData = await fetchModuleData(manifestData, this.fetchWasm, this.calculateHash);
-
-    const runtimeWasm = options.runtime ?? {
-      data: this.toBytes(embeddedRuntime),
-      hash: embeddedRuntimeHash
-    };
-
-    let runtime = await instantiateExtismRuntime(runtimeWasm, this.fetchWasm, this.calculateHash);
-
-    return new ExtismPlugin(runtime, moduleData, options);
-  }
-
   protected supportsHttpRequests(): boolean {
     return true;
   }
@@ -51,10 +29,10 @@ class ExtismPlugin extends ExtismPluginBase {
   protected httpRequest(request: HttpRequest, body: Uint8Array | null): HttpResponse {
     let b = body
       ? {
-          buffer: body,
-          byteLength: body.length,
-          byteOffset: 0,
-        }
+        buffer: body,
+        byteLength: body.length,
+        byteOffset: 0,
+      }
       : undefined;
 
     if (request.method == 'GET' || request.method == 'HEAD') {
@@ -86,7 +64,7 @@ class ExtismPlugin extends ExtismPluginBase {
 
     return new PluginWasi(wasi, wasi.wasiImport, instance => this.initialize(wasi, instance));
   }
-  
+
   private initialize(wasi: WASI, instance: WebAssembly.Instance) {
     const memory = instance.exports.memory as WebAssembly.Memory;
 
@@ -97,12 +75,34 @@ class ExtismPlugin extends ExtismPluginBase {
     wasi.start({
       exports: {
         memory,
-        _start: () => {},
+        _start: () => { },
       },
     });
   }
+}
+
+/**
+ * Create a new plugin.
+ * @param manifestData An Extism manifest {@link Manifest} or a Wasm module.
+ * @param options Options for initializing the plugin.
+ * @returns {ExtismPlugin} An initialized plugin.
+ */
+async function createPlugin(
+  manifestData: Manifest | ManifestWasm | Buffer,
+  options: ExtismPluginOptions,
+): Promise<ExtismPlugin> {
+  let moduleData = await fetchModuleData(manifestData, fetchWasm, calculateHash);
 
-  private static async fetchWasm(wasm: ManifestWasm): Promise<ArrayBuffer> {
+  const runtimeWasm = options.runtime ?? {
+    data: toBytes(embeddedRuntime),
+    hash: embeddedRuntimeHash
+  };
+
+  let runtime = await instantiateExtismRuntime(runtimeWasm, fetchWasm, calculateHash);
+
+  return new ExtismPlugin(runtime, moduleData, options);
+
+  async function fetchWasm(wasm: ManifestWasm): Promise<ArrayBuffer> {
     let data: ArrayBuffer;
 
     if ((wasm as ManifestWasmData).data) {
@@ -120,17 +120,23 @@ class ExtismPlugin extends ExtismPluginBase {
 
     return data;
   }
-  
-  private static async calculateHash(data: ArrayBuffer) {
+
+  async function calculateHash(data: ArrayBuffer) {
     const hasher = createHash('sha256');
     hasher.update(new Uint8Array(data));
     return new Promise<string>((resolve, _) => resolve(hasher.digest('hex')));
   }
 
-  private static toBytes(base64: string): Uint8Array {
+  function toBytes(base64: string): Uint8Array {
     const buffer = Buffer.from(base64, 'base64');
     return new Uint8Array(buffer);
   }
 }
 
-export { ExtismPlugin, ExtismPluginOptions, Manifest, ManifestWasm, ManifestWasmData, ManifestWasmFile, ManifestWasmUrl };
+export {
+  createPlugin,
+  ExtismPlugin,
+  ExtismPluginOptions,
+}
+
+export type { Manifest, ManifestWasm, ManifestWasmData, ManifestWasmFile, ManifestWasmUrl };
\ No newline at end of file

From 1a3e8c991850d898dd0145a81aae668441808e58 Mon Sep 17 00:00:00 2001
From: Muhammad Azeez <muhammad@dylibso.com>
Date: Thu, 5 Oct 2023 13:31:40 +0300
Subject: [PATCH 02/18] fix tests

---
 src/deno/mod.ts     | 1 +
 tests/index.test.ts | 6 +++---
 tests/mod.test.ts   | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/deno/mod.ts b/src/deno/mod.ts
index 8be90e2..e77cf64 100644
--- a/src/deno/mod.ts
+++ b/src/deno/mod.ts
@@ -106,6 +106,7 @@ async function createPlugin(
 
 export {
   createPlugin,
+  ExtismPlugin,
   ExtismPluginOptions
 }
 
diff --git a/tests/index.test.ts b/tests/index.test.ts
index 35dc7a1..e638984 100644
--- a/tests/index.test.ts
+++ b/tests/index.test.ts
@@ -1,4 +1,4 @@
-import { ExtismPlugin, ExtismPluginOptions, Manifest, ManifestWasm } from '../src/node/index';
+import { createPlugin, ExtismPlugin, ExtismPluginOptions, Manifest, ManifestWasm } from '../src/node/index';
 
 async function newPlugin(
   moduleName: string | Manifest | ManifestWasm | Buffer,
@@ -22,7 +22,7 @@ async function newPlugin(
     module = moduleName;
   }
 
-  const plugin = await ExtismPlugin.new(module, options);
+  const plugin = await createPlugin(module, options);
   return plugin;
 }
 
@@ -56,7 +56,7 @@ describe('test extism', () => {
       path: `wasm/code.wasm`,
     };
   
-    const plugin = await ExtismPlugin.new(module, options);
+    const plugin = await createPlugin(module, options);
   
     let output = await plugin.call('count_vowels', 'this is a test');
 
diff --git a/tests/mod.test.ts b/tests/mod.test.ts
index ba26c7c..e2ea9b4 100644
--- a/tests/mod.test.ts
+++ b/tests/mod.test.ts
@@ -1,6 +1,6 @@
 import { assertEquals, assertRejects } from 'https://deno.land/std@0.200.0/assert/mod.ts';
 import { assertSpyCalls, spy } from 'https://deno.land/std@0.200.0/testing/mock.ts';
-import { ExtismPlugin, ExtismPluginOptions, Manifest, ManifestWasm } from '../src/deno/mod.ts';
+import { createPlugin, ExtismPlugin, ExtismPluginOptions, Manifest, ManifestWasm } from '../src/deno/mod.ts';
 
 async function newPlugin(
   moduleName: string | Manifest | ManifestWasm,
@@ -25,7 +25,7 @@ async function newPlugin(
     module = moduleName;
   }
 
-  const plugin = await ExtismPlugin.new(module, options);
+  const plugin = await createPlugin(module, options);
   return plugin;
 }
 
@@ -62,7 +62,7 @@ Deno.test('can use embedded runtime', async () => {
     path: `wasm/code.wasm`,
   };
 
-  const plugin = await ExtismPlugin.new(module, options);
+  const plugin = await createPlugin(module, options);
 
   let output = await plugin.call('count_vowels', 'this is a test');
   let result = JSON.parse(decode(output));

From 67f994a57e175cad0014d3bd88df1d1a4b4c17d5 Mon Sep 17 00:00:00 2001
From: Muhammad Azeez <muhammad@dylibso.com>
Date: Thu, 5 Oct 2023 16:56:28 +0300
Subject: [PATCH 03/18] implement CurrentPlugin

---
 README.md           | 168 ++++++++++++++++++-
 src/plugin.ts       | 390 +++++++++++++++++++++++---------------------
 tests/index.test.ts |  20 +--
 tests/mod.test.ts   |  20 +--
 4 files changed, 369 insertions(+), 229 deletions(-)

diff --git a/README.md b/README.md
index 9cec64f..a054322 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,8 @@
 # Extism JS SDK
 
-> **Note**: This houses the 1.0 version of the JavaScript SDK and is a work in progress. Please use the [Node SDK](https://github.com/extism/extism/tree/main/node) or the [Browser SDK](https://github.com/extism/extism/tree/main/browser) in extism/extism until we hit 1.0.
+This repo houses the JS SDK for integrating with the [Extism](https://extism.org/) runtime. Install this library into your host JS applications to run Extism plugins.
 
+Join the [Discord](https://discord.gg/EGTV8Pxs) and chat with us!
 
 This is a universal JavaScript SDK for Extism. We are aiming for it to work in all the major
 JavaScript runtimes:
@@ -13,6 +14,163 @@ JavaScript runtimes:
 
 Instead of using FFI and the libextism shared object, this library uses whatever Wasm runtime is already available with the JavaScript runtime.
 
+## Installation
+
+Install vai `npm`:
+```
+npm i @extism/extism
+```
+
+## Getting Started
+
+This guide should walk you through some of the concepts in Extism and this JS library.
+
+First you should import `createPlugin` and `ExtismPluginOptions` from Extism:
+```js
+// CommonJS
+const { createPlugin, ExtismPluginOptions } = require("../dist/node/index")
+
+// ES Modules
+import { createPlugin, ExtismPluginOptions } from '../src/deno/mod.ts'
+```
+
+## Creating A Plug-in
+
+The primary concept in Extism is the [plug-in](https://extism.org/docs/concepts/plug-in). You can think of a plug-in as a code module stored in a `.wasm` file.
+
+Plug-in code can come from a file on disk, object storage or any number of places. Since you may not have one handy let's load a demo plug-in from the web:
+
+```js
+const options = new ExtismPluginOptions().withWasi();
+
+const wasm = {
+    url: 'https://github.com/extism/plugins/releases/latest/download/count_vowels.wasm'
+}
+
+const plugin = await createPlugin(wasm, options);
+```
+
+## Calling A Plug-in's Exports
+
+This plug-in was written in Rust and it does one thing, it counts vowels in a string. As such, it exposes one "export" function: `count_vowels`. We can call exports using `ExtismPlugin.call`:
+
+```js
+let out = await plugin.call("count_vowels", new TextEncoder().encode(input));
+console.log(new TextDecoder().decode(out.buffer))
+
+// => {"count": 3, "total": 3, "vowels": "aeiouAEIOU"}
+```
+
+All exports have a simple interface of optional bytes in, and optional bytes out. This plug-in happens to take a string and return a JSON encoded string with a report of results.
+
+
+### Plug-in State
+
+Plug-ins may be stateful or stateless. Plug-ins can maintain state b/w calls by the use of variables. Our count vowels plug-in remembers the total number of vowels it's ever counted in the "total" key in the result. You can see this by making subsequent calls to the export:
+
+```js
+let out = await plugin.call("count_vowels", new TextEncoder().encode("Hello, World!"));
+console.log(new TextDecoder().decode(out.buffer))
+
+// => {"count": 3, "total": 9, "vowels": "aeiouAEIOU"}
+
+out = await plugin.call("count_vowels", new TextEncoder().encode("Hello, World!"));
+console.log(new TextDecoder().decode(out.buffer))
+// => {"count": 3, "total": 9, "vowels": "aeiouAEIOU"}
+```
+
+These variables will persist until this plug-in is freed or you initialize a new one.
+
+### Configuration
+
+Plug-ins may optionally take a configuration object. This is a static way to configure the plug-in. Our count-vowels plugin takes an optional configuration to change out which characters are considered vowels. Example:
+
+```js
+const wasm = {
+    url: 'https://github.com/extism/plugins/releases/latest/download/count_vowels.wasm'
+}
+
+let options = new ExtismPluginOptions()
+    .withWasi();
+
+let out = await plugin.call("count_vowels", new TextEncoder().encode("Yellow, World!"));
+console.log(new TextDecoder().decode(out.buffer))
+// => {"count": 3, "total": 3, "vowels": "aeiouAEIOU"}
+
+options = new ExtismPluginOptions()
+    .withConfig("vowels", "aeiouyAEIOUY")
+    .withWasi();
+
+out = await plugin.call("count_vowels", new TextEncoder().encode("Yellow, World!"));
+console.log(new TextDecoder().decode(out.buffer))
+// => {"count": 4, "total": 4, "vowels": "aeiouAEIOUY"}
+```
+
+### Host Functions
+
+Let's extend our count-vowels example a little bit: Instead of storing the `total` in an ephemeral plug-in var, let's store it in a persistent key-value store!
+
+Wasm can't use our KV store on it's own. This is where [Host Functions](https://extism.org/docs/concepts/host-functions) come in.
+
+[Host functions](https://extism.org/docs/concepts/host-functions) allow us to grant new capabilities to our plug-ins from our application. They are simply some JS functions you write which can be passed down and invoked from any language inside the plug-in.
+
+Let's load the manifest like usual but load up this `count_vowels_kvstore` plug-in:
+
+```js
+const wasm = {
+    url: "https://github.com/extism/plugins/releases/latest/download/count_vowels_kvstore.wasm"
+}
+```
+
+> *Note*: The source code for this is [here](https://github.com/extism/plugins/blob/main/count_vowels_kvstore/src/lib.rs) and is written in rust, but it could be written in any of our PDK languages.
+
+Unlike our previous plug-in, this plug-in expects you to provide host functions that satisfy our its import interface for a KV store.
+
+We want to expose two functions to our plugin, `kv_write(key: string, value: Uint8Array)` which writes a bytes value to a key and `kv_read(key: string): Uint8Array` which reads the bytes at the given `key`.
+```js
+// pretend this is Redis or something :)
+let kvStore = new Map();
+
+const options = new ExtismPluginOptions()
+    .withFunction("env", "kv_read", function (offs) { // this: CurrentPlugin
+        const key = this.readString(offs);
+        let value = kvStore.get(key) ?? new Uint8Array([0, 0, 0, 0]);
+        console.log(`Read ${new DataView(value.buffer).getUint32(0, true)} from key=${key}`);
+        return this.writeBytes(value);
+    })
+    .withFunction("env", "kv_write", function (kOffs, vOffs) { // this: CurrentPlugin
+        const key = this.readString(kOffs);
+        const value = this.readBytes(vOffs);
+        console.log(`Writing value=${new DataView(value.buffer).getUint32(0, true)} from key=${key}`);
+
+        kvStore.set(key, value);
+    })
+    .withWasi();
+```
+
+> *Note*: In order to write host functions you should get familiar with the methods on the `CurrentPlugin` type. `this` is bound to an instance of `CurrentPlugin`.
+
+We need to pass these imports to the plug-in to create them. All imports of a plug-in must be satisfied for it to be initialized:
+
+```js
+const plugin = await createPlugin(wasm, options);
+```
+
+Now we can invoke the event:
+
+```js
+let out = await plugin.call("count_vowels", new TextEncoder().encode("Hello World!"));
+console.log(new TextDecoder().decode(out.buffer))
+// => Read from key=count-vowels"
+// => Writing value=3 from key=count-vowels"
+// => {"count": 3, "total": 3, "vowels": "aeiouAEIOU"}
+
+out = await plugin.call("count_vowels", new TextEncoder().encode("Hello World!"));
+console.log(new TextDecoder().decode(out.buffer))
+// => Read from key=count-vowels"
+// => Writing value=6 from key=count-vowels"
+// => {"count": 3, "total": 6, "vowels": "aeiouAEIOU"}
+```
 
 ## Run Examples:
 
@@ -24,10 +182,4 @@ node --experimental-wasi-unstable-preview1 ./examples/node.js wasm/config.wasm
 deno run -A ./examples/deno.js ./wasm/config.wasm
 
 bun run ./examples/node.js wasm/config.wasm
-```
-
-## Update `extism-kernel.wasm`:
-We are shipping an embedded kernel in base64 form in plugin.ts. To update it, you can run these commands:
-```
-make update-kernel
-```
+```
\ No newline at end of file
diff --git a/src/plugin.ts b/src/plugin.ts
index 1ea14bb..937c36f 100644
--- a/src/plugin.ts
+++ b/src/plugin.ts
@@ -1,23 +1,12 @@
-
-export abstract class ExtismPluginBase {
-  moduleData: ArrayBuffer;
-  allocator: Allocator;
+export class CurrentPlugin {
   vars: Record<string, Uint8Array>;
-  input: Uint8Array;
-  output: Uint8Array;
-  module?: WebAssembly.WebAssemblyInstantiatedSource;
-  options: ExtismPluginOptions;
-  lastStatusCode: number = 0;
-  guestRuntime: GuestRuntime;
+  plugin: ExtismPluginBase;
+  #extism: WebAssembly.Instance;
 
-  constructor(extism: WebAssembly.Instance, moduleData: ArrayBuffer, options: ExtismPluginOptions) {
-    this.moduleData = moduleData;
-    this.allocator = new Allocator(extism);
+  constructor(plugin: ExtismPluginBase, extism: WebAssembly.Instance) {
     this.vars = {};
-    this.input = new Uint8Array();
-    this.output = new Uint8Array();
-    this.options = options;
-    this.guestRuntime = { type: GuestRuntimeType.None, init: () => {}, initialized: true };
+    this.plugin = plugin;
+    this.#extism = extism;
   }
 
   setVar(name: string, value: Uint8Array | string | number): void {
@@ -32,7 +21,7 @@ export abstract class ExtismPluginBase {
     }
   }
 
-  getStringVar(name: string): string {
+  readStringVar(name: string): string {
     return new TextDecoder().decode(this.getVar(name));
   }
 
@@ -67,6 +56,139 @@ export abstract class ExtismPluginBase {
     return bytes[0] | (bytes[1] << 8) | (bytes[2] << 16) | (bytes[3] << 24);
   }
 
+  /**
+   * Resets Extism memory.
+   * @returns {void}
+   */
+  reset() {
+    return (this.#extism.exports.extism_reset as Function).call(undefined);
+  }
+
+  /**
+   * Allocates a block of memory.
+   * @param {bigint} length - Size of the memory block.
+   * @returns {bigint} Offset in the memory.
+   */
+  alloc(length: bigint): bigint {
+    return (this.#extism.exports.extism_alloc as Function).call(undefined, length);
+  }
+
+  /**
+   * Retrieves Extism memory.
+   * @returns {WebAssembly.Memory} The memory object.
+   */
+  getMemory(): WebAssembly.Memory {
+    return this.#extism.exports.memory as WebAssembly.Memory;
+  }
+
+  /**
+   * Retrieves Extism memory buffer as Uint8Array.
+   * @returns {Uint8Array} The buffer view.
+   */
+  getMemoryBuffer(): Uint8Array {
+    return new Uint8Array(this.getMemory().buffer);
+  }
+
+  /**
+   * Gets bytes from a specific memory offset.
+   * @param {bigint} offset - Memory offset.
+   * @returns {Uint8Array | null} Byte array or null if offset is zero.
+   */
+  readBytes(offset: bigint): Uint8Array | null {
+    if (offset == BigInt(0)) {
+      return null;
+    }
+
+    const length = this.getLength(offset);
+
+    const buffer = new Uint8Array(this.getMemory().buffer, Number(offset), Number(length));
+
+    // Copy the buffer because `this.getMemory().buffer` returns a write-through view
+    return new Uint8Array(buffer);
+  }
+
+  /**
+   * Retrieves a string from a specific memory offset.
+   * @param {bigint} offset - Memory offset.
+   * @returns {string | null} Decoded string or null if offset is zero.
+   */
+  readString(offset: bigint): string | null {
+    const bytes = this.readBytes(offset);
+    if (bytes === null) {
+      return null;
+    }
+
+    return new TextDecoder().decode(bytes);
+  }
+
+  /**
+   * Allocates bytes to the WebAssembly memory.
+   * @param {Uint8Array} data - Byte array to allocate.
+   * @returns {bigint} Memory offset.
+   */
+  writeBytes(data: Uint8Array): bigint {
+    const offs = this.alloc(BigInt(data.length));
+    const buffer = new Uint8Array(this.getMemory().buffer, Number(offs), data.length);
+    buffer.set(data);
+    return offs;
+  }
+
+  /**
+   * Allocates a string to the WebAssembly memory.
+   * @param {string} data - String to allocate.
+   * @returns {bigint} Memory offset.
+   */
+  writeString(data: string): bigint {
+    const bytes = new TextEncoder().encode(data);
+    return this.writeBytes(bytes);
+  }
+
+  /**
+   * Retrieves the length of a memory block from a specific offset.
+   * @param {bigint} offset - Memory offset.
+   * @returns {bigint} Length of the memory block.
+   */
+  getLength(offset: bigint): bigint {
+    return (this.#extism.exports.extism_length as Function).call(undefined, offset);
+  }
+
+  inputLength(): bigint {
+    return (this.#extism.exports.extism_input_length as Function).call(undefined);
+  }
+
+  /**
+   * Frees a block of memory from a specific offset.
+   * @param {bigint} offset - Memory offset to free.
+   * @returns {void}
+   */
+  free(offset: bigint) {
+    if (offset == BigInt(0)) {
+      return;
+    }
+
+    (this.#extism.exports.extism_free as Function).call(undefined, offset);
+  }
+}
+
+export abstract class ExtismPluginBase {
+  moduleData: ArrayBuffer;
+  currentPlugin: CurrentPlugin;
+  input: Uint8Array;
+  output: Uint8Array;
+  module?: WebAssembly.WebAssemblyInstantiatedSource;
+  options: ExtismPluginOptions;
+  lastStatusCode: number = 0;
+  guestRuntime: GuestRuntime;
+
+  constructor(extism: WebAssembly.Instance, moduleData: ArrayBuffer, options: ExtismPluginOptions) {
+    this.moduleData = moduleData;
+    this.currentPlugin = new CurrentPlugin(this, extism);
+    this.input = new Uint8Array();
+    this.output = new Uint8Array();
+    this.options = options;
+    this.guestRuntime = { type: GuestRuntimeType.None, init: () => { }, initialized: true };
+  }
+
   async getExports(): Promise<WebAssembly.Exports> {
     const module = await this.instantiateModule();
     return module.instance.exports;
@@ -111,7 +233,7 @@ export abstract class ExtismPluginBase {
       throw new Error('Plugin error: input should be string or Uint8Array');
     }
 
-    this.allocator.reset();
+    this.currentPlugin.reset();
 
     let func = module.instance.exports[func_name];
     if (!func) {
@@ -158,6 +280,16 @@ export abstract class ExtismPluginBase {
       }
     }
 
+    for (const m in imports) {
+      if (m === "wasi_snapshot_preview1") {
+        continue;
+      }
+
+      for (const f in imports[m]) {
+        imports[m][f] = imports[m][f].bind(this.currentPlugin);
+      }
+    }
+
     this.module = await WebAssembly.instantiate(this.moduleData, imports);
 
     if (this.module.instance.exports._start) {
@@ -170,27 +302,27 @@ export abstract class ExtismPluginBase {
   }
 
   private makeEnv(): any {
-    const plugin = this;
+    let plugin = this;
     var env: any = {
-      extism_alloc(n: bigint): bigint {
-        const response = plugin.allocator.alloc(n);
+      extism_alloc(this: CurrentPlugin, n: bigint): bigint {
+        const response = this.alloc(n);
         return response;
       },
-      extism_free(n: bigint) {
-        plugin.allocator.free(n);
+      extism_free(this: CurrentPlugin, n: bigint) {
+        this.free(n);
       },
-      extism_load_u8(n: bigint): number {
-        return plugin.allocator.getMemoryBuffer()[Number(n)];
+      extism_load_u8(this: CurrentPlugin, n: bigint): number {
+        return this.getMemoryBuffer()[Number(n)];
       },
-      extism_load_u64(n: bigint): bigint {
-        let cast = new DataView(plugin.allocator.getMemory().buffer, Number(n));
+      extism_load_u64(this: CurrentPlugin, n: bigint): bigint {
+        let cast = new DataView(this.getMemory().buffer, Number(n));
         return cast.getBigUint64(0, true);
       },
-      extism_store_u8(offset: bigint, n: number) {
-        plugin.allocator.getMemoryBuffer()[Number(offset)] = Number(n);
+      extism_store_u8(this: CurrentPlugin, offset: bigint, n: number) {
+        this.getMemoryBuffer()[Number(offset)] = Number(n);
       },
-      extism_store_u64(offset: bigint, n: bigint) {
-        const tmp = new DataView(plugin.allocator.getMemory().buffer, Number(offset));
+      extism_store_u64(this: CurrentPlugin, offset: bigint, n: bigint) {
+        const tmp = new DataView(this.getMemory().buffer, Number(offset));
         tmp.setBigUint64(0, n, true);
       },
       extism_input_length(): bigint {
@@ -203,19 +335,19 @@ export abstract class ExtismPluginBase {
         let cast = new DataView(plugin.input.buffer, Number(idx));
         return cast.getBigUint64(0, true);
       },
-      extism_output_set(offset: bigint, length: bigint) {
+      extism_output_set(this: CurrentPlugin, offset: bigint, length: bigint) {
         const offs = Number(offset);
         const len = Number(length);
-        plugin.output = plugin.allocator.getMemoryBuffer().slice(offs, offs + len);
+        plugin.output = this.getMemoryBuffer().slice(offs, offs + len);
       },
-      extism_error_set(i: bigint) {
-        throw new Error(`Call error: ${plugin.allocator.getString(i)}`);
+      extism_error_set(this: CurrentPlugin, i: bigint) {
+        throw new Error(`Call error: ${this.readString(i)}`);
       },
-      extism_config_get(i: bigint): bigint {
+      extism_config_get(this: CurrentPlugin, i: bigint): bigint {
         if (typeof plugin.options.config === 'undefined') {
           return BigInt(0);
         }
-        const key = plugin.allocator.getString(i);
+        const key = this.readString(i);
         if (key === null) {
           return BigInt(0);
         }
@@ -223,38 +355,38 @@ export abstract class ExtismPluginBase {
         if (typeof value === 'undefined') {
           return BigInt(0);
         }
-        return plugin.allocator.allocString(value);
+        return this.writeString(value);
       },
-      extism_var_get(i: bigint): bigint {
-        const key = plugin.allocator.getString(i);
+      extism_var_get(this: CurrentPlugin, i: bigint): bigint {
+        const key = this.readString(i);
         if (key === null) {
           return BigInt(0);
         }
-        const value = plugin.vars[key];
+        const value = this.vars[key];
         if (typeof value === 'undefined') {
           return BigInt(0);
         }
-        return plugin.allocator.allocBytes(value);
+        return this.writeBytes(value);
       },
-      extism_var_set(n: bigint, i: bigint) {
-        const key = plugin.allocator.getString(n);
+      extism_var_set(this: CurrentPlugin, n: bigint, i: bigint) {
+        const key = this.readString(n);
         if (key === null) {
           return;
         }
-        const value = plugin.allocator.getBytes(i);
+        const value = this.readBytes(i);
         if (value === null) {
           return;
         }
-        plugin.vars[key] = value;
+        this.vars[key] = value;
       },
-      extism_http_request(requestOffset: bigint, bodyOffset: bigint): bigint {
+      extism_http_request(this: CurrentPlugin, requestOffset: bigint, bodyOffset: bigint): bigint {
         if (!plugin.supportsHttpRequests()) {
-          plugin.allocator.free(bodyOffset);
-          plugin.allocator.free(requestOffset);
+          this.free(bodyOffset);
+          this.free(requestOffset);
           throw new Error('Call error: http requests are not supported.');
         }
 
-        const requestJson = plugin.allocator.getString(requestOffset);
+        const requestJson = this.readString(requestOffset);
         if (requestJson == null) {
           throw new Error('Call error: Invalid request.');
         }
@@ -283,37 +415,37 @@ export abstract class ExtismPluginBase {
         }
 
         // TODO: limit number of bytes read to 50 MiB
-        const body = plugin.allocator.getBytes(bodyOffset);
-        plugin.allocator.free(bodyOffset);
-        plugin.allocator.free(requestOffset);
+        const body = this.readBytes(bodyOffset);
+        this.free(bodyOffset);
+        this.free(requestOffset);
 
         const response = plugin.httpRequest(request, body);
         plugin.lastStatusCode = response.status;
 
-        const offset = plugin.allocator.allocBytes(response.body);
+        const offset = this.writeBytes(response.body);
 
         return offset;
       },
       extism_http_status_code(): number {
         return plugin.lastStatusCode;
       },
-      extism_length(i: bigint): bigint {
-        return plugin.allocator.getLength(i);
+      extism_length(this: CurrentPlugin, i: bigint): bigint {
+        return this.getLength(i);
       },
-      extism_log_warn(i: bigint) {
-        const s = plugin.allocator.getString(i);
+      extism_log_warn(this: CurrentPlugin, i: bigint) {
+        const s = this.readString(i);
         console.warn(s);
       },
-      extism_log_info(i: bigint) {
-        const s = plugin.allocator.getString(i);
+      extism_log_info(this: CurrentPlugin, i: bigint) {
+        const s = this.readString(i);
         console.log(s);
       },
-      extism_log_debug(i: bigint) {
-        const s = plugin.allocator.getString(i);
+      extism_log_debug(this: CurrentPlugin, i: bigint) {
+        const s = this.readString(i);
         console.debug(s);
       },
-      extism_log_error(i: bigint) {
-        const s = plugin.allocator.getString(i);
+      extism_log_error(this: CurrentPlugin, i: bigint) {
+        const s = this.readString(i);
         console.error(s);
       },
     };
@@ -421,6 +553,7 @@ export class ExtismPluginOptions {
    */
   withFunction(moduleName: string, funcName: string, func: any) {
     const x = this.functions[moduleName] ?? {};
+
     x[funcName] = func;
     this.functions[moduleName] = x;
 
@@ -616,7 +749,7 @@ function wasiRuntime(module: WebAssembly.Instance): GuestRuntime | null {
 }
 
 function detectGuestRuntime(module: WebAssembly.Instance): GuestRuntime {
-  const none = { init: () => {}, type: GuestRuntimeType.None, initialized: true };
+  const none = { init: () => { }, type: GuestRuntimeType.None, initialized: true };
   return haskellRuntime(module) ?? wasiRuntime(module) ?? none;
 }
 
@@ -648,127 +781,6 @@ export type HttpRequest = {
 };
 
 export const embeddedRuntime =
-	'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EHJBAEGQARCCgICAABoMAgsgAUEUakIANwIAIAFBATYCDCABQaCAwIAANgIIIAFBkIDAgAA2AhAgAUEIakG0gMCAABCEgICAAAALQQAoAvSAwIAAQRB0IQMLIACnQXRqIgRFDQAgAykDCCADQRBqrXwgAFgNACAENQIIIQILIAFBIGokgICAgAAgAgsIACAApy0AAAsIACAApykDAAsSAEEAKQPIgMCAACAAfKctAAALEgBBACkDyIDAgAAgAHynKQMACwoAIACnIAE6AAALCgAgAKcgATcDAAsYAEEAIAE3A9CAwIAAQQAgADcDyIDAgAALGABBACABNwPggMCAAEEAIAA3A9iAwIAACwsAQQApA9CAwIAACwsAQQApA8iAwIAACwsAQQApA+CAwIAACwsAQQApA9iAwIAAC/ABAQJ/I4CAgIAAQSBrIgAkgICAgABBAEIANwPogMCAAEEAQQAtAPCAwIAAIgFBASABGzoA8IDAgAACQAJAIAENAEEAQQFAACIBNgL0gMCAAAJAIAFBf0YNACABQRB0IgFCADcDACABQvD/AzcDCCABQRByQQBBkAEQgoCAgAAaDAILIABBFGpCADcCACAAQQE2AgwgAEGggMCAADYCCCAAQZCAwIAANgIQIABBCGpBtIDAgAAQhICAgAAAC0EAKAL0gMCAAEEQdCEBCyABQRBqQQAgASgCCBCCgICAABogAUIANwMAIABBIGokgICAgAALDQBBACAANwPogMCAAAsLAEEAKQPogMCAAAvWAQICfwF+I4CAgIAAQSBrIgAkgICAgABBAEEALQDwgMCAACIBQQEgARs6APCAwIAAAkACQCABDQBBAEEBQAAiATYC9IDAgAACQCABQX9GDQAgAUEQdCIBQgA3AwAgAULw/wM3AwggAUEQckEAQZABEIKAgIAAGgwCCyAAQRRqQgA3AgAgAEEBNgIMIABBoIDAgAA2AgggAEGQgMCAADYCECAAQQhqQbSAwIAAEISAgIAAAAtBACgC9IDAgABBEHQhAQsgASkDACECIABBIGokgICAgAAgAgsLTQEAQYCAwAALRAEAAAAAAAAAAQAAAAIAAABPdXQgb2YgbWVtb3J5AAAAEAAQAA0AAABzcmMvbGliLnJzAAAoABAACgAAAJsAAAANAAAA';
-
-export const embeddedRuntimeHash = '1a8172a36acc75aa49c35663c1bb5d89c6ae681863540c7d0afc9e0b93727c59'
-
-class Allocator {
-  #extism: WebAssembly.Instance;
-
-  /**
-   * Constructs an allocator instance.
-   * @param {WebAssembly.Instance} extism - WebAssembly instance.
-   */
-  constructor(extism: WebAssembly.Instance) {
-    this.#extism = extism;
-  }
-
-  /**
-   * Resets Extism memory.
-   * @returns {void}
-   */
-  reset() {
-    return (this.#extism.exports.extism_reset as Function).call(undefined);
-  }
-
-  /**
-   * Allocates a block of memory.
-   * @param {bigint} length - Size of the memory block.
-   * @returns {bigint} Offset in the memory.
-   */
-  alloc(length: bigint): bigint {
-    return (this.#extism.exports.extism_alloc as Function).call(undefined, length);
-  }
-
-  /**
-   * Retrieves Extism memory.
-   * @returns {WebAssembly.Memory} The memory object.
-   */
-  getMemory(): WebAssembly.Memory {
-    return this.#extism.exports.memory as WebAssembly.Memory;
-  }
-
-  /**
-   * Retrieves Extism memory buffer as Uint8Array.
-   * @returns {Uint8Array} The buffer view.
-   */
-  getMemoryBuffer(): Uint8Array {
-    return new Uint8Array(this.getMemory().buffer);
-  }
+  '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EHJBAEGQARCCgICAABoMAgsgAUEUakIANwIAIAFBATYCDCABQaCAwIAANgIIIAFBkIDAgAA2AhAgAUEIakG0gMCAABCEgICAAAALQQAoAvSAwIAAQRB0IQMLIACnQXRqIgRFDQAgAykDCCADQRBqrXwgAFgNACAENQIIIQILIAFBIGokgICAgAAgAgsIACAApy0AAAsIACAApykDAAsSAEEAKQPIgMCAACAAfKctAAALEgBBACkDyIDAgAAgAHynKQMACwoAIACnIAE6AAALCgAgAKcgATcDAAsYAEEAIAE3A9CAwIAAQQAgADcDyIDAgAALGABBACABNwPggMCAAEEAIAA3A9iAwIAACwsAQQApA9CAwIAACwsAQQApA8iAwIAACwsAQQApA+CAwIAACwsAQQApA9iAwIAAC/ABAQJ/I4CAgIAAQSBrIgAkgICAgABBAEIANwPogMCAAEEAQQAtAPCAwIAAIgFBASABGzoA8IDAgAACQAJAIAENAEEAQQFAACIBNgL0gMCAAAJAIAFBf0YNACABQRB0IgFCADcDACABQvD/AzcDCCABQRByQQBBkAEQgoCAgAAaDAILIABBFGpCADcCACAAQQE2AgwgAEGggMCAADYCCCAAQZCAwIAANgIQIABBCGpBtIDAgAAQhICAgAAAC0EAKAL0gMCAAEEQdCEBCyABQRBqQQAgASgCCBCCgICAABogAUIANwMAIABBIGokgICAgAALDQBBACAANwPogMCAAAsLAEEAKQPogMCAAAvWAQICfwF+I4CAgIAAQSBrIgAkgICAgABBAEEALQDwgMCAACIBQQEgARs6APCAwIAAAkACQCABDQBBAEEBQAAiATYC9IDAgAACQCABQX9GDQAgAUEQdCIBQgA3AwAgAULw/wM3AwggAUEQckEAQZABEIKAgIAAGgwCCyAAQRRqQgA3AgAgAEEBNgIMIABBoIDAgAA2AgggAEGQgMCAADYCECAAQQhqQbSAwIAAEISAgIAAAAtBACgC9IDAgABBEHQhAQsgASkDACECIABBIGokgICAgAAgAgsLTQEAQYCAwAALRAEAAAAAAAAAAQAAAAIAAABPdXQgb2YgbWVtb3J5AAAAEAAQAA0AAABzcmMvbGliLnJzAAAoABAACgAAAJsAAAANAAAA';
 
-  /**
-   * Gets bytes from a specific memory offset.
-   * @param {bigint} offset - Memory offset.
-   * @returns {Uint8Array | null} Byte array or null if offset is zero.
-   */
-  getBytes(offset: bigint): Uint8Array | null {
-    if (offset == BigInt(0)) {
-      return null;
-    }
-
-    const length = this.getLength(offset);
-
-    const buffer = new Uint8Array(this.getMemory().buffer, Number(offset), Number(length));
-    
-    // Copy the buffer because `this.getMemory().buffer` returns a write-through view
-    return new Uint8Array(buffer);
-  }
-
-  /**
-   * Retrieves a string from a specific memory offset.
-   * @param {bigint} offset - Memory offset.
-   * @returns {string | null} Decoded string or null if offset is zero.
-   */
-  getString(offset: bigint): string | null {
-    const bytes = this.getBytes(offset);
-    if (bytes === null) {
-      return null;
-    }
-
-    return new TextDecoder().decode(bytes);
-  }
-
-  /**
-   * Allocates bytes to the WebAssembly memory.
-   * @param {Uint8Array} data - Byte array to allocate.
-   * @returns {bigint} Memory offset.
-   */
-  allocBytes(data: Uint8Array): bigint {
-    const offs = this.alloc(BigInt(data.length));
-    const buffer = new Uint8Array(this.getMemory().buffer, Number(offs), data.length);
-    buffer.set(data);
-    return offs;
-  }
-
-  /**
-   * Allocates a string to the WebAssembly memory.
-   * @param {string} data - String to allocate.
-   * @returns {bigint} Memory offset.
-   */
-  allocString(data: string): bigint {
-    const bytes = new TextEncoder().encode(data);
-    return this.allocBytes(bytes);
-  }
-
-  /**
-   * Retrieves the length of a memory block from a specific offset.
-   * @param {bigint} offset - Memory offset.
-   * @returns {bigint} Length of the memory block.
-   */
-  getLength(offset: bigint): bigint {
-    return (this.#extism.exports.extism_length as Function).call(undefined, offset);
-  }
-
-  /**
-   * Frees a block of memory from a specific offset.
-   * @param {bigint} offset - Memory offset to free.
-   * @returns {void}
-   */
-  free(offset: bigint) {
-    if (offset == BigInt(0)) {
-      return;
-    }
-
-    (this.#extism.exports.extism_free as Function).call(undefined, offset);
-  }
-}
+export const embeddedRuntimeHash = '1a8172a36acc75aa49c35663c1bb5d89c6ae681863540c7d0afc9e0b93727c59'
\ No newline at end of file
diff --git a/tests/index.test.ts b/tests/index.test.ts
index e638984..657b6c7 100644
--- a/tests/index.test.ts
+++ b/tests/index.test.ts
@@ -1,4 +1,5 @@
 import { createPlugin, ExtismPlugin, ExtismPluginOptions, Manifest, ManifestWasm } from '../src/node/index';
+import { CurrentPlugin } from '../src/plugin';
 
 async function newPlugin(
   moduleName: string | Manifest | ManifestWasm | Buffer,
@@ -104,11 +105,11 @@ describe('test extism', () => {
 
   test('host functions works', async () => {
     const plugin = await newPlugin('code-functions.wasm', options => {
-      options.withFunction("env", "hello_world", (off: bigint) => {
-        let result = JSON.parse(plugin.allocator.getString(off) ?? "");
+      options.withFunction("env", "hello_world", function (this: CurrentPlugin, off: bigint) {
+        let result = JSON.parse(this.readString(off) ?? "");
         result['message'] = "hello from host!";
 
-        return plugin.allocator.allocString(JSON.stringify(result));
+        return this.writeString(JSON.stringify(result));
       });
     });
 
@@ -154,19 +155,6 @@ describe('test extism', () => {
     expect(console.error).toHaveBeenCalledWith("this is an erorr log");
     expect(console.debug).toHaveBeenCalledWith("this is a debug log");
   });
-
-  test('can get and set vars', async () => {
-    const plugin = await newPlugin('var.wasm');
-    plugin.setVar("a", 10);
-    
-    const _ = await plugin.call("run_test", "");
-
-    expect(plugin.getNumberVar("a")).toBe(20);
-
-    const __ = await plugin.call("run_test", "");
-
-    expect(plugin.getNumberVar("a")).toBe(40);
-  });
   
   test('can initialize haskell runtime', async () => {
     console.trace = jest.fn();
diff --git a/tests/mod.test.ts b/tests/mod.test.ts
index e2ea9b4..fe297fa 100644
--- a/tests/mod.test.ts
+++ b/tests/mod.test.ts
@@ -1,6 +1,7 @@
 import { assertEquals, assertRejects } from 'https://deno.land/std@0.200.0/assert/mod.ts';
 import { assertSpyCalls, spy } from 'https://deno.land/std@0.200.0/testing/mock.ts';
 import { createPlugin, ExtismPlugin, ExtismPluginOptions, Manifest, ManifestWasm } from '../src/deno/mod.ts';
+import { CurrentPlugin } from "../src/plugin.ts";
 
 async function newPlugin(
   moduleName: string | Manifest | ManifestWasm,
@@ -107,10 +108,10 @@ Deno.test('errors when function is not known', async () => {
 
 Deno.test('host functions works', async () => {
   const plugin = await newPlugin('code-functions.wasm', (options) => {
-    options.withFunction('env', 'hello_world', (off: bigint) => {
-      const result = JSON.parse(plugin.allocator.getString(off) ?? '');
+    options.withFunction('env', 'hello_world', function (this: CurrentPlugin, off: bigint) {
+      const result = JSON.parse(this.readString(off) ?? '');
       result['message'] = 'hello from host!';
-      return plugin.allocator.allocString(JSON.stringify(result));
+      return plugin.currentPlugin.writeString(JSON.stringify(result));
     });
   });
 
@@ -171,19 +172,6 @@ Deno.test('can log messages', async () => {
   assertSpyCalls(debugSpy, 1);
 });
 
-Deno.test('can get and set vars', async () => {
-  const plugin = await newPlugin('var.wasm');
-  plugin.setVar('a', 10);
-
-  const _ = await plugin.call('run_test', '');
-
-  assertEquals(plugin.getNumberVar('a'), 20);
-
-  const __ = await plugin.call('run_test', '');
-
-  assertEquals(plugin.getNumberVar('a'), 40);
-});
-
 Deno.test('can initialize Haskell runtime', async () => {
   const plugin = await newPlugin('hello_haskell.wasm', (options) => {
     options.withConfig('greeting', 'Howdy');

From c25f89d7c8e6e7e786a2d70812e070bae7ae6c3a Mon Sep 17 00:00:00 2001
From: Muhammad Azeez <muhammad@dylibso.com>
Date: Thu, 5 Oct 2023 17:01:01 +0300
Subject: [PATCH 04/18] use ts for deno

---
 README.md                     | 2 +-
 examples/{deno.js => deno.ts} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename examples/{deno.js => deno.ts} (100%)

diff --git a/README.md b/README.md
index a054322..ed9128a 100644
--- a/README.md
+++ b/README.md
@@ -179,7 +179,7 @@ npm run build
 
 node --experimental-wasi-unstable-preview1 ./examples/node.js wasm/config.wasm
 
-deno run -A ./examples/deno.js ./wasm/config.wasm
+deno run -A ./examples/deno.ts ./wasm/config.wasm
 
 bun run ./examples/node.js wasm/config.wasm
 ```
\ No newline at end of file
diff --git a/examples/deno.js b/examples/deno.ts
similarity index 100%
rename from examples/deno.js
rename to examples/deno.ts

From eeb05448cfe6f7c601e3edcc32ab38f67bd2870d Mon Sep 17 00:00:00 2001
From: Muhammad Azeez <muhammad@dylibso.com>
Date: Thu, 5 Oct 2023 17:01:19 +0300
Subject: [PATCH 05/18] use top level statements for deno

---
 examples/deno.ts | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/examples/deno.ts b/examples/deno.ts
index 1d5c10b..ee75695 100644
--- a/examples/deno.ts
+++ b/examples/deno.ts
@@ -1,22 +1,18 @@
 import { createPlugin, ExtismPluginOptions } from '../src/deno/mod.ts'
 
-async function main() {
-    const filename = Deno.args[0] || "wasm/hello.wasm";
-    const funcname = Deno.args[1] || "run_test";
-    const input = Deno.args[2] || "this is a test";
-    const wasm = {
-        path: filename
-    }
-
-    const options = new ExtismPluginOptions()
-        .withConfig("thing", "testing")
-        .withWasi();
+const filename = Deno.args[0] || "wasm/hello.wasm";
+const funcname = Deno.args[1] || "run_test";
+const input = Deno.args[2] || "this is a test";
+const wasm = {
+    path: filename
+}
 
-    const plugin = await createPlugin(wasm, options);
+const options = new ExtismPluginOptions()
+    .withConfig("thing", "testing")
+    .withWasi();
 
-    const res = await plugin.call(funcname, new TextEncoder().encode(input));
-    const s = new TextDecoder().decode(res.buffer);
-    console.log(s)
-}
+const plugin = await createPlugin(wasm, options);
 
-main();
\ No newline at end of file
+const res = await plugin.call(funcname, new TextEncoder().encode(input));
+const s = new TextDecoder().decode(res.buffer);
+console.log(s)
\ No newline at end of file

From 1a06f4d48f82a6f9504a308c9bc07368137f3733 Mon Sep 17 00:00:00 2001
From: Muhammad Azeez <muhammad@dylibso.com>
Date: Thu, 5 Oct 2023 17:12:35 +0300
Subject: [PATCH 06/18] cleanup

---
 src/browser/index.ts |   6 +-
 src/deno/mod.ts      |   4 +-
 src/node/index.ts    |   2 +
 src/plugin.ts        | 346 +++++++++++++++++++++----------------------
 4 files changed, 182 insertions(+), 176 deletions(-)

diff --git a/src/browser/index.ts b/src/browser/index.ts
index cbb1510..fb4ab28 100644
--- a/src/browser/index.ts
+++ b/src/browser/index.ts
@@ -12,7 +12,8 @@ import {
   HttpRequest,
   HttpResponse,
   embeddedRuntime,
-  embeddedRuntimeHash
+  embeddedRuntimeHash,
+  CurrentPlugin
 } from '../plugin';
 
 import { WASI, Fd, File, OpenFile } from '@bjorn3/browser_wasi_shim';
@@ -159,7 +160,7 @@ async function createPlugin(
 
 if (window) {
   // @ts-ignore
-  window.ExtismPlugin = ExtismPlugin;
+  window.createPlugin = createPlugin;
   // @ts-ignore
   window.ExtismPluginOptions = ExtismPluginOptions;
 }
@@ -167,6 +168,7 @@ if (window) {
 export {
   createPlugin,
   ExtismPlugin,
+  CurrentPlugin,
   ExtismPluginOptions,
 }
 
diff --git a/src/deno/mod.ts b/src/deno/mod.ts
index e77cf64..492dd43 100644
--- a/src/deno/mod.ts
+++ b/src/deno/mod.ts
@@ -12,7 +12,8 @@ import {
   HttpRequest,
   HttpResponse,
   embeddedRuntime,
-  embeddedRuntimeHash
+  embeddedRuntimeHash,
+  CurrentPlugin
 } from '../plugin.ts';
 import Context from 'https://deno.land/std@0.200.0/wasi/snapshot_preview1.ts';
 import minimatch from 'https://deno.land/x/minimatch@v3.0.4/index.js';
@@ -107,6 +108,7 @@ async function createPlugin(
 export {
   createPlugin,
   ExtismPlugin,
+  CurrentPlugin,
   ExtismPluginOptions
 }
 
diff --git a/src/node/index.ts b/src/node/index.ts
index d9ad6ed..1420a47 100644
--- a/src/node/index.ts
+++ b/src/node/index.ts
@@ -13,6 +13,7 @@ import {
   HttpResponse,
   embeddedRuntime,
   embeddedRuntimeHash,
+  CurrentPlugin,
 } from '../plugin';
 import { WASI } from 'wasi';
 import { readFile } from 'fs';
@@ -136,6 +137,7 @@ async function createPlugin(
 export {
   createPlugin,
   ExtismPlugin,
+  CurrentPlugin,
   ExtismPluginOptions,
 }
 
diff --git a/src/plugin.ts b/src/plugin.ts
index 937c36f..170851f 100644
--- a/src/plugin.ts
+++ b/src/plugin.ts
@@ -1,175 +1,3 @@
-export class CurrentPlugin {
-  vars: Record<string, Uint8Array>;
-  plugin: ExtismPluginBase;
-  #extism: WebAssembly.Instance;
-
-  constructor(plugin: ExtismPluginBase, extism: WebAssembly.Instance) {
-    this.vars = {};
-    this.plugin = plugin;
-    this.#extism = extism;
-  }
-
-  setVar(name: string, value: Uint8Array | string | number): void {
-    if (value instanceof Uint8Array) {
-      this.vars[name] = value;
-    } else if (typeof value === 'string') {
-      this.vars[name] = new TextEncoder().encode(value);
-    } else if (typeof value === 'number') {
-      this.vars[name] = this.uintToLEBytes(value);
-    } else {
-      throw new Error('Unsupported value type');
-    }
-  }
-
-  readStringVar(name: string): string {
-    return new TextDecoder().decode(this.getVar(name));
-  }
-
-  getNumberVar(name: string): number {
-    const value = this.getVar(name);
-    if (value.length < 4) {
-      throw new Error(`Variable ${name} has incorrect length`);
-    }
-
-    return this.uintFromLEBytes(value);
-  }
-
-  getVar(name: string): Uint8Array {
-    const value = this.vars[name];
-    if (!value) {
-      throw new Error(`Variable ${name} not found`);
-    }
-
-    return value;
-  }
-
-  private uintToLEBytes(num: number): Uint8Array {
-    const bytes = new Uint8Array(4);
-    bytes[0] = num & 0xff;
-    bytes[1] = (num >> 8) & 0xff;
-    bytes[2] = (num >> 16) & 0xff;
-    bytes[3] = (num >> 24) & 0xff;
-    return bytes;
-  }
-
-  private uintFromLEBytes(bytes: Uint8Array): number {
-    return bytes[0] | (bytes[1] << 8) | (bytes[2] << 16) | (bytes[3] << 24);
-  }
-
-  /**
-   * Resets Extism memory.
-   * @returns {void}
-   */
-  reset() {
-    return (this.#extism.exports.extism_reset as Function).call(undefined);
-  }
-
-  /**
-   * Allocates a block of memory.
-   * @param {bigint} length - Size of the memory block.
-   * @returns {bigint} Offset in the memory.
-   */
-  alloc(length: bigint): bigint {
-    return (this.#extism.exports.extism_alloc as Function).call(undefined, length);
-  }
-
-  /**
-   * Retrieves Extism memory.
-   * @returns {WebAssembly.Memory} The memory object.
-   */
-  getMemory(): WebAssembly.Memory {
-    return this.#extism.exports.memory as WebAssembly.Memory;
-  }
-
-  /**
-   * Retrieves Extism memory buffer as Uint8Array.
-   * @returns {Uint8Array} The buffer view.
-   */
-  getMemoryBuffer(): Uint8Array {
-    return new Uint8Array(this.getMemory().buffer);
-  }
-
-  /**
-   * Gets bytes from a specific memory offset.
-   * @param {bigint} offset - Memory offset.
-   * @returns {Uint8Array | null} Byte array or null if offset is zero.
-   */
-  readBytes(offset: bigint): Uint8Array | null {
-    if (offset == BigInt(0)) {
-      return null;
-    }
-
-    const length = this.getLength(offset);
-
-    const buffer = new Uint8Array(this.getMemory().buffer, Number(offset), Number(length));
-
-    // Copy the buffer because `this.getMemory().buffer` returns a write-through view
-    return new Uint8Array(buffer);
-  }
-
-  /**
-   * Retrieves a string from a specific memory offset.
-   * @param {bigint} offset - Memory offset.
-   * @returns {string | null} Decoded string or null if offset is zero.
-   */
-  readString(offset: bigint): string | null {
-    const bytes = this.readBytes(offset);
-    if (bytes === null) {
-      return null;
-    }
-
-    return new TextDecoder().decode(bytes);
-  }
-
-  /**
-   * Allocates bytes to the WebAssembly memory.
-   * @param {Uint8Array} data - Byte array to allocate.
-   * @returns {bigint} Memory offset.
-   */
-  writeBytes(data: Uint8Array): bigint {
-    const offs = this.alloc(BigInt(data.length));
-    const buffer = new Uint8Array(this.getMemory().buffer, Number(offs), data.length);
-    buffer.set(data);
-    return offs;
-  }
-
-  /**
-   * Allocates a string to the WebAssembly memory.
-   * @param {string} data - String to allocate.
-   * @returns {bigint} Memory offset.
-   */
-  writeString(data: string): bigint {
-    const bytes = new TextEncoder().encode(data);
-    return this.writeBytes(bytes);
-  }
-
-  /**
-   * Retrieves the length of a memory block from a specific offset.
-   * @param {bigint} offset - Memory offset.
-   * @returns {bigint} Length of the memory block.
-   */
-  getLength(offset: bigint): bigint {
-    return (this.#extism.exports.extism_length as Function).call(undefined, offset);
-  }
-
-  inputLength(): bigint {
-    return (this.#extism.exports.extism_input_length as Function).call(undefined);
-  }
-
-  /**
-   * Frees a block of memory from a specific offset.
-   * @param {bigint} offset - Memory offset to free.
-   * @returns {void}
-   */
-  free(offset: bigint) {
-    if (offset == BigInt(0)) {
-      return;
-    }
-
-    (this.#extism.exports.extism_free as Function).call(undefined, offset);
-  }
-}
-
 export abstract class ExtismPluginBase {
   moduleData: ArrayBuffer;
   currentPlugin: CurrentPlugin;
@@ -783,4 +611,176 @@ export type HttpRequest = {
 export const embeddedRuntime =
   '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EHJBAEGQARCCgICAABoMAgsgAUEUakIANwIAIAFBATYCDCABQaCAwIAANgIIIAFBkIDAgAA2AhAgAUEIakG0gMCAABCEgICAAAALQQAoAvSAwIAAQRB0IQMLIACnQXRqIgRFDQAgAykDCCADQRBqrXwgAFgNACAENQIIIQILIAFBIGokgICAgAAgAgsIACAApy0AAAsIACAApykDAAsSAEEAKQPIgMCAACAAfKctAAALEgBBACkDyIDAgAAgAHynKQMACwoAIACnIAE6AAALCgAgAKcgATcDAAsYAEEAIAE3A9CAwIAAQQAgADcDyIDAgAALGABBACABNwPggMCAAEEAIAA3A9iAwIAACwsAQQApA9CAwIAACwsAQQApA8iAwIAACwsAQQApA+CAwIAACwsAQQApA9iAwIAAC/ABAQJ/I4CAgIAAQSBrIgAkgICAgABBAEIANwPogMCAAEEAQQAtAPCAwIAAIgFBASABGzoA8IDAgAACQAJAIAENAEEAQQFAACIBNgL0gMCAAAJAIAFBf0YNACABQRB0IgFCADcDACABQvD/AzcDCCABQRByQQBBkAEQgoCAgAAaDAILIABBFGpCADcCACAAQQE2AgwgAEGggMCAADYCCCAAQZCAwIAANgIQIABBCGpBtIDAgAAQhICAgAAAC0EAKAL0gMCAAEEQdCEBCyABQRBqQQAgASgCCBCCgICAABogAUIANwMAIABBIGokgICAgAALDQBBACAANwPogMCAAAsLAEEAKQPogMCAAAvWAQICfwF+I4CAgIAAQSBrIgAkgICAgABBAEEALQDwgMCAACIBQQEgARs6APCAwIAAAkACQCABDQBBAEEBQAAiATYC9IDAgAACQCABQX9GDQAgAUEQdCIBQgA3AwAgAULw/wM3AwggAUEQckEAQZABEIKAgIAAGgwCCyAAQRRqQgA3AgAgAEEBNgIMIABBoIDAgAA2AgggAEGQgMCAADYCECAAQQhqQbSAwIAAEISAgIAAAAtBACgC9IDAgABBEHQhAQsgASkDACECIABBIGokgICAgAAgAgsLTQEAQYCAwAALRAEAAAAAAAAAAQAAAAIAAABPdXQgb2YgbWVtb3J5AAAAEAAQAA0AAABzcmMvbGliLnJzAAAoABAACgAAAJsAAAANAAAA';
 
-export const embeddedRuntimeHash = '1a8172a36acc75aa49c35663c1bb5d89c6ae681863540c7d0afc9e0b93727c59'
\ No newline at end of file
+export const embeddedRuntimeHash = '1a8172a36acc75aa49c35663c1bb5d89c6ae681863540c7d0afc9e0b93727c59'
+
+export class CurrentPlugin {
+  vars: Record<string, Uint8Array>;
+  plugin: ExtismPluginBase;
+  #extism: WebAssembly.Instance;
+
+  constructor(plugin: ExtismPluginBase, extism: WebAssembly.Instance) {
+    this.vars = {};
+    this.plugin = plugin;
+    this.#extism = extism;
+  }
+
+  setVar(name: string, value: Uint8Array | string | number): void {
+    if (value instanceof Uint8Array) {
+      this.vars[name] = value;
+    } else if (typeof value === 'string') {
+      this.vars[name] = new TextEncoder().encode(value);
+    } else if (typeof value === 'number') {
+      this.vars[name] = this.uintToLEBytes(value);
+    } else {
+      throw new Error('Unsupported value type');
+    }
+  }
+
+  readStringVar(name: string): string {
+    return new TextDecoder().decode(this.getVar(name));
+  }
+
+  getNumberVar(name: string): number {
+    const value = this.getVar(name);
+    if (value.length < 4) {
+      throw new Error(`Variable ${name} has incorrect length`);
+    }
+
+    return this.uintFromLEBytes(value);
+  }
+
+  getVar(name: string): Uint8Array {
+    const value = this.vars[name];
+    if (!value) {
+      throw new Error(`Variable ${name} not found`);
+    }
+
+    return value;
+  }
+
+  private uintToLEBytes(num: number): Uint8Array {
+    const bytes = new Uint8Array(4);
+    bytes[0] = num & 0xff;
+    bytes[1] = (num >> 8) & 0xff;
+    bytes[2] = (num >> 16) & 0xff;
+    bytes[3] = (num >> 24) & 0xff;
+    return bytes;
+  }
+
+  private uintFromLEBytes(bytes: Uint8Array): number {
+    return bytes[0] | (bytes[1] << 8) | (bytes[2] << 16) | (bytes[3] << 24);
+  }
+
+  /**
+   * Resets Extism memory.
+   * @returns {void}
+   */
+  reset() {
+    return (this.#extism.exports.extism_reset as Function).call(undefined);
+  }
+
+  /**
+   * Allocates a block of memory.
+   * @param {bigint} length - Size of the memory block.
+   * @returns {bigint} Offset in the memory.
+   */
+  alloc(length: bigint): bigint {
+    return (this.#extism.exports.extism_alloc as Function).call(undefined, length);
+  }
+
+  /**
+   * Retrieves Extism memory.
+   * @returns {WebAssembly.Memory} The memory object.
+   */
+  getMemory(): WebAssembly.Memory {
+    return this.#extism.exports.memory as WebAssembly.Memory;
+  }
+
+  /**
+   * Retrieves Extism memory buffer as Uint8Array.
+   * @returns {Uint8Array} The buffer view.
+   */
+  getMemoryBuffer(): Uint8Array {
+    return new Uint8Array(this.getMemory().buffer);
+  }
+
+  /**
+   * Gets bytes from a specific memory offset.
+   * @param {bigint} offset - Memory offset.
+   * @returns {Uint8Array | null} Byte array or null if offset is zero.
+   */
+  readBytes(offset: bigint): Uint8Array | null {
+    if (offset == BigInt(0)) {
+      return null;
+    }
+
+    const length = this.getLength(offset);
+
+    const buffer = new Uint8Array(this.getMemory().buffer, Number(offset), Number(length));
+
+    // Copy the buffer because `this.getMemory().buffer` returns a write-through view
+    return new Uint8Array(buffer);
+  }
+
+  /**
+   * Retrieves a string from a specific memory offset.
+   * @param {bigint} offset - Memory offset.
+   * @returns {string | null} Decoded string or null if offset is zero.
+   */
+  readString(offset: bigint): string | null {
+    const bytes = this.readBytes(offset);
+    if (bytes === null) {
+      return null;
+    }
+
+    return new TextDecoder().decode(bytes);
+  }
+
+  /**
+   * Allocates bytes to the WebAssembly memory.
+   * @param {Uint8Array} data - Byte array to allocate.
+   * @returns {bigint} Memory offset.
+   */
+  writeBytes(data: Uint8Array): bigint {
+    const offs = this.alloc(BigInt(data.length));
+    const buffer = new Uint8Array(this.getMemory().buffer, Number(offs), data.length);
+    buffer.set(data);
+    return offs;
+  }
+
+  /**
+   * Allocates a string to the WebAssembly memory.
+   * @param {string} data - String to allocate.
+   * @returns {bigint} Memory offset.
+   */
+  writeString(data: string): bigint {
+    const bytes = new TextEncoder().encode(data);
+    return this.writeBytes(bytes);
+  }
+
+  /**
+   * Retrieves the length of a memory block from a specific offset.
+   * @param {bigint} offset - Memory offset.
+   * @returns {bigint} Length of the memory block.
+   */
+  getLength(offset: bigint): bigint {
+    return (this.#extism.exports.extism_length as Function).call(undefined, offset);
+  }
+
+  inputLength(): bigint {
+    return (this.#extism.exports.extism_input_length as Function).call(undefined);
+  }
+
+  /**
+   * Frees a block of memory from a specific offset.
+   * @param {bigint} offset - Memory offset to free.
+   * @returns {void}
+   */
+  free(offset: bigint) {
+    if (offset == BigInt(0)) {
+      return;
+    }
+
+    (this.#extism.exports.extism_free as Function).call(undefined, offset);
+  }
+}
\ No newline at end of file

From 87d8fc28921a36dac86a6214e9041ab71865b30c Mon Sep 17 00:00:00 2001
From: Muhammad Azeez <muhammad@dylibso.com>
Date: Sun, 8 Oct 2023 15:20:21 +0300
Subject: [PATCH 07/18] feat: turn ExtismPluginOptions into an interface

---
 README.md            |  60 ++++++++++++---------
 build.js             |   1 -
 examples/deno.ts     |  13 ++---
 examples/index.html  |  13 +++--
 examples/node.js     |  13 +++--
 src/browser/index.ts |  12 +----
 src/deno/mod.ts      |   9 +---
 src/node/index.ts    |   9 +---
 src/plugin.ts        | 125 +++----------------------------------------
 tests/index.test.ts  |  72 +++++++++++++------------
 tests/mod.test.ts    |  39 ++++++++------
 11 files changed, 127 insertions(+), 239 deletions(-)

diff --git a/README.md b/README.md
index 47c9819..a08e19f 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,7 @@ Instead of using FFI and the libextism shared object, this library uses whatever
 
 ## Installation
 
+Install via npm:
 ```
 npm install @extism/extism@1.0.0-rc1 --save
 ```
@@ -27,10 +28,10 @@ This guide should walk you through some of the concepts in Extism and this JS li
 First you should import `createPlugin` and `ExtismPluginOptions` from Extism:
 ```js
 // CommonJS
-const { createPlugin, ExtismPluginOptions } = require("../dist/node/index")
+const { createPlugin } = require("../dist/node/index")
 
 // ES Modules
-import { createPlugin, ExtismPluginOptions } from '../src/deno/mod.ts'
+import createPlugin from '../src/deno/mod.ts'
 ```
 
 ## Creating A Plug-in
@@ -40,13 +41,14 @@ The primary concept in Extism is the [plug-in](https://extism.org/docs/concepts/
 Plug-in code can come from a file on disk, object storage or any number of places. Since you may not have one handy let's load a demo plug-in from the web:
 
 ```js
-const options = new ExtismPluginOptions().withWasi();
-
 const wasm = {
     url: 'https://github.com/extism/plugins/releases/latest/download/count_vowels.wasm'
 }
 
-const plugin = await createPlugin(wasm, options);
+const plugin = await createPlugin(wasm, {
+    // NOTE: If you get an error like "TypeError: WebAssembly.instantiate(): Import #0 module="wasi_snapshot_preview1": module is not an object or function", then your plugin requires WASI support
+    useWasi: true,
+});
 ```
 
 ## Calling A Plug-in's Exports
@@ -62,7 +64,6 @@ console.log(new TextDecoder().decode(out.buffer))
 
 All exports have a simple interface of optional bytes in, and optional bytes out. This plug-in happens to take a string and return a JSON encoded string with a report of results.
 
-
 ### Plug-in State
 
 Plug-ins may be stateful or stateless. Plug-ins can maintain state b/w calls by the use of variables. Our count vowels plug-in remembers the total number of vowels it's ever counted in the "total" key in the result. You can see this by making subsequent calls to the export:
@@ -89,16 +90,18 @@ const wasm = {
     url: 'https://github.com/extism/plugins/releases/latest/download/count_vowels.wasm'
 }
 
-let options = new ExtismPluginOptions()
-    .withWasi();
+let plugin = await createPlugin(wasm, {
+    useWasi: true,
+});
 
 let out = await plugin.call("count_vowels", new TextEncoder().encode("Yellow, World!"));
 console.log(new TextDecoder().decode(out.buffer))
 // => {"count": 3, "total": 3, "vowels": "aeiouAEIOU"}
 
-options = new ExtismPluginOptions()
-    .withConfig("vowels", "aeiouyAEIOUY")
-    .withWasi();
+plugin = await createPlugin(wasm, {
+    useWasi: true,
+    config: { "vowels": "aeiouyAEIOUY" }
+});
 
 out = await plugin.call("count_vowels", new TextEncoder().encode("Yellow, World!"));
 console.log(new TextDecoder().decode(out.buffer))
@@ -130,21 +133,26 @@ We want to expose two functions to our plugin, `kv_write(key: string, value: Uin
 // pretend this is Redis or something :)
 let kvStore = new Map();
 
-const options = new ExtismPluginOptions()
-    .withFunction("env", "kv_read", function (offs) { // this: CurrentPlugin
-        const key = this.readString(offs);
-        let value = kvStore.get(key) ?? new Uint8Array([0, 0, 0, 0]);
-        console.log(`Read ${new DataView(value.buffer).getUint32(0, true)} from key=${key}`);
-        return this.writeBytes(value);
-    })
-    .withFunction("env", "kv_write", function (kOffs, vOffs) { // this: CurrentPlugin
-        const key = this.readString(kOffs);
-        const value = this.readBytes(vOffs);
-        console.log(`Writing value=${new DataView(value.buffer).getUint32(0, true)} from key=${key}`);
-
-        kvStore.set(key, value);
-    })
-    .withWasi();
+const options = {
+    useWasi: true,
+    functions: {
+        "env": {
+            "kv_read": function (offs) { // this: CurrentPlugin
+                const key = this.readString(offs);
+                let value = kvStore.get(key) ?? new Uint8Array([0, 0, 0, 0]);
+                console.log(`Read ${new DataView(value.buffer).getUint32(0, true)} from key=${key}`);
+                return this.writeBytes(value);
+            },
+            "kv_write": function (kOffs, vOffs) { // this: CurrentPlugin
+                const key = this.readString(kOffs);
+                const value = this.readBytes(vOffs);
+                console.log(`Writing value=${new DataView(value.buffer).getUint32(0, true)} from key=${key}`);
+
+                kvStore.set(key, value);
+            }
+        }
+    }
+};
 ```
 
 > *Note*: In order to write host functions you should get familiar with the methods on the `CurrentPlugin` type. `this` is bound to an instance of `CurrentPlugin`.
diff --git a/build.js b/build.js
index fa8c394..82d9817 100644
--- a/build.js
+++ b/build.js
@@ -1,6 +1,5 @@
 const { build } = require("esbuild");
 const { peerDependencies } = require('./package.json')
-const fs = require('fs')
 
 const sharedConfig = {
     bundle: true,
diff --git a/examples/deno.ts b/examples/deno.ts
index ee75695..693d059 100644
--- a/examples/deno.ts
+++ b/examples/deno.ts
@@ -1,4 +1,4 @@
-import { createPlugin, ExtismPluginOptions } from '../src/deno/mod.ts'
+import createPlugin, { CurrentPlugin } from '../src/deno/mod.ts'
 
 const filename = Deno.args[0] || "wasm/hello.wasm";
 const funcname = Deno.args[1] || "run_test";
@@ -7,11 +7,12 @@ const wasm = {
     path: filename
 }
 
-const options = new ExtismPluginOptions()
-    .withConfig("thing", "testing")
-    .withWasi();
-
-const plugin = await createPlugin(wasm, options);
+const plugin = await createPlugin(wasm, {
+    useWasi: true,
+    config: {
+        "thing": "testing"
+    }
+});
 
 const res = await plugin.call(funcname, new TextEncoder().encode(input));
 const s = new TextDecoder().decode(res.buffer);
diff --git a/examples/index.html b/examples/index.html
index 2892f5d..dc27dff 100644
--- a/examples/index.html
+++ b/examples/index.html
@@ -58,7 +58,7 @@
     <script type="module" src="/dist/browser/index.mjs"></script>
 
     <script type="module">
-        import { createPlugin } from '/dist/browser/index.mjs';
+        import createPlugin from '/dist/browser/index.mjs';
 
         async function runPlugin() {
             // Get values from input fields
@@ -71,12 +71,11 @@
                 url: url
             }
 
-            const options = new ExtismPluginOptions()
-                .withConfig("thing", "testing")
-                .withWasi()
-                .withAllowedHosts(hosts);
-
-            const plugin = await createPlugin(wasm, options);
+            const plugin = await createPlugin(wasm, {
+                useWasi: true,
+                config: { "thing": "testing" },
+                allowedHosts: [ ...hosts ]
+            });
 
             const res = await plugin.call(funcname, new TextEncoder().encode(input));
             const s = new TextDecoder().decode(res.buffer);
diff --git a/examples/node.js b/examples/node.js
index a80fcf7..3c6935e 100644
--- a/examples/node.js
+++ b/examples/node.js
@@ -1,4 +1,4 @@
-const { createPlugin, ExtismPluginOptions } = require("../dist/node/index")
+const { createPlugin } = require("../dist/node/index")
 const { argv } = require("process");
 
 async function main() {
@@ -9,12 +9,11 @@ async function main() {
         path: filename
     }
 
-    const options = new ExtismPluginOptions()
-        .withConfig("thing", "testing")
-        .withWasi()
-        .withAllowedHost("*.typicode.com");
-
-    const plugin = await createPlugin(wasm, options);
+    const plugin = await createPlugin(wasm, {
+        useWasi: true,
+        config: { "thing": "testing" },
+        withAllowedHosts: ["*.typicode.com"]
+    })
 
     const res = await plugin.call(funcname, new TextEncoder().encode(input));
     const s = new TextDecoder().decode(res.buffer);
diff --git a/src/browser/index.ts b/src/browser/index.ts
index fb4ab28..fbdd0c7 100644
--- a/src/browser/index.ts
+++ b/src/browser/index.ts
@@ -161,15 +161,7 @@ async function createPlugin(
 if (window) {
   // @ts-ignore
   window.createPlugin = createPlugin;
-  // @ts-ignore
-  window.ExtismPluginOptions = ExtismPluginOptions;
-}
-
-export {
-  createPlugin,
-  ExtismPlugin,
-  CurrentPlugin,
-  ExtismPluginOptions,
 }
 
-export type { Manifest, ManifestWasm, ManifestWasmData, ManifestWasmFile, ManifestWasmUrl };
\ No newline at end of file
+export default createPlugin;
+export type { ExtismPlugin, CurrentPlugin, ExtismPluginOptions, Manifest, ManifestWasm, ManifestWasmData, ManifestWasmFile, ManifestWasmUrl };
diff --git a/src/deno/mod.ts b/src/deno/mod.ts
index 492dd43..2adeac4 100644
--- a/src/deno/mod.ts
+++ b/src/deno/mod.ts
@@ -105,11 +105,6 @@ async function createPlugin(
   }
 }
 
-export {
-  createPlugin,
-  ExtismPlugin,
-  CurrentPlugin,
-  ExtismPluginOptions
-}
+export default createPlugin;
 
-export type { Manifest, ManifestWasm, ManifestWasmData, ManifestWasmFile, ManifestWasmUrl };
+export type { ExtismPlugin, CurrentPlugin, ExtismPluginOptions, Manifest, ManifestWasm, ManifestWasmData, ManifestWasmFile, ManifestWasmUrl };
diff --git a/src/node/index.ts b/src/node/index.ts
index 1420a47..48b3343 100644
--- a/src/node/index.ts
+++ b/src/node/index.ts
@@ -134,11 +134,6 @@ async function createPlugin(
   }
 }
 
-export {
-  createPlugin,
-  ExtismPlugin,
-  CurrentPlugin,
-  ExtismPluginOptions,
-}
+export { createPlugin };
 
-export type { Manifest, ManifestWasm, ManifestWasmData, ManifestWasmFile, ManifestWasmUrl };
\ No newline at end of file
+export type { ExtismPlugin, CurrentPlugin, ExtismPluginOptions, Manifest, ManifestWasm, ManifestWasmData, ManifestWasmFile, ManifestWasmUrl };
\ No newline at end of file
diff --git a/src/plugin.ts b/src/plugin.ts
index 170851f..fabc096 100644
--- a/src/plugin.ts
+++ b/src/plugin.ts
@@ -224,7 +224,7 @@ export abstract class ExtismPluginBase {
         // The actual code starts here
         const url = new URL(request.url);
         let hostMatches = false;
-        for (const allowedHost of plugin.options.allowedHosts) {
+        for (const allowedHost of (plugin.options.allowedHosts ?? [])) {
           if (allowedHost === url.hostname) {
             hostMatches = true;
             break;
@@ -334,123 +334,14 @@ export type Manifest = {
 
 /**
  * Options for initializing an Extism plugin.
- *
- * @class ExtismPluginOptions
  */
-export class ExtismPluginOptions {
-  useWasi: boolean;
-  runtime: ManifestWasm | null;
-  functions: { [key: string]: { [key: string]: any } };
-  allowedPaths: { [key: string]: string };
-  allowedHosts: string[];
-  config: PluginConfig;
-
-  constructor() {
-    this.useWasi = false;
-    this.functions = {};
-    this.runtime = null;
-    this.allowedPaths = {};
-    this.config = {};
-    this.allowedHosts = [];
-  }
-
-  /**
-   * Enable/Disable WASI.
-   */
-  withWasi(value: boolean = true) {
-    this.useWasi = value;
-    return this;
-  }
-
-  /**
-   * Overrides the Extism Runtime.
-   * @param runtime A Wasm source.
-   * @returns ExtismPluginOptions
-   */
-  withRuntime(runtime: ManifestWasm) {
-    this.runtime = runtime;
-    return this;
-  }
-
-  /**
-   * Adds or updates a host function under a specified module name.
-   * @param {string} moduleName - The name of the module.
-   * @param {string} funcName - The name of the function.
-   * @param {any} func - The host function callback.
-   * @returns {this} Returns the current instance for chaining.
-   */
-  withFunction(moduleName: string, funcName: string, func: any) {
-    const x = this.functions[moduleName] ?? {};
-
-    x[funcName] = func;
-    this.functions[moduleName] = x;
-
-    return this;
-  }
-
-  /**
-   * Adds or updates an allowed path.
-   * If WASI is enabled, the plugin will have access to all allowed paths.
-   * @param {string} dest - The destination path.
-   * @param {string|null} src - The source path. Defaults to the destination if null.
-   * @returns {this} Returns the current instance for chaining.
-   */
-  withAllowedPath(dest: string, src: string | null) {
-    this.allowedPaths[dest] = src || dest;
-    return this;
-  }
-
-  /**
-   * Sets a configuration value that's accessible to the plugin.
-   * The plugin can't change configuration values.
-   * @param {string} key - The configuration key.
-   * @param {string} value - The configuration value.
-   * @returns {this} Returns the current instance for chaining.
-   */
-  withConfig(key: string, value: string) {
-    this.config[key] = value;
-
-    return this;
-  }
-
-  /**
-   * Sets multiple configuration values.
-   * @param {{ [key: string]: string }} configs - An object containing configuration key-value pairs.
-   * @returns {this} Returns the current instance for chaining.
-   */
-  withConfigs(configs: { [key: string]: string }) {
-    for (let key in configs) {
-      this.config[key] = configs[key];
-    }
-
-    return this;
-  }
-
-  /**
-   * Adds a host pattern to the allowed hosts list.
-   * The plugin will be able to make HTTP requests to all allowed hosts.
-   * By default, all hosts are denied.
-   * @param {string} pattern - The host pattern to allow.
-   * @returns {this} Returns the current instance for chaining.
-   */
-  withAllowedHost(pattern: string) {
-    this.allowedHosts.push(pattern.trim());
-
-    return this;
-  }
-
-  /**
-   * Adds multiple host patterns to the allowed hosts list.
-   * @param {string[]} patterns - An array of host patterns to allow.
-   * @returns {this} Returns the current instance for chaining.
-   */
-  withAllowedHosts(patterns: string[]) {
-    for (const pattern of patterns) {
-      this.withAllowedHost(pattern);
-    }
-
-    return this;
-  }
+export interface ExtismPluginOptions {
+  useWasi?: boolean | undefined;
+  runtime?: ManifestWasm | undefined;
+  functions?: { [key: string]: { [key: string]: any } } | undefined;
+  allowedPaths?: { [key: string]: string } | undefined;
+  allowedHosts?: string[] | undefined;
+  config?: PluginConfig | undefined;
 }
 
 /**
diff --git a/tests/index.test.ts b/tests/index.test.ts
index 657b6c7..408e047 100644
--- a/tests/index.test.ts
+++ b/tests/index.test.ts
@@ -4,17 +4,18 @@ import { CurrentPlugin } from '../src/plugin';
 async function newPlugin(
   moduleName: string | Manifest | ManifestWasm | Buffer,
   optionsConfig?: (opts: ExtismPluginOptions) => void): Promise<ExtismPlugin> {
-  let options = new ExtismPluginOptions()
-    .withRuntime({
+  const options: ExtismPluginOptions = {
+    useWasi: true,
+    runtime: {
       path: 'wasm/extism-runtime.wasm',
-    })
-    .withWasi();
+    },
+  }
 
   if (optionsConfig) {
     optionsConfig(options);
   }
 
-  let module : Manifest | ManifestWasm | Buffer;
+  let module: Manifest | ManifestWasm | Buffer;
   if (typeof moduleName == 'string') {
     module = {
       path: `wasm/${moduleName}`,
@@ -51,14 +52,14 @@ describe('test extism', () => {
   });
 
   test('can use embedded runtime', async () => {
-    const options = new ExtismPluginOptions().withWasi();
-
     let module = {
       path: `wasm/code.wasm`,
     };
-  
-    const plugin = await createPlugin(module, options);
-  
+
+    const plugin = await createPlugin(module, {
+      useWasi: true
+    });
+
     let output = await plugin.call('count_vowels', 'this is a test');
 
     let result = JSON.parse(decode(output));
@@ -105,12 +106,15 @@ describe('test extism', () => {
 
   test('host functions works', async () => {
     const plugin = await newPlugin('code-functions.wasm', options => {
-      options.withFunction("env", "hello_world", function (this: CurrentPlugin, off: bigint) {
-        let result = JSON.parse(this.readString(off) ?? "");
-        result['message'] = "hello from host!";
-
-        return this.writeString(JSON.stringify(result));
-      });
+      options.functions = {
+        "env": {
+          "hello_world": function (this: CurrentPlugin, off: bigint) {
+            const result = JSON.parse(this.readString(off) ?? '');
+            result['message'] = 'hello from host!';
+            return plugin.currentPlugin.writeString(JSON.stringify(result));
+          }
+        }
+      }
     });
 
     const output = await plugin.call('count_vowels', 'aaa');
@@ -129,12 +133,12 @@ describe('test extism', () => {
 
   test('can allow http requests', async () => {
     const plugin = await newPlugin('http.wasm', options => {
-      options.withAllowedHost("*.typicode.com");
+      options.allowedHosts = ['*.typicode.com'];
     });
-    
+
     const output = await plugin.call("run_test", "");
     const result = JSON.parse(decode(output));
-    
+
     expect(result.id).toBe(1);
   });
 
@@ -143,51 +147,51 @@ describe('test extism', () => {
     console.warn = jest.fn();
     console.error = jest.fn();
     console.debug = jest.fn();
-    
+
     const plugin = await newPlugin('log.wasm', options => {
-      options.withAllowedHost("*.typicode.com");
+      options.allowedHosts = ['*.typicode.com'];
     });
-    
+
     const _ = await plugin.call("run_test", "");
-    
+
     expect(console.log).toHaveBeenCalledWith("this is an info log");
     expect(console.warn).toHaveBeenCalledWith("this is a warning log");
     expect(console.error).toHaveBeenCalledWith("this is an erorr log");
     expect(console.debug).toHaveBeenCalledWith("this is a debug log");
   });
-  
+
   test('can initialize haskell runtime', async () => {
     console.trace = jest.fn();
-    
+
     const plugin = await newPlugin('hello_haskell.wasm', options => {
-      options.withConfig("greeting", "Howdy");
+      options.config = { 'greeting': 'Howdy' };
     });
-    
+
     {
       const output = await plugin.call("testing", "John");
       const result = decode(output);
-      
+
       expect(result).toBe("Howdy, John")
     }
-    
+
     {
       const output = await plugin.call("testing", "Ben");
       const result = decode(output);
-      
+
       expect(result).toBe("Howdy, Ben")
     }
-    
+
     expect(console.debug).toHaveBeenCalledWith("Haskell (normal) runtime detected.");
   });
 
   test('can read file', async () => {
     const plugin = await newPlugin('fs.wasm', options => {
-      options.withAllowedPath("/mnt", "tests/data")
+      options.allowedPaths = { '/mnt': 'tests/data' };
     });
-  
+
     const output = await plugin.call("run_test", "");
     const result = decode(output);
-  
+
     expect(result).toBe("hello world!");
   });
 });
diff --git a/tests/mod.test.ts b/tests/mod.test.ts
index fe297fa..e9362c5 100644
--- a/tests/mod.test.ts
+++ b/tests/mod.test.ts
@@ -1,17 +1,18 @@
 import { assertEquals, assertRejects } from 'https://deno.land/std@0.200.0/assert/mod.ts';
 import { assertSpyCalls, spy } from 'https://deno.land/std@0.200.0/testing/mock.ts';
-import { createPlugin, ExtismPlugin, ExtismPluginOptions, Manifest, ManifestWasm } from '../src/deno/mod.ts';
-import { CurrentPlugin } from "../src/plugin.ts";
+import createPlugin, { CurrentPlugin, ExtismPlugin, ExtismPluginOptions, Manifest, ManifestWasm } from '../src/deno/mod.ts';
 
 async function newPlugin(
   moduleName: string | Manifest | ManifestWasm,
   optionsConfig?: (opts: ExtismPluginOptions) => void,
 ): Promise<ExtismPlugin> {
-  const options = new ExtismPluginOptions()
-    .withRuntime({
+
+  const options: ExtismPluginOptions = {
+    useWasi: true,
+    runtime: {
       path: 'wasm/extism-runtime.wasm',
-    })
-    .withWasi();
+    },
+  }
 
   if (optionsConfig) {
     optionsConfig(options);
@@ -57,13 +58,13 @@ Deno.test('fails on hash mismatch', async () => {
 });
 
 Deno.test('can use embedded runtime', async () => {
-  const options = new ExtismPluginOptions().withWasi();
-
   let module = {
     path: `wasm/code.wasm`,
   };
 
-  const plugin = await createPlugin(module, options);
+  const plugin = await createPlugin(module, {
+    useWasi: true
+  });
 
   let output = await plugin.call('count_vowels', 'this is a test');
   let result = JSON.parse(decode(output));
@@ -108,11 +109,15 @@ Deno.test('errors when function is not known', async () => {
 
 Deno.test('host functions works', async () => {
   const plugin = await newPlugin('code-functions.wasm', (options) => {
-    options.withFunction('env', 'hello_world', function (this: CurrentPlugin, off: bigint) {
-      const result = JSON.parse(this.readString(off) ?? '');
-      result['message'] = 'hello from host!';
-      return plugin.currentPlugin.writeString(JSON.stringify(result));
-    });
+    options.functions = {
+      "env": {
+        "hello_world": function (this: CurrentPlugin, off: bigint) {
+          const result = JSON.parse(this.readString(off) ?? '');
+          result['message'] = 'hello from host!';
+          return plugin.currentPlugin.writeString(JSON.stringify(result));
+        }
+      }
+    }
   });
 
   const output = await plugin.call('count_vowels', 'aaa');
@@ -143,7 +148,7 @@ Deno.test('can deny http requests', async () => {
 
 Deno.test('can allow http requests', async () => {
   const plugin = await newPlugin('http.wasm', (options) => {
-    options.withAllowedHost('*.typicode.com');
+    options.allowedHosts = ['*.typicode.com'];
   });
 
   // http is not supported in Deno
@@ -174,7 +179,7 @@ Deno.test('can log messages', async () => {
 
 Deno.test('can initialize Haskell runtime', async () => {
   const plugin = await newPlugin('hello_haskell.wasm', (options) => {
-    options.withConfig('greeting', 'Howdy');
+    options.config = { 'greeting': 'Howdy' };
   });
 
   let output = await plugin.call('testing', 'John');
@@ -188,7 +193,7 @@ Deno.test('can initialize Haskell runtime', async () => {
 
 Deno.test('can access fs', async () => {
   const plugin = await newPlugin('fs.wasm', (options) => {
-    options.withAllowedPath('/mnt', 'tests/data');
+    options.allowedPaths = { '/mnt': 'tests/data' };
   });
 
   const output = await plugin.call('run_test', '');

From 2d18ba3a90dd7bbb1dda7b3df2bb2c636855b2af Mon Sep 17 00:00:00 2001
From: Muhammad Azeez <muhammad@dylibso.com>
Date: Sun, 8 Oct 2023 15:41:13 +0300
Subject: [PATCH 08/18] pass in CurrentPlugin to the first argument

---
 README.md           | 13 +++---
 src/plugin.ts       | 96 ++++++++++++++++++++++-----------------------
 tests/index.test.ts |  4 +-
 tests/mod.test.ts   |  4 +-
 4 files changed, 59 insertions(+), 58 deletions(-)

diff --git a/README.md b/README.md
index a08e19f..a38166b 100644
--- a/README.md
+++ b/README.md
@@ -137,15 +137,16 @@ const options = {
     useWasi: true,
     functions: {
         "env": {
-            "kv_read": function (offs) { // this: CurrentPlugin
-                const key = this.readString(offs);
+            // NOTE: the first argument is always a CurrentPlugin
+            "kv_read": function (cp: CurrentPlugin, offs: bigint) {
+                const key = cp.readString(offs);
                 let value = kvStore.get(key) ?? new Uint8Array([0, 0, 0, 0]);
                 console.log(`Read ${new DataView(value.buffer).getUint32(0, true)} from key=${key}`);
-                return this.writeBytes(value);
+                return cp.writeBytes(value);
             },
-            "kv_write": function (kOffs, vOffs) { // this: CurrentPlugin
-                const key = this.readString(kOffs);
-                const value = this.readBytes(vOffs);
+            "kv_write": function (cp: CurrentPlugin, kOffs: bigint, vOffs: bigint) { // this: CurrentPlugin
+                const key = cp.readString(kOffs);
+                const value = cp.readBytes(vOffs);
                 console.log(`Writing value=${new DataView(value.buffer).getUint32(0, true)} from key=${key}`);
 
                 kvStore.set(key, value);
diff --git a/src/plugin.ts b/src/plugin.ts
index fabc096..09d5cd6 100644
--- a/src/plugin.ts
+++ b/src/plugin.ts
@@ -114,7 +114,7 @@ export abstract class ExtismPluginBase {
       }
 
       for (const f in imports[m]) {
-        imports[m][f] = imports[m][f].bind(this.currentPlugin);
+        imports[m][f] = imports[m][f].bind(null, this.currentPlugin);
       }
     }
 
@@ -132,50 +132,50 @@ export abstract class ExtismPluginBase {
   private makeEnv(): any {
     let plugin = this;
     var env: any = {
-      extism_alloc(this: CurrentPlugin, n: bigint): bigint {
-        const response = this.alloc(n);
+      extism_alloc(cp: CurrentPlugin, n: bigint): bigint {
+        const response = cp.alloc(n);
         return response;
       },
-      extism_free(this: CurrentPlugin, n: bigint) {
-        this.free(n);
+      extism_free(cp: CurrentPlugin, n: bigint) {
+        cp.free(n);
       },
-      extism_load_u8(this: CurrentPlugin, n: bigint): number {
-        return this.getMemoryBuffer()[Number(n)];
+      extism_load_u8(cp: CurrentPlugin, n: bigint): number {
+        return cp.getMemoryBuffer()[Number(n)];
       },
-      extism_load_u64(this: CurrentPlugin, n: bigint): bigint {
-        let cast = new DataView(this.getMemory().buffer, Number(n));
+      extism_load_u64(cp: CurrentPlugin, n: bigint): bigint {
+        let cast = new DataView(cp.getMemory().buffer, Number(n));
         return cast.getBigUint64(0, true);
       },
-      extism_store_u8(this: CurrentPlugin, offset: bigint, n: number) {
-        this.getMemoryBuffer()[Number(offset)] = Number(n);
+      extism_store_u8(cp: CurrentPlugin, offset: bigint, n: number) {
+        cp.getMemoryBuffer()[Number(offset)] = Number(n);
       },
-      extism_store_u64(this: CurrentPlugin, offset: bigint, n: bigint) {
-        const tmp = new DataView(this.getMemory().buffer, Number(offset));
+      extism_store_u64(cp: CurrentPlugin, offset: bigint, n: bigint) {
+        const tmp = new DataView(cp.getMemory().buffer, Number(offset));
         tmp.setBigUint64(0, n, true);
       },
       extism_input_length(): bigint {
         return BigInt(plugin.input.length);
       },
-      extism_input_load_u8(i: bigint): number {
+      extism_input_load_u8(cp: CurrentPlugin, i: bigint): number {
         return plugin.input[Number(i)];
       },
-      extism_input_load_u64(idx: bigint): bigint {
+      extism_input_load_u64(cp: CurrentPlugin, idx: bigint): bigint {
         let cast = new DataView(plugin.input.buffer, Number(idx));
         return cast.getBigUint64(0, true);
       },
-      extism_output_set(this: CurrentPlugin, offset: bigint, length: bigint) {
+      extism_output_set(cp: CurrentPlugin, offset: bigint, length: bigint) {
         const offs = Number(offset);
         const len = Number(length);
-        plugin.output = this.getMemoryBuffer().slice(offs, offs + len);
+        plugin.output = cp.getMemoryBuffer().slice(offs, offs + len);
       },
-      extism_error_set(this: CurrentPlugin, i: bigint) {
-        throw new Error(`Call error: ${this.readString(i)}`);
+      extism_error_set(cp: CurrentPlugin, i: bigint) {
+        throw new Error(`Call error: ${cp.readString(i)}`);
       },
-      extism_config_get(this: CurrentPlugin, i: bigint): bigint {
+      extism_config_get(cp: CurrentPlugin, i: bigint): bigint {
         if (typeof plugin.options.config === 'undefined') {
           return BigInt(0);
         }
-        const key = this.readString(i);
+        const key = cp.readString(i);
         if (key === null) {
           return BigInt(0);
         }
@@ -183,38 +183,38 @@ export abstract class ExtismPluginBase {
         if (typeof value === 'undefined') {
           return BigInt(0);
         }
-        return this.writeString(value);
+        return cp.writeString(value);
       },
-      extism_var_get(this: CurrentPlugin, i: bigint): bigint {
-        const key = this.readString(i);
+      extism_var_get(cp: CurrentPlugin, i: bigint): bigint {
+        const key = cp.readString(i);
         if (key === null) {
           return BigInt(0);
         }
-        const value = this.vars[key];
+        const value = cp.vars[key];
         if (typeof value === 'undefined') {
           return BigInt(0);
         }
-        return this.writeBytes(value);
+        return cp.writeBytes(value);
       },
-      extism_var_set(this: CurrentPlugin, n: bigint, i: bigint) {
-        const key = this.readString(n);
+      extism_var_set(cp: CurrentPlugin, n: bigint, i: bigint) {
+        const key = cp.readString(n);
         if (key === null) {
           return;
         }
-        const value = this.readBytes(i);
+        const value = cp.readBytes(i);
         if (value === null) {
           return;
         }
-        this.vars[key] = value;
+        cp.vars[key] = value;
       },
-      extism_http_request(this: CurrentPlugin, requestOffset: bigint, bodyOffset: bigint): bigint {
+      extism_http_request(cp: CurrentPlugin, requestOffset: bigint, bodyOffset: bigint): bigint {
         if (!plugin.supportsHttpRequests()) {
-          this.free(bodyOffset);
-          this.free(requestOffset);
+          cp.free(bodyOffset);
+          cp.free(requestOffset);
           throw new Error('Call error: http requests are not supported.');
         }
 
-        const requestJson = this.readString(requestOffset);
+        const requestJson = cp.readString(requestOffset);
         if (requestJson == null) {
           throw new Error('Call error: Invalid request.');
         }
@@ -243,37 +243,37 @@ export abstract class ExtismPluginBase {
         }
 
         // TODO: limit number of bytes read to 50 MiB
-        const body = this.readBytes(bodyOffset);
-        this.free(bodyOffset);
-        this.free(requestOffset);
+        const body = cp.readBytes(bodyOffset);
+        cp.free(bodyOffset);
+        cp.free(requestOffset);
 
         const response = plugin.httpRequest(request, body);
         plugin.lastStatusCode = response.status;
 
-        const offset = this.writeBytes(response.body);
+        const offset = cp.writeBytes(response.body);
 
         return offset;
       },
       extism_http_status_code(): number {
         return plugin.lastStatusCode;
       },
-      extism_length(this: CurrentPlugin, i: bigint): bigint {
-        return this.getLength(i);
+      extism_length(cp: CurrentPlugin, i: bigint): bigint {
+        return cp.getLength(i);
       },
-      extism_log_warn(this: CurrentPlugin, i: bigint) {
-        const s = this.readString(i);
+      extism_log_warn(cp: CurrentPlugin, i: bigint) {
+        const s = cp.readString(i);
         console.warn(s);
       },
-      extism_log_info(this: CurrentPlugin, i: bigint) {
-        const s = this.readString(i);
+      extism_log_info(cp: CurrentPlugin, i: bigint) {
+        const s = cp.readString(i);
         console.log(s);
       },
-      extism_log_debug(this: CurrentPlugin, i: bigint) {
-        const s = this.readString(i);
+      extism_log_debug(cp: CurrentPlugin, i: bigint) {
+        const s = cp.readString(i);
         console.debug(s);
       },
-      extism_log_error(this: CurrentPlugin, i: bigint) {
-        const s = this.readString(i);
+      extism_log_error(cp: CurrentPlugin, i: bigint) {
+        const s = cp.readString(i);
         console.error(s);
       },
     };
diff --git a/tests/index.test.ts b/tests/index.test.ts
index 408e047..02a4fa7 100644
--- a/tests/index.test.ts
+++ b/tests/index.test.ts
@@ -108,8 +108,8 @@ describe('test extism', () => {
     const plugin = await newPlugin('code-functions.wasm', options => {
       options.functions = {
         "env": {
-          "hello_world": function (this: CurrentPlugin, off: bigint) {
-            const result = JSON.parse(this.readString(off) ?? '');
+          "hello_world": function (cp: CurrentPlugin, off: bigint) {
+            const result = JSON.parse(cp.readString(off) ?? '');
             result['message'] = 'hello from host!';
             return plugin.currentPlugin.writeString(JSON.stringify(result));
           }
diff --git a/tests/mod.test.ts b/tests/mod.test.ts
index e9362c5..79a336e 100644
--- a/tests/mod.test.ts
+++ b/tests/mod.test.ts
@@ -111,8 +111,8 @@ Deno.test('host functions works', async () => {
   const plugin = await newPlugin('code-functions.wasm', (options) => {
     options.functions = {
       "env": {
-        "hello_world": function (this: CurrentPlugin, off: bigint) {
-          const result = JSON.parse(this.readString(off) ?? '');
+        "hello_world": function (cp: CurrentPlugin, off: bigint) {
+          const result = JSON.parse(cp.readString(off) ?? '');
           result['message'] = 'hello from host!';
           return plugin.currentPlugin.writeString(JSON.stringify(result));
         }

From 9b208b143dae92aea78619befa2bf48b6a32840c Mon Sep 17 00:00:00 2001
From: Muhammad Azeez <muhammad@dylibso.com>
Date: Sun, 8 Oct 2023 18:32:45 +0300
Subject: [PATCH 09/18] don't use syncfetch in fetchWasm

---
 package-lock.json | 1 +
 package.json      | 1 +
 src/node/index.ts | 7 ++++---
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f5e0534..e5e959b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,6 +13,7 @@
         "cross-env": "^7.0.3",
         "crypto": "^1.0.1",
         "minimatch": "^9.0.3",
+        "node-fetch": "^2.7.0",
         "sync-fetch": "^0.5.2"
       },
       "devDependencies": {
diff --git a/package.json b/package.json
index 16946f3..e22e5c8 100644
--- a/package.json
+++ b/package.json
@@ -53,6 +53,7 @@
     "cross-env": "^7.0.3",
     "crypto": "^1.0.1",
     "minimatch": "^9.0.3",
+    "node-fetch": "^2.7.0",
     "sync-fetch": "^0.5.2"
   }
 }
diff --git a/src/node/index.ts b/src/node/index.ts
index 48b3343..805ea7f 100644
--- a/src/node/index.ts
+++ b/src/node/index.ts
@@ -18,7 +18,8 @@ import {
 import { WASI } from 'wasi';
 import { readFile } from 'fs';
 import { promisify } from 'util';
-import fetch from 'sync-fetch';
+import syncFetch from 'sync-fetch';
+import fetchPolyfill from 'node-fetch';
 import { minimatch } from 'minimatch';
 import { createHash } from 'crypto';
 
@@ -40,7 +41,7 @@ class ExtismPlugin extends ExtismPluginBase {
       b = undefined;
     }
 
-    const response = fetch(request.url, {
+    const response = syncFetch(request.url, {
       headers: request.headers,
       method: request.method,
       body: b,
@@ -113,7 +114,7 @@ async function createPlugin(
 
       data = await readFileAsync((wasm as ManifestWasmFile).path);
     } else if ((wasm as ManifestWasmUrl).url) {
-      const response = await fetch((wasm as ManifestWasmUrl).url);
+      const response = await fetchPolyfill((wasm as ManifestWasmUrl).url);
       data = await response.arrayBuffer();
     } else {
       throw new Error(`Unrecognized wasm source: ${wasm}`);

From 2e5bca7eb5b17d3f99b8e970ac8bc43058df0ab2 Mon Sep 17 00:00:00 2001
From: Muhammad Azeez <muhammad@dylibso.com>
Date: Sun, 8 Oct 2023 20:16:16 +0300
Subject: [PATCH 10/18] use WebAssembly.instantiateStreaming when possible

---
 src/browser/index.ts | 16 ++++++-------
 src/deno/mod.ts      | 12 +++++-----
 src/node/index.ts    | 22 ++++++++++--------
 src/plugin.ts        | 54 ++++++++++++++++++++++++++++++++++++--------
 tests/index.test.ts  | 13 ++++++++---
 5 files changed, 80 insertions(+), 37 deletions(-)

diff --git a/src/browser/index.ts b/src/browser/index.ts
index fbdd0c7..1a1c7ad 100644
--- a/src/browser/index.ts
+++ b/src/browser/index.ts
@@ -13,7 +13,8 @@ import {
   HttpResponse,
   embeddedRuntime,
   embeddedRuntimeHash,
-  CurrentPlugin
+  CurrentPlugin,
+  StreamingSource,
 } from '../plugin';
 
 import { WASI, Fd, File, OpenFile } from '@bjorn3/browser_wasi_shim';
@@ -88,7 +89,7 @@ class ExtismPlugin extends ExtismPluginBase {
     const wrapper = {
       exports: {
         memory: instance.exports.memory as WebAssembly.Memory,
-        _start() {},
+        _start() { },
       },
     };
 
@@ -125,14 +126,14 @@ async function createPlugin(
     const binaryString = window.atob(base64);
     const len = binaryString.length;
     const bytes = new Uint8Array(len);
-  
+
     for (let i = 0; i < len; i++) {
       bytes[i] = binaryString.charCodeAt(i);
     }
-  
+
     return bytes;
   }
-  
+
   async function calculateHash(data: ArrayBuffer) {
     const hashBuffer = await crypto.subtle.digest('SHA-256', data);
     const hashArray = Array.from(new Uint8Array(hashBuffer));
@@ -140,7 +141,7 @@ async function createPlugin(
     return hashHex;
   }
 
-  async function fetchWasm(wasm: ManifestWasm): Promise<ArrayBuffer> {
+  async function fetchWasm(wasm: ManifestWasm): Promise<StreamingSource> {
     let data: ArrayBuffer;
 
     if ((wasm as ManifestWasmData).data) {
@@ -148,8 +149,7 @@ async function createPlugin(
     } else if ((wasm as ManifestWasmFile).path) {
       throw new Error(`Unsupported wasm source: ${wasm}`);
     } else if ((wasm as ManifestWasmUrl).url) {
-      const response = await fetch((wasm as ManifestWasmUrl).url);
-      data = await response.arrayBuffer();
+      return await fetch((wasm as ManifestWasmUrl).url);
     } else {
       throw new Error(`Unrecognized wasm source: ${wasm}`);
     }
diff --git a/src/deno/mod.ts b/src/deno/mod.ts
index 2adeac4..74061cc 100644
--- a/src/deno/mod.ts
+++ b/src/deno/mod.ts
@@ -13,7 +13,8 @@ import {
   HttpResponse,
   embeddedRuntime,
   embeddedRuntimeHash,
-  CurrentPlugin
+  CurrentPlugin,
+  StreamingSource
 } from '../plugin.ts';
 import Context from 'https://deno.land/std@0.200.0/wasi/snapshot_preview1.ts';
 import minimatch from 'https://deno.land/x/minimatch@v3.0.4/index.js';
@@ -51,7 +52,7 @@ class ExtismPlugin extends ExtismPluginBase {
     context.start({
       exports: {
         memory,
-        _start: () => {},
+        _start: () => { },
       },
     });
   }
@@ -78,8 +79,8 @@ async function createPlugin(
 
   return new ExtismPlugin(runtime, moduleData, options);
 
-  
-  async function fetchWasm(wasm: ManifestWasm): Promise<ArrayBuffer> {
+
+  async function fetchWasm(wasm: ManifestWasm): Promise<StreamingSource> {
     let data: ArrayBuffer;
 
     if ((wasm as ManifestWasmData).data) {
@@ -87,8 +88,7 @@ async function createPlugin(
     } else if ((wasm as ManifestWasmFile).path) {
       data = await Deno.readFile((wasm as ManifestWasmFile).path);
     } else if ((wasm as ManifestWasmUrl).url) {
-      const response = await fetch((wasm as ManifestWasmUrl).url);
-      data = await response.arrayBuffer();
+      return await fetch((wasm as ManifestWasmUrl).url);
     } else {
       throw new Error(`Unrecognized wasm source: ${wasm}`);
     }
diff --git a/src/node/index.ts b/src/node/index.ts
index 805ea7f..4959fc5 100644
--- a/src/node/index.ts
+++ b/src/node/index.ts
@@ -14,6 +14,7 @@ import {
   embeddedRuntime,
   embeddedRuntimeHash,
   CurrentPlugin,
+  StreamingSource,
 } from '../plugin';
 import { WASI } from 'wasi';
 import { readFile } from 'fs';
@@ -104,23 +105,24 @@ async function createPlugin(
 
   return new ExtismPlugin(runtime, moduleData, options);
 
-  async function fetchWasm(wasm: ManifestWasm): Promise<ArrayBuffer> {
-    let data: ArrayBuffer;
-
+  async function fetchWasm(wasm: ManifestWasm): Promise<StreamingSource> {
     if ((wasm as ManifestWasmData).data) {
-      data = (wasm as ManifestWasmData).data;
+      return Promise.resolve((wasm as ManifestWasmData).data);
     } else if ((wasm as ManifestWasmFile).path) {
       const readFileAsync = (path: string) => promisify(readFile)(path);
-
-      data = await readFileAsync((wasm as ManifestWasmFile).path);
+      const buffer = await readFileAsync((wasm as ManifestWasmFile).path);
+      const array = new Uint8Array(buffer);
+      return array.buffer.slice(array.byteOffset, array.byteOffset + array.byteLength);
     } else if ((wasm as ManifestWasmUrl).url) {
-      const response = await fetchPolyfill((wasm as ManifestWasmUrl).url);
-      data = await response.arrayBuffer();
+      //@ts-ignore
+      if (WebAssembly.instantiateStreaming && fetch) {
+        return await fetch((wasm as ManifestWasmUrl).url);
+      } else {
+        return await fetchPolyfill((wasm as ManifestWasmUrl).url).then(response => response.arrayBuffer())
+      }
     } else {
       throw new Error(`Unrecognized wasm source: ${wasm}`);
     }
-
-    return data;
   }
 
   async function calculateHash(data: ArrayBuffer) {
diff --git a/src/plugin.ts b/src/plugin.ts
index 09d5cd6..48b5598 100644
--- a/src/plugin.ts
+++ b/src/plugin.ts
@@ -1,5 +1,5 @@
 export abstract class ExtismPluginBase {
-  moduleData: ArrayBuffer;
+  moduleData: ArrayBuffer | Response | PromiseLike<Response>;
   currentPlugin: CurrentPlugin;
   input: Uint8Array;
   output: Uint8Array;
@@ -8,7 +8,7 @@ export abstract class ExtismPluginBase {
   lastStatusCode: number = 0;
   guestRuntime: GuestRuntime;
 
-  constructor(extism: WebAssembly.Instance, moduleData: ArrayBuffer, options: ExtismPluginOptions) {
+  constructor(extism: WebAssembly.Instance, moduleData: ArrayBuffer | Response | PromiseLike<Response>, options: ExtismPluginOptions) {
     this.moduleData = moduleData;
     this.currentPlugin = new CurrentPlugin(this, extism);
     this.input = new Uint8Array();
@@ -118,7 +118,11 @@ export abstract class ExtismPluginBase {
       }
     }
 
-    this.module = await WebAssembly.instantiate(this.moduleData, imports);
+    if (this.moduleData instanceof ArrayBuffer || ArrayBuffer.isView(this.moduleData)) {
+      this.module = await WebAssembly.instantiate(this.moduleData, imports);
+    } else {
+      this.module = await WebAssembly.instantiateStreaming(this.moduleData, imports);
+    }
 
     if (this.module.instance.exports._start) {
       pluginWasi?.initialize(this.module.instance);
@@ -379,12 +383,14 @@ type GuestRuntime = {
   type: GuestRuntimeType;
 };
 
+export type StreamingSource = ArrayBuffer | Response
+
 export async function fetchModuleData(
   manifestData: Manifest | ManifestWasm | ArrayBuffer,
-  fetchWasm: (wasm: ManifestWasm) => Promise<ArrayBuffer>,
+  fetchWasm: (wasm: ManifestWasm) => Promise<StreamingSource>,
   calculateHash: (buffer: ArrayBuffer) => Promise<string>,
 ) {
-  let moduleData: ArrayBuffer | null = null;
+  let moduleData: StreamingSource | null = null;
 
   if (manifestData instanceof ArrayBuffer) {
     moduleData = manifestData;
@@ -401,12 +407,35 @@ export async function fetchModuleData(
   ) {
     moduleData = await fetchWasm(manifestData as ManifestWasm);
 
+    if (moduleData instanceof Response) {
+      // HACK: WebAssembly.instantiateStreaming only works when the content-type is application/wasm
+      // This can be problematic because a lot of object storages store the content-type as application/octet-stream by default
+      if (moduleData.headers.get('Content-Type') != 'application/wasm') {
+        const headers = new Headers(moduleData.headers);
+        headers.set('Content-Type', 'application/wasm');
+
+        moduleData = new Response(moduleData.body, {
+          status: moduleData.status,
+          statusText: moduleData.statusText,
+          headers: headers,
+        })
+      }
+    }
+
     const expected = (manifestData as ManifestWasm).hash;
 
     if (expected) {
-      const actual = await calculateHash(moduleData);
+      let actual: string;
+      if (moduleData instanceof ArrayBuffer || moduleData instanceof Uint8Array) {
+        actual = await calculateHash(moduleData);
+      } else {
+        // Download the content to check its hash
+        moduleData = await moduleData.arrayBuffer();
+        actual = await calculateHash(moduleData);
+      }
+
       if (actual != expected) {
-        throw new Error('Plugin error: hash mismatch');
+        throw new Error(`Plugin error: hash mismatch. Expected: ${expected}. Actual: ${actual}`);
       }
     }
   }
@@ -474,7 +503,7 @@ function detectGuestRuntime(module: WebAssembly.Instance): GuestRuntime {
 
 export async function instantiateExtismRuntime(
   runtime: ManifestWasm | null,
-  fetchWasm: (wasm: ManifestWasm) => Promise<ArrayBuffer>,
+  fetchWasm: (wasm: ManifestWasm) => Promise<StreamingSource>,
   calculateHash: (buffer: ArrayBuffer) => Promise<string>,
 ): Promise<WebAssembly.Instance> {
   if (!runtime) {
@@ -482,8 +511,13 @@ export async function instantiateExtismRuntime(
   }
 
   const extismWasm = await fetchModuleData(runtime, fetchWasm, calculateHash);
-  const extismModule = new WebAssembly.Module(extismWasm);
-  const extismInstance = new WebAssembly.Instance(extismModule, {});
+
+  let extismInstance: WebAssembly.Instance;
+  if (extismWasm instanceof Response) {
+    extismInstance = (await WebAssembly.instantiateStreaming(extismWasm)).instance;
+  } else {
+    extismInstance = (await WebAssembly.instantiate(extismWasm)).instance;
+  }
 
   return extismInstance;
 }
diff --git a/tests/index.test.ts b/tests/index.test.ts
index 02a4fa7..070040b 100644
--- a/tests/index.test.ts
+++ b/tests/index.test.ts
@@ -1,5 +1,4 @@
-import { createPlugin, ExtismPlugin, ExtismPluginOptions, Manifest, ManifestWasm } from '../src/node/index';
-import { CurrentPlugin } from '../src/plugin';
+import { createPlugin, CurrentPlugin, ExtismPlugin, ExtismPluginOptions, Manifest, ManifestWasm } from '../src/node/index';
 
 async function newPlugin(
   moduleName: string | Manifest | ManifestWasm | Buffer,
@@ -34,7 +33,7 @@ function decode(buffer: Uint8Array) {
 }
 
 describe('test extism', () => {
-  test('can create plugin from url', async () => {
+  test('can create plugin from url with hash check', async () => {
     const plugin = await newPlugin({
       url: "https://raw.githubusercontent.com/extism/extism/main/wasm/code.wasm",
       hash: "7def5bb4aa3843a5daf5d6078f1e8540e5ef10b035a9d9387e9bd5156d2b2565"
@@ -43,6 +42,14 @@ describe('test extism', () => {
     expect(await plugin.functionExists('count_vowels')).toBe(true);
   });
 
+  test('can create plugin from url', async () => {
+    const plugin = await newPlugin({
+      url: "https://raw.githubusercontent.com/extism/extism/main/wasm/code.wasm",
+    });
+
+    expect(await plugin.functionExists('count_vowels')).toBe(true);
+  });
+
   test('fails on hash mismatch', async () => {
     await expect(newPlugin({
       path: "wasm/code.wasm",

From 9cd8bf57ae85bed9e7eea9c873f2f2b31e6329ef Mon Sep 17 00:00:00 2001
From: Muhammad Azeez <muhammad@dylibso.com>
Date: Thu, 12 Oct 2023 13:20:06 +0300
Subject: [PATCH 11/18] apply chris's suggestions

---
 src/plugin.ts | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/plugin.ts b/src/plugin.ts
index 48b5598..1d88e84 100644
--- a/src/plugin.ts
+++ b/src/plugin.ts
@@ -409,8 +409,9 @@ export async function fetchModuleData(
 
     if (moduleData instanceof Response) {
       // HACK: WebAssembly.instantiateStreaming only works when the content-type is application/wasm
-      // This can be problematic because a lot of object storages store the content-type as application/octet-stream by default
-      if (moduleData.headers.get('Content-Type') != 'application/wasm') {
+      // This can be problematic because a lot of object storages store the content-type
+      // as application/octet-stream by default
+      if (moduleData.headers.get('Content-Type') === 'application/octet-stream') {
         const headers = new Headers(moduleData.headers);
         headers.set('Content-Type', 'application/wasm');
 
@@ -557,7 +558,8 @@ export class CurrentPlugin {
     } else if (typeof value === 'number') {
       this.vars[name] = this.uintToLEBytes(value);
     } else {
-      throw new Error('Unsupported value type');
+      const typeName = (value as any)?.constructor.name || (value === null ? 'null' : typeof value);
+      throw new TypeError(`Invalid plugin variable type. Expected Uint8Array, string, or number, got ${typeName}`);
     }
   }
 
@@ -568,7 +570,7 @@ export class CurrentPlugin {
   getNumberVar(name: string): number {
     const value = this.getVar(name);
     if (value.length < 4) {
-      throw new Error(`Variable ${name} has incorrect length`);
+      throw new Error(`Variable "${name}" has incorrect length`);
     }
 
     return this.uintFromLEBytes(value);
@@ -585,15 +587,13 @@ export class CurrentPlugin {
 
   private uintToLEBytes(num: number): Uint8Array {
     const bytes = new Uint8Array(4);
-    bytes[0] = num & 0xff;
-    bytes[1] = (num >> 8) & 0xff;
-    bytes[2] = (num >> 16) & 0xff;
-    bytes[3] = (num >> 24) & 0xff;
+    new DataView(bytes.buffer).setUint32(0, num, true);
+
     return bytes;
   }
 
   private uintFromLEBytes(bytes: Uint8Array): number {
-    return bytes[0] | (bytes[1] << 8) | (bytes[2] << 16) | (bytes[3] << 24);
+    return new DataView(bytes.buffer).getUint32(0, true);
   }
 
   /**
@@ -601,7 +601,7 @@ export class CurrentPlugin {
    * @returns {void}
    */
   reset() {
-    return (this.#extism.exports.extism_reset as Function).call(undefined);
+    return (this.#extism.exports.extism_reset as Function)();
   }
 
   /**
@@ -610,7 +610,7 @@ export class CurrentPlugin {
    * @returns {bigint} Offset in the memory.
    */
   alloc(length: bigint): bigint {
-    return (this.#extism.exports.extism_alloc as Function).call(undefined, length);
+    return (this.#extism.exports.extism_alloc as Function)(length);
   }
 
   /**
@@ -689,11 +689,11 @@ export class CurrentPlugin {
    * @returns {bigint} Length of the memory block.
    */
   getLength(offset: bigint): bigint {
-    return (this.#extism.exports.extism_length as Function).call(undefined, offset);
+    return (this.#extism.exports.extism_length as Function)(offset);
   }
 
   inputLength(): bigint {
-    return (this.#extism.exports.extism_input_length as Function).call(undefined);
+    return (this.#extism.exports.extism_input_length as Function)();
   }
 
   /**
@@ -706,6 +706,6 @@ export class CurrentPlugin {
       return;
     }
 
-    (this.#extism.exports.extism_free as Function).call(undefined, offset);
+    (this.#extism.exports.extism_free as Function)(offset);
   }
 }
\ No newline at end of file

From 6c207afbb772a83c4fb8bf331723219efbb398a7 Mon Sep 17 00:00:00 2001
From: Muhammad Azeez <muhammad@dylibso.com>
Date: Thu, 12 Oct 2023 13:24:59 +0300
Subject: [PATCH 12/18] use default export in Node too

---
 README.md         | 2 +-
 examples/node.js  | 2 +-
 src/node/index.ts | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index a38166b..34f3193 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ This guide should walk you through some of the concepts in Extism and this JS li
 First you should import `createPlugin` and `ExtismPluginOptions` from Extism:
 ```js
 // CommonJS
-const { createPlugin } = require("../dist/node/index")
+const createPlugin = require("../dist/node/index")
 
 // ES Modules
 import createPlugin from '../src/deno/mod.ts'
diff --git a/examples/node.js b/examples/node.js
index 3c6935e..07fed23 100644
--- a/examples/node.js
+++ b/examples/node.js
@@ -1,4 +1,4 @@
-const { createPlugin } = require("../dist/node/index")
+const createPlugin = require("../dist/node/index").default;
 const { argv } = require("process");
 
 async function main() {
diff --git a/src/node/index.ts b/src/node/index.ts
index 4959fc5..035c6b9 100644
--- a/src/node/index.ts
+++ b/src/node/index.ts
@@ -137,6 +137,5 @@ async function createPlugin(
   }
 }
 
-export { createPlugin };
-
+export default createPlugin;
 export type { ExtismPlugin, CurrentPlugin, ExtismPluginOptions, Manifest, ManifestWasm, ManifestWasmData, ManifestWasmFile, ManifestWasmUrl };
\ No newline at end of file

From b4428bbc7e16fc0bbbbfa7d8ef8dc5bc0454080f Mon Sep 17 00:00:00 2001
From: Muhammad Azeez <muhammad@dylibso.com>
Date: Thu, 12 Oct 2023 14:23:50 +0300
Subject: [PATCH 13/18] unify ManifestWasmFile into ManifestWasmUrl

---
 src/browser/index.ts | 13 ++++++++-----
 src/deno/mod.ts      | 18 +++++++++++-------
 src/node/index.ts    | 32 +++++++++++++++++++++-----------
 src/plugin.ts        | 18 ++++++------------
 tests/index.test.ts  | 10 +++++-----
 tests/mod.test.ts    |  8 ++++----
 6 files changed, 55 insertions(+), 44 deletions(-)

diff --git a/src/browser/index.ts b/src/browser/index.ts
index 1a1c7ad..49bbae5 100644
--- a/src/browser/index.ts
+++ b/src/browser/index.ts
@@ -7,7 +7,6 @@ import {
   Manifest,
   ManifestWasm,
   ManifestWasmData,
-  ManifestWasmFile,
   ManifestWasmUrl,
   HttpRequest,
   HttpResponse,
@@ -15,6 +14,7 @@ import {
   embeddedRuntimeHash,
   CurrentPlugin,
   StreamingSource,
+  isURL,
 } from '../plugin';
 
 import { WASI, Fd, File, OpenFile } from '@bjorn3/browser_wasi_shim';
@@ -146,10 +146,13 @@ async function createPlugin(
 
     if ((wasm as ManifestWasmData).data) {
       data = (wasm as ManifestWasmData).data;
-    } else if ((wasm as ManifestWasmFile).path) {
-      throw new Error(`Unsupported wasm source: ${wasm}`);
     } else if ((wasm as ManifestWasmUrl).url) {
-      return await fetch((wasm as ManifestWasmUrl).url);
+      const url = (wasm as ManifestWasmUrl).url;
+      if (isURL(url)) {
+        return await fetch(url);
+      } else {
+        throw new Error("Local paths are not supported.");
+      }
     } else {
       throw new Error(`Unrecognized wasm source: ${wasm}`);
     }
@@ -164,4 +167,4 @@ if (window) {
 }
 
 export default createPlugin;
-export type { ExtismPlugin, CurrentPlugin, ExtismPluginOptions, Manifest, ManifestWasm, ManifestWasmData, ManifestWasmFile, ManifestWasmUrl };
+export type { ExtismPlugin, CurrentPlugin, ExtismPluginOptions, Manifest, ManifestWasm, ManifestWasmData, ManifestWasmUrl };
diff --git a/src/deno/mod.ts b/src/deno/mod.ts
index 74061cc..676f634 100644
--- a/src/deno/mod.ts
+++ b/src/deno/mod.ts
@@ -7,19 +7,20 @@ import {
   Manifest,
   ManifestWasm,
   ManifestWasmData,
-  ManifestWasmFile,
   ManifestWasmUrl,
   HttpRequest,
   HttpResponse,
   embeddedRuntime,
   embeddedRuntimeHash,
   CurrentPlugin,
-  StreamingSource
+  StreamingSource,
+  isURL,
 } from '../plugin.ts';
 import Context from 'https://deno.land/std@0.200.0/wasi/snapshot_preview1.ts';
 import minimatch from 'https://deno.land/x/minimatch@v3.0.4/index.js';
 import { createHash } from 'https://deno.land/std@0.108.0/hash/mod.ts';
 import { decode } from 'https://deno.land/std@0.201.0/encoding/base64.ts';
+import * as path from 'https://deno.land/std@0.102.0/path/mod.ts';
 
 class ExtismPlugin extends ExtismPluginBase {
   protected supportsHttpRequests(): boolean {
@@ -79,16 +80,19 @@ async function createPlugin(
 
   return new ExtismPlugin(runtime, moduleData, options);
 
-
   async function fetchWasm(wasm: ManifestWasm): Promise<StreamingSource> {
     let data: ArrayBuffer;
 
     if ((wasm as ManifestWasmData).data) {
       data = (wasm as ManifestWasmData).data;
-    } else if ((wasm as ManifestWasmFile).path) {
-      data = await Deno.readFile((wasm as ManifestWasmFile).path);
     } else if ((wasm as ManifestWasmUrl).url) {
-      return await fetch((wasm as ManifestWasmUrl).url);
+      const url = (wasm as ManifestWasmUrl).url;
+      if (isURL(url)) {
+        return await fetch(url);
+      } else {
+        const absolutePath = path.resolve(url as string);
+        return await fetch(`file://${absolutePath}`);
+      }
     } else {
       throw new Error(`Unrecognized wasm source: ${wasm}`);
     }
@@ -107,4 +111,4 @@ async function createPlugin(
 
 export default createPlugin;
 
-export type { ExtismPlugin, CurrentPlugin, ExtismPluginOptions, Manifest, ManifestWasm, ManifestWasmData, ManifestWasmFile, ManifestWasmUrl };
+export type { ExtismPlugin, CurrentPlugin, ExtismPluginOptions, Manifest, ManifestWasm, ManifestWasmData, ManifestWasmUrl };
diff --git a/src/node/index.ts b/src/node/index.ts
index 035c6b9..37d1b31 100644
--- a/src/node/index.ts
+++ b/src/node/index.ts
@@ -7,7 +7,6 @@ import {
   Manifest,
   ManifestWasm,
   ManifestWasmData,
-  ManifestWasmFile,
   ManifestWasmUrl,
   HttpRequest,
   HttpResponse,
@@ -15,6 +14,7 @@ import {
   embeddedRuntimeHash,
   CurrentPlugin,
   StreamingSource,
+  isURL,
 } from '../plugin';
 import { WASI } from 'wasi';
 import { readFile } from 'fs';
@@ -23,6 +23,7 @@ import syncFetch from 'sync-fetch';
 import fetchPolyfill from 'node-fetch';
 import { minimatch } from 'minimatch';
 import { createHash } from 'crypto';
+import path from 'path';
 
 class ExtismPlugin extends ExtismPluginBase {
   protected supportsHttpRequests(): boolean {
@@ -108,18 +109,27 @@ async function createPlugin(
   async function fetchWasm(wasm: ManifestWasm): Promise<StreamingSource> {
     if ((wasm as ManifestWasmData).data) {
       return Promise.resolve((wasm as ManifestWasmData).data);
-    } else if ((wasm as ManifestWasmFile).path) {
-      const readFileAsync = (path: string) => promisify(readFile)(path);
-      const buffer = await readFileAsync((wasm as ManifestWasmFile).path);
-      const array = new Uint8Array(buffer);
-      return array.buffer.slice(array.byteOffset, array.byteOffset + array.byteLength);
     } else if ((wasm as ManifestWasmUrl).url) {
-      //@ts-ignore
-      if (WebAssembly.instantiateStreaming && fetch) {
-        return await fetch((wasm as ManifestWasmUrl).url);
+      const url = (wasm as ManifestWasmUrl).url;
+
+      let source: StreamingSource;
+      if (isURL(url)) {
+        const response = await fetch(url);
+
+        //@ts-ignore
+        if (WebAssembly.instantiateStreaming) {
+          source = response;
+        } else {
+          source = await response.arrayBuffer();
+        }
       } else {
-        return await fetchPolyfill((wasm as ManifestWasmUrl).url).then(response => response.arrayBuffer())
+        const readFileAsync = (path: string) => promisify(readFile)(path);
+        const buffer = await readFileAsync(url as string);
+        const array = new Uint8Array(buffer);
+        source = array.buffer.slice(array.byteOffset, array.byteOffset + array.byteLength);
       }
+
+      return source;
     } else {
       throw new Error(`Unrecognized wasm source: ${wasm}`);
     }
@@ -138,4 +148,4 @@ async function createPlugin(
 }
 
 export default createPlugin;
-export type { ExtismPlugin, CurrentPlugin, ExtismPluginOptions, Manifest, ManifestWasm, ManifestWasmData, ManifestWasmFile, ManifestWasmUrl };
\ No newline at end of file
+export type { ExtismPlugin, CurrentPlugin, ExtismPluginOptions, Manifest, ManifestWasm, ManifestWasmData, ManifestWasmUrl };
\ No newline at end of file
diff --git a/src/plugin.ts b/src/plugin.ts
index 1d88e84..6e86b6c 100644
--- a/src/plugin.ts
+++ b/src/plugin.ts
@@ -286,15 +286,6 @@ export abstract class ExtismPluginBase {
   }
 }
 
-/**
- * Represents a path to a WASM module
- */
-export type ManifestWasmFile = {
-  path: string;
-  name?: string;
-  hash?: string;
-};
-
 /**
  * Represents the raw bytes of a WASM file loaded into memory
  */
@@ -308,7 +299,7 @@ export type ManifestWasmData = {
  * Represents a url to a WASM module
  */
 export type ManifestWasmUrl = {
-  url: string;
+  url: URL | string;
   name?: string;
   hash?: string;
 };
@@ -321,7 +312,7 @@ export type PluginConfig = { [key: string]: string };
 /**
  * The WASM to load as bytes, a path, or a url
  */
-export type ManifestWasm = ManifestWasmUrl | ManifestWasmFile | ManifestWasmData;
+export type ManifestWasm = ManifestWasmUrl | ManifestWasmData;
 
 /**
  * The manifest which describes the {@link ExtismPlugin} code and
@@ -385,6 +376,10 @@ type GuestRuntime = {
 
 export type StreamingSource = ArrayBuffer | Response
 
+export function isURL(url: URL | string) {
+  return url instanceof URL || url.includes("://");
+}
+
 export async function fetchModuleData(
   manifestData: Manifest | ManifestWasm | ArrayBuffer,
   fetchWasm: (wasm: ManifestWasm) => Promise<StreamingSource>,
@@ -402,7 +397,6 @@ export async function fetchModuleData(
     moduleData = await fetchWasm(wasm);
   } else if (
     (manifestData as ManifestWasmData).data ||
-    (manifestData as ManifestWasmFile).path ||
     (manifestData as ManifestWasmUrl).url
   ) {
     moduleData = await fetchWasm(manifestData as ManifestWasm);
diff --git a/tests/index.test.ts b/tests/index.test.ts
index 070040b..0928936 100644
--- a/tests/index.test.ts
+++ b/tests/index.test.ts
@@ -1,4 +1,4 @@
-import { createPlugin, CurrentPlugin, ExtismPlugin, ExtismPluginOptions, Manifest, ManifestWasm } from '../src/node/index';
+import createPlugin, { CurrentPlugin, ExtismPlugin, ExtismPluginOptions, Manifest, ManifestWasm } from '../src/node/index';
 
 async function newPlugin(
   moduleName: string | Manifest | ManifestWasm | Buffer,
@@ -6,7 +6,7 @@ async function newPlugin(
   const options: ExtismPluginOptions = {
     useWasi: true,
     runtime: {
-      path: 'wasm/extism-runtime.wasm',
+      url: 'wasm/extism-runtime.wasm',
     },
   }
 
@@ -17,7 +17,7 @@ async function newPlugin(
   let module: Manifest | ManifestWasm | Buffer;
   if (typeof moduleName == 'string') {
     module = {
-      path: `wasm/${moduleName}`,
+      url: `wasm/${moduleName}`,
     };
   } else {
     module = moduleName;
@@ -52,7 +52,7 @@ describe('test extism', () => {
 
   test('fails on hash mismatch', async () => {
     await expect(newPlugin({
-      path: "wasm/code.wasm",
+      url: "wasm/code.wasm",
       name: "code",
       hash: "-----------"
     })).rejects.toThrow(/Plugin error/);
@@ -60,7 +60,7 @@ describe('test extism', () => {
 
   test('can use embedded runtime', async () => {
     let module = {
-      path: `wasm/code.wasm`,
+      url: `wasm/code.wasm`,
     };
 
     const plugin = await createPlugin(module, {
diff --git a/tests/mod.test.ts b/tests/mod.test.ts
index 79a336e..b4af8f2 100644
--- a/tests/mod.test.ts
+++ b/tests/mod.test.ts
@@ -10,7 +10,7 @@ async function newPlugin(
   const options: ExtismPluginOptions = {
     useWasi: true,
     runtime: {
-      path: 'wasm/extism-runtime.wasm',
+      url: 'wasm/extism-runtime.wasm',
     },
   }
 
@@ -21,7 +21,7 @@ async function newPlugin(
   let module: Manifest | ManifestWasm;
   if (typeof moduleName == 'string') {
     module = {
-      path: `wasm/${moduleName}`,
+      url: `wasm/${moduleName}`,
     };
   } else {
     module = moduleName;
@@ -49,7 +49,7 @@ Deno.test('fails on hash mismatch', async () => {
   await assertRejects(
     () =>
       newPlugin({
-        path: 'wasm/code.wasm',
+        url: 'wasm/code.wasm',
         hash: '----',
       }),
     Error,
@@ -59,7 +59,7 @@ Deno.test('fails on hash mismatch', async () => {
 
 Deno.test('can use embedded runtime', async () => {
   let module = {
-    path: `wasm/code.wasm`,
+    url: `wasm/code.wasm`,
   };
 
   const plugin = await createPlugin(module, {

From 9081289330988fa4ab87469856549cf065c27f9f Mon Sep 17 00:00:00 2001
From: Muhammad Azeez <muhammad@dylibso.com>
Date: Thu, 12 Oct 2023 14:27:35 +0300
Subject: [PATCH 14/18] assume all URLs are http in the browser

---
 src/browser/index.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/browser/index.ts b/src/browser/index.ts
index 49bbae5..69fe1c8 100644
--- a/src/browser/index.ts
+++ b/src/browser/index.ts
@@ -147,12 +147,10 @@ async function createPlugin(
     if ((wasm as ManifestWasmData).data) {
       data = (wasm as ManifestWasmData).data;
     } else if ((wasm as ManifestWasmUrl).url) {
+      // In the browser, it's useful to support relative paths,
+      // so we assume the URL we get doesn't point to local files
       const url = (wasm as ManifestWasmUrl).url;
-      if (isURL(url)) {
-        return await fetch(url);
-      } else {
-        throw new Error("Local paths are not supported.");
-      }
+      return await fetch(url);
     } else {
       throw new Error(`Unrecognized wasm source: ${wasm}`);
     }

From 5e3356d1c24196e63f6fee2a643b2a632ea727a8 Mon Sep 17 00:00:00 2001
From: Muhammad Azeez <muhammad@dylibso.com>
Date: Thu, 12 Oct 2023 14:45:47 +0300
Subject: [PATCH 15/18] fix examples

---
 examples/deno.ts | 2 +-
 examples/node.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/deno.ts b/examples/deno.ts
index 693d059..32fa604 100644
--- a/examples/deno.ts
+++ b/examples/deno.ts
@@ -4,7 +4,7 @@ const filename = Deno.args[0] || "wasm/hello.wasm";
 const funcname = Deno.args[1] || "run_test";
 const input = Deno.args[2] || "this is a test";
 const wasm = {
-    path: filename
+    url: filename
 }
 
 const plugin = await createPlugin(wasm, {
diff --git a/examples/node.js b/examples/node.js
index 07fed23..6631deb 100644
--- a/examples/node.js
+++ b/examples/node.js
@@ -6,7 +6,7 @@ async function main() {
     const funcname = argv[3] || "run_test";
     const input = argv[4] || "this is a test";
     const wasm = {
-        path: filename
+        url: filename
     }
 
     const plugin = await createPlugin(wasm, {

From 7904062e1a9b8a925e354181894e88ee9c28cbee Mon Sep 17 00:00:00 2001
From: Muhammad Azeez <muhammad@dylibso.com>
Date: Thu, 12 Oct 2023 14:46:28 +0300
Subject: [PATCH 16/18] allow users to pass in a string

---
 src/browser/index.ts | 9 ++++++++-
 src/deno/mod.ts      | 9 ++++++++-
 src/node/index.ts    | 9 ++++++++-
 tests/index.test.ts  | 8 ++++++++
 tests/mod.test.ts    | 8 ++++++++
 5 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/src/browser/index.ts b/src/browser/index.ts
index 69fe1c8..84773a8 100644
--- a/src/browser/index.ts
+++ b/src/browser/index.ts
@@ -108,9 +108,16 @@ class ExtismPlugin extends ExtismPluginBase {
  * @returns {ExtismPlugin} An initialized plugin.
  */
 async function createPlugin(
-  manifestData: Manifest | ManifestWasm | ArrayBuffer,
+  manifestData: Manifest | ManifestWasm | ArrayBuffer | string | URL,
   options: ExtismPluginOptions,
 ): Promise<ExtismPlugin> {
+
+  if (typeof manifestData === "string" || manifestData instanceof URL) {
+    manifestData = {
+      url: manifestData as string | URL
+    }
+  }
+  
   let moduleData = await fetchModuleData(manifestData, fetchWasm, calculateHash);
 
   const runtimeWasm = options.runtime ?? {
diff --git a/src/deno/mod.ts b/src/deno/mod.ts
index 676f634..4114dab 100644
--- a/src/deno/mod.ts
+++ b/src/deno/mod.ts
@@ -66,9 +66,16 @@ class ExtismPlugin extends ExtismPluginBase {
    * @returns {ExtismPlugin} An initialized plugin.
    */
 async function createPlugin(
-  manifestData: Manifest | ManifestWasm | ArrayBuffer,
+  manifestData: Manifest | ManifestWasm | ArrayBuffer | string | URL,
   options: ExtismPluginOptions,
 ): Promise<ExtismPlugin> {
+
+  if (typeof manifestData === "string" || manifestData instanceof URL) {
+    manifestData = {
+      url: manifestData as string | URL
+    }
+  }
+  
   const moduleData = await fetchModuleData(manifestData, fetchWasm, calculateHash);
 
   const runtimeWasm = options.runtime ?? {
diff --git a/src/node/index.ts b/src/node/index.ts
index 37d1b31..8c6ad19 100644
--- a/src/node/index.ts
+++ b/src/node/index.ts
@@ -92,9 +92,16 @@ class ExtismPlugin extends ExtismPluginBase {
  * @returns {ExtismPlugin} An initialized plugin.
  */
 async function createPlugin(
-  manifestData: Manifest | ManifestWasm | Buffer,
+  manifestData: Manifest | ManifestWasm | ArrayBuffer | string | URL,
   options: ExtismPluginOptions,
 ): Promise<ExtismPlugin> {
+
+  if (typeof manifestData === "string" || manifestData instanceof URL) {
+    manifestData = {
+      url: manifestData as string | URL
+    }
+  }
+
   let moduleData = await fetchModuleData(manifestData, fetchWasm, calculateHash);
 
   const runtimeWasm = options.runtime ?? {
diff --git a/tests/index.test.ts b/tests/index.test.ts
index 0928936..b9bcb63 100644
--- a/tests/index.test.ts
+++ b/tests/index.test.ts
@@ -33,6 +33,14 @@ function decode(buffer: Uint8Array) {
 }
 
 describe('test extism', () => {
+  test('can create plugin from string', async () => {
+    const plugin = await createPlugin("wasm/code.wasm", {
+      useWasi: true
+    });
+    
+    expect(await plugin.functionExists('count_vowels')).toBe(true);
+  });
+
   test('can create plugin from url with hash check', async () => {
     const plugin = await newPlugin({
       url: "https://raw.githubusercontent.com/extism/extism/main/wasm/code.wasm",
diff --git a/tests/mod.test.ts b/tests/mod.test.ts
index b4af8f2..23abc03 100644
--- a/tests/mod.test.ts
+++ b/tests/mod.test.ts
@@ -36,6 +36,14 @@ function decode(buffer: Uint8Array) {
   return decoder.decode(buffer);
 }
 
+Deno.test('can create plugin from string', async () => {
+  const plugin = await createPlugin("wasm/code.wasm", {
+    useWasi: true
+  });
+  
+  assertEquals(await plugin.functionExists('count_vowels'), true);
+});
+
 Deno.test('can create plugin from url', async () => {
   const plugin = await newPlugin({
     url: 'https://raw.githubusercontent.com/extism/extism/main/wasm/code.wasm',

From 928db469435f768566c0c0df0c73a49609529622 Mon Sep 17 00:00:00 2001
From: Muhammad Azeez <muhammad@dylibso.com>
Date: Thu, 12 Oct 2023 15:54:03 +0300
Subject: [PATCH 17/18] remove node-fetch dependency

---
 package-lock.json | 1 -
 package.json      | 1 -
 2 files changed, 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e5e959b..f5e0534 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,6 @@
         "cross-env": "^7.0.3",
         "crypto": "^1.0.1",
         "minimatch": "^9.0.3",
-        "node-fetch": "^2.7.0",
         "sync-fetch": "^0.5.2"
       },
       "devDependencies": {
diff --git a/package.json b/package.json
index e22e5c8..16946f3 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,6 @@
     "cross-env": "^7.0.3",
     "crypto": "^1.0.1",
     "minimatch": "^9.0.3",
-    "node-fetch": "^2.7.0",
     "sync-fetch": "^0.5.2"
   }
 }

From 4835c8a0d1607f640dd5e998036ba11fc94a2b0b Mon Sep 17 00:00:00 2001
From: Muhammad Azeez <muhammad@dylibso.com>
Date: Mon, 16 Oct 2023 11:17:50 +0300
Subject: [PATCH 18/18] fix: remove unnecessary CurrentPlugin import

---
 examples/deno.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/deno.ts b/examples/deno.ts
index 32fa604..5f061e7 100644
--- a/examples/deno.ts
+++ b/examples/deno.ts
@@ -1,4 +1,4 @@
-import createPlugin, { CurrentPlugin } from '../src/deno/mod.ts'
+import createPlugin from '../src/deno/mod.ts'
 
 const filename = Deno.args[0] || "wasm/hello.wasm";
 const funcname = Deno.args[1] || "run_test";