feat: improvements

Author: RohitKushvaha01

src/plugins/terminal/src/android/Executor.java

@@ -31,6 +31,7 @@
 
 import java.net.ServerSocket;
 import java.io.IOException;
+import java.net.InetSocketAddress;
 
 public class Executor extends CordovaPlugin {
 
@@ -256,26 +257,29 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo
             return true;
         }
 
-        if(actions.equals("spawn")){
-            try{
+        if (action.equals("spawn")) {
+            try {
                 JSONArray cmdArr = args.getJSONArray(0);
                 String[] cmd = new String[cmdArr.length()];
                 for (int i = 0; i < cmdArr.length(); i++) {
                     cmd[i] = cmdArr.getString(i);
                 }
 
-                ServerSocket socket = findFreePort();
-                int port = socket.getLocalPort();
+                int port;
+                try (ServerSocket socket = new ServerSocket(0)) {
+                    socket.setReuseAddress(true);
+                    port = socket.getLocalPort();
+                }
 
-                ProcessServer server = new ProcessServer(socket, cmd);
+                ProcessServer server = new ProcessServer(port, cmd);
                 server.start();
 
                 callbackContext.success(port);
-            }catch(Exception e){
+            } catch (Exception e) {
                 e.printStackTrace();
                 callbackContext.error("Failed to spawn process: " + e.getMessage());
             }
-            
+
             return true;
         }
 
@@ -318,12 +322,6 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo
         }
     }
 
-    private ServerSocket findFreePort() throws IOException {
-        ServerSocket socket = new ServerSocket(0);
-        socket.setReuseAddress(true);
-        return socket;
-    }
-
     private void stopServiceNow() {
         if (isServiceBound) {
             try {

src/plugins/terminal/src/android/ProcessServer.java

@@ -6,17 +6,26 @@
 
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.net.InetSocketAddress;
+import java.net.ServerSocket;
 import java.nio.ByteBuffer;
+import java.net.InetSocketAddress;
 
 class ProcessServer extends WebSocketServer {
 
     private final String[] cmd;
 
-    private record ConnState(Process process, OutputStream stdin) {}
+    private static final class ConnState {
+        final Process process;
+        final OutputStream stdin;
+
+        ConnState(Process process, OutputStream stdin) {
+            this.process = process;
+            this.stdin   = stdin;
+        }
+    }
 
-    ProcessServer(ServerSocket socket, String[] cmd) {
-        super(socket);
+       ProcessServer(int port, String[] cmd) {
+        super(new InetSocketAddress(port));
         this.cmd = cmd;
     }
 
@@ -46,17 +55,17 @@ public void onOpen(WebSocket conn, ClientHandshake handshake) {
     public void onMessage(WebSocket conn, ByteBuffer msg) {
         try {
             ConnState state = conn.getAttachment();
-            state.stdin().write(msg.array(), msg.position(), msg.remaining());
-            state.stdin().flush();
+            state.stdin.write(msg.array(), msg.position(), msg.remaining());
+            state.stdin.flush();
         } catch (Exception ignored) {}
     }
 
     @Override
     public void onMessage(WebSocket conn, String message) {
         try {
             ConnState state = conn.getAttachment();
-            state.stdin().write(message.getBytes());
-            state.stdin().flush();
+            state.stdin.write(message.getBytes());
+            state.stdin.flush();
         } catch (Exception ignored) {}
     }
 
@@ -76,7 +85,7 @@ public void onStart() {}
     private void stopProcess(WebSocket conn) {
         try {
             ConnState state = conn.getAttachment();
-            if (state != null) state.process().destroy();
+            if (state != null) state.process.destroy();
             stop();
         } catch (Exception ignored) {}
     }