@xyo-network/hash 2.90.10 → 2.90.12

package/dist/node/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAA;AAC/B,cAAc,qBAAqB,CAAA;AACnC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,cAAc,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,IAAI,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACxE,cAAc,qBAAqB,CAAA;AACnC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,cAAc,CAAA"}

package/dist/node/index.d.ts

@@ -1,4 +1,4 @@
-export * from './PayloadHasher';
+export { NodePayloadHasher as PayloadHasher } from './NodePayloadHasher';
 export * from './removeEmptyFields';
 export * from './removeFields';
 export * from './sortFields';

package/dist/node/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAA;AAC/B,cAAc,qBAAqB,CAAA;AACnC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,cAAc,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,IAAI,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACxE,cAAc,qBAAqB,CAAA;AACnC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,cAAc,CAAA"}

package/dist/node/index.js

@@ -13,13 +13,31 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 
+// src/createNodeWorker.ts
+import { Worker } from "threads";
+var createNodeWorker = /* @__PURE__ */ __name((func) => {
+  try {
+    const code = (func == null ? void 0 : func.toString().slice(6)) ?? "";
+    const w = new Worker(
+      code,
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      {
+        fromSource: true
+      }
+    );
+    return w;
+  } catch {
+    return;
+  }
+}, "createNodeWorker");
+
 // src/PayloadHasher.ts
+import { assertEx as assertEx2 } from "@xylabs/assert";
 import { asHash, hexFromArrayBuffer } from "@xylabs/hex";
 import { ObjectWrapper } from "@xylabs/object";
 import { WasmSupport } from "@xyo-network/wasm";
-import { Semaphore } from "async-mutex";
 import shajs from "sha.js";
-import { spawn, Worker } from "threads";
+import { Pool, spawn } from "threads";
 
 // src/removeEmptyFields.ts
 import { typeOf } from "@xylabs/typeof";
