feat: improve WebSocketInstance and WebSocketPlugin with enhanced logging and error handling

- Updated `WebSocketInstance.send` and `close` methods to include detailed logging for better debugging.
- Modified `WebSocketPlugin` to handle close operation errors and provide appropriate feedback to the callback context.
- Ensured proper binding of event handlers in the JavaScript WebSocket interface for consistent context handling.

Author: UnschooledGamer

src/plugins/websocket/src/android/WebSocketInstance.java

@@ -68,25 +68,42 @@ public void setCallback(CallbackContext callbackContext) {
     }
 
     public void send(String message) {
-        if (webSocket != null) {
-            webSocket.send(message);
+        if (this.webSocket != null) {
+            this.webSocket.send(message);
+            Log.d("WebSocketInstance", "websocket instanceId=" + this.instanceId + " received send() action call, sending message=" + message);
+        } else {
+            Log.d("WebSocketInstance", "websocket instanceId=" + this.instanceId + " received send() action call, ignoring... as webSocket is null (not present)");
         }
     }
 
-    public void close(int code, String reason) {
-        if (webSocket != null) {
-            readyState = 2; // CLOSING
-            webSocket.close(code, reason);
-            Log.d("WebSocketInstance", "websocket instanceId=" + this.instanceId + " received close() action call");
+    public String close(int code, String reason) {
+        if (this.webSocket != null) {
+            this.readyState = 2; // CLOSING
+            try {
+                boolean result = this.webSocket.close(code, reason);
+                Log.d("WebSocketInstance", "websocket instanceId=" + this.instanceId + " received close() action call");
+
+                // if a graceful shutdown was already underway...
+                // or if the web socket is already closed or canceled. do nothing.
+                if(!result) {
+                    return null;
+                }
+            } catch (Exception e) {
+                return e.getMessage();
+            }
+
+            return null;
         } else {
             Log.d("WebSocketInstance", "websocket instanceId=" + this.instanceId + " received close() action call, ignoring... as webSocket is null (not present)");
+            // TODO: finding a better way of telling it wasn't successful.
+            return "";
         }
     }
 
-    public void close() {
+    public String close() {
         Log.d("WebSocketInstance", "WebSocket instanceId=" + this.instanceId + " close() called with no arguments. Using defaults.");
         // Calls the more specific version with default values
-        close(DEFAULT_CLOSE_CODE, DEFAULT_CLOSE_REASON);
+        return close(DEFAULT_CLOSE_CODE, DEFAULT_CLOSE_REASON);
     }
 
     @Override

src/plugins/websocket/src/android/WebSocketPlugin.java

@@ -1,5 +1,7 @@
 package com.foxdebug.websocket;
 
+import android.util.Log;
+
 import org.apache.cordova.*;
 import org.json.*;
 
@@ -35,6 +37,7 @@ public boolean execute(String action, JSONArray args, final CallbackContext call
                 String instanceId = args.optString(0);
                 String message = args.optString(1);
                 WebSocketInstance inst = instances.get(instanceId);
+                Log.d("WebSocketPlugin", "send called");
                 if (inst != null) {
                     inst.send(message);
                     callbackContext.success();
@@ -45,12 +48,21 @@ public boolean execute(String action, JSONArray args, final CallbackContext call
 
             case "close":
                 instanceId = args.optString(0);
-                int code = args.optInt(1);
-                String reason = args.optString(2);
+                // defaults code to 1000 & reason to "Normal closure"
+                int code = args.optInt(1, 1000);
+                String reason = args.optString(2, "Normal closure");
                 inst = instances.get(instanceId);
                 if (inst != null) {
-                    inst.close(code, reason);
-                    instances.remove(instanceId);
+                    String error = inst.close(code, reason);
+
+                    if(error == null) {
+                        instances.remove(instanceId);
+                        callbackContext.success();
+                        return true;
+                    } else if(!error.isEmpty()) {
+                        // if error is empty means the websocket is not ready/open.
+                        callbackContext.error(error);
+                    }
                     callbackContext.success();
                 } else {
                     callbackContext.error("Invalid instance ID");
@@ -88,5 +100,6 @@ public void onDestroy() {
         }
         instances.clear();
         okHttpMainClient.dispatcher().executorService().shutdown();
+        Log.i("WebSocketPlugin", "cleaned up... on destroy");
     }
 }

src/plugins/websocket/www/websocket.js

@@ -15,14 +15,14 @@ class WebSocketInstance {
             if (event.type === 'open') {
                 this.readyState = WebSocketInstance.OPEN;
                 this.extensions = event.extensions || '';
-                if (this.onopen) this.onopen(event);
+                if (this.onopen) this.onopen.bind(this)(event);
             }
-            if (event.type === 'message' && this.onmessage) this.onmessage(event);
+            if (event.type === 'message' && this.onmessage) this.onmessage.bind(this)(event);
             if (event.type === 'close') {
                 this.readyState = WebSocketInstance.CLOSED;
-                if (this.onclose) this.onclose(event);
+                if (this.onclose) this.onclose.bind(this)(event);
             }
-            if (event.type === 'error' && this.onerror) this.onerror(event);
+            if (event.type === 'error' && this.onerror) this.onerror.bind(this)(event);
         }, null, "WebSocketPlugin", "registerListener", [this.instanceId]);
     }