wasm-client: close client conn in a goroutine

Close the client connection in a goroutine. This fixes a bug that was
introduced with the upgrade to grpc v0.18.1. The caused the websocket
to freeze during closure when the client disconnected, and therefore
the entire wasm-client would freeze.
When closing the connection in a goroutine, the websocket is closed
correctly.

Author: ViktorTigerstrom

cmd/wasm-client/main.go

@@ -288,12 +288,29 @@ func (w *wasmClient) IsConnected(_ js.Value, _ []js.Value) interface{} {
 	return js.ValueOf(w.lndConn != nil)
 }
 
-func (w *wasmClient) Disconnect(_ js.Value, _ []js.Value) interface{} {
+// Disconnect disconnects the client, and closes the connection.
+// The first argument passed should be a onDisconnect callback, which will be
+// invoked once the client has disconnected.
+func (w *wasmClient) Disconnect(_ js.Value, args []js.Value) interface{} {
 	if w.lndConn != nil {
-		if err := w.lndConn.Close(); err != nil {
-			log.Errorf("Error closing RPC connection: %v", err)
-		}
-		w.lndConn = nil
+		// We launch the closure of the connection in a goroutine to
+		// avoid that the JS websocket freezes and blocks while closing.
+		go func() {
+			if err := w.lndConn.Close(); err != nil {
+				log.Errorf("Error closing RPC connection: %v",
+					err)
+			}
+			w.lndConn = nil
+
+			// We expect the first arg to be the onDisconnect
+			// callback
+			if len(args) > 0 && args[0].Type() == js.TypeFunction {
+				callback := args[0]
+
+				// Call the onDisconnect callback.
+				callback.Invoke()
+			}
+		}()
 	}
 
 	return nil

example/index.html

@@ -98,8 +98,10 @@
     }
 
     async function disconnect() {
-        window[namespace].wasmClientDisconnect();
+        window[namespace].wasmClientDisconnect(onDisconnect);
+    }
 
+    function onDisconnect() {
         document.getElementById('disconnectBtn').disabled = true;
         document.getElementById('reconnectBtn').disabled = false;
         document.getElementById('ready').style.display= 'none' ;