@@ -118,9 +136,20 @@ var wasmHashFunc = /* @__PURE__ */ __name(() => {
 var wasmSupportStatic = new WasmSupport([
   "bigInt"
 ]);
-var maxHashThreads = 8;
-var maxListenersPerThread = 1;
 var _PayloadHasher = class _PayloadHasher extends ObjectWrapper {
+  static get jsHashPool() {
+    return this._jsHashPool = this._jsHashPool ?? this.createWorkerPool(this.jsHashWorkerUrl, jsHashFunc);
+  }
+  static get subtleHashPool() {
+    return this._subtleHashPool = this._subtleHashPool ?? this.createWorkerPool(this.subtleHashWorkerUrl, subtleHashFunc);
+  }
+  static get wasmHashPool() {
+    return this._wasmHashPool = this._wasmHashPool ?? this.createWorkerPool(this.wasmHashWorkerUrl, wasmHashFunc);
+  }
+  static createWorker(url, func) {
+    var _a, _b;
+    return assertEx2(((_a = this.createBrowserWorker) == null ? void 0 : _a.call(this, url)) ?? ((_b = this.createNodeWorker) == null ? void 0 : _b.call(this, func)), "Unable to create worker");
+  }
   static async filterExcludeByHash(objs = [], hash) {
     var _a;
     const hashes = Array.isArray(hash) ? hash : [
@@ -199,32 +228,10 @@ var _PayloadHasher = class _PayloadHasher extends ObjectWrapper {
     return objs ? await Promise.all(objs.map((obj) => this.hash(obj))) : void 0;
   }
   static async jsHash(data) {
-    await this.jsSemaphore.acquire();
     if (_PayloadHasher.warnIfUsingJsHash) {
       console.warn("Using jsHash [No subtle or wasm?]");
     }
-    try {
-      if (this.jsHashThreads.length < maxHashThreads) {
-        const code = jsHashFunc.toString().slice(6);
-        const w = new Worker(
-          code,
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          {
-            fromSource: true
-          }
-        );
-        const worker = await spawn(w);
-        this.jsHashThreads.push(worker);
-      }
-      let threadToUse = this.lastJsThreadUsed === void 0 ? 0 : this.lastJsThreadUsed + 1;
-      if (threadToUse >= this.jsHashThreads.length) {
-        threadToUse = 0;
-      }
-      this.lastJsThreadUsed = threadToUse;
-      return await this.jsHashThreads[threadToUse].hash(data);
-    } finally {
-      this.jsSemaphore.release();
-    }
+    return await this.jsHashPool.queue(async (thread) => await thread.hash(data));
   }
   /**
   * Returns a clone of the payload that is JSON safe
@@ -243,54 +250,14 @@ var _PayloadHasher = class _PayloadHasher extends ObjectWrapper {
     return JSON.stringify(this.hashFields(obj));
   }
   static async subtleHash(data) {
-    await this.subtleSemaphore.acquire();
-    try {
-      if (this.subtleHashThreads.length < maxHashThreads) {
-        const code = subtleHashFunc.toString().slice(6);
-        const w = new Worker(
-          code,
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          {
-            fromSource: true
-          }
-        );
-        const worker = await spawn(w);
-        this.subtleHashThreads.push(worker);
-      }
-      let threadToUse = this.lastSubtleThreadUsed === void 0 ? 0 : this.lastSubtleThreadUsed + 1;
-      if (threadToUse >= this.subtleHashThreads.length) {
-        threadToUse = 0;
-      }
-      this.lastSubtleThreadUsed = threadToUse;
-      return await this.subtleHashThreads[threadToUse].hash(data);
-    } finally {
-      this.subtleSemaphore.release();
-    }
+    return await this.subtleHashPool.queue(async (thread) => await thread.hash(data));
   }
   static async wasmHash(data) {
-    await this.wasmSemaphore.acquire();
-    try {
-      if (this.wasmHashThreads.length < maxHashThreads) {
-        const code = wasmHashFunc.toString().slice(6);
-        const w = new Worker(
-          code,
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          {
-            fromSource: true
-          }
-        );
-        const worker = await spawn(w);
-        this.wasmHashThreads.push(worker);
-      }
-      let threadToUse = this.lastWasmThreadUsed === void 0 ? 0 : this.lastWasmThreadUsed + 1;
-      if (threadToUse >= this.wasmHashThreads.length) {
-        threadToUse = 0;
-      }
-      this.lastWasmThreadUsed = threadToUse;
-      return await this.wasmHashThreads[threadToUse].hash(data);
-    } finally {
-      this.wasmSemaphore.release();
-    }
+    return await this.wasmHashPool.queue(async (thread) => await thread.hash(data));
+  }
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  static createWorkerPool(url, func, size = 8) {
+    return Pool(() => spawn(this.createWorker(url, func)), size);
   }
   async hash() {
     return await _PayloadHasher.hash(this.obj);
@@ -309,24 +276,31 @@ var _PayloadHasher = class _PayloadHasher extends ObjectWrapper {
 };
 __name(_PayloadHasher, "PayloadHasher");
 __publicField(_PayloadHasher, "allowSubtle", true);
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-__publicField(_PayloadHasher, "jsHashThreads", []);
-__publicField(_PayloadHasher, "jsSemaphore", new Semaphore(maxHashThreads * maxListenersPerThread));
-__publicField(_PayloadHasher, "lastJsThreadUsed");
-__publicField(_PayloadHasher, "lastSubtleThreadUsed");
-__publicField(_PayloadHasher, "lastWasmThreadUsed");
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-__publicField(_PayloadHasher, "subtleHashThreads", []);
-__publicField(_PayloadHasher, "subtleSemaphore", new Semaphore(maxHashThreads * maxListenersPerThread));
+__publicField(_PayloadHasher, "createBrowserWorker");
+__publicField(_PayloadHasher, "createNodeWorker");
+__publicField(_PayloadHasher, "jsHashWorkerUrl");
+__publicField(_PayloadHasher, "subtleHashWorkerUrl");
 __publicField(_PayloadHasher, "warnIfUsingJsHash", true);
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-__publicField(_PayloadHasher, "wasmHashThreads", []);
+__publicField(_PayloadHasher, "wasmHashWorkerUrl");
 __publicField(_PayloadHasher, "wasmInitialized", wasmSupportStatic.initialize());
-__publicField(_PayloadHasher, "wasmSemaphore", new Semaphore(maxHashThreads * maxListenersPerThread));
 __publicField(_PayloadHasher, "wasmSupport", wasmSupportStatic);
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+__publicField(_PayloadHasher, "_jsHashPool");
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+__publicField(_PayloadHasher, "_subtleHashPool");
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+__publicField(_PayloadHasher, "_wasmHashPool");
 var PayloadHasher = _PayloadHasher;
+
+// src/NodePayloadHasher.ts
+PayloadHasher.createNodeWorker = createNodeWorker;
+var _NodePayloadHasher = class _NodePayloadHasher extends PayloadHasher {
+};
+__name(_NodePayloadHasher, "NodePayloadHasher");
+__publicField(_NodePayloadHasher, "createNodeWorker", createNodeWorker);
+var NodePayloadHasher = _NodePayloadHasher;
 export {
-  PayloadHasher,
+  NodePayloadHasher as PayloadHasher,
   deepBy,
   deepOmitPrefixedFields,
   deepPickUnderscoreFields,

package/dist/node/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/PayloadHasher.ts","../../src/removeEmptyFields.ts","../../src/removeFields.ts","../../src/sortFields.ts","../../src/worker/jsHash.ts","../../src/worker/subtleHash.ts","../../src/worker/wasmHash.ts"],"sourcesContent":["import { asHash, Hash, hexFromArrayBuffer } from '@xylabs/hex'\nimport { EmptyObject, ObjectWrapper } from '@xylabs/object'\nimport { WasmSupport } from '@xyo-network/wasm'\nimport { Semaphore } from 'async-mutex'\nimport shajs from 'sha.js'\nimport { spawn, Worker } from 'threads'\n\nimport { removeEmptyFields } from './removeEmptyFields'\nimport { deepOmitPrefixedFields } from './removeFields'\nimport { sortFields } from './sortFields'\nimport { jsHashFunc, subtleHashFunc, wasmHashFunc } from './worker'\n\nconst wasmSupportStatic = new WasmSupport(['bigInt'])\nconst maxHashThreads = 8\nconst maxListenersPerThread = 1\n\nexport class PayloadHasher<T extends EmptyObject = EmptyObject> extends ObjectWrapper<T> {\n  static allowSubtle = true\n\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  static readonly jsHashThreads: any[] = []\n  static readonly jsSemaphore = new Semaphore(maxHashThreads * maxListenersPerThread)\n\n  static lastJsThreadUsed: number\n  static lastSubtleThreadUsed: number\n  static lastWasmThreadUsed: number\n\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  static readonly subtleHashThreads: any[] = []\n  static readonly subtleSemaphore = new Semaphore(maxHashThreads * maxListenersPerThread)\n  static warnIfUsingJsHash = true\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  static readonly wasmHashThreads: any[] = []\n\n  static readonly wasmInitialized = wasmSupportStatic.initialize()\n  static readonly wasmSemaphore = new Semaphore(maxHashThreads * maxListenersPerThread)\n  static readonly wasmSupport = wasmSupportStatic\n\n  static async filterExcludeByHash<T extends EmptyObject>(objs: T[] = [], hash: Hash[] | Hash): Promise<T[]> {\n    const hashes = Array.isArray(hash) ? hash : [hash]\n    return (await this.hashPairs(objs)).filter(([_, objHash]) => !hashes.includes(objHash))?.map((pair) => pair[0])\n  }\n\n  static async filterIncludeByHash<T extends EmptyObject>(objs: T[] = [], hash: Hash[] | Hash): Promise<T[]> {\n    const hashes = Array.isArray(hash) ? hash : [hash]\n    return (await this.hashPairs(objs)).filter(([_, objHash]) => hashes.includes(objHash))?.map((pair) => pair[0])\n  }\n\n  static async findByHash<T extends EmptyObject>(objs: T[] = [], hash: Hash): Promise<T | undefined> {\n    return (await this.hashPairs(objs)).find(([_, objHash]) => objHash === hash)?.[0]\n  }\n\n  /**\n   * Asynchronously hashes a payload\n   * @param obj A payload\n   * @returns The payload hash\n   */\n  static async hash<T extends EmptyObject>(obj: T): Promise<Hash> {\n    const stringToHash = this.stringifyHashFields(obj)\n\n    if (PayloadHasher.allowSubtle) {\n      try {\n        const enc = new TextEncoder()\n        const data = enc.encode(stringToHash)\n        const hashArray = await this.subtleHash(data)\n        return hexFromArrayBuffer(hashArray, { bitLength: 256 })\n      } catch {\n        PayloadHasher.allowSubtle = false\n      }\n    }\n\n    await this.wasmInitialized\n    if (this.wasmSupport.canUseWasm) {\n      try {\n        return this.wasmHash(stringToHash)\n      } catch {\n        this.wasmSupport.allowWasm = false\n      }\n    }\n    return await this.jsHash(stringToHash)\n  }\n\n  static hashFields<T extends EmptyObject>(obj: T): T {\n    return sortFields(removeEmptyFields(deepOmitPrefixedFields(obj, '_')))\n  }\n\n  /**\n   * Creates an array of payload/hash tuples based on the payloads passed in\n   * @param objs Any array of payloads\n   * @returns An array of payload/hash tuples\n   */\n  static async hashPairs<T extends EmptyObject>(objs: T[]): Promise<[T, Hash][]> {\n    return await Promise.all(objs.map<Promise<[T, string]>>(async (obj) => [obj, await PayloadHasher.hash(obj)]))\n  }\n\n  /**\n   * Synchronously hashes a payload\n   * @param obj A payload\n   * @returns The payload hash\n   */\n  static hashSync<T extends EmptyObject>(obj: T): Hash {\n    return asHash(shajs('sha256').update(this.stringifyHashFields(obj)).digest().toString('hex'), true)\n  }\n\n  /**\n   * Creates an array of payload hashes based on the payloads passed in\n   * @param objs Any array of payloads\n   * @returns An array of payload hashes\n   */\n  static async hashes<T extends EmptyObject>(objs?: T[]): Promise<Hash[] | undefined> {\n    return objs ? await Promise.all(objs.map((obj) => this.hash(obj))) : undefined\n  }\n\n  static async jsHash(data: string) {\n    await this.jsSemaphore.acquire()\n    if (PayloadHasher.warnIfUsingJsHash) {\n      console.warn('Using jsHash [No subtle or wasm?]')\n    }\n    try {\n      if (this.jsHashThreads.length < maxHashThreads) {\n        const code = jsHashFunc.toString().slice(6)\n        const w = new Worker(\n          code,\n          // eslint-disable-next-line @typescript-eslint/no-explicit-any\n          { fromSource: true } as any,\n        )\n        const worker = await spawn(w)\n        this.jsHashThreads.push(worker)\n      }\n      let threadToUse = this.lastJsThreadUsed === undefined ? 0 : this.lastJsThreadUsed + 1\n      if (threadToUse >= this.jsHashThreads.length) {\n        threadToUse = 0\n      }\n      this.lastJsThreadUsed = threadToUse\n\n      return await this.jsHashThreads[threadToUse].hash(data)\n    } finally {\n      this.jsSemaphore.release()\n    }\n  }\n\n  /**\n   * Returns a clone of the payload that is JSON safe\n   * @param obj A payload\n   * @param meta Keeps underscore (meta) fields if set to true\n   * @returns Returns a clone of the payload that is JSON safe\n   */\n  static json<T extends EmptyObject>(payload: T, meta = false): T {\n    return sortFields(removeEmptyFields(meta ? payload : deepOmitPrefixedFields(payload, '_')))\n  }\n\n  /** @deprecated us json instead */\n  static jsonPayload<T extends EmptyObject>(payload: T, meta = false): T {\n    return this.json(payload, meta)\n  }\n\n  static stringifyHashFields<T extends EmptyObject>(obj: T) {\n    return JSON.stringify(this.hashFields(obj))\n  }\n\n  static async subtleHash(data: Uint8Array): Promise<ArrayBuffer> {\n    await this.subtleSemaphore.acquire()\n    try {\n      if (this.subtleHashThreads.length < maxHashThreads) {\n        const code = subtleHashFunc.toString().slice(6)\n        const w = new Worker(\n          code,\n          // eslint-disable-next-line @typescript-eslint/no-explicit-any\n          { fromSource: true } as any,\n        )\n        const worker = await spawn(w)\n        this.subtleHashThreads.push(worker)\n      }\n      let threadToUse = this.lastSubtleThreadUsed === undefined ? 0 : this.lastSubtleThreadUsed + 1\n      if (threadToUse >= this.subtleHashThreads.length) {\n        threadToUse = 0\n      }\n      this.lastSubtleThreadUsed = threadToUse\n\n      return await this.subtleHashThreads[threadToUse].hash(data)\n    } finally {\n      this.subtleSemaphore.release()\n    }\n  }\n\n  static async wasmHash(data: string) {\n    await this.wasmSemaphore.acquire()\n    try {\n      if (this.wasmHashThreads.length < maxHashThreads) {\n        const code = wasmHashFunc.toString().slice(6)\n        const w = new Worker(\n          code,\n          // eslint-disable-next-line @typescript-eslint/no-explicit-any\n          { fromSource: true } as any,\n        )\n        const worker = await spawn(w)\n        this.wasmHashThreads.push(worker)\n      }\n      let threadToUse = this.lastWasmThreadUsed === undefined ? 0 : this.lastWasmThreadUsed + 1\n      if (threadToUse >= this.wasmHashThreads.length) {\n        threadToUse = 0\n      }\n      this.lastWasmThreadUsed = threadToUse\n\n      return await this.wasmHashThreads[threadToUse].hash(data)\n    } finally {\n      this.wasmSemaphore.release()\n    }\n  }\n\n  async hash(): Promise<Hash> {\n    return await PayloadHasher.hash(this.obj)\n  }\n\n  hashSync(): Hash {\n    return PayloadHasher.hashSync(this.obj)\n  }\n\n  /**\n   * Returns a clone of the payload that is JSON safe\n   * @param meta Keeps underscore (meta) fields if set to true\n   * @returns Returns a clone of the payload that is JSON safe\n   */\n  jsonPayload(meta = false): T {\n    return PayloadHasher.jsonPayload(this.obj, meta)\n  }\n}\n","import { AnyObject, EmptyObject } from '@xylabs/object'\nimport { typeOf } from '@xylabs/typeof'\n\nexport const removeEmptyFields = <T extends EmptyObject>(obj: T): T => {\n  if (obj === null || Array.isArray(obj)) return obj\n\n  const newObject: AnyObject = {}\n  for (const [key, value] of Object.entries(obj)) {\n    if (typeOf(value) === 'object') {\n      newObject[key] = removeEmptyFields(value as Record<string, unknown>)\n    } else if (value !== undefined) {\n      newObject[key] = value\n    }\n  }\n  return newObject as T\n}\n","import { assertEx } from '@xylabs/assert'\nimport { mapValues, merge, omitBy, pickBy } from '@xylabs/lodash'\nimport { EmptyObject, isObject } from '@xylabs/object'\n// eslint-disable-next-line no-restricted-imports\ntype ValueKeyIteratee<T> = (value: T, key: string) => unknown\n\nexport const deepBy = <T extends EmptyObject>(obj: T, predicate: ValueKeyIteratee<T>, func: typeof omitBy | typeof pickBy): T => {\n  if (Array.isArray(obj)) {\n    return obj\n  }\n\n  //pick the child objects\n  const onlyObjects = pickBy<T>(obj, isObject)\n\n  //pick the child non-objects\n  const nonObjects = pickBy<T>(obj, (value) => !isObject(value))\n\n  const pickedObjects = omitBy(onlyObjects, predicate)\n  const pickedNonObjects = omitBy(nonObjects, predicate)\n\n  const processedObjects = mapValues(pickedObjects, (obj: T) => deepBy(obj, predicate, func))\n\n  return merge({}, pickedNonObjects, processedObjects) as T\n}\n\nexport const deepOmitPrefixedFields = <T extends EmptyObject>(obj: T, prefix: string): T => {\n  return deepBy(\n    obj,\n    (_, key) => {\n      assertEx(typeof key === 'string', () => `Invalid key type [${key}, ${typeof key}]`)\n      return key.startsWith(prefix)\n    },\n    omitBy,\n  )\n}\n\nexport const deepPickUnderscoreFields = <T extends EmptyObject>(obj: T): T => {\n  return deepBy(\n    obj,\n    (_, key) => {\n      assertEx(typeof key === 'string', () => `Invalid key type [${key}, ${typeof key}]`)\n      return key.startsWith('_')\n    },\n    pickBy,\n  )\n}\n","import { AnyObject, EmptyObject, isObject } from '@xylabs/object'\n\n//if an object, sub-sort\nconst subSort = (value: unknown) => {\n  return isObject(value) ? sortFields(value) : value\n}\n\nexport const sortFields = <T extends EmptyObject>(obj: T) => {\n  const result: AnyObject = {}\n  const keys = Object.keys(obj) as (keyof T)[]\n  for (const key of keys.sort()) {\n    result[key] = subSort(obj[key])\n  }\n  return result as T\n}\n","/* eslint-disable @typescript-eslint/no-var-requires */\nexport const jsHashFunc = () => {\n  const shajs = require('sha.js')\n  const { asHash } = require('@xylabs/hex')\n  // eslint-disable-next-line import/no-internal-modules\n  const { expose } = require('threads/worker')\n\n  expose({\n    hash(data: string) {\n      return asHash(shajs('sha256').update(data).digest().toString('hex'), true)\n    },\n  })\n}\n","/* eslint-disable @typescript-eslint/no-var-requires */\nexport const subtleHashFunc = () => {\n  const { subtle } = require('@xylabs/platform')\n  // eslint-disable-next-line import/no-internal-modules\n  const { expose } = require('threads/worker')\n\n  expose({\n    async hash(data: ArrayBuffer) {\n      return await subtle.digest('SHA-256', data)\n    },\n  })\n}\n","/* eslint-disable @typescript-eslint/no-var-requires */\nexport const wasmHashFunc = () => {\n  const { sha256 } = require('hash-wasm')\n  const { asHash } = require('@xylabs/hex')\n  // eslint-disable-next-line import/no-internal-modules\n  const { expose } = require('threads/worker')\n\n  expose({\n    async hash(data: string) {\n      return asHash(await sha256(data), true)\n    },\n  })\n}\n"],"mappings":"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","names":["asHash","hexFromArrayBuffer","ObjectWrapper","WasmSupport","Semaphore","shajs","spawn","Worker","typeOf","removeEmptyFields","obj","Array","isArray","newObject","key","value","Object","entries","typeOf","undefined","assertEx","mapValues","merge","omitBy","pickBy","isObject","deepBy","obj","predicate","func","Array","isArray","onlyObjects","pickBy","isObject","nonObjects","value","pickedObjects","omitBy","pickedNonObjects","processedObjects","mapValues","merge","deepOmitPrefixedFields","prefix","_","key","assertEx","startsWith","deepPickUnderscoreFields","isObject","subSort","value","isObject","sortFields","obj","result","keys","Object","key","sort","jsHashFunc","shajs","require","asHash","expose","hash","data","update","digest","toString","subtleHashFunc","subtle","require","expose","hash","data","digest","wasmHashFunc","sha256","require","asHash","expose","hash","data","wasmSupportStatic","WasmSupport","maxHashThreads","maxListenersPerThread","PayloadHasher","ObjectWrapper","filterExcludeByHash","objs","hash","hashes","Array","isArray","hashPairs","filter","_","objHash","includes","map","pair","filterIncludeByHash","findByHash","find","obj","stringToHash","stringifyHashFields","allowSubtle","enc","TextEncoder","data","encode","hashArray","subtleHash","hexFromArrayBuffer","bitLength","wasmInitialized","wasmSupport","canUseWasm","wasmHash","allowWasm","jsHash","hashFields","sortFields","removeEmptyFields","deepOmitPrefixedFields","Promise","all","hashSync","asHash","shajs","update","digest","toString","undefined","jsSemaphore","acquire","warnIfUsingJsHash","console","warn","jsHashThreads","length","code","jsHashFunc","slice","w","Worker","fromSource","worker","spawn","push","threadToUse","lastJsThreadUsed","release","json","payload","meta","jsonPayload","JSON","stringify","subtleSemaphore","subtleHashThreads","subtleHashFunc","lastSubtleThreadUsed","wasmSemaphore","wasmHashThreads","wasmHashFunc","lastWasmThreadUsed","Semaphore","initialize"]}
+{"version":3,"sources":["../../src/createNodeWorker.ts","../../src/PayloadHasher.ts","../../src/removeEmptyFields.ts","../../src/removeFields.ts","../../src/sortFields.ts","../../src/worker/jsHash.ts","../../src/worker/subtleHash.ts","../../src/worker/wasmHash.ts","../../src/NodePayloadHasher.ts"],"sourcesContent":["import { Worker } from 'threads'\n\nexport const createNodeWorker = (func?: () => unknown) => {\n  try {\n    const code = func?.toString().slice(6) ?? ''\n    const w = new Worker(\n      code,\n      // eslint-disable-next-line @typescript-eslint/no-explicit-any\n      { fromSource: true } as any,\n    )\n    return w\n  } catch {\n    return\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { asHash, Hash, hexFromArrayBuffer } from '@xylabs/hex'\nimport { EmptyObject, ObjectWrapper } from '@xylabs/object'\nimport { WasmSupport } from '@xyo-network/wasm'\nimport shajs from 'sha.js'\nimport { ModuleThread, Pool, spawn, Worker } from 'threads'\n// eslint-disable-next-line import/no-internal-modules\nimport { WorkerModule } from 'threads/dist/types/worker'\n\nimport { removeEmptyFields } from './removeEmptyFields'\nimport { deepOmitPrefixedFields } from './removeFields'\nimport { sortFields } from './sortFields'\nimport { jsHashFunc, subtleHashFunc, wasmHashFunc } from './worker'\n\nconst wasmSupportStatic = new WasmSupport(['bigInt'])\n\nexport class PayloadHasher<T extends EmptyObject = EmptyObject> extends ObjectWrapper<T> {\n  static allowSubtle = true\n  static createBrowserWorker?: (url?: URL) => Worker | undefined\n  static createNodeWorker?: (func?: () => unknown) => Worker | undefined\n\n  static jsHashWorkerUrl?: URL\n  static subtleHashWorkerUrl?: URL\n\n  static warnIfUsingJsHash = true\n\n  static wasmHashWorkerUrl?: URL\n\n  static readonly wasmInitialized = wasmSupportStatic.initialize()\n  static readonly wasmSupport = wasmSupportStatic\n\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  private static _jsHashPool?: Pool<ModuleThread<WorkerModule<any>>>\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  private static _subtleHashPool?: Pool<ModuleThread<WorkerModule<any>>>\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  private static _wasmHashPool?: Pool<ModuleThread<WorkerModule<any>>>\n\n  private static get jsHashPool() {\n    return (this._jsHashPool = this._jsHashPool ?? this.createWorkerPool(this.jsHashWorkerUrl, jsHashFunc))\n  }\n\n  private static get subtleHashPool() {\n    return (this._subtleHashPool = this._subtleHashPool ?? this.createWorkerPool(this.subtleHashWorkerUrl, subtleHashFunc))\n  }\n\n  private static get wasmHashPool() {\n    return (this._wasmHashPool = this._wasmHashPool ?? this.createWorkerPool(this.wasmHashWorkerUrl, wasmHashFunc))\n  }\n\n  static createWorker(url?: URL, func?: () => unknown) {\n    return assertEx(this.createBrowserWorker?.(url) ?? this.createNodeWorker?.(func), 'Unable to create worker')\n  }\n\n  static async filterExcludeByHash<T extends EmptyObject>(objs: T[] = [], hash: Hash[] | Hash): Promise<T[]> {\n    const hashes = Array.isArray(hash) ? hash : [hash]\n    return (await this.hashPairs(objs)).filter(([_, objHash]) => !hashes.includes(objHash))?.map((pair) => pair[0])\n  }\n\n  static async filterIncludeByHash<T extends EmptyObject>(objs: T[] = [], hash: Hash[] | Hash): Promise<T[]> {\n    const hashes = Array.isArray(hash) ? hash : [hash]\n    return (await this.hashPairs(objs)).filter(([_, objHash]) => hashes.includes(objHash))?.map((pair) => pair[0])\n  }\n\n  static async findByHash<T extends EmptyObject>(objs: T[] = [], hash: Hash): Promise<T | undefined> {\n    return (await this.hashPairs(objs)).find(([_, objHash]) => objHash === hash)?.[0]\n  }\n\n  /**\n   * Asynchronously hashes a payload\n   * @param obj A payload\n   * @returns The payload hash\n   */\n  static async hash<T extends EmptyObject>(obj: T): Promise<Hash> {\n    const stringToHash = this.stringifyHashFields(obj)\n\n    if (PayloadHasher.allowSubtle) {\n      try {\n        const enc = new TextEncoder()\n        const data = enc.encode(stringToHash)\n        const hashArray = await this.subtleHash(data)\n        return hexFromArrayBuffer(hashArray, { bitLength: 256 })\n      } catch {\n        PayloadHasher.allowSubtle = false\n      }\n    }\n\n    await this.wasmInitialized\n    if (this.wasmSupport.canUseWasm) {\n      try {\n        return this.wasmHash(stringToHash)\n      } catch {\n        this.wasmSupport.allowWasm = false\n      }\n    }\n    return await this.jsHash(stringToHash)\n  }\n\n  static hashFields<T extends EmptyObject>(obj: T): T {\n    return sortFields(removeEmptyFields(deepOmitPrefixedFields(obj, '_')))\n  }\n\n  /**\n   * Creates an array of payload/hash tuples based on the payloads passed in\n   * @param objs Any array of payloads\n   * @returns An array of payload/hash tuples\n   */\n  static async hashPairs<T extends EmptyObject>(objs: T[]): Promise<[T, Hash][]> {\n    return await Promise.all(objs.map<Promise<[T, string]>>(async (obj) => [obj, await PayloadHasher.hash(obj)]))\n  }\n\n  /**\n   * Synchronously hashes a payload\n   * @param obj A payload\n   * @returns The payload hash\n   */\n  static hashSync<T extends EmptyObject>(obj: T): Hash {\n    return asHash(shajs('sha256').update(this.stringifyHashFields(obj)).digest().toString('hex'), true)\n  }\n\n  /**\n   * Creates an array of payload hashes based on the payloads passed in\n   * @param objs Any array of payloads\n   * @returns An array of payload hashes\n   */\n  static async hashes<T extends EmptyObject>(objs?: T[]): Promise<Hash[] | undefined> {\n    return objs ? await Promise.all(objs.map((obj) => this.hash(obj))) : undefined\n  }\n\n  static async jsHash(data: string) {\n    if (PayloadHasher.warnIfUsingJsHash) {\n      console.warn('Using jsHash [No subtle or wasm?]')\n    }\n    return await this.jsHashPool.queue(async (thread) => await thread.hash(data))\n  }\n\n  /**\n   * Returns a clone of the payload that is JSON safe\n   * @param obj A payload\n   * @param meta Keeps underscore (meta) fields if set to true\n   * @returns Returns a clone of the payload that is JSON safe\n   */\n  static json<T extends EmptyObject>(payload: T, meta = false): T {\n    return sortFields(removeEmptyFields(meta ? payload : deepOmitPrefixedFields(payload, '_')))\n  }\n\n  /** @deprecated us json instead */\n  static jsonPayload<T extends EmptyObject>(payload: T, meta = false): T {\n    return this.json(payload, meta)\n  }\n\n  static stringifyHashFields<T extends EmptyObject>(obj: T) {\n    return JSON.stringify(this.hashFields(obj))\n  }\n\n  static async subtleHash(data: Uint8Array): Promise<ArrayBuffer> {\n    return await this.subtleHashPool.queue(async (thread) => await thread.hash(data))\n  }\n\n  static async wasmHash(data: string) {\n    return await this.wasmHashPool.queue(async (thread) => await thread.hash(data))\n  }\n\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  private static createWorkerPool<T extends WorkerModule<any>>(url?: URL, func?: () => unknown, size = 8) {\n    return Pool(() => spawn<T>(this.createWorker(url, func)), size)\n  }\n\n  async hash(): Promise<Hash> {\n    return await PayloadHasher.hash(this.obj)\n  }\n\n  hashSync(): Hash {\n    return PayloadHasher.hashSync(this.obj)\n  }\n\n  /**\n   * Returns a clone of the payload that is JSON safe\n   * @param meta Keeps underscore (meta) fields if set to true\n   * @returns Returns a clone of the payload that is JSON safe\n   */\n  jsonPayload(meta = false): T {\n    return PayloadHasher.jsonPayload(this.obj, meta)\n  }\n}\n","import { AnyObject, EmptyObject } from '@xylabs/object'\nimport { typeOf } from '@xylabs/typeof'\n\nexport const removeEmptyFields = <T extends EmptyObject>(obj: T): T => {\n  if (obj === null || Array.isArray(obj)) return obj\n\n  const newObject: AnyObject = {}\n  for (const [key, value] of Object.entries(obj)) {\n    if (typeOf(value) === 'object') {\n      newObject[key] = removeEmptyFields(value as Record<string, unknown>)\n    } else if (value !== undefined) {\n      newObject[key] = value\n    }\n  }\n  return newObject as T\n}\n","import { assertEx } from '@xylabs/assert'\nimport { mapValues, merge, omitBy, pickBy } from '@xylabs/lodash'\nimport { EmptyObject, isObject } from '@xylabs/object'\n// eslint-disable-next-line no-restricted-imports\ntype ValueKeyIteratee<T> = (value: T, key: string) => unknown\n\nexport const deepBy = <T extends EmptyObject>(obj: T, predicate: ValueKeyIteratee<T>, func: typeof omitBy | typeof pickBy): T => {\n  if (Array.isArray(obj)) {\n    return obj\n  }\n\n  //pick the child objects\n  const onlyObjects = pickBy<T>(obj, isObject)\n\n  //pick the child non-objects\n  const nonObjects = pickBy<T>(obj, (value) => !isObject(value))\n\n  const pickedObjects = omitBy(onlyObjects, predicate)\n  const pickedNonObjects = omitBy(nonObjects, predicate)\n\n  const processedObjects = mapValues(pickedObjects, (obj: T) => deepBy(obj, predicate, func))\n\n  return merge({}, pickedNonObjects, processedObjects) as T\n}\n\nexport const deepOmitPrefixedFields = <T extends EmptyObject>(obj: T, prefix: string): T => {\n  return deepBy(\n    obj,\n    (_, key) => {\n      assertEx(typeof key === 'string', () => `Invalid key type [${key}, ${typeof key}]`)\n      return key.startsWith(prefix)\n    },\n    omitBy,\n  )\n}\n\nexport const deepPickUnderscoreFields = <T extends EmptyObject>(obj: T): T => {\n  return deepBy(\n    obj,\n    (_, key) => {\n      assertEx(typeof key === 'string', () => `Invalid key type [${key}, ${typeof key}]`)\n      return key.startsWith('_')\n    },\n    pickBy,\n  )\n}\n","import { AnyObject, EmptyObject, isObject } from '@xylabs/object'\n\n//if an object, sub-sort\nconst subSort = (value: unknown) => {\n  return isObject(value) ? sortFields(value) : value\n}\n\nexport const sortFields = <T extends EmptyObject>(obj: T) => {\n  const result: AnyObject = {}\n  const keys = Object.keys(obj) as (keyof T)[]\n  for (const key of keys.sort()) {\n    result[key] = subSort(obj[key])\n  }\n  return result as T\n}\n","/* eslint-disable @typescript-eslint/no-var-requires */\nexport const jsHashFunc = () => {\n  const shajs = require('sha.js')\n  const { asHash } = require('@xylabs/hex')\n  // eslint-disable-next-line import/no-internal-modules\n  const { expose } = require('threads/worker')\n\n  expose({\n    hash(data: string) {\n      return asHash(shajs('sha256').update(data).digest().toString('hex'), true)\n    },\n  })\n}\n","/* eslint-disable @typescript-eslint/no-var-requires */\nexport const subtleHashFunc = () => {\n  const { subtle } = require('@xylabs/platform')\n  // eslint-disable-next-line import/no-internal-modules\n  const { expose } = require('threads/worker')\n\n  expose({\n    async hash(data: ArrayBuffer) {\n      return await subtle.digest('SHA-256', data)\n    },\n  })\n}\n","/* eslint-disable @typescript-eslint/no-var-requires */\nexport const wasmHashFunc = () => {\n  const { sha256 } = require('hash-wasm')\n  const { asHash } = require('@xylabs/hex')\n  // eslint-disable-next-line import/no-internal-modules\n  const { expose } = require('threads/worker')\n\n  expose({\n    async hash(data: string) {\n      return asHash(await sha256(data), true)\n    },\n  })\n}\n","import { createNodeWorker } from './createNodeWorker'\nimport { PayloadHasher } from './PayloadHasher'\n\nPayloadHasher.createNodeWorker = createNodeWorker\n\nexport class NodePayloadHasher extends PayloadHasher {\n  static override createNodeWorker = createNodeWorker\n}\n"],"mappings":"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","names":["Worker","createNodeWorker","func","code","toString","slice","w","Worker","fromSource","assertEx","asHash","hexFromArrayBuffer","ObjectWrapper","WasmSupport","shajs","Pool","spawn","typeOf","removeEmptyFields","obj","Array","isArray","newObject","key","value","Object","entries","typeOf","undefined","assertEx","mapValues","merge","omitBy","pickBy","isObject","deepBy","obj","predicate","func","Array","isArray","onlyObjects","pickBy","isObject","nonObjects","value","pickedObjects","omitBy","pickedNonObjects","processedObjects","mapValues","merge","deepOmitPrefixedFields","prefix","_","key","assertEx","startsWith","deepPickUnderscoreFields","isObject","subSort","value","isObject","sortFields","obj","result","keys","Object","key","sort","jsHashFunc","shajs","require","asHash","expose","hash","data","update","digest","toString","subtleHashFunc","subtle","require","expose","hash","data","digest","wasmHashFunc","sha256","require","asHash","expose","hash","data","wasmSupportStatic","WasmSupport","PayloadHasher","ObjectWrapper","jsHashPool","_jsHashPool","createWorkerPool","jsHashWorkerUrl","jsHashFunc","subtleHashPool","_subtleHashPool","subtleHashWorkerUrl","subtleHashFunc","wasmHashPool","_wasmHashPool","wasmHashWorkerUrl","wasmHashFunc","createWorker","url","func","assertEx","createBrowserWorker","createNodeWorker","filterExcludeByHash","objs","hash","hashes","Array","isArray","hashPairs","filter","_","objHash","includes","map","pair","filterIncludeByHash","findByHash","find","obj","stringToHash","stringifyHashFields","allowSubtle","enc","TextEncoder","data","encode","hashArray","subtleHash","hexFromArrayBuffer","bitLength","wasmInitialized","wasmSupport","canUseWasm","wasmHash","allowWasm","jsHash","hashFields","sortFields","removeEmptyFields","deepOmitPrefixedFields","Promise","all","hashSync","asHash","shajs","update","digest","toString","undefined","warnIfUsingJsHash","console","warn","queue","thread","json","payload","meta","jsonPayload","JSON","stringify","size","Pool","spawn","initialize","PayloadHasher","createNodeWorker","NodePayloadHasher"]}

package/package.json

@@ -16,8 +16,7 @@
     "@xylabs/object": "^2.89.1",
     "@xylabs/platform": "^2.14.1",
     "@xylabs/typeof": "^2.14.1",
-    "@xyo-network/wasm": "~2.90.10",
-    "async-mutex": "^0.4.1",
+    "@xyo-network/wasm": "~2.90.12",
     "hash-wasm": "^4.11.0",
     "sha.js": "^2.4.11",
     "threads": "^1.7.0"
@@ -68,6 +67,6 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
   },
   "sideEffects": false,
-  "version": "2.90.10",
+  "version": "2.90.12",
   "type": "module"
 }

package/src/BrowserPayloadHasher.ts

@@ -0,0 +1,34 @@
+import { createBrowserWorker } from './createBrowserWorker'
+import { createNodeWorker } from './createNodeWorker'
+import { PayloadHasher } from './PayloadHasher'
+
+// We put both in here so that things will work in jsdom/jest
+
+PayloadHasher.createBrowserWorker = createBrowserWorker
+PayloadHasher.createNodeWorker = createNodeWorker
+
+export class BrowserPayloadHasher extends PayloadHasher {
+  static override createBrowserWorker = createBrowserWorker
+  static override createNodeWorker = createNodeWorker
+  static override jsHashWorkerUrl = (() => {
+    try {
+      return new URL('worker/jsHash.ts', import.meta.url)
+    } catch {
+      return
+    }
+  })()
+  static override subtleHashWorkerUrl = (() => {
+    try {
+      return new URL('worker/subtleHash.ts', import.meta.url)
+    } catch {
+      return
+    }
+  })()
+  static override wasmHashWorkerUrl = (() => {
+    try {
+      return new URL('worker/wasmHash.ts', import.meta.url)
+    } catch {
+      return
+    }
+  })()
+}

package/src/NodePayloadHasher.ts

@@ -0,0 +1,8 @@
+import { createNodeWorker } from './createNodeWorker'
+import { PayloadHasher } from './PayloadHasher'
+
+PayloadHasher.createNodeWorker = createNodeWorker
+
+export class NodePayloadHasher extends PayloadHasher {
+  static override createNodeWorker = createNodeWorker
+}

package/src/PayloadHasher.ts

@@ -1,9 +1,11 @@
+import { assertEx } from '@xylabs/assert'
 import { asHash, Hash, hexFromArrayBuffer } from '@xylabs/hex'
 import { EmptyObject, ObjectWrapper } from '@xylabs/object'
 import { WasmSupport } from '@xyo-network/wasm'
-import { Semaphore } from 'async-mutex'
 import shajs from 'sha.js'
-import { spawn, Worker } from 'threads'
+import { ModuleThread, Pool, spawn, Worker } from 'threads'
+// eslint-disable-next-line import/no-internal-modules
+import { WorkerModule } from 'threads/dist/types/worker'
 
 import { removeEmptyFields } from './removeEmptyFields'
 import { deepOmitPrefixedFields } from './removeFields'
@@ -11,31 +13,45 @@ import { sortFields } from './sortFields'
 import { jsHashFunc, subtleHashFunc, wasmHashFunc } from './worker'
 
 const wasmSupportStatic = new WasmSupport(['bigInt'])
-const maxHashThreads = 8
-const maxListenersPerThread = 1
 
 export class PayloadHasher<T extends EmptyObject = EmptyObject> extends ObjectWrapper<T> {
   static allowSubtle = true
+  static createBrowserWorker?: (url?: URL) => Worker | undefined
+  static createNodeWorker?: (func?: () => unknown) => Worker | undefined
 
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  static readonly jsHashThreads: any[] = []
-  static readonly jsSemaphore = new Semaphore(maxHashThreads * maxListenersPerThread)
-
-  static lastJsThreadUsed: number
-  static lastSubtleThreadUsed: number
-  static lastWasmThreadUsed: number
+  static jsHashWorkerUrl?: URL
+  static subtleHashWorkerUrl?: URL
 
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  static readonly subtleHashThreads: any[] = []
-  static readonly subtleSemaphore = new Semaphore(maxHashThreads * maxListenersPerThread)
   static warnIfUsingJsHash = true
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  static readonly wasmHashThreads: any[] = []
+
+  static wasmHashWorkerUrl?: URL
 
   static readonly wasmInitialized = wasmSupportStatic.initialize()
-  static readonly wasmSemaphore = new Semaphore(maxHashThreads * maxListenersPerThread)
   static readonly wasmSupport = wasmSupportStatic
 
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  private static _jsHashPool?: Pool<ModuleThread<WorkerModule<any>>>
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  private static _subtleHashPool?: Pool<ModuleThread<WorkerModule<any>>>
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  private static _wasmHashPool?: Pool<ModuleThread<WorkerModule<any>>>
+
+  private static get jsHashPool() {
+    return (this._jsHashPool = this._jsHashPool ?? this.createWorkerPool(this.jsHashWorkerUrl, jsHashFunc))
+  }
+
+  private static get subtleHashPool() {
+    return (this._subtleHashPool = this._subtleHashPool ?? this.createWorkerPool(this.subtleHashWorkerUrl, subtleHashFunc))
+  }
+
+  private static get wasmHashPool() {
+    return (this._wasmHashPool = this._wasmHashPool ?? this.createWorkerPool(this.wasmHashWorkerUrl, wasmHashFunc))
+  }
+
+  static createWorker(url?: URL, func?: () => unknown) {
+    return assertEx(this.createBrowserWorker?.(url) ?? this.createNodeWorker?.(func), 'Unable to create worker')
+  }
+
   static async filterExcludeByHash<T extends EmptyObject>(objs: T[] = [], hash: Hash[] | Hash): Promise<T[]> {
     const hashes = Array.isArray(hash) ? hash : [hash]
     return (await this.hashPairs(objs)).filter(([_, objHash]) => !hashes.includes(objHash))?.map((pair) => pair[0])
@@ -112,31 +128,10 @@ export class PayloadHasher<T extends EmptyObject = EmptyObject> extends ObjectWr
   }
 
   static async jsHash(data: string) {
-    await this.jsSemaphore.acquire()
     if (PayloadHasher.warnIfUsingJsHash) {
       console.warn('Using jsHash [No subtle or wasm?]')
     }
-    try {
-      if (this.jsHashThreads.length < maxHashThreads) {
-        const code = jsHashFunc.toString().slice(6)
-        const w = new Worker(
-          code,
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          { fromSource: true } as any,
-        )
-        const worker = await spawn(w)
-        this.jsHashThreads.push(worker)
-      }
-      let threadToUse = this.lastJsThreadUsed === undefined ? 0 : this.lastJsThreadUsed + 1
-      if (threadToUse >= this.jsHashThreads.length) {
-        threadToUse = 0
-      }
-      this.lastJsThreadUsed = threadToUse
-
-      return await this.jsHashThreads[threadToUse].hash(data)
-    } finally {
-      this.jsSemaphore.release()
-    }
+    return await this.jsHashPool.queue(async (thread) => await thread.hash(data))
   }
 
   /**
@@ -159,53 +154,16 @@ export class PayloadHasher<T extends EmptyObject = EmptyObject> extends ObjectWr
   }
 
   static async subtleHash(data: Uint8Array): Promise<ArrayBuffer> {
-    await this.subtleSemaphore.acquire()
-    try {
-      if (this.subtleHashThreads.length < maxHashThreads) {
-        const code = subtleHashFunc.toString().slice(6)
-        const w = new Worker(
-          code,
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          { fromSource: true } as any,
-        )
-        const worker = await spawn(w)
-        this.subtleHashThreads.push(worker)
-      }
-      let threadToUse = this.lastSubtleThreadUsed === undefined ? 0 : this.lastSubtleThreadUsed + 1
-      if (threadToUse >= this.subtleHashThreads.length) {
-        threadToUse = 0
-      }
-      this.lastSubtleThreadUsed = threadToUse
-
-      return await this.subtleHashThreads[threadToUse].hash(data)
-    } finally {
-      this.subtleSemaphore.release()
-    }
+    return await this.subtleHashPool.queue(async (thread) => await thread.hash(data))
   }
 
   static async wasmHash(data: string) {
-    await this.wasmSemaphore.acquire()
-    try {
-      if (this.wasmHashThreads.length < maxHashThreads) {
-        const code = wasmHashFunc.toString().slice(6)
-        const w = new Worker(
-          code,
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          { fromSource: true } as any,
-        )
-        const worker = await spawn(w)
-        this.wasmHashThreads.push(worker)
-      }
-      let threadToUse = this.lastWasmThreadUsed === undefined ? 0 : this.lastWasmThreadUsed + 1
-      if (threadToUse >= this.wasmHashThreads.length) {
-        threadToUse = 0
-      }
-      this.lastWasmThreadUsed = threadToUse
+    return await this.wasmHashPool.queue(async (thread) => await thread.hash(data))
+  }
 
-      return await this.wasmHashThreads[threadToUse].hash(data)
-    } finally {
-      this.wasmSemaphore.release()
-    }
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  private static createWorkerPool<T extends WorkerModule<any>>(url?: URL, func?: () => unknown, size = 8) {
+    return Pool(() => spawn<T>(this.createWorker(url, func)), size)
   }
 
   async hash(): Promise<Hash> {

package/src/createBrowserWorker.ts

@@ -0,0 +1,10 @@
+import { Worker } from 'threads'
+
+export const createBrowserWorker = (url?: URL) => {
+  try {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    return new Worker(url as any)
+  } catch {
+    return
+  }
+}

package/src/createNodeWorker.ts

@@ -0,0 +1,15 @@
+import { Worker } from 'threads'
+
+export const createNodeWorker = (func?: () => unknown) => {
+  try {
+    const code = func?.toString().slice(6) ?? ''
+    const w = new Worker(
+      code,
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      { fromSource: true } as any,
+    )
+    return w
+  } catch {
+    return
+  }
+}

package/src/index-browser.ts

@@ -1,4 +1,4 @@
-export * from './PayloadHasher-browser'
+export { BrowserPayloadHasher as PayloadHasher } from './BrowserPayloadHasher'
 export * from './removeEmptyFields'
 export * from './removeFields'
 export * from './sortFields'

package/src/index.ts

@@ -1,4 +1,4 @@
-export * from './PayloadHasher'
+export { NodePayloadHasher as PayloadHasher } from './NodePayloadHasher'
 export * from './removeEmptyFields'
 export * from './removeFields'
 export * from './sortFields'