Merge wasm bindings

.github/workflows/bindings-wallet-wasm-publish.yml → .github/workflows/bindings-wasm-publish.yml

@@ -1,4 +1,4 @@
-name: Wasm publish to NPM (wallet)
+name: Wasm publish to NPM
 
 on: workflow_dispatch
 
@@ -11,7 +11,7 @@ jobs:
 
     defaults:
       run:
-        working-directory: wallet/bindings/wasm
+        working-directory: bindings/wasm
 
     steps:
       - uses: actions/checkout@v3

.github/workflows/bindings-wallet-wasm.yml → .github/workflows/bindings-wasm.yml

@@ -1,5 +1,4 @@
-name: Wasm bindings checks (wallet)
-
+name: Wasm bindings checks
 on:
   push:
     branches: [develop, production]
@@ -12,9 +11,9 @@ on:
       - "!**/tests/**" # Exclude all tests
       - "!cli/**" # Exclude CLI
       - "!**/bindings/**" # Exclude all bindings
-      - "sdk/src/wallet/bindings/wasm/**"
-      - "sdk/src/wallet/bindings/nodejs/**"
-      - ".github/workflows/bindings-wallet-wasm.yml"
+      - "bindings/wasm/**"
+      - "bindings/nodejs/**"
+      - ".github/workflows/bindings-wasm.yml"
   pull_request:
     branches: [develop, production]
     paths:
@@ -26,9 +25,9 @@ on:
       - "!**/tests/**" # Exclude all tests
       - "!cli/**" # Exclude CLI
       - "!**/bindings/**" # Exclude all bindings
-      - "sdk/src/wallet/bindings/wasm/**"
-      - "sdk/src/wallet/bindings/nodejs/**"
-      - ".github/workflows/bindings-wallet-wasm.yml"
+      - "bindings/wasm/**"
+      - "bindings/nodejs/**"
+      - ".github/workflows/bindings-wasm.yml"
   schedule:
     - cron: "0 1 * * *"
   workflow_dispatch:
@@ -60,7 +59,7 @@ jobs:
         uses: ./.github/actions/setup-rust
         with:
           target: wasm32-unknown-unknown
-          cache-root: sdk/src/wallet/bindings/wasm
+          cache-root: bindings/wasm
 
       # Download a pre-compiled wasm-bindgen binary.
       - name: Install wasm-bindgen-cli
@@ -73,14 +72,14 @@ jobs:
         with:
           node-version: ${{ matrix.node }}
           cache: yarn
-          cache-dependency-path: sdk/src/wallet/bindings/wasm/yarn.lock
+          cache-dependency-path: bindings/wasm/yarn.lock
 
       - name: Run Yarn Install
-        working-directory: sdk/src/wallet/bindings/wasm/
+        working-directory: bindings/wasm/
         run: yarn install
 
       - name: Run Yarn Build
-        working-directory: sdk/src/wallet/bindings/wasm/
+        working-directory: bindings/wasm/
         run: yarn build
 
       - name: Start private tangle
@@ -89,12 +88,12 @@ jobs:
 
       - name: Run Yarn Test
         if: ${{ startsWith(matrix.os, 'ubuntu') }}
-        working-directory: sdk/src/wallet/bindings/wasm/
+        working-directory: bindings/wasm/
         run: yarn test
 
       - name: Run Yarn Test
         if: ${{ !startsWith(matrix.os, 'ubuntu') }}
-        working-directory: sdk/src/wallet/bindings/wasm/
+        working-directory: bindings/wasm/
         # Only run test that doesn't require a node because we can't use the private tangle script on macos and windows
         run: yarn test -t 'Wallet methods'
 
@@ -115,15 +114,15 @@ jobs:
         uses: actions/setup-node@v2
         with:
           cache: yarn
-          cache-dependency-path: sdk/src/wallet/bindings/wasm/yarn.lock
+          cache-dependency-path: bindings/wasm/yarn.lock
           node-version: 18.x
 
       - name: Install Dependencies
