Fix AlreadyDestroyedError not being actually thrown (#438)

* Fix AlreadyDestroyedError not being actually thrown * PR link * Fix sendJsonRpc
smol-dot · Apr 19, 2023 · e92d1b0 · e92d1b0
1 parent bfe29cf
commit e92d1b0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/wasm-node/CHANGELOG.md b/wasm-node/CHANGELOG.md
@@ -7,6 +7,10 @@
 - As NodeJS v14 reaches its end of life on April 30th 2023, the minimum NodeJS version required to run smoldot is now v16. The smoldot Wasm binary now has SIMD enabled, meaning that the minimum Deno version required to run smoldot is now v1.9.
 - When receiving an identify request through the libp2p protocol, smoldot now sends back `smoldot-light-wasm vX.X.X` (with proper version numbers) as its agent name and version, instead of previously just `smoldot`. ([#417](https://github.com/smol-dot/smoldot/pull/417))
 
+### Fixed
+
+- Fix `AlreadyDestroyedError` not being properly thrown if a function is called after `terminate()`. ([#438](https://github.com/smol-dot/smoldot/pull/438))
+
 ## 1.0.2 - 2023-04-12
 
 ### Changed

diff --git a/wasm-node/javascript/src/client.ts b/wasm-node/javascript/src/client.ts
@@ -391,11 +391,11 @@ export function start(options: ClientOptions, platformBindings: PlatformBindings
   // For each chain object returned by `addChain`, the associated internal chain id.
   //
   // Immediately cleared when `remove()` is called on a chain.
-  let chainIds: WeakMap<Chain, number> = new WeakMap();
+  const chainIds: WeakMap<Chain, number> = new WeakMap();
 
   // If `Client.terminate()̀  is called, this error is set to a value.
   // All the functions of the public API check if this contains a value.
-  let alreadyDestroyedError: null | AlreadyDestroyedError = null;
+  const alreadyDestroyedError: { value: null | AlreadyDestroyedError } = { value: null };
 
   const instance = startInstance({
     // Maximum level of log entries sent by the client.
@@ -411,8 +411,8 @@ export function start(options: ClientOptions, platformBindings: PlatformBindings
 
   return {
     addChain: async (options: AddChainOptions): Promise<Chain> => {
-      if (alreadyDestroyedError)
-        throw alreadyDestroyedError;
+      if (alreadyDestroyedError.value)
+        throw alreadyDestroyedError.value;
 
       // Passing a JSON object for the chain spec is an easy mistake, so we provide a more
       // readable error.
@@ -443,8 +443,8 @@ export function start(options: ClientOptions, platformBindings: PlatformBindings
       // Resolve the promise that `addChain` returned to the user.
       const newChain: Chain = {
         sendJsonRpc: (request) => {
-          if (alreadyDestroyedError)
-            throw alreadyDestroyedError;
+          if (alreadyDestroyedError.value)
+            throw alreadyDestroyedError.value;
           if (wasDestroyed.destroyed)
             throw new AlreadyDestroyedError();
           if (options.disableJsonRpc)
@@ -455,17 +455,17 @@ export function start(options: ClientOptions, platformBindings: PlatformBindings
           instance.request(request, chainId);
         },
         nextJsonRpcResponse: () => {
-          if (alreadyDestroyedError)
-            return Promise.reject(alreadyDestroyedError);
+          if (alreadyDestroyedError.value)
+            return Promise.reject(alreadyDestroyedError.value);
           if (wasDestroyed.destroyed)
             return Promise.reject(new AlreadyDestroyedError());
           if (options.disableJsonRpc)
             return Promise.reject(new JsonRpcDisabledError());
           return instance.nextJsonRpcResponse(chainId);
         },
         remove: () => {
-          if (alreadyDestroyedError)
-            throw alreadyDestroyedError;
+          if (alreadyDestroyedError.value)
+            throw alreadyDestroyedError.value;
           if (wasDestroyed.destroyed)
             throw new AlreadyDestroyedError();
           wasDestroyed.destroyed = true;
@@ -479,9 +479,9 @@ export function start(options: ClientOptions, platformBindings: PlatformBindings
       return newChain;
     },
     terminate: async () => {
-      if (alreadyDestroyedError)
-        throw alreadyDestroyedError
-      alreadyDestroyedError = new AlreadyDestroyedError();
+      if (alreadyDestroyedError.value)
+        throw alreadyDestroyedError.value
+      alreadyDestroyedError.value = new AlreadyDestroyedError();
       instance.startShutdown()
     }
   }