Fix Blocking behavior in Node.js bindings

bindings/nodejs/CHANGELOG.md

@@ -19,6 +19,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Security -->
 
+## 1.0.9 - 2023-09-06
+
+### Fixed
+
+- The main thread gets blocked when calling client or wallet methods;
+
 ## 1.0.8 - 2023-09-05
 
 ### Added

bindings/nodejs/src/client.rs

@@ -86,7 +86,6 @@ pub fn call_client_method(mut cx: FunctionContext) -> JsResult<JsUndefined> {
     let method_handler = Arc::clone(&cx.argument::<JsBox<ClientMethodHandlerWrapper>>(1)?.0);
     let callback = cx.argument::<JsFunction>(2)?.root(&mut cx);
 
-    let (sender, receiver) = std::sync::mpsc::channel();
     crate::RUNTIME.spawn(async move {
         if let Some(method_handler) = &*method_handler.read().await {
             let (response, is_error) = method_handler.call_method(method).await;
@@ -108,18 +107,10 @@ pub fn call_client_method(mut cx: FunctionContext) -> JsResult<JsUndefined> {
                 Ok(())
             });
         } else {
-            // Notify that the client got destroyed
-            // Safe to unwrap because the receiver is waiting on it
-            sender.send(()).unwrap();
+            panic!("Client got destroyed")
         }
     });
 
-    if receiver.recv().is_ok() {
-        return cx.throw_error(
-            serde_json::to_string(&Response::Panic("Client got destroyed".to_string())).expect("json to string error"),
-        );
-    }
-
     Ok(cx.undefined())
 }
 

bindings/nodejs/src/wallet.rs

@@ -103,7 +103,6 @@ pub fn call_wallet_method(mut cx: FunctionContext) -> JsResult<JsUndefined> {
     let method_handler = Arc::clone(&cx.argument::<JsBox<WalletMethodHandlerWrapper>>(1)?.0);
     let callback = cx.argument::<JsFunction>(2)?.root(&mut cx);
 
-    let (sender, receiver) = std::sync::mpsc::channel();
     crate::RUNTIME.spawn(async move {
         if let Some(method_handler) = &*method_handler.read().await {
             let (response, is_error) = method_handler.call_method(method).await;
@@ -125,18 +124,10 @@ pub fn call_wallet_method(mut cx: FunctionContext) -> JsResult<JsUndefined> {
                 Ok(())
             });
         } else {
-            // Notify that the wallet got destroyed
-            // Safe to unwrap because the receiver is waiting on it
-            sender.send(()).unwrap();
+            panic!("Wallet got destroyed")
         }
     });
 
-    if receiver.recv().is_ok() {
-        return cx.throw_error(
-            serde_json::to_string(&Response::Panic("Wallet got destroyed".to_string())).expect("json to string error"),
-        );
-    }
-
     Ok(cx.undefined())
 }
 

bindings/nodejs/tests/wallet/wallet.spec.ts

@@ -132,53 +132,6 @@ describe('Wallet', () => {
         await recreatedWallet.destroy()
         removeDir(storagePath)
     }, 20000);
-
-    it('error after destroy', async () => {
-        let storagePath = 'test-error-after-destroy';
-        removeDir(storagePath);
-
-        const walletOptions = {
-            storagePath,
-            clientOptions: {
-                nodes: ['https://api.testnet.shimmer.network'],
-            },
-            coinType: CoinType.Shimmer,
-            secretManager: {
-                stronghold: {
-                    snapshotPath: `./${storagePath}/wallet.stronghold`,
-                    password: `A12345678*`,
-                },
-            },
-        };
-
-        const wallet = new Wallet(walletOptions);
-        await wallet.storeMnemonic(
-            'vital give early extra blind skin eight discover scissors there globe deal goat fat load robot return rate fragile recycle select live ordinary claim',
-        );
-
-        const account = await wallet.createAccount({
-            alias: 'Alice',
-        });
-
-        expect(account.getMetadata().index).toStrictEqual(0);
-
-        await wallet.destroy();
-
-        try {
-            const accounts = await wallet.getAccounts();
-            throw 'Should return an error because the wallet got destroyed';
-        } catch (err: any) {
-            expect(err).toContain('Wallet got destroyed');
-        }
-
-        try {
-            const client = await wallet.getClient();
-            throw 'Should return an error because the wallet got destroyed';
-        } catch (err: any) {
-            expect(err).toContain('Wallet got destroyed');
-        }
-        removeDir(storagePath)
-    }, 35000);
 })
 
 function removeDir(storagePath: string) {