-        working-directory: sdk/src/wallet/bindings/wasm/
+        working-directory: bindings/wasm/
         run: yarn install --ignore-scripts
 
       - name: Lint
-        working-directory: sdk/src/wallet/bindings/wasm/
+        working-directory: bindings/wasm/
         run: yarn lint
 
   check-format:
@@ -139,13 +138,13 @@ jobs:
         uses: actions/setup-node@v2
         with:
           cache: yarn
-          cache-dependency-path: sdk/src/wallet/bindings/wasm/yarn.lock
+          cache-dependency-path: bindings/wasm/yarn.lock
           node-version: 18.x
 
       - name: Install Dependencies
-        working-directory: sdk/src/wallet/bindings/wasm/
+        working-directory: bindings/wasm/
         run: yarn install --ignore-scripts
 
       - name: Format
-        working-directory: sdk/src/wallet/bindings/wasm/
+        working-directory: bindings/wasm/
         run: yarn format-check

Cargo.toml

@@ -4,14 +4,13 @@ members = [
 	"bindings/core",
 	"bindings/nodejs",
 	"bindings/python",
+	"bindings/wasm",
 	"cli",
 	"sdk",
 	"sdk/src/client/bindings/java/lib/native",
-	"sdk/src/client/bindings/wasm",
 	"sdk/src/wallet/bindings/java/lib/native",
 	"sdk/src/wallet/bindings/nodejs",
-	"sdk/src/wallet/bindings/swift",
-	"sdk/src/wallet/bindings/wasm"
+	"sdk/src/wallet/bindings/swift"
 ]
 
 [profile.dev]

bindings/core/src/lib.rs

@@ -22,12 +22,12 @@ use serde::Deserialize;
 
 #[cfg(feature = "mqtt")]
 pub use self::method_handler::listen_mqtt;
+#[cfg(not(target_family = "wasm"))]
+pub use self::method_handler::CallMethod;
 pub use self::{
     error::{Error, Result},
     method::{AccountMethod, ClientMethod, SecretManagerMethod, UtilsMethod, WalletMethod},
-    method_handler::{
-        call_client_method, call_secret_manager_method, call_utils_method, call_wallet_method, CallMethod,
-    },
+    method_handler::{call_client_method, call_secret_manager_method, call_utils_method, call_wallet_method},
     response::Response,
 };
 

bindings/core/src/method_handler/call_method.rs

@@ -24,29 +24,29 @@ pub trait CallMethod {
     type Method;
 
     // This uses a manual async_trait-like impl because it's not worth it to import the lib for one trait
-    fn call_method<'a>(&'a self, method: Self::Method) -> Pin<Box<dyn Future<Output = Response> + Send + 'a>>;
+    fn call_method<'a>(&'a self, method: Self::Method) -> Pin<Box<dyn Future<Output = Response> + 'a>>;
 }
 
 impl CallMethod for Client {
     type Method = ClientMethod;
 
-    fn call_method<'a>(&'a self, method: Self::Method) -> Pin<Box<dyn Future<Output = Response> + Send + 'a>> {
+    fn call_method<'a>(&'a self, method: Self::Method) -> Pin<Box<dyn Future<Output = Response> + 'a>> {
         Box::pin(call_client_method(self, method))
     }
 }
 
 impl CallMethod for Wallet {
     type Method = WalletMethod;
 
-    fn call_method<'a>(&'a self, method: Self::Method) -> Pin<Box<dyn Future<Output = Response> + Send + 'a>> {
+    fn call_method<'a>(&'a self, method: Self::Method) -> Pin<Box<dyn Future<Output = Response> + 'a>> {
         Box::pin(call_wallet_method(self, method))
     }
 }
 
 impl CallMethod for SecretManager {
     type Method = SecretManagerMethod;
 
-    fn call_method<'a>(&'a self, method: Self::Method) -> Pin<Box<dyn Future<Output = Response> + Send + 'a>> {
+    fn call_method<'a>(&'a self, method: Self::Method) -> Pin<Box<dyn Future<Output = Response> + 'a>> {
         Box::pin(call_secret_manager_method(self, method))
     }
 }

