Fix panic when removing a chain while querying next response (#1025)

smol-dot · Aug 13, 2023 · ba53e57 · ba53e57
1 parent 1986f83
commit ba53e57
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/wasm-node/CHANGELOG.md b/wasm-node/CHANGELOG.md
@@ -13,6 +13,7 @@
 - Fix panic when removing a chain while a networking connection is being opened. ([#1011](https://github.com/smol-dot/smoldot/pull/1011))
 - Fix epoch start slot calculation when epochs have been skipped. ([#1015](https://github.com/smol-dot/smoldot/pull/1015))
 - Fix timeouts not working properly in the networking. ([#1023](https://github.com/smol-dot/smoldot/pull/1023), [#1026](https://github.com/smol-dot/smoldot/pull/1026))
+- Fix panic when calling `Chain.remove` while `Chain.nextJsonRpcResponse` is in progress. ([#1025](https://github.com/smol-dot/smoldot/pull/1025))
 
 ## 1.0.15 - 2023-08-08
 

diff --git a/wasm-node/javascript/src/internals/client.ts b/wasm-node/javascript/src/internals/client.ts
@@ -547,12 +547,11 @@ export function start(options: ClientOptions, wasmModule: SmoldotBytecode | Prom
                     }
                 },
                 nextJsonRpcResponse: async () => {
-                    if (!state.chains.has(chainId))
-                        throw new AlreadyDestroyedError();
-                    if (options.disableJsonRpc)
-                        return Promise.reject(new JsonRpcDisabledError());
-
                     while (true) {
+                        if (!state.chains.has(chainId))
+                            throw new AlreadyDestroyedError();
+                        if (options.disableJsonRpc)
+                            return Promise.reject(new JsonRpcDisabledError());
                         if (state.instance.status === "destroyed")
                             throw state.instance.error;
                         if (state.instance.status !== "ready")

diff --git a/wasm-node/javascript/src/internals/remote-instance.ts b/wasm-node/javascript/src/internals/remote-instance.ts
@@ -291,8 +291,8 @@ export async function startInstanceServer(config: ServerConfig, initPortToClient
                 // from within the events callback itself.
                 // TODO: do better than setTimeout?
                 setTimeout(() => {
-                    const numAccepted = state.acceptedJsonRpcResponses.get(event.chainId)!;
-                    if (numAccepted == 0)
+                    const numAccepted = state.acceptedJsonRpcResponses.get(event.chainId);
+                    if (numAccepted === undefined || numAccepted === 0)
                         return;
                     const response = state.instance!.peekJsonRpcResponse(event.chainId);
                     if (response) {
@@ -345,6 +345,7 @@ export async function startInstanceServer(config: ServerConfig, initPortToClient
                 break;
             }
             case "remove-chain": {
+                state.acceptedJsonRpcResponses.delete(message.chainId);
                 state.instance!.removeChain(message.chainId);
                 break;
             }