feat: updating wasm loader

Author: jurevans

src/index.ts

@@ -63,3 +63,12 @@ export { PhraseSize } from "./mnemonic";
 export type { Mnemonic } from "./mnemonic";
 export type { Signing } from "./signing";
 export type { Tx } from "./tx";
+
+// Export SDK initializer and types
+export { initSdk } from "wasm";
+export type {
+  WasmTarget,
+  SdkBuildOptions,
+  SdkWasmOptions,
+  InitProps,
+} from "wasm";

src/wasm/index.ts

@@ -1,9 +1,10 @@
 import { Proposal, Proposals } from "./borsh-schemas";
 // TODO: How to handle these imports?
-import { Query as RustQuery } from "./web/sdk-multicore";
-export * from "./web/sdk-multicore";
+import { Query as RustQuery } from "./web/sdk";
+export * from "./web/sdk";
 export * from "./types";
 export * from "./utils";
+export * from "./loader";
 
 type TimeoutOpts = {
   // Timeout in milliseconds
@@ -60,3 +61,4 @@ export class Query extends RustQuery {
 
 export * from "./types";
 export { Proposal, Proposals };
+export { initSdk } from "wasm/loader";

src/wasm/init-inline.ts

@@ -1,6 +1,6 @@
 // TODO: How to handle these imports?
-import initWasm, { InitOutput } from "./web/sdk-multicore";
+import initWasm, { InitOutput } from "./web/sdk";
 // @ts-ignore
-import wasm from "./web/sdk-multicore/sdk_bg.wasm?url";
+import wasm from "./web/sdk/sdk_bg.wasm?url";
 
 export const init: () => Promise<InitOutput> = async () => await initWasm(wasm);

src/wasm/init-thread-pool.ts

@@ -1,2 +1,2 @@
 // TODO: Fix this export
-export { initThreadPool } from "./web/sdk-multicore";
+export { initThreadPool } from "./web/sdk";

src/wasm/init.ts

@@ -1,4 +1,4 @@
-import initWasm, { InitInput, InitOutput } from "./web/sdk-multicore";
+import initWasm, { InitInput, InitOutput } from "./web/sdk";
 
 export const init: (wasm: InitInput) => Promise<InitOutput> = async (wasm) => {
   return await initWasm(wasm);

src/wasm/loader/index.ts

@@ -0,0 +1,4 @@
+export * from "./web";
+export * from "./node";
+export * from "./types";
+export * from "./init";

src/wasm/loader/init.ts

@@ -0,0 +1,46 @@
+import { Sdk } from "sdk";
+import {
+  InitializedWasm,
+  InitProps,
+  SdkBuildOptions,
+  SdkWasmOptions,
+} from "./types";
+import { initializeWeb } from "./web";
+import { initializeNode } from "./node";
+
+// Load and initialize SDK according to options
+const initializeSdk = async (
+  buildOpts: SdkBuildOptions,
+  sdkOpts: SdkWasmOptions,
+): Promise<InitializedWasm> => {
+  const { target } = buildOpts;
+
+  if (target === "web") {
+    return initializeWeb(buildOpts, sdkOpts);
+  } else {
+    return initializeNode(buildOpts, sdkOpts);
+  }
+};
+
+/**
+ * Public initializer for SDK
+ */
+export const initSdk = async (props: InitProps) => {
+  const { rpcUrl, token, maspIndexerUrl, dbName = "", options } = props;
+  const target = options?.target ?? "web";
+  const multicore = options?.multicore ?? false;
+  const inline = options?.inline ?? false;
+
+  // Import and initialize wasm
+  const { cryptoMemory, query, sdk } = await initializeSdk(
+    { target, multicore, inline },
+    {
+      rpcUrl,
+      token,
+      maspIndexerUrl,
+      dbName,
+    },
+  );
+
+  return new Sdk(sdk, query, cryptoMemory, rpcUrl, token);
+};

src/wasm/loader/node.ts

@@ -0,0 +1,37 @@
+import { InitializedWasm, SdkBuildOptions, SdkWasmOptions } from "./types";
+
+export const initializeNode = async (
+  buildOpts: SdkBuildOptions,
+  sdkOpts: SdkWasmOptions,
+): Promise<InitializedWasm> => {
+  const { target, multicore } = buildOpts;
+  const { rpcUrl, maspIndexerUrl, dbName, token } = sdkOpts;
+  const sdkPath = `./${target}/sdk${multicore ? "-multicore" : ""}`;
+  const wasmPath = `${sdkPath}/sdk_bg.wasm`;
+  const wasm = await import(wasmPath);
+
+  if (multicore) {
+    const {
+      default: initWasmSync,
+      Sdk: SdkWasm,
+      Query: QueryWasm,
+      initThreadPool,
+    } = await import(sdkPath);
+    const { cryptoMemory } = initWasmSync(wasm);
+    await initThreadPool(navigator.hardwareConcurrency);
+    const sdk = new SdkWasm(rpcUrl, token, dbName);
+    const query = new QueryWasm(rpcUrl, maspIndexerUrl);
+    return { cryptoMemory, query, sdk };
+  } else {
+    const {
+      default: initWasmSync,
+      Sdk: SdkWasm,
+      Query: QueryWasm,
+    } = await import(sdkPath);
+    const cryptoMemory = (crypto as any).__wasm.memory;
+    initWasmSync(wasm);
+    const sdk = new SdkWasm(rpcUrl, token, dbName);
+    const query = new QueryWasm(rpcUrl, maspIndexerUrl);
+    return { cryptoMemory, query, sdk };
+  }
+};

src/wasm/loader/types.ts

@@ -0,0 +1,24 @@
+import type { Sdk as SdkWasmType, Query as QueryWasmType } from "wasm/web/sdk";
+
+export type WasmTarget = "web" | "nodejs";
+export type SdkBuildOptions = {
+  target?: WasmTarget;
+  multicore?: boolean;
+  inline?: boolean;
+};
+
+export type SdkWasmOptions = {
+  rpcUrl: string;
+  token: string;
+  maspIndexerUrl?: string;
+  dbName?: string;
+};
+export type InitProps = SdkWasmOptions & {
+  options?: SdkBuildOptions;
+};
+
+export type InitializedWasm = {
+  sdk: SdkWasmType;
+  query: QueryWasmType;
+  cryptoMemory: WebAssembly.Memory;
+};

src/wasm/loader/web.ts

@@ -0,0 +1,27 @@
+import { InitializedWasm, SdkBuildOptions, SdkWasmOptions } from "./types";
+
+export const initializeWeb = async (
+  buildOpts: SdkBuildOptions,
+  sdkOpts: SdkWasmOptions,
+): Promise<InitializedWasm> => {
+  const { target, multicore, inline } = buildOpts;
+  const { rpcUrl, maspIndexerUrl, dbName, token } = sdkOpts;
+  const sdkPath = `./${target}/sdk${multicore ? "-multicore" : ""}`;
+  const wasmPath = `${sdkPath}/sdk_bg.wasm${inline ? "?url" : ""}`;
+  const wasm = await import(wasmPath);
+
+  const {
+    default: initWasm,
+    Sdk: SdkWasm,
+    Query: QueryWasm,
+  } = await import(sdkPath);
+
+  const { cryptoMemory } = initWasm(wasm);
+  const sdk = new SdkWasm(rpcUrl, token, dbName);
+  const query = new QueryWasm(rpcUrl, maspIndexerUrl);
+  return {
+    cryptoMemory,
+    query,
+    sdk,
+  };
+};

src/wasm/types.ts

@@ -1,4 +1,4 @@
-import { TxType } from "./web/sdk-multicore";
+import { TxType } from "./web/sdk";
 
 export type SupportedTx = Extract<
   TxType,