From 535c400a69d752111bf35c833ded9d5b99735ae0 Mon Sep 17 00:00:00 2001
From: Josh Babb <sneurlax@gmail.com>
Date: Wed, 24 May 2023 16:06:56 -0500
Subject: [PATCH] re-add mutex; release in doneHandler

---
 lib/electrumx_rpc/rpc.dart | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/electrumx_rpc/rpc.dart b/lib/electrumx_rpc/rpc.dart
index 568b2b158..31baffdb3 100644
--- a/lib/electrumx_rpc/rpc.dart
+++ b/lib/electrumx_rpc/rpc.dart
@@ -2,7 +2,7 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
-// import 'package:mutex/mutex.dart';
+import 'package:mutex/mutex.dart';
 
 import 'package:stackwallet/utilities/logger.dart';
 
@@ -22,7 +22,7 @@ class JsonRPC {
   Socket? socket;
   StreamSubscription<Uint8List>? _subscription;
 
-  // final m = Mutex();
+  final m = Mutex();
 
   void Function(List<int>)? _onData;
   void Function(Object, StackTrace)? _onError;
@@ -79,15 +79,21 @@ class JsonRPC {
         level: LogLevel.Info,
       );
       // socket?.destroy();
+      m.release();
       // TODO is this all we need?
     }
 
     if (socket != null) {
       // TODO check if the socket is valid, alive, connected, etc
+    } else {
+      Logging.instance.log(
+        "JsonRPC request: opening socket $host:$port",
+        level: LogLevel.Info,
+      );
     }
     // Do we need to check the subscription, too?
 
-    // await m.acquire();
+    await m.acquire();
 
     if (useSSL) {
       socket ??= await SecureSocket.connect(host, port,
@@ -115,12 +121,10 @@ class JsonRPC {
     socket!.write('$jsonRpcRequest\r\n');
 
     Logging.instance.log(
-      "JsonRPC errorHandler: wrote request $jsonRpcRequest to socket ${socket?.address}:${socket?.port}",
+      "JsonRPC request: wrote request $jsonRpcRequest to socket ${socket?.address}:${socket?.port}",
       level: LogLevel.Info,
     );
 
-    // m.release();
-
     return completer.future;
   }
 }