@acala-network/chopsticks-core 0.8.0-1 → 0.8.0-2

package/lib/db/browser.d.ts

@@ -1,2 +1,2 @@
 import { DataSource } from 'typeorm';
-export declare const openDb: (dbPath: string) => Promise<DataSource>;
+export declare const openDb: (sqlWasmUrl: URL) => Promise<DataSource>;

package/lib/db/browser.js

@@ -40,17 +40,14 @@ const typeorm_1 = require("typeorm");
 const localforage_1 = require("localforage");
 const sql_js_1 = __importDefault(require("sql.js"));
 const entities = __importStar(require("./entities"));
-const openDb = (dbPath) => __awaiter(void 0, void 0, void 0, function* () {
+const openDb = (sqlWasmUrl) => __awaiter(void 0, void 0, void 0, function* () {
     if (!globalThis.localforage) {
         globalThis.localforage = (0, localforage_1.createInstance)({ name: 'chopsticks' });
     }
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    const wasmUrl = new URL('../../../../node_modules/sql.js/dist/sql-wasm.wasm', import.meta.url);
-    const wasmBinary = yield fetch(wasmUrl).then((response) => response.arrayBuffer());
+    const wasmBinary = yield fetch(sqlWasmUrl).then((response) => response.arrayBuffer());
     const source = new typeorm_1.DataSource({
         type: 'sqljs',
-        location: dbPath,
+        location: 'cache',
         entities: Object.values(entities),
         synchronize: true,
         autoSave: true,

package/lib/db/index.d.ts

@@ -1 +1 @@
-export declare const openDb: (dbPath: string) => Promise<import("typeorm").DataSource>;
+export declare const openDb: (dbPath: string | URL) => Promise<import("typeorm").DataSource>;

package/lib/db/index.js

@@ -34,11 +34,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.openDb = void 0;
 const openDb = (dbPath) => __awaiter(void 0, void 0, void 0, function* () {
-    if (typeof window === 'undefined') {
-        return (yield Promise.resolve().then(() => __importStar(require('./node')))).openDb(dbPath);
+    if (dbPath instanceof URL) {
+        return (yield Promise.resolve().then(() => __importStar(require('./browser')))).openDb(dbPath);
     }
     else {
-        return (yield Promise.resolve().then(() => __importStar(require('./browser')))).openDb(dbPath);
+        return (yield Promise.resolve().then(() => __importStar(require('./node')))).openDb(dbPath);
     }
 });
 exports.openDb = openDb;

package/lib/executor.js

@@ -1,27 +1,4 @@
 "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) {
@@ -39,14 +16,10 @@ exports.getAuraSlotDuration = exports.emptyTaskHandler = exports.taskHandler = e
 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 chopsticks_executor_1 = __importStar(require("@acala-network/chopsticks-executor"));
 const logger = logger_1.defaultLogger.child({ name: 'executor' });
-// init wasm on browser
-if (typeof chopsticks_executor_1.default === 'function') {
-    (0, chopsticks_executor_1.default)();
-}
 const getRuntimeVersion = (code) => __awaiter(void 0, void 0, void 0, function* () {
     return (0, chopsticks_executor_1.get_runtime_version)(code).then((version) => {
         version.specName = (0, util_1.hexToString)(version.specName);

package/lib/setup.d.ts

@@ -8,7 +8,7 @@ type Options = {
     block?: string | number | null;
     genesis?: string | Genesis;
     buildBlockMode?: BuildBlockMode;
-    db?: string;
+    db?: string | URL;
     mockSignatureHost?: boolean;
     allowUnresolvedImports?: boolean;
     runtimeLogLevel?: number;

package/lib/setup.js

@@ -49,6 +49,11 @@ const setup = (options) => __awaiter(void 0, void 0, void 0, function* () {
     logger_1.defaultLogger.debug(Object.assign(Object.assign({}, options), { blockHash }), 'Args');
     let db;
     if (options.db) {
+        if (typeof window !== 'undefined') {
+            if (!(options.db instanceof URL)) {
+                throw new Error('options.db must be an URL to sql-wasm.wasm when running in browser');
+            }
+        }
         db = yield (0, db_1.openDb)(options.db);
     }
     const header = yield api.getHeader(blockHash);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/chopsticks-core",
-  "version": "0.8.0-1",
+  "version": "0.8.0-2",
   "author": "Bryan Chen <xlchen1291@gmail.com>",
   "license": "Apache-2.0",
   "scripts": {
@@ -8,7 +8,7 @@
     "build": "tsc -p ./tsconfig.json"
   },
   "dependencies": {
-    "@acala-network/chopsticks-executor": "0.8.0-1",
+    "@acala-network/chopsticks-executor": "0.8.0-2",
     "@polkadot/api": "^10.9.1",
     "axios": "^1.4.0",
     "eventemitter3": "^5.0.1",