v0.6.0

Author: beshan

CHANGE.md

@@ -1,3 +1,8 @@
+## v0.6.0
+
+- New tests are added to the platform lib.
+- Running WebAssembly modules is implemented.
+
 ## v0.5.15
 
 - New tests are added to the platform lib.

apps/sample/wasm/asconfig.json

@@ -0,0 +1,22 @@
+{
+  "targets": {
+    "debug": {
+      "outFile": "build/index.debug.wasm",
+      "textFile": "build/index.debug.wat",
+      "sourceMap": true,
+      "debug": true
+    },
+    "release": {
+      "outFile": "build/index.wasm",
+      "textFile": "build/index.wat",
+      "sourceMap": true,
+      "optimizeLevel": 3,
+      "shrinkLevel": 0,
+      "converge": false,
+      "noAssert": false
+    }
+  },
+  "options": {
+    "bindings": "esm"
+  }
+}

apps/sample/wasm/package.json

@@ -0,0 +1,11 @@
+{
+  "type": "module",
+  "scripts": {
+    "build": "bash ./scripts/build.sh"
+  },
+  "devDependencies": {
+    "assemblyscript": "^0.27.1",
+    "typescript": "^4.9.5"
+  },
+  "license": "MIT"
+}

apps/sample/wasm/scripts/build.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+rm -rf build
+
+npx asc src/index.ts --target release

apps/sample/wasm/src/index.ts

@@ -0,0 +1,3 @@
+export function add(a: i32, b: i32): i32 {
+  return a + b
+}

apps/sample/wasm/tsconfig.json

@@ -0,0 +1,4 @@
+{
+  "extends": "./node_modules/assemblyscript/std/assembly.json",
+  "include": ["src/**/*.ts"]
+}

dist/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "@bitair/concurrent.js",
-  "version": "0.5.15",
+  "version": "0.6.0",
   "description": "Easy Multithreading for JavaScript (Node.js, Deno & Browser)",
   "main": "src/node/index.js",
   "browser": "src/browser/index.js",

dist/src/browser/index.js