bindings/nodejs/lib/bindings.ts

@@ -0,0 +1,105 @@
+// Copyright 2023 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+import type { EventType } from '../types/wallet';
+import type { WalletMethodHandler } from './wallet/WalletMethodHandler';
+import { __UtilsMethods__ } from '../types/utils';
+import type { SecretManagerMethodHandler } from './secretManager/SecretManagerMethodHandler';
+import type { ClientMethodHandler } from './client/ClientMethodHandler';
+
+// @ts-ignore: path is set to match runtime transpiled js path
+import addon = require('../../../build/Release/index.node');
+
+const {
+    callUtilsMethodRust,
+    callSecretManagerMethod,
+    createSecretManager,
+    initLogger,
+    callClientMethod,
+    createClient,
+    listenMqtt,
+    callWalletMethod,
+    createWallet,
+    listenWallet,
+    destroyWallet,
+    getClientFromWallet,
+} = addon;
+
+const callClientMethodAsync = (
+    method: string,
+    handler: ClientMethodHandler,
+): Promise<string> =>
+    new Promise((resolve, reject) => {
+        callClientMethod(method, handler, (error: Error, result: string) => {
+            if (error) {
+                reject(error);
+            } else {
+                resolve(result);
+            }
+        });
+    });
+
+const callSecretManagerMethodAsync = (
+    method: string,
+    handler: SecretManagerMethodHandler,
+): Promise<string> =>
+    new Promise((resolve, reject) => {
+        callSecretManagerMethod(
+            method,
+            handler,
+            (error: Error, result: string) => {
+                if (error) {
+                    reject(error);
+                } else {
+                    resolve(result);
+                }
+            },
+        );
+    });
+
+const callUtilsMethod = (method: __UtilsMethods__): any => {
+    const response = JSON.parse(callUtilsMethodRust(JSON.stringify(method)));
+    if (response.type == 'error' || response.type == 'panic') {
+        throw response;
+    } else {
+        return response.payload;
+    }
+};
+
+const listenWalletAsync = (
+    eventTypes: EventType[],
+    callback: (error: Error, result: string) => void,
+    handler: WalletMethodHandler,
+): Promise<void> => {
+    listenWallet(eventTypes, callback, handler);
+    return Promise.resolve();
+};
+
+const callWalletMethodAsync = (
+    method: string,
+    handler: WalletMethodHandler,
+): Promise<string> =>
+    new Promise((resolve, reject) => {
+        callWalletMethod(method, handler, (error: Error, result: string) => {
+            if (error) {
+                reject(error);
+            } else {
+                resolve(result);
+            }
+        });
+    });
+
+export {
+    initLogger,
+    createClient,
+    createSecretManager,
+    createWallet,
+    callClientMethodAsync,
+    callSecretManagerMethodAsync,
+    callUtilsMethod,
+    callWalletMethodAsync,
+    destroyWallet,
+    listenWalletAsync,
+    getClientFromWallet,
+    listenMqtt,
+};

bindings/nodejs/lib/client/ClientMethodHandler.ts

@@ -1,7 +1,7 @@
 // Copyright 2023 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-import { callMethodAsync, createClient, listenMqtt } from './bindings';
+import { callClientMethodAsync, createClient, listenMqtt } from '../bindings';
 import type { IClientOptions, __ClientMethods__ } from '../../types/client';
 
 /** The MethodHandler which sends the commands to the Rust side. */
@@ -18,7 +18,10 @@ export class ClientMethodHandler {
     }
 
     async callMethod(method: __ClientMethods__): Promise<string> {
-        return callMethodAsync(JSON.stringify(method), this.methodHandler);
+        return callClientMethodAsync(
+            JSON.stringify(method),
+            this.methodHandler,
+        );
     }
 
     // MQTT