Merge pull request #11 from joshLong145/ref/instance-wrappers-consoli…

…dation

Ref/instance wrappers consolidation

README.md

@@ -172,11 +172,10 @@ Below we provide the go WASM runtime as an `addon` and give a callback for
 loading the module at the given file path.
 
 ```javascript
-import { WasmInstanceWrapper, WasmWorkerDefinition } from "./../../src/mod.ts";
-class Example extends WasmWorkerDefinition {
+class Example extends WorkerDefinition {
 
-    public constructor(modulePath: string) {
-        super(modulePath);
+    public constructor() {
+        super();
     }
 
     addOne = (buffer: SharedArrayBuffer, module: any) => {
@@ -188,12 +187,13 @@ class Example extends WasmWorkerDefinition {
     }
 }
 
-const example: Example = new Example("./examples/wasm/primes-2.wasm");
+const example: Example = new Example();
 
-const wrapper: WasmInstanceWrapper<Example> = new WasmInstanceWrapper<Example>(example, {
+const wrapper: InstanceWrapper<Example> = new InstanceWrapper<Example>(example, {
      addons: [
       "./lib/wasm_exec_tiny.js",
     ],
+    modulePath: "./examples/wasm/primes-2.wasm",
     addonLoader: (path: string) => {
       return Deno.readTextFileSync(path);
     },
@@ -204,7 +204,7 @@ const wrapper: WasmInstanceWrapper<Example> = new WasmInstanceWrapper<Example>(e
 });
 
 wrapper.start();
-//@ts-ignore
+
 await example.execute("addOne").then((buf: SharedArrayBuffer) => {
     console.log("buffer returned ", new Int32Array(buf))
 });

benchmark/wasm_instance_start_bench.ts

@@ -1,11 +1,8 @@
 //@ts-nocheck
 
-import {
-  WasmInstanceWrapper,
-  WasmWorkerDefinition,
-} from "../src/WasmInstanceWrapper.ts";
+import { InstanceWrapper, WorkerDefinition } from "../src/mod.ts";
 
-class TestExample extends WasmWorkerDefinition {
+class TestExample extends WorkerDefinition {
   public constructor(modulePath: string) {
     super(modulePath);
   }
@@ -23,11 +20,9 @@ class TestExample extends WasmWorkerDefinition {
 }
 
 Deno.bench("Wasm Worker Start Go Module loading", async (_b) => {
-  const example: WasmWorkerDefinition = new TestExample(
-    "./examples/wasm/tiny-go/primes-2.wasm",
-  );
+  const example: WorkerDefinition = new TestExample();
 
-  const wrapper: WasmInstanceWrapper<TestExample> = new WasmInstanceWrapper<
+  const wrapper: InstanceWrapper<TestExample> = new InstanceWrapper<
     Example
   >(
     example,
@@ -37,12 +32,13 @@ Deno.bench("Wasm Worker Start Go Module loading", async (_b) => {
       addons: [
         "./lib/wasm_exec_tiny.js",
       ],
+      modulePath: "./examples/wasm/tiny-go/primes-2.wasm",
       addonLoader: (path: string) => {
         return Deno.readTextFileSync(path);
       },
       moduleLoader: (path: string) => {
         const fd = Deno.openSync(path);
-        const mod = Deno.readFileSync(fd);
+        const mod = Deno.readAllSync(fd);
         fd.close();
         return mod;
       },
@@ -55,11 +51,9 @@ Deno.bench("Wasm Worker Start Go Module loading", async (_b) => {
 });
 
 Deno.bench("Wasm Worker Start Rust Module loading", async (_b) => {
-  const example: WasmWorkerDefinition = new TestExample(
-    "./examples/wasm/rust/wasm_test_bg.wasm",
-  );
+  const example: WorkerDefinition = new TestExample();
 
-  const wrapper: WasmInstanceWrapper<TestExample> = new WasmInstanceWrapper<
+  const wrapper: InstanceWrapper<TestExample> = new InstanceWrapper<
     Example
   >(
     example,
@@ -69,6 +63,7 @@ Deno.bench("Wasm Worker Start Rust Module loading", async (_b) => {
       addons: [
         "./lib/wasm_test.js",
       ],
+      modulePath: "./examples/wasm/rust/wasm_test_bg.wasm",
       addonLoader: (path: string) => {
         return Deno.readTextFileSync(path);
       },

deno.json

@@ -8,6 +8,10 @@
     "gen-npm": "deno run -A --no-check scripts/gen-npm.ts"
   },
   "exclude": [
-    "./examples/*.ts"
-  ]
+    "./examples/*.ts",
+    "./lib/*.js"
+  ],
+  "name": "@joshlong145/span",
+  "version": "0.5.0",
+  "exports": "./src/mod.ts"
 }

examples/js/example.ts

@@ -72,7 +72,7 @@ const wrapper: InstanceWrapper<Example> = new InstanceWrapper<Example>(
 
 wrapper.start();
 
-(example as any).worker.onerror = (event: any) => {
+example.worker.onerror = (event: any) => {
   console.log("an error occured ", event);
 };
 

examples/wasm/rust/example.ts

@@ -1,14 +1,14 @@
 import {
-  WasmInstanceWrapper,
-  WasmWorkerDefinition,
-} from "./../../../src/WasmInstanceWrapper.ts";
+  InstanceWrapper,
+  WorkerDefinition,
+} from "../../../src/InstanceWrapper.ts";
 
-class Example extends WasmWorkerDefinition {
-  public constructor(modulePath: string) {
-    super(modulePath);
+class Example extends WorkerDefinition {
+  public constructor() {
+    super();
   }
 
-  test2 = (buffer: SharedArrayBuffer, args: Record<string, any>) => {
+  test2 = (buffer: SharedArrayBuffer, _args: Record<string, any>) => {
     let arr = new Int8Array(buffer);
     arr[0] += 1;
     //@ts-ignore
@@ -17,11 +17,9 @@ class Example extends WasmWorkerDefinition {
   };
 }
 
-const example: Example = new Example(
-  "./examples/wasm/rust/wasm_test_bg.wasm",
-);
+const example: Example = new Example();
 
-const wrapper: WasmInstanceWrapper<Example> = new WasmInstanceWrapper<Example>(
+const wrapper: InstanceWrapper<Example> = new InstanceWrapper<Example>(
   example,
   {
     addons: [
@@ -30,6 +28,7 @@ const wrapper: WasmInstanceWrapper<Example> = new WasmInstanceWrapper<Example>(
     addonLoader: (path: string) => {
       return Deno.readTextFileSync(path);
     },
+    modulePath: "./examples/wasm/rust/wasm_test_bg.wasm",
     moduleLoader: (path: string) => {
       const fd = Deno.openSync(path);
       return Deno.readAllSync(fd);

examples/wasm/tiny-go/example.ts

@@ -1,27 +1,30 @@
 import {
-  WasmInstanceWrapper,
-  WasmWorkerDefinition,
-} from "./../../../src/WasmInstanceWrapper.ts";
+  InstanceWrapper,
+  WorkerDefinition,
+} from "../../../src/InstanceWrapper.ts";
 
-class Example extends WasmWorkerDefinition {
-  public constructor(modulePath: string) {
-    super(modulePath);
+class Example extends WorkerDefinition {
+  public constructor() {
+    super();
   }
 
-  public test2(buffer: SharedArrayBuffer, args: Record<string, any>) {
-    let arr = new Int8Array(buffer);
+  test2 = (
+    buffer: SharedArrayBuffer,
+    _args: Record<string, any>,
+  ): SharedArrayBuffer => {
+    const arr = new Int8Array(buffer);
     arr[0] += 1;
     //@ts-ignore
     self.primeGenerator();
-    return arr.buffer;
-  }
+    return arr.buffer as SharedArrayBuffer;
+  };
 
-  public test1(
+  test1 = (
     buffer: SharedArrayBuffer,
-    args: Record<string, any>,
-  ): SharedArrayBuffer {
-    let arr = new Int32Array(buffer);
-    let myString = "A rather long string of English text, an error message \
+    _args: Record<string, any>,
+  ): SharedArrayBuffer => {
+    const arr = new Int32Array(buffer);
+    const myString = "A rather long string of English text, an error message \
                 actually that just keeps going and going -- an error \
                 message to make the Energizer bunny blush (right through \
                 those Schwarzenegger shades)! Where was I? Oh yes, \
@@ -37,21 +40,20 @@ class Example extends WasmWorkerDefinition {
       arr[index] = hash;
     }
     return buffer;
-  }
+  };
 }
 
-const example: Example = new Example(
-  "./examples/wasm/tiny-go/primes-2.wasm",
-);
+const example: Example = new Example();
 
-const wrapper: WasmInstanceWrapper<Example> = new WasmInstanceWrapper<Example>(
+const wrapper: InstanceWrapper<Example> = new InstanceWrapper<Example>(
   example,
   {
     outputPath: "output",
     namespace: "asd",
     addons: [
       "./lib/wasm_exec_tiny.js",
     ],
+    modulePath: "./examples/wasm/tiny-go/primes-2.wasm",
     addonLoader: (path: string) => {
       return Deno.readTextFileSync(path);
     },
@@ -81,7 +83,8 @@ await example.execute("test2").then((buf: SharedArrayBuffer) => {
 
 example.terminateWorker();
 
-wrapper.restart();
+await wrapper.restart();
+console.log("restarting web worker");
 
 await example.execute("test1").then((buf: SharedArrayBuffer) => {
   console.log("hello", new Int32Array(buf));