@@ -13,6 +13,7 @@ var __publicField = (obj, key, value) => {
 var constants_exports = {};
 __export(constants_exports, {
   ErrorMessage: () => ErrorMessage,
+  ModuleExt: () => ModuleExt,
   TaskType: () => TaskType,
   ThreadMessageType: () => ThreadMessageType,
   ValueType: () => ValueType,
@@ -46,9 +47,20 @@ var ErrorMessage = {
   WorkerNotSupported: { code: 507, text: "This browser doesn't support web workers." },
   ThreadAllocationTimeout: { code: 508, text: "Thread allocation failed due to timeout." },
   MethodAssignment: { code: 509, text: "Can't assign a method." },
-  NotAccessibleExport: { code: 510, text: "Can't access an export of type '%{0}'. Only top level functions and classes are imported." },
+  NotAccessibleExport: {
+    code: 510,
+    text: "Can't access an export of type '%{0}'. Only top level functions and classes are imported."
+  },
   ThreadPoolTerminated: { code: 511, text: "Thread pool has been terminated." },
-  ThreadTerminated: { code: 512, text: "Thread has been terminated." }
+  ThreadTerminated: { code: 512, text: "Thread has been terminated." },
+  UnrecognizedModuleType: {
+    code: 513,
+    text: "A module with an unrecognized type has been passed '%{0}'."
+  },
+  UnexportedFunction: {
+    code: 514,
+    text: "No function with the name '%{0}' has been exported in module '{%1}'."
+  }
 };
 var ValueType = {
   undefined: 1,
@@ -71,6 +83,10 @@ var defaultConcurrencySettings = Object.assign(
   },
   defaultThreadPoolSettings
 );
+var ModuleExt = /* @__PURE__ */ ((ModuleExt2) => {
+  ModuleExt2["WASM"] = ".wasm";
+  return ModuleExt2;
+})(ModuleExt || {});
 
 // libs/platform/src/core/utils.ts
 function isBoolean(val) {
@@ -128,6 +144,12 @@ function createObject(properties) {
   }
   return obj;
 }
+function isNativeModule(moduleSrc) {
+  if (moduleSrc.endsWith(".wasm" /* WASM */))
+    return false;
+  else
+    return true;
+}
 
 // libs/platform/src/core/error.ts
 var ConcurrencyError = class extends Error {
@@ -238,14 +260,22 @@ var ConcurrentModule = class {
     this.src = src;
   }
   async load() {
-    const moduleSrc = this.src;
-    const module = await import(this.src);
+    const moduleSrc = this.src.toString();
+    const module = isNativeModule(moduleSrc) ? await import(moduleSrc) : {};
     const thread = await this.pool.getThread();
     const cache = {};
     return new Proxy(module, {
       get(obj, key) {
         const _export = Reflect.get(obj, key);
-        if (!Reflect.has(obj, key))
+        if (key === "then")
+          return;
+        else if (!isNativeModule(moduleSrc)) {
+          if (!Reflect.has(cache, key)) {
+            const threadedFunction = new ThreadedFunction(thread, moduleSrc, key);
+            Reflect.set(cache, key, (...params) => threadedFunction.invoke(params));
+          }
+          return Reflect.get(cache, key);
+        } else if (!Reflect.has(obj, key))
           return;
         else if (!isFunction(_export))
           throw new ConcurrencyError(ErrorMessage.NotAccessibleExport);
@@ -485,7 +515,7 @@ var Master = class {
       this.start();
     const module = this.settings.disabled ? {
       load: () => import(moduleSrc.toString())
-    } : new ConcurrentModule(this.pool, moduleSrc.toString());
+    } : new ConcurrentModule(this.pool, moduleSrc);
     return module;
   }
   async terminate(force) {

dist/src/browser/worker_script.js

@@ -28,9 +28,20 @@ var ErrorMessage = {
   WorkerNotSupported: { code: 507, text: "This browser doesn't support web workers." },
   ThreadAllocationTimeout: { code: 508, text: "Thread allocation failed due to timeout." },
   MethodAssignment: { code: 509, text: "Can't assign a method." },
-  NotAccessibleExport: { code: 510, text: "Can't access an export of type '%{0}'. Only top level functions and classes are imported." },
+  NotAccessibleExport: {
+    code: 510,
+    text: "Can't access an export of type '%{0}'. Only top level functions and classes are imported."
+  },
   ThreadPoolTerminated: { code: 511, text: "Thread pool has been terminated." },
-  ThreadTerminated: { code: 512, text: "Thread has been terminated." }
+  ThreadTerminated: { code: 512, text: "Thread has been terminated." },
+  UnrecognizedModuleType: {
+    code: 513,
+    text: "A module with an unrecognized type has been passed '%{0}'."
+  },
+  UnexportedFunction: {
+    code: 514,
+    text: "No function with the name '%{0}' has been exported in module '{%1}'."
+  }
 };
 var ValueType = {
   undefined: 1,
@@ -111,6 +122,12 @@ function createObject(properties) {
   }
   return obj;
 }
+function isNativeModule(moduleSrc) {
+  if (moduleSrc.endsWith(".wasm" /* WASM */))
+    return false;
+  else
+    return true;
+}
 
 // libs/platform/src/core/error.ts
 var ConcurrencyError = class extends Error {
@@ -173,6 +190,9 @@ __publicField(ThreadedObject, "objectRegistry", new FinalizationRegistry(({ id,
 
 // libs/platform/src/core/worker_manager.ts
 var WorkerManager = class {
+  constructor(interopHandler) {
+    this.interopHandler = interopHandler;
+  }
   objects = /* @__PURE__ */ new Map();
   lastObjectId = 0;
   async handleMessage(type, data) {
@@ -240,9 +260,13 @@ var WorkerManager = class {
   async invokeFunction(moduleSrc, functionName, args = []) {
     let result, error;
     try {
-      const module = await import(moduleSrc);
-      const method = Reflect.get(module, functionName);
-      result = await method.apply(module.exports, args);
+      if (!isNativeModule(moduleSrc)) {
+        result = await this.interopHandler.run(moduleSrc, functionName, args);
+      } else {
+        const module = await import(moduleSrc);
+        const method = Reflect.get(module, functionName);
+        result = await method.apply(module.exports, args);
+      }
     } catch (err) {
       error = err;
     }
@@ -347,10 +371,43 @@ var WorkerManager = class {
   }
 };
 
+// libs/platform/src/core/interop/wasm.ts
+var WasmInteropHandler = class {
+  constructor(createInstance) {
+    this.createInstance = createInstance;
+  }
+  cache = /* @__PURE__ */ new Map();
+  async run(moduleSrc, functionName, args) {
+    let instance;
+    if (this.cache.has(moduleSrc))
+      instance = this.cache.get(moduleSrc);
+    else {
+      instance = await this.createInstance(moduleSrc);
+      this.cache.set(moduleSrc, instance);
+    }
+    const fn = Reflect.get(instance.exports, functionName);
+    if (!fn)
+      throw new ConcurrencyError(ErrorMessage.UnexportedFunction, functionName, moduleSrc);
+    const result = Reflect.apply(fn, instance.exports, args);
+    return result;
+  }
+};
+
 // libs/platform/src/browser/worker_script.ts
 if (void 0)
-  throw new ConcurrencyError2(Constants.ErrorMessage.NotRunningOnWorker);
-var manager = new WorkerManager();
+  throw new ConcurrencyError(Constants.ErrorMessage.NotRunningOnWorker);
+var wasmInteropHandler = new WasmInteropHandler(async (moduleSrc) => {
+  const { instance } = await WebAssembly.instantiateStreaming(fetch(moduleSrc));
+  return instance;
+});
+var manager = new WorkerManager({
+  run(moduleSrc, functionName, args) {
+    if (moduleSrc.endsWith(".wasm" /* WASM */))
+      return wasmInteropHandler.run(moduleSrc, functionName, args);
+    else
+      throw new ConcurrencyError(ErrorMessage.UnrecognizedModuleType, moduleSrc);
+  }
+});
 onmessage = function(e) {
   const [type, data] = e.data;
   manager.handleMessage(type, data).then((reply) => {

dist/src/deno/index.js

@@ -65,9 +65,20 @@ var ErrorMessage = {
   WorkerNotSupported: { code: 507, text: "This browser doesn't support web workers." },
   ThreadAllocationTimeout: { code: 508, text: "Thread allocation failed due to timeout." },
   MethodAssignment: { code: 509, text: "Can't assign a method." },
-  NotAccessibleExport: { code: 510, text: "Can't access an export of type '%{0}'. Only top level functions and classes are imported." },
+  NotAccessibleExport: {
+    code: 510,
+    text: "Can't access an export of type '%{0}'. Only top level functions and classes are imported."
+  },
   ThreadPoolTerminated: { code: 511, text: "Thread pool has been terminated." },
-  ThreadTerminated: { code: 512, text: "Thread has been terminated." }
+  ThreadTerminated: { code: 512, text: "Thread has been terminated." },
+  UnrecognizedModuleType: {
+    code: 513,
+    text: "A module with an unrecognized type has been passed '%{0}'."
+  },
+  UnexportedFunction: {
+    code: 514,
+    text: "No function with the name '%{0}' has been exported in module '{%1}'."
+  }
 };
 var defaultThreadPoolSettings = {
   maxThreads: 1,
@@ -137,6 +148,12 @@ function createObject(properties) {
   }
   return obj;
 }
+function isNativeModule(moduleSrc) {
+  if (moduleSrc.endsWith(".wasm" /* WASM */))
+    return false;
+  else
+    return true;
+}
 
 // libs/platform/src/core/error.ts
 var ConcurrencyError = class extends Error {
@@ -247,14 +264,22 @@ var ConcurrentModule = class {
     this.src = src;
   }
   async load() {
-    const moduleSrc = this.src;
-    const module = await import(this.src);
+    const moduleSrc = this.src.toString();
+    const module = isNativeModule(moduleSrc) ? await import(moduleSrc) : {};
     const thread = await this.pool.getThread();
     const cache = {};
     return new Proxy(module, {
       get(obj, key) {
         const _export = Reflect.get(obj, key);
-        if (!Reflect.has(obj, key))
+        if (key === "then")
+          return;
+        else if (!isNativeModule(moduleSrc)) {
+          if (!Reflect.has(cache, key)) {
+            const threadedFunction = new ThreadedFunction(thread, moduleSrc, key);
+            Reflect.set(cache, key, (...params) => threadedFunction.invoke(params));
+          }
+          return Reflect.get(cache, key);
+        } else if (!Reflect.has(obj, key))
           return;
         else if (!isFunction(_export))
           throw new ConcurrencyError(ErrorMessage.NotAccessibleExport);
@@ -494,7 +519,7 @@ var Master = class {
       this.start();
     const module = this.settings.disabled ? {
       load: () => import(moduleSrc.toString())
-    } : new ConcurrentModule(this.pool, moduleSrc.toString());
+    } : new ConcurrentModule(this.pool, moduleSrc);
     return module;
   }
   async terminate(force) {