Rabbit fixes

Author: haslinghuis

android/app/src/main/java/betaflight/configurator/MainActivity.java

@@ -1,6 +1,13 @@
 package betaflight.configurator;
 
+import android.os.Bundle;
 import com.getcapacitor.BridgeActivity;
 import betaflight.configurator.plugin.SocketPlugin;
 
-public class MainActivity extends BridgeActivity {}
+public class MainActivity extends BridgeActivity {
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    registerPlugin(SocketPlugin.class);
+  }
+}

android/app/src/main/java/betaflight/configurator/plugin/SocketPlugin.java

@@ -1,7 +1,5 @@
 package betaflight.configurator.plugin;
 
-import android.util.Log;
-
 import com.getcapacitor.JSObject;
 import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginCall;
@@ -10,38 +8,78 @@
 import java.io.*;
 import java.net.Socket;
 
+/**
+ * Capacitor plugin that provides raw TCP socket functionality.
+ * Implements methods to connect, send, receive, and disconnect.
+ */
 @CapacitorPlugin(name = "SocketPlugin")
 public class SocketPlugin extends Plugin {
     private Socket socket;
     private BufferedReader reader;
     private BufferedWriter writer;
+    private boolean isConnected = false;
 
     @PluginMethod
     public void connect(PluginCall call) {
         String ip = call.getString("ip");
         int port = call.getInt("port");
+
+        // Validate inputs
+        if (ip == null || ip.isEmpty()) {
+            call.reject("IP address is required");
+            return;
+        }
+
+        if (port <= 0 || port > 65535) {
+            call.reject("Invalid port number");
+            return;
+        }
+
+        // Prevent duplicate connections
+        if (socket != null && !socket.isClosed()) {
+            call.reject("Already connected; please disconnect first");
+            return;
+        }
+
         try {
             socket = new Socket(ip, port);
+            socket.setSoTimeout(30_000); // 30s timeout
             reader = new BufferedReader(new InputStreamReader(socket.getInputStream()));
             writer = new BufferedWriter(new OutputStreamWriter(socket.getOutputStream()));
             JSObject ret = new JSObject();
             ret.put("success", true);
             call.resolve(ret);
         } catch (Exception e) {
+            closeResources();
             call.reject("Connection failed: " + e.getMessage());
         }
     }
 
-    @PluginMethod
+@PluginMethod
     public void send(PluginCall call) {
         String data = call.getString("data");
+
+        // Validate input
+        if (data == null) {
+            call.reject("Data is required");
+            return;
+        }
+
+        // Check connection state
+        if (socket == null || socket.isClosed() || !isConnected) {
+            call.reject("Not connected to any server");
+            return;
+        }
+
         try {
             writer.write(data);
             writer.flush();
             JSObject ret = new JSObject();
             ret.put("success", true);
             call.resolve(ret);
         } catch (Exception e) {
+            closeResources();
+            isConnected = false;
             call.reject("Send failed: " + e.getMessage());
         }
     }
@@ -61,12 +99,36 @@ public void receive(PluginCall call) {
     @PluginMethod
     public void disconnect(PluginCall call) {
         try {
-            if (socket != null) socket.close();
+            closeResources();
+            isConnected = false;
             JSObject ret = new JSObject();
             ret.put("success", true);
             call.resolve(ret);
         } catch (Exception e) {
             call.reject("Disconnect failed: " + e.getMessage());
         }
     }
+
+    /**
+     * Helper method to close all resources and clean up state
+     */
+    private void closeResources() {
+    try {
+        if (reader != null) {
+            reader.close();
+            reader = null;
+        }
+        if (writer != null) {
+            writer.close();
+            writer = null;
+        }
+        if (socket != null) {
+            socket.close();
+            socket = null;
+        }
+    } catch (IOException e) {
+        // Log but continue cleanup
+        getContext().getActivity().runOnUiThread(() -> 
+            Log.e("SocketPlugin", "Error closing resources", e));
+    }
 }

capacitor-plugin-socket/package.json

@@ -2,15 +2,20 @@
   "name": "capacitor-plugin-socket",
   "version": "1.0.0",
   "description": "A Capacitor plugin for handling raw TCP sockets.",
-  "main": "index.js",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "files": ["dist/*", "package.json", "README.md"],
   "scripts": {
-    "build": "tsc"
+    "clean": "rimraf dist",
+    "build": "npm run clean && tsc -p tsconfig.json"
   },
   "keywords": ["capacitor", "plugin", "tcp", "socket"],
-  "author": "Your Name",
+  "author": "Betaflight <dev.betaflight.com>",
   "license": "MIT",
+  "peerDependencies": {
+    "@capacitor/core": "^5.0.0"
+  },
   "devDependencies": {
-    "@capacitor/core": "latest",
     "typescript": "^5.0.0"
   }
 }