@acala-network/chopsticks-core 0.8.2 → 0.8.4

package/lib/{executor.js → wasm-executor/index.js}

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -12,16 +35,30 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAuraSlotDuration = exports.emptyTaskHandler = exports.taskHandler = exports.runTask = exports.createProof = exports.decodeProof = exports.calculateStateRoot = exports.getRuntimeVersion = void 0;
+exports.releaseWorker = exports.getAuraSlotDuration = exports.emptyTaskHandler = exports.taskHandler = exports.runTask = exports.createProof = exports.decodeProof = exports.calculateStateRoot = exports.getRuntimeVersion = void 0;
+const Comlink = __importStar(require("comlink"));
 const util_1 = require("@polkadot/util");
 const util_crypto_1 = require("@polkadot/util-crypto");
-const key_cache_1 = require("./utils/key-cache");
-const chopsticks_executor_1 = require("@acala-network/chopsticks-executor");
-const logger_1 = require("./logger");
 const lodash_1 = __importDefault(require("lodash"));
+const key_cache_1 = require("../utils/key-cache");
+const logger_1 = require("../logger");
+const utils_1 = require("../utils");
 const logger = logger_1.defaultLogger.child({ name: 'executor' });
+let __executor_worker;
+const getWorker = () => __awaiter(void 0, void 0, void 0, function* () {
+    if (__executor_worker)
+        return __executor_worker;
+    if (typeof Worker !== 'undefined') {
+        __executor_worker = Promise.resolve().then(() => __importStar(require('./browser-worker'))).then(({ startWorker }) => startWorker());
+    }
+    else {
+        __executor_worker = Promise.resolve().then(() => __importStar(require('./node-worker'))).then(({ startWorker }) => startWorker());
+    }
+    return __executor_worker;
+});
 const getRuntimeVersion = (code) => __awaiter(void 0, void 0, void 0, function* () {
-    return (0, chopsticks_executor_1.get_runtime_version)(code).then((version) => {
+    const worker = yield getWorker();
+    return worker.remote.getRuntimeVersion(code).then((version) => {
         version.specName = (0, util_1.hexToString)(version.specName);
         version.implName = (0, util_1.hexToString)(version.implName);
         return version;
@@ -30,25 +67,24 @@ const getRuntimeVersion = (code) => __awaiter(void 0, void 0, void 0, function*
 exports.getRuntimeVersion = getRuntimeVersion;
 // trie_version: 0 for old trie, 1 for new trie
 const calculateStateRoot = (entries, trie_version) => __awaiter(void 0, void 0, void 0, function* () {
-    return (0, chopsticks_executor_1.calculate_state_root)(entries, trie_version);
+    const worker = yield getWorker();
+    return worker.remote.calculateStateRoot(entries, trie_version);
 });
 exports.calculateStateRoot = calculateStateRoot;
 const decodeProof = (trieRootHash, keys, nodes) => __awaiter(void 0, void 0, void 0, function* () {
-    const decoded = yield (0, chopsticks_executor_1.decode_proof)(trieRootHash, keys, nodes);
-    return decoded.reduce((accum, [key, value]) => {
-        accum[key] = value;
-        return accum;
-    }, {});
+    const worker = yield getWorker();
+    return worker.remote.decodeProof(trieRootHash, keys, nodes);
 });
 exports.decodeProof = decodeProof;
 const createProof = (nodes, entries) => __awaiter(void 0, void 0, void 0, function* () {
-    const result = yield (0, chopsticks_executor_1.create_proof)(nodes, entries);
-    return { trieRootHash: result[0], nodes: result[1] };
+    const worker = yield getWorker();
+    return worker.remote.createProof(nodes, entries);
 });
 exports.createProof = createProof;
 const runTask = (task, callback = exports.emptyTaskHandler) => __awaiter(void 0, void 0, void 0, function* () {
+    const worker = yield getWorker();
     logger.trace((0, logger_1.truncate)(task), 'taskRun');
-    const response = yield (0, chopsticks_executor_1.run_task)(task, callback, typeof process === 'object' ? process.env.RUST_LOG : 'info');
+    const response = yield worker.remote.runTask(task, Comlink.proxy(callback));
     if (response.Call) {
         logger.trace((0, logger_1.truncate)(response.Call), 'taskResponse');
     }
@@ -78,7 +114,7 @@ const taskHandler = (block) => {
                     pageSize: 1,
                     startKey: key,
                 });
-                return nextKey;
+                return nextKey && (0, utils_1.stripChildPrefix)(nextKey);
             });
         },
         offchainGetStorage: function (key) {
@@ -166,3 +202,12 @@ exports.getAuraSlotDuration = lodash_1.default.memoize((wasm, registry) => __awa
     const slotDuration = registry.createType('u64', (0, util_1.hexToU8a)(result.Call.result)).toNumber();
     return slotDuration;
 }));
+const releaseWorker = () => __awaiter(void 0, void 0, void 0, function* () {
+    if (!__executor_worker)
+        return;
+    const executor = yield __executor_worker;
+    executor.remote[Comlink.releaseProxy]();
+    yield executor.terminate();
+    __executor_worker = undefined;
+});
+exports.releaseWorker = releaseWorker;

package/lib/wasm-executor/node-wasm-executor.mjs

@@ -0,0 +1,34 @@
+import * as Comlink from 'comlink'
+import * as pkg from '@acala-network/chopsticks-executor'
+import { parentPort } from 'node:worker_threads'
+import nodeEndpoint from 'comlink/dist/umd/node-adapter.js'
+
+const getRuntimeVersion = async (code) => {
+	return pkg.get_runtime_version(code)
+}
+
+// trie_version: 0 for old trie, 1 for new trie
+const calculateStateRoot = async (entries, trie_version) => {
+	return pkg.calculate_state_root(entries, trie_version)
+}
+
+const decodeProof = async (trieRootHash, keys, nodes) => {
+	const decoded = await pkg.decode_proof(trieRootHash, keys, nodes)
+	return decoded.reduce((accum, [key, value]) => {
+		accum[key] = value
+		return accum
+	}, {})
+}
+
+const createProof = async (nodes, entries) => {
+	const result = await pkg.create_proof(nodes, entries)
+	return { trieRootHash: result[0], nodes: result[1] }
+}
+
+const runTask = async (task, callback) => {
+	return pkg.run_task(task, callback, process.env.RUST_LOG)
+}
+
+export const wasmExecutor = { runTask, getRuntimeVersion, calculateStateRoot, createProof, decodeProof }
+
+Comlink.expose(wasmExecutor, nodeEndpoint(parentPort))

package/lib/wasm-executor/node-worker.d.ts

@@ -0,0 +1,5 @@
+import type { WasmExecutor } from '.';
+export declare const startWorker: () => Promise<{
+    remote: import("comlink").Remote<WasmExecutor>;
+    terminate: () => Promise<void>;
+}>;

package/lib/wasm-executor/node-worker.js

@@ -0,0 +1,31 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.startWorker = void 0;
+const comlink_1 = require("comlink");
+const node_adapter_js_1 = __importDefault(require("comlink/dist/umd/node-adapter.js"));
+const node_worker_threads_1 = __importDefault(require("node:worker_threads"));
+const node_url_1 = __importDefault(require("node:url"));
+const startWorker = () => __awaiter(void 0, void 0, void 0, function* () {
+    const worker = new node_worker_threads_1.default.Worker(node_url_1.default.resolve(__filename, 'node-wasm-executor.mjs'), {
+        name: 'chopsticks-wasm-executor',
+    });
+    return {
+        remote: (0, comlink_1.wrap)((0, node_adapter_js_1.default)(worker)),
+        terminate: () => __awaiter(void 0, void 0, void 0, function* () {
+            yield worker.terminate();
+        }),
+    };
+});
+exports.startWorker = startWorker;

package/package.json

@@ -1,19 +1,21 @@
 {
   "name": "@acala-network/chopsticks-core",
-  "version": "0.8.2",
+  "version": "0.8.4",
   "author": "Acala Developers <hello@acala.network>",
   "license": "Apache-2.0",
   "scripts": {
     "clean": "rm -rf lib tsconfig.tsbuildinfo",
-    "pack-wasm": "scripts/pack-wasm.js",
-    "build": "yarn pack-wasm; tsc -p ./tsconfig.json",
+    "pack-wasm": "scripts/pack-wasm.cjs",
+    "build": "yarn pack-wasm; tsc -p ./tsconfig.json; yarn copyfiles",
+    "copyfiles": "cp -r src/wasm-executor/*.mjs lib/wasm-executor/",
     "docs:prep": "typedoc"
   },
   "dependencies": {
-    "@acala-network/chopsticks-executor": "0.8.2",
+    "@acala-network/chopsticks-executor": "0.8.4",
     "@polkadot/api": "^10.9.1",
     "@polkadot/util-crypto": "^12.3.2",
     "axios": "^1.5.1",
+    "comlink": "^4.4.1",
     "eventemitter3": "^5.0.1",
     "localforage": "^1.10.0",
     "lodash": "^4.17.21",