Report any socket.io usage exceptions asynchronously.

Author: koush

AndroidAsync/src/com/koushikdutta/async/http/socketio/ExceptionCallback.java

@@ -0,0 +1,8 @@
+package com.koushikdutta.async.http.socketio;
+
+/**
+ * Created by koush on 8/1/13.
+ */
+public interface ExceptionCallback {
+    public void onException(Exception e);
+}

AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOClient.java

@@ -5,6 +5,7 @@
 import android.text.TextUtils;
 
 import com.koushikdutta.async.AsyncServer;
+import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.future.Future;
 import com.koushikdutta.async.future.SimpleFuture;
 import com.koushikdutta.async.http.AsyncHttpClient;
@@ -110,6 +111,15 @@ public void onConnectCompleted(Exception ex, SocketIOClient client) {
         return ret;
     }
 
+    ExceptionCallback exceptionCallback;
+    public void setExceptionCallback(ExceptionCallback exceptionCallback) {
+        this.exceptionCallback = exceptionCallback;
+    }
+
+    public ExceptionCallback getExceptionCallback() {
+        return exceptionCallback;
+    }
+
     ErrorCallback errorCallback;
     public ErrorCallback getErrorCallback() {
         return errorCallback;

AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java

@@ -302,7 +302,7 @@ public void onSelect(SocketIOClient client) {
         });
     }
 
-    private Acknowledge acknowledge(final String _messageId) {
+    private Acknowledge acknowledge(final String _messageId, final String endpoint) {
         if (TextUtils.isEmpty(_messageId))
             return null;
 
@@ -314,6 +314,19 @@ public void acknowledge(JSONArray arguments) {
                 String data = "";
                 if (arguments != null)
                     data += "+" + arguments.toString();
+                WebSocket webSocket = SocketIOConnection.this.webSocket;
+                if (webSocket == null) {
+                    final Exception e = new SocketIOException("websocket is not connected");
+                    select(endpoint, new SelectCallback() {
+                        @Override
+                        public void onSelect(SocketIOClient client) {
+                            ExceptionCallback callback = client.exceptionCallback;
+                            if (callback != null)
+                                callback.onException(e);
+                        }
+                    });
+                    return;
+                }
                 webSocket.send(String.format("6:::%s%s", messageId, data));
             }
         };
@@ -354,22 +367,22 @@ public void onStringAvailable(String message) {
                             break;
                         case 3: {
                             // message
-                            reportString(parts[2], parts[3], acknowledge(parts[1]));
+                            reportString(parts[2], parts[3], acknowledge(parts[1], parts[2]));
                             break;
                         }
                         case 4: {
                             //json message
                             final String dataString = parts[3];
                             final JSONObject jsonMessage = new JSONObject(dataString);
-                            reportJson(parts[2], jsonMessage, acknowledge(parts[1]));
+                            reportJson(parts[2], jsonMessage, acknowledge(parts[1], parts[2]));
                             break;
                         }
                         case 5: {
                             final String dataString = parts[3];
                             final JSONObject data = new JSONObject(dataString);
                             final String event = data.getString("name");
                             final JSONArray args = data.optJSONArray("args");
-                            reportEvent(parts[2], event, args, acknowledge(parts[1]));
+                            reportEvent(parts[2], event, args, acknowledge(parts[1], parts[2]));
                             break;
                         }
                         case 6:

AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOException.java

@@ -0,0 +1,10 @@
+package com.koushikdutta.async.http.socketio;
+
+/**
+ * Created by koush on 8/1/13.
+ */
+public class SocketIOException extends Exception {
+    public SocketIOException(String error) {
+        super(error);
+    }
+}