feat: Improve IPC dispose logic

Author: Berstanio

src/main/java/io/github/berstanio/pymobiledevice3/ipc/PyMobileDevice3IPC.java

@@ -86,14 +86,8 @@ public PyMobileDevice3IPC() throws IOException {
             while (true) {
                 try {
                     String line = reader.readLine();
-                    if (line == null) {
-                        for (CompletableFuture<?> future : futures.values()) {
-                            future.completeExceptionally(new PyMobileDevice3Error("Python process died"));
-                        }
-
-                        close();
-                        return;
-                    }
+                    if (line == null)
+                        throw new IOException("End of stream");
                     JSONObject jsonObject = new JSONObject(line);
                     if (jsonObject.get("state").equals("failed")) {
                         String request = jsonObject.getString("request");
@@ -110,6 +104,7 @@ public PyMobileDevice3IPC() throws IOException {
 
                     handler.accept(jsonObject);
                 } catch (IOException e) {
+                    closePythonProcessDied();
                     break;
                 }
             }
@@ -118,6 +113,14 @@ public PyMobileDevice3IPC() throws IOException {
         readThread.start();
     }
 
+    private void closePythonProcessDied()
+    {
+        for (CompletableFuture<?> future : futures.values())
+            future.completeExceptionally(new PyMobileDevice3Error("Python process died"));
+
+        close();
+    }
+
     private int readVersion() throws IOException {
         try {
             socket.setSoTimeout(2000);
@@ -455,21 +458,25 @@ public boolean isAlive() {
 
     @Override
     public void close() {
-        try {
-            writeThread.interrupt();
-            writeThread.join();
-
-            socket.close();
-            commandResults.clear();
-            writeQueue.clear();
-
-            readThread.interrupt();
-            readThread.join();
-
-            futures.values().forEach(completableFuture -> completableFuture.cancel(true));
-            futures.clear();
+        if (destroyed)
+            return;
+
+        tryClose(writeThread::interrupt);
+        tryClose(writeThread::join);
+        tryClose(socket);
+        tryClose(commandResults::clear);
+        tryClose(writeQueue::clear);
+        tryClose(readThread::interrupt);
+        tryClose(readThread::join);
+        tryClose(() -> futures.values().forEach(completableFuture -> tryClose(() -> completableFuture.cancel(true))));
+        tryClose(futures::clear);
+
+        destroyed = true;
+    }
 
-            destroyed = true;
-        } catch (IOException | InterruptedException ignored) {}
+    private void tryClose(AutoCloseable operation) {
+        try {
+            operation.close();
+        } catch (Exception ignored) {}
     }
 }